X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=49c7f5a1f39150bfb9c84bddfbcc286420c458bc;hb=9891bd15f772caef0c199a98f036e976bf4ab94a;hp=a708d1299efdad9df282fcbf4de4527e543447bb;hpb=53ee429b076f679168fda0301651a21b00ddf0e3;p=platal.git diff --git a/modules/search.php b/modules/search.php index a708d12..49c7f5a 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ $this->make_hook('quick', AUTH_PUBLIC), - 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE), + 'search' => $this->make_hook('quick', AUTH_PUBLIC), + 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE), 'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC), - 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH), - 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH), + 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH), + 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH), ); } @@ -38,18 +38,9 @@ class SearchModule extends PLModule exit; } - function on_subscribe($forlife, $uid, $promo, $pass) - { - require_once 'user.func.inc.php'; - user_reindex($uid); - } - - function form_prepare() { - global $page; - - $page->assign('formulaire',1); + Platal::page()->assign('formulaire',1); } function get_diplomas($school = null) @@ -58,22 +49,24 @@ class SearchModule extends PLModule $school = Env::i('school'); } - if (!is_null($school)) { - $sql = 'SELECT type FROM applis_def WHERE id=' . $school; + if ((!is_null($school)) && ($school != '')) { + $sql = 'SELECT degreeid + FROM profile_education_degree + WHERE eduid=' . $school; } else { - $sql = 'DESCRIBE applis_def type'; + $sql = 'SELECT id + FROM profile_education_degree_enum + ORDER BY id'; } $res = XDB::query($sql); - $row = $res->fetchOneRow(); - if (!is_null($school)) { - $types = $row[0]; - } else { - $types = explode('(',$row[1]); - $types = str_replace("'","",substr($types[1],0,-1)); - } - global $page; - $page->assign('choix_diplomas', explode(',',$types)); + Platal::page()->assign('choix_diplomas', $res->fetchColumn()); + + $sql = 'SELECT degree + FROM profile_education_degree_enum + ORDER BY id'; + $res = XDB::query($sql); + Platal::page()->assign('name_diplomas', $res->fetchColumn()); } function handler_quick(&$page, $action = null, $subaction = null) @@ -90,14 +83,14 @@ class SearchModule extends PLModule if (Env::has('quick') || $action == 'geoloc') { $quick = trim(Env::v('quick')); if (S::logged() && !Env::has('page')) { - $_SESSION['log']->log('search', 'quick=' . $quick); + S::logger()->log('search', 'quick=' . $quick); } $list = 'profile|prf|fiche|fic|referent|ref|mentor'; if (S::has_perms()) { $list .= '|admin|adm|ax'; } if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', replace_accent($quick), $matches)) { - $forlife = $matches[2]; + $login = $matches[2]; switch($matches[1]) { case 'admin': case 'adm': $base = 'admin/user/'; @@ -113,13 +106,12 @@ class SearchModule extends PLModule break; } - require_once 'user.func.inc.php'; - $login = get_user_forlife($forlife, '_silent_user_callback'); - if ($login) { - pl_redirect($base . $login); + $user = User::getSilent($login); + if ($user) { + pl_redirect($base . $user->login()); } - $_REQUEST['quick'] = $forlife; - $_GET['quick'] = $forlife; + $_REQUEST['quick'] = $login; + $_GET['quick'] = $login; } elseif (strpos($quick, 'doc:') === 0) { $url = 'Docs/Recherche?'; $url .= 'action=search&q=' . urlencode(substr($quick, 4)); @@ -131,7 +123,7 @@ class SearchModule extends PLModule require_once 'userset.inc.php'; $view = new SearchSet(true, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Minifiches', true, array('with_score' => true)); + $view->addMod('minifiche', 'Mini-fiches', true, array('with_score' => true)); if (S::logged() && !Env::i('nonins')) { $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true, 'with_score' => true)); $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); @@ -155,36 +147,39 @@ class SearchModule extends PLModule $page->addJsLink('ajax.js'); } - require_once dirname(__FILE__) . '/search/search.inc.php'; + $this->load('search.inc.php'); $page->changeTpl('search/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Annuaire'); + $page->setTitle('Annuaire'); } function handler_advanced(&$page, $action = null, $subaction = null) { global $globals; require_once 'geoloc.inc.php'; - require_once dirname(__FILE__) . '/search/search.inc.php'; + $this->load('search.inc.php'); $page->assign('advanced',1); + $page->addJsLink('jquery.autocomplete.js'); if (!Env::has('rechercher') && $action != 'geoloc') { $this->form_prepare(); } else { $textFields = array( - 'country' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', 'exact' => false), - 'fonction' => array('field' => 'id', 'table' => 'fonctions_def', 'text' => 'fonction_fr', 'exact' => true), - 'secteur' => array('field' => 'id', 'table' => 'emploi_secteur', 'text' => 'label', 'exact' => false), - 'nationalite' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'nat', 'exact' => 'false'), - 'binet' => array('field' => 'id', 'table' => 'binets_def', 'text' => 'text', 'exact' => false), - 'groupex' => array('field' => 'id', 'table' => 'groupex.asso', - 'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom", - 'exact' => false), - 'section' => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false), - 'school' => array('field' => 'id', 'table' => 'applis_def', 'text' => 'text', 'exact' => false), - 'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false) + 'country' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', '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'), + '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' => "(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) ); if (!Env::has('page')) { - $_SESSION['log']->log('search', 'adv=' . var_export($_GET, true)); + S::logger()->log('search', 'adv=' . var_export($_GET, true)); } foreach ($textFields as $field=>&$query) { if (!Env::v($field) && Env::v($field . 'Txt')) { @@ -199,7 +194,7 @@ class SearchModule extends PLModule require_once 'userset.inc.php'; $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Minifiches', true); + $view->addMod('minifiche', 'Mini-fiches', true); $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true)); //$view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); $view->apply('search/adv', $page, $action, $subaction); @@ -256,16 +251,24 @@ class SearchModule extends PLModule $beginwith = true; $field2 = false; $qsearch = str_replace(array('%', '_'), '', $q); + $distinct = true; switch ($type) { case 'binetTxt': $db = '`binets_def` INNER JOIN `binets_ins` ON(`binets_def`.`id` = `binets_ins`.`binet_id`)'; - $field='`binets_def`.`text`'; + $field = '`binets_def`.`text`'; if (strlen($q) > 2) $beginwith = false; $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`'; + $unique = 'uid'; + $realid = '`profile_networking_enum`.`network_type`'; + break; case 'city': $db = '`geoloc_city` INNER JOIN `adresses` ON(`geoloc_city`.`id` = `adresses`.`cityid`)'; @@ -275,26 +278,27 @@ class SearchModule extends PLModule case 'countryTxt': $db = '`geoloc_pays` INNER JOIN `adresses` ON(`geoloc_pays`.`a2` = `adresses`.`country`)'; - $unique='`uid`'; + $unique = '`uid`'; $field = '`geoloc_pays`.`pays`'; $field2 = '`geoloc_pays`.`country`'; - $realid='`geoloc_pays`.`a2`'; + $realid = '`geoloc_pays`.`a2`'; break; case 'entreprise': - $db = '`entreprises`'; - $field = '`entreprise`'; - $unique='`uid`'; + $db = 'profile_job_enum INNER JOIN + profile_job ON (profile_job.jobid = profile_job_enum.id)'; + $field = 'profile_job_enum.name'; + $unique = 'profile_job.uid'; break; case 'firstname': $field = '`prenom`'; $beginwith = false; break; case 'fonctionTxt': - $db = '`fonctions_def` INNER JOIN - `entreprises` ON(`entreprises`.`fonction` = `fonctions_def`.`id`)'; - $field = '`fonction_fr`'; - $unique = '`uid`'; - $realid = '`fonctions_def`.`id`'; + $db = 'fonctions_def INNER JOIN + profile_job ON (profile_job.fonctionid = fonctions_def.id)'; + $field = 'fonction_fr'; + $unique = 'uid'; + $realid = 'fonctions_def.id'; $beginwith = false; break; case 'groupexTxt': @@ -316,7 +320,9 @@ class SearchModule extends PLModule break; case 'nationaliteTxt': $db = '`geoloc_pays` INNER JOIN - `auth_user_md5` ON(`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)'; + `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`)'; @@ -327,28 +333,35 @@ class SearchModule extends PLModule $db = '`auth_user_quick`'; $beginwith = false; break; - case 'poste': - $db = '`entreprises`'; - $field = '`poste`'; - $unique='`uid`'; + case 'description': + $db = 'profile_job'; + $field = 'description'; + $unique = 'uid'; break; case 'schoolTxt': - $db = '`applis_def` INNER JOIN - `applis_ins` ON(`applis_def`.`id` = `applis_ins`.`aid`)'; - $field='`applis_def`.`text`'; - $unique = '`uid`'; - $realid = '`applis_def`.`id`'; + $db = 'profile_education_enum INNER JOIN + profile_education ON (profile_education_enum.id = profile_education.eduid)'; + $field = 'profile_education_enum.name'; + $unique = 'uid'; + $realid = 'profile_education_enum.id'; if (strlen($q) > 2) $beginwith = false; break; case 'secteurTxt': - $db = '`emploi_secteur` INNER JOIN - `entreprises` ON(`entreprises`.`secteur` = `emploi_secteur`.`id`)'; - $field = '`emploi_secteur`.`label`'; - $realid = '`emploi_secteur`.`id`'; - $unique = '`uid`'; + $db = 'profile_job_sector_enum INNER JOIN + profile_job ON (profile_job.sectorid = profile_job_sector_enum.id)'; + $field = 'profile_job_sector_enum.name'; + $realid = 'profile_job_sector_enum.id'; + $unique = 'uid'; $beginwith = false; break; + case 'sss_secteur': + $db = 'profile_job_subsubsector_enum'; + $field = 'name'; + $beginwith = false; + $unique = 'name'; + $distinct = false; + break; case 'sectionTxt': $db = '`sections` INNER JOIN `auth_user_md5` ON(`auth_user_md5`.`section` = `sections`.`id`)'; @@ -374,26 +387,29 @@ class SearchModule extends PLModule $field2_t = make_field_test($field2, $beginwith); $field_select = 'IF(' . $field_t . ', ' . $field . ', ' . $field2. ')'; } - $list = XDB::iterator('SELECT ' . $field_select . ' AS field, - COUNT(DISTINCT ' . $unique . ') AS nb - ' . ($realid ? (', ' . $realid . ' AS id') : '') . ' + $list = XDB::iterator('SELECT ' . $field_select . ' AS field' + . ($distinct ? (', COUNT(DISTINCT ' . $unique . ') AS nb') : '') + . ($realid ? (', ' . $realid . ' AS id') : '') . ' FROM ' . $db . ' WHERE ' . $field_t . ($field2 ? (' OR ' . $field2_t) : '') . ' GROUP BY ' . $field_select . ' - ORDER BY nb DESC + ORDER BY ' . ($distinct ? 'nb DESC' : $field_select) . ' LIMIT 11', $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch); + $nbResults = 0; $res = ""; while ($result = $list->next()) { $nbResults++; if ($nbResults == 11) { - $res .= '...|1'."\n"; + $res .= $q."|-1\n"; } else { $res .= $result['field'].'|'; - $res .= $result['nb']; + if (isset($result['nb'])) { + $res .= $result['nb']; + } if (isset($result['id'])) { $res .= '|'.$result['id']; } @@ -418,6 +434,11 @@ class SearchModule extends PLModule case 'binet': $db = '`binets_def`'; break; + case 'networking_type': + $db = '`profile_networking_enum`'; + $field = '`name`'; + $id = '`network_type`'; + break; case 'country': $db = '`geoloc_pays`'; $field = '`pays`'; @@ -440,7 +461,9 @@ class SearchModule extends PLModule break; case 'nationalite': $db = '`geoloc_pays` INNER JOIN - `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)'; + `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`'; break; @@ -453,15 +476,19 @@ class SearchModule extends PLModule } break; case 'school': - $db = '`applis_def`'; + $db = 'profile_education_enum'; + $field = 'name'; + $id = 'id'; $page->assign('onchange', 'changeSchool(this.value)'); break; case 'section': $db = '`sections`'; break; case 'secteur': - $db = '`emploi_secteur`'; - $field = '`label`'; + $db = 'profile_job_sector_enum INNER JOIN + profile_job ON (profile_job.sectorid = profile_job_sector_enum.id)'; + $field = 'profile_job_sector_enum.name'; + $id = 'profile_job_sector_enum.id'; break; default: exit(); }