From 76be17b6f5e2fb62b3613ba6a92cac6b0b04f717 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 24 Mar 2006 07:49:49 +0000
Subject: [PATCH] Pas de bouton admin en cas de Content-Type explicite
---
ecrire/inc/utils.php | 2 +-
ecrire/public.php | 3 ++-
ecrire/public/balises.php | 2 --
ecrire/public/calcul.php | 1 +
ecrire/public/global.php | 3 +++
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 4af2c7c49c..2110a11eb2 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -192,7 +192,7 @@ function spip_log($message, $logname='spip') {
}
$f = @fopen($logfile, "ab");
if ($f) {
- fputs($f, htmlspecialchars($message));
+ fputs($f, ($message));
fclose($f);
}
if ($rotate) {
diff --git a/ecrire/public.php b/ecrire/public.php
index ca711546e0..0f8142bc9e 100644
--- a/ecrire/public.php
+++ b/ecrire/public.php
@@ -92,7 +92,8 @@ if (defined('_INC_PUBLIC')) {
// est-on admin ?
if ($affiche_boutons_admin = (
- $_COOKIE['spip_admin']
+ $_COOKIE['spip_admin']
+ AND !$flag_preserver
AND ($html OR ($var_mode == 'debug') OR count($tableau_des_erreurs))
))
include_spip('balise/formulaire_admin');
diff --git a/ecrire/public/balises.php b/ecrire/public/balises.php
index 537ff21f74..3c6a267446 100644
--- a/ecrire/public/balises.php
+++ b/ecrire/public/balises.php
@@ -245,7 +245,6 @@ function balise_COMPTEUR_BOUCLE_dist($p) {
function balise_TOTAL_BOUCLE_dist($p) {
$b = $p->nom_boucle ? $p->nom_boucle : $p->descr['id_mere'];
-# spip_log("tb '$b'");
if ($b === '' || !isset($p->boucles[$b])) {
erreur_squelette(
_T('zbug_champ_hors_boucle',
@@ -796,7 +795,6 @@ function balise_CHEMIN_dist($p) {
// La syntaxe #ENV{toto, rempl} renverra 'rempl' si $toto est vide
//
function balise_ENV_dist($p, $src = NULL) {
-
// le tableau de base de la balise (cf #META ci-dessous)
if (!$src) $src = '$Pile[0]';
diff --git a/ecrire/public/calcul.php b/ecrire/public/calcul.php
index 01e2585d24..5ca8f3846a 100644
--- a/ecrire/public/calcul.php
+++ b/ecrire/public/calcul.php
@@ -102,6 +102,7 @@ function charger_squelette ($squelette, $mime_type, $gram, $sourcefile) {
if ($GLOBALS['var_mode'] == 'debug') {
debug_dumpfile ($skel_code, $nom, 'code');
}
+ spip_log($skel_code);
eval('?'.'>'.$skel_code);
if (function_exists($nom)) {
ecrire_fichier ($phpfile, $skel_code);
diff --git a/ecrire/public/global.php b/ecrire/public/global.php
index 5cab444600..3bb7d1301b 100644
--- a/ecrire/public/global.php
+++ b/ecrire/public/global.php
@@ -261,6 +261,9 @@ function inclure_balise_dynamique($texte, $echo=true, $ligne=0) {
if (is_array($page['entetes']))
foreach($page['entetes'] as $k => $v) {
+ // ceci se discute
+ // if ((strtolower($k) != 'content-type')
+ // OR !isset( $GLOBALS['page']['entetes'][$k])
$GLOBALS['page']['entetes'][$k] = $v;
}
--
GitLab