<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2009 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
(!empty($GLOBALS['IS_XNET_SITE']) ?
'INNER JOIN groupex.membres AS gxm ON (u.user_id = gxm.uid
AND gxm.asso_id = ' . $globals->asso('id') . ') ' : '')
- . 'LEFT JOIN auth_user_quick AS q USING (user_id)
- LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type = \'a_vie\')
- ' . $joins,
+ . 'LEFT JOIN auth_user_quick AS q USING (user_id)' . $joins,
$where,
'u.user_id');
}
public function fields()
{
- return "u.user_id AS id,
- u.*, a.alias AS forlife,
+ global $globals;
+ return "u.user_id AS id, u.*,
+ CONCAT(a.alias, '@{$globals->mail->domain}') AS bestemail,
u.perms != 'pending' AS inscrit,
u.perms != 'pending' AS wasinscrit,
u.deces != 0 AS dcd, u.deces, u.matricule_ax,
AND FIND_IN_SET('active', adr.statut)".(S::logged() ? "" : " AND adr.pub = 'public'").")
LEFT JOIN geoloc_pays AS gp ON (adr.country = gp.a2)
LEFT JOIN geoloc_region AS gr ON (adr.country = gr.a2 AND adr.region = gr.region)
+ LEFT JOIN aliases AS a ON (a.id = u.user_id AND FIND_IN_SET('bestalias', a.flags))
LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = 'active')" .
(S::logged() ?
"LEFT JOIN contacts AS c On (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")"
public function fields()
{
- return "m.uid, u.prenom, u.nom, u.promo,
- a.alias AS forlife, m.expertise, mp.pid,
- ms.secteur, ms.ss_secteur";
+ return "m.uid, u.prenom, u.nom, u.promo, u.hruid,
+ m.expertise, mp.pid, ms.secteur, ms.ss_secteur";
}
public function bounds()
public function fields()
{
- return "u.user_id, IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, a.alias AS forlife ";
+ return "u.user_id, IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo, u.hruid ";
}
public function joins()
switch ($this->type) {
case 'icon.swf':
- header("Content-type: application/x-shockwave-flash");
- header("Pragma:");
+ pl_cached_content_headers("application/x-shockwave-flash");
readfile(dirname(__FILE__).'/../modules/geoloc/icon.swf');
exit;
case 'dynamap.swf':
- header("Content-type: application/x-shockwave-flash");
- header("Pragma:");
+ pl_cached_content_headers("application/x-shockwave-flash");
readfile(dirname(__FILE__).'/../modules/geoloc/dynamap.swf');
exit;
case 'init':
$page->changeTpl('geoloc/init.tpl', NO_SKIN);
- header('Content-Type: text/xml');
- header('Pragma:');
+ pl_cached_content_headers("text/xml", "utf-8");
if (!empty($GLOBALS['IS_XNET_SITE'])) {
$page->assign('background', 0xF2E9D0);
}
case 'city':
$page->changeTpl('geoloc/city.tpl', NO_SKIN);
- header('Content-Type: text/xml');
- header('Pragma:');
+ pl_cached_content_headers("text/xml", "utf-8");
$only_current = Env::v('only_current', false)? ' AND FIND_IN_SET(\'active\', adrf.statut)' : '';
$it =& $this->set->get('u.user_id AS id, u.prenom, u.nom, u.promo, al.alias',
"INNER JOIN adresses AS adrf ON (adrf.uid = u.user_id $only_current)
$page->changeTpl('geoloc/country.tpl', SIMPLE);
} else {
$page->changeTpl('geoloc/country.tpl', NO_SKIN);
- header('Content-Type: text/xml');
- header('Pragma:');
+ pl_cached_content_headers("text/xml", "utf-8");
}
$mapid = Env::has('mapid') ? Env::i('mapid', -2) : false;
list($countries, $cities) = geoloc_getData_subcountries($mapid, $this->set, 10);
public function fields()
{
- return "u.user_id AS id,
- u.*, a.alias AS forlife," .
+ return "u.user_id AS id, u.*," .
(S::logged() ? "q.profile_mobile AS mobile, " : "IF(q.profile_mobile_pub = 'public', q.profile_mobile, NULL) as mobile, ") .
"u.perms != 'pending' AS inscrit,
u.perms != 'pending' AS wasinscrit,