X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=1dc226cdfb57ad1b404bc7c4f3e23691e8b10803;hb=7757efd6c4bf3542c57efa4b248de641b39a7003;hp=64adb5f870bdda5ec2cf2c927ec868cda64d7886;hpb=a1c554a92888e0b017ba362817a67cc2849a9154;p=platal.git diff --git a/modules/search.php b/modules/search.php index 64adb5f..1dc226c 100644 --- a/modules/search.php +++ b/modules/search.php @@ -24,19 +24,20 @@ class SearchModule extends PLModule function handlers() { return array( - 'search' => $this->make_hook('quick', AUTH_PUBLIC), - 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE, 'directory_ax'), - 'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC), - 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'directory_ax', NO_AUTH), - 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'directory_ax', NO_AUTH), - 'jobs' => $this->make_hook('referent', AUTH_COOKIE), - 'emploi' => $this->make_hook('referent', AUTH_COOKIE), - 'referent/search' => $this->make_hook('referent', AUTH_COOKIE), - 'search/referent/countries' => $this->make_hook('referent_countries', AUTH_COOKIE), + 'search' => $this->make_hook('quick', AUTH_PUBLIC), + 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE, 'directory_ax'), + 'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC), + 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'directory_ax', NO_AUTH), + 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'directory_ax', NO_AUTH), + 'search/list/count' => $this->make_hook('list_count', AUTH_COOKIE, 'directory_ax', NO_AUTH), + 'jobs' => $this->make_hook('referent', AUTH_COOKIE), + 'emploi' => $this->make_hook('referent', AUTH_COOKIE), + 'referent/search' => $this->make_hook('referent', AUTH_COOKIE), + 'search/referent/countries' => $this->make_hook('referent_countries', AUTH_COOKIE), ); } - function handler_redir_advanced(&$page, $mode = null) + function handler_redir_advanced($page, $mode = null) { pl_redirect('search/adv'); exit; @@ -51,7 +52,7 @@ class SearchModule extends PLModule * $model: The way of presenting the results: minifiche, trombi, geoloc. * $byletter: Show only names beginning with this letter */ - function handler_quick(&$page, $model = null, $byletter = null) + function handler_quick($page, $model = null, $byletter = null) { global $globals; @@ -96,8 +97,7 @@ class SearchModule extends PLModule if ($user) { pl_redirect($base . $user->login()); } - $_REQUEST['quick'] = $login; - $_GET['quick'] = $login; + Get::set('quick', $login); } elseif (strpos($quick, 'doc:') === 0) { $url = 'Docs/Recherche?'; $url .= 'action=search&q=' . urlencode(substr($quick, 4)); @@ -147,17 +147,28 @@ class SearchModule extends PLModule /** $model is the way of presenting the results: minifiche, trombi, geoloc. */ - function handler_advanced(&$page, $model = null, $byletter = null) + function handler_advanced($page, $model = null, $byletter = null) { global $globals; $page->assign('advanced',1); - $page->addJsLink('jquery.autocomplete.js'); $networks = DirEnum::getOptions(DirEnum::NETWORKS); $networks[-1] = 'Tous types'; $networks[0] = '-'; ksort($networks); $page->assign('networking_types', $networks); + $origin_corps_list = DirEnum::getOptions(DirEnum::CURRENTCORPS); + $current_corps_list = DirEnum::getOptions(DirEnum::ORIGINCORPS); + $corps_rank_list = DirEnum::getOptions(DirEnum::CORPSRANKS); + $origin_corps_list[0] = '-'; + $current_corps_list[0] = '-'; + $corps_rank_list[0] = '-'; + ksort($origin_corps_list); + ksort($current_corps_list); + ksort($corps_rank_list); + $page->assign('origin_corps_list', $origin_corps_list); + $page->assign('current_corps_list', $current_corps_list); + $page->assign('corps_rank_list', $corps_rank_list); if (!Env::has('rechercher') && $model != 'geoloc') { $this->form_prepare(); @@ -202,7 +213,7 @@ class SearchModule extends PLModule $page->assign('public_directory',0); } - function handler_autocomplete(&$page, $type = null) + function handler_autocomplete($page, $type = null) { // Autocompletion : according to type required, return // a list of results matching with the number of matches. @@ -237,7 +248,7 @@ class SearchModule extends PLModule 'groupexTxt' => DirEnum::GROUPESX, 'sectionTxt' => DirEnum::SECTIONS, 'networking_typeTxt' => DirEnum::NETWORKS, - 'city' => DirEnum::LOCALITIES, + 'localityTxt' => DirEnum::LOCALITIES, 'countryTxt' => DirEnum::COUNTRIES, 'entreprise' => DirEnum::COMPANIES, 'jobtermTxt' => DirEnum::JOBTERMS, @@ -280,7 +291,7 @@ class SearchModule extends PLModule exit(); } - function handler_list(&$page, $type = null, $idVal = null) + function handler_list($page, $type = null, $idVal = null) { $page->assign('name', $type); $page->assign('with_text_value', true); @@ -298,7 +309,23 @@ class SearchModule extends PLModule break; case 'country': $ids = DirEnum::getOptionsIter(DirEnum::COUNTRIES); - $page->assign('onchange', 'changeCountry(this.value)'); + $page->assign('onchange', 'changeAddressComponents(\'' . $type . '\', this.value)'); + break; + case 'administrative_area_level_1': + case 'administrative_area_level_2': + case 'administrative_area_level_3': + case 'locality': + $page->assign('onchange', 'changeAddressComponents(\'' . $type . '\', this.value)'); + case 'sublocality': + $ids = XDB::iterator("SELECT pace1.id, pace1.long_name AS field + FROM profile_addresses_components_enum AS pace1 + INNER JOIN profile_addresses_components AS pac1 ON (pac1.component_id = pace1.id) + INNER JOIN profile_addresses_components AS pac2 ON (pac1.pid = pac2.pid AND pac1.jobid = pac2.jobid AND pac1.id = pac2.id + AND pac1.groupid = pac2.groupid AND pac1.type = pac2.type) + INNER JOIN profile_addresses_components_enum AS pace2 ON (pac2.component_id = pace2.id AND FIND_IN_SET({?}, pace2.types)) + WHERE pace2.id = {?} AND FIND_IN_SET({?}, pace1.types) AND pac1.type = 'home' + GROUP BY pace1.long_name", + Env::v('previous'), Env::v('value'), $type); break; case 'diploma': if (Env::has('school') && Env::i('school') != 0) { @@ -313,21 +340,6 @@ class SearchModule extends PLModule case 'nationalite': $ids = DirEnum::getOptionsIter(DirEnum::NATIONALITIES); break; - case 'administrativearea': - if (Env::has('country')) { - $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS, Env::v('country')); - } else { - $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS); - } - $page->assign('onchange', 'changeAdministrativeArea(this.value)'); - break; - case 'subadministrativearea': - if (Env::has('administrativearea')) { - $ids = DirEnum::getOptionsIter(DirEnum::SUBADMINAREAS, Env::v('administrativearea')); - } else { - $ids = DirEnum::getOptionsIter(DirEnum::SUBADMINAREAS); - } - break; case 'school': $ids = DirEnum::getOptionsIter(DirEnum::EDUSCHOOLS); $page->assign('onchange', 'changeSchool(this.value)'); @@ -337,7 +349,7 @@ class SearchModule extends PLModule break; case 'jobterm': if (Env::has('jtid')) { - JobTerms::ajaxGetBranch(&$page, JobTerms::ONLY_JOBS); + JobTerms::ajaxGetBranch($page, JobTerms::ONLY_JOBS); return; } else { pl_content_headers('text/xml'); @@ -363,7 +375,7 @@ class SearchModule extends PLModule $page->assign('list', $ids); } - function handler_referent(&$page, $action = null, $subaction = null) + function handler_referent($page, $action = null, $subaction = null) { global $globals; @@ -376,8 +388,6 @@ class SearchModule extends PLModule $res = XDB::query("SELECT count(distinct pid) FROM profile_mentor_term"); $page->assign('mentors_number', $res->fetchOneCell()); - $page->addJsLink('jquery.autocomplete.js'); - // Search for mentors matching filters require_once 'ufbuilder.inc.php'; $ufb = new UFB_MentorSearch(); @@ -406,7 +416,7 @@ class SearchModule extends PLModule * know about. Only referents linked to term (jtid) are displayed. * @param $jtid id of job term to restrict referents */ - function handler_referent_countries(&$page, $jtid = null) + function handler_referent_countries($page, $jtid = null) { pl_content_headers("text/xml"); $page->changeTpl('include/field.select.tpl', NO_SKIN); @@ -417,8 +427,8 @@ class SearchModule extends PLModule INNER JOIN profile_mentor_term AS mt ON (mt.pid = mp.pid) INNER JOIN profile_job_term_relation AS jtr ON (jtr.jtid_2 = mt.jtid) WHERE jtr.jtid_1 = {?} - GROUP BY iso_3166_1_a2 - ORDER BY country", $jtid); + GROUP BY gc.iso_3166_1_a2 + ORDER BY gc.country", $jtid); $page->assign('list', $it); } }