adapt geoloc to new urls

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@636 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/.htaccess b/htdocs/.htaccess
index 73d78b6..54469c6 100644 (file)
--- a/htdocs/.htaccess
+++ b/htdocs/.htaccess
@@ -1,7 +1,7 @@
 Options +FollowSymLinks
 RewriteEngine on
 
-RewriteBase /~x2000habouzit
+RewriteBase /~x2001corpet
 
 # wiki
 

diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php
index c23da8c..c23f726 100644 (file)
--- a/include/geoloc.inc.php
+++ b/include/geoloc.inc.php
@@ -350,6 +350,8 @@ function geoloc_getData_subcountries($mapid, $SFields, $minentities) {
         FROM    geoloc_maps AS gm
         ".$wheremapid, Env::v('mapid',''));
 
+    global $globals;
+
     while ($c = $submapres->next())
     {
         $country = $c;

diff --git a/templates/geoloc/geolocInit.tpl b/templates/geoloc/geolocInit.tpl
index 99057dc..ead89a1 100644 (file)
--- a/templates/geoloc/geolocInit.tpl
+++ b/templates/geoloc/geolocInit.tpl
@@ -43,4 +43,5 @@ textYouHaveSelected="Tu as sélectionné "
 background="{$background}"\r
 {/if} \r
 textCopyright="Les règles de l'annuaire s'appliquent aussi à cette application"\r
-scriptInfosArea="getData.php?{$querystring}"/>\r
+iconSwf="geoloc/icon.swf"\r
+scriptInfosArea="geoloc/country?{$querystring}"/>\r

diff --git a/templates/geoloc/getData.tpl b/templates/geoloc/getData.tpl
index d884cd3..a5e55d3 100644 (file)
--- a/templates/geoloc/getData.tpl
+++ b/templates/geoloc/getData.tpl
@@ -30,7 +30,7 @@
       {if $country.nbPop > 0 or $country.id eq 0}\r
       <map x="{$country.x}" y="{$country.y}" height="{$country.height}" width="{$country.width}" ratio="{$country.rat}"/>\r
       <icon x="{$country.xPop}" y="{$country.yPop}" nb="{$country.nbPop}" size="{$country.rad}" name="{$country.name|utf8_encode}" green="{if $country.nbPop}{$country.yellow/$country.nbPop}{else}0{/if}" blue="0" alpha="0.7"/>\r
-      <moreinfos url="getData.php?{$searchvars}mapid={$country.id}"/>\r
+      <moreinfos url="geoloc/country?{$searchvars}mapid={$country.id}"/>\r
       {/if}\r
     </country>\r
     {/foreach}\r
@@ -39,7 +39,7 @@
     {foreach from=$cities item="city"}\r
     <city id="{$city.id}" name="{$city.name}">\r
       <icon x="{$city.x}" y="{$city.y}" nb="{$city.pop}" size="{$city.size}" name="{$city.name}" green="{if $city.pop}{$city.yellow/$city.pop}{else}0{/if}" blue="0"/>\r
-      <moreinfos url="getCityInfos.php?{$searchvars}cityid={$city.id}"/>\r
+      <moreinfos url="geoloc/city?{$searchvars}cityid={$city.id}"/>\r
     </city>\r
     {/foreach}\r
   </cities>\r

diff --git a/templates/geoloc/index.tpl b/templates/geoloc/index.tpl
index f25d38d..91b3fbc 100644 (file)
--- a/templates/geoloc/index.tpl
+++ b/templates/geoloc/index.tpl
@@ -65,7 +65,7 @@ function searchMapId(f)
 {if $globals->geoloc->use_map}
   <p class="center">
     <embed
-      src="dynamap.swf"
+      src="geoloc/dynamap.swf"
       quality="high"
       bgcolor="#ffffff"
       width="600"