X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=106b6a156573e4ec39e7ec194da66cf1683745b7;hb=56c6950a11572152c5893a5c7542c0e0246cb50d;hp=b853b0375b3c3e5ebd1f974a47f941819fd43063;hpb=08cce2ff528b38bde27cdec6d6bc28d6af4a42d4;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index b853b03..106b6a1 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ fetchOneCell()) { return; } XDB::execute("UPDATE aliases - SET flags=CONCAT(flags,',','bestalias') - WHERE id={?} AND type!='homonyme' - ORDER BY !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias) - LIMIT 1", $uid); + SET flags=CONCAT(flags,',','bestalias') + WHERE id={?} AND type!='homonyme' + ORDER BY !FIND_IN_SET('usage',flags),alias LIKE '%.%', LENGTH(alias) + LIMIT 1", $uid); } // }}} @@ -50,15 +49,17 @@ function fix_bestalias($uid) function valide_email($str) { - $em = trim(rtrim($str)); - $em = str_replace('<', '', $em); - $em = str_replace('>', '', $em); - list($ident, $dom) = explode('@', $em); - if ($dom == $globals->mail->domain or $dom == $globals->mail->domain2) { - list($ident1) = explode('_', $ident); - list($ident) = explode('+', $ident1); - } - return $ident . '@' . $dom; + global $globals; + + $em = trim(rtrim($str)); + $em = str_replace('<', '', $em); + $em = str_replace('>', '', $em); + list($ident, $dom) = explode('@', $em); + if ($dom == $globals->mail->domain or $dom == $globals->mail->domain2) { + list($ident1) = explode('_', $ident); + list($ident) = explode('+', $ident1); + } + return $ident . '@' . $dom; } // }}} @@ -67,41 +68,45 @@ function valide_email($str) class Bogo { // {{{ properties - - var $state; - var $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); + + private $state; + private $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); // }}} // {{{ constructor - - function Bogo($uid) + + public function __construct($uid) { - global $globals; - $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid); - if ($res->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() - function change($uid, $state) + public function change($uid, $state) { - global $globals; - $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() - function level() - { return array_search($this->state, $this->_states); } + public function level() + { + return array_search($this->state, $this->_states); + } // }}} } @@ -112,60 +117,68 @@ class Bogo class Email { // {{{ properties - - var $email; - var $active; - var $rewrite; - var $panne; + + public $email; + public $active; + public $broken; + public $rewrite; + public $panne; + public $last; + public $panne_level; // }}} // {{{ constructor - function Email($row) + public function __construct($row) { - list($this->email, $this->active, $this->rewrite, $this->panne) = $row; + list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row; + $this->active = ($flags == 'active'); + $this->broken = ($flags == 'panne'); } // }}} // {{{ function activate() - function activate($uid) + public function activate($uid) { - global $globals; if (!$this->active) { - XDB::execute("UPDATE emails SET flags = 'active' - WHERE uid={?} AND email={?}", $uid, $this->email); - $_SESSION['log']->log("email_on", $this->email.($uid!=Session::getInt('uid') ? "(admin on $uid)" : "")); + 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)" : "")); $this->active = true; + $this->broken = false; } } // }}} // {{{ function deactivate() - function deactivate($uid) + public function deactivate($uid) { - global $globals; if ($this->active) { XDB::execute("UPDATE emails SET flags ='' - WHERE uid={?} AND email={?}", $uid, $this->email); - $_SESSION['log']->log("email_off",$this->email.($uid!=Session::getInt('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($rew, $uid) { - global $globals; - 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; } // }}} @@ -177,33 +190,33 @@ class Email class Redirect { // {{{ properties - - var $flag_active = 'active'; - var $emails; - var $bogo; - var $uid; + + private $flag_active = 'active'; + private $uid; + + public $emails; + public $bogo; // }}} // {{{ function Redirect() - function Redirect($_uid) + public function __construct($_uid) { - global $globals; - $this->uid=$_uid; - $res = XDB::iterRow(" - SELECT email, flags='active', rewrite, panne - 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() - function other_active($email) + public function other_active($email) { foreach ($this->emails as $mail) { if ($mail->email!=$email && $mail->active) { @@ -216,28 +229,27 @@ class Redirect // }}} // {{{ function delete_email() - function delete_email($email) + public function delete_email($email) { - global $globals; 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!=Session::getInt('uid') ? " (admin on {$this->uid})" : "")); - foreach ($this->emails as $i=>$mail) { - if ($email==$mail->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) { unset($this->emails[$i]); } - } + } + check_redirect($this); return SUCCESS; } // }}} // {{{ function add_email() - - function add_email($email) + + public function add_email($email) { - global $globals; $email_stripped = strtolower(trim($email)); if (!isvalid_email($email_stripped)) { return ERROR_INVALID_EMAIL; @@ -246,43 +258,109 @@ class Redirect return ERROR_LOOP_EMAIL; } XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email); - if ($logger = Session::getMixed('log', null)) { // may be absent --> step4.php - $logger->log('email_add',$email.($this->uid!=Session::getInt('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 + check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->uid); + check_redirect($this); return SUCCESS; } // }}} // {{{ function modify_email() - function modify_email($emails_actifs,$emails_rewrite) + public function modify_email($emails_actifs, $emails_rewrite) { - global $globals; - 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); + } + check_redirect($this); + } + + public function modify_one_email($email, $activate) + { + $allinactive = true; + $thisone = false; + foreach ($this->emails as $i=>$mail) { + if ($mail->email == $email) { + $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; + } } - function modify_one_email($email, $activate) { + public function modify_one_email_redirect($email, $redirect) + { 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); + $this->emails[$i]->rewrite($redirect, $this->uid); + check_redirect($this); + return; + } + } + } + // }}} + // {{{ function get_broken_mx() + + public function get_broken_mx() + { + $res = XDB::query("SELECT host, text + 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; + foreach ($mxs as &$mx) { + foreach ($lcl_mxs as $lcl) { + if (fnmatch($mx['host'], $lcl)) { + $broken = $mx['text']; + break; + } + } + if ($broken) { + $mails[] = array('mail' => $mail->email, 'text' => $broken); + } + } } } + return $mails; } // }}} @@ -290,5 +368,5 @@ class Redirect // }}} -// 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: ?>