From: x2000habouzit Date: Tue, 16 Nov 2004 20:36:10 +0000 (+0000) Subject: use the new HermesMailer everywhere ! X-Git-Tag: xorg/old~929 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=49e14cdceb85e6a21dbcc782f50ba8df0d169b7e;p=platal.git use the new HermesMailer everywhere ! --- diff --git a/htdocs/admin/homonymes.php b/htdocs/admin/homonymes.php index c5c0d7c..216ecb9 100644 --- a/htdocs/admin/homonymes.php +++ b/htdocs/admin/homonymes.php @@ -18,26 +18,27 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: homonymes.php,v 1.6 2004-11-13 14:16:16 x2000habouzit Exp $ + $Id: homonymes.php,v 1.7 2004-11-16 20:36:11 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); new_admin_page('admin/homonymes.tpl'); -require("diogenes.mailer.inc.php"); +require("diogenes.hermes.inc.php"); $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'list'; $target = isset($_REQUEST['target']) ? $_REQUEST['target'] : 0; if ($target) { - $res = $globals->db->query("SELECT prenom,a.alias AS forlife,h.alias AS loginbis + $res = $globals->db->query("SELECT prenom,nom,a.alias AS forlife,h.alias AS loginbis FROM auth_user_md5 AS u INNER JOIN aliases AS a ON (a.id=u.user_id AND a.type='a_vie') INNER JOIN aliases AS h ON (h.id=u.user_id AND h.expire!='') WHERE user_id='$target'"); - if (! list($prenom,$forlife,$loginbis) = mysql_fetch_row($res)) { + if (! list($prenom,$nom,$forlife,$loginbis) = mysql_fetch_row($res)) { $target=0; } else { + $page->assign('nom',$nom); $page->assign('prenom',$prenom); $page->assign('forlife',$forlife); $page->assign('loginbis',$loginbis); @@ -50,29 +51,35 @@ $page->assign('baseurl',$baseurl); // on a un $target valide, on prepare les mails if ($target) { - // from - $cc = "support+homonyme@polytechnique.org"; - $FROM = "From: Support Polytechnique.org <$cc>"; - - // on examine l'op a effectuer - switch ($op) { - case 'mail': - $mymail = new DiogenesMailer($cc,$forlife,"Dans 2 semaines, suppression de $loginbis@polytechnique.org",false,$cc); - $mymail->addHeader($FROM); - $mymail->setBody(stripslashes($_REQUEST['mailbody'])); - $mymail->send(); - $op = 'list'; - break; - case 'correct': - $globals->db->query("UPDATE aliases SET type='homonyme',expire=NOW() WHERE alias='$loginbis'"); - $globals->db->query("REPLACE INTO homonymes (homonyme_id,user_id) VALUES('$target','$target')"); - $mymail = new DiogenesMailer($cc,$forlife,"Mise en place du robot $loginbis@polytechnique.org",false,$cc); - $mymail->addHeader($FROM); - $mymail->setBody(stripslashes($_REQUEST['mailbody'])); - $mymail->send(); - $op = 'list'; - break; - } + // from + $cc = "support+homonyme@polytechnique.org"; + $FROM = "Support Polytechnique.org <$cc>"; + + // on examine l'op a effectuer + switch ($op) { + case 'mail': + $mymail = new HermesMailer(); + $mymail->setFrom($FROM); + $mymail->setSubject("Dans 2 semaines, suppression de $loginbis@polytechnique.org"); + $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>"); + $mymail->addCc($cc); + $mymail->setTxtBody(stripslashes($_REQUEST['mailbody'])); + $mymail->send(); + $op = 'list'; + break; + case 'correct': + $globals->db->query("UPDATE aliases SET type='homonyme',expire=NOW() WHERE alias='$loginbis'"); + $globals->db->query("REPLACE INTO homonymes (homonyme_id,user_id) VALUES('$target','$target')"); + $mymail = new HermesMailer(); + $mymail->setFrom($FROM); + $mymail->setSubject("Mise en place du robot $loginbis@polytechnique.org"); + $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>"); + $mymail->addCc($cc); + $mymail->setTxtBody(stripslashes($_REQUEST['mailbody'])); + $mymail->send(); + $op = 'list'; + break; + } } if ($op == 'list') { diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php index 5cc7105..a936ec2 100644 --- a/htdocs/listes/moderate.php +++ b/htdocs/listes/moderate.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: moderate.php,v 1.19 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: moderate.php,v 1.20 2004-11-16 20:36:11 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); @@ -47,50 +47,50 @@ if(isset($_POST['sdel'])) { if(isset($_REQUEST['mid'])) { $mid = $_REQUEST['mid']; + include_once('diogenes.hernes.inc.php'); + $mailer = new HermesMailer(); + $mailer->addTo("$liste-owner@polytechnique.org"); + $mailer->setFrom("$liste-bounces@polytechnique.org"); + $mailer->addHeader('Reply-To', "$liste-owner@polytechnique.org"); + if(isset($_REQUEST['mok'])) { unset($_GET['mid']); if($client->handle_request($liste,$mid,1,'')) { /** 1 = APPROVE **/ - include_once('diogenes.mailer.inc.php'); - $mailer = new DiogenesMailer("$liste-bounces@polytechnique.org", - "$liste-owner@polytechnique.org", "Message accepté"); + $mailer->setSubject("Message accepté"); $texte = "le message suivant :\n\n" ." Auteur: {$mail['sender']}\n" ." Sujet : « {$mail['subj']} »\n" ." Date : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n" ."a été accepté par {$_SESSION['prenom']} {$_SESSION['nom']}.\n"; - $mailer->setBody(wordwrap($texte,72)); + $mailer->setTxtBody(wordwrap($texte,72)); $mailer->send(); } } elseif(isset($_POST['mno'])) { $reason = stripslashes($_POST['reason']); $mail = $client->get_pending_mail($liste, $mid); if($client->handle_request($liste,$mid,2,$reason)) { /** 2 = REJECT **/ - include_once('diogenes.mailer.inc.php'); - $mailer = new DiogenesMailer("$liste-bounces@polytechnique.org", - "$liste-owner@polytechnique.org", "Message refusé"); + $mailer->setSubject("Message refusé"); $texte = "le message suivant :\n\n" ." Auteur: {$mail['sender']}\n" ." Sujet : « {$mail['subj']} »\n" ." Date : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n" ."a été refusé par {$_SESSION['prenom']} {$_SESSION['nom']} avec la raison :\n" ."« $reason »"; - $mailer->setBody(wordwrap($texte,72)); + $mailer->setTxtBody(wordwrap($texte,72)); $mailer->send(); } } elseif(isset($_REQUEST['mdel'])) { unset($_GET['mid']); $mail = $client->get_pending_mail($liste, $mid); if($client->handle_request($liste,$mid,3,'')) { /** 3 = DISCARD **/ - include_once('diogenes.mailer.inc.php'); - $mailer = new DiogenesMailer("$liste-bounces@polytechnique.org", - "$liste-owner@polytechnique.org", "Message supprimé"); + $mailer->setSubject("Message supprimé"); $texte = "le message suivant :\n\n" ." Auteur: {$mail['sender']}\n" ." Sujet : « {$mail['subj']} »\n" ." Date : ".strftime("le %d %b %Y à %H:%M:%S",(int)$mail['stamp'])."\n\n" ."a été supprimé par {$_SESSION['prenom']} {$_SESSION['nom']}.\n\n" ."Rappel: il ne faut utiliser cette opération que dans le cas de spams ou de virus !\n"; - $mailer->setBody(wordwrap($texte,72)); + $mailer->setTxtBody(wordwrap($texte,72)); $mailer->send(); } } diff --git a/htdocs/newsletter/submit.php b/htdocs/newsletter/submit.php index ceea318..156b261 100644 --- a/htdocs/newsletter/submit.php +++ b/htdocs/newsletter/submit.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: submit.php,v 1.4 2004-11-13 14:16:24 x2000habouzit Exp $ + $Id: submit.php,v 1.5 2004-11-16 20:36:11 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -33,12 +33,15 @@ if(isset($_POST['see'])) { $art = new NLArticle($_POST['title'], $_POST['body'], $_POST['append']); $nl->saveArticle($art); - require("diogenes.mailer.inc.php"); - $to = 'Equipe Newsletter Polytechnique.org '; + require("diogenes.hermes.inc.php"); $from = "{$_SESSION['prenom']} {$_SESSION['nom']} ({$_SESSION['promo']}) <{$_SESSION['forlife']}@polytechnique.org>"; - $mailer = new DiogenesMailer($from,$to,"proposition d'article dans la NL",false,$from); + $mailer = new HermesMailer(); + $mailer->setSubject("proposition d'article dans la NL"); + $mailer->setTo('Equipe Newsletter Polytechnique.org '); + $mailer->setFrom($from); + $mailer->setCc($from); $text = "l'article suivant a été proposé par:\n\n $from\n\n\n".$art->toText(); - $mailer->setBody($text); + $mailer->setTxtBody($text); $mailer->send(); $page->assign('submited', true); diff --git a/htdocs/paiement/cyberpaiement_retour.php b/htdocs/paiement/cyberpaiement_retour.php index ab8d52e..f202a9f 100644 --- a/htdocs/paiement/cyberpaiement_retour.php +++ b/htdocs/paiement/cyberpaiement_retour.php @@ -18,58 +18,51 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: cyberpaiement_retour.php,v 1.8 2004-10-31 16:39:08 x2000chevalier Exp $ + $Id: cyberpaiement_retour.php,v 1.9 2004-11-16 20:36:12 x2000habouzit Exp $ ***************************************************************************/ require("config.xorg.inc.php") ; require_once("xorg.common.inc.php"); -require("diogenes.mailer.inc.php"); - -/* en attendant PHP 4.2, on definit var_export */ -function var_exp(&$var) { - ob_start(); - var_dump($var); - $ret = ob_get_contents(); - ob_end_clean(); - return $ret; -} +require("diogenes.hermes.inc.php"); /* sort en affichant une erreur */ function erreur($text) { - $text .= "\n\n".var_exp($_REQUEST); - $mymail = new DiogenesMailer("webmaster","web","erreur lors d'un télépaiement",false); - $mymail->setBody($text); - $mymail->send(); - exit; + $mymail = new HermesMailer(); + $mymail->addTo("webmaster@polytechnique.org"); + $mymail->setFrom("webmaster@polytechnique.org"); + $mymail->setSubject("erreur lors d'un télépaiement"); + $mymail->setTxtBody("\n\n".var_export($_REQUEST,true)); + $mymail->send(); + exit; } /* calcule la clé de Luhn d'un nombre */ function luhn($nombre) { - $sum = 0; - for ($i = 0; $i < strlen($nombre); $i++) { - $digit = substr($nombre,$i,1); - if ($i % 2) { - if ($digit*2>9) - $sum += 2*$digit - 9; - else - $sum += 2*$digit; - } else { - $sum += $digit; + $sum = 0; + for ($i = 0; $i < strlen($nombre); $i++) { + $digit = substr($nombre,$i,1); + if ($i % 2) { + if ($digit*2>9) + $sum += 2*$digit - 9; + else + $sum += 2*$digit; + } else { + $sum += $digit; + } } - } - return $sum % 10; + return $sum % 10; } /* calcule la clé d'acceptation a partir de 5 champs */ function cle_accept($d1,$d2,$d3,$d4,$d5) { - $m1 = luhn(strrev($d1.$d5)); - $m2 = luhn(strrev($d2.$d5)); - $m3 = luhn(strrev($d3.$d5)); - $m4 = luhn(strrev($d4.$d5)); - $n = $m1 + $m2 + $m3 + $m4; - $alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - return substr($alpha,$n-1,1).$m1.$m2.$m3.$m4; + $m1 = luhn(strrev($d1.$d5)); + $m2 = luhn(strrev($d2.$d5)); + $m3 = luhn(strrev($d3.$d5)); + $m4 = luhn(strrev($d4.$d5)); + $n = $m1 + $m2 + $m3 + $m4; + $alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + return substr($alpha,$n-1,1).$m1.$m2.$m3.$m4; } /* user id */ @@ -96,29 +89,37 @@ $res = $globals->db->query(" FROM auth_user_md5 AS a INNER JOIN aliases AS l ON (a.user_id=l.id AND type!='homonyme') WHERE a.user_id='$uid'"); -if (!list($prenom,$nom,$promo,$forlife,$femme) = mysql_fetch_row($res)) - erreur("uid invalide"); +if (!list($prenom,$nom,$promo,$forlife,$femme) = mysql_fetch_row($res)) { + erreur("uid invalide"); +} + /* on extrait la reference de la commande */ -if (!ereg('-xorg-([0-9]+)$',$champ200,$matches)) - erreur("référence de commande invalide"); -$ref = $matches[1]; -echo $ref; +if (!ereg('-xorg-([0-9]+)$',$champ200,$matches)) { + erreur("référence de commande invalide"); +} + +echo ($ref = $matches[1]); $res = $globals->db->query("select mail,text,confirmation from paiement.paiements where id='$ref'"); -if (!list($conf_mail,$conf_title,$conf_text) = mysql_fetch_row($res)) - erreur("référence de commande inconnue"); +if (!list($conf_mail,$conf_title,$conf_text) = mysql_fetch_row($res)) { + erreur("référence de commande inconnue"); +} /* on extrait le code de retour */ if ($champ906 != "0000") { - $res = $globals->db->query("select rcb.text,c.id,c.text from paiement.codeRCB as rcb left join paiement.codeC as c on rcb.codeC=c.id where rcb.id='$champ906'"); - if (list($rcb_text,$c_id,$c_text) = mysql_fetch_row($res)) - erreur("erreur lors du paiement : $c_text ($c_id)"); - else - erreur("erreur inconnue lors du paiement"); + $res = $globals->db->query("SELECT rcb.text,c.id,c.text + FROM paiement.codeRCB AS rcb + LEFT JOIN paiement.codeC AS c ON rcb.codeC=c.id + WHERE rcb.id='$champ906'"); + if (list($rcb_text,$c_id,$c_text) = mysql_fetch_row($res)) + erreur("erreur lors du paiement : $c_text ($c_id)"); + else + erreur("erreur inconnue lors du paiement"); } /* on fait l'insertion en base de donnees */ -$globals->db->query("insert into paiement.transactions set id='$champ901',uid='$uid',ref='$ref',fullref='$champ200',montant='$montant',cle='$champ905'"); +$globals->db->query("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle) + VALUES ('$champ901','$uid','$ref','$champ200','$montant','$champ905')"); /* on genere le mail de confirmation */ $conf_text = str_replace("",$prenom,$conf_text); @@ -127,20 +128,27 @@ $conf_text = str_replace("",$promo,$conf_text); $conf_text = str_replace("",$montant,$conf_text); $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); -$mymail = new DiogenesMailer($conf_mail,$forlife,$conf_title,false,$conf_mail); -$mymail->setBody($conf_text); +$mymail = new HermesMailer(); +$mymail->setFrom($conf_mail); +$mymail->addTo("$prenom $nom <$forlife@polytechnique.org>"); +$mymail->addCc($conf_mail); +$mymail->setSubject($conf_title); +$mymail->setTxtBody($conf_text); $mymail->send(); /* on envoie les details de la transaction à telepaiement@ */ -$mymail = new DiogenesMailer("webmaster","telepaiement",$conf_title,false); +$mymail = new HermesMailer(); +$mymail->setFrom("webmaster@polytechnique.org"); +$mymail->addTo("telepaiement@polytechnique.org"); +$mymail->setSubject($conf_title); $msg = "utilisateur : $prenom $nom ($uid)\n". "mail : $forlife@polytechnique.org\n\n". "paiement : $conf_title ($conf_mail)\n". "reference : $champ200\n". "montant : $montant\n\n". "dump de REQUEST:\n". - var_exp($_REQUEST); -$mymail->setBody($msg); + var_export($_REQUEST,true); +$mymail->setTxtBody($msg); $mymail->send(); ?> diff --git a/htdocs/pattecassee.php b/htdocs/pattecassee.php index faded5f..132f36f 100644 --- a/htdocs/pattecassee.php +++ b/htdocs/pattecassee.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: pattecassee.php,v 1.9 2004-09-05 12:54:18 x2000habouzit Exp $ + $Id: pattecassee.php,v 1.10 2004-11-16 20:36:10 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -67,9 +67,12 @@ consulter la page . A bientôt sur Polytechnique.org ! L'équipe d'administration "; - require_once("diogenes.mailer.inc.php"); - $mail = new DiogenesMailer('Polytechnique.org ', $dest, "Une de tes adresse de redirection Polytechnique.org ne marche plus !!", false); - $mail->setBody($message); + require_once("diogenes.hermes.inc.php"); + $mail = new HermesMailer(); + $mail->setFrom('Polytechnique.org '); + $mail->addTo("<$dest@polytechnique.org>"); + $mail->setSubject("Une de tes adresse de redirection Polytechnique.org ne marche plus !!"); + $mail->setTxtBody($message); $mail->send(); $page->assign('erreur', "Mail envoyé ! :o)"); } diff --git a/htdocs/recovery.php b/htdocs/recovery.php index eaaf267..7aa9ad8 100644 --- a/htdocs/recovery.php +++ b/htdocs/recovery.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: recovery.php,v 1.5 2004-09-22 18:11:00 x2000coic Exp $ + $Id: recovery.php,v 1.6 2004-11-16 20:36:10 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -70,11 +70,12 @@ if (isset($_REQUEST['login']) and isset($_REQUEST['birth'])) { mysql_free_result($result); $emails = implode(',', $emails); - require("diogenes.mailer.inc.php"); - $mymail = new DiogenesMailer('Gestion des mots de passe ', - $emails, 'Ton certificat d\'authentification', false); - - $mymail->setBody("Visite la page suivante qui expire dans six heures : + require("diogenes.hermes.inc.php"); + $mymail = new HermesMailer(); + $mymail->setFrom('\"Gestion des mots de passe\" '); + $mymail->addTo($emails); + $mymail->setSubject('Ton certificat d\'authentification'); + $mymail->setTxtBody("Visite la page suivante qui expire dans six heures : $baseurl/tmpPWD.php?certificat=$url Si en cliquant dessus tu n'y arrives pas, copie intégralement l'adresse dans la barre de ton navigateur. diff --git a/htdocs/sendmail.php b/htdocs/sendmail.php index f91c124..6482193 100644 --- a/htdocs/sendmail.php +++ b/htdocs/sendmail.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: sendmail.php,v 1.7 2004-11-13 14:16:16 x2000habouzit Exp $ + $Id: sendmail.php,v 1.8 2004-11-16 20:36:10 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -41,17 +41,20 @@ if (isset($_REQUEST['submit']) and $_REQUEST['submit'] == 'Envoyer' $_REQUEST['bcc'] = stripslashes($_REQUEST['bcc']); $autre_to = stripslashes($autre_to); } - + if ($_REQUEST['to'] == '' and $_REQUEST['cc'] == '' and $autre_to == '') { $page->assign('error',"Indique au moins un destinataire."); } else { - require("diogenes.mailer.inc.php"); - $FROM = "From: {$_REQUEST['from']}"; + require("diogenes.hermes.inc.php"); //$_REQUEST['contenu'] = chunk_split($_REQUEST['contenu'], 76, "\n"); // pas bon, ne tient pas compte des mots - $dest = $_REQUEST['to'].', '.$autre_to; - $mymail = new DiogenesMailer($_SESSION['forlife'], $dest, $_REQUEST['sujet'], false, $_REQUEST['cc'], $_REQUEST['bcc']); - $mymail->addHeader($FROM); - $mymail->setBody(wordwrap($_REQUEST['contenu'],72,"\n")); + $dest = $_REQUEST['to'].', '.$autre_to; + $mymail = new HermesMailer(); + $mymail->setFrom($_REQUEST['from']); + $mymail->addTo($dest); + $mymail->setSubject($_REQUEST['sujet']); + if (!empty($_REQUEST['cc'])) $mymail->addCc($_REQUEST['cc']); + if (!empty($_REQUEST['bcc'])) $mymail->addBcc($_REQUEST['bcc']); + $mymail->setTxtBody(wordwrap($_REQUEST['contenu'],72,"\n")); if ($mymail->send()) { $page->assign('error',"Ton mail a bien été envoyé."); $_REQUEST = array(); diff --git a/include/auto.prepend.inc.php b/include/auto.prepend.inc.php index dfbce06..5a5be81 100644 --- a/include/auto.prepend.inc.php +++ b/include/auto.prepend.inc.php @@ -18,9 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: auto.prepend.inc.php,v 1.30 2004-11-16 19:46:14 x2000habouzit Exp $ + $Id: auto.prepend.inc.php,v 1.31 2004-11-16 20:36:12 x2000habouzit Exp $ ***************************************************************************/ +ini_set('include_path',"/home/x2000habouzit/dev/diogenes/lib/:/usr/share/php:".ini_get('include_path')); + function microtime_float() { list($usec, $sec) = explode(" ", microtime()); diff --git a/scripts/cron/cron_validations.php b/scripts/cron/cron_validations.php index 5ba417c..f180270 100755 --- a/scripts/cron/cron_validations.php +++ b/scripts/cron/cron_validations.php @@ -19,18 +19,18 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: cron_validations.php,v 1.3 2004-10-09 15:16:27 x2000habouzit Exp $ + $Id: cron_validations.php,v 1.4 2004-11-16 20:39:08 x2000habouzit Exp $ ***************************************************************************/ /* vim: set sw=4 ts=4 sts=4 tw=100: * vérifie qu'il n'y a pas de validations en cours, et maile si c'est le cas * - * $Id: cron_validations.php,v 1.3 2004-10-09 15:16:27 x2000habouzit Exp $ + * $Id: cron_validations.php,v 1.4 2004-11-16 20:39:08 x2000habouzit Exp $ */ $M_PERIOD = "INTERVAL 3 HOUR"; // période d'envoi des mails de 3h $R_PERIOD = "INTERVAL 6 HOUR"; // période de réponse moyenne de 6h -require("/usr/share/php/diogenes/diogenes.mailer.inc.php"); +require("/usr/share/php/diogenes/diogenes.hermes.inc.php"); require('./connect.db.inc.php'); $sql = mysql_query("SELECT count(stamp), sum(stamp < NOW() - $M_PERIOD), sum(stamp < NOW() - $R_PERIOD) FROM x4dat.requests"); @@ -40,10 +40,10 @@ mysql_free_result($sql); if(empty($nb)) exit; -$mymail = new DiogenesMailer('validation@polytechnique.org', - "validation@polytechnique.org", - (empty($nbveryold)?"":"[urgent] ")."il y a $nb validations non effectuées", - false, ""); +$mymail = new HermesMailer(); +$mymail->setFrom('validation@polytechnique.org'); +$mymail->addTo("validation@polytechnique.org"); +$mymail->setSubject((empty($nbveryold)?"":"[urgent] ")."il y a $nb validations non effectuées"); $message = "il y a $nb validation à effectuer \n" @@ -53,6 +53,6 @@ $message = ."https://www.polytechnique.org/admin/valider.php\n"; $message = wordwrap($message,78); -$mymail->setBody($message); +$mymail->setTxtBody($message); $mymail->send(); ?> diff --git a/scripts/cron/send_notifs.php b/scripts/cron/send_notifs.php index 83caa3a..ec65f0f 100755 --- a/scripts/cron/send_notifs.php +++ b/scripts/cron/send_notifs.php @@ -19,12 +19,12 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: send_notifs.php,v 1.1 2004-11-07 14:30:32 x2000habouzit Exp $ + $Id: send_notifs.php,v 1.2 2004-11-16 20:39:08 x2000habouzit Exp $ ***************************************************************************/ require('./connect.db.inc.php'); require("../../include/notifs.inc.php"); -require("diogenes.mailer.inc.php"); +require("diogenes.hermes.inc.php"); require("diogenes.misc.inc.php"); $all = new AllNotifs(); @@ -52,10 +52,11 @@ foreach($all->_data as $u) { . "-- \n" . "L'équipe de Polytechnique.org"; - $mailer = new DiogenesMailer("Carnet Polytechnicien ", - replace_accent("{$u['prenom']} {$u['nom']} <{$u['forlife']}@polytechnique.org>"), - "Notifications de la semaine ".date("W - Y")); - $mailer->setBody($text); + $mailer = new HermesMailer(); + $mailer->setFrom("Carnet Polytechnicien "); + $mailer->addTo("{$u['prenom']} {$u['nom']} <{$u['forlife']}@polytechnique.org>"); + $mailer->setSubject("Notifications de la semaine ".date("W - Y")); + $mailer->setTxtBody($text); $mailer->send(); } diff --git a/templates/sendmail.tpl b/templates/sendmail.tpl index b5e6b46..1d3b880 100644 --- a/templates/sendmail.tpl +++ b/templates/sendmail.tpl @@ -17,7 +17,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: sendmail.tpl,v 1.13 2004-11-13 15:56:35 x2000habouzit Exp $ + $Id: sendmail.tpl,v 1.14 2004-11-16 20:36:13 x2000habouzit Exp $ ***************************************************************************} @@ -31,10 +31,7 @@
  • - Les destinataires sont simplement séparés par des espaces ou des virgules -
    • -
  • - Pour les destinataires en polytechnique.org, le domaine n'est pas nécessaire + Les destinataires sont simplement séparés par des virgules
  • Pense à te mettre en copie cachée du mail sinon tu n'auras aucun moyen de retrouver @@ -85,7 +82,7 @@ copie cachée : - +