From 80f8b21ecd861f70934fe0c0d24c959f87aedd4d Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 16 Dec 2005 20:54:04 +0000
Subject: [PATCH] surcharge possible
---
.gitattributes | 1 +
ecrire/export_all.php3 | 104 +--------------------------------
ecrire/inc_export_all.php | 117 ++++++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+), 102 deletions(-)
create mode 100644 ecrire/inc_export_all.php
diff --git a/.gitattributes b/.gitattributes
index 979dd8bde4..06d7ee77ec 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -288,6 +288,7 @@ ecrire/inc_controle_petition.php -text
ecrire/inc_cookie.php -text
ecrire/inc_distant.php -text
ecrire/inc_documents_liste.php -text
+ecrire/inc_export_all.php -text
ecrire/inc_forum_admin.php -text
ecrire/inc_forum_envoi.php -text
ecrire/inc_headers.php -text
diff --git a/ecrire/export_all.php3 b/ecrire/export_all.php3
index d51897dbbb..9540eeeaa1 100644
--- a/ecrire/export_all.php3
+++ b/ecrire/export_all.php3
@@ -10,108 +10,8 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-
$reinstall = 'non';
include ("inc.php3");
-include_ecrire ("inc_export.php3");
-
-if (!$archive) {
- if ($gz) $archive = "dump.xml.gz";
- else $archive = "dump.xml";
-}
-
-$action = _T('info_exportation_base', array('archive' => $archive));
-
-debut_admin($action);
-
-$debug_limit = '';
-
-if (!$debut_limit) $debut_limit = 0;
-
-install_debut_html(_T('info_sauvegarde'));
-
-if (!$etape) echo "<p><blockquote><font size=2>"._T('info_sauvegarde_echouee')." <a href='export_all.php3?etape=1&gz=$gz'>"._T('info_procedez_par_etape')."</a></font></blockquote><p>";
-
-if ($etape < 2)
- $f = ($gz) ? gzopen(_DIR_SESSIONS . $archive, "wb") : fopen(_DIR_SESSIONS . $archive, "wb");
-else
- $f = ($gz) ? gzopen(_DIR_SESSIONS . $archive, "ab") : fopen(_DIR_SESSIONS . $archive, "ab");
-
-if (!$f) {
- echo _T('avis_erreur_sauvegarde', array('type'=>'.', 'id_objet'=>'. .'));
- exit;
-}
-
-$_fputs = ($gz) ? gzputs : fputs;
-
-if ($etape < 2)
- $_fputs($f, "<"."?xml version=\"1.0\" encoding=\"".$GLOBALS['meta']['charset']."\"?".">\n<SPIP version=\"$spip_version_affichee\" version_base=\"$spip_version\" version_archive=\"$version_archive\">\n\n");
-
-$query = "SELECT * FROM spip_rubriques";
-export_objets($query, "rubrique", $f, $gz, $etape, 1, _T('info_sauvegarde_rubriques'));
-
-$query = "SELECT * FROM spip_auteurs";
-export_objets($query, "auteur", $f, $gz, $etape, 2, _T('info_sauvegarde_auteurs'));
-
-$query = "SELECT * FROM spip_articles";
-export_objets($query, "article", $f, $gz, $etape, 3, _T('info_sauvegarde_articles'));
-
-$query = "SELECT * FROM spip_types_documents";
-export_objets($query, "type_document", $f, $gz, $etape, 4, _T('info_sauvegarde_type_documents'));
-
-$query = "SELECT * FROM spip_documents";
-export_objets($query, "document", $f, $gz, $etape, 5, _T('info_sauvegarde_documents'));
-
-$query = "SELECT * FROM spip_mots";
-export_objets($query, "mot", $f, $gz, $etape, 6, _T('info_sauvegarde_mots_cles'));
-
-$query = "SELECT * FROM spip_groupes_mots";
-export_objets($query, "groupe_mots", $f, $gz, $etape, 7, _T('info_sauvegarde_groupe_mots'));
-
-$query = "SELECT * FROM spip_breves".$debug_limit;
-export_objets($query, "breve", $f, $gz, $etape, 8, _T('info_sauvegarde_breves'));
-
-//$query = "SELECT * FROM spip_messages";
-//export_objets($query, "message", $f, $gz, $etape, 9, _T('info_sauvegarde_messages'));
-
-$query = "SELECT * FROM spip_forum".$debug_limit;
-export_objets($query, "forum", $f, $gz, $etape, 9, _T('info_sauvegarde_forums'));
-
-$query = "SELECT * FROM spip_petitions";
-export_objets($query, "petition", $f, $gz, $etape, 10, _T('info_sauvegarde_petitions'));
-
-$query = "SELECT * FROM spip_signatures".$debug_limit;
-export_objets($query, "signature", $f, $gz, $etape, 11, _T('info_sauvegarde_signatures'));
-
-$query = "SELECT * FROM spip_syndic";
-export_objets($query, "syndic", $f, $gz, $etape, 12, _T('info_sauvegarde_sites_references'));
-
-$query = "SELECT * FROM spip_syndic_articles".$debug_limit;
-export_objets($query, "syndic_article", $f, $gz, $etape, 13, _T('info_sauvegarde_articles_sites_ref'));
-
-/*$query = "SELECT * FROM spip_visites".$debug_limit;
-export_objets($query, "spip_visite", $f, $gz, $etape, 14, _T('info_sauvegarde_visites'));
-
-$query = "SELECT * FROM spip_referers".$debug_limit;
-export_objets($query, "spip_referers", $f, $gz, $etape, 15, _T('info_sauvegarde_refers'));
-*/
-
-if (!$etape OR $etape == 13){
- $_fputs ($f, build_end_tag("SPIP")."\n");
- echo "<p>"._T('info_sauvegarde_reussi_01')."</b><p>"._T('info_sauvegarde_reussi_02', array('archive' => $archive))." <a href='index.php3'>"._T('info_sauvegarde_reussi_03')."</a> "._T('info_sauvegarde_reussi_04')."\n";
-}
-else {
- $etape_suivante = $etape + 1;
- if ($debut_limit > 1) echo "<p align='right'> <a href='export_all.php3?etape=$etape&debut_limit=$debut_limit&gz=$gz'>>>>> "._T('info_etape_suivante')."</a>";
- else echo "<p align='right'> <a href='export_all.php3?etape=$etape_suivante&gz=$gz'>>>>> "._T('info_etape_suivante')."</a>";
-}
-install_fin_html();
-
-if ($gz) gzclose($f);
-else fclose($f);
-
-if (!$etape OR $etape == 14) fin_admin($action);
-
-exit;
-
+$var_f = include_fonction(basename($SCRIPT_NAME, _EXTENSION_PHP));
+$var_f();
?>
diff --git a/ecrire/inc_export_all.php b/ecrire/inc_export_all.php
new file mode 100644
index 0000000000..52baa80234
--- /dev/null
+++ b/ecrire/inc_export_all.php
@@ -0,0 +1,117 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Systeme de publication pour l'internet *
+ * *
+ * Copyright (c) 2001-2005 *
+ * 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. *
+\***************************************************************************/
+
+include_ecrire ("inc_export.php3");
+
+function export_all_dist()
+{
+ global $archive, $debut_limit, $etape, $gz, $spip_version, $spip_version_affichee, $version_archive;
+
+if (!$archive) {
+ if ($gz) $archive = "dump.xml.gz";
+ else $archive = "dump.xml";
+}
+
+$action = _T('info_exportation_base', array('archive' => $archive));
+
+debut_admin($action);
+
+$debug_limit = '';
+
+ $debut_limit = intval($debut_limit);
+
+install_debut_html(_T('info_sauvegarde'));
+
+if (!$etape) echo "<p><blockquote><font size=2>"._T('info_sauvegarde_echouee')." <a href='export_all.php3?etape=1&gz=$gz'>"._T('info_procedez_par_etape')."</a></font></blockquote><p>";
+
+if ($etape < 2)
+ $f = ($gz) ? gzopen(_DIR_SESSIONS . $archive, "wb") : fopen(_DIR_SESSIONS . $archive, "wb");
+else
+ $f = ($gz) ? gzopen(_DIR_SESSIONS . $archive, "ab") : fopen(_DIR_SESSIONS . $archive, "ab");
+
+if (!$f) {
+ echo _T('avis_erreur_sauvegarde', array('type'=>'.', 'id_objet'=>'. .'));
+ exit;
+}
+
+$_fputs = ($gz) ? gzputs : fputs;
+
+if ($etape < 2)
+ $_fputs($f, "<"."?xml version=\"1.0\" encoding=\"".$GLOBALS['meta']['charset']."\"?".">\n<SPIP version=\"$spip_version_affichee\" version_base=\"$spip_version\" version_archive=\"$version_archive\">\n\n");
+
+$query = "SELECT * FROM spip_rubriques";
+export_objets($query, "rubrique", $f, $gz, $etape, 1, _T('info_sauvegarde_rubriques'));
+
+$query = "SELECT * FROM spip_auteurs";
+export_objets($query, "auteur", $f, $gz, $etape, 2, _T('info_sauvegarde_auteurs'));
+
+$query = "SELECT * FROM spip_articles";
+export_objets($query, "article", $f, $gz, $etape, 3, _T('info_sauvegarde_articles'));
+
+$query = "SELECT * FROM spip_types_documents";
+export_objets($query, "type_document", $f, $gz, $etape, 4, _T('info_sauvegarde_type_documents'));
+
+$query = "SELECT * FROM spip_documents";
+export_objets($query, "document", $f, $gz, $etape, 5, _T('info_sauvegarde_documents'));
+
+$query = "SELECT * FROM spip_mots";
+export_objets($query, "mot", $f, $gz, $etape, 6, _T('info_sauvegarde_mots_cles'));
+
+$query = "SELECT * FROM spip_groupes_mots";
+export_objets($query, "groupe_mots", $f, $gz, $etape, 7, _T('info_sauvegarde_groupe_mots'));
+
+$query = "SELECT * FROM spip_breves".$debug_limit;
+export_objets($query, "breve", $f, $gz, $etape, 8, _T('info_sauvegarde_breves'));
+
+//$query = "SELECT * FROM spip_messages";
+//export_objets($query, "message", $f, $gz, $etape, 9, _T('info_sauvegarde_messages'));
+
+$query = "SELECT * FROM spip_forum".$debug_limit;
+export_objets($query, "forum", $f, $gz, $etape, 9, _T('info_sauvegarde_forums'));
+
+$query = "SELECT * FROM spip_petitions";
+export_objets($query, "petition", $f, $gz, $etape, 10, _T('info_sauvegarde_petitions'));
+
+$query = "SELECT * FROM spip_signatures".$debug_limit;
+export_objets($query, "signature", $f, $gz, $etape, 11, _T('info_sauvegarde_signatures'));
+
+$query = "SELECT * FROM spip_syndic";
+export_objets($query, "syndic", $f, $gz, $etape, 12, _T('info_sauvegarde_sites_references'));
+
+$query = "SELECT * FROM spip_syndic_articles".$debug_limit;
+export_objets($query, "syndic_article", $f, $gz, $etape, 13, _T('info_sauvegarde_articles_sites_ref'));
+
+/*$query = "SELECT * FROM spip_visites".$debug_limit;
+export_objets($query, "spip_visite", $f, $gz, $etape, 14, _T('info_sauvegarde_visites'));
+
+$query = "SELECT * FROM spip_referers".$debug_limit;
+export_objets($query, "spip_referers", $f, $gz, $etape, 15, _T('info_sauvegarde_refers'));
+*/
+
+if (!$etape OR $etape == 13){
+ $_fputs ($f, build_end_tag("SPIP")."\n");
+ echo "<p>"._T('info_sauvegarde_reussi_01')."</b><p>"._T('info_sauvegarde_reussi_02', array('archive' => $archive))." <a href='index.php3'>"._T('info_sauvegarde_reussi_03')."</a> "._T('info_sauvegarde_reussi_04')."\n";
+}
+else {
+ $etape_suivante = $etape + 1;
+ if ($debut_limit > 1) echo "<p align='right'> <a href='export_all.php3?etape=$etape&debut_limit=$debut_limit&gz=$gz'>>>>> "._T('info_etape_suivante')."</a>";
+ else echo "<p align='right'> <a href='export_all.php3?etape=$etape_suivante&gz=$gz'>>>>> "._T('info_etape_suivante')."</a>";
+}
+install_fin_html();
+
+if ($gz) gzclose($f);
+else fclose($f);
+
+if (!$etape OR $etape == 14) fin_admin($action);
+}
+
+?>
--
GitLab