X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=a68f1f0384d8f21e6bf55b935263db33a52a5442;hb=82af3fc3b6e003b0cbbcf4faf4ed4f0ea5c07570;hp=e6ae4492f7c68dc2cf4795d6c00ad013dc5de5d8;hpb=5b2c99878fc75a6acffb2239e284f2cb1782142c;p=platal.git

diff --git a/include/emails.inc.php b/include/emails.inc.php
index e6ae449..a68f1f0 100644
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -27,11 +27,11 @@ define("ERROR_LOOP_EMAIL", 4);
 // function fix_bestalias() {{{1
 // Checks for an existing 'bestalias' among the the current user's aliases, and
 // eventually selects a new bestalias when required.
-function fix_bestalias(User &$user)
+function fix_bestalias(User $user)
 {
     $res = XDB::query("SELECT  COUNT(*)
                          FROM  aliases
-                        WHERE  id = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'",
+                        WHERE  uid = {?} AND FIND_IN_SET('bestalias', flags) AND type != 'homonyme'",
                       $user->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,6 +77,97 @@ function isvalid_email_redirection($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[$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[$email] = $user;
+        } else {
+            $other_mails[] = $email;
+        }
+    }
+    $uids = array();
+
+    // Look up user ids for addresses in domain
+    $alias_uids = array();
+    if (count($domain_mails)) {
+        $res = XDB::query("SELECT   alias, uid
+                             FROM   aliases
+                            WHERE   alias IN {?}", array_unique($domain_mails));
+        foreach ($res->fetchAllRow() as $row) {
+            list ($alias, $id) = $row;
+            $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)) {
+        $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;
+            $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)) {
+        $lowerupper = array();
+        foreach ($other_mails as $mail) {
+            $lowerupper[strtolower($mail)] = $mail;
+        }
+        $res = XDB::query("SELECT   email, uid
+                             FROM   emails
+                            WHERE   email IN {?}", $other_mails);
+        foreach ($res->fetchAllRow() as $row) {
+            list ($email, $uid) = $row;
+            $uids[$lowerupper[strtolower($email)]] = $uid;
+        }
+    }
+
+    return $uids;
+}
+
 // class Bogo {{{1
 // The Bogo class represents a spam filtering level in plat/al architecture.
 class Bogo
@@ -86,7 +180,7 @@ class Bogo
 
     // constructor {{{2
 
-    public function __construct(User &$user)
+    public function __construct(User $user)
     {
         if (!$user) {
             return;
@@ -178,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;
@@ -252,7 +346,7 @@ class EmailRedirection extends Email
 
     public function clean_errors()
     {
-        if (!S::has_perms()) {
+        if (!S::admin()) {
             return false;
         }
         $this->panne       = 0;
@@ -314,7 +408,7 @@ class EmailStorage extends Email
     }
 
     // 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();
@@ -328,7 +422,7 @@ class EmailStorage extends Email
 
         // 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';
         }
 
@@ -336,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;
@@ -400,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);
@@ -461,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()})" : ""));
         }
@@ -553,7 +650,7 @@ class Redirect
     {
         XDB::execute("UPDATE  emails
                          SET  flags = 'disable'
-                       WHERE  flags = 'active' AND uid = {?}", $this->user->id);
+                       WHERE  flags = 'active' AND uid = {?}", $this->user->id());
         foreach ($this->emails as &$mail) {
             if ($mail->active && $mail->has_disable()) {
                 $mail->disabled = true;
@@ -569,7 +666,7 @@ class Redirect
     {
         XDB::execute("UPDATE  emails
                          SET  flags = 'active'
-                       WHERE  flags = 'disable' AND uid = {?}", $this->user->id);
+                       WHERE  flags = 'disable' AND uid = {?}", $this->user->id());
         foreach ($this->emails as &$mail) {
             if ($mail->disabled) {
                 $mail->active   = true;