projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes an "undefined variable" error in modules/email.php.
[platal.git]
/
modules
/
geoloc.php
diff --git
a/modules/geoloc.php
b/modules/geoloc.php
index
86bfbc9
..
42abc79
100644
(file)
--- a/
modules/geoloc.php
+++ b/
modules/geoloc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
8
Polytechnique.org *
+ * Copyright (C) 2003-200
9
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-42,7
+42,7
@@
class GeolocModule extends PLModule
function handler_admin(&$page, $action = false) {
$page->changeTpl('geoloc/admin.tpl');
require_once("geoloc.inc.php");
function handler_admin(&$page, $action = false) {
$page->changeTpl('geoloc/admin.tpl');
require_once("geoloc.inc.php");
- $page->
assign('xorg_title','Polytechnique.org -
Administration - Geolocalisation');
+ $page->
setTitle('
Administration - Geolocalisation');
$nb_synchro = 0;
$nb_synchro = 0;
@@
-56,7
+56,7
@@
class GeolocModule extends PLModule
}
if ($nb_synchro)
}
if ($nb_synchro)
- $page->trig(($nb_synchro > 1)?($nb_synchro." villes ont été synchronisées"):"Une ville a été synchronisée");
+ $page->trig
Success
(($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());
$res = XDB::query("SELECT COUNT(*) FROM geoloc_city WHERE lat = 0 AND lon = 0");
$page->assign("nb_missinglat", $res->fetchOneCell());
@@
-68,7
+68,7
@@
class GeolocModule extends PLModule
if ($action == 'cities_not_on_map') {
require_once('geoloc.inc.php');
if (!fix_cities_not_on_map(20))
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->trig
Error
("Impossible d'accéder au webservice");
else
$refresh = true;
}
else
$refresh = true;
}
@@
-87,7
+87,7
@@
class GeolocModule extends PLModule
if ($action == 'newmaps') {
require_once('geoloc.inc.php');
if (!get_new_maps(Env::v('url')))
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->trig
Error
("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");
}
$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");
@@
-100,7
+100,7
@@
class GeolocModule extends PLModule
$noCoordinates = $countNoCoordinates->fetchOneCell();
if (isset($refresh) && $missing) {
$noCoordinates = $countNoCoordinates->fetchOneCell();
if (isset($refresh) && $missing) {
- $page->assign("
xorg
_extra_header", "<meta http-equiv='Refresh' content='3'/>");
+ $page->assign("
pl
_extra_header", "<meta http-equiv='Refresh' content='3'/>");
}
$page->assign("nb_cities_not_on_map", $missing);
$page->assign("no_smallest", $noSmallest);
}
$page->assign("nb_cities_not_on_map", $missing);
$page->assign("no_smallest", $noSmallest);