X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgeoloc.php;h=895c5f464f0f7eb11720b4ab1e4b83a22fb4ac31;hb=d7610c358d074c78e1e8dc25fe0cf0e5e7e1c55e;hp=cc437ea181bd502320e3c62b86b5a26892f33987;hpb=a91fb58440b6dbe3a4ba023520fff0e2be5f5000;p=platal.git

diff --git a/modules/geoloc.php b/modules/geoloc.php
index cc437ea..895c5f4 100644
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -43,60 +43,62 @@ class GeolocModule extends PLModule
         $page->changeTpl('geoloc/admin.tpl');
         require_once("geoloc.inc.php");
         $page->assign('xorg_title','Polytechnique.org - Administration - Geolocalisation');
-        
+
         $nb_synchro = 0;
-        
+
         if (Env::has('id') && is_numeric(Env::v('id'))) {
             if (synchro_city(Env::v('id'))) $nb_synchro ++;
         }
-        
+
         if ($action == 'missinglat') {
             $res = XDB::iterRow("SELECT id FROM geoloc_city WHERE lat = 0 AND lon = 0");
             while ($a = $res->next()) if (synchro_city($a[0])) $nb_synchro++;
         }
-        
-        if ($nb_synchro) 
-            $page->trig(($nb_synchro > 1)?($nb_synchro." villes ont été synchronisées"):"Une ville a été synchronisée");
-        
+
+        if ($nb_synchro)
+            $page->trigSuccess(($nb_synchro > 1)?($nb_synchro." villes ont été synchronisées"):"Une ville a été synchronisée");
+
         $res = XDB::query("SELECT COUNT(*) FROM geoloc_city WHERE lat = 0 AND lon = 0");
         $page->assign("nb_missinglat", $res->fetchOneCell());
     }
-    
+
     function handler_admin_dynamap(&$page, $action = false) {
         $page->changeTpl('geoloc/admin_dynamap.tpl');
-        
+
         if ($action == 'cities_not_on_map') {
             require_once('geoloc.inc.php');
             if (!fix_cities_not_on_map(20))
-                $page->trig("Impossible d'accéder au webservice");
+                $page->trigError("Impossible d'accéder au webservice");
             else
                 $refresh = true;
         }
-        
+
         if ($action == 'smallest_maps') {
             require_once('geoloc.inc.php');
             set_smallest_levels();
         }
-        
+
         if ($action == 'precise_coordinates') {
-            XDB::execute("UPDATE adresses AS a INNER JOIN geoloc_city AS c ON(a.cityid = c.id) SET a.glat = c.lat / 100000, a.glng = c.lon / 100000");
+            XDB::execute("UPDATE  adresses AS a
+                      INNER JOIN  geoloc_city AS c ON(a.cityid = c.id)
+                             SET  a.glat = c.lat / 100000, a.glng = c.lon / 100000");
         }
-        
+
         if ($action == 'newmaps') {
             require_once('geoloc.inc.php');
             if (!get_new_maps(Env::v('url')))
-                $page->trig("Impossible d'accéder aux nouvelles cartes");
+                $page->trigError("Impossible d'accéder aux nouvelles cartes");
         }
-        
+
         $countMissing = XDB::query("SELECT COUNT(*) FROM geoloc_city AS c LEFT JOIN geoloc_city_in_maps AS m ON(c.id = m.city_id) WHERE m.city_id IS NULL");
         $missing = $countMissing->fetchOneCell();
-        
+
         $countNoSmallest = XDB::query("SELECT SUM(IF(infos = 'smallest',1,0)) AS n FROM geoloc_city_in_maps GROUP BY city_id ORDER BY n");
         $noSmallest = $countNoSmallest->fetchOneCell() == 0;
-        
+
         $countNoCoordinates = XDB::query("SELECT COUNT(*) FROM adresses WHERE cityid IS NOT NULL AND glat = 0 AND glng = 0");
         $noCoordinates = $countNoCoordinates->fetchOneCell();
-        
+
         if (isset($refresh) && $missing) {
             $page->assign("xorg_extra_header", "<meta http-equiv='Refresh' content='3'/>");
         }
@@ -104,7 +106,7 @@ class GeolocModule extends PLModule
         $page->assign("no_smallest", $noSmallest);
         $page->assign("no_coordinates", $noCoordinates);
     }
-    
+
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: