dynamap pas obligatoire

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

diff --git a/hooks/geoloc.inc.php b/hooks/geoloc.inc.php
index 0165c29..bbdd1c4 100644 (file)
--- a/hooks/geoloc.inc.php
+++ b/hooks/geoloc.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -26,6 +26,12 @@
 class GeolocConfig
 {
     var $webservice_url = '';
+    var $dynamap_path = false;
+    var $icon_path = false;
+
+    function use_map() {
+        return $this->dynamap_path != false;
+    }
 }
 
 // }}}

diff --git a/hooks/tmp.inc.php b/hooks/tmp.inc.php
index f0d1b57..0c52987 100644 (file)
--- a/hooks/tmp.inc.php
+++ b/hooks/tmp.inc.php
@@ -12,7 +12,8 @@ function tmp_menu()
 
     $globals->menu->addPrivateEntry(XOM_GROUPS,   10, 'Trombi/Site promo',          'trombipromo.php');
     $globals->menu->addPrivateEntry(XOM_GROUPS,   20, 'Conseil Pro.',          'referent.php');
-    $globals->menu->addPrivateEntry(XOM_GROUPS,   10, 'Planisphère',          'geoloc/');
+    if ($globals->geoloc->use_map())
+        $globals->menu->addPrivateEntry(XOM_GROUPS,   10, 'Planisphère',          'geoloc/');
     $globals->menu->addPrivateEntry(XOM_GROUPS,   30, 'Groupes X',             'http://www.polytechnique.net/plan.php');
 
     $globals->menu->addPrivateEntry(XOM_INFOS,    10, 'Documentations',        'Docs/');

diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index a935b64..de17927 100644 (file)
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -122,6 +122,8 @@ if (!Env::has('rechercher')) {
     
 }
 
+$page->assign('use_map', $globals->geoloc->use_map());
+
 $page->register_modifier('display_lines', 'display_lines');
 $page->run();
 

diff --git a/htdocs/geoloc/dynamap.php b/htdocs/geoloc/dynamap.php
index 1d3ecc5..3e4755b 100644 (file)
--- a/htdocs/geoloc/dynamap.php
+++ b/htdocs/geoloc/dynamap.php
@@ -38,6 +38,7 @@ if (urlencode(Env::get('initfile')) != $initfile)
 
 header("Content-type: application/x-shockwave-flash");
 
-readfile("../../plugins/geoloc/dynamap.swf");
+if ($globals->geoloc->use_map())
+       readfile($globals->geoloc->dynamap_path);
 
 ?>

diff --git a/htdocs/geoloc/icon.php b/htdocs/geoloc/icon.php
index 7482ffc..2805756 100644 (file)
--- a/htdocs/geoloc/icon.php
+++ b/htdocs/geoloc/icon.php
@@ -26,6 +26,7 @@ new_nonhtml_page('', AUTH_COOKIE);
 
 header("Content-type: application/x-shockwave-flash");
 
-readfile("../../plugins/geoloc/icon.swf");
+if ($globals->geoloc->use_map())
+       readfile($globals->geoloc->icon_path);
 
 ?>

diff --git a/htdocs/geoloc/index.php b/htdocs/geoloc/index.php
index 5af6ecb..8f13d57 100644 (file)
--- a/htdocs/geoloc/index.php
+++ b/htdocs/geoloc/index.php
@@ -33,6 +33,7 @@ $search = preg_replace('/(^|&)mapid=([0-9]+)(&|$)/','\1\3', $search);
 if ($search)
        $page->assign('dynamap_vars', $search);
 
+$page->assign('use_map', $globals->geoloc->use_map());
 $page->run();
 
 // vim:set et sws=4 sw=4 sts=4:

diff --git a/templates/geoloc/index.tpl b/templates/geoloc/index.tpl
index 871f393..129b152 100644 (file)
--- a/templates/geoloc/index.tpl
+++ b/templates/geoloc/index.tpl
@@ -58,6 +58,7 @@ function searchMapId(f)
 Aujourd'hui {$localises} de nos camarades sont localisés grâce à leurs adresses personnelles.
 </p>
 {/if}
+{if $use_map}
 <p class="center">
 <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="600" height="450" id="dynamap" align="middle">
 <param name="allowScriptAccess" value="sameDomain" />
@@ -66,12 +67,16 @@ Aujourd'hui {$localises} de nos camarades sont localis
 <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>
 <form id="search_form" action="{#globals.baseurl#}/advanced_search.php?{$dynamap_vars|default:"only_current=on"}&amp;rechercher=1" method="post">
 <p>
        <input type="button" value="Lister les camarades de la carte" onclick="searchMapId(this.form)"/>
 </p>
 </form>
+{else}
+<p>Le moteur de carte n'a pas été installé sur cette version de plat/al. Veuillez contacter <a href="http://www.geodesix.com/">Geodesix</a>.</p>
+{/if} 
 <p class="descr">Pour toute question, problème ou suggestion tu peux envoyer un mail à <a href="mailto:contact+geoloc@polytechnique.org">contact+geoloc@polytechnique.org</a></p>
 
 {* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/search.adv.form.tpl b/templates/search.adv.form.tpl
index dd4a263..8d1ace2 100644 (file)
--- a/templates/search.adv.form.tpl
+++ b/templates/search.adv.form.tpl
@@ -315,7 +315,9 @@
                        f.submit();
                }
                {/literal}</script>
-               <input type="button" value="Voir les résultats sur une carte" onclick="launch_form('geoloc/')"/>
+               {if $use_map}
+                 <input type="button" value="Voir les résultats sur une carte" onclick="launch_form('geoloc/')"/>
+               {/if}
                <input type="button" value="Chercher" onclick="launch_form('{$smarty.server.PHP_SELF}')"/>
   </p>
 <p>

diff --git a/templates/search.tpl b/templates/search.tpl
index 3df8b19..adc472b 100644 (file)
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -34,7 +34,7 @@
     {if $search_results_nb==0}Aucune{else}{$search_results_nb}{/if} réponse{if $search_results_nb>1}s{/if}.
   </h1>
 
-  {if $search_results_nb and $advanced and !$simple}
+  {if $search_results_nb and $advanced and !$simple and $use_map}
   <p>
        [<a href='geoloc/?{$search_vars}'>Voir la recherche sur une carte</a>].
   </p>