more mysql_assign disappear + backport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.3--patch-26
   fix cron

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

diff --git a/bin/cron/send_notifs.php b/bin/cron/send_notifs.php
index d81bf0d..9e67b1c 100755 (executable)
--- a/bin/cron/send_notifs.php
+++ b/bin/cron/send_notifs.php
@@ -20,10 +20,10 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require('./connect.db.inc.php');
-require("../../include/notifs.inc.php");
-require("diogenes.hermes.inc.php");
-require("diogenes.misc.inc.php");
+require_once('./connect.db.inc.php');
+require_once("../../include/notifs.inc.php");
+require_once("diogenes.hermes.inc.php");
+require_once("diogenes.misc.inc.php");
 
 $all = new AllNotifs();
 

diff --git a/htdocs/emails/redirect.php b/htdocs/emails/redirect.php
index 0955779..7ef579f 100644 (file)
--- a/htdocs/emails/redirect.php
+++ b/htdocs/emails/redirect.php
@@ -53,10 +53,12 @@ if ($melix) {
     $page->assign('melix',$melix);
 }
 
-$page->mysql_assign("SELECT  alias,expire
-                       FROM  aliases
-                     WHERE  id=$uid AND (type='a_vie' OR type='alias')
-                  ORDER BY  !FIND_IN_SET('epouse',flags), LENGTH(alias)", 'alias');
+$res = $globals->xdb->query(
+        "SELECT  alias,expire
+           FROM  aliases
+          WHERE  id={?} AND (type='a_vie' OR type='alias')
+       ORDER BY  !FIND_IN_SET('epouse',flags), LENGTH(alias)", $uid);
+$page->assign('alias', $res->fetchAllAssoc());
 $page->assign('emails',$redirect->emails);
 
 $page->run();

diff --git a/htdocs/emails/send.php b/htdocs/emails/send.php
index 6f62647..b2d4db6 100644 (file)
--- a/htdocs/emails/send.php
+++ b/htdocs/emails/send.php
@@ -57,13 +57,14 @@ if (Env::get('submit') == 'Envoyer')
     $_REQUEST['bcc'] = Session::get('bestalias').'@'.$globals->mail->domain;
 }
 
-$sql = "SELECT  u.prenom, u.nom, u.promo, a.alias as forlife
-          FROM  auth_user_md5 AS u
-    INNER JOIN  contacts      AS c ON (u.user_id = c.contact)
-    INNER JOIN  aliases       AS a ON (u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
-         WHERE  c.uid = ".Session::getInt('uid')."
-        ORDER BY u.nom, u.prenom";
-$page->mysql_assign($sql, 'contacts','nb_contacts');
+$res = $globals->xdb->query(
+        "SELECT  u.prenom, u.nom, u.promo, a.alias as forlife
+           FROM  auth_user_md5 AS u
+     INNER JOIN  contacts      AS c ON (u.user_id = c.contact)
+     INNER JOIN  aliases       AS a ON (u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
+          WHERE  c.uid = {?}
+         ORDER BY u.nom, u.prenom", Session::getInt('uid'));
+$page->assign('contacts', $res->fetchAllAssoc());
 
 $page->run();
 ?>

diff --git a/htdocs/marketing/envoidirect.php b/htdocs/marketing/envoidirect.php
index d6f7964..112b88e 100644 (file)
--- a/htdocs/marketing/envoidirect.php
+++ b/htdocs/marketing/envoidirect.php
@@ -24,6 +24,7 @@ new_admin_page('marketing/envoidirect.tpl');
 
 // effacement des inscrits il y a plus de 8 jours
 $globals->xdb->execute("DELETE FROM envoidirect WHERE DATE_ADD(date_succes, INTERVAL 8 DAY) < CURRENT_DATE AND date_succes <> '0000-00-00'");
+
 $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
@@ -31,7 +32,7 @@ $sql = "SELECT  e.date_succes,e.date_envoi,a.promo,a.nom,a.prenom,e.email,b.nom
          WHERE  a.date_ins != 0
       ORDER BY  e.date_envoi DESC";
 
-$page->mysql_assign($sql, 'recents', 'nbrecents');
+$page->assign('recents', $globals->xdb->iterator($sql));
 
 $sql = "SELECT  DISTINCT e.date_envoi, a.promo, a.nom, a.prenom, e.email, b.nom as sender
           FROM  envoidirect   AS e
@@ -39,7 +40,7 @@ $sql = "SELECT  DISTINCT e.date_envoi, a.promo, a.nom, a.prenom, e.email, b.nom
     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, 'notsub', 'nbnotsub');
+$page->assign('notsub', $globals->xdb->iterator($sql));
 
 $page->run();
 

diff --git a/htdocs/marketing/ins_confirmees.php b/htdocs/marketing/ins_confirmees.php
index 3b36b6d..b05ed57 100644 (file)
--- a/htdocs/marketing/ins_confirmees.php
+++ b/htdocs/marketing/ins_confirmees.php
@@ -29,7 +29,7 @@ $sql = "SELECT a.alias AS forlife,u.date_ins,u.promo,u.nom,u.prenom
         INNER JOIN aliases        AS a ON (u.user_id = a.id AND a.type='a_vie')
        WHERE u.date_ins > ".date("Ymd", strtotime ("last Monday"))."*1000000
         ORDER BY u.{$_GET['sort']} DESC";
-$page->mysql_assign($sql, 'ins', 'nb_ins');
+$page->assign('ins', $globals->xdb->iterator($sql));
 
 $page->run();
 ?>

diff --git a/htdocs/marketing/promo.php b/htdocs/marketing/promo.php
index ded8af8..1019543 100644 (file)
--- a/htdocs/marketing/promo.php
+++ b/htdocs/marketing/promo.php
@@ -34,11 +34,10 @@ $sql = "SELECT  u.nom, u.prenom, last_known_email, u.matricule, u.matricule_ax,
           FROM  auth_user_md5  AS u
      LEFT JOIN  envoidirect    AS e ON (u.matricule = e.matricule)
      LEFT JOIN  en_cours       AS c ON (u.matricule = c.matricule)
-         WHERE  u.promo = $promo AND u.deces = 0 AND u.perms='pending'
+         WHERE  u.promo = {?} AND u.deces = 0 AND u.perms='pending'
       GROUP BY  u.matricule
       ORDER BY  nom,prenom";
-
-$page->mysql_assign($sql, 'nonins', 'nbnonins');
+$page->assign('nonins', $globals->xdb->iterator($sql, $promo));
 
 $page->run();
 

diff --git a/htdocs/marketing/relance.php b/htdocs/marketing/relance.php
index 892d6d8..6880bf2 100644 (file)
--- a/htdocs/marketing/relance.php
+++ b/htdocs/marketing/relance.php
@@ -55,7 +55,7 @@ if (isset($_POST["relancer"]) && isset($_POST["relancer"]) != "") {
             $mymail->assign('lemail',$lemail);
             $mymail->assign('subj',$lusername."@polytechnique.org");
 
-            $globals->xdb->execute("UPDATE en_cours SET ins_id={?}, password={?}, relance=NOW(), WHERE matricule = {?}", $lins_id, $lpass $lmatricule);
+            $globals->xdb->execute("UPDATE en_cours SET ins_id={?}, password={?}, relance=NOW(), WHERE matricule = {?}", $lins_id, $lpass, $lmatricule);
             // envoi du mail à l'utilisateur
 
             $mymail->send();
@@ -72,8 +72,7 @@ $sql = "SELECT  e.date,e.relance,e.promo,e.nom,e.prenom,e.matricule
           FROM  en_cours      AS e
     INNER JOIN  auth_user_md5 AS a ON (e.matricule=a.matricule AND a.perms = 'pending')
       ORDER BY  date DESC";
-
-$page ->mysql_assign($sql, 'relance','nb');
+$page->assign('relance', $globals->xdb->iterator($sql));
 
 $page->run();
 ?>

diff --git a/htdocs/marketing/volontaire.php b/htdocs/marketing/volontaire.php
index 8efc855..2aac200 100644 (file)
--- a/htdocs/marketing/volontaire.php
+++ b/htdocs/marketing/volontaire.php
@@ -41,9 +41,7 @@ $sql = "SELECT  m.id, m.expe, m.dest, m.email,
     INNER JOIN  auth_user_md5 AS u ON u.user_id = m.expe
     INNER JOIN  aliases       AS a ON (u.user_id = a.id AND a.type='a_vie')
          WHERE  NOT FIND_IN_SET('envoye', m.flags)";
-
-$page->mysql_assign($sql, 'neuves');
-
+$page->assign('neuves', $globals->xdb->iterator($sql));
 
 $sql = "SELECT  a.promo, a.nom, a.prenom,
                 m.email, a.perms!='pending' AS inscrit,
@@ -52,8 +50,7 @@ $sql = "SELECT  a.promo, a.nom, a.prenom,
     INNER JOIN  auth_user_md5 AS a  ON a.matricule = m.dest
     INNER JOIN  auth_user_md5 AS sa ON sa.user_id = m.expe
          WHERE  FIND_IN_SET('envoye', m.flags)";
-
-$page->mysql_assign($sql, 'used', 'nbused');
+$page->assign('used', $globals->xdb->iterator($sql));
 
 $res = $globals->xdb->query(
         "SELECT  COUNT(a.perms != 'pending') AS j,

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index cb8d248..af04892 100644 (file)
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -83,7 +83,7 @@
     </tr>
   </table>
 
-{if $nb_contacts}
+  {if $contacts|@count}
   <ul>
     <li>
       <p>

diff --git a/templates/marketing/envoidirect.tpl b/templates/marketing/envoidirect.tpl
index c8f152a..b0e961f 100644 (file)
--- a/templates/marketing/envoidirect.tpl
+++ b/templates/marketing/envoidirect.tpl
@@ -31,7 +31,7 @@
     <th>Nom</th>
     <th>inscription</th>
   </tr>
-  {foreach from=$recents item=it}
+  {iterate from=$recents item=it}
   <tr class="{cycle values="pair,impair"}">
     <td>{$it.date_envoi|date_format}</td>
     <td>{$it.sender|lower|truncate:8:""}</td>
@@ -41,10 +41,10 @@
     </td>
     <td>{$it.date_succes|date_format}</td>
   </tr>
-  {/foreach}
+  {/iterate}
 </table>
 <p>
-{$nbrecents} Polytechniciens ont été sollicités et se sont inscrits.
+{$recents->total()} Polytechniciens ont été sollicités et se sont inscrits.
 </p>
 
 <h1>
@@ -57,7 +57,7 @@
     <th>Par</th>
     <th>Nom</th>
   </tr>
-  {foreach from=$notsub item=it}
+  {iterate from=$notsub item=it}
   <tr class="{cycle values="pair,impair"}">
     <td>{$it.date_envoi|date_format}</td>
     <td>{$it.sender|lower|truncate:8:""}</td>
@@ -66,11 +66,11 @@
       (x<a href="promo.php?promo={$it.promo}">{$it.promo}</a>)
     </td>
   </tr>
-  {/foreach}
+  {/iterate}
 </table>
 
 <p>
-{$nbnotsub} Polytechniciens ont été sollicités et ne se sont toujours pas inscrits.
+{$notsub->total()} Polytechniciens ont été sollicités et ne se sont toujours pas inscrits.
 </p>
 
 

diff --git a/templates/marketing/ins_confirmees.tpl b/templates/marketing/ins_confirmees.tpl
index b1aa2bf..0699845 100644 (file)
--- a/templates/marketing/ins_confirmees.tpl
+++ b/templates/marketing/ins_confirmees.tpl
@@ -26,7 +26,7 @@
     <th>Promo</th>
     <th>Nom</th>
   </tr>
-{foreach item=in from=$ins}
+{iterate item=in from=$ins}
   <tr class="{cycle values="impair,pair"}">
     <td class="center">{$in.date_ins|date_format:"%x %X"}</td>
     <td class="center">
@@ -37,7 +37,7 @@
         {$in.nom} {$in.prenom}</a>
     </td>
   </tr>
-{/foreach}
+{/iterate}
 </table>
 
 <br />
@@ -46,7 +46,7 @@
   [<a href="{$smarty.server.PHP_SELF}?sort=promo">par promo</a>]
 </div>
 <p>
-{$nb_ins} Polytechniciens se sont inscrits depuis le début de la semaine !
+{$ins->total()} Polytechniciens se sont inscrits depuis le début de la semaine !
 </p>
 
 

diff --git a/templates/marketing/promo.tpl b/templates/marketing/promo.tpl
index d23b3e6..05fbc45 100644 (file)
--- a/templates/marketing/promo.tpl
+++ b/templates/marketing/promo.tpl
@@ -81,7 +81,7 @@
       <th>Date dernière relance<br />(si moins d'un an)</th>
       <th>&nbsp;</th>
     </tr>
-    {foreach from=$nonins item=it}
+    {iterate from=$nonins item=it}
     <tr class="{cycle values="pair,impair"}">
       <td>{$it.nom} {$it.prenom}</td>
       <td class="center">{if $it.last_known_email}{mailto address=$it.last_known_email}{/if}</td>
@@ -99,12 +99,12 @@
         <a href="utilisateurs_marketing.php?xmat={$it.matricule}">Marketing</a>
       </td>
     </tr>
-    {/foreach}
+    {/iterate}
   </table>
 </form>
 
 <p>
-{$nbnonins} Polytechniciens de la promo {$promo} ne sont pas inscrits !
+{$nonins->total()} Polytechniciens de la promo {$promo} ne sont pas inscrits !
 </p>
 
 

diff --git a/templates/marketing/relance.tpl b/templates/marketing/relance.tpl
index 8dae265..80a001e 100644 (file)
--- a/templates/marketing/relance.tpl
+++ b/templates/marketing/relance.tpl
@@ -36,7 +36,7 @@
       <th>Dernière relance</th>
       <th>&nbsp;</th>
     </tr>
-    {foreach from=$relance item=it}
+    {iterate from=$relance item=it}
     <tr class="{cycle values="pair,impair"}">
       <td class="center">{$it.date}</td>
       <td class="center">{$it.promo}</td>
@@ -48,11 +48,11 @@
         <input type="checkbox" name="{$it.matricule}" value="1" />
       </td>
     </tr>
-    {/foreach}
+    {/iterate}
   </table>
 
   <p>
-  {$nb} Polytechniciens n'ont pas effectué jusqu'au bout leur inscription.
+  {$relance->total()} Polytechniciens n'ont pas effectué jusqu'au bout leur inscription.
   </p>
   <div class="center">
     <input type="submit" name="relancer" value="Relancer" />

diff --git a/templates/marketing/volontaire.tpl b/templates/marketing/volontaire.tpl
index 2340319..5e6c3a1 100644 (file)
--- a/templates/marketing/volontaire.tpl
+++ b/templates/marketing/volontaire.tpl
@@ -34,7 +34,7 @@
     <th>Dernière adresse connue</th>
     <th>Lui écrire ?</th>
   </tr>
-  {foreach from=$neuves item=it}
+  {iterate from=$neuves item=it}
   <tr class="{cycle values="pair,impair"}">
     <td>{$it.nom} {$it.prenom} (X{$it.promo})</td>
     <td>{$it.email}</td>
@@ -51,7 +51,7 @@
       <a href="{$smarty.server.PHP_SELF}?del={$it.id}">Del</a>
     </td>
   </tr>
-  {/foreach}
+  {/iterate}
 </table>
 
 <br />
@@ -66,14 +66,14 @@
     <th>Camarade "informateur"</th>
     <th>inscrit?</th>
   </tr>
-  {foreach from=$used item=it}
+  {iterate from=$used item=it}
   <tr class="{cycle values="pair,impair"}">
     <td>{$it.nom} {$it.prenom} (X{$it.promo})</td>
     <td>{$it.email}</td>
     <td>{$it.snom} {$it.sprenom} (X{$it.spromo})</td>
     <td>{if $it.inscrit}OUI{else}NON{/if}</td>
   </tr>
-  {/foreach}
+  {/iterate}
 </table>
 
 <p>