From: Pierre Habouzit (MadCoder Date: Sat, 8 Jan 2005 11:13:55 +0000 (+0000) Subject: more mysql_assign disappear + backport X-Git-Tag: xorg/old~512 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7368cd23e2708cb6e726f1e718044a88bae001a3;p=platal.git 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/templates/emails/send.tpl +++ b/templates/emails/send.tpl @@ -83,7 +83,7 @@ -{if $nb_contacts} + {if $contacts|@count}