X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=modules%2Fgeoloc.php;h=d731e6a8cb89d31bb1307a62b1a4149b54e4cded;hb=63c386f8106ae27322f8c712962f24e9cbcc5d77;hp=370a121bfc06c0a59d6f1bff48b1e52dd995dcc0;hpb=62a66dfc26089fb5c15f36617c40e82380c052f0;p=platal.git diff --git a/modules/geoloc.php b/modules/geoloc.php index 370a121..d731e6a 100644 --- a/modules/geoloc.php +++ b/modules/geoloc.php @@ -1,6 +1,6 @@ $this->make_hook('default', AUTH_COOKIE), - 'geoloc/icon.php' => $this->make_hook('icon', AUTH_COOKIE), - 'geoloc/dynamap.php' => $this->make_hook('dynamap', AUTH_COOKIE), - 'geoloc/geolocInit.php' => $this->make_hook('init', AUTH_COOKIE), - 'geoloc/getCityInfos.php' => $this->make_hook('city', AUTH_COOKIE), - 'geoloc/getData.php' => $this->make_hook('data', AUTH_COOKIE), + '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') { - $querystring .= '&'.urlencode($v).'='.urlencode($a); - } - } - - return $querystring; - } - - function handler_default(&$page) + static public function prepare_map(PlPage $page) { global $globals; - - require_once 'search.inc.php'; - $page->changeTpl('geoloc/index.tpl'); - - $res = XDB::query('SELECT COUNT(DISTINCT uid) - FROM adresses WHERE cityid IS NOT NULL'); - $page->assign('localises', $res->fetchOneCell()); - - $fields = new SFieldGroup(true, advancedSearchFromInput()); - $search = $fields->get_url(); - if (Env::has('only_current') && Env::get('only_current') != 'on') { - $search .= '&only_current='; - } - $search = preg_replace('/(^|&)mapid=([0-9]+)(&|$)/','\1\3', $search); - if ($search) { - $page->assign('dynamap_vars', $search); - } - - $page->assign('use_map', $globals->geoloc->use_map()); - } - - function handler_icon(&$page) - { - global $globals; - - header("Content-type: application/x-shockwave-flash"); - - if ($globals->geoloc->use_map()) { - readfile($globals->geoloc->icon_path); - exit; - } - - return PL_NOT_FOUND; + $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->assign('pl_extra_header', ''); } - function handler_dynamap(&$page) + static public function assign_json_to_map(PlPage $page, $pids = null) { - global $globals; - - $querystring = $this->_make_qs(); - $initfile = urlencode('geolocInit.php?'.$querystring); - - if (urlencode(Env::get('initfile')) != $initfile) { - header("Location: dynamap.php?initfile=$initfile{$querystring}"); - die(); + if (!is_null($pids)) { + $where = XDB::format(' AND pa.pid IN {?}', $pids); + } else { + $where = ''; } - header("Content-type: application/x-shockwave-flash"); - - if ($globals->geoloc->use_map()) { - readfile($globals->geoloc->dynamap_path); - exit; + 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'; } - return PL_NOT_FOUND; - } - - function handler_init(&$page) - { - global $globals; - - $page->changeTpl('geoloc/geolocInit.tpl', NO_SKIN); - - header('Content-type: text/xml'); - $page->assign('querystring', $this->_make_qs()); + $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 p.deathdate IS NULL 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_city(&$page) + function handler_map($page) { - global $globals; - - header("Content-type: text/xml"); - - $page->changeTpl('geoloc/getCityInfos.tpl', NO_SKIN); - - require_once('geoloc.inc.php'); - require_once('search.inc.php'); - - $usual_fields = advancedSearchFromInput(); - $fields = new SFieldGroup(true, $usual_fields); - $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); - - $page->assign('users', $users); + if (Get::b('ajax')) { + self::assign_json_to_map($page); + return PL_JSON; + } else { + self::prepare_map($page); + } } - function handler_data(&$page) + function handler_map_url($page) { - global $globals; + pl_content_headers('text/plain'); - // to debug sql use the next line - if (Env::has('debug')) { - $page->changeTpl('geoloc/getData.tpl', SIMPLE); - } else { - header("Content-type: text/xml"); - $page->changeTpl('geoloc/getData.tpl', NO_SKIN); + 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')); } - require_once 'geoloc.inc.php'; - require_once 'search.inc.php'; - - $querystring = $this->_make_qs(); - $page->assign('searchvars', $querystring); - - $mapid = Env::has('mapid') ? Env::getInt('mapid', -2) : false; - - list($countries, $cities) = geoloc_getData_subcountries($mapid, advancedSearchFromInput(), 10); - - $page->assign('countries', $countries); - $page->assign('cities', $cities); + exit(); } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>