From: x2003bruneau Date: Sat, 5 Aug 2006 19:44:38 +0000 (+0000) Subject: Send a mail to hotliners when somebody add a watched email in his redirections X-Git-Tag: xorg/0.9.11~136 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ca6d07f4ee62840ba1bbb9d232c585b44027dd32;hp=e9e9306b81a5493276c9e817cdcd083a1add72e7;p=platal.git Send a mail to hotliners when somebody add a watched email in his redirections Fix some bugs of the duplicated admin page git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@779 839d8a87-29fc-0310-9880-83ba4fa771e5 --- diff --git a/include/emails.inc.php b/include/emails.inc.php index 580d388..c85191f 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -155,7 +155,7 @@ class Email if ($this->active) { XDB::execute("UPDATE emails SET flags ='' WHERE uid={?} AND email={?}", $uid, $this->email); - $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") ); + $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") ); $this->active = false; } } @@ -165,12 +165,12 @@ class Email function rewrite($rew, $uid) { - if ($this->rewrite == $rew) { + if ($this->rewrite == $rew) { return; } - XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email); - $this->rewrite = $rew; - return; + XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email); + $this->rewrite = $rew; + return; } // }}} @@ -193,15 +193,15 @@ class Redirect function Redirect($_uid) { - $this->uid=$_uid; + $this->uid=$_uid; $res = XDB::iterRow(" - SELECT email, flags, rewrite, panne, last, panne_level - FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid); - $this->emails=Array(); + SELECT email, flags, rewrite, panne, last, panne_level + FROM emails WHERE uid = {?} AND flags != 'filter'", $_uid); + $this->emails=Array(); while ($row = $res->next()) { - $this->emails[] = new Email($row); + $this->emails[] = new Email($row); } - $this->bogo = new Bogo($_uid); + $this->bogo = new Bogo($_uid); } // }}} @@ -227,11 +227,11 @@ class Redirect } XDB::execute('DELETE FROM emails WHERE uid={?} AND email={?}', $this->uid, $email); $_SESSION['log']->log('email_del',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : "")); - foreach ($this->emails as $i=>$mail) { - if ($email==$mail->email) { + foreach ($this->emails as $i=>$mail) { + if ($email==$mail->email) { unset($this->emails[$i]); } - } + } return SUCCESS; } @@ -248,15 +248,36 @@ class Redirect return ERROR_LOOP_EMAIL; } XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email); - if ($logger = S::v('log', null)) { // may be absent --> step4.php - $logger->log('email_add',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : "")); + if ($logger = S::v('log', null)) { // may be absent --> step4.php + $logger->log('email_add',$email.($this->uid!=S::v('uid') ? " (admin on {$this->uid})" : "")); } - foreach ($this->emails as $mail) { - if ($mail->email == $email_stripped) { + foreach ($this->emails as $mail) { + if ($mail->email == $email_stripped) { return SUCCESS; } - } + } $this->emails[] = new Email(array($email,1,'','0000-00-00')); + + // security stuff + $res = XDB::query("SELECT state, description + FROM emails_watch + WHERE state != 'safe' AND email = {?}", $email); + if ($res->numRows()) { + $row = $res->fetchOneAssoc(); + $message = "L'email $email vient d'être ajouté aux redirections de ". S::v('forlife') + . ". Cette adresse est surveillée avec l'état *" . $row['state'] + . "* et la description :\n" . $row['description']; + $message = wordwrap($message); + require_once("diogenes/diogenes.hermes.inc.php"); + $mailer = new HermesMailer(); + $mailer->setFrom("webmaster@polytechnique.org"); + $mailer->addTo("hotliners@polytechnique.org"); + $mailer->setSubject("ALERTE LORS DE L'AJOUT DE REDIRECTION de " + . S::v('prenom') . ' ' . S::v('nom') . '(' . S::v('promo') . ')'); + $mailer->setTxtBody($message + . "\n\nInformations de connexion :\n" . var_export($_SERVER, true)); + $mailer->send(); + } return SUCCESS; } @@ -265,13 +286,13 @@ class Redirect function modify_email($emails_actifs,$emails_rewrite) { - foreach ($this->emails as $i=>$mail) { + foreach ($this->emails as $i=>$mail) { if (in_array($mail->email,$emails_actifs)) { $this->emails[$i]->activate($this->uid); - } else { + } else { $this->emails[$i]->deactivate($this->uid); - } - $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid); + } + $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid); } } diff --git a/modules/email.php b/modules/email.php index ef34aac..199e6c4 100644 --- a/modules/email.php +++ b/modules/email.php @@ -424,8 +424,8 @@ L' if ($action == 'list') { $sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife FROM emails_watch AS w - INNER JOIN emails AS e USING(email) - INNER JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie') + LEFT JOIN emails AS e USING(email) + LEFT JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie') ORDER BY w.state, w.email, a.alias"; $it = Xdb::iterRow($sql); @@ -452,9 +452,9 @@ L' $sql = "SELECT w.detection, w.state, w.last, w.description, a1.alias AS edit, a2.alias AS forlife FROM emails_watch AS w - INNER JOIN emails AS e USING(email) - LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie') - INNER JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie') + LEFT JOIN emails AS e USING(email) + INNER JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie') + LEFT JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie') WHERE w.email = {?} ORDER BY a2.alias"; $it = Xdb::iterRow($sql, $email); diff --git a/templates/emails/duplicated.tpl b/templates/emails/duplicated.tpl index 1ff4bd2..5ef0bb8 100644 --- a/templates/emails/duplicated.tpl +++ b/templates/emails/duplicated.tpl @@ -49,8 +49,10 @@ {foreach from=$doublon.users item=user name=all} + {if $user} {$user}{icon name=user_suit title="Fiche"} {icon name=wrench title="Administrer}{if !$smarty.foreach.all.last}
{/if} + {/if} {/foreach} @@ -79,6 +81,7 @@ {foreach from=$doublon.users key=i name=all item=user} + {if $user} {if $i is even}{/if} {$user}{icon name=user_suit title="Fiche"} @@ -86,6 +89,7 @@ {if $i is even && $smarty.foreach.all.last}{/if} {if $i is odd || $smarty.foreach.all.last}{/if} + {/if} {/foreach} Date de détection