From e4a2be1e7ef93de3d3139e1725349e48aea23514 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 15 Apr 2006 16:20:25 +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/action/instituer.php | 21 ++++++---------
ecrire/exec/forum.php | 3 +--
ecrire/exec/mots_edit.php | 16 +++++-------
ecrire/exec/mots_type.php | 4 +--
ecrire/exec/statistiques_visites.php | 39 +++++++++++++---------------
ecrire/exec/suivi_revisions.php | 17 +++++-------
ecrire/inc/auth.php | 10 +++----
ecrire/inc/config.php | 11 ++++----
8 files changed, 50 insertions(+), 71 deletions(-)
diff --git a/ecrire/action/instituer.php b/ecrire/action/instituer.php
index 4187944cac..cd4873395b 100644
--- a/ecrire/action/instituer.php
+++ b/ecrire/action/instituer.php
@@ -69,13 +69,10 @@ function instituer_forum($arg) {
$id_messages = array($id_forum);
while ($id_messages) {
$id_messages = join(',', $id_messages);
- $query_forum = "UPDATE spip_forum SET statut='$statut'
- WHERE id_forum IN ($id_messages)";
- $result_forum = spip_query($query_forum);
- $query_forum = "SELECT id_forum FROM spip_forum
- WHERE id_parent IN ($id_messages)";
- $result_forum = spip_query($query_forum);
- unset($id_messages);
+ spip_query("UPDATE spip_forum SET statut='$statut' WHERE id_forum IN ($id_messages)");
+
+ $result_forum = spip_query("SELECT id_forum FROM spip_forum WHERE id_parent IN ($id_messages)");
+ $id_messages = array();
while ($row = spip_fetch_array($result_forum))
$id_messages[] = $row['id_forum'];
}
@@ -94,8 +91,7 @@ function instituer_article($arg) {
}
if ($statut != $statut_ancien) {
- spip_query("UPDATE spip_articles SET statut='$statut',
- date=NOW() WHERE id_article=$id_article");
+ spip_query("UPDATE spip_articles SET statut='$statut', date=NOW() WHERE id_article=$id_article");
include_spip('inc/rubriques');
calculer_rubriques();
@@ -129,15 +125,14 @@ function instituer_breve($arg) {
list($id_breve, $statut) = split(' ', $arg);
$id_breve = intval($id_breve);
- $query = "SELECT statut FROM spip_breves WHERE id_breve=$id_breve";
- $result = spip_query($query);
+ $result = spip_query("SELECT statut FROM spip_breves WHERE id_breve=$id_breve");
+
if ($row = spip_fetch_array($result)) {
$statut_ancien = $row['statut'];
}
if ($statut != $statut_ancien) {
- spip_query("UPDATE spip_breves SET date_heure=NOW(),
- statut='$statut' WHERE id_breve=$id_breve");
+ spip_query("UPDATE spip_breves SET date_heure=NOW(), statut='$statut' WHERE id_breve=$id_breve");
include_spip('inc/rubriques');
calculer_rubriques();
diff --git a/ecrire/exec/forum.php b/ecrire/exec/forum.php
index 7ed61a1cf9..b6557b9c31 100644
--- a/ecrire/exec/forum.php
+++ b/ecrire/exec/forum.php
@@ -81,8 +81,7 @@ function exec_forum_dist()
echo "<p align='left'>";
$limit = $debut ? "LIMIT $debut,10" : "LIMIT 10" ;
- $query_forum="SELECT * FROM spip_forum WHERE statut='$statutforum' AND id_parent=0 ORDER BY date_heure DESC $limit";
- $result_forum = spip_query($query_forum);
+ $result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='$statutforum' AND id_parent=0 ORDER BY date_heure DESC $limit");
afficher_forum($result_forum,$urlforum);
diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php
index 54c45f2baf..4173990db0 100644
--- a/ecrire/exec/mots_edit.php
+++ b/ecrire/exec/mots_edit.php
@@ -53,10 +53,8 @@ global
//
if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
if ($supp_mot) {
- $query = "DELETE FROM spip_mots WHERE id_mot=$supp_mot";
- $result = spip_query($query);
- $query = "DELETE FROM spip_mots_articles WHERE id_mot=$supp_mot";
- $result = spip_query($query);
+ spip_query("DELETE FROM spip_mots WHERE id_mot=$supp_mot");
+ spip_query("DELETE FROM spip_mots_articles WHERE id_mot=$supp_mot");
}
if (strval($titre_mot)!='') {
@@ -87,8 +85,7 @@ if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
} else
$add_extra = '';
- $query = "UPDATE spip_mots SET titre='$titre_mot', texte='$texte', descriptif='$descriptif', type='$type', id_groupe=$id_groupe $add_extra WHERE id_mot=$id_mot";
- $result = spip_query($query);
+ spip_query("UPDATE spip_mots SET titre='$titre_mot', texte='$texte', descriptif='$descriptif', type='$type', id_groupe=$id_groupe $add_extra WHERE id_mot=$id_mot");
if ($GLOBALS['meta']['activer_moteur'] == 'oui') {
include_spip("inc/indexation");
@@ -113,8 +110,7 @@ if ($redirect_ok == 'oui' && $redirect) {
//
// Recupere les donnees
//
-$query = "SELECT * FROM spip_mots WHERE id_mot='$id_mot'";
-$result = spip_query($query);
+$result = spip_query("SELECT * FROM spip_mots WHERE id_mot='$id_mot'");
if ($row = spip_fetch_array($result)) {
$id_mot = $row['id_mot'];
@@ -264,8 +260,8 @@ if ($connect_statut =="0minirezo" AND $connect_toutes_rubriques){
echo "<BR><input type='text' NAME='titre_mot' CLASS='formo' VALUE=\"$titre_mot\" SIZE='40' $onfocus />";
// dans le groupe...
- $query_groupes = "SELECT id_groupe, titre FROM spip_groupes_mots ORDER BY titre";
- $result = spip_query($query_groupes);
+ $result = spip_query("SELECT id_groupe, titre FROM spip_groupes_mots ORDER BY titre");
+
if (spip_num_rows($result)>1) {
debut_cadre_relief("groupe-mot-24.gif");
echo _T('info_dans_groupe')."</label>\n";
diff --git a/ecrire/exec/mots_type.php b/ecrire/exec/mots_type.php
index 083eace997..de5a67d671 100644
--- a/ecrire/exec/mots_type.php
+++ b/ecrire/exec/mots_type.php
@@ -35,8 +35,8 @@ if ($connect_statut == '0minirezo' AND $new == "oui") {
$acces_comite = 'oui';
$acces_forum = 'non';
} else {
- $query_groupes = "SELECT * FROM spip_groupes_mots WHERE id_groupe=$id_groupe";
- $result_groupes = spip_query($query_groupes);
+ $result_groupes = spip_query("SELECT * FROM spip_groupes_mots WHERE id_groupe=$id_groupe");
+
while($row = spip_fetch_array($result_groupes)) {
$id_groupe = $row['id_groupe'];
$type = $row['titre'];
diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php
index 0336118aae..0a23d4a2b3 100644
--- a/ecrire/exec/statistiques_visites.php
+++ b/ecrire/exec/statistiques_visites.php
@@ -49,8 +49,8 @@ function exec_statistiques_visites_dist()
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)) {
$titre = typo($row['titre']);
@@ -59,8 +59,8 @@ if ($id_article = intval($id_article)){
}
}
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'];
@@ -113,16 +113,16 @@ else {
// Par popularite
$articles_recents[] = "0";
- $query = "SELECT id_article FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY date DESC LIMIT 10";
- $result = spip_query($query);
+ $result = spip_query("SELECT id_article FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY date DESC LIMIT 10");
+
while ($row = spip_fetch_array($result)) {
$articles_recents[] = $row['id_article'];
}
$articles_recents = join($articles_recents, ",");
// Par popularite
- $query = "SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY popularite DESC";
- $result = spip_query($query);
+ $result = spip_query("SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY popularite DESC");
+
$nombre_articles = spip_num_rows($result);
if ($nombre_articles > 0) {
@@ -153,8 +153,8 @@ else {
$articles_vus = join($articles_vus, ",");
// Par popularite
- $query_suite = "SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND id_article IN ($articles_recents) AND id_article NOT IN ($articles_vus) ORDER BY popularite DESC";
- $result_suite = spip_query($query_suite);
+ $result_suite = spip_query("SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND id_article IN ($articles_recents) AND id_article NOT IN ($articles_vus) ORDER BY popularite DESC");
+
if (spip_num_rows($result_suite) > 0) {
echo "<br><br>[...]<br><br>";
@@ -184,8 +184,8 @@ else {
// Par visites depuis le debut
- $query = "SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY visites DESC LIMIT 30";
- $result = spip_query($query);
+ $result = spip_query("SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY visites DESC LIMIT 30");
+
if (spip_num_rows($result) > 0) {
creer_colonne_droite();
@@ -263,16 +263,13 @@ if (!$origine) {
$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'];
@@ -600,9 +597,9 @@ if (flag_svg()) {
echo "<div align='left'>";
///////// Affichage par mois
- $query="SELECT FROM_UNIXTIME(UNIX_TIMESTAMP(date),'%Y-%m') AS date_unix, SUM(visites) AS total_visites FROM $table ".
- "WHERE $where AND date > DATE_SUB(NOW(),INTERVAL 2700 DAY) GROUP BY date_unix ORDER BY date";
- $result=spip_query($query);
+ $result=spip_query("SELECT FROM_UNIXTIME(UNIX_TIMESTAMP(date),'%Y-%m') AS date_unix, SUM(visites) AS total_visites FROM $table ".
+ "WHERE $where AND date > DATE_SUB(NOW(),INTERVAL 2700 DAY) GROUP BY date_unix ORDER BY date");
+
$i = 0;
while ($row = spip_fetch_array($result)) {
diff --git a/ecrire/exec/suivi_revisions.php b/ecrire/exec/suivi_revisions.php
index ce692970fb..7f1b46f829 100644
--- a/ecrire/exec/suivi_revisions.php
+++ b/ecrire/exec/suivi_revisions.php
@@ -62,18 +62,15 @@ else echo "<li><a href='" . generer_url_ecrire("suivi_revisions","id_auteur=$con
echo "<p>";
-$query = "SELECT * FROM spip_rubriques WHERE id_parent = 0 ORDER BY 0+titre, titre";
-$result = spip_query($query);
+$result = spip_query("SELECT * FROM spip_rubriques WHERE id_parent = 0 ORDER BY 0+titre, titre");
while ($row = spip_fetch_array($result)) {
$id_rubrique = $row['id_rubrique'];
$titre = propre($row['titre']);
- $query_rub = "
-SELECT versions.*, articles.statut, articles.titre
+ $result_rub = spip_query("SELECT versions.*, articles.statut, articles.titre
FROM spip_versions AS versions, spip_articles AS articles
-WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.id_secteur=$id_rubrique$req_where LIMIT 1";
- $result_rub = spip_query($query_rub);
+WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.id_secteur=$id_rubrique$req_where LIMIT 1");
if ($id_rubrique == $id_secteur) echo "<li><b>$titre</b>";
else if (spip_num_rows($result_rub) > 0) echo "<li><a href='" . generer_url_ecrire("suivi_revisions","id_secteur=$id_rubrique") . "'>$titre</a>";
@@ -86,12 +83,10 @@ if (($GLOBALS['meta']['multi_rubriques'] == 'oui') OR ($GLOBALS['meta']['multi_a
foreach ($langues as $lang) {
$titre = traduire_nom_langue($lang);
- $query_lang = "
-SELECT versions.*
+ $result_lang = spip_query("SELECT versions.*
FROM spip_versions AS versions, spip_articles AS articles
-WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.lang='$lang' $req_where LIMIT 1";
- $result_lang = spip_query($query_lang);
-
+WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.lang='$lang' $req_where LIMIT 1");
+
if ($lang == $lang_choisie) echo "<li><b>$titre</b>";
else if (spip_num_rows($result_lang) > 0) echo "<li><a href='" . generer_url_ecrire("suivi_revisions","lang_choisie=$lang") . "'>$titre</a>";
}
diff --git a/ecrire/inc/auth.php b/ecrire/inc/auth.php
index 942fcbec72..b101383766 100644
--- a/ecrire/inc/auth.php
+++ b/ecrire/inc/auth.php
@@ -111,8 +111,7 @@ function inc_auth_dist() {
//
$auth_login = addslashes($auth_login);
- $query = "SELECT * FROM spip_auteurs WHERE login='$auth_login' AND statut!='5poubelle' AND statut!='6forum'";
- $result = @spip_query($query);
+ $result = @spip_query("SELECT * FROM spip_auteurs WHERE login='$auth_login' AND statut!='5poubelle' AND statut!='6forum'");
if ($row = spip_fetch_array($result)) {
$connect_id_auteur = $row['id_auteur'];
@@ -149,8 +148,7 @@ function inc_auth_dist() {
// Si administrateur, recuperer les rubriques gerees par l'admin
if ($connect_statut == '0minirezo') {
- $query_admin = "SELECT id_rubrique FROM spip_auteurs_rubriques WHERE id_auteur=$connect_id_auteur AND id_rubrique!='0'";
- $result_admin = spip_query($query_admin);
+ $result_admin = spip_query("SELECT id_rubrique FROM spip_auteurs_rubriques WHERE id_auteur=$connect_id_auteur AND id_rubrique!='0'");
$connect_toutes_rubriques = (@spip_num_rows($result_admin) == 0);
if ($connect_toutes_rubriques) {
@@ -166,8 +164,8 @@ function inc_auth_dist() {
}
if (!$r) break;
$r = join(',', $r);
- $query_admin = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent IN ($r) AND id_rubrique NOT IN ($r)";
- $result_admin = spip_query($query_admin);
+ $result_admin = spip_query("SELECT id_rubrique FROM spip_rubriques WHERE id_parent IN ($r) AND id_rubrique NOT IN ($r");
+
}
}
}
diff --git a/ecrire/inc/config.php b/ecrire/inc/config.php
index 49c0f86b78..b308d05127 100644
--- a/ecrire/inc/config.php
+++ b/ecrire/inc/config.php
@@ -153,12 +153,11 @@ function appliquer_modifs_config() {
// Appliquer les changements de moderation forum
// forums_publics_appliquer : futur, saufnon, tous
$accepter_forum = substr($forums_publics,0,3);
- $requete_appliquer = ($forums_publics_appliquer == 'saufnon') ?
- "UPDATE spip_articles SET accepter_forum='$accepter_forum'
- WHERE accepter_forum != 'non'" :
- (($forums_publics_appliquer == 'tous') ?
- "UPDATE spip_articles SET accepter_forum='$accepter_forum'" : '');
- if ($requete_appliquer) spip_query($requete_appliquer);
+ if ($forums_publics_appliquer == 'saufnon')
+ spip_query("UPDATE spip_articles SET accepter_forum='$accepter_forum'
+ WHERE accepter_forum != 'non'");
+ else if ($forums_publics_appliquer == 'tous')
+ spip_query("UPDATE spip_articles SET accepter_forum='$accepter_forum'");
if ($accepter_forum == 'abo')
ecrire_meta('accepter_visiteurs', 'oui');
--
GitLab