From 9c1bd8a6e37416c53ac85c5c8f77e0d51e282852 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 15 Apr 2006 21:47:38 +0000
Subject: [PATCH] =?UTF-8?q?T=C3=A2che=20#209:=20normalisation=20des=20appe?=
=?UTF-8?q?ls=20de=20spip=5Fquery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/breves_edit.php | 8 ++++----
ecrire/exec/breves_voir.php | 4 ++--
ecrire/exec/documents_liste.php | 3 +--
ecrire/exec/js_menu_rubriques.php | 10 ++--------
ecrire/exec/sites_edit.php | 8 ++++----
ecrire/exec/statistiques_lang.php | 9 +++------
ecrire/exec/statistiques_referers.php | 6 ++----
ecrire/exec/statistiques_repartition.php | 12 +++++-------
ecrire/exec/statistiques_svg.php | 10 ++++------
9 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/ecrire/exec/breves_edit.php b/ecrire/exec/breves_edit.php
index c78b2a2e2e..7aa32a490f 100644
--- a/ecrire/exec/breves_edit.php
+++ b/ecrire/exec/breves_edit.php
@@ -33,8 +33,8 @@ global
$id_breve = intval($id_breve);
if ($new != "oui") {
- $query = "SELECT * FROM spip_breves WHERE id_breve=$id_breve";
- $result = spip_query($query);
+ $result = spip_query("SELECT * FROM spip_breves WHERE id_breve=$id_breve");
+
if ($row=spip_fetch_array($result)) {
$id_breve=$row['id_breve'];
@@ -109,8 +109,8 @@ if ($connect_statut=="0minirezo" OR $statut=="prop" OR $new == "oui") {
if ($id_rubrique == 0) $logo_parent = "racine-site-24.gif";
else {
- $query = "SELECT id_parent FROM spip_rubriques WHERE id_rubrique='$id_rubrique'";
- $result=spip_query($query);
+ $result=spip_query("SELECT id_parent FROM spip_rubriques WHERE id_rubrique='$id_rubrique'");
+
while($row=spip_fetch_array($result)){
$parent_parent=$row['id_parent'];
}
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index baa29ae0ba..b7633e317a 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -24,8 +24,8 @@ function afficher_breves_voir($id_breve, $changer_lang, $cherche_mot, $supp_mot,
{
global $champs_extra, $options, $connect_statut, $les_notes;
-$query = "SELECT * FROM spip_breves WHERE id_breve='$id_breve'";
-$result = spip_query($query);
+ $result = spip_query("SELECT * FROM spip_breves WHERE id_breve='$id_breve'");
+
if ($row = spip_fetch_array($result)) {
$id_breve=$row['id_breve'];
diff --git a/ecrire/exec/documents_liste.php b/ecrire/exec/documents_liste.php
index 006b114803..a393fb1f96 100644
--- a/ecrire/exec/documents_liste.php
+++ b/ecrire/exec/documents_liste.php
@@ -44,8 +44,7 @@ debut_droite();
while ($row = spip_fetch_array($res))
$types[$row['id_type']] = $row;
- $query = "SELECT docs.id_document AS id_doc, docs.id_type AS type, docs.fichier AS fichier, docs.date AS date, docs.titre AS titre, docs.descriptif AS descriptif, lien.id_rubrique AS id_rub, rubrique.titre AS titre_rub FROM spip_documents AS docs, spip_documents_rubriques AS lien, spip_rubriques AS rubrique WHERE docs.id_document = lien.id_document AND rubrique.id_rubrique = lien.id_rubrique AND docs.mode = 'document' ORDER BY docs.date DESC";
- $result = spip_query($query);
+ $result = spip_query("SELECT docs.id_document AS id_doc, docs.id_type AS type, docs.fichier AS fichier, docs.date AS date, docs.titre AS titre, docs.descriptif AS descriptif, lien.id_rubrique AS id_rub, rubrique.titre AS titre_rub FROM spip_documents AS docs, spip_documents_rubriques AS lien, spip_rubriques AS rubrique WHERE docs.id_document = lien.id_document AND rubrique.id_rubrique = lien.id_rubrique AND docs.mode = 'document' ORDER BY docs.date DESC");
while($row=spip_fetch_array($result)){
$titre=$row['titre'];
diff --git a/ecrire/exec/js_menu_rubriques.php b/ecrire/exec/js_menu_rubriques.php
index a537831ecc..ec43d3df28 100644
--- a/ecrire/exec/js_menu_rubriques.php
+++ b/ecrire/exec/js_menu_rubriques.php
@@ -24,17 +24,11 @@ function extraire_article($id_p) {
function gen_liste_rubriques() {
// se restreindre aux rubriques utilisees recemment +secteurs
$liste="0";
- $s = spip_query("SELECT id_rubrique FROM spip_rubriques
- ORDER BY id_parent=0 DESC, date DESC LIMIT 500");
+ $s = spip_query("SELECT id_rubrique FROM spip_rubriques ORDER BY id_parent=0 DESC, date DESC LIMIT 500");
while ($t = spip_fetch_array($s))
$liste .=",".$t['id_rubrique'];
- $q = "SELECT id_rubrique, id_parent, titre
- FROM spip_rubriques
- WHERE id_rubrique IN ($liste)
- ORDER BY id_parent,0+titre,titre";
-
- $res = spip_query($q);
+ $res = spip_query("SELECT id_rubrique, id_parent, titre FROM spip_rubriques WHERE id_rubrique IN ($liste) ORDER BY id_parent,0+titre,titre");
$GLOBALS['db_art_cache'] = array();
if (spip_num_rows($res) > 0) {
diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php
index c674565ce5..c13277a766 100644
--- a/ecrire/exec/sites_edit.php
+++ b/ecrire/exec/sites_edit.php
@@ -17,8 +17,8 @@ function exec_sites_edit_dist()
{
global $champs_extra, $connect_statut, $descriptif, $id_rubrique, $id_secteur, $id_syndic, $new, $nom_site, $syndication, $url_site, $url_syndic;
-$query = "SELECT * FROM spip_syndic WHERE id_syndic=" . intval($id_syndic);
-$result = spip_query($query);
+$result = spip_query("SELECT * FROM spip_syndic WHERE id_syndic=" . intval($id_syndic));
+
if ($row = spip_fetch_array($result)) {
$id_syndic = $row["id_syndic"];
$id_rubrique = $row["id_rubrique"];
@@ -101,8 +101,8 @@ echo "<input type='text' class='formo' name='url_site' value=\"$url_site\" size=
if ($id_rubrique == 0) $logo_parent = "racine-site-24.gif";
else {
- $query = "SELECT id_parent FROM spip_rubriques WHERE id_rubrique='$id_rubrique'";
- $result=spip_query($query);
+ $result=spip_query("SELECT id_parent FROM spip_rubriques WHERE id_rubrique='$id_rubrique'");
+
while($row=spip_fetch_array($result)){
$parent_parent=$row['id_parent'];
}
diff --git a/ecrire/exec/statistiques_lang.php b/ecrire/exec/statistiques_lang.php
index 97f293352f..b17db17da9 100644
--- a/ecrire/exec/statistiques_lang.php
+++ b/ecrire/exec/statistiques_lang.php
@@ -62,8 +62,8 @@ if ($connect_statut != '0minirezo') {
debut_cadre_enfonce("langues-24.gif");
- $query = "SELECT SUM(".$critere.") AS total_visites FROM spip_articles";
- $result = spip_query($query);
+$result = spip_query("SELECT SUM(".$critere.") AS total_visites FROM spip_articles");
+
$visites = 1;
if ($row = spip_fetch_array($result))
$total_visites = $row['total_visites'];
@@ -71,10 +71,7 @@ debut_cadre_enfonce("langues-24.gif");
$total_visites = 1;
echo "<p>";
-
- $query = "SELECT lang, SUM(".$critere.") AS cnt FROM spip_articles WHERE statut='publie' GROUP BY lang";
- $result = spip_query($query);
-
+ $result = spip_query("SELECT lang, SUM(".$critere.") AS cnt FROM spip_articles WHERE statut='publie' GROUP BY lang");
echo "<table cellpadding = 2 cellspacing = 0 border = 0 width='100%' style='border: 1px solid #aaaaaa;'>";
$ifond = 1;
diff --git a/ecrire/exec/statistiques_referers.php b/ecrire/exec/statistiques_referers.php
index ae871eb8a7..dc4b491702 100644
--- a/ecrire/exec/statistiques_referers.php
+++ b/ecrire/exec/statistiques_referers.php
@@ -20,16 +20,14 @@ function exec_statistiques_referers_dist()
global $connect_statut, $id_article, $jour, $limit;
if ($id_article = intval($id_article)){
- $query = "SELECT titre, visites, popularite FROM spip_articles WHERE statut='publie' AND id_article ='$id_article'";
- $result = spip_query($query);
+ $result = spip_query("SELECT titre, visites, popularite FROM spip_articles WHERE statut='publie' AND id_article ='$id_article'");
if ($row = spip_fetch_array($result)) {
$total_absolu = $row['visites'];
}
}
else {
- $query = "SELECT SUM(visites) AS total_absolu FROM spip_visites";
- $result = spip_query($query);
+ $result = spip_query("SELECT SUM(visites) AS total_absolu FROM spip_visites");
if ($row = spip_fetch_array($result)) {
$total_absolu = $row['total_absolu'];
diff --git a/ecrire/exec/statistiques_repartition.php b/ecrire/exec/statistiques_repartition.php
index cd6e75cfcb..e824608d2e 100644
--- a/ecrire/exec/statistiques_repartition.php
+++ b/ecrire/exec/statistiques_repartition.php
@@ -22,15 +22,15 @@ function enfants($id_parent, $critere){
global $nombre_abs;
- $query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent='$id_parent'";
- $result = spip_query($query);
+ $result = spip_query("SELECT id_rubrique FROM spip_rubriques WHERE id_parent='$id_parent'");
+
$nombre = 0;
while($row = spip_fetch_array($result)) {
$id_rubrique = $row['id_rubrique'];
- $query2 = "SELECT SUM(".$critere.") AS cnt FROM spip_articles WHERE id_rubrique='$id_rubrique'";
- $result2 = spip_query($query2);
+ $result2 = spip_query("SELECT SUM(".$critere.") AS cnt FROM spip_articles WHERE id_rubrique='$id_rubrique'");
+
$visites = 0;
if ($row2 = spip_fetch_array($result2)) {
$visites = $row2['cnt'];
@@ -55,9 +55,7 @@ function enfants_aff($id_parent,$decalage, $critere, $gauche=0) {
global $abs_total;
global $taille;
- $query="SELECT id_rubrique, titre, descriptif FROM spip_rubriques WHERE id_parent='$id_parent' ORDER BY 0+titre, titre";
- $result=spip_query($query);
-
+ $result=spip_query("SELECT id_rubrique, titre, descriptif FROM spip_rubriques WHERE id_parent='$id_parent' ORDER BY 0+titre, titre");
while($row = spip_fetch_array($result)){
$id_rubrique = $row['id_rubrique'];
diff --git a/ecrire/exec/statistiques_svg.php b/ecrire/exec/statistiques_svg.php
index 439d980c3c..d07b92c817 100644
--- a/ecrire/exec/statistiques_svg.php
+++ b/ecrire/exec/statistiques_svg.php
@@ -76,16 +76,14 @@ echo '</defs>';
$where = "0=0";
}
- $query="SELECT UNIX_TIMESTAMP(date) AS date_unix FROM $table ".
- "WHERE $where ORDER BY date LIMIT 1";
- $result = spip_query($query);
+ $result = spip_query("SELECT UNIX_TIMESTAMP(date) AS date_unix FROM $table WHERE $where ORDER BY date LIMIT 1");
+
while ($row = spip_fetch_array($result)) {
$date_premier = $row['date_unix'];
}
- $query="SELECT UNIX_TIMESTAMP(date) AS date_unix, visites FROM $table ".
- "WHERE $where AND date > DATE_SUB(NOW(),INTERVAL $aff_jours DAY) ORDER BY date";
- $result=spip_query($query);
+ $result = spip_query("SELECT UNIX_TIMESTAMP(date) AS date_unix, visites FROM $table WHERE $where AND date > DATE_SUB(NOW(),INTERVAL $aff_jours DAY) ORDER BY date");
+
while ($row = spip_fetch_array($result)) {
$date = $row['date_unix'];
--
GitLab