From 4beaec16c4d37b59504ccc5fd9093be42da0d519 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 4 Oct 2007 20:36:06 +0000
Subject: [PATCH] =?UTF-8?q?Abstraction=20de=20WHERE=20et=20ORDER=20(plus?=
=?UTF-8?q?=20aucun=20spip=5Fquery-SELECT=20avec=20eux=20hormis=20les=20in?=
=?UTF-8?q?=C3=A9vitables,=20et=20ils=20sont=20compatibles=20avec=20PG).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/articles_tous.php | 2 +-
ecrire/exec/menu_rubriques.php | 2 +-
ecrire/exec/mots_tous.php | 2 +-
ecrire/exec/statistiques_visites.php | 2 +-
ecrire/inc/article_select.php | 2 +-
ecrire/inc/autoriser.php | 5 ++---
ecrire/inc/forum.php | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ecrire/exec/articles_tous.php b/ecrire/exec/articles_tous.php
index f6204aadec..d48fb6203e 100644
--- a/ecrire/exec/articles_tous.php
+++ b/ecrire/exec/articles_tous.php
@@ -116,7 +116,7 @@ function texte_articles_tous(&$sel_lang, $flag_trad, $aff_art,$spip_lang_dir){
$sel_lang[$spip_lang] = $spip_lang;
if (autoriser('publierdans', 'rubrique', 0))
- $result = spip_query("SELECT id_article, titre, statut, id_rubrique, lang, id_trad, date_modif FROM spip_articles ORDER BY date DESC");
+ $result = sql_select("id_article, titre, statut, id_rubrique, lang, id_trad, date_modif", "spip_articles", "", "", "date DESC");
else
$result = sql_select("articles.id_article, articles.titre, articles.statut, articles.id_rubrique, articles.lang, articles.id_trad, articles.date_modif", "spip_articles AS articles LEFT JOIN spip_auteurs_articles AS lien ON articles.id_article=lien.id_article", "articles.statut = 'publie' OR articles.statut = 'prop' OR (articles.statut = 'prepa' AND lien.id_auteur=" . _q($GLOBALS['auteur_session']['id_auteur']) . ")", "id_article", "articles.date DESC");
diff --git a/ecrire/exec/menu_rubriques.php b/ecrire/exec/menu_rubriques.php
index 96011b1add..2cf3ff85ca 100644
--- a/ecrire/exec/menu_rubriques.php
+++ b/ecrire/exec/menu_rubriques.php
@@ -160,7 +160,7 @@ 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 = sql_select("id_rubrique", "spip_rubriques", "", "", "id_parent=0 DESC, date DESC", 500);
while ($t = sql_fetch($s))
$liste .=",".$t['id_rubrique'];
diff --git a/ecrire/exec/mots_tous.php b/ecrire/exec/mots_tous.php
index 4a2bd97c69..a90e09d61b 100644
--- a/ecrire/exec/mots_tous.php
+++ b/ecrire/exec/mots_tous.php
@@ -52,7 +52,7 @@ function exec_mots_tous_dist()
// On boucle d'abord sur les groupes de mots
//
- $result = spip_query("SELECT *, ".sql_multi ("titre", "$spip_lang")." FROM spip_groupes_mots ORDER BY multi");
+ $result = sql_select("*, ".sql_multi ("titre", "$spip_lang"), "spip_groupes_mots", "", "", "multi");
while ($row_groupes = sql_fetch($result)) {
$id_groupe = $row_groupes['id_groupe'];
diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php
index b740aef6fb..e978889532 100644
--- a/ecrire/exec/statistiques_visites.php
+++ b/ecrire/exec/statistiques_visites.php
@@ -59,7 +59,7 @@ function statistiques_csv($id) {
if ($id)
$s = sql_select("date, visites", "spip_visites_articles", "id_article=$id", "", "date");
else
- $s = spip_query("SELECT date, visites FROM spip_visites ORDER BY date");
+ $s = sql_select("date, visites", "spip_visites", "", "", "date");
while ($t = sql_fetch($s)) {
echo $t['date'].";".$t['visites']."\n";
}
diff --git a/ecrire/inc/article_select.php b/ecrire/inc/article_select.php
index 188e6c747f..1a934ef500 100644
--- a/ecrire/inc/article_select.php
+++ b/ecrire/inc/article_select.php
@@ -67,7 +67,7 @@ function article_select($id_article, $id_rubrique=0, $lier_trad=0, $id_version=0
if ($connect_id_rubrique)
$row['id_rubrique'] = $id_rubrique = $connect_id_rubrique[0];
else {
- $row_rub = sql_fetch(spip_query("SELECT id_rubrique FROM spip_rubriques ORDER BY id_rubrique DESC LIMIT 1"));
+ $row_rub = sql_fetsel("id_rubrique", "spip_rubriques", "", "", "id_rubrique DESC", 1);
$row['id_rubrique'] = $id_rubrique = $row_rub['id_rubrique'];
}
if (!autoriser('creerarticledans','rubrique',$row['id_rubrique'] )){
diff --git a/ecrire/inc/autoriser.php b/ecrire/inc/autoriser.php
index d28b9ee73b..cf6fe6c052 100644
--- a/ecrire/inc/autoriser.php
+++ b/ecrire/inc/autoriser.php
@@ -555,9 +555,8 @@ function liste_rubriques_auteur($id_auteur, $raz=false) {
}
// Fin de la recurrence : $rubriques est complet
- $q = count($r)
- ? spip_query("SELECT id_rubrique FROM spip_rubriques WHERE id_parent IN (".join(',',$r).") AND id_rubrique NOT IN (".join(',',$r).")")
- : false;
+ if (!$r) break;
+ $q = sql_select('id_rubrique', 'spip_rubriques', "id_parent IN (".join(',',$r).") AND id_rubrique NOT IN (".join(',',$r).")");
}
// Affecter l'auteur session le cas echeant
diff --git a/ecrire/inc/forum.php b/ecrire/inc/forum.php
index c4c0a2d8c7..1a0a98451e 100644
--- a/ecrire/inc/forum.php
+++ b/ecrire/inc/forum.php
@@ -223,7 +223,7 @@ function calculer_threads() {
do {
$discussion = "0";
$precedent = 0;
- $r = spip_query("SELECT fille.id_forum AS id, maman.id_thread AS thread FROM spip_forum AS fille, spip_forum AS maman WHERE fille.id_parent = maman.id_forum AND fille.id_thread <> maman.id_thread ORDER BY thread");
+ $r = sql_select("fille.id_forum AS id, maman.id_thread AS thread", 'spip_forum AS fille, spip_forum AS maman', "fille.id_parent = maman.id_forum AND fille.id_thread <> maman.id_thread",'', "thread");
while ($row = sql_fetch($r)) {
if ($row['thread'] == $precedent)
$discussion .= "," . $row['id'];
--
GitLab