From c879cdd0375d088fabf87ded2f704dc5de43931f Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 18 Apr 2006 11:49:04 +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/accueil.php | 4 +--
ecrire/exec/articles_forum.php | 2 +-
ecrire/exec/articles_page.php | 4 +--
ecrire/exec/naviguer.php | 2 +-
ecrire/exec/sites.php | 55 +++++++++++-----------------------
ecrire/inc/agenda.php | 27 ++++++-----------
ecrire/inc/distant.php | 22 +++++---------
ecrire/inc/forum.php | 13 ++++----
ecrire/inc/forum_insert.php | 20 +++++--------
ecrire/inc/invalideur.php | 2 +-
ecrire/inc/popularites.php | 10 +++----
ecrire/inc/rubriques.php | 16 +++++-----
ecrire/inc/session.php | 4 +--
ecrire/inc/syndic.php | 9 +++---
ecrire/inc/texte.php | 28 ++++++++---------
15 files changed, 85 insertions(+), 133 deletions(-)
diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php
index e48858fcf4..cd0fb00a71 100644
--- a/ecrire/exec/accueil.php
+++ b/ecrire/exec/accueil.php
@@ -61,14 +61,14 @@ if ($GLOBALS['meta']['activer_syndic'] != 'non' AND $connect_statut == '0minirez
// Les articles syndiques en attente de validation
if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
- $result = spip_query ("SELECT COUNT(*) AS compte FROM spip_syndic_articles WHERE statut='dispo'");
+ $result = spip_query("SELECT COUNT(*) AS compte FROM spip_syndic_articles WHERE statut='dispo'");
if (($row = spip_fetch_array($result)) AND $row['compte'])
echo "<br><small><a href='" . generer_url_ecrire("sites_tous","") . "' style='color: black;'>".$row['compte']." "._T('info_liens_syndiques_1')." "._T('info_liens_syndiques_2')."</a></small>";
}
// Les forums en attente de moderation
if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
- $result = spip_query ("SELECT COUNT(*) AS compte FROM spip_forum WHERE statut='prop'");
+ $result = spip_query("SELECT COUNT(*) AS compte FROM spip_forum WHERE statut='prop'");
if (($row = spip_fetch_array($result)) AND $row['compte']) {
echo "<br><small> <a href='" . generer_url_ecrire("controle_forum","") . "' style='color: black;'>".$row['compte'];
if ($row['compte']>1)
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index fcf57e7185..49a4c6aded 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -57,7 +57,7 @@ function exec_articles_forum_dist()
AND thread.id_thread=pied.id_forum
GROUP BY id_thread
ORDER BY date DESC
- LIMIT $debut, $pack";
+ LIMIT $debut, $pack");
afficher_forum($res,"", $id_article);
diff --git a/ecrire/exec/articles_page.php b/ecrire/exec/articles_page.php
index 7eea34d6c8..d8dfb978c6 100644
--- a/ecrire/exec/articles_page.php
+++ b/ecrire/exec/articles_page.php
@@ -97,8 +97,8 @@ function changer_statut_articles_page($debloquer_article)
if ($debloquer_article) {
if ($debloquer_article <> 'tous')
$where_id = "AND id_article=".intval($debloquer_article);
- $query = "UPDATE spip_articles SET auteur_modif='0' WHERE auteur_modif=$connect_id_auteur $where_id";
- spip_query ($query);
+ spip_query("UPDATE spip_articles SET auteur_modif='0' WHERE auteur_modif=$connect_id_auteur $where_id");
+
}
}
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index 72e1b0bb39..e77d965905 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -329,7 +329,7 @@ if ($relief) {
// Les articles syndiques en attente de validation
if ($id_rubrique == 0
AND $connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
- $row = spip_fetch_array(spip_query ("SELECT COUNT(*) AS compte
+ $row = spip_fetch_array(spip_query("SELECT COUNT(*) AS compte
FROM spip_syndic_articles WHERE statut='dispo'"));
if ($row['compte'] > 0)
echo "<br><small><a href='" . generer_url_ecrire("sites_tous")
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index 0bd5ca6263..947d74aef9 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -69,11 +69,9 @@ $flag_administrable = ($connect_statut == '0minirezo' AND acces_rubrique($id_rub
if ($flag_administrable) {
if ($supprimer_lien = intval($supprimer_lien))
- spip_query("UPDATE spip_syndic_articles SET statut='refuse'
- WHERE id_syndic_article='$supprimer_lien'");
+ spip_query("UPDATE spip_syndic_articles SET statut='refuse' WHERE id_syndic_article='$supprimer_lien'");
if ($ajouter_lien = intval($ajouter_lien))
- spip_query("UPDATE spip_syndic_articles SET statut='publie'
- WHERE id_syndic_article='$ajouter_lien'");
+ spip_query("UPDATE spip_syndic_articles SET statut='publie' WHERE id_syndic_article='$ajouter_lien'");
}
if ($new == 'oui') {
@@ -120,11 +118,7 @@ if ($analyser_site == 'oui' AND $flag_editable) {
$url_syndic = trim(addslashes($v['url_syndic']));
$descriptif = addslashes($v['descriptif']);
$syndication = $v[syndic] ? 'oui' : 'non';
- $result = spip_query("UPDATE spip_syndic ".
- "SET nom_site='$nom_site', url_site='$url_site',
- url_syndic='$url_syndic', descriptif='$descriptif',
- syndication='$syndication', statut='$statut'
- WHERE id_syndic=$id_syndic");
+ $result = spip_query("UPDATE spip_syndic SET nom_site='$nom_site', url_site='$url_site', url_syndic='$url_syndic', descriptif='$descriptif', syndication='$syndication', statut='$statut' WHERE id_syndic=$id_syndic");
if ($syndication == 'oui') syndic_a_jour($id_syndic);
$redirect = generer_url_ecrire('sites',("id_syndic=$id_syndic". ($redirect ? "&redirect=$redirect" : "")), true);
$redirect_ok = 'oui';
@@ -138,11 +132,9 @@ if ($analyser_site == 'oui' AND $flag_editable) {
if ($nouveau_statut AND $flag_administrable) {
$statut = $nouveau_statut;
- $result = spip_query("UPDATE spip_syndic SET statut='$statut'
- WHERE id_syndic=$id_syndic");
+ $result = spip_query("UPDATE spip_syndic SET statut='$statut' WHERE id_syndic=$id_syndic");
if ($statut == 'publie')
- spip_query("UPDATE spip_syndic SET date=NOW() WHERE
- id_syndic=$id_syndic");
+ spip_query("UPDATE spip_syndic SET date=NOW() WHERE id_syndic=$id_syndic");
calculer_rubriques();
if ($statut == 'publie') {
@@ -169,10 +161,7 @@ if (strval($nom_site)!='' AND $modifier_site == 'oui' AND $flag_editable) {
- spip_query("UPDATE spip_syndic SET id_rubrique='$id_rubrique',
- nom_site='$nom_site', url_site='$url_site', url_syndic='$url_syndic',
- descriptif='$descriptif', syndication='$syndication', statut='$statut'
- $add_extra WHERE id_syndic=$id_syndic");
+ spip_query("UPDATE spip_syndic SET id_rubrique='$id_rubrique', nom_site='$nom_site', url_site='$url_site', url_syndic='$url_syndic', descriptif='$descriptif', syndication='$syndication', statut='$statut' $add_extra WHERE id_syndic=$id_syndic");
propager_les_secteurs();
@@ -181,8 +170,7 @@ if (strval($nom_site)!='' AND $modifier_site == 'oui' AND $flag_editable) {
$reload = "oui";
if ($syndication_old != $syndication AND $syndication == "non")
- spip_query("DELETE FROM spip_syndic_articles
- WHERE id_syndic=$id_syndic");
+ spip_query("DELETE FROM spip_syndic_articles WHERE id_syndic=$id_syndic");
calculer_rubriques();
@@ -204,9 +192,7 @@ if (strval($nom_site)!='' AND $modifier_site == 'oui' AND $flag_editable) {
if ($jour AND $flag_administrable) {
if ($annee == "0000") $mois = "00";
if ($mois == "00") $jour = "00";
- spip_query("UPDATE spip_syndic SET date='" .
- addslashes("$annee-$mois-$jour") .
- "' WHERE id_syndic=$id_syndic");
+ spip_query("UPDATE spip_syndic SET date='" . addslashes("$annee-$mois-$jour") . "' WHERE id_syndic=$id_syndic");
calculer_rubriques();
}
@@ -216,11 +202,9 @@ if ($redirect AND $redirect_ok == 'oui') {
// Appliquer le choix resume/fulltexte (necessite un reload)
if ($flag_editable AND ($resume == 'oui' OR $resume == 'non')) {
- list($old_resume) = spip_fetch_array(spip_query(
- "SELECT resume FROM spip_syndic WHERE id_syndic=$id_syndic"));
- if ($old_resume <> $resume) $reload = 'oui';
- spip_query("UPDATE spip_syndic SET resume='$resume'
- WHERE id_syndic=$id_syndic");
+ $old_resume = spip_fetch_array(spip_query("SELECT resume FROM spip_syndic WHERE id_syndic=$id_syndic"));
+ if ($old_resume['resume'] <> $resume) $reload = 'oui';
+ spip_query("UPDATE spip_syndic SET resume='$resume' WHERE id_syndic=$id_syndic");
}
@@ -228,7 +212,7 @@ if ($flag_editable AND ($resume == 'oui' OR $resume == 'non')) {
// reload
//
if ($reload) {
- $result = spip_query ("SELECT id_syndic FROM spip_syndic WHERE id_syndic=$id_syndic AND syndication IN ('oui', 'sus', 'off') LIMIT 1");
+ $result = spip_query("SELECT id_syndic FROM spip_syndic WHERE id_syndic=$id_syndic AND syndication IN ('oui', 'sus', 'off') LIMIT 1");
if ($result AND spip_num_rows($result)>0)
$erreur_syndic = syndic_a_jour ($id_syndic);
}
@@ -435,8 +419,7 @@ if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
// modifier la moderation
if ($moderation == 'oui' OR $moderation == 'non')
- spip_query("UPDATE spip_syndic SET moderation='$moderation'
- WHERE id_syndic=$id_syndic");
+ spip_query("UPDATE spip_syndic SET moderation='$moderation' WHERE id_syndic=$id_syndic");
else
$moderation = $mod;
if ($moderation != 'oui') $moderation='non';
@@ -455,11 +438,9 @@ if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
// Depublier les liens qui ne figurent plus ?
# appliquer les choix
if ($miroir == 'oui' OR $miroir == 'non')
- spip_query("UPDATE spip_syndic SET miroir='$miroir'
- WHERE id_syndic=$id_syndic");
+ spip_query("UPDATE spip_syndic SET miroir='$miroir' WHERE id_syndic=$id_syndic");
if ($oubli == 'oui' OR $oubli == 'non')
- spip_query("UPDATE spip_syndic SET oubli='$oubli'
- WHERE id_syndic=$id_syndic");
+ spip_query("UPDATE spip_syndic SET oubli='$oubli' WHERE id_syndic=$id_syndic");
echo "<div align='left'>"._T('syndic_choix_oublier'), '</div>';
@@ -487,8 +468,7 @@ if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
// Prendre les resumes ou le texte integral ?
# appliquer les choix
if ($resume == 'oui' OR $resume == 'non')
- spip_query("UPDATE spip_syndic SET resume='$resume'
- WHERE id_syndic=$id_syndic");
+ spip_query("UPDATE spip_syndic SET resume='$resume' WHERE id_syndic=$id_syndic");
if (!$resume AND !$resume = $row['resume']) $resume = 'oui';
echo "<div align='$spip_lang_left'>"
. _T('syndic_choix_resume') . "<br />\n";
@@ -563,8 +543,7 @@ echo "</div>";
echo "<p align='left'>\n";
-$result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='prive'
-AND id_syndic=$id_syndic AND id_parent=0 ORDER BY date_heure DESC LIMIT 20");
+$result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='prive' AND id_syndic=$id_syndic AND id_parent=0 ORDER BY date_heure DESC LIMIT 20");
afficher_forum($result_forum, $forum_retour);
diff --git a/ecrire/inc/agenda.php b/ecrire/inc/agenda.php
index e48d9aff74..b018a8c279 100644
--- a/ecrire/inc/agenda.php
+++ b/ecrire/inc/agenda.php
@@ -1127,8 +1127,7 @@ function sql_calendrier_interval($limites) {
function sql_calendrier_interval_forums($limites, &$evenements) {
list($avant, $apres) = $limites;
- $result=spip_query("
-SELECT DISTINCT titre, date_heure, id_forum
+ $result=spip_query("SELECT DISTINCT titre, date_heure, id_forum
FROM spip_forum
WHERE date_heure >= $avant
AND date_heure < $apres
@@ -1152,8 +1151,7 @@ ORDER BY date_heure
function sql_calendrier_interval_articles($avant, $apres, &$evenements) {
- $result=spip_query("
-SELECT id_article, titre, date, descriptif, chapo
+ $result=spip_query("SELECT id_article, titre, date, descriptif, chapo
FROM spip_articles
WHERE statut='publie'
AND date >= $avant
@@ -1174,8 +1172,7 @@ ORDER BY date
function sql_calendrier_interval_rubriques($avant, $apres, &$evenements) {
- $result=spip_query("
-SELECT DISTINCT R.id_rubrique, titre, descriptif, date
+ $result=spip_query("SELECT DISTINCT R.id_rubrique, titre, descriptif, date
FROM spip_rubriques AS R, spip_documents_rubriques AS L
WHERE statut='publie'
AND date >= $avant
@@ -1196,8 +1193,7 @@ ORDER BY date
}
function sql_calendrier_interval_breves($avant, $apres, &$evenements) {
- $result=spip_query("
-SELECT id_breve, titre, date_heure, id_rubrique
+ $result=spip_query("SELECT id_breve, titre, date_heure, id_rubrique
FROM spip_breves
WHERE statut='publie'
AND date_heure >= $avant
@@ -1220,8 +1216,7 @@ function sql_calendrier_interval_rv($avant, $apres) {
global $connect_id_auteur;
$evenements= array();
if (!$connect_id_auteur) return $evenements;
- $result=spip_query("
-SELECT messages.id_message, messages.titre, messages.texte,
+ $result=spip_query("SELECT messages.id_message, messages.titre, messages.texte,
messages.date_heure, messages.date_fin, messages.type
FROM spip_messages AS messages,
spip_auteurs_messages AS lien
@@ -1250,8 +1245,7 @@ ORDER BY messages.date_heure
else {
$cat = 'calendrier-couleur9';
$auteurs = array();
- $result_aut=spip_query("
-SELECT auteurs.nom
+ $result_aut=spip_query("SELECT auteurs.nom
FROM spip_auteurs AS auteurs,
spip_auteurs_messages AS lien
WHERE (lien.id_message='$id_message'
@@ -1305,8 +1299,7 @@ function sql_calendrier_taches_annonces () {
global $connect_id_auteur;
$r = array();
if (!$connect_id_auteur) return $r;
- $result = spip_query("
-SELECT * FROM spip_messages
+ $result = spip_query("SELECT * FROM spip_messages
WHERE type = 'affich' AND rv != 'oui' AND statut = 'publie' ORDER BY date_heure DESC");
if (spip_num_rows($result) > 0)
while ($x = spip_fetch_array($result)) $r[] = $x;
@@ -1317,8 +1310,7 @@ function sql_calendrier_taches_pb () {
global $connect_id_auteur;
$r = array();
if (!$connect_id_auteur) return $r;
- $result = spip_query("
-SELECT * FROM spip_messages AS messages
+ $result = spip_query("SELECT * FROM spip_messages AS messages
WHERE id_auteur=$connect_id_auteur AND statut='publie' AND type='pb' AND rv!='oui'");
if (spip_num_rows($result) > 0){
$r = array();
@@ -1331,8 +1323,7 @@ function sql_calendrier_taches_rv () {
global $connect_id_auteur;
$r = array();
if (!$connect_id_auteur) return $r;
- $result = spip_query("
-SELECT messages.*
+ $result = spip_query("SELECT messages.*
FROM spip_messages AS messages, spip_auteurs_messages AS lien
WHERE ((lien.id_auteur='$connect_id_auteur'
AND lien.id_message=messages.id_message)
diff --git a/ecrire/inc/distant.php b/ecrire/inc/distant.php
index 8826bbb872..347f992221 100644
--- a/ecrire/inc/distant.php
+++ b/ecrire/inc/distant.php
@@ -40,8 +40,7 @@ function copie_locale($source, $mode='auto') {
ecrire_fichier($local, $contenu);
// signaler au moteur de recherche qu'il peut reindexer ce doc
- $a = spip_query("SELECT id_document FROM spip_documents
- WHERE fichier='".addslashes($source)."'");
+ $a = spip_query("SELECT id_document FROM spip_documents WHERE fichier='".addslashes($source)."'");
list($id_document) = spip_fetch_array($a);
if ($id_document) {
include_spip('inc/indexation');
@@ -209,13 +208,11 @@ function fichier_copie_locale($source) {
// Si l'extension n'est pas precisee, aller la chercher dans la table
// des documents -- si la source n'est pas dans la table des documents,
// on ne fait rien
- if ($t = spip_fetch_array(spip_query("SELECT * FROM spip_documents
- WHERE fichier='".addslashes($source)."' AND distant='oui'")))
- list($extension) = spip_fetch_array(spip_query("SELECT extension
- FROM spip_types_documents WHERE id_type=".$t['id_type']));
-
- if ($extension)
- return nom_fichier_copie_locale($source, $extension);
+ if ($t = spip_fetch_array(spip_query("SELECT id_type FROM spip_documents WHERE fichier='".addslashes($source)."' AND distant='oui'"))) {
+ $t = spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE id_type=".$t['id_type']));
+ if ($t)
+ return nom_fichier_copie_locale($source, $t['extension']);
+ }
}
@@ -232,8 +229,7 @@ function recuperer_infos_distantes($source, $max=0) {
if (preg_match(",\nContent-Type: *([^[:space:];]*),i",
"\n$headers", $regs)
AND $mime_type = addslashes(trim($regs[1]))
- AND $s = spip_query("SELECT id_type,extension FROM spip_types_documents
- WHERE mime_type='$mime_type'")
+ AND $s = spip_query("SELECT id_type,extension FROM spip_types_documents WHERE mime_type='$mime_type'")
AND $t = spip_fetch_array($s)) {
spip_log("mime-type $mime_type ok");
$a['id_type'] = $t['id_type'];
@@ -241,9 +237,7 @@ function recuperer_infos_distantes($source, $max=0) {
} else {
# par defaut on retombe sur '.bin' si c'est autorise
spip_log("mime-type $mime_type inconnu");
- $t = spip_fetch_array(spip_query(
- "SELECT id_type,extension FROM spip_types_documents
- WHERE extension='bin'"));
+ $t = spip_fetch_array(spip_query("SELECT id_type,extension FROM spip_types_documents WHERE extension='bin'"));
if (!$t) return false;
$a['id_type'] = $t['id_type'];
$a['extension'] = $t['extension'];
diff --git a/ecrire/inc/forum.php b/ecrire/inc/forum.php
index 5752c142ea..f1a6741f4b 100644
--- a/ecrire/inc/forum.php
+++ b/ecrire/inc/forum.php
@@ -144,8 +144,7 @@ function calcul_index_forum($id_article, $id_breve, $id_rubrique, $id_syndic) {
//
function calculer_threads() {
// fixer les id_thread des debuts de discussion
- spip_query("UPDATE spip_forum SET id_thread=id_forum
- WHERE id_parent=0");
+ spip_query("UPDATE spip_forum SET id_thread=id_forum WHERE id_parent=0");
// reparer les messages qui n'ont pas l'id_secteur de leur parent
do {
@@ -176,8 +175,8 @@ function calculer_threads() {
// Calculs des URLs des forums (pour l'espace public)
function racine_forum($id_forum){
if (!$id_forum = intval($id_forum)) return;
- $query = "SELECT id_parent, id_rubrique, id_article, id_breve FROM spip_forum WHERE id_forum=".$id_forum;
- $result = spip_query($query);
+ $result = spip_query("SELECT id_parent, id_rubrique, id_article, id_breve FROM spip_forum WHERE id_forum=".$id_forum);
+
if($row = spip_fetch_array($result)){
if($row['id_parent']) {
return racine_forum($row['id_parent']);
@@ -218,8 +217,8 @@ function generer_url_forum_dist($id_forum, $show_thread=false) {
function get_forums_publics($id_article=0) {
$forums_publics = $GLOBALS['meta']["forums_publics"];
if ($id_article) {
- $query = "SELECT accepter_forum FROM spip_articles WHERE id_article=$id_article";
- $res = spip_query($query);
+ $res = spip_query("SELECT accepter_forum FROM spip_articles WHERE id_article=$id_article");
+
if ($obj = spip_fetch_array($res))
$forums_publics = $obj['accepter_forum'];
} else { // dans ce contexte, inutile
@@ -230,7 +229,7 @@ function get_forums_publics($id_article=0) {
// Modifier le reglage des forums publics de l'article x
function modifier_forums_publics($id_article, $forums_publics) {
- spip_query ("UPDATE spip_articles
+ spip_query("UPDATE spip_articles
SET accepter_forum='$forums_publics'
WHERE id_article=".intval($id_article));
if ($forums_publics == 'abo') {
diff --git a/ecrire/inc/forum_insert.php b/ecrire/inc/forum_insert.php
index 1c2a9e497a..935e0586c8 100644
--- a/ecrire/inc/forum_insert.php
+++ b/ecrire/inc/forum_insert.php
@@ -56,14 +56,11 @@ function prevenir_auteurs($auteur, $email_auteur, $id_forum, $id_article, $texte
$old_lang = $GLOBALS['spip_lang'];
- $result = spip_query("SELECT auteurs.email, auteurs.lang FROM spip_auteurs AS auteurs,
- spip_auteurs_articles AS lien
- WHERE lien.id_article='$id_article'
- AND auteurs.id_auteur=lien.id_auteur");
- while (list($email, $salangue) = spip_fetch_array($result)) {
- $email = trim($email);
+ $result = spip_query("SELECT auteurs.email, auteurs.lang FROM spip_auteurs AS auteurs, spip_auteurs_articles AS lien WHERE lien.id_article='$id_article' AND auteurs.id_auteur=lien.id_auteur");
+ while ($row = spip_fetch_array($result)) {
+ $email = trim($row['email']);
if (strlen($email) < 3) continue;
- $GLOBALS['spip_lang'] = ($salangue ? $salangue : $old_lang);
+ $GLOBALS['spip_lang'] = ($row['lang'] ? $row['lang'] : $old_lang);
envoyer_mail($email, $sujet, $corps) ;
}
$GLOBALS['spip_lang'] = $old_lang;
@@ -93,8 +90,7 @@ function controler_forum($id) {
// Reglage forums d'article
if ($id) {
- $q = spip_query("SELECT accepter_forum FROM spip_articles
- WHERE id_article=$id");
+ $q = spip_query("SELECT accepter_forum FROM spip_articles WHERE id_article=$id");
if ($r = spip_fetch_array($q))
$id = $r['accepter_forum'];
}
@@ -109,8 +105,7 @@ function mots_du_forum($ajouter_mot, $id_message)
{
foreach ($ajouter_mot as $id_mot)
if ($id_mot = intval($id_mot))
- spip_query("INSERT INTO spip_mots_forum (id_mot, id_forum)
- VALUES ($id_mot, $id_message)");
+ spip_abstract_insert('spip_mots_forum', '(id_mot, id_forum)', "($id_mot, $id_message)");
}
// Recalcule la signature faite dans formulaires/inc-formulaire-forum
@@ -208,8 +203,7 @@ function inc_forum_insert_dist() {
$id_message = spip_abstract_insert('spip_forum', '(date_heure)', '(NOW())');
if ($id_forum)
- list($id_thread) = spip_fetch_array(spip_query(
- "SELECT id_thread FROM spip_forum WHERE id_forum = $id_forum"));
+ list($id_thread) = spip_fetch_array(spip_query("SELECT id_thread FROM spip_forum WHERE id_forum = $id_forum"));
else
$id_thread = $id_message; # id_thread oblige INSERT puis UPDATE.
diff --git a/ecrire/inc/invalideur.php b/ecrire/inc/invalideur.php
index 8761232e88..8e8d4a3b8d 100644
--- a/ecrire/inc/invalideur.php
+++ b/ecrire/inc/invalideur.php
@@ -53,7 +53,7 @@ function insere_invalideur($inval, $fichier) {
$values = array();
foreach($a as $k => $v)
$values[] = "('$fichier', '$type/$k')";
- spip_query ("INSERT IGNORE INTO spip_caches
+ spip_query("INSERT IGNORE INTO spip_caches
(fichier, id) VALUES " . join(", ", $values));
}
}
diff --git a/ecrire/inc/popularites.php b/ecrire/inc/popularites.php
index 212be5a3f5..8fb4731a76 100644
--- a/ecrire/inc/popularites.php
+++ b/ecrire/inc/popularites.php
@@ -42,15 +42,13 @@ function calculer_popularites() {
$b = log(2) * $periode / $demivie;
// oublier un peu le passe
- spip_query("UPDATE spip_articles SET maj=maj,
- popularite = popularite * $a");
+ spip_query("UPDATE spip_articles SET maj=maj, popularite = popularite * $a");
// enregistrer les metas...
- list($maxpop, $totalpop) = spip_fetch_array(spip_query(
- "SELECT MAX(popularite), SUM(popularite) FROM spip_articles"
+ $row = spip_fetch_array(spip_query("SELECT MAX(popularite) AS max, SUM(popularite) AS tot FROM spip_articles"
));
- ecrire_meta("popularite_max", $maxpop);
- ecrire_meta("popularite_total", $totalpop);
+ ecrire_meta("popularite_max", $row['max']);
+ ecrire_meta("popularite_total", $row['tot']);
// Une fois par jour purger les referers du jour ; qui deviennent
diff --git a/ecrire/inc/rubriques.php b/ecrire/inc/rubriques.php
index 0ecdb5ad0e..a764bc29a3 100644
--- a/ecrire/inc/rubriques.php
+++ b/ecrire/inc/rubriques.php
@@ -156,7 +156,7 @@ function propager_les_secteurs()
// Calculer la langue des sous-rubriques et des articles
//
function calculer_langues_rubriques_etape() {
- $s = spip_query ("SELECT fille.id_rubrique AS id_rubrique, mere.lang AS lang
+ $s = spip_query("SELECT fille.id_rubrique AS id_rubrique, mere.lang AS lang
FROM spip_rubriques AS fille, spip_rubriques AS mere
WHERE fille.id_parent = mere.id_rubrique
AND fille.langue_choisie != 'oui' AND mere.lang<>''
@@ -165,7 +165,7 @@ function calculer_langues_rubriques_etape() {
while ($row = spip_fetch_array($s)) {
$lang = addslashes($row['lang']);
$id_rubrique = $row['id_rubrique'];
- $t = spip_query ("UPDATE spip_rubriques
+ $t = spip_query("UPDATE spip_rubriques
SET lang='$lang', langue_choisie='non' WHERE id_rubrique=$id_rubrique");
}
@@ -176,13 +176,13 @@ function calculer_langues_rubriques() {
// rubriques (recursivite)
$langue_site = addslashes($GLOBALS['meta']['langue_site']);
- spip_query ("UPDATE spip_rubriques
+ spip_query("UPDATE spip_rubriques
SET lang='$langue_site', langue_choisie='non'
WHERE id_parent=0 AND langue_choisie != 'oui'");
while (calculer_langues_rubriques_etape());
// articles
- $s = spip_query ("SELECT fils.id_article AS id_article, mere.lang AS lang
+ $s = spip_query("SELECT fils.id_article AS id_article, mere.lang AS lang
FROM spip_articles AS fils, spip_rubriques AS mere
WHERE fils.id_rubrique = mere.id_rubrique
AND fils.langue_choisie != 'oui' AND (fils.lang='' OR mere.lang<>'')
@@ -190,12 +190,12 @@ function calculer_langues_rubriques() {
while ($row = spip_fetch_array($s)) {
$lang = addslashes($row['lang']);
$id_article = $row['id_article'];
- spip_query ("UPDATE spip_articles
+ spip_query("UPDATE spip_articles
SET lang='$lang', langue_choisie='non' WHERE id_article=$id_article");
}
// breves
- $s = spip_query ("SELECT fils.id_breve AS id_breve, mere.lang AS lang
+ $s = spip_query("SELECT fils.id_breve AS id_breve, mere.lang AS lang
FROM spip_breves AS fils, spip_rubriques AS mere
WHERE fils.id_rubrique = mere.id_rubrique
AND fils.langue_choisie != 'oui' AND (fils.lang='' OR mere.lang<>'')
@@ -203,14 +203,14 @@ function calculer_langues_rubriques() {
while ($row = spip_fetch_array($s)) {
$lang = addslashes($row['lang']);
$id_breve = $row['id_breve'];
- spip_query ("UPDATE spip_breves
+ spip_query("UPDATE spip_breves
SET lang='$lang', langue_choisie='non' WHERE id_breve=$id_breve");
}
if ($GLOBALS['meta']['multi_rubriques'] == 'oui') {
// Ecrire meta liste langues utilisees dans rubriques
include_spip('inc/meta');
- $s = spip_query ("SELECT lang FROM spip_rubriques
+ $s = spip_query("SELECT lang FROM spip_rubriques
WHERE lang != '' GROUP BY lang");
while ($row = spip_fetch_array($s)) {
$lang_utilisees[] = $row['lang'];
diff --git a/ecrire/inc/session.php b/ecrire/inc/session.php
index 75c1e10844..2f10397b51 100644
--- a/ecrire/inc/session.php
+++ b/ecrire/inc/session.php
@@ -49,7 +49,7 @@ function ajouter_session($auteur, $id_session, $lang='') {
global $connect_id_auteur, $auteur_session;
if ($lang) {
- spip_query ("UPDATE spip_auteurs SET lang = '". addslashes($lang) .
+ spip_query("UPDATE spip_auteurs SET lang = '". addslashes($lang) .
"' WHERE id_auteur = $connect_id_auteur");
$auteur_session['lang'] = $lang;
}
@@ -71,7 +71,7 @@ function ajouter_session($auteur, $id_session, $lang='') {
function update_prefs_session($prefs, $id_auteur)
{
- spip_query ("UPDATE spip_auteurs SET prefs = '".addslashes(serialize($prefs))."' WHERE id_auteur = $id_auteur");
+ spip_query("UPDATE spip_auteurs SET prefs = '".addslashes(serialize($prefs))."' WHERE id_auteur = $id_auteur");
}
//
diff --git a/ecrire/inc/syndic.php b/ecrire/inc/syndic.php
index 3a1e52944e..3ca6741380 100644
--- a/ecrire/inc/syndic.php
+++ b/ecrire/inc/syndic.php
@@ -335,8 +335,7 @@ function inserer_article_syndique ($data, $now_id_syndic, $statut, $url_site, $u
// Creer le lien s'il est nouveau - cle=(id_syndic,url)
$le_lien = substr($data['url'], 0,255);
- if (spip_num_rows(spip_query(
- "SELECT * FROM spip_syndic_articles
+ if (spip_num_rows(spip_query("SELECT * FROM spip_syndic_articles
WHERE url='".addslashes($le_lien)."'
AND id_syndic=$now_id_syndic"
)) == 0 and !spip_sql_error()) {
@@ -381,7 +380,7 @@ function inserer_article_syndique ($data, $now_id_syndic, $statut, $url_site, $u
}
// Mise a jour du contenu (titre,auteurs,description,date?,source...)
- spip_query ("UPDATE spip_syndic_articles SET
+ spip_query("UPDATE spip_syndic_articles SET
titre='".addslashes($data['titre'])."',
".$update_date."
lesauteurs='".addslashes($data['lesauteurs'])."',
@@ -410,8 +409,8 @@ function inserer_article_syndique ($data, $now_id_syndic, $statut, $url_site, $u
function syndic_a_jour($now_id_syndic, $statut = 'off') {
include_spip('inc/texte');
- $query = "SELECT * FROM spip_syndic WHERE id_syndic='$now_id_syndic'";
- $result = spip_query($query);
+ $result = spip_query("SELECT * FROM spip_syndic WHERE id_syndic='$now_id_syndic'");
+
if (!$row = spip_fetch_array($result))
return;
diff --git a/ecrire/inc/texte.php b/ecrire/inc/texte.php
index ad076e1858..ce8917be32 100644
--- a/ecrire/inc/texte.php
+++ b/ecrire/inc/texte.php
@@ -527,32 +527,32 @@ function extraire_lien ($regs) {
case 'ru':
$lien_url = generer_url_rubrique($id_lien);
if (!$lien_texte) {
- $req = "select titre from spip_rubriques where id_rubrique=$id_lien";
- $row = @spip_fetch_array(@spip_query($req));
+ $row = @spip_fetch_array(spip_query("SELECT titre FROM spip_rubriques WHERE id_rubrique=$id_lien"));
+
$lien_texte = $row['titre'];
}
break;
case 'br':
$lien_url = generer_url_breve($id_lien);
if (!$lien_texte) {
- $req = "select titre from spip_breves where id_breve=$id_lien";
- $row = @spip_fetch_array(@spip_query($req));
+ $row = @spip_fetch_array(spip_query("SELECT titre FROM spip_breves WHERE id_breve=$id_lien"));
+
$lien_texte = $row['titre'];
}
break;
case 'au':
$lien_url = generer_url_auteur($id_lien);
if (!$lien_texte) {
- $req = "select nom from spip_auteurs where id_auteur = $id_lien";
- $row = @spip_fetch_array(@spip_query($req));
+ $row = @spip_fetch_array(spip_query("SELECT nom FROM spip_auteurs WHERE id_auteur = $id_lien"));
+
$lien_texte = $row['nom'];
}
break;
case 'mo':
$lien_url = generer_url_mot($id_lien);
if (!$lien_texte) {
- $req = "select titre from spip_mots where id_mot=$id_lien";
- $row = @spip_fetch_array(@spip_query($req));
+ $row = @spip_fetch_array(spip_query("SELECT titre FROM spip_mots WHERE id_mot=$id_lien"));
+
$lien_texte = $row['titre'];
}
break;
@@ -560,9 +560,8 @@ function extraire_lien ($regs) {
case 'do':
$lien_url = generer_url_document($id_lien);
if (!$lien_texte) {
- $req = "select titre,fichier from spip_documents
- WHERE id_document=$id_lien";
- $row = @spip_fetch_array(@spip_query($req));
+ $row = @spip_fetch_array(spip_query("SELECT titre,fichier FROM spip_documents WHERE id_document=$id_lien"));
+
$lien_texte = $row['titre'];
if (!$lien_texte)
$lien_texte = ereg_replace("^.*/","",$row['fichier']);
@@ -571,8 +570,7 @@ function extraire_lien ($regs) {
case 'si':
# attention dans le cas des sites le lien pointe non pas sur
# la page locale du site, mais directement sur le site lui-meme
- $row = @spip_fetch_array(@spip_query("SELECT nom_site,url_site
- FROM spip_syndic WHERE id_syndic=$id_lien"));
+ $row = @spip_fetch_array(spip_query("SELECT nom_site,url_site FROM spip_syndic WHERE id_syndic=$id_lien"));
if ($row) {
$lien_url = $row['url_site'];
if (!$lien_texte)
@@ -582,8 +580,8 @@ function extraire_lien ($regs) {
default:
$lien_url = generer_url_article($id_lien);
if (!$lien_texte) {
- $req = "select titre from spip_articles where id_article=$id_lien";
- $row = @spip_fetch_array(@spip_query($req));
+ $row = @spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id_lien"));
+
$lien_texte = $row['titre'];
}
--
GitLab