global $globals;
$this->entriesPerPage = $globals->search->per_page;
if (@$params['with_score']) {
- $this->addSortKey('score', array('-score', '-date', '-promo', 'name_sort'), 'pertinence');
+ $this->addSortKey('score', array('-score', '-date', '-d.promo', 'name_sort'), 'pertinence');
}
$this->addSortKey('name', array('name_sort'), 'nom');
- $this->addSortKey('promo', array('-promo', 'name_sort'), 'promotion');
- $this->addSortKey('date_mod', array('-date', '-promo', 'name_sort'), 'dernière modification');
+ $this->addSortKey('promo', array('-d.promo', 'name_sort'), 'promotion');
+ $this->addSortKey('date_mod', array('-date', '-d.promo', 'name_sort'), 'dernière modification');
parent::__construct($set, $data, $params);
}
public function fields()
{
global $globals;
- return "u.user_id AS id, u.*, d.promo_display,
+ return "u.user_id AS id, u.*, d.promo,
CONCAT(a.alias, '@{$globals->mail->domain}') AS bestemail,
u.perms != 'pending' AS inscrit,
u.perms != 'pending' AS wasinscrit,
LEFT JOIN geoloc_region AS gr ON (adr.country = gr.a2 AND adr.region = gr.region)
LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = 'active')
INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)
- INNER JOIN profile_display AS d ON (d.uid = u.user_id)" . (S::logged() ?
+ INNER JOIN profile_display AS d ON (d.pid = u.user_id)" . (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, d.promo_display, u.hruid,
+ return "m.uid, d.promo, u.hruid,
m.expertise, mp.country, ms.sectorid, ms.subsectorid,
nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort";
}
public function joins()
{
return "INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)
- INNER JOIN profile_display AS d ON (d.uid = u.user_id)";
+ INNER JOIN profile_display AS d ON (d.pid = u.user_id)";
}
public function bounds()
public function fields()
{
- return "u.user_id, nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort, u.promo, d.promo_display, u.hruid ";
+ return "u.user_id, nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort, u.promo, d.promo, u.hruid ";
}
public function joins()
{
return "INNER JOIN photo AS p ON (p.uid = u.user_id)
- INNER JOIN profile_display AS d ON (d.uid = u.user_id)
+ INNER JOIN profile_display AS d ON (d.pid = u.user_id)
INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)";
}
header('Content-Type: text/xml');
header('Pragma:');
$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, d.promo_display, al.alias',
+ $it =& $this->set->get('u.user_id AS id, u.prenom, u.nom, d.promo, al.alias',
"INNER JOIN adresses AS adrf ON (adrf.uid = u.user_id $only_current)
- INNER JOIN profile_display AS d ON (d.uid = u.user_id)
+ INNER JOIN profile_display AS d ON (d.pid = u.user_id)
LEFT JOIN aliases AS al ON (u.user_id = al.id
AND FIND_IN_SET('bestalias', al.flags))
INNER JOIN adresses AS avg ON (" . getadr_join('avg') . ")",