Adapts marketting processing to new mail chain.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/marketing.php b/modules/marketing.php
index ea6ee2f..822b7ae 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -174,9 +174,9 @@ class MarketingModule extends PLModule
 
         // Retrieves and display the existing marketing attempts.
         $res = XDB::iterator(
-                "SELECT  r.*, a.alias
-                   FROM  register_marketing AS r
-              LEFT JOIN  aliases            AS a ON (r.sender = a.uid AND a.type = 'a_vie')
+                "SELECT  r.*, s.email AS alias
+                   FROM  register_marketing   AS r
+              LEFT JOIN  email_source_account AS s ON (r.sender = s.uid AND s.type = 'forlife')
                   WHERE  r.uid = {?}
                ORDER BY  date", $user->id());
         $page->assign('addr', $res);
@@ -206,15 +206,14 @@ class MarketingModule extends PLModule
             pl_redirect('emails/redirect');
         }
 
-        $res = XDB::query('SELECT  p.deathdate IS NULL AS alive, e.last,
-                                   IF(e.email IS NOT NULL, e.email,
-                                         IF(FIND_IN_SET(\'googleapps\', eo.storage), \'googleapps\', NULL)) AS email
-                             FROM  email_options AS eo
-                        LEFT JOIN  account_profiles AS ap ON (ap.uid = eo.uid AND FIND_IN_SET(\'owner\', ap.perms))
-                        LEFT JOIN  profiles AS p ON (p.pid = ap.pid)
-                        LEFT JOIN  emails        AS e ON (e.flags = \'active\' AND e.uid = eo.uid)
-                            WHERE  eo.uid = {?}
-                         ORDER BY  e.panne_level, e.last', $user->id());
+        $res = XDB::query('SELECT  p.deathdate IS NULL AS alive, r.last, IF(r.type = \'googleapps\', \'googleapps\', r.redirect) AS active_email
+                             FROM  accounts               AS a
+                        LEFT JOIN  email_redirect_account AS r  ON (a.uid = r.uid AND r.type IN (\'smtp\', \'googleapps\') AND r.flags = \'active\')
+                        LEFT JOIN  account_profiles       AS ap ON (ap.uid = r.uid AND FIND_IN_SET(\'owner\', ap.perms))
+                        LEFT JOIN  profiles               AS p  ON (p.pid = ap.pid)
+                            WHERE  a.uid = {?}
+                         ORDER BY  r.broken_level, r.last',
+                          $user->id());
         if (!$res->numRows()) {
             return PL_NOT_FOUND;
         }
@@ -231,15 +230,15 @@ class MarketingModule extends PLModule
 
             // security stuff
             check_email($email, "Proposition d'une adresse surveillee pour " . $user->login() . " par " . S::user()->login());
-            $res = XDB::query("SELECT  flags
-                                 FROM  emails
-                                WHERE  email = {?} AND uid = {?}", $email, $user->id());
-            $state = $res->numRows() ? $res->fetchOneCell() : null;
-            if ($state == 'panne') {
+            $state = XDB::fetchOneCell('SELECT  flags
+                                          FROM  email_redirect_account
+                                         WHERE  redirect = {?} AND uid = {?}',
+                                       $email, $user->id());
+            if ($state == 'broken') {
                 $page->trigWarning("L'adresse que tu as fournie est l'adresse actuelle de {$user->fullName()} et est en panne.");
             } elseif ($state == 'active') {
                 $page->trigWarning("L'adresse que tu as fournie est l'adresse actuelle de {$user->fullName()}");
-            } elseif ($user->email && !trim(Post::v('comment'))) {
+            } elseif ($user->email && !Post::t('comment')) {
                 $page->trigError("Il faut que tu ajoutes un commentaire à ta proposition pour justifier le "
                                . "besoin de changer la redirection de {$user->fullName()}.");
             } else {
@@ -248,7 +247,7 @@ class MarketingModule extends PLModule
                 $page->assign('sent', true);
             }
         } elseif ($email) {
-            $page->trigError("L'adresse proposée n'est pas une adresse acceptable pour une redirection");
+            $page->trigError("L'adresse proposée n'est pas une adresse acceptable pour une redirection.");
         }
     }
 
@@ -353,11 +352,11 @@ class MarketingModule extends PLModule
 
 
         if (!is_null($promo)) {
-            $it = XDB::iterator('SELECT  m.uid, m.email, s.alias AS forlife
+            $it = XDB::iterator('SELECT  m.uid, m.email, s.email AS forlife
                                    FROM  register_marketing AS m
                              INNER JOIN  account_profiles AS ap ON (m.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms))
                              INNER JOIN  profile_display AS pd ON (pd.pid = ap.pid)
-                              LEFT JOIN  aliases AS s ON (m.sender = s.uid AND s.type = \'a_vie\')
+                              LEFT JOIN  email_source_account AS s ON (m.sender = s.uid AND s.type = \'forlife\')
                                   WHERE  pd.promo = {?}
                                ORDER BY  pd.sort_name', $promo);
             $page->assign('addr', $it);

diff --git a/templates/marketing/broken.tpl b/templates/marketing/broken.tpl
index c100a05..25ddb6b 100644 (file)
--- a/templates/marketing/broken.tpl
+++ b/templates/marketing/broken.tpl
@@ -39,7 +39,7 @@
   Recherche d'adresses pour {$user->fullName("promo")}.
 </h1>
 
-{if !$user->email}
+{if !$user->active_email}
 <p>
   Avec le temps, toutes les adresses de redirection de notre camarade sont devenues invalides et produisent
   des erreurs lorsqu'on lui envoie un email. Nous sommes donc à la recherche d'adresses valides où nous pourrions
@@ -77,7 +77,7 @@
         <input type="text" name="mail" size="30" maxlength="255" value="{$smarty.post.mail}" />
       </td>
     </tr>
-    {if $user->email}
+    {if $user->active_email}
     <tr class="impair">
       <td>Explication&nbsp;:</td>
       <td><textarea name="comment" cols="50" rows="4">{$smarty.post.comment}</textarea></td>