From e6c2ae1003223b929fd88bfdbb4a90f5dee7d33f Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 23 Apr 2006 20:02:03 +0000
Subject: [PATCH] =?UTF-8?q?T=C3=A2che=20#209:=20normalisation=20des=20appe?=
=?UTF-8?q?ls=20=C3=A0=20spip=5Fquery:=20=09-=20ne=20plus=20utiliser=20la?=
=?UTF-8?q?=20forme:=20list($x)=20=3D=20spip=5Fquery("SELECT...=20=09-=20f?=
=?UTF-8?q?aire=20apparaitre=20explicitement=20FROM,=20WHERE=20etc=20si=20?=
=?UTF-8?q?pr=C3=A9sent=20=09-=20avoir=20tout=20l'appel=20sur=20une=20seul?=
=?UTF-8?q?e=20ligne,=20termin=C3=A9e=20par=20";".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/balise/formulaire_admin.php | 27 +++++------
ecrire/balise/formulaire_inscription.php | 15 ++----
ecrire/balise/formulaire_signature.php | 4 +-
ecrire/exec/recherche.php | 7 +--
ecrire/inc/agenda.php | 60 ++++--------------------
ecrire/inc/ajax.php | 5 +-
ecrire/inc/article_select.php | 3 +-
ecrire/inc/auteur_voir.php | 14 ++----
ecrire/inc/auth_spip.php | 3 +-
ecrire/inc/boutons.php | 3 +-
ecrire/inc/config.php | 3 +-
ecrire/inc/documents.php | 36 ++++----------
ecrire/inc/forum.php | 17 ++-----
ecrire/inc/forum_insert.php | 20 +-------
ecrire/inc/getdocument.php | 9 ++--
ecrire/inc/indexation.php | 22 ++++-----
ecrire/inc/invalideur.php | 16 +++----
ecrire/inc/mail.php | 3 +-
ecrire/inc/message_select.php | 4 +-
ecrire/inc/mots.php | 17 +++----
ecrire/inc/popularites.php | 6 +--
ecrire/inc/presentation.php | 12 ++---
ecrire/inc/session.php | 3 +-
ecrire/inc/signatures.php | 4 +-
ecrire/inc/urls.php | 16 +++----
ecrire/inc/visites.php | 38 ++++-----------
26 files changed, 109 insertions(+), 258 deletions(-)
diff --git a/ecrire/balise/formulaire_admin.php b/ecrire/balise/formulaire_admin.php
index fbc4431164..b6c759cb1f 100644
--- a/ecrire/balise/formulaire_admin.php
+++ b/ecrire/balise/formulaire_admin.php
@@ -58,13 +58,13 @@ function balise_FORMULAIRE_ADMIN_dyn($float='', $debug='') {
// Ne pas afficher le bouton 'Modifier ce...' si l'objet n'existe pas
foreach (array('article', 'breve', 'rubrique', 'mot', 'auteur', 'syndic') as $type) {
$id_type = id_table_objet($type);
- if (!($$id_type = intval($$id_type)
- AND $s = spip_query("SELECT $id_type FROM spip_".table_objet($type)." WHERE $id_type=".$$id_type)
- AND spip_num_rows($s)))
- $$id_type='';
- else {
- $objet_affiche = $type;
- break;
+ if ($n = intval($$id_type)) {
+ $s = spip_query("SELECT $id_type FROM spip_".table_objet($type)." WHERE $id_type=".$$id_type);
+ if ($s AND spip_num_rows($s)) {
+ $$id_type = $n;
+ $objet_affiche = $type;
+ break;
+ }
}
}
@@ -111,26 +111,21 @@ function balise_FORMULAIRE_ADMIN_dyn($float='', $debug='') {
$ecrire = _DIR_RESTREINT_ABS;
// Bouton "preview" si l'objet demande existe et est previsualisable
+ $preview = false;
+
if (!$GLOBALS['var_preview'] AND (
(($GLOBALS['meta']['preview']=='1comite'
AND $GLOBALS['auteur_session']['statut'] =='1comite')
OR ($GLOBALS['meta']['preview']<>''
AND $GLOBALS['auteur_session']['statut'] =='0minirezo'))
)) {
- if ($objet_affiche == 'article' AND $GLOBALS['meta']['post_dates'] != 'oui')
- $postdates = "OR (statut='publie' AND date>NOW())";
+ $p = ($objet_affiche == 'article' AND $GLOBALS['meta']['post_dates'] != 'oui');
if ($objet_affiche == 'article'
OR $objet_affiche == 'breve'
OR $objet_affiche == 'rubrique'
OR $objet_affiche == 'syndic')
- if (spip_num_rows(spip_query("SELECT id_$objet_affiche FROM spip_".table_objet($objet_affiche)."
- WHERE ".id_table_objet($objet_affiche)."=".$$id_type."
- AND (
- (statut IN ('prop', 'prive'))
- $postdates
- )")))
- $preview = true;
+ $preview = spip_num_rows(spip_query("SELECT id_$objet_affiche FROM spip_".table_objet($objet_affiche)." WHERE ".id_table_objet($objet_affiche)."=".$$id_type." AND ((statut IN ('prop', 'prive')) " . (!$p ? '' : "OR (statut='publie' AND date>NOW())") .")"));
}
return array('formulaire_admin', 0,
diff --git a/ecrire/balise/formulaire_inscription.php b/ecrire/balise/formulaire_inscription.php
index 3e218e256e..eee0e3228a 100644
--- a/ecrire/balise/formulaire_inscription.php
+++ b/ecrire/balise/formulaire_inscription.php
@@ -104,11 +104,8 @@ function message_inscription($mail, $nom, $mode, $id_rubrique=0) {
if (is_string($declaration))
return $declaration;
- $s = spip_query("SELECT statut, id_auteur, login, email
- FROM spip_auteurs WHERE email='".
- addslashes($declaration['email']) .
- "'");
- $row = spip_fetch_array($s);
+ $row = spip_fetch_array(spip_query("SELECT statut, id_auteur, login, email FROM spip_auteurs WHERE email='". addslashes($declaration['email']) . "'"));
+
if (!$row)
// il n'existe pas, creer les identifiants
return inscription_nouveau($declaration);
@@ -192,8 +189,8 @@ function test_login($nom, $mail) {
$login = $login_base;
for ($i = 1; ; $i++) {
- if (!spip_num_rows(spip_query("SELECT id_auteur FROM spip_auteurs WHERE login='$login' LIMIT 1")))
- return $login;
+ $n = spip_num_rows(spip_query("SELECT id_auteur FROM spip_auteurs WHERE login='$login' LIMIT 1"));
+ if (!$n) return $login;
$login = $login_base.$i;
}
}
@@ -203,9 +200,7 @@ function creer_pass_pour_auteur($id_auteur) {
$pass = creer_pass_aleatoire(8, $id_auteur);
$mdpass = md5($pass);
$htpass = generer_htpass($pass);
- spip_query("UPDATE spip_auteurs
- SET pass='$mdpass', htpass='$htpass'
- WHERE id_auteur = ".intval($id_auteur));
+ spip_query("UPDATE spip_auteurs SET pass='$mdpass', htpass='$htpass' WHERE id_auteur = ".intval($id_auteur));
ecrire_acces();
return $pass;
diff --git a/ecrire/balise/formulaire_signature.php b/ecrire/balise/formulaire_signature.php
index 1752deb4ba..3c53518ff4 100644
--- a/ecrire/balise/formulaire_signature.php
+++ b/ecrire/balise/formulaire_signature.php
@@ -154,9 +154,7 @@ function reponse_confirmation($id_article, $var_confirm = '') {
$confirm= (_T('form_deja_inscrit'));
}
else {
- $result = spip_query("UPDATE spip_signatures
- SET statut='publie', date_time=NOW()
- WHERE id_signature='$id_signature'");
+ spip_query("UPDATE spip_signatures SET statut='publie', date_time=NOW() WHERE id_signature='$id_signature'");
// invalider les pages ayant des boucles signatures
include_spip('inc/invalideur');
diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php
index 386cc0f4f1..b083e4c28d 100644
--- a/ecrire/exec/recherche.php
+++ b/ecrire/exec/recherche.php
@@ -61,7 +61,6 @@ function exec_recherche_dist()
$query_breves['WHERE']= ($testnum ? "(id_breve = $recherche)" : '') . $where;
$query_rubriques['WHERE']= ($testnum ? "(id_rubrique = $recherche)" : '') . $where;
$query_sites['WHERE']= ($testnum ? "(id_syndic = $recherche)" : '') . ereg_replace("titre LIKE", "nom_site LIKE",$where);
- }
$query_articles['ORDER BY']= "date_modif DESC";
$query_breves['ORDER BY']= "maj DESC";
@@ -80,6 +79,7 @@ function exec_recherche_dist()
}
$nba = afficher_articles (_T('info_articles_trouves'), $query_articles);
+
if ($activer_moteur) {
if ($nba) {
$doublons = join($nba, ",");
@@ -89,6 +89,7 @@ function exec_recherche_dist()
}
$nbb = afficher_breves (_T('info_breves_touvees'), $query_breves, true);
+
if ($activer_moteur) {
if ($nbb) {
$doublons = join($nbb, ",");
@@ -96,7 +97,7 @@ function exec_recherche_dist()
}
$nbb1 = afficher_breves (_T('info_breves_touvees_dans_texte'), $query_breves_int, true);
}
-
+
$nbr = afficher_rubriques (_T('info_rubriques_trouvees'), $query_rubriques);
if ($activer_moteur) {
if ($nbr) {
@@ -121,7 +122,7 @@ function exec_recherche_dist()
echo "<FONT FACE='Verdana,Arial,Sans,sans-serif'>"._T('avis_aucun_resultat')."</FONT><P>";
}
-echo "<p>";
+ }
fin_page();
}
diff --git a/ecrire/inc/agenda.php b/ecrire/inc/agenda.php
index 3bc9e55e8e..86f0e6d892 100644
--- a/ecrire/inc/agenda.php
+++ b/ecrire/inc/agenda.php
@@ -1074,10 +1074,7 @@ 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
-"));
+ $result= spip_fetch_array(spip_query("SELECT " . (($objet != 'id_breve') ? 'id_secteur' : 'id_rubrique') . " FROM $table WHERE $objet=$num"));
if ($result) $num = $result[0];
return 'calendrier-couleur' . (($num%14)+1);
}
@@ -1127,11 +1124,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 FROM spip_forum WHERE
- date_heure >= $avant
- AND date_heure < $apres
-ORDER BY date_heure
-");
+ $result=spip_query("SELECT DISTINCT titre, date_heure, id_forum FROM spip_forum WHERE date_heure >= $avant AND date_heure < $apres ORDER BY date_heure");
while($row=spip_fetch_array($result)){
$amj = date_anneemoisjour($row['date_heure']);
$id = $row['id_forum'];
@@ -1150,12 +1143,7 @@ ORDER BY date_heure
function sql_calendrier_interval_articles($avant, $apres, &$evenements) {
- $result=spip_query("SELECT id_article, titre, date, descriptif, chapo FROM spip_articles WHERE
- statut='publie'
- AND date >= $avant
- AND date < $apres
-ORDER BY date
-");
+ $result=spip_query("SELECT id_article, titre, date, descriptif, chapo FROM spip_articles WHERE statut='publie' AND date >= $avant AND date < $apres ORDER BY date");
while($row=spip_fetch_array($result)){
$amj = date_anneemoisjour($row['date']);
$id = $row['id_article'];
@@ -1170,13 +1158,7 @@ ORDER BY date
function sql_calendrier_interval_rubriques($avant, $apres, &$evenements) {
- $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
- AND date < $apres
- AND R.id_rubrique = L.id_rubrique
-ORDER BY 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 AND date < $apres AND R.id_rubrique = L.id_rubrique ORDER BY date");
while($row=spip_fetch_array($result)){
$amj = date_anneemoisjour($row['date']);
$id = $row['id_rubrique'];
@@ -1190,12 +1172,7 @@ ORDER BY date
}
function sql_calendrier_interval_breves($avant, $apres, &$evenements) {
- $result=spip_query("SELECT id_breve, titre, date_heure, id_rubrique FROM spip_breves WHERE
- statut='publie'
- AND date_heure >= $avant
- AND date_heure < $apres
-ORDER BY date_heure
-");
+ $result=spip_query("SELECT id_breve, titre, date_heure, id_rubrique FROM spip_breves WHERE statut='publie' AND date_heure >= $avant AND date_heure < $apres ORDER BY date_heure");
while($row=spip_fetch_array($result)){
$amj = date_anneemoisjour($row['date_heure']);
$id = $row['id_breve'];
@@ -1212,15 +1189,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, messages.date_heure, messages.date_fin, messages.type FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE
- ((lien.id_auteur='$connect_id_auteur'
- AND lien.id_message=messages.id_message) OR messages.type='affich')
- AND messages.rv='oui'
- AND ((messages.date_fin >= $avant OR messages.date_heure >= $avant) AND messages.date_heure <= $apres)
- AND messages.statut='publie'
-GROUP BY messages.id_message
-ORDER BY messages.date_heure
-");
+ $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 WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND ((messages.date_fin >= $avant OR messages.date_heure >= $avant) AND messages.date_heure <= $apres) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure");
while($row=spip_fetch_array($result)){
$date_heure=$row["date_heure"];
$date_fin=$row["date_fin"];
@@ -1238,10 +1207,7 @@ ORDER BY messages.date_heure
else {
$cat = 'calendrier-couleur9';
$auteurs = array();
- $result_aut=spip_query("SELECT nom FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien WHERE
- (lien.id_message='$id_message'
- AND (auteurs.id_auteur!='$connect_id_auteur'
- AND lien.id_auteur=auteurs.id_auteur))");
+ $result_aut=spip_query("SELECT nom FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien WHERE (lien.id_message='$id_message' AND (auteurs.id_auteur!='$connect_id_auteur' AND lien.id_auteur=auteurs.id_auteur))");
while($row_auteur=spip_fetch_array($result_aut)){
$auteurs[] = $row_auteur['nom'];
}
@@ -1312,17 +1278,7 @@ function sql_calendrier_taches_rv () {
global $connect_id_auteur;
$r = array();
if (!$connect_id_auteur) return $r;
- $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)
- OR messages.type='affich')
-AND messages.rv='oui'
-AND ( (messages.date_heure > DATE_SUB(NOW(), INTERVAL 1 DAY)
- AND messages.date_heure < DATE_ADD(NOW(), INTERVAL 1 MONTH))
- OR (messages.date_heure < NOW() AND messages.date_fin > NOW() ))
-AND messages.statut='publie'
-GROUP BY messages.id_message
-ORDER BY messages.date_heure");
+ $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) OR messages.type='affich') AND messages.rv='oui' AND ( (messages.date_heure > DATE_SUB(NOW(), INTERVAL 1 DAY) AND messages.date_heure < DATE_ADD(NOW(), INTERVAL 1 MONTH)) OR (messages.date_heure < NOW() AND messages.date_fin > NOW() )) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure");
if (spip_num_rows($result) > 0){
$r = array();
while ($x = spip_fetch_array($result)) $r[] = $x;
diff --git a/ecrire/inc/ajax.php b/ecrire/inc/ajax.php
index 083580e46a..7c50694e64 100644
--- a/ecrire/inc/ajax.php
+++ b/ecrire/inc/ajax.php
@@ -10,13 +10,10 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-
-//
if (!defined("_ECRIRE_INC_VERSION")) return;
function cron_ajax ($t) {
- spip_query("DELETE FROM spip_ajax_fonc
- WHERE date < DATE_SUB(NOW(), INTERVAL 2 HOUR)");
+ spip_query("DELETE FROM spip_ajax_fonc WHERE date < DATE_SUB(NOW(), INTERVAL 2 HOUR)");
return 1;
}
diff --git a/ecrire/inc/article_select.php b/ecrire/inc/article_select.php
index 3627b0c6e3..8553adca60 100644
--- a/ecrire/inc/article_select.php
+++ b/ecrire/inc/article_select.php
@@ -75,7 +75,8 @@ else if ($new=='oui') {
$id_parent = $row_rub['id_parent'];
}
- if ($row_rub = spip_fetch_array(spip_query("SELECT id_rubrique FROM spip_rubriques WHERE lang='$spip_lang' AND id_parent=$id_parent"))) {
+ $row_rub = spip_fetch_array(spip_query("SELECT id_rubrique FROM spip_rubriques WHERE lang='$spip_lang' AND id_parent=$id_parent"));
+ if ($row_rub) {
$id_rubrique = $row['id_secteur'] = $row['id_rubrique'] = $row_rub['id_rubrique'];
$changer_lang = 'herit';
}
diff --git a/ecrire/inc/auteur_voir.php b/ecrire/inc/auteur_voir.php
index 8dabecd9ee..bc2e49a005 100644
--- a/ecrire/inc/auteur_voir.php
+++ b/ecrire/inc/auteur_voir.php
@@ -25,15 +25,11 @@ function cadre_auteur_infos($id_auteur, $auteur)
// "Voir en ligne" si l'auteur a un article publie
// seuls les admins peuvent "previsualiser" une page auteur
-if (spip_num_rows(spip_query("SELECT lien.id_article
-FROM spip_auteurs_articles AS lien,
-spip_articles AS articles
-WHERE lien.id_auteur=$id_auteur
-AND lien.id_article=articles.id_article
-AND articles.statut='publie'")))
- voir_en_ligne ('auteur', $id_auteur, 'publie');
-else if ($connect_statut == '0minirezo')
- voir_en_ligne ('auteur', $id_auteur, 'prop');
+ $n = spip_num_rows(spip_query("SELECT lien.id_article FROM spip_auteurs_articles AS lien, spip_articles AS articles WHERE lien.id_auteur=$id_auteur AND lien.id_article=articles.id_article AND articles.statut='publie'"));
+ if ($n)
+ voir_en_ligne ('auteur', $id_auteur, 'publie');
+ else if ($connect_statut == '0minirezo')
+ voir_en_ligne ('auteur', $id_auteur, 'prop');
fin_boite_info();
}
diff --git a/ecrire/inc/auth_spip.php b/ecrire/inc/auth_spip.php
index d6108e44b4..dd2253e15a 100644
--- a/ecrire/inc/auth_spip.php
+++ b/ecrire/inc/auth_spip.php
@@ -62,8 +62,7 @@ class Auth_spip {
$connect_statut =
($GLOBALS['meta']['accepter_inscriptions'] == 'oui') ?
'1comite' : '6forum';
- spip_query("UPDATE spip_auteurs SET statut='$connect_statut'
- WHERE login='".addslashes($this->login)."'");
+ spip_query("UPDATE spip_auteurs SET statut='$connect_statut' WHERE login='".addslashes($this->login)."'");
}
if ($this->md5next) {
include_spip('inc/session');
diff --git a/ecrire/inc/boutons.php b/ecrire/inc/boutons.php
index e42ad6e4e6..70973b51c7 100644
--- a/ecrire/inc/boutons.php
+++ b/ecrire/inc/boutons.php
@@ -113,7 +113,8 @@ function definir_barre_boutons() {
$sousmenu['sites_tous']=
new Bouton('site-24.gif', 'icone_sites_references');
- if (@spip_num_rows(spip_query("SELECT * FROM spip_documents_rubriques LIMIT 1")) > 0) {
+ $n = spip_num_rows(spip_query("SELECT * FROM spip_documents_rubriques LIMIT 1"));
+ if ($n) {
$sousmenu['documents_liste']=
new Bouton('doc-24.gif', 'icone_doc_rubrique');
}
diff --git a/ecrire/inc/config.php b/ecrire/inc/config.php
index 7abbcf4b64..a778a47ca8 100644
--- a/ecrire/inc/config.php
+++ b/ecrire/inc/config.php
@@ -156,8 +156,7 @@ function appliquer_modifs_config() {
// forums_publics_appliquer : futur, saufnon, tous
$accepter_forum = substr($forums_publics,0,3);
if ($forums_publics_appliquer == 'saufnon')
- spip_query("UPDATE spip_articles SET accepter_forum='$accepter_forum'
- WHERE accepter_forum != 'non'");
+ 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'");
diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php
index b337bb1e8a..b8a58ef7db 100644
--- a/ecrire/inc/documents.php
+++ b/ecrire/inc/documents.php
@@ -83,12 +83,11 @@ function image_pattern($vignette) {
function document_et_vignette($document, $url, $portfolio=false) {
// a supprimer avec spip_types_documents
- list($extension) = spip_fetch_array(spip_query("SELECT extension FROM
- spip_types_documents WHERE id_type=".$document['id_type']));
+ $extension = spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE id_type=".$document['id_type']));
+ $extension = $extension['extension'];
if ($document['id_vignette'] > 0
- AND $vignette = spip_fetch_array(spip_query("SELECT * FROM spip_documents
- WHERE id_document = ".$document['id_vignette']))) {
+ AND $vignette = spip_fetch_array(spip_query("SELECT * FROM spip_documents WHERE id_document = ".$document['id_vignette']))) {
if (!$portfolio OR !($GLOBALS['meta']['creer_preview'] == 'oui')) {
$image = image_pattern($vignette);
} else {
@@ -909,13 +908,7 @@ function afficher_documents_non_inclus($id_article, $type = "article", $flag_mod
$doublons = document_vu();
- $images_liees = spip_query("SELECT docs.*,l.id_$type FROM spip_documents AS docs, spip_documents_".$type."s AS l, spip_types_documents AS lestypes ".
- "WHERE l.id_$type=$id_article AND l.id_document=docs.id_document ".
- "AND docs.mode='document'".
- " AND docs.id_type=lestypes.id_type AND lestypes.extension IN ('gif', 'jpg', 'png')" .
-
- (!$doublons ?'':" AND docs.id_document NOT IN ($doublons) ") .
- " ORDER BY 0+docs.titre, docs.titre, docs.id_document");
+ $images_liees = spip_query("SELECT docs.*,l.id_$type FROM spip_documents AS docs, spip_documents_".$type."s AS l, spip_types_documents AS lestypes WHERE l.id_$type=$id_article AND l.id_document=docs.id_document AND docs.mode='document' AND docs.id_type=lestypes.id_type AND lestypes.extension IN ('gif', 'jpg', 'png')" . (!$doublons ?'':" AND docs.id_document NOT IN ($doublons) ") . " ORDER BY 0+docs.titre, docs.titre, docs.id_document");
//
// recuperer tout le tableau des images du portfolio
@@ -939,12 +932,7 @@ function afficher_documents_non_inclus($id_article, $type = "article", $flag_mod
$doublons = document_vu();
//// Documents associes
- $documents_lies = spip_query("SELECT docs.*,l.id_$type FROM spip_documents AS docs, spip_documents_".$type."s AS l ".
- "WHERE l.id_$type=$id_article AND l.id_document=docs.id_document ".
- "AND docs.mode='document'" .
-
- (!$doublons ? '' : " AND docs.id_document NOT IN ($doublons) ") .
- " ORDER BY 0+docs.titre, docs.titre, docs.id_document");
+ $documents_lies = spip_query("SELECT docs.*,l.id_$type FROM spip_documents AS docs, spip_documents_".$type."s AS l WHERE l.id_$type=$id_article AND l.id_document=docs.id_document AND docs.mode='document'" . (!$doublons ? '' : " AND docs.id_document NOT IN ($doublons) ") . " ORDER BY 0+docs.titre, docs.titre, docs.id_document");
$documents = array();
while ($document = spip_fetch_array($documents_lies))
@@ -1004,8 +992,7 @@ function afficher_documents_colonne($id, $type="article", $flag_modif = true) {
$documents_lies[]= $row['id_document'];
if (count($documents_lies)) {
- $res = spip_query("SELECT DISTINCT id_vignette FROM spip_documents ".
- "WHERE id_document in (".join(',', $documents_lies).")");
+ $res = spip_query("SELECT DISTINCT id_vignette FROM spip_documents WHERE id_document in (".join(',', $documents_lies).")");
while ($v = spip_fetch_array($res))
$vignettes[]= $v['id_vignette'];
$docs_exclus = ereg_replace('^,','',join(',', $vignettes).','.join(',', $documents_lies));
@@ -1352,9 +1339,7 @@ function maj_documents ($id_objet, $type) {
AND $_POST['modif_document'] == 'oui') {
// "securite" : verifier que le document est bien lie a l'objet
- $result_doc = spip_query("SELECT * FROM spip_documents_".$type."s
- WHERE id_document=".$id_document."
- AND id_".$type." = $id_objet");
+ $result_doc = spip_query("SELECT * FROM spip_documents_".$type."s WHERE id_document=".$id_document." AND id_".$type." = $id_objet");
if (spip_num_rows($result_doc) > 0) {
$titre_document = addslashes(corriger_caracteres(
$_POST['titre_document']));
@@ -1368,8 +1353,7 @@ function maj_documents ($id_objet, $type) {
hauteur='$hauteur_document'";
else $wh = "";
- spip_query("UPDATE spip_documents
- SET titre='$titre_document', descriptif='$descriptif_document' $wh WHERE id_document=".$id_document);
+ spip_query("UPDATE spip_documents SET titre='$titre_document', descriptif='$descriptif_document' $wh WHERE id_document=".$id_document);
// Date du document (uniquement dans les rubriques)
if ($_POST['jour_doc']) {
@@ -1381,9 +1365,7 @@ function maj_documents ($id_objet, $type) {
.$_POST['mois_doc'].'-'.$_POST['jour_doc'];
if (preg_match('/^[0-9-]+$/', $date)) {
- spip_query("UPDATE spip_documents
- SET date='$date'
- WHERE id_document=$id_document");
+ spip_query("UPDATE spip_documents SET date='$date' WHERE id_document=$id_document");
// Changement de date, ce qui nous oblige a :
calculer_rubriques();
diff --git a/ecrire/inc/forum.php b/ecrire/inc/forum.php
index f1a6741f4b..237192a8dd 100644
--- a/ecrire/inc/forum.php
+++ b/ecrire/inc/forum.php
@@ -150,25 +150,18 @@ 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 = 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");
while (list($id, $thread) = spip_fetch_array($r)) {
if ($thread == $precedent)
$discussion .= ",$id";
else {
if ($precedent)
- spip_query("UPDATE spip_forum SET id_thread=$precedent
- WHERE id_forum IN ($discussion)");
+ spip_query("UPDATE spip_forum SET id_thread=$precedent WHERE id_forum IN ($discussion)");
$precedent = $thread;
$discussion = "$id";
}
}
- spip_query("UPDATE spip_forum SET id_thread=$precedent
- WHERE id_forum IN ($discussion)");
+ spip_query("UPDATE spip_forum SET id_thread=$precedent WHERE id_forum IN ($discussion)");
} while ($discussion != "0");
}
@@ -229,9 +222,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
- SET accepter_forum='$forums_publics'
- WHERE id_article=".intval($id_article));
+ spip_query("UPDATE spip_articles SET accepter_forum='$forums_publics' WHERE id_article=".intval($id_article));
if ($forums_publics == 'abo') {
ecrire_meta('accepter_visiteurs', 'oui');
ecrire_metas();
diff --git a/ecrire/inc/forum_insert.php b/ecrire/inc/forum_insert.php
index 935e0586c8..aa40d242e1 100644
--- a/ecrire/inc/forum_insert.php
+++ b/ecrire/inc/forum_insert.php
@@ -207,25 +207,7 @@ function inc_forum_insert_dist() {
else
$id_thread = $id_message; # id_thread oblige INSERT puis UPDATE.
- spip_query("UPDATE spip_forum
- SET id_parent = $id_forum,
- id_rubrique = $id_rubrique,
- id_article = $id_article,
- id_breve = $id_breve,
- id_syndic = $id_syndic,
- id_auteur = $id_auteur,
- id_thread = $id_thread,
- date_heure = NOW(),
- titre = '".addslashes(corriger_caracteres($titre))."',
- texte = '".addslashes(corriger_caracteres($texte))."',
- nom_site = '".addslashes(corriger_caracteres($nom_site_forum))."',
- url_site = '".addslashes(corriger_caracteres($url_site))."',
- auteur = '".addslashes(corriger_caracteres($auteur))."',
- email_auteur = '".addslashes(corriger_caracteres($email_auteur))."',
- ip = '".addslashes($ip)."',
- statut = '$statut'
- WHERE id_forum = $id_message
- ");
+ spip_query("UPDATE spip_forum SET id_parent = $id_forum, id_rubrique = $id_rubrique, id_article = $id_article, id_breve = $id_breve, id_syndic = $id_syndic, id_auteur = $id_auteur, id_thread = $id_thread, date_heure = NOW(), titre = '".addslashes(corriger_caracteres($titre))."', texte = '".addslashes(corriger_caracteres($texte))."', nom_site = '".addslashes(corriger_caracteres($nom_site_forum))."', url_site = '".addslashes(corriger_caracteres($url_site))."', auteur = '".addslashes(corriger_caracteres($auteur))."', email_auteur = '".addslashes(corriger_caracteres($email_auteur))."', ip = '".addslashes($ip)."', statut = '$statut' WHERE id_forum = $id_message");
// Entrer les mots-cles associes
if (is_array($ajouter_mot)) mots_du_forum($ajouter_mot, $id_message);
diff --git a/ecrire/inc/getdocument.php b/ecrire/inc/getdocument.php
index ae39486d89..15ea46b63c 100644
--- a/ecrire/inc/getdocument.php
+++ b/ecrire/inc/getdocument.php
@@ -241,7 +241,8 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode,
/* STOCKER LES DOCUMENTS INCONNUS AU FORMAT .ZIP */
$ext = 'zip';
- if (!$row = spip_fetch_array(spip_query("SELECT * FROM spip_types_documents WHERE extension='zip' AND upload='oui'"))) {
+ $row = spip_fetch_array(spip_query("SELECT * FROM spip_types_documents WHERE extension='zip' AND upload='oui'"));
+ if (!$row) {
spip_log("Extension $ext interdite a l'upload");
return;
}
@@ -339,11 +340,7 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode,
}
// Mise a jour des donnees
- spip_query("UPDATE spip_documents
- SET $update
- taille='$taille', largeur='$largeur', hauteur='$hauteur',
- fichier='$fichier'
- WHERE id_document=$id_document");
+ spip_query("UPDATE spip_documents SET $update taille='$taille', largeur='$largeur', hauteur='$hauteur', fichier='$fichier' WHERE id_document=$id_document");
if ($id_document_lie) {
spip_query("UPDATE spip_documents SET id_vignette=$id_document WHERE id_document=$id_document_lie");
diff --git a/ecrire/inc/indexation.php b/ecrire/inc/indexation.php
index fe728eca8c..41d982e709 100644
--- a/ecrire/inc/indexation.php
+++ b/ecrire/inc/indexation.php
@@ -305,8 +305,7 @@ function indexer_contenu_document ($row) {
global $extracteur;
if ($row['mode'] == 'vignette') return;
- list($extension) = spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE id_type = ".$row['id_type']
- ));
+ list($extension) = spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE id_type = ".$row['id_type']));
// Voir si on sait lire le contenu (eventuellement en chargeant le
// fichier extract/pdf.php dans find_in_path() )
@@ -463,12 +462,10 @@ function indexer_objet($table, $id_objet, $forcer_reset = true) {
// 3. marquer le thread comme "en cours d'indexation"
spip_log("-> indexation thread $thread");
- spip_query("UPDATE spip_forum SET idx='idx'
- WHERE id_forum IN ($thread,$id_objet) AND idx!='non'");
+ spip_query("UPDATE spip_forum SET idx='idx' WHERE id_forum IN ($thread,$id_objet) AND idx!='non'");
// 4. Indexer le thread
- $s = spip_query("SELECT * FROM spip_forum
- WHERE id_forum IN ($thread) AND idx!='non'");
+ $s = spip_query("SELECT * FROM spip_forum WHERE id_forum IN ($thread) AND idx!='non'");
while ($row = spip_fetch_array($s)) {
indexer_les_champs($row,$INDEX_elements_objet[$table]);
if (isset($INDEX_objet_associes[$table]))
@@ -478,8 +475,7 @@ function indexer_objet($table, $id_objet, $forcer_reset = true) {
}
// 5. marquer le thread comme "indexe"
- spip_query("UPDATE spip_forum SET idx='oui'
- WHERE id_forum IN ($thread,$id_objet) AND idx!='non'");
+ spip_query("UPDATE spip_forum SET idx='oui' WHERE id_forum IN ($thread,$id_objet) AND idx!='non'");
// 6. Changer l'id_objet en id_forum de la racine du thread
$id_objet = $id_forum;
@@ -586,8 +582,7 @@ function effectuer_une_indexation($nombre_indexations = 1) {
// (statut d'indexation inconnu), enfin les 'idx' (ceux dont
// l'indexation a precedemment echoue, p. ex. a cause d'un timeout)
foreach (array('1', '', 'idx') as $mode) {
- $s = spip_query("SELECT $table_primary AS id FROM $table
- WHERE idx='$mode' AND $critere LIMIT $limit");
+ $s = spip_query("SELECT $table_primary AS id FROM $table WHERE idx='$mode' AND $critere LIMIT $limit");
while ($t = spip_fetch_array($s)) {
$vu[$table] .= $t['id'].", ";
indexer_objet($table, $t['id'], $mode);
@@ -600,7 +595,8 @@ function effectuer_une_indexation($nombre_indexations = 1) {
function executer_une_indexation_syndic() {
$id_syndic = 0;
- if ($row = spip_fetch_array(spip_query("SELECT id_syndic FROM spip_syndic WHERE statut='publie' AND date_index < DATE_SUB(NOW(), INTERVAL 7 DAY) ORDER BY date_index LIMIT 1"))) {
+ $row = spip_fetch_array(spip_query("SELECT id_syndic FROM spip_syndic WHERE statut='publie' AND date_index < DATE_SUB(NOW(), INTERVAL 7 DAY) ORDER BY date_index LIMIT 1"));
+ if ($row) {
$id_syndic = $row['id_syndic'];
spip_query("UPDATE spip_syndic SET date_index=NOW() WHERE id_syndic=$id_syndic");
marquer_indexer('syndic', $id_syndic);
@@ -737,9 +733,7 @@ function prepare_recherche($recherche, $primary = 'id_article', $id_table='artic
$index_id_table = id_index_table($nom_table);
$points = array();
- $s = spip_query("SELECT hash,points,id_objet as id
- FROM spip_index
- WHERE hash IN ($hash_recherche) AND id_table='$index_id_table'");
+ $s = spip_query("SELECT hash,points,id_objet as id FROM spip_index WHERE hash IN ($hash_recherche) AND id_table='$index_id_table'");
while ($r = spip_fetch_array($s))
$points[$r['id']]
diff --git a/ecrire/inc/invalideur.php b/ecrire/inc/invalideur.php
index 8e8d4a3b8d..1ee025de81 100644
--- a/ecrire/inc/invalideur.php
+++ b/ecrire/inc/invalideur.php
@@ -36,8 +36,7 @@ function maj_invalideurs ($fichier, &$page, $duree) {
# entre un invalideur et un appel public de page
$bedtime = time() + $duree + 3600;
$taille = @filesize(_DIR_CACHE . $fichier);
- spip_query("INSERT IGNORE INTO spip_caches (fichier,id,type,taille)
- VALUES ('".addslashes($fichier)."','$bedtime','t','$taille')");
+ spip_query("INSERT IGNORE INTO spip_caches (fichier,id,type,taille) VALUES ('".addslashes($fichier)."','$bedtime','t','$taille')");
// invalidations
insere_invalideur($page['invalideurs'], $fichier);
@@ -53,8 +52,7 @@ function insere_invalideur($inval, $fichier) {
$values = array();
foreach($a as $k => $v)
$values[] = "('$fichier', '$type/$k')";
- spip_query("INSERT IGNORE INTO spip_caches
- (fichier, id) VALUES " . join(", ", $values));
+ spip_query("INSERT IGNORE INTO spip_caches (fichier, id) VALUES " . join(", ", $values));
}
}
}
@@ -92,8 +90,7 @@ function applique_invalideur($depart) {
$tous = "'".join("', '", $depart)."'";
spip_log("applique $tous");
- spip_query("UPDATE spip_caches SET type='x'"
- . ' WHERE ' . calcul_mysql_in('fichier', $tous));
+ spip_query("UPDATE spip_caches SET type='x' WHERE " . calcul_mysql_in('fichier', $tous));
// Demander a inc-public de retirer les caches
// invalides ;
@@ -162,15 +159,14 @@ function cron_invalideur($t) {
// A revoir: il semble y avoir une desynchro ici.
- list ($total_cache) = spip_fetch_array(spip_query("SELECT SUM(taille)
- FROM spip_caches WHERE type IN ('t', 'x')"));
+ $t = spip_fetch_array(spip_query("SELECT SUM(taille) AS n FROM spip_caches WHERE type IN ('t', 'x')"));
+ $total_cache = $t['n'];
spip_log("Taille du CACHE: $total_cache octets");
global $quota_cache;
$total_cache -= $quota_cache*1024*1024;
if ($quota_cache > 0 AND $total_cache > 0) {
- $q = spip_query("SELECT id, taille FROM spip_caches
- WHERE type IN ('t', 'x') ORDER BY id");
+ $q = spip_query("SELECT id, taille FROM spip_caches WHERE type IN ('t', 'x') ORDER BY id");
while ($r = spip_fetch_array($q)
AND ($total_cache > $taille_supprimee)) {
$date_limite = $r['id'];
diff --git a/ecrire/inc/mail.php b/ecrire/inc/mail.php
index 303d5b42d0..5250dc9dea 100644
--- a/ecrire/inc/mail.php
+++ b/ecrire/inc/mail.php
@@ -227,7 +227,8 @@ function envoyer_mail_proposition($id_article) {
$suivi_edito = $GLOBALS['meta']["suivi_edito"];
if ($suivi_edito == "oui") {
- if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_articles WHERE id_article = $id_article"))) {
+ $row = spip_fetch_array(spip_query("SELECT * FROM spip_articles WHERE id_article = $id_article"));
+ if ($row) {
$lang_utilisateur = $GLOBALS['spip_lang'];
changer_langue($row['lang']);
diff --git a/ecrire/inc/message_select.php b/ecrire/inc/message_select.php
index 2b307ad52e..68ea963c7b 100644
--- a/ecrire/inc/message_select.php
+++ b/ecrire/inc/message_select.php
@@ -25,7 +25,7 @@ function afficher_messages($titre_table, $from, $where, &$messages_vus, $affiche
if (! ($obligatoire OR ($cpt = $cpt['n']))) return ;
$nb_aff = 1.5 * _TRANCHES;
- $def_aff = intval(_request('t_' .$tmp_var));
+ $deb_aff = intval(_request('t_' .$tmp_var));
if ($cpt > $nb_aff) {
$nb_aff = (_TRANCHES);
@@ -40,7 +40,7 @@ function afficher_messages($titre_table, $from, $where, &$messages_vus, $affiche
echo "<TABLE WIDTH='100%' CELLPADDING='2' CELLSPACING='0' BORDER='0'>";
echo $tranches;
- $result_message = spip_query("SELECT messages.* FROM $from WHERE $where ORDER BY date_heure DESC LIMIT " . $deb_aff . ", $nb_aff")
+ $result_message = spip_query("SELECT messages.* FROM $from WHERE $where ORDER BY date_heure DESC LIMIT $deb_aff, $nb_aff");
;
while($row = spip_fetch_array($result_message)) {
$vals = array();
diff --git a/ecrire/inc/mots.php b/ecrire/inc/mots.php
index 13c6ee69e4..33ca6c78f2 100644
--- a/ecrire/inc/mots.php
+++ b/ecrire/inc/mots.php
@@ -130,14 +130,13 @@ function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot,
$url_base = "sites";
}
- list($nombre_mots) = spip_fetch_array(spip_query("SELECT COUNT(*) FROM spip_mots AS mots, spip_mots_$table AS lien WHERE lien.$table_id=$id_objet AND mots.id_mot=lien.id_mot"));
+ $cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_mots AS mots, spip_mots_$table AS lien WHERE lien.$table_id=$id_objet AND mots.id_mot=lien.id_mot"));
- if (!$nombre_mots) {
+ if (!($nombre_mots = $cpt['n'])) {
if (!$flag_editable) return;
- list($nombre_groupes) = spip_fetch_array(spip_query("SELECT COUNT(*) FROM spip_groupes_mots WHERE $table = 'oui'
- AND ".substr($connect_statut,1)." = 'oui'"));
+ $cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_groupes_mots WHERE $table = 'oui' AND ".substr($connect_statut,1)." = 'oui'"));
- if (!$nombre_groupes) return;
+ if (!$cpt['n']) return;
}
echo "<a name='mots'></a>";
@@ -260,8 +259,7 @@ function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot,
}
if ($flag_editable && ($supp_mot = intval($supp_mot))) {
- $result = spip_query("DELETE FROM spip_mots_$table WHERE $table_id=$id_objet" .
- (($supp_mot == -1) ? "" : " AND id_mot=$supp_mot"));
+ $result = spip_query("DELETE FROM spip_mots_$table WHERE $table_id=$id_objet" . (($supp_mot == -1) ? "" : " AND id_mot=$supp_mot"));
$reindexer = true;
}
@@ -419,10 +417,7 @@ function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot,
echo "<table border='0' width='100%' style='text-align: $spip_lang_right'>";
- $result_groupes = spip_query("SELECT *, ".creer_objet_multi ("titre", "$spip_lang")." FROM spip_groupes_mots WHERE $table = 'oui'
- AND ".substr($connect_statut,1)." = 'oui' AND (unseul != 'oui' OR
- (unseul = 'oui' AND id_groupe NOT IN ($id_groupes_vus)))
- ORDER BY multi");
+ $result_groupes = spip_query("SELECT *, ".creer_objet_multi ("titre", "$spip_lang")." FROM spip_groupes_mots WHERE $table = 'oui' AND ".substr($connect_statut,1)." = 'oui' AND (unseul != 'oui' OR (unseul = 'oui' AND id_groupe NOT IN ($id_groupes_vus))) ORDER BY multi");
// Afficher un menu par groupe de mots
diff --git a/ecrire/inc/popularites.php b/ecrire/inc/popularites.php
index 8fb4731a76..60a272c027 100644
--- a/ecrire/inc/popularites.php
+++ b/ecrire/inc/popularites.php
@@ -45,8 +45,7 @@ function calculer_popularites() {
spip_query("UPDATE spip_articles SET maj=maj, popularite = popularite * $a");
// enregistrer les metas...
- $row = spip_fetch_array(spip_query("SELECT MAX(popularite) AS max, SUM(popularite) AS tot 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", $row['max']);
ecrire_meta("popularite_total", $row['tot']);
@@ -59,8 +58,7 @@ function calculer_popularites() {
$aujourdhui = date("Y-m-d");
if ($date = $GLOBALS['meta']['date_statistiques']
AND $date != $aujourdhui)
- spip_query("UPDATE spip_referers
- SET visites_veille=visites_jour, visites_jour=0");
+ spip_query("UPDATE spip_referers SET visites_veille=visites_jour, visites_jour=0");
ecrire_meta('date_statistiques', $aujourdhui);
// et c'est fini pour cette fois-ci
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index da38c70e51..143eb786f7 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -2357,8 +2357,7 @@ if (true /*$gadgets*/) {
echo "</a>";
$gadget = '';
- $vos_articles = spip_query("SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_article=lien.id_article ".
- "AND lien.id_auteur=$connect_id_auteur AND articles.statut='prepa' ORDER BY articles.date DESC LIMIT 5");
+ $vos_articles = spip_query("SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_article=lien.id_article AND lien.id_auteur=$connect_id_auteur AND articles.statut='prepa' ORDER BY articles.date DESC LIMIT 5");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
$gadget .= "<div class='bandeau_rubriques' style='z-index: 1;'>";
@@ -2374,8 +2373,7 @@ if (true /*$gadgets*/) {
$gadget .= "</div>";
}
- $vos_articles = spip_query("SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut='prop' ".
- " ORDER BY articles.date DESC LIMIT 5");
+ $vos_articles = spip_query("SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut='prop' ORDER BY articles.date DESC LIMIT 5");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
$gadget .= "<div class='bandeau_rubriques' style='z-index: 1;'>";
@@ -2392,8 +2390,7 @@ if (true /*$gadgets*/) {
$gadget .= "</div>";
}
- $vos_articles = spip_query("SELECT * FROM spip_breves WHERE statut='prop' ".
- " ORDER BY date_heure DESC LIMIT 5");
+ $vos_articles = spip_query("SELECT * FROM spip_breves WHERE statut='prop' ORDER BY date_heure DESC LIMIT 5");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
$gadget .= "<div class='bandeau_rubriques' style='z-index: 1;'>";
@@ -2973,8 +2970,7 @@ function voir_en_ligne ($type, $id, $statut=false, $image='racine-24.gif') {
switch ($type) {
case 'article':
if ($statut == "publie" AND $GLOBALS['meta']["post_dates"] == 'non'
- AND !spip_fetch_array(spip_query("SELECT id_article
- FROM spip_articles WHERE id_article=$id AND date<=NOW()")))
+ AND !spip_fetch_array(spip_query("SELECT id_article FROM spip_articles WHERE id_article=$id AND date<=NOW()")))
$statut = 'prop';
if ($statut == 'publie')
$en_ligne = 'calcul';
diff --git a/ecrire/inc/session.php b/ecrire/inc/session.php
index 2f10397b51..2cd8c1af57 100644
--- a/ecrire/inc/session.php
+++ b/ecrire/inc/session.php
@@ -49,8 +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) .
- "' WHERE id_auteur = $connect_id_auteur");
+ spip_query("UPDATE spip_auteurs SET lang = '". addslashes($lang) . "' WHERE id_auteur = $connect_id_auteur");
$auteur_session['lang'] = $lang;
}
diff --git a/ecrire/inc/signatures.php b/ecrire/inc/signatures.php
index 1a49be2465..35559eb8b0 100644
--- a/ecrire/inc/signatures.php
+++ b/ecrire/inc/signatures.php
@@ -76,7 +76,7 @@ function controle_signatures($script, $id, $debut, $where, $order, $limit='') {
echo "<p>",message_de_signature($row),"</p>";
- list($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>",
@@ -89,7 +89,7 @@ function controle_signatures($script, $id, $debut, $where, $order, $limit='') {
generer_url_action('redirect', "id_article=$id_article") :
generer_url_ecrire('articles', "id_article=$id_article")),
"'>",
- typo($titre),
+ typo($titre['titre']),
"</a>";
echo "</TD></TR></TABLE>";
diff --git a/ecrire/inc/urls.php b/ecrire/inc/urls.php
index a9f0c59f5f..435609cec4 100644
--- a/ecrire/inc/urls.php
+++ b/ecrire/inc/urls.php
@@ -18,8 +18,8 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
function generer_url_ecrire_article($id_article, $statut='') {
$args = "id_article=" . intval($id_article);
if (!$statut)
- list($statut) = spip_fetch_array(spip_query("SELECT statut FROM spip_articles WHERE $args"));
- if ($statut == 'publie')
+ $statut = spip_fetch_array(spip_query("SELECT statut FROM spip_articles WHERE $args"));
+ if ($statut['statut'] == 'publie')
return generer_url_action('redirect', $args);
else return generer_url_ecrire('articles', $args);
}
@@ -27,8 +27,8 @@ function generer_url_ecrire_article($id_article, $statut='') {
function generer_url_ecrire_rubrique($id_rubrique, $statut='') {
$args = "id_rubrique=" . intval($id_rubrique);
if (!$statut)
- list($statut) = spip_fetch_array(spip_query("SELECT statut FROM spip_rubriques WHERE $args"));
- if ($statut == 'publie')
+ $statut = spip_fetch_array(spip_query("SELECT statut FROM spip_rubriques WHERE $args"));
+ if ($statut['statut'] == 'publie')
return generer_url_action('redirect', $args);
else return generer_url_ecrire('naviguer',$args);
}
@@ -36,8 +36,8 @@ function generer_url_ecrire_rubrique($id_rubrique, $statut='') {
function generer_url_ecrire_breve($id_breve, $statut='') {
$args = "id_breve=" . intval($id_breve);
if (!$statut)
- list($statut) = spip_fetch_array(spip_query("SELECT statut FROM spip_breves WHERE $args"));
- if ($statut == 'publie')
+ $statut = spip_fetch_array(spip_query("SELECT statut FROM spip_breves WHERE $args"));
+ if ($statut['statut'] == 'publie')
return generer_url_action('redirect', $args);
else return generer_url_ecrire('breves_voir',$args);
}
@@ -70,8 +70,8 @@ function generer_url_ecrire_forum($id_forum, $statut='') {
function generer_url_ecrire_document($id_document, $statut='') {
if (intval($id_document) <= 0)
return '';
- if ($row = @spip_fetch_array(spip_query("SELECT fichier,distant
- FROM spip_documents WHERE id_document = $id_document"))) {
+ $row = @spip_fetch_array(spip_query("SELECT fichier,distant FROM spip_documents WHERE id_document = $id_document"));
+ if ($row) {
if ($row['distant'] == 'oui') {
return $row['fichier'];
} else {
diff --git a/ecrire/inc/visites.php b/ecrire/inc/visites.php
index ada56d5c5b..9704f8027b 100644
--- a/ecrire/inc/visites.php
+++ b/ecrire/inc/visites.php
@@ -91,20 +91,15 @@ function calculer_visites($t) {
$date = date("Y-m-d", time() - 1800);
// 1. les visites du site (facile)
- spip_query("INSERT IGNORE INTO spip_visites
- (date) VALUES ('$date')");
- spip_query("UPDATE spip_visites SET visites = visites+$visites
- WHERE date='$date'");
+ spip_query("INSERT IGNORE INTO spip_visites (date) VALUES ('$date')");
+ spip_query("UPDATE spip_visites SET visites = visites+$visites WHERE date='$date'");
// 2. les visites des articles (en deux passes pour minimiser
// le nombre de requetes)
if ($articles) {
// s'assurer qu'un slot (date, visites, id) existe pour
// chaque article vu
- spip_query("INSERT IGNORE INTO spip_visites_articles
- (date, id_article) VALUES ('$date',"
- . join("), ('$date',", $articles)
- . ")");
+ spip_query("INSERT IGNORE INTO spip_visites_articles (date, id_article) VALUES ('$date',". join("), ('$date',", $articles) . ")");
// enregistrer les visites dans les deux tables
$ar = array(); # tableau num -> liste des articles ayant num visites
@@ -126,14 +121,9 @@ function calculer_visites($t) {
$sumref = ' + '.calcul_mysql_in('id_article',
join(',',array_keys($referers_a)));
- spip_query("UPDATE spip_visites_articles
- SET visites = visites $sum
- WHERE date='$date' AND $tous");
- spip_query("UPDATE spip_articles
- SET visites = visites $sum$sumref,
- popularite = popularite $sum,
- maj = maj
- WHERE $tous");
+ spip_query("UPDATE spip_visites_articles SET visites = visites $sum WHERE date='$date' AND $tous");
+
+ spip_query("UPDATE spip_articles SET visites = visites $sum$sumref, popularite = popularite $sum, maj = maj WHERE $tous");
## Ajouter un JOIN sur le statut de l'article ?
}
@@ -147,15 +137,11 @@ function calculer_visites($t) {
$referer_md5)";
$ar[$num][] = $referer_md5;
}
- spip_query("INSERT IGNORE INTO spip_referers
- (date, referer, referer_md5) VALUES "
- . join(', ', $insert));
+ spip_query("INSERT IGNORE INTO spip_referers (date, referer, referer_md5) VALUES " . join(', ', $insert));
// ajouter les visites
foreach ($ar as $num => $liste) {
- spip_query("UPDATE spip_referers
- SET visites = visites+$num, visites_jour = visites_jour+$num
- WHERE ".calcul_mysql_in('referer_md5',join(',',$liste)));
+ spip_query("UPDATE spip_referers SET visites = visites+$num, visites_jour = visites_jour+$num WHERE ".calcul_mysql_in('referer_md5',join(',',$liste)));
}
}
@@ -171,15 +157,11 @@ function calculer_visites($t) {
$referer_md5, $id_article)";
$ar[$num][] = "(id_article=$id_article AND referer_md5=$referer_md5)";
}
- spip_query("INSERT IGNORE INTO spip_referers_articles
- (date, referer, referer_md5, id_article) VALUES "
- . join(', ', $insert));
+ spip_query("INSERT IGNORE INTO spip_referers_articles (date, referer, referer_md5, id_article) VALUES " . join(', ', $insert));
// ajouter les visites
foreach ($ar as $num => $liste) {
- spip_query("UPDATE spip_referers_articles
- SET visites = visites+$num
- WHERE ".join(" OR ", $liste));
+ spip_query("UPDATE spip_referers_articles SET visites = visites+$num WHERE ".join(" OR ", $liste));
## Ajouter un JOIN sur le statut de l'article ?
}
}
--
GitLab