From: x2001corpet <x2001corpet@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Wed, 7 Jun 2006 17:10:02 +0000 (+0000)
Subject: adaptation geoloc pour utiliser une regle RewriteRule simple dans apache + verificati... 
X-Git-Tag: xorg/0.9.10~64
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1d07a02010ef577a3a1c4aa9f912ba5b4012a86a;p=platal.git

adaptation geoloc pour utiliser une regle RewriteRule simple dans apache + verification de la presence des fichiers de geodesix

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

diff --git a/hooks/geoloc.inc.php b/hooks/geoloc.inc.php
index bbdd1c4..89dd7e1 100644
--- a/hooks/geoloc.inc.php
+++ b/hooks/geoloc.inc.php
@@ -30,7 +30,10 @@ class GeolocConfig
     var $icon_path = false;
 
     function use_map() {
-        return $this->dynamap_path != false;
+        static $use_map;
+        if (!isset($use_map))
+            $use_map = $this->dynamap_path != false && is_file($this->dynamap_path) && is_file($this->icon_path);
+        return $use_map;
     }
 }
 
diff --git a/templates/geoloc/index.tpl b/templates/geoloc/index.tpl
index 129b152..524d589 100644
--- a/templates/geoloc/index.tpl
+++ b/templates/geoloc/index.tpl
@@ -64,8 +64,8 @@ Aujourd'hui {$localises} de nos camarades sont localis
 <param name="allowScriptAccess" value="sameDomain" />
 <param name="quality" value="high" />
 <param name="bgcolor" value="#ffffff" />
-<param name="movie" value="dynamap{$dynamap_vars|default:"only_current=on"}.swf" />
-<embed src="dynamap{$dynamap_vars|default:"only_current=on"}.swf" quality="high" bgcolor="#ffffff" width="600" height="450" name="dynamap" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+<param name="movie" value="dynamap_{$dynamap_vars|default:"only_current=on"}.swf" />
+<embed src="dynamap_{$dynamap_vars|default:"only_current=on"}.swf" quality="high" bgcolor="#ffffff" width="600" height="450" name="dynamap" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
 </object>
 <p class="smaller">Carte fournie gracieusement par <a href="http://www.geodesix.com/">Geodesix</a>.</p>
 </p>