From 2b0c3bfc045786fcf94f48e6902ccd5a59297a54 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sat, 17 Aug 2002 00:12:51 +0000
Subject: [PATCH] =?UTF-8?q?En=20cas=20de=20probl=C3=A8me=20MySQL,=20on=20e?=
=?UTF-8?q?st=20dirigi=C3=A9=20sur=20l'aide=20en=20ligne...=20=C3=A0=20con?=
=?UTF-8?q?dition=20tout=20de=20m=C3=AAme=20qu'on=20ait=20le=20cookie=20d'?=
=?UTF-8?q?admin.=20Il=20n'y=20a=20rien=20de=20secret=20dans=20l'aide,=20d?=
=?UTF-8?q?onc=20pas=20de=20souci=20de=20s=C3=A9curit=C3=A9.=20L'aide=20en?=
=?UTF-8?q?=20ligne=20dispo=20depuis=20l'espace=20public,=20sp=C3=A9cialit?=
=?UTF-8?q?=C3=A9=20d'uZine,=20devient=20donc=20"aide=20en=20ligne=20pour?=
=?UTF-8?q?=20tous".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/aide_gauche.php3 | 12 ++++--------
ecrire/articles.php3 | 5 +----
inc-calcul-squel.php3 | 6 +++++-
inc-public-global.php3 | 2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/ecrire/aide_gauche.php3 b/ecrire/aide_gauche.php3
index e9cb69f8e0..3068125c40 100644
--- a/ecrire/aide_gauche.php3
+++ b/ecrire/aide_gauche.php3
@@ -1,15 +1,10 @@
<?php
include ("inc_version.php3");
+include_ecrire ("inc_session.php3");
-if ($flag_ecrire AND file_exists("inc_connect.php3")) {
- include_ecrire ("inc_connect.php3");
- include_ecrire ("inc_auth.php3");
- include_ecrire ("inc_admin.php3");
- include_ecrire ("inc_acces.php3");
- $aide_statut = ($connect_statut == "0minirezo") ? "admin" : "redac";
-}
-else $aide_statut = "admin";
+verifier_visiteur();
+$aide_statut = ($auteur_session['statut'] == '1comite') ? 'redac' : 'admin';
?>
<HTML>
@@ -103,6 +98,7 @@ article("Votre connexion MySQL", "install1", "admin");
article("Choix de votre base", "install2", "admin");
article("Informations personnelles", "install5", "admin");
article("Vérification par FTP", "ftp_auth", "admin");
+article("Un problème de squelette ?", "erreur_mysql", "admin");
rubrique("Les articles");
article("Les raccourcis typographiques","raccourcis");
diff --git a/ecrire/articles.php3 b/ecrire/articles.php3
index 635fa1b93a..6a16b22bc6 100644
--- a/ecrire/articles.php3
+++ b/ecrire/articles.php3
@@ -631,16 +631,13 @@ debut_raccourcis();
icone_horizontale("Tous vos articles", "articles_page.php3", "article-24.gif");
if ($connect_statut == '0minirezo') {
- echo "<p>";
$retour = urlencode($clean_link->getUrl());
icone_horizontale("Créer un nouvel auteur pour cet article", "auteur_infos.php3?new=oui&ajouter_id_article=$id_article&redirect=$retour", "redacteurs-24.gif", "creer.gif");
$articles_mots = lire_meta('articles_mots');
- if ($articles_mots != "non") {
- echo "<p>";
+ if ($articles_mots != "non")
icone_horizontale("Créer un nouveau mot-clé pour cet article", "mots_edit.php3?new=oui&ajouter_id_article=$id_article&redirect=$retour", "mot-cle-24.gif", "creer.gif");
- }
}
diff --git a/inc-calcul-squel.php3 b/inc-calcul-squel.php3
index 6dd884992b..f672a11ffd 100644
--- a/inc-calcul-squel.php3
+++ b/inc-calcul-squel.php3
@@ -1819,11 +1819,15 @@ function calculer_boucle($id_boucle, $prefix_boucle)
$texte .= ' $query = $instance->requete;
$result = @spip_query($query);
if (!$result) {
+ include_ecrire("inc_presentation.php3");
$retour .= "<tt><br><br><blink><BOUCLE'.$id_boucle.'></blink><br>\n".
"<b>Erreur dans la requête envoyée à MySQL :</b><br>\n".
"$query<br>\n<font color=\'red\'><b>> ".
mysql_error()."</b></font><br>\n".
- "<blink></BOUCLE'.$id_boucle.'></blink></tt><br><br>\n"; // debugger les squelettes
+ "<blink></BOUCLE'.$id_boucle.'></blink></tt>\n";
+ if ($GLOBALS[\'spip_admin\'])
+ $retour .= aide("erreur_mysql");
+ $retour .= "<br><br>\n"; // debugger les squelettes
}
$total_boucle = @mysql_num_rows($result);
$pile_boucles[$id_instance]->num_rows = $total_boucle;
diff --git a/inc-public-global.php3 b/inc-public-global.php3
index ced0603450..44d9529101 100644
--- a/inc-public-global.php3
+++ b/inc-public-global.php3
@@ -312,7 +312,7 @@ function bouton_admin($titre, $lien) {
}
-if (($admin_ok OR ($auteur_session['statut'] == '0minirezo')) AND !$flag_preserver) {
+if ($admin_ok AND !$flag_preserver) {
include_ecrire("inc_filtres.php3");
if ($id_article) {
--
GitLab