X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=b06df66cbe620d23c04b01ecb17155fc3b2c81c6;hb=2ebe2e686a87338a11602f70ef60851ab5399c81;hp=be0b6fd8b5f3001a88df51925a2ddf89bea633f4;hpb=2925df1bd6cb08c1f29822019fcb82e59f63f8a3;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index be0b6fd..b06df66 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ id()); if ($res->fetchOneCell()) { return; } XDB::execute("UPDATE aliases SET flags=CONCAT(flags,',','bestalias') - WHERE id={?} AND type!='homonyme' + WHERE uid={?} 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 @@ -55,40 +55,137 @@ function valide_email($str) $em = trim(rtrim($str)); $em = str_replace('<', '', $em); $em = str_replace('>', '', $em); + if (strpos($em, '@') === false) { + return; + } list($ident, $dom) = explode('@', $em); - if ($dom == $globals->mail->domain or $dom == $globals->mail->domain2) { + if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) { list($ident1) = explode('_', $ident); list($ident) = explode('+', $ident1); } 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); +} + +// function ids_from_mails() {{{1 +// Converts an array of emails to an array of email => uid +function ids_from_mails(array $emails) +{ + global $globals; + $domain_mails = array(); + $alias_mails = array(); + $other_mails = array(); + + // Determine the type of the email adresses. It can eiher be a domain + // email (@polytechnique.org), an alias email (@melix.net) or any other + // email (potentially used as a redirection by one user) + foreach ($emails as $email) { + if (strpos($email, '@') === false) { + $user = $email; + $domain = $globals->mail->domain2; + } else { + list($user, $domain) = explode('@', $email); + } + if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) { + list($user) = explode('+', $user); + list($user) = explode('_', $user); + $alias_mails[$user] = $email; + } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { + list($user) = explode('+', $user); + list($user) = explode('_', $user); + $domain_mails[$user] = $email; + } else { + $other_mails[] = $email; + } + } + $uids = array(); + + // Look up user ids for addresses in domain + if (count($domain_mails)) { + $domain_users = array_map(array('XDB', 'escape'), array_keys($domain_mails)); + $list = implode(',', $domain_users); + $res = XDB::query("SELECT alias, uid + FROM aliases + WHERE alias IN ($list)"); + foreach ($res->fetchAllRow() as $row) { + list ($alias, $id) = $row; + $uids[$domain_mails[$alias]] = $id; + } + } + + // Look up user ids for addresses in our alias domain + if (count($alias_mails)) { + $alias_users = array(); + foreach (array_keys($alias_mails) as $user) { + $alias_users[] = XDB::escape($user."@".$globals->mail->alias_dom); + } + $list = implode(',', $alias_users); + $res = XDB::query("SELECT v.alias, a.uid + FROM virtual AS v + INNER JOIN virtual_redirect AS r USING(vid) + INNER JOIN aliases AS a ON (a.type = 'a_vie' + AND r.redirect = CONCAT(a.alias, '@{$globals->mail->domain2}')) + WHERE v.alias IN ($list)"); + foreach ($res->fetchAllRow() as $row) { + list ($alias, $id) = $row; + $uids[$alias_mails[$alias]] = $id; + } + } + + // Look up user ids for other addresses in the email redirection list + if (count($other_mails)) { + $other_users = array_map(array('XDB', 'escape'), $other_mails); + $list = implode(',', $other_users); + $res = XDB::query("SELECT email, uid + FROM emails + WHERE email IN ($list)"); + foreach ($res->fetchAllRow() as $row) { + list ($email, $uid) = $row; + $uids[$email] = $uid; + } + } + + return $uids; +} + // 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()); } } @@ -97,8 +194,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 @@ -115,7 +212,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. @@ -129,6 +226,8 @@ abstract class Email public $broken; public $disabled; public $rewrite; + public $allow_rewrite; + public $hash; // Redirection bounces stats. public $panne; @@ -163,12 +262,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'); @@ -183,8 +282,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); - S::logger()->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; } @@ -196,8 +295,8 @@ class EmailRedirection extends Email { if ($this->active) { XDB::execute("UPDATE emails SET flags ='' - WHERE uid={?} AND email={?}", $this->uid, $this->email); - S::logger()->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; } } @@ -212,8 +311,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; } @@ -221,7 +336,7 @@ class EmailRedirection extends Email public function clean_errors() { - if (!S::has_perms()) { + if (!S::admin()) { return false; } $this->panne = 0; @@ -230,7 +345,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 @@ -268,22 +383,22 @@ class EmailStorage extends Email // Retrieves the current list of actives storages. private function get_storages() { - $res = XDB::query("SELECT mail_storage - FROM auth_user_md5 - WHERE user_id = {?}", $this->uid); - return new PlFlagSet($res->fetchOneCell()); + return new PlFlagSet(XDB::fetchOneCell('SELECT storage + FROM email_options + WHERE uid = {?}', + $this->user->id())); } // Updates the list of active storages. private function set_storages($storages) { - XDB::execute("UPDATE auth_user_md5 - SET mail_storage = {?} - WHERE user_id = {?}", $storages, $this->uid); + XDB::execute("UPDATE email_options + SET storage = {?} + WHERE uid = {?}", $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(); @@ -291,13 +406,13 @@ 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'; } // IMAP storage is always visible to administrators, and is allowed for // everyone when the service is marked as 'active'. - if ($globals->mailstorage->imap_active || S::has_perms()) { + if ($globals->mailstorage->imap_active || S::admin()) { $storages[] = 'imap'; } @@ -305,9 +420,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); @@ -362,30 +477,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); } } @@ -408,8 +523,8 @@ class Redirect if (!$this->other_active($email)) { return ERROR_INACTIVE_REDIRECTION; } - XDB::execute('DELETE FROM emails WHERE uid={?} AND email={?}', $this->uid, $email); - S::logger()->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]); @@ -430,19 +545,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 - S::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; } @@ -522,7 +637,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; @@ -538,7 +653,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; @@ -602,7 +717,7 @@ class Redirect public function get_uid() { - return $this->uid; + return $this->user->id(); } }