Author: bill@adequates.com
Date: Thu Aug 17 16:25:31 2006
New Revision: 4626
Log:
petits bugs
Modified:
_plugins_/_contenu_editorial_/spipcarto/inc/carto.php
_plugins_/_contenu_editorial_/spipcarto/spipcarto.php
_plugins_/_contenu_editorial_/spipcarto/spipcarto_fonctions.php
_plugins_/_contenu_editorial_/spipcarto/spipcarto_options.php
Modified: _plugins_/_contenu_editorial_/spipcarto/inc/carto.php
--- _plugins_/_contenu_editorial_/spipcarto/inc/carto.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/inc/carto.php Thu Aug 17 16:25:31 2006
@@ -102,18 +102,13 @@
$cpt = "$from$where";
$tmp_var = substr(md5($cpt), 0, 4);
- //if (!$group){
- $cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM $cpt"));
- if (! ($cpt = $cpt['n'])) return $tous_id ;
- /*}
- else
- $cpt = spip_num_rows(spip_query("SELECT $select FROM $cpt"));
- */
+ $res = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM $cpt"));
+ $cpt = $res['n'];
+
if ($requete['LIMIT']) $cpt = min($requete['LIMIT'], $cpt);
$nb_aff = 1.5 * _TRANCHES;
$deb_aff = intval(_request('t_' .$tmp_var));
-
if ($cpt > $nb_aff) {
$nb_aff = (_TRANCHES);
$tranches = afficher_tranches_requete($cpt, 3, $tmp_var, '', $nb_aff);
@@ -121,7 +116,6 @@
if (!$icone) $icone = "../"._DIR_PLUGIN_SPIPCARTO."/img/carte-24.png";
- if ($tranches) {
if ($titre_table) echo "<div style='height: 12px;'></div>";
echo "<div class='liste'>";
bandeau_titre_boite2($titre_table, $icone, $couleur_claire, "black");
@@ -171,8 +165,8 @@
echo "</table>";
echo "</div>\n";
- }
- return;// $tous_id;
+
+ return;
}
@@ -357,7 +351,7 @@
// Ajouter une carte
echo "\n<p>";
- debut_cadre_relief("../"._DIR_PLUGIN_SPIPCARTO."/img/carte-24.png", false);
+ debut_cadre_relief("../"._DIR_PLUGIN_SPIPCARTO."/img/carte-24.gif", false);
echo "<div style='padding: 2px; background-color: $couleur_claire; text-align: center; color: black;'>";
echo bouton_block_invisible("ajouter_carte");
@@ -386,7 +380,7 @@
$titre = typo($row['titre']);
$param="id_carte=".$id_carte;
-if ($retour) $param.='&retour='.$retour;
+$param.='&retour='.generer_url_ecrire("articles_edit","id_article=".$id_article);
$link = generer_url_ecrire("cartes_edit",$param);
echo "<div class='verdana3' style='border:1px;background-color: $couleur_claire;'>";
Modified: _plugins_/_contenu_editorial_/spipcarto/spipcarto.php
--- _plugins_/_contenu_editorial_/spipcarto/spipcarto.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/spipcarto.php Thu Aug 17 16:25:31 2006
@@ -52,7 +52,7 @@
function spipcarto_affiche_droite($flux){
include_spip ("inc/carto");
if (_request('exec')=='articles_edit'){
- $flux['data'] .= spipcarto_afficher_insertion_carte($flux['arg']['id_article']);
+ $flux['data'] .= spipcarto_afficher_insertion_carte($flux['args']['id_article']);
}
return $flux;
}
Modified: _plugins_/_contenu_editorial_/spipcarto/spipcarto_fonctions.php
--- _plugins_/_contenu_editorial_/spipcarto/spipcarto_fonctions.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/spipcarto_fonctions.php Thu Aug 17 16:25:31 2006
@@ -41,7 +41,6 @@
if (defined("_ECRIRE_INC_CARTE")) return;
define("_ECRIRE_INC_CARTE", "1");
$GLOBALS['rep_cartes']="spipcarto";
-$GLOBALS['sq_cartes']=array('map','logo','lien','svg','svgx','geosvgwms');
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// PARAMETRAGE
Modified: _plugins_/_contenu_editorial_/spipcarto/spipcarto_options.php
--- _plugins_/_contenu_editorial_/spipcarto/spipcarto_options.php (original)
+++ _plugins_/_contenu_editorial_/spipcarto/spipcarto_options.php Thu Aug 17 16:25:31 2006
@@ -1,4 +1,5 @@
<?php
+$GLOBALS['sq_cartes']=array('map','logo','lien','svg','svgx','geosvgwms');
$GLOBALS['choses_possibles']['carto_objets'] = array(
'titre_chose' => 'Objets',