From 89e1d0c13f80f95994dfbbff736be6f96606c49f Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 7 Mar 2023 15:14:22 +0000 Subject: [PATCH] wait #5699 @0.75 --- inc/commons/class.common.ajax.php | 84 ----------- inc/commons/class.common.url.php | 20 +-- .../Controlleur/class.extranet.ajax.php | 12 -- inc/ws/Controlleur/class.ws.services.php | 136 +----------------- inc/ws/DAO/class.ws.dao.book.php | 9 +- 5 files changed, 14 insertions(+), 247 deletions(-) diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php index 78eafaf8f..c4be8b5fe 100644 --- 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 588a1a185..50b5f421b 100644 --- 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 // de login - $closesession = ['relay', 'relayfb','relayus']; + $closesession = ['relay', 'relayfb', 'relayus']; $bypass = array_merge(['stats', 'telecharger', 'telechargerr', 'orpiref', 'resetPassword'], $closesession); if (isset($args[0]) && in_array($args[0], $closesession)) { session_write_close(); @@ -651,12 +651,12 @@ class commonUrl } if (count($files_uploaded) > 0) { - $mail = new cubeMail(); - $mail->charset = 'UTF-8'; - $mail->from = FROM_NAME . '<' . FROM_EMAIL . '>'; + $mail = new CubeIT_Mail_Mailjet(); + $mail->setFrom(FROM_EMAIL, FROM_NAME); + if (!$for) { - $mail->to = TEAM_EMAIL; - $mail->subject = '[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés par ' . $core->user->prenom . ' ' . $core->user->nom; + $mail->addTo(TEAM_EMAIL); + $mail->setSubject('[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés par ' . $core->user->prenom . ' ' . $core->user->nom); $body = 'Tous les fichiers de ' . $core->user->prenom . ' ' . $core->user->nom . ' : https://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $core->user->utilisateur_id . "\n\n"; $body .= 'Fichiers chargés : ' . "\n"; foreach ($files_uploaded as $f) { @@ -666,8 +666,8 @@ class commonUrl $dao = new commonDAOClient($core->con); $client = $dao->selectById($for); - $mail->to = $core->user->email; - $mail->subject = '[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés pour ' . $client->prenom . ' ' . $client->nom; + $mail->addTo($core->user->email); + $mail->setSubject('[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés pour ' . $client->prenom . ' ' . $client->nom); $body = 'Tous les fichiers de ' . $client->prenom . ' ' . $client->nom . ' : https://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $client->utilisateur_id . "\n\n"; $body .= 'Fichiers chargés : ' . "\n"; @@ -679,8 +679,8 @@ class commonUrl $body .= ' - Login : ' . $client->email . "\n"; $body .= ' - Mot de passe : ' . __('Utiliser la fonction "Mot de passe oublié" pour le créer ou le réinitialiser') . "\n"; } - $mail->body = $body; - $ok = $mail->send(); + $mail->setBodyText($body); + $mail->send(commonAjax::getMailTransport()); } diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php index 196e2cae5..cb8ce9b7c 100644 --- 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); $devis->createur = $daoUtilisateur->selectById($devis->createur_id); - if ($args[1] == 1) { - // Envoie de l'email - $mail = new cubeMail(); - $mail->from = $devis->createur->getEmail(); - $mail->bcc = MAIL_BCC; - $mail->bcc = $devis->createur->getEmail(); - $mail->to = $devis->client->getEmail(); - $mail->subject = $devis->email['sujet']; - $mail->body = $devis->email['corps'] . "\r\n\r\n" . $devis->createur->getSignature(); - $mail->addFile('Devis.pdf', ROOT . '/docs/devis/' . $devis->devis_id . '.pdf'); - $mail->send(); - } // On marque le devis comme envoyé $dao->changeStatus($devis->devis_id, 1); $x->addDownloadFile('/voirdevis/' . $devis->devis_id . '/1'); diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index 37bef8c4e..0ec2eaac1 100644 --- 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'] . '

' . $_POST['details']['billing_company'] . "
" . $_POST['details']['billing_address'] . '
' . $_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'] . "
" . $_POST['details']['shipping_address'] . '
' . $_POST['details']['shipping_zip'] . ' ' . $_POST['details']['shipping_city']; - - if ($_POST['fpv'] == 'hidden') { - $fraisport = ''; - } else { - $fraisport = ''; - $fraisport .= 'Frais de livraison'; - $fraisport .= '' . $_POST['fpv'] . ''; - $fraisport .= ''; - } - - $lignes = []; - foreach ($_POST['items'] as $item) { - $ligne = ''; - $ligne .= '' . $item[0] . ''; - $ligne .= '' . $item[1] . ''; - $ligne .= '' . $item[2] . ''; - $ligne .= '' . $item[3] . ''; - $ligne .= '' . $item[4] . ''; - $ligne .= ''; - $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('€', '€', $$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 343854f30..b4637aac7 100644 --- 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 . '\''); -- 2.39.5