Revert "Fixes group aliases display."

[platal.git] / include / emails.inc.php

diff --git a/include/emails.inc.php b/include/emails.inc.php
index aac9a25..6abdede 100644 (file)
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -140,7 +140,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, 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\')
@@ -176,14 +177,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 +191,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
@@ -326,7 +348,8 @@ class Bogo
         $this->user = &$user;
         $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\'',
+                                    WHERE  uid = {?} AND (type = \'smtp\' OR type = \'googleapps\') AND flags = \'active\'
+                                 GROUP BY  uid',
                                   $user->id());
         if ($res['redirect_count'] == 0) {
             return;