X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=2597086000cff0029cf72aa6bf18b837f2f239b9;hb=baa62e58cdfb6839040e156ef91e2827bdde1600;hp=f954b23c0d059878c73b2395a949364004ed6849;hpb=ccdbc270a4d0e98d88c1d7a29e8cb3c5f260bcef;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index f954b23..2597086 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -21,15 +21,12 @@ require_once("xorg.misc.inc.php"); -// {{{ defines - define("SUCCESS", 1); define("ERROR_INACTIVE_REDIRECTION", 2); define("ERROR_INVALID_EMAIL", 3); define("ERROR_LOOP_EMAIL", 4); -// }}} -// {{{ function fix_bestalias() +// function fix_bestalias() {{{1 function fix_bestalias($uid) { @@ -38,14 +35,13 @@ function fix_bestalias($uid) 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); } -// }}} -// {{{ function valide_email() +// function valide_email() {{{1 function valide_email($str) { @@ -62,27 +58,25 @@ function valide_email($str) return $ident . '@' . $dom; } -// }}} -// {{{ class Bogo +// class Bogo {{{1 class Bogo { - // {{{ properties + // properties {{{2 - 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 + // constructor {{{2 - function Bogo($uid) + public function __construct($uid) { if (!$uid) { return; } $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid); if ($res->numRows()) { - $this->state = $res->fetchOneCell(); + $this->state = $res->fetchOneCell(); } else { $this->state = 'tag_and_drop_spams'; $res = XDB::query("INSERT INTO emails (uid,email,rewrite,panne,flags) @@ -90,116 +84,127 @@ class Bogo } } - // }}} - // {{{ 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() - - function level() - { return array_search($this->state, $this->_states); } + // pubic function level() {{{2 - // }}} + 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); + 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) { 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 - // }}} - // {{{ function Redirect() + private $flag_active = 'active'; + private $uid; - function Redirect($_uid) + public $emails; + public $bogo; + + // constructor {{{2 + + 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); + $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); @@ -207,10 +212,9 @@ class Redirect $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) { @@ -220,10 +224,9 @@ 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; @@ -239,10 +242,9 @@ class Redirect 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)) { @@ -263,28 +265,29 @@ class Redirect $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_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); + foreach ($this->emails as &$mail) { + if (in_array($mail->email, $emails_actifs)) { + $mail->activate($this->uid); } else { - $this->emails[$i]->deactivate($this->uid); + $mail->deactivate($this->uid); } - $this->emails[$i]->rewrite($emails_rewrite[$mail->email], $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; @@ -307,36 +310,75 @@ class Redirect return ERROR_INACTIVE_REDIRECTION; } else { return SUCCESS; - } + } } - function modify_one_email_redirect($email, $redirect) { - foreach ($this->emails as $i=>$mail) { - if ($mail->email == $email) { - $this->emails[$i]->rewrite($redirect, $this->uid); + // 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 get_broken_mx() + } + } + } - function get_broken_mx() + // function cleanErrors() {{{2 + + public function cleanErrors($email) { - $res = XDB::iterRow("SELECT host, text - FROM mx_watch - WHERE state != 'ok'"); - if (!$res->total()) { - return array(); + foreach ($this->emails as &$mail) { + if ($mail->email == $email) { + 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; + } } - $mxs = array(); - while (list($host, $text) = $res->next()) { - $host = preg_quote($host, '/'); - $host = str_replace('\*', '.*', $host); - $host = str_replace('\?', '.', $host); - $mxs[] = array('host' => "/^$host\\.?$/", 'text' => $text); + } + + // 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; + } + } + } + + // function get_broken_mx() {{{2 + + 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) { @@ -348,24 +390,21 @@ class Redirect $broken = false; foreach ($mxs as &$mx) { foreach ($lcl_mxs as $lcl) { - if (preg_match($mx['host'], $lcl)) { + if (fnmatch($mx['host'], $lcl)) { $broken = $mx['text']; break; } } if ($broken) { $mails[] = array('mail' => $mail->email, 'text' => $broken); + 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: ?>