X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Femails.inc.php;h=4fdbacf7e9bea5e1ec3b1580c64797c08f5d819c;hb=c67b874fd8d442bfded35295a819e7ce11a2d6dc;hp=4b40e0dd7ffe719cada1599b14e89da1e5f6aa99;hpb=1605f171418842df3135d9331d607203e5899c99;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index 4b40e0d..4fdbacf 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); } @@ -74,18 +77,18 @@ function isvalid_email_redirection($email) !preg_match("/@(polytechnique\.(org|edu)|melix\.(org|net)|m4x\.org)$/", $email); } -// function idsFromMails() {{{1 -/** Converts an array of emails to an array of email => uid - * @param $emails : array of emails - * @return array of ($email => $uid) - */ -function idsFromMails($emails) +// 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(); - /* Find type of email address */ + + // 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; @@ -96,64 +99,64 @@ function idsFromMails($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; } } $uids = array(); - /* domain users */ + + // Look up user ids for addresses in domain + $alias_uids = array(); if (count($domain_mails)) { - $domain_users = array(); - foreach (array_keys($domain_mails) as $user) { - $domain_users[] = XDB::escape($user); - } - $list = implode(',', $domain_users); - $res = XDB::query("SELECT alias, id - FROM aliases - WHERE alias IN ($list)"); + $res = XDB::query("SELECT alias, uid + FROM aliases + 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) { + $uids[$email] = $domain_uids[$user]; + } - /* Alias users */ + // 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 - 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)"); + $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 {?}", 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) { + $uids[$email] = $alias_uids[$user]; + } - /* Other mails */ + // Look up user ids for other addresses in the email redirection list if (count($other_mails)) { - $other_users = array(); - foreach (array_keys($other_mails) as $user) { - $other_users[] = XDB::escape($user); + $lowerupper = array(); + foreach ($other_mails as $mail) { + $lowerupper[strtolower($mail)] = $mail; } - $list = implode(',', $other_users); $res = XDB::query("SELECT email, uid - FROM emails - WHERE email IN ($list)"); + FROM emails + WHERE email IN {?}", $other_mails); foreach ($res->fetchAllRow() as $row) { list ($email, $uid) = $row; - $uids[$other_mails[$email]] = $uid; + $uids[$lowerupper[strtolower($email)]] = $uid; } } @@ -385,18 +388,18 @@ 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.