X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=f2f12e034154cc731ff0d8609e66abd65966b21a;hb=3424387cde6c635ff16c3b5459c4caa88bb76e2e;hp=35621e2745f341f99405209c8ee792024d56b575;hpb=aca54585dcd431240a0286adf6007b1ceb5a672a;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index 35621e2..f2f12e0 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ checkPerms(User::PERM_MAIL) && $new_email != strtolower($user->email); + if ($new_email && $is_new) { + $already = XDB::fetchOneCell('SELECT hruid + FROM accounts + WHERE email = {?} AND uid != {?}', + $new_email, $user->id()); + if ($already) { + Platal::page()->trigError("L'email ne peut pas être utilisé pour ce compte car il correspond déjà au compte : " + . $already . ". Si l'utilisateur courant et cette personne ne sont en fait qu'une " + . "seul et même personne, ou en cas de problème, contacter : contact@polytechnique.org"); + return false; + } + } + return $is_new; +} + +function format_email_alias($email) +{ + if ($user = User::getSilent($email)) { + return $user->forlifeEmail(); + } + if (isvalid_email($email)) { + return $email; + } + return null; +} + +function add_to_list_alias($email, $local_part, $domain, $type = 'alias') +{ + $email = format_email_alias($email); + if (is_null($email)) { + return false; + } XDB::execute('INSERT IGNORE INTO email_virtual (email, domain, redirect, type) SELECT {?}, id, {?}, {?} FROM email_virtual_domains WHERE name = {?}', - $local_part, $user->forlifeEmail(), $type, $domain); + $local_part, $email, $type, $domain); + return true; } -function delete_from_list_alias(User $user, $local_part, $domain, $type = 'user') +function delete_from_list_alias($email, $local_part, $domain, $type = 'alias') { - Platal::assert($user !== null); + $email = format_email_alias($email); + if (is_null($email)) { + return false; + } XDB::execute('DELETE v FROM email_virtual AS v INNER JOIN email_virtual_domains AS m ON (v.domain = m.id) INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) WHERE v.email = {?} AND d.name = {?} AND v.redirect = {?} AND type = {?}', - $local_part, $domain, $user->forlifeEmail(), $type); + $local_part, $domain, $email, $type); + return true; } -function update_list_alias(User $user, $former_email, $local_part, $domain, $type = 'user') +function update_list_alias($email, $former_email, $local_part, $domain, $type = 'alias') { - Platal::assert($user !== null); + $email = format_email_alias($email); + if (is_null($email)) { + return false; + } XDB::execute('UPDATE email_virtual AS v INNER JOIN email_virtual_domains AS d ON (v.domain = d.id) SET v.redirect = {?} WHERE v.redirect = {?} AND d.name = {?} AND v.email = {?} AND v.type = {?}', - $user->forlifeEmail(), $former_email, $domain, $local_part, $type); + $email, $former_email, $domain, $local_part, $type); + return true; +} + +// Updates an email in all aliases (groups and events). +function update_alias_user($former_email, $new_email) +{ + XDB::execute('UPDATE email_virtual + SET redirect = {?} + WHERE redirect = {?} AND (type = \'alias\' OR type = \'event\')', + $new_email, $former_email); } function list_alias_members($local_part, $domain) @@ -64,15 +118,23 @@ function list_alias_members($local_part, $domain) FROM email_virtual AS v INNER JOIN email_virtual_domains AS m ON (v.domain = m.id) INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) - WHERE v.email = {?} AND d.name = {?} AND type = \'user\'', + WHERE v.email = {?} AND d.name = {?} AND type = \'alias\'', $local_part, $domain); - $members = array(); + $users = array(); + $nonusers = array(); foreach ($emails as $email) { - $members[] = User::getSilent($email); + if ($user = User::getSilent($email)) { + $users[] = $user; + } else { + $nonusers[] = $email; + } } - return $members; + return array( + 'users' => $users, + 'nonusers' => $nonusers + ); } function delete_list_alias($local_part, $domain) @@ -81,7 +143,7 @@ function delete_list_alias($local_part, $domain) FROM email_virtual AS v INNER JOIN email_virtual_domains AS m ON (v.domain = m.id) INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) - WHERE v.email = {?} AND d.name = {?} AND type = \'user\'', + WHERE v.email = {?} AND d.name = {?} AND type = \'alias\'', $local_part, $domain); } @@ -90,7 +152,7 @@ function iterate_list_alias($domain) return XDB::fetchColumn('SELECT CONCAT(v.email, \'@\', m.name) FROM email_virtual AS v INNER JOIN email_virtual_domains AS m ON (v.domain = m.id) - WHERE m.name = {?} AND v.type = \'user\' + WHERE m.name = {?} AND v.type = \'alias\' GROUP BY v.email', $domain); } @@ -116,8 +178,8 @@ function delete_list($local_part, $domain) $redirect = $domain . '_' . $local_part . '+'; foreach(array('post', 'owner', 'admin', 'bounces', 'unsubscribe') as $suffix) { - XDB::execute('DELETE email_virtual - WHERE redirect = {?} AND type = \'list\'', + XDB::execute('DELETE FROM email_virtual + WHERE redirect = {?} AND type = \'list\'', $redirect . $suffix . '@' . $globals->lists->redirect_domain); } } @@ -140,7 +202,8 @@ function mark_broken_email($email, $admin = false) return; } - $user = XDB::fetchOneAssoc('SELECT r1.uid, r1.broken_level != 0 AS broken, a.hruid, COUNT(r2.uid) AS nb_mails, a.full_name, s.email AS alias + $user = XDB::fetchOneAssoc('SELECT r1.uid, a.hruid, a.full_name, r1.broken_level != 0 AS broken, COUNT(r2.uid) AS nb_mails, + s.email AS alias, DATE_ADD(r1.last, INTERVAL 14 DAY) < CURDATE() as notify FROM email_redirect_account AS r1 INNER JOIN accounts AS a ON (a.uid = r1.uid) INNER JOIN email_source_account AS s ON (a.uid = s.uid AND s.flags = \'bestalias\') @@ -158,7 +221,7 @@ function mark_broken_email($email, $admin = false) WHERE redirect = {?}', $email); } elseif ($admin) { XDB::execute('UPDATE email_redirect_account - SET last = CURDATE(), broken_level = IF(broken_level > 1, 3, 2) + SET last = CURDATE(), broken_level = broken_level + 1 WHERE redirect = {?} AND DATE_ADD(last, INTERVAL 14 DAY) < CURDATE()', $email); } else { @@ -176,14 +239,13 @@ function mark_broken_email($email, $admin = false) // eventually selects a new bestalias when required. function fix_bestalias(User $user) { - $count = XDB::fetchOneCell('SELECT COUNT(*) - FROM email_source_account - WHERE uid = {?} AND FIND_IN_SET(\'bestalias\', flags) AND expire IS NULL', - $user->id()); + // First check if the bestalias is properly set. + $alias_count = XDB::fetchOneCell('SELECT COUNT(*) + FROM email_source_account + WHERE uid = {?} AND FIND_IN_SET(\'bestalias\', flags) AND expire IS NULL', + $user->id()); - if ($count == 1) { - return; - } elseif ($count > 1) { + if ($alias_count > 1) { // If too many bestaliases, delete the bestalias flag from all this // user's emails (this should never happen). XDB::execute("UPDATE email_source_account @@ -191,15 +253,37 @@ function fix_bestalias(User $user) WHERE uid = {?}", $user->id()); } + if ($alias_count != 1) { + // If no bestalias is selected, we choose the shortest email which is not + // related to a usage name and contains a '.'. + XDB::execute("UPDATE email_source_account + SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') + WHERE uid = {?} AND expire IS NULL + ORDER BY NOT FIND_IN_SET('usage', flags), email LIKE '%.%', LENGTH(email) + LIMIT 1", + $user->id()); + } + + // First check if best_domain is properly set. + $domain_count = XDB::fetchOneCell('SELECT COUNT(*) + FROM accounts AS a + INNER JOIN email_source_account AS s ON (s.uid = a.uid AND FIND_IN_SET(\'bestalias\', s.flags)) + INNER JOIN email_virtual_domains AS d ON (d.id = a.best_domain) + INNER JOIN email_virtual_domains AS m ON (d.aliasing = m.id) + INNER JOIN email_virtual_domains AS v ON (v.aliasing = m.id AND v.id = s.domain) + WHERE a.uid = {?} AND (m.name = {?} OR m.name = {?})', + $user->id(), $user->mainEmailDomain(), Platal::globals()->mail->alias_dom); + + if ($domain_count == 0) { + XDB::execute('UPDATE accounts AS a + INNER JOIN email_source_account AS s ON (s.uid = a.uid AND FIND_IN_SET(\'bestalias\', s.flags)) + INNER JOIN email_virtual_domains AS d ON (d.aliasing = s.domain AND (d.name = {?} OR d.name = {?})) + SET a.best_domain = d.id + WHERE a.uid = {?}', + $user->mainEmailDomain(), Platal::globals()->mail->alias_dom, $user->id()); + } + - // If no bestalias is selected, we choose the shortest email which is not - // related to a usage name and contains a '.'. - XDB::execute("UPDATE email_source_account - SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') - WHERE uid = {?} AND expire IS NULL - ORDER BY NOT FIND_IN_SET('usage', flags), email LIKE '%.%', LENGTH(email) - LIMIT 1", - $user->id()); } // function valide_email() {{{1 @@ -217,7 +301,7 @@ function valide_email($str) return; } list($ident, $dom) = explode('@', $em); - if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) { + if (User::isMainMailDomain($dom)) { list($ident1) = explode('_', $ident); list($ident) = explode('+', $ident1); } @@ -227,12 +311,17 @@ function valide_email($str) // function isvalid_email_redirection() {{{1 /** Checks if an email is a suitable redirection. * @param $email the email to check + * @param $user the user asking for the redirection * @return BOOL */ -function isvalid_email_redirection($email) +function isvalid_email_redirection($email, User $user) { - return isvalid_email($email) && - !preg_match("/@(polytechnique\.(org|edu)|melix\.(org|net)|m4x\.org)$/", $email); + $valid = isvalid_email($email) && User::isForeignEmailAddress($email); + if (!$user->hasProfile() || ($user->profile()->grad_year > date('Y') - 3)) { + return $valid && !preg_match("/@polytechnique\.edu$/", $email); + } else { + return $valid; + } } // function ids_from_mails() {{{1 @@ -240,37 +329,43 @@ function isvalid_email_redirection($email) // given email when we found a matching user. function ids_from_mails(array $emails) { - global $globals; - // Removes duplicates, if any. $emails = array_unique($emails); // Formats and splits by domain type (locally managed or external) emails. - $domain_emails = array(); - $other_emails = array(); + $main_domain_emails = array(); + $aux_domain_emails = array(); + $other_emails = array(); 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 - || $domain == $globals->mail->domain || $domain == $globals->mail->domain2) { - list($user) = explode('+', $user); - list($user) = explode('_', $user); - $domain_emails[$email] = strtolower($user . '@' . $domain); + $main_domain_emails[] = $email; } else { - $other_emails[$email] = strtolower($user . '@' . $domain); + if (User::isForeignEmailAddress($email)) { + $other_emails[$email] = strtolower($user . '@' . $domain); + } else { + list($local_part, $domain) = explode('@', $email); + list($local_part) = explode('+', $local_part); + list($local_part) = explode('_', $local_part); + if (User::isMainMailDomain($domain)) { + $main_domain_emails[$email] = strtolower($local_part); + } elseif (User::isAliasMailDomain($domain)) { + $aux_domain_emails[$email] = strtolower($local_part); + } + } } } // Retrieves emails from our domains. - $domain_uids = XDB::fetchAllAssoc('email', - 'SELECT email, uid - FROM email_source_account - WHERE email IN {?}', - array_unique($domain_emails)); + $main_domain_uids = XDB::fetchAllAssoc('email', + 'SELECT email, uid + FROM email_source_account + WHERE email IN {?} AND type != \'alias_aux\'', + array_unique($main_domain_emails)); + $aux_domain_uids = XDB::fetchAllAssoc('email', + 'SELECT email, uid + FROM email_source_account + WHERE email IN {?} AND type = \'alias_aux\'', + array_unique($aux_domain_emails)); // Retrieves emails from redirections. $other_uids = XDB::fetchAllAssoc('redirect', @@ -281,25 +376,39 @@ function ids_from_mails(array $emails) // Associates given emails with the corresponding uid. $uids = array(); - foreach (array_merge($domain_emails, $other_emails) as $email => $canonical_email) { - if (array_key_exists($canonical_email, $domain_uids)) { - $uids[$email] = $domain_uids[$canonical_email]; - } elseif (array_key_exists($canonical_email, $other_uids)) { - $uids[$email] = $other_uids[$canonical_email]; - } + foreach ($main_domain_emails as $email => $key) { + $uids[$email] = $main_domain_uids[$key]; + } + foreach ($aux_domain_emails as $email => $key) { + $uids[$email] = $aux_domain_uids[$key]; + } + foreach ($other_emails as $email => $key) { + $uids[$email] = $other_uids[$key]; } - return $uids; + return array_unique($uids); } // class Bogo {{{1 // The Bogo class represents a spam filtering level in plat/al architecture. class Bogo { - private static $states = array('let_spams', 'tag_spams', 'tag_and_drop_spams', 'drop_spams'); + const MAIN_DEFAULT = 'default'; + const IMAP_DEFAULT = 'let_spams'; + + public static $states = array( + 0 => 'default', + 1 => 'let_spams', + 2 => 'tag_spams', + 3 => 'tag_and_drop_spams', + 4 => 'drop_spams' + ); private $user; - private $state; + public $state; + public $single_state; + public $redirections; + public $single_redirection; public function __construct(User $user) { @@ -308,28 +417,52 @@ class Bogo } $this->user = &$user; - $res = XDB::query('SELECT action - FROM email_redirect_account - WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\')', - $user->id()); - if ($res->numRows() == 0) { + $res = XDB::fetchOneAssoc('SELECT COUNT(DISTINCT(action)) AS action_count, COUNT(redirect) AS redirect_count, action + FROM email_redirect_account + WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\') AND flags = \'active\' + GROUP BY uid', + $user->id()); + if ($res['redirect_count'] == 0) { return; } - $this->state = $res->fetchOneCell(); + + $this->single_redirection = ($res['redirect_count'] == 1); + $this->redirections = XDB::fetchAllAssoc('SELECT IF(type = \'googleapps\', type, redirect) AS redirect, type, action + FROM email_redirect_account + WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\') + ORDER BY type, redirect', + $user->id()); + + foreach ($this->redirections AS &$redirection) { + $redirection['filter'] = array_search($redirection['action'], self::$states); + } + if ($res['action_count'] == 1) { + $this->state = array_search($res['action'], self::$states); + $this->single_state = true; + } else { + $this->single_state = $this->state = false; + } } - public function change($state) + public function changeAll($state) { - $this->state = is_int($state) ? self::$states[$state] : $state; + Platal::assert($state >= 0 && $state < count(self::$states), 'Unknown antispam level.'); + + $this->state = $state; XDB::execute('UPDATE email_redirect_account SET action = {?} WHERE uid = {?} AND (type = \'smtp\' OR type = \'googleapps\')', - $this->state, $this->user->id()); + self::$states[$this->state], $this->user->id()); } - public function level() + public function change($redirection, $state) { - return array_search($this->state, self::$states); + Platal::assert($state >= 0 && $state < count(self::$states), 'Unknown antispam level.'); + + XDB::execute('UPDATE email_redirect_account + SET action = {?} + WHERE uid = {?} AND (type = {?} OR redirect = {?})', + self::$states[$state], $this->user->id(), $redirection, $redirection); } } @@ -355,12 +488,14 @@ class Email // Basic email properties; $sufficient indicates if the email can be used as // an unique redirection; $redirect contains the delivery email address. + public $id; public $type; public $sufficient; public $email; public $display_email; public $domain; public $action; + public $filter_level; // Redirection status properties. public $active; @@ -394,18 +529,30 @@ class Email $this->$status = ($status == $row['flags']); } $this->sufficient = ($this->type == 'smtp' || $this->type == 'googleapps'); + $this->filter_level = ($this->type == 'imap') ? null : array_search($this->action, Bogo::$states); + if (array_key_exists($this->type , self::$storage_domains)) { + $this->id = $this->type; + } else { + $this->id = str_replace(array('@', '.'), array('_at_', '_dot_'), $this->email); + } $this->user = &$user; } // Activates the email address as a redirection. public function activate() { - if ($this->inactive) { - XDB::execute('UPDATE email_redirect_account - SET broken_level = IF(flags = \'broken\', broken_level - 1, broken_level), flags = \'active\' - WHERE uid = {?} AND redirect = {?}', - $this->user->id(), $this->email); + if (!$this->active) { + if (in_array($this->type, self::get_allowed_storages($this->user))) { + self::activate_storage($this->user, $this->type, $this->action); + } else { + XDB::execute('UPDATE email_redirect_account + SET broken_level = IF(flags = \'broken\', broken_level - 1, broken_level), flags = \'active\' + WHERE uid = {?} AND redirect = {?}', + $this->user->id(), $this->email); + } S::logger()->log('email_on', $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : '')); + $this->disabled = false; + $this->broken = false; $this->inactive = false; $this->active = true; } @@ -415,10 +562,14 @@ class Email public function deactivate() { if ($this->active) { - XDB::execute('UPDATE email_redirect_account - SET flags = \'inactive\' - WHERE uid = {?} AND redirect = {?}', - $this->user->id(), $this->email); + if (in_array($this->type, self::get_allowed_storages($this->user))) { + self::deactivate_storage($this->user, $this->type); + } else { + XDB::execute('UPDATE email_redirect_account + SET flags = \'inactive\' + WHERE uid = {?} AND redirect = {?}', + $this->user->id(), $this->email); + } S::logger()->log('email_off', $this->email . ($this->user->id() != S::v('uid') ? "(admin on {$this->user->login()})" : "") ); $this->inactive = true; $this->active = false; @@ -504,14 +655,15 @@ class Email } // Returns the list of allowed storages for the @p user. - static private function get_allowed_storages(User $user) + static public function get_allowed_storages(User $user) { global $globals; $storages = array(); // Google Apps storage is available for users with valid Google Apps account. require_once 'googleapps.inc.php'; - if ($globals->mailstorage->googleapps_domain && + if ($user->checkPerms('gapps') && + $globals->mailstorage->googleapps_domain && GoogleAppsAccount::account_status($user->id()) == 'active') { $storages[] = 'googleapps'; } @@ -525,23 +677,33 @@ class Email return $storages; } - static public function activate_storage(User $user, $storage) + static public function make_storage_redirection(User $user, $storage) { - Platal::assert(in_array($storage, self::get_allowed_storages($user))); + return $user->hruid . '@' . self::$storage_domains[$storage] . '.' . Platal::globals()->mail->domain; + } - if (!self::is_active_storage($user, $storage)) { - global $globals; + static public function activate_storage(User $user, $storage, $action = null) + { + Platal::assert(in_array($storage, self::get_allowed_storages($user)), 'Unknown storage.'); - XDB::execute('INSERT INTO email_redirect_account (uid, type, redirect, flags) - VALUES ({?}, {?}, {?}, \'active\')', - $user->id(), $storage, - $user->hruid . '@' . self::$storage_domains[$storage] . '.' . $globals->mail->domain); + // We first need to retrieve the value for the antispam filter if not + // provided: it is either the user's redirections common value, or if + // they differ, our default value. + if (is_null($action)) { + $bogo = new Bogo($user); + $action = ($bogo->single_state ? Bogo::$states[$bogo->state] : Bogo::MAIN_DEFAULT); + } + + if (!self::is_active_storage($user, $storage)) { + XDB::execute('INSERT INTO email_redirect_account (uid, type, action, redirect, flags) + VALUES ({?}, {?}, {?}, {?}, \'active\')', + $user->id(), $storage, $action, self::make_storage_redirection($user, $storage)); } } static public function deactivate_storage(User $user, $storage) { - if (in_array($storage, self::$storage_domains)) { + if (in_array($storage, self::get_allowed_storages($user))) { XDB::execute('DELETE FROM email_redirect_account WHERE uid = {?} AND type = {?}', $user->id(), $storage); @@ -550,12 +712,12 @@ class Email static public function is_active_storage(User $user, $storage) { - if (!in_array($storage, self::$storage_domains)) { + if (!in_array($storage, self::get_allowed_storages($user))) { return false; } $res = XDB::fetchOneCell('SELECT COUNT(*) FROM email_redirect_account - WHERE uid = {?} AND type = {?} AND flags = \'active\')', + WHERE uid = {?} AND type = {?} AND flags = \'active\'', $user->id(), $storage); return !is_null($res) && $res > 0; } @@ -569,12 +731,10 @@ class Redirect private $user; public $emails; - public $bogo; public function __construct(User $user) { $this->user = &$user; - $this->bogo = new Bogo($user); // Adds third-party email redirections. $res = XDB::iterator('SELECT redirect, rewrite, type, action, broken_date, broken_level, last, flags, hash, allow_rewrite @@ -585,6 +745,30 @@ class Redirect while ($row = $res->next()) { $this->emails[] = new Email($user, $row); } + + if ($storages = Email::get_allowed_storages($user)) { + // We first need to retrieve the value for the antispam filter: it is + // either the user's redirections common value, or if they differ, our + // default value. + $bogo = new Bogo($user); + $filter = ($bogo->single_state ? Bogo::$states[$bogo->state] : Bogo::MAIN_DEFAULT); + + foreach ($storages as $storage) { + if (!Email::is_active_storage($user, $storage)) { + $this->emails[] = new Email($user, array( + 'redirect' => Email::make_storage_redirection($user, $storage), + 'rewrite' => '', + 'type' => $storage, + 'action' => $filter, + 'broken_date' => 0, + 'broken_level' => '0000-00-00', + 'last' => '0000-00-00', + 'flags' => 'inactive', + 'hash' => '', + 'allow_rewrite' => 0)); + } + } + } } public function other_active($email) @@ -612,6 +796,7 @@ class Redirect } } check_redirect($this); + $this->update_imap(); return SUCCESS; } @@ -621,13 +806,22 @@ class Redirect if (!isvalid_email($email_stripped)) { return ERROR_INVALID_EMAIL; } - if (!isvalid_email_redirection($email_stripped)) { + if (!isvalid_email_redirection($email_stripped, $this->user)) { return ERROR_LOOP_EMAIL; } + // We first need to retrieve the value for the antispam filter: it is + // either the user's redirections common value, or if they differ, our + // default value. + $bogo = new Bogo($this->user); + $filter = ($bogo->single_state ? Bogo::$states[$bogo->state] : Bogo::MAIN_DEFAULT); // If the email was already present for this user, we reset it to the default values, we thus use REPLACE INTO. - XDB::execute('REPLACE INTO email_redirect_account (uid, redirect, flags) - VALUES ({?}, {?}, \'active\')', - $this->user->id(), $email); + XDB::execute('REPLACE INTO email_redirect_account (uid, redirect, flags, action) + VALUES ({?}, {?}, \'active\', {?})', + $this->user->id(), $email, $filter); + // Replace this email by forlife email, if present in aliases and MLs. + $listClient = new MMList(S::user()); + $listClient->change_user_email($email, $this->user->forlifeEmail()); + update_alias_user($email, $this->user->forlifeEmail()); if ($logger = S::v('log', null)) { // may be absent --> step4.php S::logger()->log('email_add', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : "")); } @@ -640,7 +834,7 @@ class Redirect 'redirect' => $email, 'rewrite' => '', 'type' => 'smtp', - 'action' => 'default', + 'action' => $filter, 'broken_date' => '0000-00-00', 'broken_level' => 0, 'last' => '0000-00-00', @@ -652,6 +846,7 @@ class Redirect // security stuff check_email($email, "Ajout d'une adresse surveillée aux redirections de " . $this->user->login()); check_redirect($this); + $this->update_imap(); return SUCCESS; } @@ -666,6 +861,7 @@ class Redirect $email->set_rewrite($emails_rewrite[$email->email]); } check_redirect($this); + $this->update_imap(); return SUCCESS; } @@ -688,6 +884,7 @@ class Redirect $this->emails[$thisone]->deactivate(); } check_redirect($this); + $this->update_imap(); if ($allinactive && !$activate) { return ERROR_INACTIVE_REDIRECTION; } @@ -700,6 +897,7 @@ class Redirect if ($mail->email == $email) { $mail->set_rewrite($redirect); check_redirect($this); + $this->update_imap(); return; } } @@ -710,6 +908,7 @@ class Redirect foreach ($this->emails as &$mail) { if ($mail->email == $email) { check_redirect($this); + $this->update_imap(); return $mail->clean_errors(); } } @@ -728,6 +927,7 @@ class Redirect } } check_redirect($this); + $this->update_imap(); } public function enable() @@ -742,6 +942,7 @@ class Redirect } check_redirect($this); } + $this->update_imap(); } public function get_broken_mx() @@ -794,7 +995,23 @@ class Redirect { return $this->user->id(); } + + private function update_imap() + { + // Imaps must bounce if and only if the user has no active redirection. + if (!$this->other_active('')) { + XDB::execute('UPDATE email_redirect_account + SET action = \'imap_and_bounce\' + WHERE type = \'imap\' AND uid = {?}', + $this->user->id()); + } else { + XDB::execute('UPDATE email_redirect_account + SET action = \'let_spams\' + WHERE type = \'imap\' AND uid = {?}', + $this->user->id()); + } + } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>