Author: bill@adequates.com
Date: Fri Jul 28 18:47:53 2006
New Revision: 4251
Log:
du bug et les fichiers à mettre à la racine ...
Added:
_plugins_/_contenu_editorial_/spipcarto/racine_spip/
_plugins_/_contenu_editorial_/spipcarto/racine_spip/carto.php
_plugins_/_contenu_editorial_/spipcarto/racine_spip/spip_carto.php
Modified:
_plugins_/_contenu_editorial_/spipcarto/README.txt
_plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php
_plugins_/_contenu_editorial_/spipcarto/inc/carto.php
_plugins_/_contenu_editorial_/spipcarto/spipcarto.php
_plugins_/_contenu_editorial_/spipcarto/spipcarto_fonctions.php
Modified: _plugins_/_contenu_editorial_/spipcarto/README.txt
--- _plugins_/_contenu_editorial_/spipcarto/README.txt (original)
+++ _plugins_/_contenu_editorial_/spipcarto/README.txt Fri Jul 28 18:47:53 2006
@@ -1,9 +1,15 @@
-Auteur: Stephane LAURENT (aka Bill) bill@adequates.com
+Auteur: Stephane LAURENT (Bill) bill@adequates.com
Licence: GPL
Description:
-[fr] ...
+[fr]
+version plugin de spipcarto
+Installation:
+- copier le repertoire dans le repertoire plugin de spip
+- deplacer les fichier du repertoire /racine_spip à la racine du site
+- activer le plugin
+- configurer le plugin (installation en base et metas)
[en] ...
Modified: _plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php
--- _plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/exec/cartes_edit.php Fri Jul 28 18:47:53 2006
@@ -47,9 +47,8 @@
//------------------------la fonction qui fait tout-----------------------------------
function exec_cartes_edit() {
- include(_DIR_PLUGIN_SPIPCARTO."/inc/carto.php");
-//include_spip ("inc/carto");
-include_spip ("spipcarto_fonctions");
+include(_DIR_PLUGIN_SPIPCARTO."/spipcarto_fonctions.php");
+include_spip ("inc/carto");
include_spip ("inc/carto_import");
include_spip ("inc/presentation");
include_spip ("inc/documents");
@@ -236,6 +235,7 @@
if ($url_carte && ($new!="oui")) {
echo "<br><font face='Verdana,Arial,Sans,sans-serif' size='1'><b>"._T('spipcarto:carte_apercu')."</b></font>\n";
$sq_cartes=$GLOBALS['sq_cartes'];
+
if (!is_array($sq_cartes)) $sq_cartes=array('map');
foreach ($sq_cartes as $sq_carte)
icone_horizontale( _T('spipcarto:carte_'.$sq_carte), "../carto.php?id_carto_carte=".$id_carte."&fond=".$sq_carte."&var_mode=recalcul", "racine-24.gif", "rien.gif");
Modified: _plugins_/_contenu_editorial_/spipcarto/inc/carto.php
--- _plugins_/_contenu_editorial_/spipcarto/inc/carto.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/inc/carto.php Fri Jul 28 18:47:53 2006
@@ -160,9 +160,8 @@
//articles liés
afficher_articles(_T("spipcarto:carte_articles_use"),
array(
- "FROM"=>"spip_carto_cartes_articles AS lien",
- "WHERE"=>"lien.id_article=articles.id_article".
- "AND id_carto_carte=$id_carte AND statut!='poubelle'",
+ "FROM"=>"spip_articles AS articles, spip_carto_cartes_articles AS lien",
+ "WHERE"=>"lien.id_article=articles.id_article AND id_carto_carte=$id_carte AND statut!='poubelle'",
"ORDER BY"=>"titre"));
echo "</a></td></tr>";
Added: _plugins_/_contenu_editorial_/spipcarto/racine_spip/carto.php
--- _plugins_/_contenu_editorial_/spipcarto/racine_spip/carto.php (added)
+++ _plugins_/_contenu_editorial_/spipcarto/racine_spip/carto.php Fri Jul 28 18:47:53 2006
@@ -0,0 +1,80 @@
+<?php
+/*****************************************************************************\
+* SPIP-CARTO, Solution de partage et délaboration dinformation
+* (Carto)Graphique sous SPIP
+*
+* Copyright (c) 2005
+*
+* Stéphane Laurent, François-Xavier Prunayre, Pierre Giraud, Jean-Claude
+* Moissinac et tous les membres du projet SPIP-CARTO V1 (Annie Danzart - Arnaud
+* Fontaine - Arnaud Saint Léger - Benoit Veler - Christine Potier - Christophe
+* Betin - Daniel Faivre - David Delon - David Jonglez - Eric Guichard - Jacques
+* Chatignoux - Julien Custot - Laurent Jégou - Mathieu Géhin - Michel Briand -
+* Mose - Olivier Frérot - Philippe Fournel - Thierry Joliveau)
+*
+* voir : http://www.geolibre.net/article.php3?id_article=16
+*
+* Ce programme est un logiciel libre distribue sous licence GNU/GPL.
+* Pour plus de details voir le fichier COPYING.txt ou laide en ligne.
+*
+ -
+This program is free software ; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation ; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY ; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program (COPYING.txt) ; if not, write to
+the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+or check http://www.gnu.org/copyleft/gpl.html
+ -
+*
+\***************************************************************************/
+# ou est l'espace prive ?
+@define('_DIR_RESTREINT_ABS', 'ecrire/');
+include_once _DIR_RESTREINT_ABS.'inc_version.php';
+
+//specifier ici le nom du sous repertoire du dossier squelette contenant
+//les squelettes de carte
+//squelettes de carte disponibles
+//(preview dans cartes.php3 et raccourcis dans carte_edit.php3)
+if ($GLOBALS['rep_cartes']) $rep_fond=$GLOBALS['rep_cartes'];
+else $rep_fond="spipcarto";
+// valeurs par defaut
+//$delai=24*3600;
+
+$flag_preserver = true;
+
+if (isset($contexte_inclus['fond'])&&($contexte_inclus['fond']!="")){
+ if (strstr($fond, '/')
+ OR preg_match(',^formulaire_,i', $fond))
+ die ("Faut pas se gener");
+ else $fond = $rep_fond."/carto_".$contexte_inclus['fond'];
+}
+elseif (isset($_GET["fond"])&&($_GET["fond"]!="")){
+ if (strstr($fond, '/')
+ OR preg_match(',^formulaire_,i', $fond))
+ die ("Faut pas se gener");
+ else $fond = $rep_fond."/carto_".$_GET["fond"];
+}
+else $fond = $rep_fond."/carto";
+
+// Securite
+
+if (!find_in_path("$fond.html")) {
+ spip_log("carto.php: find_in_path ne trouve pas le squelette $fond");
+ $fond = '404';
+}
+
+if (isset($contexte_inclus['delais'])) $delais = intval($contexte_inclus['delais']);
+
+# au travail...
+include _DIR_RESTREINT_ABS.'public.php';
+
+?>
\ No newline at end of file
Added: _plugins_/_contenu_editorial_/spipcarto/racine_spip/spip_carto.php
--- _plugins_/_contenu_editorial_/spipcarto/racine_spip/spip_carto.php (added)
+++ _plugins_/_contenu_editorial_/spipcarto/racine_spip/spip_carto.php Fri Jul 28 18:47:53 2006
@@ -0,0 +1,64 @@
+<?php
+/*****************************************************************************\
+* SPIP-CARTO, Solution de partage et délaboration dinformation
+* (Carto)Graphique sous SPIP
+*
+* Copyright (c) 2005
+*
+* Stéphane Laurent, François-Xavier Prunayre, Pierre Giraud, Jean-Claude
+* Moissinac et tous les membres du projet SPIP-CARTO V1 (Annie Danzart - Arnaud
+* Fontaine - Arnaud Saint Léger - Benoit Veler - Christine Potier - Christophe
+* Betin - Daniel Faivre - David Delon - David Jonglez - Eric Guichard - Jacques
+* Chatignoux - Julien Custot - Laurent Jégou - Mathieu Géhin - Michel Briand -
+* Mose - Olivier Frérot - Philippe Fournel - Thierry Joliveau)
+*
+* voir : http://www.geolibre.net/article.php3?id_article=16
+*
+* Ce programme est un logiciel libre distribue sous licence GNU/GPL.
+* Pour plus de details voir le fichier COPYING.txt ou laide en ligne.
+*
+ -
+This program is free software ; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation ; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY ; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program (COPYING.txt) ; if not, write to
+the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+or check http://www.gnu.org/copyleft/gpl.html
+ -
+*
+\***************************************************************************/
+# ou est l'espace prive ?
+@define('_DIR_RESTREINT_ABS', 'ecrire/');
+include_once _DIR_RESTREINT_ABS.'inc_version.php';
+
+$fond_carte=$_GET["fond_carte"];
+if (isset($fond_carte) && !empty($fond_carte))
+{
+ $fond_carte=base64_decode($fond_carte);
+ $lid_carte=intval($fond_carte);
+ if ($lid_carte)
+ {
+ $query="select fichier from spip_documents where id_document=".$lid_carte;
+ $result = @spip_query($query);
+ if ($result)
+ {
+ $row = @spip_fetch_array($result);
+ redirige_par_entete($row[0]);
+ }
+ }
+ else
+ {
+ redirige_par_entete($fond_carte);
+ }
+}
+redirige_par_entete("spip.php?fond=404");
+?>
\ No newline at end of file
Modified: _plugins_/_contenu_editorial_/spipcarto/spipcarto.php
[... 30 lines stripped ...]