X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=a15bb3ae43a6045cd69be856021bfe827242b554;hb=145006c0ff77fa8a329616c2c8859191b2b236f7;hp=c85191fe55519bcbdd5733d24e762cea595a211b;hpb=ca6d07f4ee62840ba1bbb9d232c585b44027dd32;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index c85191f..a15bb3a 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ numRows()) { + if (!$uid) { + return; + } + $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid); + if ($res->numRows()) { $this->state = $res->fetchOneCell(); - } else { - $this->state = 'tag_and_drop_spams'; - $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags) - VALUES ({?},'tag_and_drop_spams','','0000-00-00','filter')", $uid); - } + } else { + $this->state = 'tag_and_drop_spams'; + $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags) + VALUES ({?},'tag_and_drop_spams','','0000-00-00','filter')", $uid); + } } - // }}} - // {{{ function change() + // public function change() {{{2 - function change($uid, $state) + public function change($uid, $state) { - $this->state = is_int($state) ? $this->_states[$state] : $state; - XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"', - $this->state, $uid); + $this->state = is_int($state) ? $this->_states[$state] : $state; + XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"', + $this->state, $uid); } - // }}} - // {{{ function level() + // pubic function level() {{{2 - function level() - { return array_search($this->state, $this->_states); } - - // }}} + public function level() + { + return array_search($this->state, $this->_states); + } } -// }}} -// {{{ class Email +// class Email {{{1 class Email { - // {{{ properties - - var $email; - var $active; - var $broken; - var $rewrite; - var $panne; - var $last; - var $panne_level; - - // }}} - // {{{ constructor - - function Email($row) + // properties {{{2 + + public $email; + public $active; + public $broken; + public $disabled; + public $rewrite; + public $panne; + public $last; + public $panne_level; + + // constructor {{{2 + + public function __construct($row) { list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row; - $this->active = ($flags == 'active'); - $this->broken = ($flags == 'panne'); + $this->active = ($flags == 'active'); + $this->broken = ($flags == 'panne'); + $this->disabled = ($flags == 'disable'); } - // }}} - // {{{ function activate() + // public function activate() {{{2 - function activate($uid) + public function activate($uid) { if (!$this->active) { XDB::execute("UPDATE emails SET panne_level = IF(flags = 'panne', panne_level - 1, panne_level), flags = 'active' WHERE uid={?} AND email={?}", $uid, $this->email); - $_SESSION['log']->log("email_on", $this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "")); + $_SESSION['log']->log("email_on", $this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "")); $this->active = true; $this->broken = false; } } - // }}} - // {{{ function deactivate() + // public function deactivate() {{{2 - function deactivate($uid) + public function deactivate($uid) { 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)" : "") ); + WHERE uid={?} AND email={?}", $uid, $this->email); + $_SESSION['log']->log("email_off",$this->email.($uid!=S::v('uid') ? "(admin on $uid)" : "") ); $this->active = false; } } - - // }}} - // {{{ function rewrite() - function rewrite($rew, $uid) + // public function rewrite() {{{2 + + public 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; + if (!$rew || !isvalid_email($rew)) { + $rew = ''; + } + XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rew, $uid, $this->email); + $this->rewrite = $rew; + return; } - // }}} + // function cleanErrors() {{{2 + + public function cleanErrors($uid) + { + if (!S::has_perms()) { + return false; + } + $this->panne = 0; + $this->panne_level = 0; + $this->last = 0; + return XDB::execute("UPDATE emails + SET panne_level = 0, panne = 0, last = 0 + WHERE uid = {?} AND email = {?}", + $uid, $this->email); + } } -// }}} -// {{{ class Redirect +// class Redirect {{{1 class Redirect { - // {{{ properties - - var $flag_active = 'active'; - var $emails; - var $bogo; - var $uid; + // properties {{{2 + + private $flag_active = 'active'; + private $uid; + + public $emails; + public $bogo; - // }}} - // {{{ function Redirect() + // constructor {{{2 - function Redirect($_uid) + public function __construct($_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(); + $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(); while ($row = $res->next()) { - $this->emails[] = new Email($row); + $this->emails[] = new Email($row); } - $this->bogo = new Bogo($_uid); + $this->bogo = new Bogo($_uid); } - // }}} - // {{{ function other_active() + // public function other_active() {{{2 - function other_active($email) + public function other_active($email) { foreach ($this->emails as $mail) { if ($mail->email!=$email && $mail->active) { @@ -217,28 +224,27 @@ class Redirect return false; } - // }}} - // {{{ function delete_email() + // public function delete_email() {{{2 - function delete_email($email) + public function delete_email($email) { if (!$this->other_active($email)) { return ERROR_INACTIVE_REDIRECTION; } 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]); } - } + } + check_redirect($this); return SUCCESS; } - // }}} - // {{{ function add_email() - - function add_email($email) + // public function add_email() {{{2 + + public function add_email($email) { $email_stripped = strtolower(trim($email)); if (!isvalid_email($email_stripped)) { @@ -248,69 +254,162 @@ 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')); + } + $this->emails[] = new Email(array($email, 'active', '', '0000-00-00', '0000-00-00', 0)); // 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(); - } + check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->uid); + check_redirect($this); return SUCCESS; } - // }}} - // {{{ function modify_email() + // public function modify_email() {{{2 - function modify_email($emails_actifs,$emails_rewrite) + public function modify_email($emails_actifs, $emails_rewrite) { - foreach ($this->emails as $i=>$mail) { - if (in_array($mail->email,$emails_actifs)) { - $this->emails[$i]->activate($this->uid); - } else { - $this->emails[$i]->deactivate($this->uid); - } - $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $this->uid); + foreach ($this->emails as &$mail) { + if (in_array($mail->email, $emails_actifs)) { + $mail->activate($this->uid); + } else { + $mail->deactivate($this->uid); + } + $mail->rewrite($emails_rewrite[$mail->email], $this->uid); } + check_redirect($this); } - function modify_one_email($email, $activate) { + // public function modify_one_email() {{{2 + + public function modify_one_email($email, $activate) + { + $allinactive = true; + $thisone = false; foreach ($this->emails as $i=>$mail) { if ($mail->email == $email) { - if ($activate) - $this->emails[$i]->activate($this->uid); - else - $this->emails[$i]->deactivate($this->uid); + $thisone = $i; } + $allinactive &= !$mail->active || $mail->email == $email; + } + if ($thisone === false) { + return ERROR_INVALID_EMAIL; + } + if ($allinactive || $activate) { + $this->emails[$thisone]->activate($this->uid); + } else { + $this->emails[$thisone]->deactivate($this->uid); + } + check_redirect($this); + if ($allinactive && !$activate) { + return ERROR_INACTIVE_REDIRECTION; + } else { + return SUCCESS; } } - // }}} -} + // public function modify_one_email_redirect() {{{2 + + public function modify_one_email_redirect($email, $redirect) + { + foreach ($this->emails as &$mail) { + if ($mail->email == $email) { + $mail->rewrite($redirect, $this->uid); + check_redirect($this); + return; + } + } + } + + // function cleanErrors() {{{2 + + public function cleanErrors($email) + { + foreach ($this->emails as &$mail) { + if ($mail->email == $email) { + check_redirect($this); + return $mail->cleanErrors($this->uid); + } + } + return false; + } + + // function disable() {{{2 + + public function disable() + { + XDB::execute("UPDATE emails + SET flags = 'disable' + WHERE flags = 'active' AND uid = {?}", $this->uid); + foreach ($this->emails as &$mail) { + if ($mail->active) { + $mail->disabled = true; + $mail->active = false; + } + } + check_redirect($this); + } + + // function enable() {{{2 -// }}} + public function enable() + { + XDB::execute("UPDATE emails + SET flags = 'active' + WHERE flags = 'disable' AND uid = {?}", $this->uid); + foreach ($this->emails as &$mail) { + if ($mail->disabled) { + $mail->active = true; + $mail->disabled = false; + } + check_redirect($this); + } + } + + // function get_broken_mx() {{{2 + + public function get_broken_mx() + { + $res = XDB::query("SELECT host, text, state + FROM mx_watch + WHERE state != 'ok'"); + if (!$res->numRows()) { + return array(); + } + $mxs = $res->fetchAllAssoc(); + $mails = array(); + foreach ($this->emails as &$mail) { + if ($mail->active) { + list(,$domain) = explode('@', $mail->email); + getmxrr($domain, $lcl_mxs); + if (empty($lcl_mxs)) { + $lcl_mxs = array($domain); + } + $broken = false; + $state = false; + foreach ($mxs as &$mx) { + foreach ($lcl_mxs as $lcl) { + if (fnmatch($mx['host'], $lcl)) { + $broken = $mx['text']; + $state = $mx['state']; + break; + } + } + if ($broken) { + $mails[] = array('mail' => $mail->email, 'text' => $broken, 'state' => $state); + break; + } + } + } + } + return $mails; + } +} -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>