fixing date_ins on envoidirect and drop obsolete fields

- few syntax bugfixes
- registering dates on marketing/envoidirect.php didn't work
- remove usage of envoidirect.nom,.prenom,.promo since it's in auth_user_md5 now
- test of registering as a new user : OK
- maybe todo : fix non-execution of "DELETE" in envoidirect.php (non critical)
- Happy holidays, Merry Christmas & Happy New Year !
- bn :)

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-110

diff --git a/htdocs/inscription/step4.php b/htdocs/inscription/step4.php
index 8f27e9c..49d5cc0 100644 (file)
--- a/htdocs/inscription/step4.php
+++ b/htdocs/inscription/step4.php
@@ -34,7 +34,7 @@ if (!empty($_REQUEST['ref'])) {
 }
 
 //vérifions que la référence de l'utilisateur est 
-if (empty($_REQUEST['ref'] ||
+if (empty($_REQUEST['ref']) ||
         !list( $forlife, $alias, $matricule, $promo, $password, $nom, $prenom,$nationalite, 
         $email, $naissance,$date,$appli_id1,$appli_type1,$appli_id2,$appli_type2) = mysql_fetch_row($res))
 {

diff --git a/htdocs/marketing/envoidirect.php b/htdocs/marketing/envoidirect.php
index 90ca0ca..83ea697 100644 (file)
--- a/htdocs/marketing/envoidirect.php
+++ b/htdocs/marketing/envoidirect.php
@@ -24,19 +24,20 @@ new_admin_page('marketing/envoidirect.tpl');
 
 // effacement des inscrits il y a plus de 8 jours
 $globals->db->query("DELETE FROM envoidirect WHERE DATE_ADD(date_succes, INTERVAL 8 DAY) < CURRENT_DATE AND date_succes <> '0000-00-00'");
-$sql = "SELECT  a.date_ins,e.date_envoi,e.promo,e.nom,e.prenom,e.email,b.nom as sender
+$sql = "SELECT  e.date_succes,e.date_envoi,a.promo,a.nom,a.prenom,e.email,b.nom as sender
           FROM  envoidirect   AS e
     INNER JOIN  auth_user_md5 AS a ON e.matricule = a.matricule
-    LEFT  JOIN  auth_user_md5 AS b ON e.sender    = b.user_id
+    INNER JOIN  auth_user_md5 AS b ON e.sender    = b.user_id
+         WHERE  a.date_ins != 0
       ORDER BY  e.date_envoi DESC";
 
 $page->mysql_assign($sql, 'recents', 'nbrecents');
 
-$sql = "SELECT  DISTINCT e.date_envoi, e.promo, e.nom, e.prenom, e.email, b.nom as sender
+$sql = "SELECT  DISTINCT e.date_envoi, a.promo, a.nom, a.prenom, e.email, b.nom as sender
           FROM  envoidirect   AS e
-    LEFT  JOIN  auth_user_md5 AS a ON e.matricule = a.matricule
+    INNER JOIN  auth_user_md5 AS a ON e.matricule = a.matricule
     INNER JOIN  auth_user_md5 AS b ON e.sender    = b.user_id
-         WHERE  a.nom is null
+         WHERE  a.date_ins = 0
       ORDER BY  e.date_envoi DESC";
 $page->mysql_assign($sql, 'notsub', 'nbnotsub');
 

diff --git a/htdocs/marketing/utilisateurs_marketing.php b/htdocs/marketing/utilisateurs_marketing.php
index 35b2686..d6f6f44 100644 (file)
--- a/htdocs/marketing/utilisateurs_marketing.php
+++ b/htdocs/marketing/utilisateurs_marketing.php
@@ -91,8 +91,7 @@ switch ($_REQUEST["submit"]) {
                                 SET  last_known_email='{$_REQUEST['mail']}'
                               WHERE  matricule='{$_REQUEST['xmat']}'");
        $requete="INSERT INTO  envoidirect
-                          SET  matricule='{$_REQUEST['xmat']}',uid='$user_id',promo='$promo',
-                               prenom='".addslashes($prenom)."',nom='".addslashes($nom)."',
+                          SET  matricule='{$_REQUEST['xmat']}',uid='$user_id',
                                email='{$_REQUEST['mail']}',sender='{$_REQUEST['sender']}',date_envoi='$date'";
        $globals->db->query($requete);
        // pas d'erreur pour l'insert

diff --git a/templates/mails/inscription.reussie.tpl b/templates/mails/inscription.reussie.tpl
index 4225e62..2636a80 100644 (file)
--- a/templates/mails/inscription.reussie.tpl
+++ b/templates/mails/inscription.reussie.tpl
@@ -28,8 +28,10 @@
 N'oublie pas de changer ton mot de passe sur le site. C'est très important
 si tu veux garder accès au site et ton e-mail en fonction.
 
-Tu as maintenant accès à l'annuaire en ligne, aux services de listes de diffusion,
-aux infos promo, etc. N'oublie pas de mettre ta fiche-annuaire à jour.
+Tu as maintenant accès à l'annuaire en ligne, aux services de listes de
+diffusion, aux infos promo, etc. N'oublie pas de mettre ta fiche-annuaire
+à jour.
+
 --
 Polytechnique.org
 "Le portail des élèves & anciens élèves de l'Ecole polytechnique"

diff --git a/templates/marketing/envoidirect.tpl b/templates/marketing/envoidirect.tpl
index ad4a7ac..bae6fca 100644 (file)
--- a/templates/marketing/envoidirect.tpl
+++ b/templates/marketing/envoidirect.tpl
@@ -35,12 +35,12 @@
   {foreach from=$recents item=it}
   <tr class="{cycle values="pair,impair"}">
     <td>{$it.date_envoi|date_format:"%e&nbsp;%b&nbsp;%y"}</td>
-    <td>{$it.sender|lower|truncate:4:""}</td>
+    <td>{$it.sender|lower|truncate:8:""}</td>
     <td>
       <a href="mailto:{$it.email}" title="{$it.email}">{$it.nom} {$it.prenom}</a>
       (x<a href="promo.php?promo={$it.promo}">{$it.promo}</a>)
     </td>
-    <td>{$it.date_ins|date_format:"%e&nbsp;%b&nbsp;%y"}</td>
+    <td>{$it.date_succes|date_format:"%e&nbsp;%b&nbsp;%y"}</td>
   </tr>
   {/foreach}
 </table>
@@ -61,7 +61,7 @@
   {foreach from=$notsub item=it}
   <tr class="{cycle values="pair,impair"}">
     <td>{$it.date_envoi|date_format:"%e&nbsp;%b&nbsp;%y"}</td>
-    <td>{$it.sender|lower|truncate:4:""}</td>
+    <td>{$it.sender|lower|truncate:8:""}</td>
     <td>
       <a href="mailto:{$it.email}" title="{$it.email}">{$it.nom} {$it.prenom}</a>
       (x<a href="promo.php?promo={$it.promo}">{$it.promo}</a>)

diff --git a/upgrade/0.9.3/30_auth_user_md5.sql b/upgrade/0.9.3/30_auth_user_md5.sql
index 5b67dc7..32253b4 100644 (file)
--- a/upgrade/0.9.3/30_auth_user_md5.sql
+++ b/upgrade/0.9.3/30_auth_user_md5.sql
@@ -27,8 +27,8 @@ alter table en_cours drop column foo;
 --
 
 alter table auth_user_quick add column redirecturl varchar(255) not null;
-replace into auth_user_quick (user_id,banana_last,skin,watch_flags,watch_last,redirecturl)
-      select q.user_id,q.banana_last,q.skin,q.watch_flags,q.watch_last,u.redirecturl
+replace into auth_user_quick (user_id,lastnewslogin,skin,watch_flags,watch_last,redirecturl)
+      select q.user_id,q.lastnewslogin,q.skin,q.watch_flags,q.watch_last,u.redirecturl
         from auth_user_md5   as u
   inner join auth_user_quick as q USING(user_id)
        where u.redirecturl!='';

diff --git a/upgrade/0.9.3/80_envoidirect b/upgrade/0.9.3/80_envoidirect
new file mode 100644 (file)
index 0000000..1168585
--- /dev/null
+++ b/upgrade/0.9.3/80_envoidirect
@@ -0,0 +1,6 @@
+--
+-- obsolete fields
+--
+alter table envoidirect drop column prenom;
+alter table envoidirect drop column nom;
+alter table envoidirect drop column promo;