use geoloc/ link instead of geoloc/geoloc

diff --git a/modules/geoloc.php b/modules/geoloc.php
index d9d7358..e276e1f 100644 (file)
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -36,7 +36,7 @@ class GeolocModule extends PLModule
 
         $set = new UserSet();
         $set->addMod('geoloc', 'Geolocalisation', true);
-        $set->apply('geoloc', $page, $action, $subaction);
+        $set->apply('geoloc', $page, 'geoloc', $action);
     }
 
     function handler_admin(&$page, $action = false) {

diff --git a/templates/include/plview.geoloc.tpl b/templates/include/plview.geoloc.tpl
index 8393328..6f3f417 100644 (file)
--- a/templates/include/plview.geoloc.tpl
+++ b/templates/include/plview.geoloc.tpl
@@ -52,7 +52,7 @@ function searchMapId()
   
   {if $smarty.request.only_current neq 'on'}
   <p class="center">
-    [<a href="{$platal->ns}{$plset_base}/geoloc{$plset_search}only_current=on">Ne voir que les adresses principales</a>]
+    [<a href="{$platal->ns}{$plset_base}{$plset_search}only_current=on">Ne voir que les adresses principales</a>]
   </p>
   {/if}
   
@@ -63,13 +63,13 @@ function searchMapId()
     width="600"
     height="450"
     align="middle">
-      <param name="movie" value="{$platal->ns}{$plset_base}/geoloc/dynamap.swf"/>
+      <param name="movie" value="{$platal->ns}{$plset_base}/dynamap.swf"/>
       <param name="bgcolor" value="#ffffff"/>
       <param name="wmode" value="opaque"/>
       <param name="quality" value="high"/>
-      <param name="flashvars" value="initfile={$platal->ns|urlencode}{$plset_base|urlencode}%2Fgeoloc%2Finit{$plset_search_enc}"/>
+      <param name="flashvars" value="initfile={$platal->ns|urlencode}{$plset_base|urlencode}%2Finit{$plset_search_enc}"/>
       <embed
-        src="{$platal->ns}{$plset_base}/geoloc/dynamap.swf"
+        src="{$platal->ns}{$plset_base}/dynamap.swf"
         quality="high"
         bgcolor="#ffffff"
         width="600"
@@ -77,7 +77,7 @@ function searchMapId()
         name="dynamap"
         id="dynamap"
         align="middle"
-        flashvars="initfile={$platal->ns|urlencode}{$plset_base|urlencode}%2Fgeoloc%2Finit{$plset_search_enc}"
+        flashvars="initfile={$platal->ns|urlencode}{$plset_base|urlencode}%2Finit{$plset_search_enc}"
         type="application/x-shockwave-flash"
         menu="false"
         wmode="opaque"