wait #5699 @0.75

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 78eafaf8f5b09aaf9d5d1aae03f60dc2657eaaff..c4be8b5feac8deee1c634781925c8de35f7ac4b3 100644 (file)
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -456,90 +456,6 @@ class commonAjax
         $x->addAlert($res);
     }
 
-    public static function createDevSpace($args, &$x)
-    {
-        commonDroits::min(1);
-        global $core;
-
-        $domain = $_POST['domain'];
-        $svn = $_POST['svn'];
-        $user = $_POST['user'];
-        $zend = $_POST['zend'];
-        if (!$user) {
-            $user = $domain;
-        }
-
-        $domain = cubeText::str2URL($domain);
-        $user = cubeText::str2URL($user);
-        $svn = cubeText::str2URL($svn);
-        $password = CubeIT_Crypt::generateRandomString(10);
-        $zend = cubeText::str2URL($zend);
-        $zend = cubeText::ucfirst($zend);
-
-        $body = "Adresse : https://$domain.dev1.cubedesigners.com
-
-SSH : $domain.dev1.cubedesigners.com
-Nom d'utilisateur : $user
-Mot de passe : $password
-Chemin : /home/$user/www
-Port : 22
-
-Base de données MySQL : https://clockwork.fluidbook.com/phpmyadmin/
-Hôte : localhost
-Nom d'utilisateur : $user
-Nom de la base : $user
-Mot de passe : $password";
-
-        if ($svn != '') {
-            $body .= "\n\nSVN : svn+ssh://svn@svn.cubedesigners.com/projects/$svn";
-        }
-
-        $users = array();
-        if ($zend && isset($_POST['users']) && count($_POST['users'])) {
-
-            foreach ($_POST['users'] as $u) {
-                $userpassword = CubeIT_Crypt::generateRandomString(10);
-                $users[$u] = $userpassword;
-                $b = $body . "\n\n";
-                $b .= 'Admin : https://' . $domain . '.dev1.cubedesigners.com/admin/' . "\n";
-                $b .= 'Nom d\'utilisateur : ' . $u . "\n";
-                $b .= 'Mot de passe : ' . $userpassword . "\n";
-
-                $mail = new cubeMail();
-                $mail->charset = 'UTF-8';
-                $mail->from = 'extranet@cubedesigners.com';
-                $mail->to = $u;
-                $mail->subject = 'Création de l\'espace de développement "' . $domain . '"';
-                $mail->body = $b;
-                $mail->send();
-            }
-        } else {
-            $mail = new cubeMail();
-            $mail->charset = 'UTF-8';
-            $mail->from = 'extranet@cubedesigners.com';
-            $mail->to = $core->user->email;
-            $mail->subject = 'Création de l\'espace de développement "' . $domain . '"';
-            $mail->body = $body;
-            $mail->send();
-        }
-
-        $args = "-l $user -o $domain -u $user -p $password";
-        if ($zend) {
-            $args .= " -n $zend";
-        }
-        if ($svn) {
-            $args .= " -d $svn";
-        }
-        if (count($users)) {
-            $args .= ' -e ' . base64_encode(json_encode($users));
-        }
-
-        $cmd = "ssh root@clockwork.cubedesigners.com /usr/local/bin/tools/projectcreator/make.php $args";
-        $out = `$cmd`;
-        $x->addDebug($cmd . ' : ' . $out);
-        $x->addAlert('Espace de développement crée. Vous allez recevoir un mail récapitulant les identifiants de l\'espace crée');
-    }
-
     public static function postMailer($args, &$x)
     {
         $mail = new CubeIT_Mail_Mailjet();

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 588a1a18552528fca0a4f3265c1a48bcf3574433..50b5f421b66e5524e4d0b4203844bab7a56eb324 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -10,7 +10,7 @@ class commonUrl
         // Si l'utilisateur n'est pas connecté, on affiche le formulaire\r
         // de login\r
 \r
-        $closesession = ['relay', 'relayfb','relayus'];\r
+        $closesession = ['relay', 'relayfb', 'relayus'];\r
         $bypass = array_merge(['stats', 'telecharger', 'telechargerr', 'orpiref', 'resetPassword'], $closesession);\r
         if (isset($args[0]) && in_array($args[0], $closesession)) {\r
             session_write_close();\r
@@ -651,12 +651,12 @@ class commonUrl
         }\r
 \r
         if (count($files_uploaded) > 0) {\r
-            $mail = new cubeMail();\r
-            $mail->charset = 'UTF-8';\r
-            $mail->from = FROM_NAME . '<' . FROM_EMAIL . '>';\r
+            $mail = new CubeIT_Mail_Mailjet();\r
+            $mail->setFrom(FROM_EMAIL, FROM_NAME);\r
+\r
             if (!$for) {\r
-                $mail->to = TEAM_EMAIL;\r
-                $mail->subject = '[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés par ' . $core->user->prenom . ' ' . $core->user->nom;\r
+                $mail->addTo(TEAM_EMAIL);\r
+                $mail->setSubject('[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés par ' . $core->user->prenom . ' ' . $core->user->nom);\r
                 $body = 'Tous les fichiers de ' . $core->user->prenom . ' ' . $core->user->nom . ' : https://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $core->user->utilisateur_id . "\n\n";\r
                 $body .= 'Fichiers chargés : ' . "\n";\r
                 foreach ($files_uploaded as $f) {\r
@@ -666,8 +666,8 @@ class commonUrl
                 $dao = new commonDAOClient($core->con);\r
                 $client = $dao->selectById($for);\r
 \r
-                $mail->to = $core->user->email;\r
-                $mail->subject = '[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés pour ' . $client->prenom . ' ' . $client->nom;\r
+                $mail->addTo($core->user->email);\r
+                $mail->setSubject('[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés pour ' . $client->prenom . ' ' . $client->nom);\r
 \r
                 $body = 'Tous les fichiers de ' . $client->prenom . ' ' . $client->nom . ' : https://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $client->utilisateur_id . "\n\n";\r
                 $body .= 'Fichiers chargés : ' . "\n";\r
@@ -679,8 +679,8 @@ class commonUrl
                 $body .= ' - Login : ' . $client->email . "\n";\r
                 $body .= ' - Mot de passe : ' . __('Utiliser la fonction "Mot de passe oublié" pour le créer ou le réinitialiser') . "\n";\r
             }\r
-            $mail->body = $body;\r
-            $ok = $mail->send();\r
+            $mail->setBodyText($body);\r
+            $mail->send(commonAjax::getMailTransport());\r
         }\r
 \r
 \r

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 196e2cae58dc352021ff3226ee88bfea41122eb8..cb8ce9b7c1728fc43e1d5faa664dbff993635c04 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -414,18 +414,6 @@ class extranetAjax
         $devis->client = $daoUtilisateur->selectById($devis->client_id);\r
         $devis->createur = $daoUtilisateur->selectById($devis->createur_id);\r
 \r
-        if ($args[1] == 1) {\r
-            // Envoie de l'email\r
-            $mail = new cubeMail();\r
-            $mail->from = $devis->createur->getEmail();\r
-            $mail->bcc = MAIL_BCC;\r
-            $mail->bcc = $devis->createur->getEmail();\r
-            $mail->to = $devis->client->getEmail();\r
-            $mail->subject = $devis->email['sujet'];\r
-            $mail->body = $devis->email['corps'] . "\r\n\r\n" . $devis->createur->getSignature();\r
-            $mail->addFile('Devis.pdf', ROOT . '/docs/devis/' . $devis->devis_id . '.pdf');\r
-            $mail->send();\r
-        }\r
         // On marque le devis comme envoyé\r
         $dao->changeStatus($devis->devis_id, 1);\r
         $x->addDownloadFile('/voirdevis/' . $devis->devis_id . '/1');\r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 37bef8c4ee6100e6e3e51cd315af1b25a8aa5850..0ec2eaac1ab48e172e665a42133c85f25afb052e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -25,23 +25,7 @@ class wsServices extends cubeFlashGateway
         $dao = new wsDAOBook($core->con);
         $book = $dao->selectById($this->args['id']);
 
-        $return = 'postmaster@fluidbook.com';
-
-        // Send the email
-        $mail = new cubeMail();
-        $mail->returnPath = $return;
-        $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];
-        $mail->charset = 'UTF-8';
-        $mail->to = $this->args['email'];
-        if ($book->parametres->sendasfluidbook) {
-            $mail->from = $this->args['fromname'] . '<' . $return . '>';
-            $mail->replyTo = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
-        } else {
-            $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
-        }
-        $mail->subject = $this->args['subject'];
-        $mail->body = $this->args['body'];
-        $this->xml->addChild('ok', $mail->send() ? '1' : '0');
+        $this->xml->addChild('ok', '0');
     }
 
     protected function _checkHash()
@@ -120,24 +104,8 @@ class wsServices extends cubeFlashGateway
                 $s = ' (' . ($i + 1) . '/' . $total . ')';
             }
 
-            // Send the email
-            $mail = new cubeMail();
-            $mail->returnPath = $return;
-            $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];
-            $mail->charset = 'UTF-8';
-            $mail->to = $this->args['email'];
-            if ($book->parametres->sendasfluidbook) {
-                $mail->from = $this->args['fromname'] . '<' . $return . '>';
-                $mail->replyTo = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
-            } else {
-                $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';
-            }
-            $mail->subject = $this->args['subject'] . $s;
-            $mail->body = $this->args['body'];
-            foreach ($g as $f) {
-                $mail->addFile($f['name'] . '.pdf', $f['file']);
-            }
-            $this->xml->addChild('ok', $mail->send() ? '1' : '0');
+
+            $this->xml->addChild('ok', '0');
         }
     }
 
@@ -553,46 +521,6 @@ class wsServices extends cubeFlashGateway
         $this->xml->addChild('errors', implode(',', $errors));
     }
 
-    public function grdfSendForm()
-    {
-        global $core;
-
-        if ($this->args['id'] == 11222) {
-            $annee = 2013;
-        } else if ($this->args['id'] == 12235 || $this->args['id'] == 12779) {
-            $annee = 2014;
-        }
-
-        $fields = array('Civilité' => 'civilite', 'Prénom' => 'prenom', 'Nom' => 'nom',
-            'E-mail' => 'email', 'Adresse' => 'adresse', 'Code postal' => 'codepostal', 'Ville' => 'ville',
-            'Téléphone' => 'telephone', 'Connu par' => 'connu', 'Energie' => 'energie',
-            'Type de logement' => 'logement', 'Echéance travaux' => 'echeance',
-            'Optin' => 'optin', 'Optin partenaires' => 'optin_partenaires', 'Coupons sélectionnés' => 'reflist');
-
-        $mail = new cubeMail();
-        $mail->charset = 'UTF-8';
-        $mail->subject = '[Chéquier avantages] Validation de coupon';
-        $mail->from = 'noreply@chequieravantages.fr';
-        $mail->replyTo = 'noreply@chequiavantages.fr';
-        $mail->to = 'projetrenogaz@grdf.fr';
-        $mail->to = 'pierric.soustre@external.grdf.fr';
-        $mail->to = 'caroline.gaulin@grdf.fr';
-        $mail->bcc = 'test@cubedesigners.com';
-        $body = '';
-
-        foreach ($fields as $k => $f) {
-            $body .= $k . ' : ' . $this->args[$f] . "\r\n";
-            $datas[$f] = $this->args[$f];
-        }
-        $datas['date'] = TIME;
-
-        $c = $core->con->openCursor('grdf' . $annee);
-        $c->datas = json_encode($datas);
-        $c->insert();
-
-        $mail->body = $body;
-        $mail->send();
-    }
 
     public function proxy()
     {
@@ -977,64 +905,6 @@ class wsServices extends cubeFlashGateway
         die;
     }
 
-    public function orderRemarkable()
-    {
-        try {
-            $html = file_get_contents(WS_FILES . '/services/remarkableorder.html');
-            $billing_address = $_POST['details']['firstname'] . ' ' . $_POST['details']['lastname'] . '<br><br>' . $_POST['details']['billing_company'] . " <br>" . $_POST['details']['billing_address'] . '<br>' . $_POST['details']['billing_zip'] . ' ' . $_POST['details']['billing_city'];
-
-            $params = array('company', 'address', 'zip', 'city');
-            foreach ($params as $param) {
-                if (trim($_POST['details']['shipping_' . $param]) == '') {
-                    $_POST['details']['shipping_' . $param] = $_POST['details']['billing_' . $param];
-                }
-            }
-            $shipping_address = $_POST['details']['shipping_company'] . " <br>" . $_POST['details']['shipping_address'] . '<br>' . $_POST['details']['shipping_zip'] . ' ' . $_POST['details']['shipping_city'];
-
-            if ($_POST['fpv'] == 'hidden') {
-                $fraisport = '';
-            } else {
-                $fraisport = '<tr>';
-                $fraisport .= '<td></td><td colspan="3" bgcolor="#f2f2f2" align="right"><font size="1" face="Verdana" color="#1F497D">Frais de livraison</font></td>';
-                $fraisport .= '<td bgcolor="#f2f2f2" align="right"><font size="1" face="Verdana" color="#1F497D">' . $_POST['fpv'] . '</font></td>';
-                $fraisport .= '</tr>';
-            }
-
-            $lignes = [];
-            foreach ($_POST['items'] as $item) {
-                $ligne = '<tr>';
-                $ligne .= '<td bgcolor="#ebecee"><font size="1" face="Verdana" color="#1F497D">' . $item[0] . '</font></td>';
-                $ligne .= '<td bgcolor="#ebecee"><font size="1" face="Verdana" color="#1F497D"><b>' . $item[1] . '</b></font></td>';
-                $ligne .= '<td align="right" bgcolor="#ebecee"><font size="1" face="Verdana" color="#1F497D">' . $item[2] . '</font></td>';
-                $ligne .= '<td align="center" bgcolor="#ebecee"><font size="1" face="Verdana" color="#1F497D">' . $item[3] . '</font></td>';
-                $ligne .= '<td align="right" bgcolor="#ebecee"><font size="1" face="Verdana" color="#1F497D">' . $item[4] . '</font></td>';
-                $ligne .= '</tr>';
-                $lignes[] = $ligne;
-            }
-
-            $lignes = implode('', $lignes);
-            $totalttc = $_POST['totalttc'];
-
-            $replace = ['billing_address', 'shipping_address', 'totalttc', 'fraisport', 'lignes'];
-            foreach ($replace as $item) {
-                if (isset($$item)) {
-                    $html = str_replace('$' . $item, str_replace('€', '&euro;', $$item), $html);
-                }
-            }
-
-            $mail = new cubeMail();
-            $mail->type = "html";
-            $mail->from = 'transfert-fluidbook@remarkable.fr';
-            $mail->to = $_POST['details']['email'];
-            $mail->bcc = 'transfert-fluidbook@remarkable.fr';
-            $mail->bcc = 'test@cubedesigners.com';
-            $mail->subject = '[Remarkable] Votre commande';
-            $mail->body = $html;
-            $mail->send();
-        } catch (Exception $e) {
-
-        }
-    }
 
     public function bourbonSuggestion()
     {

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 343854f300ee3fb95ccb902b59bd952965ebbc94..b4637aac74db49863951d327fa7bdf1f5966244b 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -125,14 +125,7 @@ class wsDAOBook extends commonDAO
         $r = $this->con->select('SELECT demo_counter,nom FROM books WHERE book_id=\'' . $book_id . '\'');
         $m = 20;
         if ($r->demo_counter > 0 && $r->demo_counter % $m == 0) {
-            $mail = new cubeMail();
-            $mail->charset = 'UTF-8';
-            $mail->from = 'contact@fluidbook.com';
-            $mail->to = 'tech@fluidbook.com';
-            $mail->subject = '[Fluidbook Workshop] Fluidbook consulté via l\'url publique';
-            $mail->body = 'Le fluidbook suivant a été consulté ' . $m . ' fois (et ' . $r->demo_counter . ' au total) via l\'url publique : ' . "\r\n" .
-                'Fluidbook # ' . $book_id . ' - ' . $r->nom;
-            $mail->send();
+
         }
 
         $this->con->select('UPDATE books SET demo_counter=demo_counter+1 WHERE book_id=\'' . $book_id . '\'');