X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=a68f1f0384d8f21e6bf55b935263db33a52a5442;hb=82af3fc3b6e003b0cbbcf4faf4ed4f0ea5c07570;hp=d6e885f11b6c705ca30caf85541bda0e48022c33;hpb=f0b77ba6ee05dd28da60dc8b299fdd4a9fdca8bd;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index d6e885f..a68f1f0 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ id()); if ($res->fetchOneCell()) { return; @@ -39,7 +39,7 @@ function fix_bestalias(User &$user) 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", $user->id()); } @@ -55,8 +55,11 @@ 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); } @@ -96,11 +99,11 @@ function ids_from_mails(array $emails) if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) { list($user) = explode('+', $user); list($user) = explode('_', $user); - $alias_mails[$user] = $email; + $alias_mails[$email] = $user . "@" . $globals->mail->alias_dom; } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { list($user) = explode('+', $user); list($user) = explode('_', $user); - $domain_mails[$user] = $email; + $domain_mails[$email] = $user; } else { $other_mails[] = $email; } @@ -108,47 +111,57 @@ function ids_from_mails(array $emails) $uids = array(); // Look up user ids for addresses in domain + $alias_uids = array(); if (count($domain_mails)) { - $domain_users = array_map(array('XDB', 'escape'), array_keys($domain_mails)); - $list = implode(',', $domain_users); - $res = XDB::query("SELECT alias, id + $res = XDB::query("SELECT alias, uid FROM aliases - WHERE alias IN ($list)"); + WHERE alias IN {?}", array_unique($domain_mails)); foreach ($res->fetchAllRow() as $row) { list ($alias, $id) = $row; - $uids[$domain_mails[$alias]] = $id; + $domain_uids[$alias] = $id; + } + } + // Connect emails with uids + foreach ($domain_mails as $email => $user) { + // Some 'domain' emails might be invalid. + if (array_key_exists($user, $domain_uids)) { + $uids[$email] = $domain_uids[$user]; } } // Look up user ids for addresses in our alias domain + $alias_uids = array(); 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.id + $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)"); + WHERE v.alias IN {?}", array_unique($alias_mails)); foreach ($res->fetchAllRow() as $row) { list ($alias, $id) = $row; - $uids[$alias_mails[$alias]] = $id; + $alias_uids[$alias] = $id; + } + } + // Connect emails with uids + foreach ($alias_mails as $email => $user) { + if (array_key_exists($user, $alias_uids)) { + $uids[$email] = $alias_uids[$user]; } } // 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); + $lowerupper = array(); + foreach ($other_mails as $mail) { + $lowerupper[strtolower($mail)] = $mail; + } $res = XDB::query("SELECT email, uid FROM emails - WHERE email IN ($list)"); + WHERE email IN {?}", $other_mails); foreach ($res->fetchAllRow() as $row) { list ($email, $uid) = $row; - $uids[$other_mails[$email]] = $uid; + $uids[$lowerupper[strtolower($email)]] = $uid; } } @@ -167,7 +180,7 @@ class Bogo // constructor {{{2 - public function __construct(User &$user) + public function __construct(User $user) { if (!$user) { return; @@ -259,7 +272,7 @@ class EmailRedirection extends Email { // constructor {{{2 - public function __construct(User &$user, $row) + public function __construct(User $user, $row) { $this->user = &$user; $this->sufficient = true; @@ -380,22 +393,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->user->id()); - 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->user->id()); + 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(User &$user) + static public function get_allowed_storages(User $user) { global $globals; $storages = array(); @@ -417,7 +430,7 @@ class EmailStorage extends Email } - public function __construct(User &$user, $name) + public function __construct(User $user, $name) { $this->user = &$user; $this->email = $name; @@ -481,7 +494,7 @@ class Redirect // constructor {{{2 - public function __construct(User &$user) + public function __construct(User $user) { $this->user = &$user; $this->bogo = new Bogo($user); @@ -542,7 +555,10 @@ class Redirect if (!isvalid_email_redirection($email_stripped)) { return ERROR_LOOP_EMAIL; } - XDB::execute('REPLACE INTO emails (uid,email,flags) VALUES({?},{?},"active")', $this->user->id(), $email); + // 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 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->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : "")); }