From 864cc60ae36bf26b6cc05e2bcb091b74f78e0b73 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Wed, 26 Apr 2006 18:05:03 +0000
Subject: [PATCH] =?UTF-8?q?T=C3=A2che=20#209:=20spip=5Fquery=20rikiki?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/controle_petition.php | 3 ++-
ecrire/exec/message.php | 16 ++++++++--------
ecrire/exec/message_edit.php | 4 ++--
ecrire/exec/messagerie.php | 5 +----
ecrire/exec/mots_edit.php | 4 ++--
ecrire/exec/mots_tous.php | 21 ++++++++++++---------
ecrire/exec/rubriques_edit.php | 3 ++-
ecrire/exec/statistiques_visites.php | 3 +--
ecrire/exec/suivi_revisions.php | 8 ++------
ecrire/inc/documents.php | 18 ++++++++++--------
10 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/ecrire/exec/controle_petition.php b/ecrire/exec/controle_petition.php
index 92016665a5..eeb6996663 100644
--- a/ecrire/exec/controle_petition.php
+++ b/ecrire/exec/controle_petition.php
@@ -62,7 +62,8 @@ if ($connect_statut == "0minirezo") {
// Invalider les pages ayant trait aux petitions
if ($id_signature = ($add_petition?$add_petition:$supp_petition)) {
include_spip('inc/invalideur');
- list ($id_article) = spip_fetch_array(spip_query("SELECT id_article FROM spip_signatures WHERE id_signature=$id_signature"));
+ $id_article = spip_fetch_array(spip_query("SELECT id_article FROM spip_signatures WHERE id_signature=$id_signature"));
+ $id_article = $id_article['id_article'];
suivre_invalideur("id='varia/pet$id_article'");
}
diff --git a/ecrire/exec/message.php b/ecrire/exec/message.php
index fd72a80f36..e0d14d0cd3 100644
--- a/ecrire/exec/message.php
+++ b/ecrire/exec/message.php
@@ -48,10 +48,11 @@ $supp_dest = intval($supp_dest);
$nouv_auteur = intval($nouv_auteur);
charger_generer_url();
-if (!spip_num_rows(spip_query("SELECT id_auteur FROM spip_auteurs_messages WHERE id_auteur=$connect_id_auteur AND id_message=$id_message"))) {
+$row = spip_fetch_array(spip_query("SELECT type FROM spip_messages WHERE id_message=$id_message"));
- $row = spip_fetch_array(spip_query("SELECT type FROM spip_messages WHERE id_message=$id_message"));
- if ($row['type'] != "affich"){
+if ($row['type'] != "affich"){
+ $n = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_auteurs_messages WHERE id_auteur=$connect_id_auteur AND id_message=$id_message"));
+ if (!$n['n']) {
debut_page(_T('info_acces_refuse'));
debut_gauche();
debut_droite();
@@ -138,9 +139,8 @@ function http_auteurs_ressemblants($cherche_auteur, $id_message)
}
else if (count($resultat) < 16) {
$res = '';
- $query = spip_query("SELECT * FROM spip_auteurs WHERE id_auteur IN (" .
- join(',', $resultat) .
- ") ORDER BY nom");
+ $query = spip_query("SELECT * FROM spip_auteurs WHERE id_auteur IN (" . join(',', $resultat) . ") ORDER BY nom");
+
while ($row = spip_fetch_array($query)) {
$id_auteur = $row['id_auteur'];
$nom_auteur = $row['nom'];
@@ -470,11 +470,11 @@ function change_date_message($id_message, $heures,$minutes,$mois, $jour, $annee,
}
-
function exec_affiche_message_dist($id_message, $cherche_auteur, $nouv_auteur, $forcer_dest)
{
global $connect_id_auteur, $echelle, $partie_cal;
- if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_messages WHERE id_message=$id_message"))) {
+ $row = spip_fetch_array(spip_query("SELECT * FROM spip_messages WHERE id_message=$id_message"));
+ if ($row) {
$id_message = $row['id_message'];
$date_heure = $row["date_heure"];
$date_fin = $row["date_fin"];
diff --git a/ecrire/exec/message_edit.php b/ecrire/exec/message_edit.php
index 4f27821015..a769575cff 100644
--- a/ecrire/exec/message_edit.php
+++ b/ecrire/exec/message_edit.php
@@ -136,11 +136,11 @@ debut_droite();
echo "</p><p><b>"._T('info_nom_destinataire')."</b><br />";
echo "<input type='text' class='formo' name='cherche_auteur' value='' size='40'/>";
} else if ($dest) {
- list($nom) = spip_fetch_array(spip_query("SELECT nom FROM spip_auteurs WHERE id_auteur=$dest"));
+ $nom = spip_fetch_array(spip_query("SELECT nom FROM spip_auteurs WHERE id_auteur=$dest"));
echo "</p><p><b>",
_T('info_nom_destinataire'),
"</b> : ",
- $nom,
+ $nom['nom'],
"<br /><br />";
}
echo "<p />";
diff --git a/ecrire/exec/messagerie.php b/ecrire/exec/messagerie.php
index 411b019352..33a6f9c8ab 100644
--- a/ecrire/exec/messagerie.php
+++ b/ecrire/exec/messagerie.php
@@ -112,10 +112,7 @@ echo "<div style='text-align: "
afficher_messages(_T('info_message_en_redaction'), '', "id_auteur=$connect_id_auteur AND statut='redac'", $messages_vus, true, false, false);
-$result = spip_query("SELECT auteurs.id_auteur, auteurs.nom, COUNT(*) AS total FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien2, spip_messages AS messages, spip_auteurs_messages AS lien ".
- "WHERE (lien.id_auteur = $connect_id_auteur AND lien.id_message = messages.id_message AND messages.statut = 'publie' AND (messages.rv != 'oui' OR messages.date_fin > NOW() )) ".
- "AND (lien2.id_auteur = lien2.id_auteur AND lien2.id_message = messages.id_message AND lien2.id_auteur != $connect_id_auteur AND auteurs.id_auteur = lien2.id_auteur) ".
- "GROUP BY auteurs.id_auteur ORDER BY total DESC LIMIT 10");
+$result = spip_query("SELECT auteurs.id_auteur, auteurs.nom, COUNT(*) AS total FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien2, spip_messages AS messages, spip_auteurs_messages AS lien WHERE (lien.id_auteur = $connect_id_auteur AND lien.id_message = messages.id_message AND messages.statut = 'publie' AND (messages.rv != 'oui' OR messages.date_fin > NOW() )) AND (lien2.id_auteur = lien2.id_auteur AND lien2.id_message = messages.id_message AND lien2.id_auteur != $connect_id_auteur AND auteurs.id_auteur = lien2.id_auteur) GROUP BY auteurs.id_auteur ORDER BY total DESC LIMIT 10");
if (spip_num_rows($result) > 0) {
diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php
index 8575d07f36..b777d38632 100644
--- a/ecrire/exec/mots_edit.php
+++ b/ecrire/exec/mots_edit.php
@@ -313,8 +313,8 @@ fin_page();
function un_seul_mot_dans_groupe($id_groupe)
{
- list($u) = spip_fetch_array(spip_query("SELECT unseul FROM spip_groupes_mots WHERE id_groupe = $id_groupe"));
- return ($u == 'oui');
+ $u = spip_fetch_array(spip_query("SELECT unseul FROM spip_groupes_mots WHERE id_groupe = $id_groupe"));
+ return ($u['unseul'] == 'oui');
}
function supprime_mot_de_groupe($id_groupe, $table)
diff --git a/ecrire/exec/mots_tous.php b/ecrire/exec/mots_tous.php
index d86f83125d..733a4edc66 100644
--- a/ecrire/exec/mots_tous.php
+++ b/ecrire/exec/mots_tous.php
@@ -32,14 +32,20 @@ function exec_mots_tous_dist()
if ($connect_statut=="0minirezo") $aff_articles="prepa,prop,publie,refuse";
else $aff_articles="prop,publie";
- list($nb_articles) = spip_fetch_array(spip_query("SELECT COUNT(*) FROM spip_mots_articles AS lien, spip_articles AS article WHERE lien.id_mot=$conf_mot AND article.id_article=lien.id_article AND FIND_IN_SET(article.statut,'$aff_articles')>0 AND article.statut!='refuse'"));
+ $nb_articles = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_mots_articles AS lien, spip_articles AS article WHERE lien.id_mot=$conf_mot AND article.id_article=lien.id_article AND FIND_IN_SET(article.statut,'$aff_articles')>0 AND article.statut!='refuse'"));
+ $nb_articles = $nb_articles['n'];
- list($nb_rubriques) = spip_fetch_array(spip_query("SELECT COUNT(*) FROM spip_mots_rubriques AS lien, spip_rubriques AS rubrique WHERE lien.id_mot=$conf_mot AND rubrique.id_rubrique=lien.id_rubrique"));
- list($nb_breves) = spip_fetch_array(spip_query("SELECT COUNT(*) FROM spip_mots_breves AS lien, spip_breves AS breve WHERE lien.id_mot=$conf_mot AND breve.id_breve=lien.id_breve AND FIND_IN_SET(breve.statut,'$aff_articles')>0 AND breve.statut!='refuse'"));
+ $nb_rubriques = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_mots_rubriques AS lien, spip_rubriques AS rubrique WHERE lien.id_mot=$conf_mot AND rubrique.id_rubrique=lien.id_rubrique"));
+ $nb_rubriques = $nb_rubriques['n'];
- list($nb_sites) = spip_fetch_array(spip_query("SELECT COUNT(*) FROM spip_mots_syndic AS lien, spip_syndic AS syndic WHERE lien.id_mot=$conf_mot AND syndic.id_syndic=lien.id_syndic AND FIND_IN_SET(syndic.statut,'$aff_articles')>0 AND syndic.statut!='refuse'"));
+ $nb_breves = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_mots_breves AS lien, spip_breves AS breve WHERE lien.id_mot=$conf_mot AND breve.id_breve=lien.id_breve AND FIND_IN_SET(breve.statut,'$aff_articles')>0 AND breve.statut!='refuse'"));
+ $nb_breves = $nb_breves['n'];
- list($nb_forum) = spip_fetch_array(spip_query("SELECT COUNT(*) FROM spip_mots_forum AS lien, spip_forum AS forum WHERE lien.id_mot=$conf_mot AND forum.id_forum=lien.id_forum AND forum.statut='publie'"));
+ $nb_sites = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_mots_syndic AS lien, spip_syndic AS syndic WHERE lien.id_mot=$conf_mot AND syndic.id_syndic=lien.id_syndic AND FIND_IN_SET(syndic.statut,'$aff_articles')>0 AND syndic.statut!='refuse'"));
+ $nb_sites = $nb_sites['n'];
+
+ $nb_forum = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_mots_forum AS lien, spip_forum AS forum WHERE lien.id_mot=$conf_mot AND forum.id_forum=lien.id_forum AND forum.statut='publie'"));
+ $nb_forum = $nb_forum['n'];
// si le mot n'est pas lie, on demande sa suppression
if ($nb_articles + $nb_breves + $nb_sites + $nb_forum == 0) {
@@ -68,10 +74,7 @@ if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
spip_query("UPDATE spip_mots SET type='$change_type' WHERE id_groupe='$id_groupe'");
- spip_query("UPDATE spip_groupes_mots SET titre='$change_type', texte='$texte', descriptif='$descriptif', unseul='$unseul', obligatoire='$obligatoire',
- articles='$articles', breves='$breves', rubriques='$rubriques', syndic='$syndic',
- minirezo='$acces_minirezo', comite='$acces_comite', forum='$acces_forum'
- WHERE id_groupe='$id_groupe'");
+ spip_query("UPDATE spip_groupes_mots SET titre='$change_type', texte='$texte', descriptif='$descriptif', unseul='$unseul', obligatoire='$obligatoire', articles='$articles', breves='$breves', rubriques='$rubriques', syndic='$syndic', minirezo='$acces_minirezo', comite='$acces_comite', forum='$acces_forum' WHERE id_groupe='$id_groupe'");
} else { // creation groupe
spip_abstract_insert('spip_groupes_mots',
diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php
index d545e1ec7c..5dd62ba2f2 100644
--- a/ecrire/exec/rubriques_edit.php
+++ b/ecrire/exec/rubriques_edit.php
@@ -59,7 +59,8 @@ else $ze_logo = "rubrique-24.gif";
if ($id_parent == 0) $logo_parent = "racine-site-24.gif";
else {
- list($id_secteur) = spip_fetch_array(spip_query("SELECT id_secteur FROM spip_rubriques WHERE id_rubrique='$id_parent'"));
+ $id_secteur = spip_fetch_array(spip_query("SELECT id_secteur FROM spip_rubriques WHERE id_rubrique='$id_parent'"));
+ $id_secteur = $id_secteur['id_secteur'];
if ($id_parent_== $id_secteur)
$logo_parent = "secteur-24.gif";
else $logo_parent = "rubrique-24.gif";
diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php
index e73f045928..b27f7c93db 100644
--- a/ecrire/exec/statistiques_visites.php
+++ b/ecrire/exec/statistiques_visites.php
@@ -597,8 +597,7 @@ if (flag_svg()) {
echo "<div align='left'>";
///////// Affichage par mois
- $result=spip_query("SELECT FROM_UNIXTIME(UNIX_TIMESTAMP(date),'%Y-%m') AS date_unix, SUM(visites) AS total_visites FROM $table ".
- "WHERE $where AND date > DATE_SUB(NOW(),INTERVAL 2700 DAY) GROUP BY date_unix ORDER BY date");
+ $result=spip_query("SELECT FROM_UNIXTIME(UNIX_TIMESTAMP(date),'%Y-%m') AS date_unix, SUM(visites) AS total_visites FROM $table WHERE $where AND date > DATE_SUB(NOW(),INTERVAL 2700 DAY) GROUP BY date_unix ORDER BY date");
$i = 0;
diff --git a/ecrire/exec/suivi_revisions.php b/ecrire/exec/suivi_revisions.php
index 7f1b46f829..ae39696f35 100644
--- a/ecrire/exec/suivi_revisions.php
+++ b/ecrire/exec/suivi_revisions.php
@@ -68,9 +68,7 @@ while ($row = spip_fetch_array($result)) {
$id_rubrique = $row['id_rubrique'];
$titre = propre($row['titre']);
- $result_rub = spip_query("SELECT versions.*, articles.statut, articles.titre
-FROM spip_versions AS versions, spip_articles AS articles
-WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.id_secteur=$id_rubrique$req_where LIMIT 1");
+ $result_rub = spip_query("SELECT versions.*, articles.statut, articles.titre FROM spip_versions AS versions, spip_articles AS articles WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.id_secteur=$id_rubrique$req_where LIMIT 1");
if ($id_rubrique == $id_secteur) echo "<li><b>$titre</b>";
else if (spip_num_rows($result_rub) > 0) echo "<li><a href='" . generer_url_ecrire("suivi_revisions","id_secteur=$id_rubrique") . "'>$titre</a>";
@@ -83,9 +81,7 @@ if (($GLOBALS['meta']['multi_rubriques'] == 'oui') OR ($GLOBALS['meta']['multi_a
foreach ($langues as $lang) {
$titre = traduire_nom_langue($lang);
- $result_lang = spip_query("SELECT versions.*
-FROM spip_versions AS versions, spip_articles AS articles
-WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.lang='$lang' $req_where LIMIT 1");
+ $result_lang = spip_query("SELECT versions.* FROM spip_versions AS versions, spip_articles AS articles WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.lang='$lang' $req_where LIMIT 1");
if ($lang == $lang_choisie) echo "<li><b>$titre</b>";
else if (spip_num_rows($result_lang) > 0) echo "<li><a href='" . generer_url_ecrire("suivi_revisions","lang_choisie=$lang") . "'>$titre</a>";
diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php
index 115e305e59..aaffee5516 100644
--- a/ecrire/inc/documents.php
+++ b/ecrire/inc/documents.php
@@ -86,15 +86,17 @@ function document_et_vignette($document, $url, $portfolio=false) {
// a supprimer avec spip_types_documents
$extension = spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE id_type=".$document['id_type']));
$extension = $extension['extension'];
+ $vignette = $document['id_vignette'];
- if ($document['id_vignette'] > 0
- 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 {
- include_spip('inc/logos');
- $image = reduire_image_logo((_DIR_RACINE . $vignette['fichier']), 120, 110);
- }
+ if ($vignette)
+ $vignette = spip_fetch_array(spip_query("SELECT * FROM spip_documents WHERE id_document = ".$vignette));
+ if ($vignette) {
+ if (!$portfolio OR !($GLOBALS['meta']['creer_preview'] == 'oui')) {
+ $image = image_pattern($vignette);
+ } else {
+ include_spip('inc/logos');
+ $image = reduire_image_logo((_DIR_RACINE . $vignette['fichier']), 120, 110);
+ }
} else if (strstr($GLOBALS['meta']['formats_graphiques'], $extension)
AND $GLOBALS['meta']['creer_preview'] == 'oui') {
include_spip('inc/distant');
--
GitLab