X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=2d24ccdc7aa504cd85155fa1d89ab42ff4242d11;hb=ced003168bf3b75a29313c727fe28d65cb03057c;hp=7f4f17d699b1b953e48e124ba6df84970984ef06;hpb=77e786e1d93d7017e611c42b6b4541d9ae2fbdbc;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index 7f4f17d..2d24ccd 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ id()); if ($res->fetchOneCell()) { return; } @@ -43,7 +41,7 @@ function fix_bestalias($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); + LIMIT 1", $user->id()); } // function valide_email() {{{1 @@ -65,32 +63,45 @@ function valide_email($str) return $ident . '@' . $dom; } +// function isvalid_email_redirection() {{{1 +/** vérifie si une adresse email convient comme adresse de redirection + * @param $email l'adresse email a verifier + * @return BOOL + */ +function isvalid_email_redirection($email) +{ + return isvalid_email($email) && + !preg_match("/@(polytechnique\.(org|edu)|melix\.(org|net)|m4x\.org)$/", $email); +} + // class Bogo {{{1 // The Bogo class represents a spam filtering level in plat/al architecture. class Bogo { // properties {{{2 - private $uid; + private $user; private $state; private $_states = Array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); // constructor {{{2 - public function __construct($uid) + public function __construct(User &$user) { - if (!$uid) { + if (!$user) { return; } - $this->uid = $uid; - $res = XDB::query('SELECT email FROM emails WHERE uid={?} AND flags="filter"', $uid); + $this->user = &$user; + $res = XDB::query('SELECT email FROM emails WHERE uid = {?} AND flags = "filter"', $user->id()); 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); + $res = XDB::query( + "INSERT INTO emails (uid, email, rewrite, panne, flags) + VALUES ({?}, 'tag_and_drop_spams', '', '0000-00-00', 'filter')", + $user->id()); } } @@ -99,8 +110,8 @@ class Bogo public function change($state) { $this->state = is_int($state) ? $this->_states[$state] : $state; - XDB::execute('UPDATE emails SET email={?} WHERE uid={?} AND flags = "filter"', - $this->state, $this->uid); + XDB::execute('UPDATE emails SET email = {?} WHERE uid = {?} AND flags = "filter"', + $this->state, $this->user->id()); } // pubic function level() {{{2 @@ -117,7 +128,7 @@ class Bogo // Storage emails (Polytechnique.org). abstract class Email { - protected $uid; + protected $user; // Basic email properties; $sufficient indicates if the email can be used as // an unique redirection; $email contains the delivery email address. @@ -131,6 +142,8 @@ abstract class Email public $broken; public $disabled; public $rewrite; + public $allow_rewrite; + public $hash; // Redirection bounces stats. public $panne; @@ -165,12 +178,12 @@ class EmailRedirection extends Email { // constructor {{{2 - public function __construct($uid, $row) + public function __construct(User &$user, $row) { - $this->uid = $uid; + $this->user = &$user; $this->sufficient = true; - list($this->email, $flags, $this->rewrite, $this->panne, $this->last, $this->panne_level) = $row; + list($this->email, $flags, $this->rewrite, $this->allow_rewrite, $this->hash, $this->panne, $this->last, $this->panne_level) = $row; $this->display_email = $this->email; $this->active = ($flags == 'active'); $this->broken = ($flags == 'panne'); @@ -185,8 +198,8 @@ class EmailRedirection extends Email XDB::execute("UPDATE emails SET panne_level = IF(flags = 'panne', panne_level - 1, panne_level), flags = 'active' - WHERE uid={?} AND email={?}", $this->uid, $this->email); - $_SESSION['log']->log("email_on", $this->email.($this->uid!=S::v('uid') ? "(admin on {$this->uid})" : "")); + WHERE uid = {?} AND email = {?}", $this->user->id(), $this->email); + S::logger()->log("email_on", $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : "")); $this->active = true; $this->broken = false; } @@ -198,8 +211,8 @@ class EmailRedirection extends Email { if ($this->active) { XDB::execute("UPDATE emails SET flags ='' - WHERE uid={?} AND email={?}", $this->uid, $this->email); - $_SESSION['log']->log("email_off",$this->email.($this->uid != S::v('uid') ? "(admin on {$this->uid})" : "") ); + WHERE uid = {?} AND email = {?}", $this->user->id(), $this->email); + S::logger()->log("email_off", $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : "") ); $this->active = false; } } @@ -214,8 +227,24 @@ class EmailRedirection extends Email if (!$rewrite || !isvalid_email($rewrite)) { $rewrite = ''; } - XDB::execute('UPDATE emails SET rewrite={?} WHERE uid={?} AND email={?}', $rewrite, $this->uid, $this->email); + XDB::execute('UPDATE emails SET rewrite = {?} WHERE uid = {?} AND email = {?}', $rewrite, $this->user->id(), $this->email); $this->rewrite = $rewrite; + if (!$this->allow_rewrite) { + global $globals; + if (empty($this->hash)) { + $this->hash = rand_url_id(); + XDB::execute("UPDATE emails + SET hash = {?} + WHERE uid = {?} AND email = {?}", $this->hash, $this->user->id(), $this->email); + } + $mail = new PlMailer('emails/rewrite-in.mail.tpl'); + $mail->assign('mail', $this); + $mail->assign('user', $this->user); + $mail->assign('baseurl', $globals->baseurl); + $mail->assign('sitename', $globals->core->sitename); + $mail->assign('to', $this->email); + $mail->send($this->user->isEmailFormatHtml()); + } return; } @@ -232,7 +261,7 @@ class EmailRedirection extends Email return XDB::execute("UPDATE emails SET panne_level = 0, panne = 0, last = 0 WHERE uid = {?} AND email = {?}", - $this->uid, $this->email); + $this->user->id(), $this->email); } // public function has_rewrite() {{{2 @@ -272,8 +301,8 @@ class EmailStorage extends Email { $res = XDB::query("SELECT mail_storage FROM auth_user_md5 - WHERE user_id = {?}", $this->uid); - return new FlagSet($res->fetchOneCell()); + WHERE user_id = {?}", $this->user->id()); + return new PlFlagSet($res->fetchOneCell()); } // Updates the list of active storages. @@ -281,11 +310,11 @@ class EmailStorage extends Email { XDB::execute("UPDATE auth_user_md5 SET mail_storage = {?} - WHERE user_id = {?}", $storages, $this->uid); + WHERE user_id = {?}", $storages, $this->user->id()); } // Returns the list of allowed storages for the @p user. - static public function get_allowed_storages($uid) + static public function get_allowed_storages(User &$user) { global $globals; $storages = array(); @@ -293,7 +322,7 @@ class EmailStorage extends Email // Google Apps storage is available for users with valid Google Apps account. require_once 'googleapps.inc.php'; if ($globals->mailstorage->googleapps_domain && - GoogleAppsAccount::account_status($uid) == 'active') { + GoogleAppsAccount::account_status($user->id()) == 'active') { $storages[] = 'googleapps'; } @@ -307,9 +336,9 @@ class EmailStorage extends Email } - public function __construct($uid, $name) + public function __construct(User &$user, $name) { - $this->uid = $uid; + $this->user = &$user; $this->email = $name; $this->display_email = (isset($this->display_names[$name]) ? $this->display_names[$name] : $name); @@ -364,30 +393,30 @@ class Redirect // properties {{{2 private $flag_active = 'active'; - private $uid; + private $user; public $emails; public $bogo; // constructor {{{2 - public function __construct($_uid) + public function __construct(User &$user) { - $this->uid = $_uid; - $this->bogo = new Bogo($_uid); + $this->user = &$user; + $this->bogo = new Bogo($user); // Adds third-party email redirections. - $res = XDB::iterRow("SELECT email, flags, rewrite, panne, last, panne_level + $res = XDB::iterRow("SELECT email, flags, rewrite, allow_rewrite, hash, panne, last, panne_level FROM emails - WHERE uid = {?} AND flags != 'filter'", $_uid); + WHERE uid = {?} AND flags != 'filter'", $user->id()); $this->emails = Array(); while ($row = $res->next()) { - $this->emails[] = new EmailRedirection($_uid, $row); + $this->emails[] = new EmailRedirection($user, $row); } // Adds local email storage backends. - foreach (EmailStorage::get_allowed_storages($_uid) as $storage) { - $this->emails[] = new EmailStorage($_uid, $storage); + foreach (EmailStorage::get_allowed_storages($user) as $storage) { + $this->emails[] = new EmailStorage($user, $storage); } } @@ -410,8 +439,8 @@ class Redirect 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})" : "")); + XDB::execute('DELETE FROM emails WHERE uid = {?} AND email = {?}', $this->user->id(), $email); + S::logger()->log('email_del', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : "")); foreach ($this->emails as $i => $mail) { if ($email == $mail->email) { unset($this->emails[$i]); @@ -432,19 +461,19 @@ class Redirect if (!isvalid_email_redirection($email_stripped)) { return ERROR_LOOP_EMAIL; } - XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->uid, $email); + XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->user->id(), $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})" : "")); + S::logger()->log('email_add', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : "")); } foreach ($this->emails as $mail) { if ($mail->email == $email_stripped) { return SUCCESS; } } - $this->emails[] = new EmailRedirection($this->uid, array($email, 'active', '', '0000-00-00', '0000-00-00', 0)); + $this->emails[] = new EmailRedirection($this->user, array($email, 'active', '', 0, null, '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->user->login()); check_redirect($this); return SUCCESS; } @@ -524,7 +553,7 @@ class Redirect { XDB::execute("UPDATE emails SET flags = 'disable' - WHERE flags = 'active' AND uid = {?}", $this->uid); + WHERE flags = 'active' AND uid = {?}", $this->user->id); foreach ($this->emails as &$mail) { if ($mail->active && $mail->has_disable()) { $mail->disabled = true; @@ -540,7 +569,7 @@ class Redirect { XDB::execute("UPDATE emails SET flags = 'active' - WHERE flags = 'disable' AND uid = {?}", $this->uid); + WHERE flags = 'disable' AND uid = {?}", $this->user->id); foreach ($this->emails as &$mail) { if ($mail->disabled) { $mail->active = true; @@ -604,7 +633,7 @@ class Redirect public function get_uid() { - return $this->uid; + return $this->user->id(); } }