X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgeoloc.php;h=fafbe4940090d33bad75a23e0e1418e6d8a9fc45;hb=5f0c028ae6dae8c9a724bbca5bb9915648d883df;hp=cfcd673292f97beb5390519ac9eb66f8316f5d59;hpb=27472b8575b2ba4ec4d7922891d17f48b3ff435f;p=platal.git
diff --git a/modules/geoloc.php b/modules/geoloc.php
index cfcd673..fafbe49 100644
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -1,6 +1,6 @@
$this->make_hook('default', AUTH_COOKIE),
- 'geoloc/icon.swf' => $this->make_hook('icon', AUTH_COOKIE),
- 'geoloc/dynamap.swf' => $this->make_hook('dynamap', AUTH_COOKIE),
- 'geoloc/init' => $this->make_hook('init', AUTH_COOKIE),
- 'geoloc/city' => $this->make_hook('city', AUTH_COOKIE),
- 'geoloc/country' => $this->make_hook('country', AUTH_COOKIE),
- '%grp/geoloc' => $this->make_hook('default',AUTH_COOKIE),
- '%grp/geoloc/icon.swf' => $this->make_hook('icon', AUTH_COOKIE),
- '%grp/geoloc/dynamap.swf'=> $this->make_hook('dynamap',AUTH_COOKIE),
- '%grp/geoloc/init' => $this->make_hook('init', AUTH_COOKIE),
- '%grp/geoloc/city' => $this->make_hook('city', AUTH_COOKIE),
- '%grp/geoloc/country' => $this->make_hook('country',AUTH_COOKIE),
- 'admin/geoloc' => $this->make_hook('admin', AUTH_MDP, 'admin'),
- 'admin/geoloc/dynamap' => $this->make_hook('admin_dynamap', AUTH_MDP, 'admin'),
+ 'map' => $this->make_hook('map', AUTH_COOKIE, 'user'),
+ 'map_url' => $this->make_hook('map_url', AUTH_COOKIE, 'user')
);
}
- function _make_qs()
- {
- $querystring = "";
-
- foreach ($_GET as $v => $a) {
- if ($v != 'initfile' && $v != 'n' && $v != 'mapid') {
- $querystring .= urlencode($v).'='.urlencode($a).'&';
- }
- }
-
- return $querystring;
- }
-
- function handler_default(&$page)
+ static public function prepare_map(PlPage $page)
{
global $globals;
-
- if (!is_file(dirname(__FILE__).'/geoloc/dynamap.swf') ||
- !is_file(dirname(__FILE__).'/geoloc/icon.swf'))
- $page->assign('request_geodesix', 1);
-
- if (!empty($GLOBALS['IS_XNET_SITE'])) {
- $page->useMenu();
- $page->setType($globals->asso('cat'));
- $page->assign('no_annu', 1);
- }
-
- require_once 'search.inc.php';
$page->changeTpl('geoloc/index.tpl');
- $fields = new SFieldGroup(true, advancedSearchFromInput());
- $search = str_replace('&','&',$fields->get_url());
- if (!Env::has('only_current'))
- $search .= '&only_current=on';
- elseif (Env::i('only_current') != 'on')
- $search .= '&only_current=';
-
- $search = preg_replace('/(^|&)mapid=([0-9]+)(&)/','\1\3', $search);
- if ($search)
- $search = '?'.$search;
- $page->assign('search',urlencode($search));
-
- $page->assign('protocole', substr($globals->baseurl,0,strpos($globals->baseurl,':')));
-
- if (!$search) {
- $res = XDB::query('SELECT COUNT(DISTINCT uid)
- FROM adresses WHERE cityid IS NOT NULL');
- $page->assign('localises', $res->fetchOneCell());
- }
- }
-
- function handler_icon(&$page)
- {
- global $globals;
-
- header("Content-type: application/x-shockwave-flash");
- header("Pragma:");
-
- readfile(dirname(__FILE__).'/geoloc/icon.swf');
- exit;
-
- return PL_NOT_FOUND;
- }
-
- function handler_dynamap(&$page)
- {
- global $globals;
-
- header("Content-type: application/x-shockwave-flash");
-
- header("Pragma:");
- readfile(dirname(__FILE__).'/geoloc/dynamap.swf');
- exit;
-
- return PL_NOT_FOUND;
- }
-
- function handler_init(&$page)
- {
- global $globals;
-
- $page->changeTpl('geoloc/geolocInit.tpl', NO_SKIN);
-
- header('Content-type: text/xml');
- header('Pragma:');
- if(!empty($GLOBALS['IS_XNET_SITE']))
- $page->assign('background', 0xF2E9D0);
- $page->assign('querystring', $this->_make_qs());
+ $map_url = $globals->maps->dynamic_map . '?&sensor=false&v=' . $globals->maps->api_version . '&language=' . $globals->maps->language;
+ $page->addJsLink($map_url, false);
+ $page->addJsLink('maps.js');
+ $page->addJsLink('markerclusterer.js');
+ $page->addJsLink('markerwithlabel.js');
+ $page->assign('pl_extra_header', '');
}
- function handler_city(&$page)
+ static public function assign_json_to_map(PlPage $page, $pids = null)
{
- global $globals;
-
- header("Content-type: text/xml");
- header("Pragma:");
-
- $page->changeTpl('geoloc/getCityInfos.tpl', NO_SKIN);
-
- require_once('geoloc.inc.php');
- require_once('search.inc.php');
-
- if (empty($GLOBALS['IS_XNET_SITE'])) {
- $usual_fields = advancedSearchFromInput();
- $fields = new SFieldGroup(true, $usual_fields);
+ if (!is_null($pids)) {
+ $where = XDB::format(' AND pa.pid IN {?}', $pids);
} else {
- $_REQUEST['asso_id'] = $globals->asso('id');
- $_REQUEST['only_current'] = 'on';
- $fields = new SFieldGroup(true, array(
- new RefSField('asso_id',array('gxm.asso_id'),'groupex.membres','gxm','u.user_id=gxm.uid'),
- new RefSField('cityid',array('av.cityid'),'adresses','av',getadr_join('av'))));
+ $where = '';
}
- $where = $fields->get_where_statement();
- if ($where) $where = "WHERE ".$where;
- $users = XDB::iterator("
- SELECT u.user_id AS id, u.prenom, u.nom, u.promo
- 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)
- ".$fields->get_select_statement()."
- ".$where."
- GROUP BY u.user_id LIMIT 11", $id);
+ if (!S::logged() || !S::user()->checkPerms('directory_ax')) {
+ $where .= " AND pa.pub = 'public'";
+ $name_publicity = 'public';
+ } else if (!S::user()->checkPerms('directory_private')) {
+ $where .= " AND pa.pub = 'ax'";
+ $name_publicity = 'public';
+ } else {
+ $name_publicity = 'private';
+ }
- $page->assign('users', $users);
+ $data = XDB::rawFetchAllAssoc('SELECT pa.latitude, pa.longitude, GROUP_CONCAT(DISTINCT p.hrpid SEPARATOR \',\') AS hrpid,
+ GROUP_CONCAT(pd.promo SEPARATOR \',\') AS promo,
+ GROUP_CONCAT(DISTINCT pd.' . $name_publicity . '_name, \' (\', pd.promo, \')\' SEPARATOR \', \') AS name,
+ GROUP_CONCAT(DISTINCT pa.pid SEPARATOR \',\') AS pid
+ FROM profile_addresses AS pa
+ INNER JOIN profiles AS p ON (pa.pid = p.pid)
+ INNER JOIN profile_display AS pd ON (pd.pid = pa.pid)
+ WHERE pa.type = \'home\' AND pa.latitude IS NOT NULL AND pa.longitude IS NOT NULL' . $where . '
+ GROUP BY pa.latitude, pa.longitude');
+ $page->jsonAssign('data', $data);
}
- function handler_country(&$page)
+ function handler_map($page)
{
- global $globals;
-
- // to debug sql use the next line
- if (Env::has('debug')) {
- $page->changeTpl('geoloc/getData.tpl', SIMPLE);
+ if (Get::b('ajax')) {
+ self::assign_json_to_map($page);
+ return PL_JSON;
} else {
- header("Content-type: text/xml");
- header("Pragma:");
- $page->changeTpl('geoloc/getData.tpl', NO_SKIN);
+ self::prepare_map($page);
}
+ }
- require_once 'geoloc.inc.php';
- require_once 'search.inc.php';
-
- $querystring = $this->_make_qs();
- $page->assign('searchvars', $querystring);
+ function handler_map_url($page)
+ {
+ pl_content_headers('text/plain');
- $mapid = Env::has('mapid') ? Env::i('mapid', -2) : false;
- if (empty($GLOBALS['IS_XNET_SITE'])) {
- $fields = advancedSearchFromInput();
- } else {
- $_REQUEST['asso_id'] = $globals->asso('id');
- $_REQUEST['only_current'] = 'on';
- $fields = array(new RefSField('asso_id',array('gxm.asso_id'),'groupex.membres','gxm','u.user_id=gxm.uid'));
+ if (Post::has('text')) {
+ $address = new Address(array('text' => Post::t('text')));
+ $gmapsGeocoder = new GMapsGeocoder();
+ $gmapsGeocoder->getGeocodedAddress($address);
+ echo GMapsGeocoder::buildStaticMapURL($address->latitude, $address->longitude, Post::t('color'));
}
- list($countries, $cities) = geoloc_getData_subcountries($mapid, $fields, 10);
-
- $page->assign('countries', $countries);
- $page->assign('cities', $cities);
- }
-
- function handler_admin(&$page, $action = false) {
- $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");
-
- $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");
- 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");
- }
-
- if ($action == 'newmaps') {
- require_once('geoloc.inc.php');
- if (!get_new_maps(Env::v('url')))
- $page->trig("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", "");
- }
- $page->assign("nb_cities_not_on_map", $missing);
- $page->assign("no_smallest", $noSmallest);
- $page->assign("no_coordinates", $noCoordinates);
+ exit();
}
-
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>