From: Pierre Habouzit (MadCoder Date: Sat, 8 Jan 2005 10:49:42 +0000 (+0000) Subject: move from mysql_assign to the new API X-Git-Tag: xorg/old~513 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=679749801dc04b7fcc0fc48741888a5b37d4d18b;p=platal.git move from mysql_assign to the new API git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-237 --- diff --git a/ChangeLog b/ChangeLog index 5d7607f..b4545bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,10 @@ VERSION 0.9.4 29 Jan 2004 New : - + + * Banana : + - Total rework, it's now a real library, exit from plat/al. -MC + * Core : - New SQL access API : gain in security and code factorization. -MC - Drop magic_quote_gpc (DB API takes care of it itself). -MC diff --git a/htdocs/admin/ax-xorg.php b/htdocs/admin/ax-xorg.php index df37956..b36f485 100644 --- a/htdocs/admin/ax-xorg.php +++ b/htdocs/admin/ax-xorg.php @@ -23,25 +23,27 @@ require_once('xorg.inc.php'); new_admin_page('admin/ax-xorg.tpl'); // liste des différences -$sql = "SELECT u.promo,u.nom AS nom,u.prenom AS prenom,ia.nom AS nomax,ia.prenom AS prenomax,u.matricule AS mat,ia.matricule_ax AS matax - FROM auth_user_md5 AS u - INNER JOIN identification_ax AS ia ON u.matricule_ax = ia.matricule_ax - WHERE (SOUNDEX(u.nom) != SOUNDEX(ia.nom) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom) - AND SOUNDEX(u.nom) != SOUNDEX(ia.nom_patro) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom_patro)) - OR u.prenom != ia.prenom OR (u.promo != ia.promo AND u.promo != ia.promo+1 AND u.promo != ia.promo-1) - ORDER BY u.promo,u.nom,u.prenom"; -$page->mysql_assign($sql,'diffs','nb_diffs'); +$res = $globals->xdb->query( + 'SELECT u.promo,u.nom AS nom,u.prenom AS prenom,ia.nom AS nomax,ia.prenom AS prenomax,u.matricule AS mat,ia.matricule_ax AS matax + FROM auth_user_md5 AS u + INNER JOIN identification_ax AS ia ON u.matricule_ax = ia.matricule_ax + WHERE (SOUNDEX(u.nom) != SOUNDEX(ia.nom) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom) + AND SOUNDEX(u.nom) != SOUNDEX(ia.nom_patro) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom_patro)) + OR u.prenom != ia.prenom OR (u.promo != ia.promo AND u.promo != ia.promo+1 AND u.promo != ia.promo-1) + ORDER BY u.promo,u.nom,u.prenom'); +$page->assign('diffs', $res->fetchAllAssoc()); // gens à l'ax mais pas chez nous -$sql = "SELECT ia.promo,ia.nom,ia.nom_patro,ia.prenom - FROM identification_ax as ia - LEFT JOIN auth_user_md5 AS u ON u.matricule_ax = ia.matricule_ax - WHERE u.nom IS NULL"; -$page->mysql_assign($sql,'mank','nb_mank'); +$res = $globals->xdb->query( + 'SELECT ia.promo,ia.nom,ia.nom_patro,ia.prenom + FROM identification_ax as ia + LEFT JOIN auth_user_md5 AS u ON u.matricule_ax = ia.matricule_ax + WHERE u.nom IS NULL'); +$page->assign('mank', $res->fetchAllAssoc()); // gens chez nous et pas à l'ax -$sql = "SELECT promo,nom,prenom FROM auth_user_md5 WHERE matricule_ax IS NULL"; -$page->mysql_assign($sql,'plus','nb_plus'); +$res = $globals->xdb->query('SELECT promo,nom,prenom FROM auth_user_md5 WHERE matricule_ax IS NULL'); +$page->assign('plus', $res->fetchAllAssoc()); $page->run(); diff --git a/htdocs/admin/deces_promo.php b/htdocs/admin/deces_promo.php index 1b03a74..0f074a3 100644 --- a/htdocs/admin/deces_promo.php +++ b/htdocs/admin/deces_promo.php @@ -45,8 +45,8 @@ if (Env::get('valider') == "Valider") { } } -$sql = "SELECT matricule, nom, prenom, deces FROM auth_user_md5 WHERE promo = $promo ORDER BY nom,prenom"; -$page->mysql_assign($sql, 'decedes'); +$res = $globals->xdb->iterator('SELECT matricule, nom, prenom, deces FROM auth_user_md5 WHERE promo = {?} ORDER BY nom,prenom', $promo); +$page->assign('decedes', $res); $page->run(); ?> diff --git a/htdocs/admin/emails_bounces_re.php b/htdocs/admin/emails_bounces_re.php index af767c3..0e2ca03 100644 --- a/htdocs/admin/emails_bounces_re.php +++ b/htdocs/admin/emails_bounces_re.php @@ -31,7 +31,7 @@ if (Post::has('submit')) { } } -$page->mysql_assign("SELECT * FROM emails_bounces_re ORDER BY pos", 'bre'); +$page->assign('bre', $globals->xdb->iterator("SELECT * FROM emails_bounces_re ORDER BY pos")); $page->run(); ?> diff --git a/htdocs/admin/evenements.php b/htdocs/admin/evenements.php index 9cbc943..49617ed 100644 --- a/htdocs/admin/evenements.php +++ b/htdocs/admin/evenements.php @@ -90,7 +90,7 @@ if ($action != "Editer") { INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') WHERE ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags) ORDER BY FIND_IN_SET('valide',e.flags), peremption"; - $page->mysql_assign($sql, 'evs'); + $page->assign('evs', $globals->xdb->iterator($sql)); } $page->run(); diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php index e2a7b47..2f49d9e 100644 --- a/htdocs/admin/utilisateurs.php +++ b/htdocs/admin/utilisateurs.php @@ -165,12 +165,13 @@ if ($login) { $page->assign('lastlogin', $lastlogin); $page->assign('host', $host); - $page->mysql_assign("SELECT alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire - FROM aliases - WHERE id = {$mr["user_id"]} AND type!='homonyme' - ORDER BY type!= 'a_vie'", 'aliases'); - $page->assign_by_ref('xorgmails', $xorgmails); - $page->assign_by_ref('email_panne', $email_panne); + $page->assign('aliases', $globals->xdb->iterator( + "SELECT alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire + FROM aliases + WHERE id = {?} AND type!='homonyme' + ORDER BY type!= 'a_vie'", $mr["user_id"])); + $page->assign('xorgmails', $xorgmails); + $page->assign('email_panne', $email_panne); $page->assign('emails',$redirect->emails); $page->assign('mr',$mr); diff --git a/htdocs/inscription/step3.php b/htdocs/inscription/step3.php index 31ee319..02033a0 100644 --- a/htdocs/inscription/step3.php +++ b/htdocs/inscription/step3.php @@ -68,7 +68,7 @@ $globals->xdb->execute( $date, Env::get('nationalite'), Env::get('appli_id1'), Env::get('appli_type1'), Env::get('appli_id2'), Env::get('appli_type2'), $mailorg, $forlife, $homonyme ); -$globals->db->execute('UPDATE auth_user_md5 SET last_known_email={?} WHERE matricule = {?}', Env::get('email'), $matricule); +$globals->xdb->execute('UPDATE auth_user_md5 SET last_known_email={?} WHERE matricule = {?}', Env::get('email'), $matricule); // si on venait de la page maj.php, on met a jour la table envoidirect if (Env::get('envoidirect')) { $globals->xdb->execute('UPDATE envoidirect SET date_succes=NOW() WHERE uid={?}', Env::get('envoidirect')); diff --git a/htdocs/marketing/utilisateurs_marketing.php b/htdocs/marketing/utilisateurs_marketing.php index 5dbb9ea..f0923b7 100644 --- a/htdocs/marketing/utilisateurs_marketing.php +++ b/htdocs/marketing/utilisateurs_marketing.php @@ -54,7 +54,7 @@ switch (Env::get('submit')) { exit_error("Le matricule existe déjà dans la table auth_user_md5."); } - if (!isvalid_email_redirection(Env::get('mail')) { + if (!isvalid_email_redirection(Env::get('mail'))) { exit_error("L'email n'est pas valide."); } diff --git a/include/profil/assign_poly.inc.php b/include/profil/assign_poly.inc.php index f9f7cf6..ab31c90 100644 --- a/include/profil/assign_poly.inc.php +++ b/include/profil/assign_poly.inc.php @@ -19,16 +19,20 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ - $uid = Session::getInt('uid'); -$page->mysql_assign("SELECT text,id - FROM binets_ins, binets_def - WHERE binets_def.id=binets_ins.binet_id AND user_id=$uid", 'binets'); +$res = $globals->xdb->query( + "SELECT text,id + FROM binets_ins, binets_def + WHERE binets_def.id=binets_ins.binet_id AND user_id={?}", $uid); +$page->assign('binets', $res->fetchAllAssoc()); + +$res = $globals->xdb->query( + "SELECT text,id + FROM groupesx_ins, groupesx_def + WHERE groupesx_def.id=groupesx_ins.gid AND guid={?}", $uid); +$page->assign('groupesx', $res->fetchAllAssoc()); -$page->mysql_assign("SELECT text,id - FROM groupesx_ins, groupesx_def - WHERE groupesx_def.id=groupesx_ins.gid AND guid=$uid", 'groupesx'); $page->assign('section', $section); ?> diff --git a/include/select_user.inc.php b/include/select_user.inc.php index 67459af..0afcfc2 100644 --- a/include/select_user.inc.php +++ b/include/select_user.inc.php @@ -38,15 +38,16 @@ if (!Env::has("xmat") || !Env::has("submit")) { $rq = strlen(Env::get("promoR"))==4 ? "AND promo=".Env::getInt("promoR") : ""; - $where = "prenom LIKE '%$prenom%' AND nom LIKE '%$chaine%' $rq ORDER BY promo,nom"; + $where = "prenom LIKE '%".addslashes($prenom)."%' AND nom LIKE '%".addslashes($chaine)."%' $rq ORDER BY promo,nom"; } - $sql = "SELECT matricule,matricule_ax,promo,nom,prenom,comment,appli,flags,last_known_email,deces,user_id - FROM auth_user_md5 - WHERE perms NOT IN ('admin','user') AND deces=0 AND $where"; + $res = $globals->xdb->query( + "SELECT matricule,matricule_ax,promo,nom,prenom,comment,appli,flags,last_known_email,deces,user_id + FROM auth_user_md5 + WHERE perms NOT IN ('admin','user') AND deces=0 AND $where"); new_admin_page('marketing/utilisateurs_select.tpl'); - $page->mysql_assign($sql, 'nonins'); + $page->assign('nonins', $res->fetchAllAssoc()); $page->assign('id_actions', $id_actions); $page->run(); } diff --git a/install.d/banana/files b/install.d/banana/files index e534e5e..ddab6c3 100644 --- a/install.d/banana/files +++ b/install.d/banana/files @@ -1,25 +1,9 @@ +bin/banana.spoolgen.php hooks/banana.inc.php -htdocs/banana/article.php -htdocs/banana/banana.css -htdocs/banana/disconnect.php -htdocs/banana/include/config.inc.php -htdocs/banana/include/error.inc.php -htdocs/banana/include/footer.inc.php -htdocs/banana/include/format.inc.php -htdocs/banana/include/hack.inc.php -htdocs/banana/include/header.inc.php -htdocs/banana/include/password.inc.php -htdocs/banana/include/profile.inc.php -htdocs/banana/include/session.inc.php -htdocs/banana/include/subscribe.inc.php htdocs/banana/index.php -htdocs/banana/install.sh -htdocs/banana/post.php -htdocs/banana/scripts/spoolgen.php -htdocs/banana/subscribe.php -htdocs/banana/thread.php +htdocs/banana/profile.php htdocs/banana/xface.php -htdocs/confbanana.php -templates/banana.head.tpl -templates/banana.tpl -templates/confbanana.tpl +include/banana.inc.php +templates/banana/index.head.tpl +templates/banana/index.tpl +templates/banana/profile.tpl diff --git a/templates/admin/ax-xorg.tpl b/templates/admin/ax-xorg.tpl index 3e897f4..5745e90 100644 --- a/templates/admin/ax-xorg.tpl +++ b/templates/admin/ax-xorg.tpl @@ -43,7 +43,7 @@

- {$nb_diffs} camarades ont un état civil différent dans les 2 annuaires. + {$diffs|@count} camarades ont un état civil différent dans les 2 annuaires.


@@ -66,7 +66,7 @@ {/foreach}

- {$nb_mank} camarades sont absents de notre annuaire. + {$mank|count} camarades sont absents de notre annuaire.


@@ -88,7 +88,7 @@

- {$nb_plus} camarades sont absents de l'annuaire de l'AX. + {$plus|count} camarades sont absents de l'annuaire de l'AX.

{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/admin/deces_promo.tpl b/templates/admin/deces_promo.tpl index feb1e49..065a80a 100644 --- a/templates/admin/deces_promo.tpl +++ b/templates/admin/deces_promo.tpl @@ -42,14 +42,14 @@ Nom Date de décès - {foreach item=x from=$decedes} + {iterate item=x from=$decedes} {$x.nom} {$x.prenom} - {/foreach} + {/iterate} diff --git a/templates/admin/emails_bounces_re.tpl b/templates/admin/emails_bounces_re.tpl index db58512..b0fb5cc 100644 --- a/templates/admin/emails_bounces_re.tpl +++ b/templates/admin/emails_bounces_re.tpl @@ -63,7 +63,7 @@ Rappel sur les niveaux : {/if} - {foreach from=$bre item=re} + {iterate from=$bre item=re} @@ -82,7 +82,7 @@ Rappel sur les niveaux :
- {/foreach} + {/iterate} diff --git a/templates/admin/evenements.tpl b/templates/admin/evenements.tpl index 807d8f6..0595c82 100644 --- a/templates/admin/evenements.tpl +++ b/templates/admin/evenements.tpl @@ -35,7 +35,7 @@ {else} -{foreach from=$evs item=ev} +{iterate from=$evs item=ev}
@@ -84,7 +84,7 @@

-{/foreach} +{/iterate} {/if} diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl index 8e7e8a0..4d4077e 100644 --- a/templates/admin/utilisateurs.tpl +++ b/templates/admin/utilisateurs.tpl @@ -202,7 +202,7 @@ Pour ceci changer ses permissions en 'disabled'. Alias e-mail - {foreach from=$aliases item=a} + {iterate from=$aliases item=a} @@ -217,7 +217,7 @@ Pour ceci changer ses permissions en 'disabled'. {/if} - {/foreach} + {/iterate}