<?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 *
{
global $globals;
- $res = XDB::query("SELECT MIN(`diminutif`), MAX(`diminutif`)
- FROM `groupex`.`asso`
- WHERE `cat` = 'Promotions'");
+ $res = XDB::query("SELECT MIN(diminutif), MAX(diminutif)
+ FROM groupex.asso
+ WHERE cat = 'Promotions'");
list($min, $max) = $res->fetchOneRow();
$page->assign('promo_min', $min);
$page->assign('promo_max', $max);
$this->form_prepare();
} else {
$textFields = array(
- 'country' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', 'exact' => false),
+ 'country' => array('field' => 'iso_3166_1_a2', 'table' => 'geoloc_countries', 'text' => 'countryFR',
+ 'exact' => false),
'fonction' => array('field' => 'id', 'table' => 'fonctions_def', 'text' => 'fonction_fr', 'exact' => true),
'secteur' => array('field' => 'id', 'table' => 'profile_job_sector_enum', 'text' => 'name', 'exact' => false),
- 'nationalite' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'nat', 'exact' => 'false'),
+ 'nationalite' => array('field' => 'iso_3166_1_a2', 'table' => 'geoloc_countries',
+ 'text' => 'nationalityFR', 'exact' => 'false'),
'binet' => array('field' => 'id', 'table' => 'binets_def', 'text' => 'text', 'exact' => false),
'networking_type' => array('field' => 'network_type', 'table' => 'profile_networking_enum',
'text' => 'name', 'exact' => false),
'groupex' => array('field' => 'id', 'table' => 'groupex.asso',
- 'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom",
+ 'text' => "(cat = 'GroupesX' OR cat = 'Institutions') AND pub = 'public' AND nom",
'exact' => false),
'section' => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false),
'school' => array('field' => 'id', 'table' => 'profile_education_enum', 'text' => 'name', 'exact' => false),
- 'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false)
+ 'city' => array('table' => 'geoloc_localities', 'text' => 'name', 'exact' => false)
);
if (!Env::has('page')) {
S::logger()->log('search', 'adv=' . var_export($_GET, true));
array('',
'\\\\\1',
'.*'),
- $_REQUEST['q']);
+ Env::s('q'));
if (!$q) exit();
// try to look in cached results
- $cache = XDB::query('SELECT `result`
- FROM `search_autocomplete`
- WHERE `name` = {?} AND
- `query` = {?} AND
- `generated` > NOW() - INTERVAL 1 DAY',
+ $cache = XDB::query('SELECT result
+ FROM search_autocomplete
+ WHERE name = {?} AND
+ query = {?} AND
+ generated > NOW() - INTERVAL 1 DAY',
$type, $q);
if ($res = $cache->fetchOneCell()) {
echo $res;
}
// default search
- $unique = '`user_id`';
- $db = '`auth_user_md5`';
+ $unique = 'pid';
+ $db = 'profiles';
$realid = false;
$beginwith = true;
$field2 = false;
switch ($type) {
case 'binetTxt':
- $db = '`binets_def` INNER JOIN
- `binets_ins` ON(`binets_def`.`id` = `binets_ins`.`binet_id`)';
- $field = '`binets_def`.`text`';
+ $db = 'binets_def INNER JOIN
+ binets_ins ON(binets_def.id = binets_ins.binet_id)';
+ $field = 'binets_def.text';
if (strlen($q) > 2)
$beginwith = false;
- $realid = '`binets_def`.`id`';
+ $realid = 'binets_def.id';
break;
case 'networking_typeTxt':
- $db = '`profile_networking_enum` INNER JOIN
- `profile_networking` ON(`profile_networking`.`network_type` = `profile_networking_enum`.`network_type`)';
- $field = '`profile_networking_enum`.`name`';
+ $db = 'profile_networking_enum INNER JOIN
+ profile_networking ON(profile_networking.network_type = profile_networking_enum.network_type)';
+ $field = 'profile_networking_enum.name';
$unique = 'uid';
- $realid = '`profile_networking_enum`.`network_type`';
+ $realid = 'profile_networking_enum.network_type';
break;
case 'city':
- $db = '`geoloc_city` INNER JOIN
- `adresses` ON(`geoloc_city`.`id` = `adresses`.`cityid`)';
- $unique='`uid`';
- $field='`geoloc_city`.`name`';
+ $db = 'geoloc_localities INNER JOIN
+ profile_addresses ON (geoloc_localities.id = profile_addresses.localityId)';
+ $unique = 'uid';
+ $field ='geoloc_localities.name';
break;
case 'countryTxt':
- $db = '`geoloc_pays` INNER JOIN
- `adresses` ON(`geoloc_pays`.`a2` = `adresses`.`country`)';
- $unique = '`uid`';
- $field = '`geoloc_pays`.`pays`';
- $field2 = '`geoloc_pays`.`country`';
- $realid = '`geoloc_pays`.`a2`';
+ $db = 'geoloc_countries INNER JOIN
+ profile_addresses ON (geoloc_countries.iso_3166_1_a2 = profile_addresses.countryId)';
+ $unique = 'pid';
+ $field = 'geoloc_countries.countryFR';
+ $realid = 'geoloc_countries.iso_3166_1_a2';
break;
case 'entreprise':
$db = 'profile_job_enum INNER JOIN
$field = 'profile_job_enum.name';
$unique = 'profile_job.uid';
break;
- case 'firstname':
- $field = '`prenom`';
- $beginwith = false;
- break;
case 'fonctionTxt':
$db = 'fonctions_def INNER JOIN
profile_job ON (profile_job.fonctionid = fonctions_def.id)';
$realid = 'a.id';
$unique = 'm.uid';
break;
- case 'name':
- $field = '`nom`';
- $field2 = '`nom_usage`';
- $beginwith = false;
- break;
case 'nationaliteTxt':
- $db = '`geoloc_pays` INNER JOIN
- `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite` OR
- `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite2` OR
- `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite3`)';
- $field = 'IF(`geoloc_pays`.`nat`=\'\',
- `geoloc_pays`.`pays`,
- `geoloc_pays`.`nat`)';
- $realid = '`geoloc_pays`.`a2`';
- break;
- case 'nickname':
- $field = '`profile_nick`';
- $db = '`auth_user_quick`';
- $beginwith = false;
+ $db = 'geoloc_countries INNER JOIN
+ profile ON (geoloc_countries.a2 IN (profile.nationality1, profile.nationality2, profile.nationality3))';
+ $field = 'geoloc_countries.nationalityFR';
+ $realid = 'geoloc_countries.iso_3166_1_a2';
break;
case 'description':
$db = 'profile_job';
$distinct = false;
break;
case 'sectionTxt':
- $db = '`sections` INNER JOIN
- `auth_user_md5` ON(`auth_user_md5`.`section` = `sections`.`id`)';
- $field = '`sections`.`text`';
- $realid = '`sections`.`id`';
+ $db = 'sections AS acs
+ INNER JOIN profiles AS acp ON (acp.section = acs.id)';
+ $field = 'acs.text';
+ $realid = 'acs.id';
$beginwith = false;
break;
default: exit();
$res .= "\n";
}
}
- XDB::query('REPLACE INTO `search_autocomplete`
+ XDB::query('REPLACE INTO search_autocomplete
VALUES ({?}, {?}, {?}, NOW())',
$type, $q, $res);
echo $res;
function handler_list(&$page, $type = null, $idVal = null)
{
// Give the list of all values possible of type and builds a select input for it
- $field = '`text`';
- $id = '`id`';
+ $field = 'text';
+ $id = 'id';
$where = '';
switch ($type) {
case 'binet':
- $db = '`binets_def`';
+ $db = 'binets_def';
break;
case 'networking_type':
- $db = '`profile_networking_enum`';
- $field = '`name`';
- $id = '`network_type`';
+ $db = 'profile_networking_enum';
+ $field = 'name';
+ $id = 'network_type';
break;
case 'country':
- $db = '`geoloc_pays`';
- $field = '`pays`';
- $id = '`a2`';
+ $db = 'geoloc_countries';
+ $field = 'countryFR';
+ $id = 'iso_3166_1_a2';
$page->assign('onchange', 'changeCountry(this.value)');
break;
case 'fonction':
- $db = '`fonctions_def`';
- $field = '`fonction_fr`';
+ $db = 'fonctions_def';
+ $field = 'fonction_fr';
break;
case 'diploma':
header('Content-Type: text/xml; charset="UTF-8"');
$field = 'nom';
break;
case 'nationalite':
- $db = '`geoloc_pays` INNER JOIN
- `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite` OR
- `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite2` OR
- `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite3`)';
- $field = 'IF(`nat`=\'\', `pays`, `nat`)';
- $id = '`a2`';
+ $db = 'geoloc_countries INNER JOIN
+ profiles AS acp ON (acgp.a2 IN (acp.nationality1, acp.nationality2, acp.nationality3))';
+ $field = 'nationalityFR';
+ $id = 'iso_3166_1_a2';
break;
case 'region':
- $db = '`geoloc_region`';
- $field = '`name`';
- $id = '`region`';
+ $db = 'geoloc_administrativeareas';
+ $field = 'name';
+ $id = 'id';
if (isset($_REQUEST['country'])) {
- $where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"';
+ $where .= ' WHERE country = "' . $_REQUEST['country'] . '"';
}
break;
case 'school':
$page->assign('onchange', 'changeSchool(this.value)');
break;
case 'section':
- $db = '`sections`';
+ $db = 'sections';
break;
case 'secteur':
$db = 'profile_job_sector_enum INNER JOIN
projects / platal.git / blobdiff