From a992dc1e47e804de95f7c4332194ebe3fb848a85 Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Sat, 8 Jan 2005 12:08:35 +0000 Subject: [PATCH] only search still has mysql_assign calls git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-239 --- htdocs/advanced_search.php | 14 ++++----- htdocs/emails.php | 8 ++--- htdocs/login.php | 6 ++-- htdocs/rss.php | 2 +- htdocs/stats/coupure.php | 5 ++- htdocs/trezo/gere_operations.php | 11 +++---- htdocs/trezo/index.php | 9 +++--- templates/emails.tpl | 12 ++++---- templates/login.tpl | 4 +-- templates/rss.tpl | 4 +-- templates/search.adv.form.tpl | 61 +++++++++++++++++-------------------- templates/stats/coupure.tpl | 4 +-- templates/trezo/gere_operations.tpl | 4 +-- templates/trezo/index.tpl | 4 +-- 14 files changed, 69 insertions(+), 79 deletions(-) diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php index eb4f789..608fd63 100644 --- a/htdocs/advanced_search.php +++ b/htdocs/advanced_search.php @@ -34,13 +34,13 @@ function form_prepare() { global $page,$globals; $page->assign('formulaire',1); - $page->mysql_assign('SELECT a2 AS id,IF(nat=\'\',pays,nat) AS text FROM geoloc_pays ORDER BY text', 'choix_nationalites'); - $page->mysql_assign('SELECT id,fonction_fr FROM fonctions_def ORDER BY fonction_fr', 'choix_postes'); - $page->mysql_assign('SELECT id,text FROM binets_def ORDER BY text', 'choix_binets'); - $page->mysql_assign('SELECT id,text FROM groupesx_def ORDER BY text', 'choix_groupesx'); - $page->mysql_assign('SELECT id,text FROM sections ORDER BY text', 'choix_sections'); - $page->mysql_assign('SELECT id,text FROM applis_def ORDER BY text', 'choix_schools'); - $page->mysql_assign('SELECT id,label FROM emploi_secteur ORDER BY label', 'choix_secteurs'); + $page->assign('choix_nats', $globals->xdb->iterator('SELECT a2 AS id,IF(nat=\'\',pays,nat) AS text FROM geoloc_pays ORDER BY text')); + $page->assign('choix_postes', $globals->xdb->iterator('SELECT id,fonction_fr FROM fonctions_def ORDER BY fonction_fr')); + $page->assign('choix_binets', $globals->xdb->iterator('SELECT id,text FROM binets_def ORDER BY text')); + $page->assign('choix_groupesx', $globals->xdb->iterator('SELECT id,text FROM groupesx_def ORDER BY text')); + $page->assign('choix_sections', $globals->xdb->iterator('SELECT id,text FROM sections ORDER BY text')); + $page->assign('choix_schools', $globals->xdb->iterator('SELECT id,text FROM applis_def ORDER BY text')); + $page->assign('choix_secteurs', $globals->xdb->iterator('SELECT id,label FROM emploi_secteur ORDER BY label')); if (Env::has('school')) { $sql = 'SELECT type FROM applis_def WHERE id='.Env::getInt('school'); diff --git a/htdocs/emails.php b/htdocs/emails.php index e914ed4..0c38190 100644 --- a/htdocs/emails.php +++ b/htdocs/emails.php @@ -33,14 +33,14 @@ if (Post::has('best')) { // on regarde si on a affaire à un homonyme $sql = "SELECT alias, (type='a_vie') AS a_vie, FIND_IN_SET('bestalias',flags) AS best, expire FROM aliases - WHERE id=$uid AND type!='homonyme' + WHERE id = {?} AND type!='homonyme' ORDER BY LENGTH(alias)"; -$page->mysql_assign($sql, 'aliases'); +$page->assign('aliases', $globals->xdb->iterator($sql, $uid)); $sql = "SELECT email FROM emails - WHERE uid = $uid AND FIND_IN_SET('active', flags)"; -$page->mysql_assign($sql, 'mails', 'nb_mails'); + WHERE uid = {?} AND FIND_IN_SET('active', flags)"; +$page->assign('mails', $globals->xdb->iterator($sql, $uid)); // on regarde si l'utilisateur a un alias et si oui on l'affiche ! diff --git a/htdocs/login.php b/htdocs/login.php index 7d1e428..9b9764e 100644 --- a/htdocs/login.php +++ b/htdocs/login.php @@ -72,10 +72,10 @@ $sql = "SELECT e.id,e.titre,e.texte,a.user_id,a.nom,a.prenom,a.promo,l.alias AS INNER JOIN auth_user_md5 AS a ON e.user_id=a.user_id INNER JOIN aliases AS l ON ( a.user_id=l.id AND l.type='a_vie' ) WHERE FIND_IN_SET(e.flags, 'valide') AND peremption >= NOW() - AND (e.promo_min = 0 || e.promo_min <= $promo) - AND (e.promo_max = 0 || e.promo_max >= $promo) + AND (e.promo_min = 0 || e.promo_min <= {?}) + AND (e.promo_max = 0 || e.promo_max >= {?}) ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC, e.peremption"; -$page->mysql_assign($sql, 'evenement'); +$page->assign('evenement', $globals->xdb->iterator($sql, $promo, $promo)); $page->assign('toto',""); $page->assign('tata',"1"); diff --git a/htdocs/rss.php b/htdocs/rss.php index d918f7b..93bf325 100644 --- a/htdocs/rss.php +++ b/htdocs/rss.php @@ -31,7 +31,7 @@ if (Env::has('promo')) { } $requete.=' ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC, e.peremption'; -$page->mysql_assign($requete, 'rss'); +$page->assign('rss', $globals->xdb->iterator($requete)); header('Content-Type: text/xml'); $page->run(); diff --git a/htdocs/stats/coupure.php b/htdocs/stats/coupure.php index cda17d8..c818269 100644 --- a/htdocs/stats/coupure.php +++ b/htdocs/stats/coupure.php @@ -48,9 +48,8 @@ if($cp) { $page->assign_by_ref('cp',$cp); } else { $beginning_date = date("Ymd", time() - 3600*24*21) . "000000"; - $sql = "select id, UNIX_TIMESTAMP(debut) as debut, resume, services from coupures where debut > '" . $beginning_date - . "' order by debut desc"; - $page->mysql_assign($sql, 'coupures'); + $sql = "select id, UNIX_TIMESTAMP(debut) as debut, resume, services from coupures where debut > '$beginning_date' order by debut desc"; + $page->assign('coupures', $globals->xdb->iterator($sql)); } $page->run(); diff --git a/htdocs/trezo/gere_operations.php b/htdocs/trezo/gere_operations.php index c8ffd9e..05a382a 100644 --- a/htdocs/trezo/gere_operations.php +++ b/htdocs/trezo/gere_operations.php @@ -80,13 +80,10 @@ $page->assign('mon_sel', $mon_sel); $page->assign('from_solde', solde_until($from_date)); $page->assign('to_solde', solde_until($to_date)); -$page->assign_by_ref('month_arr', $mois_fr); - -$sql = "SELECT id,date,label,credit,debit - FROM money_trezo - WHERE date >= '$from_date' AND date <= '$to_date' - ORDER BY date"; -$page->mysql_assign($sql, 'ops'); +$page->assign('month_arr', $mois_fr); +$page->assign('ops', $globals->xdb->iterator( + "SELECT id,date,label,credit,debit FROM money_trezo WHERE date >= {?} and date <= {?} ORDER BY date", + $from_date, $to_date)); $page->run(); ?> diff --git a/htdocs/trezo/index.php b/htdocs/trezo/index.php index ff13b21..8f5d8c6 100644 --- a/htdocs/trezo/index.php +++ b/htdocs/trezo/index.php @@ -21,7 +21,7 @@ require_once("xorg.inc.php"); require_once("money/trezo.inc.php"); -new_admin_page('trezo/index.tpl'); +new_skinned_page('trezo/index.tpl', AUTH_COOKIE); //Table operations : //+--------+---------------+------+-----+------------+----------------+ @@ -49,10 +49,9 @@ $page->assign('mois_sel', $mois_sel); $page->assign('mon_sel', $mon_sel); $page->assign_by_ref('month_arr', $trim_fr); -$sql = "SELECT date,label,credit,debit FROM money_trezo - WHERE date >= '$from_date' and date <= '$to_date' - ORDER BY date"; -$page->mysql_assign($sql,'ops'); +$page->assign('ops', $globals->xdb->iterator( + "SELECT date,label,credit,debit FROM money_trezo WHERE date >= {?} and date <= {?} ORDER BY date", + $from_date, $to_date)); $page->run(); ?> diff --git a/templates/emails.tpl b/templates/emails.tpl index 422ada5..232024b 100644 --- a/templates/emails.tpl +++ b/templates/emails.tpl @@ -33,12 +33,12 @@ Tes adresses polytechniciennes sont :

- {foreach from=$aliases item=a} + {iterate from=$aliases item=a} {if $a.a_vie}(*){/if} {$a.alias}@{#globals.mail.domain#} et @{#globals.mail.domain2#} {if $a.expire}(expire le {$a.expire|date_format}){/if}
- {/foreach} + {/iterate}

@@ -70,11 +70,11 @@ homonyme ni toi-m Actuellement, tout courrier électronique qui t'y est adressé, est envoyé - {if $nb_mails eq 1} à l'adresse {else} aux adresses {/if} + {if $mails->total() eq 1} à l'adresse {else} aux adresses {/if} Si tu souhaites modifier ce reroutage de ton courrier, il te suffit de te rendre ici ! diff --git a/templates/login.tpl b/templates/login.tpl index 2f685de..3870739 100644 --- a/templates/login.tpl +++ b/templates/login.tpl @@ -76,7 +76,7 @@ - {foreach item=ev from=$evenement} + {iterate item=ev from=$evenement}
@@ -102,7 +102,7 @@
- {/foreach} + {/iterate}

Nota Bene : les informations présentées ici n'engagent que leurs auteurs diff --git a/templates/rss.tpl b/templates/rss.tpl index a87a1a0..445c413 100644 --- a/templates/rss.tpl +++ b/templates/rss.tpl @@ -30,12 +30,12 @@ L'actualité polytechnicienne...{if $promo} Promotion {$promo}{/if} fr -{foreach item=line from=$rss} +{iterate item=line from=$rss} {$line.titre|strip_tags} http://{$smarty.server.SERVER_NAME}/login.php#newsid{$line.id} -{/foreach} +{/iterate} diff --git a/templates/search.adv.form.tpl b/templates/search.adv.form.tpl index e0da094..b7d8662 100644 --- a/templates/search.adv.form.tpl +++ b/templates/search.adv.form.tpl @@ -167,11 +167,11 @@ @@ -180,11 +180,11 @@ @@ -205,12 +205,11 @@ Nationalité @@ -219,12 +218,11 @@ @@ -233,12 +231,11 @@ @@ -246,12 +243,11 @@ Section @@ -260,12 +256,11 @@ diff --git a/templates/stats/coupure.tpl b/templates/stats/coupure.tpl index bd95c0d..6a591a4 100644 --- a/templates/stats/coupure.tpl +++ b/templates/stats/coupure.tpl @@ -71,7 +71,7 @@ résumé services affectés -{foreach item=cp from=$coupures} +{iterate item=cp from=$coupures} @@ -89,7 +89,7 @@ -{/foreach} +{/iterate} {/if} diff --git a/templates/trezo/gere_operations.tpl b/templates/trezo/gere_operations.tpl index a79d67f..4077209 100644 --- a/templates/trezo/gere_operations.tpl +++ b/templates/trezo/gere_operations.tpl @@ -117,7 +117,7 @@ -{foreach item=op from=$ops} +{iterate item=op from=$ops} {$op.id} {$op.date|date_format} @@ -136,7 +136,7 @@ -{/foreach} +{/iterate}
diff --git a/templates/trezo/index.tpl b/templates/trezo/index.tpl index 63dd5b3..312bf99 100644 --- a/templates/trezo/index.tpl +++ b/templates/trezo/index.tpl @@ -44,14 +44,14 @@ Dépenses Recettes -{foreach item=op from=$ops} +{iterate item=op from=$ops} {$op.date|date_format} {$op.label} {$op.debit} {$op.credit} -{/foreach} +{/iterate}
-- 2.1.4