From 06a9b20897ce2570df07af93da7bf79a9d857cc8 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 27 Jul 2007 08:05:42 +0000
Subject: [PATCH] =?UTF-8?q?Traiter=20=C3=A0=20part=20la=20configuration=20?=
=?UTF-8?q?de=20la=20pr=C3=A9visualisation,=20sinon=20elle=20se=20fait=20?=
=?UTF-8?q?=C3=A9craser=20par=20les=20autres.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 2 ++
ecrire/action/configurer_previsualiseur.php | 28 +++++++++++++++++++++
ecrire/configuration/previsualiseur.php | 4 +--
ecrire/exec/configurer_previsualiseur.php | 20 +++++++++++++++
ecrire/inc/config.php | 5 ----
5 files changed, 52 insertions(+), 7 deletions(-)
create mode 100644 ecrire/action/configurer_previsualiseur.php
create mode 100644 ecrire/exec/configurer_previsualiseur.php
diff --git a/.gitattributes b/.gitattributes
index 4fad5690ac..401fd8887e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -350,6 +350,7 @@ ecrire/action/acceder_document.php -text
ecrire/action/activer_plugins.php -text
ecrire/action/charger_plugin.php -text
ecrire/action/configurer.php -text
+ecrire/action/configurer_previsualiseur.php -text
ecrire/action/configurer_relayeur.php -text
ecrire/action/converser.php -text
ecrire/action/copier_local.php -text
@@ -470,6 +471,7 @@ ecrire/exec/config_lang.php -text
ecrire/exec/config_multilang.php -text
ecrire/exec/configuration.php -text
ecrire/exec/configurer.php -text
+ecrire/exec/configurer_previsualiseur.php -text
ecrire/exec/configurer_relayeur.php -text
ecrire/exec/controle_forum.php -text
ecrire/exec/controle_petition.php -text
diff --git a/ecrire/action/configurer_previsualiseur.php b/ecrire/action/configurer_previsualiseur.php
new file mode 100644
index 0000000000..911250d0a8
--- /dev/null
+++ b/ecrire/action/configurer_previsualiseur.php
@@ -0,0 +1,28 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Systeme de publication pour l'internet *
+ * *
+ * Copyright (c) 2001-2007 *
+ * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
+ * *
+ * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
+ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
+\***************************************************************************/
+
+if (!defined("_ECRIRE_INC_VERSION")) return;
+
+include_spip('inc/meta');
+
+function action_configurer_previsualiseur_dist() {
+
+ $securiser_action = charger_fonction('securiser_action', 'inc');
+ $arg = $securiser_action();
+
+ if ($i = _request('preview') AND is_array($i))
+ $i = ',' . join($i, ",") . ',';
+
+ ecrire_meta('preview', $i);
+ ecrire_metas();
+}
+?>
diff --git a/ecrire/configuration/previsualiseur.php b/ecrire/configuration/previsualiseur.php
index c0027194e5..e823df5b2c 100644
--- a/ecrire/configuration/previsualiseur.php
+++ b/ecrire/configuration/previsualiseur.php
@@ -48,9 +48,9 @@ function configuration_previsualiseur_dist()
$res = debut_cadre_trait_couleur("naviguer-site.png", true, "", _T('previsualisation')
. aide("previsu"))
- . ajax_action_post('configurer', 'previsualiseur', 'config_fonctions', '', $res)
+ . ajax_action_post('configurer_previsualiseur', 0, 'config_fonctions', '', $res)
. fin_cadre_trait_couleur(true);
- return ajax_action_greffe("configurer-previsualiseur", '', $res);
+ return ajax_action_greffe("configurer_previsualiseur", 0, $res);
}
?>
diff --git a/ecrire/exec/configurer_previsualiseur.php b/ecrire/exec/configurer_previsualiseur.php
new file mode 100644
index 0000000000..03e7e06f0d
--- /dev/null
+++ b/ecrire/exec/configurer_previsualiseur.php
@@ -0,0 +1,20 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Systeme de publication pour l'internet *
+ * *
+ * Copyright (c) 2001-2007 *
+ * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
+ * *
+ * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
+ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
+\***************************************************************************/
+
+if (!defined("_ECRIRE_INC_VERSION")) return;
+
+function exec_configurer_previsualiseur_dist()
+{
+ $previsualiseur = charger_fonction('previsualiseur', 'configuration');
+ ajax_retour($previsualiseur());
+}
+?>
diff --git a/ecrire/inc/config.php b/ecrire/inc/config.php
index 31d9719174..d0bcc9516a 100644
--- a/ecrire/inc/config.php
+++ b/ecrire/inc/config.php
@@ -78,7 +78,6 @@ function liste_metas()
'activer_moteur' => 'non',
'articles_versions' => 'non',
- 'preview' => '',
'activer_statistiques' => 'non',
'documents_article' => 'non',
@@ -201,10 +200,6 @@ function appliquer_modifs_config() {
set_request('langues_multilingue', join($i, ","));
}
- if ($i = _request('preview') AND is_array($i)) {
- set_request('preview', "," . join($i, ",") . ",");
- } else set_request('preview', '');
-
if ($i = _request('email_webmaster'))
ecrire_meta("email_webmaster", $i);
if ($i = _request('email_envoi'))
--
GitLab