$querystring = "";
foreach ($_GET as $v => $a) {
- if ($v != 'initfile' && $v != 'p' && $v != 'mapid') {
+ if ($v != 'initfile' && $v != 'n' && $v != 'mapid') {
$querystring .= urlencode($v).'='.urlencode($a).'&';
}
}
return $querystring;
}
+ function use_map()
+ {
+ return is_file(dirname(__FILE__).'/geoloc/dynamap.swf') &&
+ is_file(dirname(__FILE__).'/geoloc/icon.swf');
+ }
+
function handler_default(&$page)
{
global $globals;
- if (!is_file(dirname(__FILE__).'/geoloc/dynamap.swf') ||
- !is_file(dirname(__FILE__).'/geoloc/icon.swf'))
+ if (!$this->use_map())
$page->assign('request_geodesix', 1);
if (!empty($GLOBALS['IS_XNET_SITE'])) {
- $page->useMenu();
- $page->setType($globals->asso('cat'));
$page->assign('no_annu', 1);
+ new_annu_page('geoloc/index.tpl');
+ } else {
+ $page->changeTpl('geoloc/index.tpl');
}
- require_once 'search.inc.php';
- $page->changeTpl('geoloc/index.tpl');
+ require_once dirname(__FILE__).'/search/search.inc.php';
+
$fields = new SFieldGroup(true, advancedSearchFromInput());
- $search = $fields->get_url();
- if (!Env::has('only_current'))
+ $search = str_replace('&','&',$fields->get_url());
+ if ((!Env::has('only_current') && !Env::has('rechercher')) || Env::v('only_current') == 'on')
$search .= '&only_current=on';
- elseif (Env::get('only_current') != 'on')
+ elseif (Env::i('only_current') != 'on')
$search .= '&only_current=';
- $search = preg_replace('/(^|&)mapid=([0-9]+)(&|$)/','\1\3', $search);
+ $search = preg_replace('/(^|&)mapid=([0-9]+)(&)/','\1\3', $search);
if ($search)
$search = '?'.$search;
- $page->assign('search',$search);
+ $page->assign('search',urlencode($search));
$page->assign('protocole', substr($globals->baseurl,0,strpos($globals->baseurl,':')));
{
global $globals;
- $page->changeTpl('geoloc/geolocInit.tpl', NO_SKIN);
+ $page->changeTpl('geoloc/init.tpl', NO_SKIN);
header('Content-type: text/xml');
header('Pragma:');
header("Content-type: text/xml");
header("Pragma:");
- $page->changeTpl('geoloc/getCityInfos.tpl', NO_SKIN);
+ $page->changeTpl('geoloc/city.tpl', NO_SKIN);
+ require_once dirname(__FILE__).'/search/search.inc.php';
require_once('geoloc.inc.php');
- require_once('search.inc.php');
if (empty($GLOBALS['IS_XNET_SITE'])) {
$usual_fields = advancedSearchFromInput();
if ($where) $where = "WHERE ".$where;
$users = XDB::iterator("
- SELECT u.user_id AS id, u.prenom, u.nom, u.promo
+ SELECT u.user_id AS id, u.prenom, u.nom, u.promo, alias
FROM adresses AS a
INNER JOIN auth_user_md5 AS u ON(u.user_id = a.uid)
INNER JOIN auth_user_quick AS q ON(q.user_id = a.uid)
+ LEFT JOIN aliases ON(u.user_id = aliases.id AND FIND_IN_SET(aliases.flags,'bestalias'))
".$fields->get_select_statement()."
".$where."
GROUP BY u.user_id LIMIT 11", $id);
// to debug sql use the next line
if (Env::has('debug')) {
- $page->changeTpl('geoloc/getData.tpl', SIMPLE);
+ $page->changeTpl('geoloc/country.tpl', SIMPLE);
} else {
header("Content-type: text/xml");
header("Pragma:");
- $page->changeTpl('geoloc/getData.tpl', NO_SKIN);
+ $page->changeTpl('geoloc/country.tpl', NO_SKIN);
}
+ require_once dirname(__FILE__).'/search/search.inc.php';
require_once 'geoloc.inc.php';
- require_once 'search.inc.php';
$querystring = $this->_make_qs();
$page->assign('searchvars', $querystring);
}
function handler_admin(&$page, $action = false) {
- $page->changeTpl('admin/geoloc.tpl');
+ $page->changeTpl('geoloc/admin.tpl');
require_once("geoloc.inc.php");
$page->assign('xorg_title','Polytechnique.org - Administration - Geolocalisation');
}
function handler_admin_dynamap(&$page, $action = false) {
- $page->changeTpl('admin/geoloc_dynamap.tpl');
+ $page->changeTpl('geoloc/admin_dynamap.tpl');
if ($action == 'cities_not_on_map') {
require_once('geoloc.inc.php');