From 9f8ba7d01586063ff1a8e4784c1b65696bbd5cad Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 30 Apr 2006 20:57:11 +0000
Subject: [PATCH] =?UTF-8?q?Tache=20#209:=20normalisation=20des=20appels=20?=
=?UTF-8?q?=C3=A0=20spip=5Fquery,=20qui=20sont=20tous=20de=20la=20forme:?=
=?UTF-8?q?=20spip=5Fquery("[^;]*)+;$'=20ce=20qui=20permettra=20de=20facil?=
=?UTF-8?q?ement=20sp=C3=A9cialiser=20chaque=20appel=20selon=20l'instructi?=
=?UTF-8?q?on=20SQL=20qui=20suit=20le=20guillemet.=20Par=20ailleurs,=20plu?=
=?UTF-8?q?s=20aucun=20r=C3=A9sultat=20de=20spip=5Ffetch=20sur=20spip=5Fqu?=
=?UTF-8?q?ery("SELECT....=20n'utilise=20des=20index=20num=C3=A9riques=20p?=
=?UTF-8?q?our=20pr=C3=A9lever=20les=20champs=20SQL;=20l'option=20MYSQL=5F?=
=?UTF-8?q?ASSOC=20pourrait=20donc=20etre=20substitu=C3=A9e=20=C3=A0=20MYS?=
=?UTF-8?q?QL=5FBOTH.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remarque: tout ceci ne concerne pas les fichiers dans base/ qui ne seront pas adaptés à SQLite par définition, ni au fichier inc/rubriques.php qui sera
traité à part.
---
ecrire/exec/articles.php | 11 +++++++----
ecrire/exec/articles_forum.php | 4 ++--
ecrire/exec/auteurs.php | 3 ++-
ecrire/exec/export_all.php | 6 ++++--
ecrire/inc/acces.php | 9 +++++----
ecrire/inc/agenda.php | 4 ++--
ecrire/inc/auth_ldap.php | 6 ++++--
ecrire/inc/getdocument.php | 7 ++++---
ecrire/inc/indexation.php | 9 +++++----
ecrire/inc/presentation.php | 2 +-
ecrire/inc/signatures.php | 2 +-
11 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 24d59103d5..e877f39fca 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -777,9 +777,11 @@ function langues_articles($id_article, $langue_article, $flag_editable, $id_rubr
}
spip_query("UPDATE spip_articles SET id_trad = $nouveau_trad, date_modif=NOW() WHERE id_article = $lier_trad");
- if ($id_lier > 0) spip_query("UPDATE spip_articles SET id_trad = $nouveau_trad, date_modif=NOW() WHERE id_trad = $id_lier");
+ if ($id_lier > 0)
+ spip_query("UPDATE spip_articles SET id_trad = $nouveau_trad, date_modif=NOW() WHERE id_trad = $id_lier");
spip_query("UPDATE spip_articles SET id_trad = $nouveau_trad, date_modif=NOW() WHERE id_article = $id_article");
- if ($id_trad > 0) spip_query("UPDATE spip_articles SET id_trad = $nouveau_trad, date_modif=NOW() WHERE id_trad = $id_trad");
+ if ($id_trad > 0)
+ spip_query("UPDATE spip_articles SET id_trad = $nouveau_trad, date_modif=NOW() WHERE id_trad = $id_trad");
$id_trad = $nouveau_trad;
}
@@ -1257,7 +1259,7 @@ function affiche_forums_article($id_article, $id_rubrique, $titre, $debut, $mute
echo "</div>";
}
- $result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='prive' AND id_article='$id_article' AND id_parent=0 ORDER BY date_heure DESC" . " LIMIT $debut,$total_afficher" );
+ $result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='prive' AND id_article='$id_article' AND id_parent=0 ORDER BY date_heure DESC" . " LIMIT $debut,$total_afficher" );
# " LIMIT $total_afficher OFFSET $debut" # PG
afficher_forum($result_forum, $forum_retour, $mute);
@@ -1409,7 +1411,8 @@ function revisions_articles ($id_article, $id_secteur, $id_rubrique, $id_rubriqu
if ($langue_choisie_old != "oui") {
$row = spip_fetch_array(spip_query("SELECT lang FROM spip_rubriques WHERE id_rubrique=$id_rubrique"));
$langue_new = $row['lang'];
- if ($langue_new != $langue_old) spip_query("UPDATE spip_articles SET lang = '$langue_new', date_modif=NOW() WHERE id_article = $id_article");
+ if ($langue_new != $langue_old)
+ spip_query("UPDATE spip_articles SET lang = '$langue_new', date_modif=NOW() WHERE id_article = $id_article");
}
}
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index 33d4f51e81..e6d3dd6cf3 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -43,9 +43,9 @@ function exec_articles_forum_dist()
$limitdeb = ($debut > $enplus) ? $debut-$enplus : 0;
$limitnb = $debut + $enplus - $limitdeb;
- $result = spip_query("SELECT id_forum FROM spip_forum WHERE id_article='$id_article' AND id_parent=0 AND statut IN ('publie', 'off', 'prop')" . " LIMIT $limitdeb, $limitnb");
-
+ $result = spip_query("SELECT id_forum FROM spip_forum WHERE id_article='$id_article' AND id_parent=0 AND statut IN ('publie', 'off', 'prop')" . " LIMIT $limitdeb, $limitnb");
# " LIMIT $limitnb OFFSET $limitdeb" # PG
+
articles_forum_liens(spip_num_rows($result), "articles_forum", "id_article=$id_article", $debut, $pack, $limitdeb);
$res = spip_query("SELECT pied.*, max(thread.date_heure) AS date FROM spip_forum AS pied, spip_forum AS thread WHERE pied.id_article='$id_article' AND pied.id_parent=0 AND pied.statut IN ('publie', 'off', 'prop') AND thread.id_thread=pied.id_forum GROUP BY id_thread ORDER BY date DESC LIMIT $debut, $pack");
diff --git a/ecrire/exec/auteurs.php b/ecrire/exec/auteurs.php
index f0f4b0b8b8..26f17491e8 100644
--- a/ecrire/exec/auteurs.php
+++ b/ecrire/exec/auteurs.php
@@ -263,7 +263,8 @@ default:
// La requete de base est tres sympa
//
- return spip_query("SELECT aut.id_auteur AS id_auteur, aut.statut AS statut, aut.login AS login, aut.nom AS nom, aut.email AS email, aut.url_site AS url_site, aut.messagerie AS messagerie, UPPER(aut.nom) AS unom, count(lien.id_article) as compteur $sql_sel FROM spip_auteurs as aut LEFT JOIN spip_auteurs_articles AS lien ON aut.id_auteur=lien.id_auteur LEFT JOIN spip_articles AS art ON (lien.id_article = art.id_article) WHERE $sql_visible GROUP BY aut.id_auteur ORDER BY $sql_order");
+ $row = spip_query("SELECT aut.id_auteur AS id_auteur, aut.statut AS statut, aut.login AS login, aut.nom AS nom, aut.email AS email, aut.url_site AS url_site, aut.messagerie AS messagerie, UPPER(aut.nom) AS unom, count(lien.id_article) as compteur $sql_sel FROM spip_auteurs as aut LEFT JOIN spip_auteurs_articles AS lien ON aut.id_auteur=lien.id_auteur LEFT JOIN spip_articles AS art ON (lien.id_article = art.id_article) WHERE $sql_visible GROUP BY aut.id_auteur ORDER BY $sql_order");
+ return $row;
}
function afficher_n_auteurs($auteurs) {
diff --git a/ecrire/exec/export_all.php b/ecrire/exec/export_all.php
index 2f91267e4a..df8f3d3a1b 100644
--- a/ecrire/exec/export_all.php
+++ b/ecrire/exec/export_all.php
@@ -108,7 +108,8 @@ function export_objets($table, $type, $file = 0, $gz = false, $etape_en_cours=""
if ($etape_en_cours > 0){
if ($type == "forum"){
if ($total > 5000){
- $result = spip_query("SELECT * FROM $table LIMIT $debut_limit, 5000"); #" LIMIT 5000 OFFSET $debut_limit" # PG
+ $result = spip_query("SELECT * FROM $table LIMIT $debut_limit, 5000");
+#" LIMIT 5000 OFFSET $debut_limit" # PG
$debut_limit = $debut_limit + 5000;
if ($debut_limit > $total) {
@@ -125,7 +126,8 @@ function export_objets($table, $type, $file = 0, $gz = false, $etape_en_cours=""
}
if ($type == "article"){
if ($total > 500){
- $result = spip_query("SELECT * FROM $table LIMIT $debut_limit, 500"); #" LIMIT 500 OFFSET $debut_limit" # PG
+ $result = spip_query("SELECT * FROM $table LIMIT $debut_limit, 500");
+#" LIMIT 500 OFFSET $debut_limit" # PG
$debut_limit = $debut_limit + 500;
if ($debut_limit > $total) {
diff --git a/ecrire/inc/acces.php b/ecrire/inc/acces.php
index 86abf1c816..9a75dd4c30 100644
--- a/ecrire/inc/acces.php
+++ b/ecrire/inc/acces.php
@@ -115,8 +115,9 @@ function ecrire_acces() {
# remarque : ici on laisse passer les "nouveau" de maniere a leur permettre
# de devenir "1comite" le cas echeant (auth http)... a nettoyer
- $query = "SELECT login, htpass FROM spip_auteurs WHERE statut != '5poubelle' AND statut!='6forum'";
- $result = spip_query_db($query); // attention, il faut au prealable se connecter a la base (necessaire car utilise par install)
+ // attention, il faut au prealable se connecter a la base (necessaire car utilise par install)
+ $result = spip_query_db("SELECT login, htpass FROM spip_auteurs WHERE statut != '5poubelle' AND statut!='6forum'");
+
$logins = array();
while($row = spip_fetch_array($result)) $logins[$row['login']] = $row['htpass'];
@@ -128,8 +129,8 @@ function ecrire_acces() {
redirige_par_entete(generer_url_action('test_dirs', '', true));
}
- $query = "SELECT login, htpass FROM spip_auteurs WHERE statut = '0minirezo'";
- $result = spip_query_db($query);
+ $result = spip_query_db("SELECT login, htpass FROM spip_auteurs WHERE statut = '0minirezo'");
+
$logins = array();
while($row = spip_fetch_array($result)) $logins[$row['login']] = $row['htpass'];
diff --git a/ecrire/inc/agenda.php b/ecrire/inc/agenda.php
index 86f0e6d892..299c321b7a 100644
--- a/ecrire/inc/agenda.php
+++ b/ecrire/inc/agenda.php
@@ -1074,8 +1074,8 @@ function calendrier_categories($table, $num, $objet)
return generer_calendrier_class($table, $num, $objet);
else {
// cf calendrier.css
- $result= spip_fetch_array(spip_query("SELECT " . (($objet != 'id_breve') ? 'id_secteur' : 'id_rubrique') . " FROM $table WHERE $objet=$num"));
- if ($result) $num = $result[0];
+ $result= spip_fetch_array(spip_query("SELECT " . (($objet != 'id_breve') ? 'id_secteur' : 'id_rubrique') . " AS id FROM $table WHERE $objet=$num"));
+ if ($result) $num = $result['id'];
return 'calendrier-couleur' . (($num%14)+1);
}
}
diff --git a/ecrire/inc/auth_ldap.php b/ecrire/inc/auth_ldap.php
index a7eec0d49a..8555bff629 100644
--- a/ecrire/inc/auth_ldap.php
+++ b/ecrire/inc/auth_ldap.php
@@ -131,9 +131,11 @@ class Auth_ldap {
// Si l'auteur n'existe pas, l'inserer avec le statut par defaut (defini a l'install)
- if (spip_num_rows(spip_query("SELECT id_auteur FROM spip_auteurs WHERE login='$login'"))) return false;
+ $n = spip_num_rows(spip_query("SELECT id_auteur FROM spip_auteurs WHERE login='$login'"));
+ if ($n) return false;
- return spip_query("INSERT IGNORE INTO spip_auteurs (source, nom, login, email, bio, statut, pass) VALUES ('ldap', '$nom', '$login', '$email', '$bio', '$statut', '')");
+ $n = spip_query("INSERT IGNORE INTO spip_auteurs (source, nom, login, email, bio, statut, pass) VALUES ('ldap', '$nom', '$login', '$email', '$bio', '$statut', '')");
+ return $n;
}
}
diff --git a/ecrire/inc/getdocument.php b/ecrire/inc/getdocument.php
index 15ea46b63c..016c9351af 100644
--- a/ecrire/inc/getdocument.php
+++ b/ecrire/inc/getdocument.php
@@ -139,7 +139,8 @@ function accepte_fichier_upload ($f) {
if (!ereg(".*__MACOSX/", $f)
AND !ereg("^\.", basename($f))) {
$ext = corriger_extension(addslashes(strtolower(substr(strrchr($f, "."), 1))));
- return @spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE extension='$ext' AND upload='oui'"));
+ $row = @spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE extension='$ext' AND upload='oui'"));
+ return $row;
}
}
@@ -231,8 +232,8 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode,
/* $ext = 'bin';
$nom_envoye .= '.bin';
spip_log("Extension $ext");
- if (!$row = spip_fetch_array(spip_query("SELECT * FROM spip_types_documents
- WHERE extension='bin' AND upload='oui'"))) {
+ $row = spip_fetch_array(spip_query("SELECT * FROM spip_types_documents WHERE extension='bin' AND upload='oui'"));
+ if (!$row) {
spip_log("Extension $ext interdite a l'upload");
return;
}
diff --git a/ecrire/inc/indexation.php b/ecrire/inc/indexation.php
index 27a1c2ebdb..94055d8c63 100644
--- a/ecrire/inc/indexation.php
+++ b/ecrire/inc/indexation.php
@@ -509,7 +509,8 @@ function indexer_objet($table, $id_objet, $forcer_reset = true) {
if ($index) {
if ($mots) {
- spip_query("INSERT IGNORE INTO spip_index_dico (hash, dico) VALUES ".substr($mots,1)); // supprimer la virgule du debut
+ // supprimer la virgule du debut
+ spip_query("INSERT IGNORE INTO spip_index_dico (hash, dico) VALUES ".substr($mots,1));
}
reset($index);
@@ -663,9 +664,9 @@ function requete_hash ($rech) {
// Attention en MySQL 3.x il faut passer par HEX(hash)
// alors qu'en MySQL 4.1 c'est interdit !
- $vers = spip_fetch_array(spip_query("SELECT VERSION()"));
- if (substr($vers[0], 0, 1) >= 4
- AND substr($vers[0], 2, 1) >= 1 ) {
+ $vers = spip_fetch_array(spip_query("SELECT VERSION() AS v"));
+ if (substr($vers['v'], 0, 1) >= 4
+ AND substr($vers['v'], 2, 1) >= 1 ) {
$hex_fmt = '';
$select_hash = 'hash AS h';
} else {
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 7e42f712e7..c5e8392c6a 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -1425,7 +1425,7 @@ function afficher_forum($request, $adresse_retour, $controle_id_article = false)
OR ($statut=="publie" AND $id_parent > 0))) {
afficher_forum_thread($row, $controle_id_article, $compteur_forum, $nb_forum, $i, $adresse_retour);
- afficher_forum(spip_query("SELECT * FROM spip_forum WHERE id_parent='" . $row['id_forum'] . "'" . ($controle_id_article ? " AND statut<>'off'" : '') . " ORDER BY date_heure"), $adresse_retour, $controle_id_article);
+ afficher_forum(spip_query("SELECT * FROM spip_forum WHERE id_parent='" . $row['id_forum'] . "'" . ($controle_id_article ? " AND statut<>'off'" : '') . " ORDER BY date_heure"), $adresse_retour, $controle_id_article);
}
$i[$compteur_forum]++;
}
diff --git a/ecrire/inc/signatures.php b/ecrire/inc/signatures.php
index 00279e14cd..ddc1381a9a 100644
--- a/ecrire/inc/signatures.php
+++ b/ecrire/inc/signatures.php
@@ -71,7 +71,7 @@ function controle_signatures($script, $id, $debut, $where, $order, $limit='') {
echo "<p>",message_de_signature($row),"</p>";
- $titre = spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id_article"));
+ $titre = spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id_article"));
if (!$id)
echo "<span class='arial1' style='float: $spip_lang_right; color: black; padding-$spip_lang_left: 4px;'><b>",
--
GitLab