global $globals;
-@$globals->search->result_where_statement = '
- LEFT JOIN profile_education AS edu ON (u.user_id = edu.uid)
- LEFT JOIN profile_education_enum AS ede ON (ede.id = edu.eduid)
- LEFT JOIN profile_job AS j ON (j.id = 0 AND j.uid = u.user_id)
- LEFT JOIN profile_job_enum AS je ON (je.id = j.jobid)
- LEFT JOIN profile_job_sector_enum AS es ON (j.sectorid = es.id)
- LEFT JOIN fonctions_def AS ef ON (j.functionid = ef.id)
- LEFT JOIN geoloc_pays AS n1 ON (u.nationalite = n1.a2)
- LEFT JOIN geoloc_pays AS n2 ON (u.nationalite2 = n2.a2)
- LEFT JOIN geoloc_pays AS n3 ON (u.nationalite2 = n3.a2)
- LEFT JOIN profile_addresses AS adr ON (u.user_id = adr.pid AND FIND_IN_SET(\'current\', adr.flags))
- LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_1_a2)
- '//LEFT JOIN geoloc_region AS gr ON (adr.countryId = gr.a2 AND adr.region = gr.region)
- . 'LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = \'active\')';
+@$globals->search->result_where_statement = "
+ LEFT JOIN profile_education AS edu ON (u.user_id = edu.uid)
+ LEFT JOIN profile_education_enum AS ede ON (ede.id = edu.eduid)
+ LEFT JOIN profile_job AS j ON (j.id = 0 AND j.uid = u.user_id)
+ LEFT JOIN profile_job_enum AS je ON (je.id = j.jobid)
+ LEFT JOIN profile_job_sector_enum AS es ON (j.sectorid = es.id)
+ LEFT JOIN fonctions_def AS ef ON (j.functionid = ef.id)
+ LEFT JOIN geoloc_countries AS n1 ON (u.nationalite = n1.iso_3166_1_a2)
+ LEFT JOIN geoloc_countries AS n2 ON (u.nationalite2 = n2.iso_3166_1_a2)
+ LEFT JOIN geoloc_countries AS n3 ON (u.nationalite2 = n3.iso_3166_1_a2)
+ LEFT JOIN profile_addresses AS adr ON (u.user_id = adr.pid
+ AND FIND_IN_SET('current', adr.flags))
+ LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_1_a2)
+ LEFT JOIN geoloc_administrativeareas AS gr ON (adr.countryId = gr.country
+ AND adr.administrativeAreaId = gr.id)
+ LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = 'active')";
class UserSet extends PlSet
{
u.perms != 'pending' AS wasinscrit,
u.deces != 0 AS dcd, u.deces, u.matricule_ax,
FIND_IN_SET('femme', u.flags) AS sexe,
- je.name AS entreprise, je.url AS job_web, es.name AS secteur, ef.fonction_fr AS fonction,
- IF(n1.nat = '', n1.pays, n1.nat) AS nat1, n1.a2 AS iso3166_1,
- IF(n2.nat = '', n2.pays, n2.nat) AS nat2, n2.a2 AS iso3166_2,
- IF(n3.nat = '', n3.pays, n3.nat) AS nat3, n3.a2 AS iso3166_3,
+ je.name AS entreprise, je.url AS job_web, es.name AS sector, ef.fonction_fr AS fonction,
+ IF(n1.nat = '', n1.countryFR, n1.nat) AS nat1, n1.iso_3166_1_a2 AS iso3166_1,
+ IF(n2.nat = '', n2.countryFR, n2.nat) AS nat2, n2.iso_3166_1_a2 AS iso3166_2,
+ IF(n3.nat = '', n3.countryFR, n3.nat) AS nat3, n3.iso_3166_1_a2 AS iso3166_3,
IF(ede0.abbreviation = '', ede0.name, ede0.abbreviation) AS eduname0, ede0.url AS eduurl0,
IF(edd0.abbreviation = '', edd0.degree, edd0.abbreviation) AS edudegree0,
edu0.grad_year AS edugrad_year0, f0.field AS edufield0, edu0.program AS eduprogram0,
LEFT JOIN profile_job_enum AS je ON (je.id = j.jobid)
LEFT JOIN profile_job_sector_enum AS es ON (j.sectorid = es.id)
LEFT JOIN fonctions_def AS ef ON (j.functionid = ef.id)
- LEFT JOIN geoloc_pays AS n1 ON (u.nationalite = n1.a2)
- LEFT JOIN geoloc_pays AS n2 ON (u.nationalite2 = n2.a2)
- LEFT JOIN geoloc_pays AS n3 ON (u.nationalite3 = n3.a2)
+ LEFT JOIN geoloc_countries AS n1 ON (u.nationalite = n1.iso_3166_1_a2)
+ LEFT JOIN geoloc_countries AS n2 ON (u.nationalite2 = n2.iso_3166_1_a2)
+ LEFT JOIN geoloc_countries AS n3 ON (u.nationalite3 = n3.iso_3166_1_a2)
LEFT JOIN profile_education AS edu0 ON (u.user_id = edu0.uid AND edu0.id = 0)
LEFT JOIN profile_education_enum AS ede0 ON (ede0.id = edu0.eduid)
LEFT JOIN profile_education_degree_enum AS edd0 ON (edd0.id = edu0.degreeid)
. (S::logged() ? "" :
"AND adr.pub = 'public'") . ")
LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_a2)
- " // 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')
+ LEFT JOIN geoloc_administrativeareas AS gr ON (adr.countryId = gr.country
+ AND adr.administrativeAreaId = gr.id)
+ LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = 'active')
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 joins()
{
- return "LEFT JOIN profile_addresses AS adr ON (u.user_id = adr.pid AND
- FIND_IN_SET('current', adr.flags)"
- . (S::logged() ? "" : "AND adr.pub = 'public'") . ")
- LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_1_a2)"
- // LEFT JOIN geoloc_region AS gr ON (adr.country = gr.a2 AND adr.region = gr.region)
- . (S::logged() ?
- "LEFT JOIN contacts AS c ON (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")"
- : "");
+ return "LEFT JOIN profile_addresses AS adr ON (u.user_id = adr.pid AND
+ FIND_IN_SET('current', adr.flags)"
+ . (S::logged() ? "" : "AND adr.pub = 'public'") . ")
+ LEFT JOIN geoloc_countries AS gc ON (adr.countryId = gc.iso_3166_1_a2)
+ LEFT JOIN geoloc_administrativeareas AS gr ON (adr.countryId = gr.country
+ AND adr.administrativeAreaId = gr.id)
+ " . (S::logged() ?
+ "LEFT JOIN contacts AS c ON (c.contact = u.user_id
+ AND c.uid = " . S::v('uid') . ")" : "");
}
public function apply(PlPage &$page)
projects / platal.git / blobdiff