X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=9f26a73fd9d4f218b94a4d904d3e84324cbcde42;hb=b40deec06338bd63a5b4d6b9ead0166506ce049d;hp=4996d5f6a48503fef258f2c2a23a8874a4d992cf;hpb=bc67c37cd9da2052d61288d927c913e467e90c41;p=platal.git

diff --git a/modules/search.php b/modules/search.php
index 4996d5f..9f26a73 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -26,8 +26,6 @@ class SearchModule extends PLModule
         return array(
             'search'     => $this->make_hook('quick', AUTH_PUBLIC),
             'search/adv' => $this->make_hook('advanced', AUTH_COOKIE),
-            'search/ajax/region'  => $this->make_hook('region', AUTH_COOKIE, 'user', NO_AUTH),
-            'search/ajax/grade'   => $this->make_hook('grade',  AUTH_COOKIE, 'user', NO_AUTH),
             '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),
@@ -52,9 +50,6 @@ class SearchModule extends PLModule
         global $page;
 
         $page->assign('formulaire',1);
-        $page->assign('choix_schools',
-                      XDB::iterator('SELECT id,text FROM applis_def ORDER BY text'));
-        $this->get_diplomas();
     }
 
     function get_diplomas($school = null)
@@ -85,7 +80,43 @@ class SearchModule extends PLModule
     {
         global $globals;
 
+        $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);
+
         if (Env::has('quick') || $action == 'geoloc') {
+            $quick = trim(Env::v('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})?)?)$/', $quick, $matches)) {
+                $forlife = $matches[2];
+                switch($matches[1]) {
+                  case 'admin': case 'adm':
+                    $base = 'admin/user/';
+                    break;
+                  case 'ax':
+                    $base = 'profile/ax/';
+                    break;
+                  case 'profile': case 'prf': case 'fiche': case 'fic':
+                    $base = 'profile/';
+                    break;
+                  case 'referent': case 'ref': case 'mentor':
+                    $base = 'referent/';
+                    break;
+                }
+                pl_redirect($base . $forlife);
+            } elseif (strpos($quick, 'doc:') === 0) {
+                $url = 'Docs/Recherche?';
+                $url .= 'action=search&q=' . urlencode(substr($quick, 4));
+                $url .= '&group=' . urlencode('-Equipe,-Main,-PmWiki,-Site');
+                pl_redirect($url);
+            }
+
             $page->assign('formulaire', 0);
 
             require_once 'userset.inc.php';
@@ -109,12 +140,6 @@ class SearchModule extends PLModule
                 new ThrowError('il n\'existe personne correspondant à ces critères dans la base !');
             }
         } else {
-            $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); 
             $page->assign('formulaire',1);
             $page->addJsLink('ajax.js');
         }
@@ -122,8 +147,6 @@ class SearchModule extends PLModule
         require_once dirname(__FILE__) . '/search/search.inc.php';
         $page->changeTpl('search/index.tpl');            
         $page->assign('xorg_title','Polytechnique.org - Annuaire');
-        $page->assign('baseurl', $globals->baseurl);
-        $page->register_modifier('display_lines', 'display_lines');
     }
 
     function handler_advanced(&$page, $action = null, $subaction = null)
@@ -140,8 +163,8 @@ class SearchModule extends PLModule
             $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf');
             $view->addMod('minifiche', 'Minifiches', true);
             $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
-            $view->addMod('geoloc', 'Planishpère');
-            $view->apply('search', $page, $action, $subaction);
+            $view->addMod('geoloc', 'Planisphère');
+            $view->apply('search/adv', $page, $action, $subaction);
             
             if ($subaction) {
                 return;
@@ -156,24 +179,6 @@ class SearchModule extends PLModule
         $page->changeTpl('search/index.tpl', $action == 'mini' ? SIMPLE : SKINNED);
         $page->addJsLink('ajax.js');
         $page->assign('public_directory',0);
-        $page->register_modifier('display_lines', 'display_lines');
-    }
-
-    function handler_region(&$page, $country = null)
-    {
-        header('Content-Type: text/html; charset="UTF-8"');
-        require_once("geoloc.inc.php");
-        $page->ChangeTpl('search/adv.region.form.tpl', NO_SKIN);
-        $page->assign('region', "");
-        $page->assign('country', $country);
-    }
-
-    function handler_grade(&$page, $school = null)
-    {
-        header('Content-Type: text/html; charset="UTF-8"');
-        $page->ChangeTpl('search/adv.grade.form.tpl', NO_SKIN);
-        $page->assign('grade', '');
-        $this->get_diplomas($school);
     }
 
     function handler_autocomplete(&$page, $type = null)
@@ -185,81 +190,157 @@ class SearchModule extends PLModule
         //   result2|nb2
         //   ...
         header('Content-Type: text/plain; charset="UTF-8"');
-        $q = preg_replace('/\*+$/','',$_REQUEST['q']);
+        $q = preg_replace(array('/\*+$/', // always look for $q*
+                                '/([\^\$\[\]])/', // escape special regexp char
+                                '/\*/'), // replace joker by regexp joker
+                           array('',
+                                 '\\\\\1',
+                                 '.*'),
+                           $_REQUEST['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',
-        		$type, $q);
+        // try to look in cached results        
+        $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;
-        		die();
+            echo $res;
+            die();
         }
         
         // default search
-        $unique = 'user_id';
-        $db = 'auth_user_md5';
+        $q = preg_quote($q);
+        $unique = '`user_id`';
+        $db = '`auth_user_md5`';
         $realid = false;
-        $contains = false;
+        $beginwith = true;
+        $field2 = false;
+        $qsearch = $q;
         
         switch ($type) {
-        case 'binetTxt':
-						$db = 'binets_def INNER JOIN binets_ins ON(binets_def.id = binets_ins.binet_id)';
-						$field='binets_def.text';
-						if (strlen($q) > 2)
-								$contains = true;
-						$realid = 'binets_def.id';
-						break;
-        case 'city': $db = 'geoloc_city INNER JOIN adresses ON(geoloc_city.id = adresses.cityid)'; $unique='uid'; $field='geoloc_city.name'; break;
-        case 'entreprise': $db = 'entreprises'; $field = 'entreprise'; $unique='uid'; break;
-        case 'firstname': $field = 'prenom'; break;
-        case 'fonctionTxt':
-        		$db = 'fonctions_def INNER JOIN entreprises ON(entreprises.fonction = fonctions_def.id)';
-        		$field = 'fonction_fr';
-        		$unique = 'uid';
-        		$realid = 'fonctions_def.id';
-        		break;
-        case 'groupexTxt':
-						$db = 'groupesx_def INNER JOIN groupesx_ins ON(groupesx_def.id = groupesx_ins.gid)';
-						$field='groupesx_def.text';
-						if (strlen($q) > 2)
-								$contains = true;
-						$realid = 'groupesx_def.id';
-						$unique = 'guid';
-						break;
-        case 'name': $field = 'nom'; break;
-    		case 'nationaliteTxt':
-    				$db = 'geoloc_pays INNER JOIN auth_user_md5 ON(geoloc_pays.a2 = auth_user_md5.nationalite)';
-    				$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'; break;
-        case 'poste': $db = 'entreprises'; $field = 'poste'; $unique='uid'; 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';
-    				break;
-    		case 'sectionTxt':
-    				$db = 'sections INNER JOIN auth_user_md5 ON(auth_user_md5.section = sections.id)';
-    				$field = 'sections.text';
-    				$realid = 'sections.id';
-    				break;
-        default: exit();
+          case 'binetTxt':
+            $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`';
+            break;
+          case 'city':
+            $db = '`geoloc_city` INNER JOIN
+                   `adresses` ON(`geoloc_city`.`id` = `adresses`.`cityid`)';
+            $unique='`uid`';
+            $field='`geoloc_city`.`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`';
+            break;
+          case 'entreprise':
+            $db = '`entreprises`';
+            $field = '`entreprise`';
+            $unique='`uid`';
+            break;
+          case 'firstname':
+            $field = '`prenom`';
+            $q = '(^|[ \\-])'.$q;
+            $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`';
+            $qsearch = '(^|[ /\\-])'.$q;
+            $beginwith = false;
+            break;
+          case 'groupexTxt':
+            $db = '`groupesx_def` INNER JOIN
+                   `groupesx_ins` ON(`groupesx_def`.`id` = `groupesx_ins`.`gid`)';
+            $field='`groupesx_def`.`text`';
+            if (strlen($q) > 2)
+                $beginwith = false;
+            $realid = '`groupesx_def`.`id`';
+            $unique = '`guid`';
+            break;
+          case 'name':
+            $field = '`nom`';
+            $field2 = '`nom_usage`';
+            $qsearch = '(^|[ \\-])'.$q;
+            $beginwith = false;
+            break;
+          case 'nationaliteTxt':
+            $db = '`geoloc_pays` INNER JOIN
+                   `auth_user_md5` ON(`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)';
+            $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`';
+            $qsearch = '(^|[ \\-])'.$q;
+            $beginwith = false;
+            break;
+          case 'poste':
+            $db = '`entreprises`';
+            $field = '`poste`';
+            $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`';
+            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`';
+            $beginwith = false;
+            break;
+          case 'sectionTxt':
+            $db = '`sections` INNER JOIN 
+                   `auth_user_md5` ON(`auth_user_md5`.`section` = `sections`.`id`)';
+            $field = '`sections`.`text`';
+            $realid = '`sections`.`id`';
+            $beginwith = false;
+            break;
+          default: exit();
+        }
+
+        $field_select = $field;
+        if ($field2) {
+            $field_select = 'IF('.$field.' REGEXP {?}, '.$field.', '.$field2.')';
         }
 
-        $list = XDB::iterator('
-						SELECT
-								'.$field.' AS field,
-								COUNT(DISTINCT '.$unique.') AS nb
-								'.($realid?(', '.$realid.' AS id'):'').'
-						FROM '.$db.'
-						WHERE '.$field.' LIKE {?}
-						GROUP BY '.$field.'
-						ORDER BY nb DESC
-						LIMIT 11',
-						($contains?'%':'').str_replace('*','%',$q).'%');
+        if ($beginwith) {
+            $qsearch = '^'.$qsearch;
+        }
+        $list = XDB::iterator('SELECT  '.$field_select.' AS field,
+                                       COUNT(DISTINCT '.$unique.') AS nb
+                                       '.($realid?(', '.$realid.' AS id'):'').'
+                                 FROM  '.$db.'
+                                WHERE  '.$field.' REGEXP {?}'.
+                                        ($field2?(' OR '.$field2.' REGEXP {?}'):'').'
+                             GROUP BY  '.$field_select.'
+                             ORDER BY  nb DESC
+                                LIMIT  11',
+                               $qsearch, $qsearch, $qsearch, $qsearch);
         $nbResults = 0;
         $res = "";
         while ($result = $list->next()) {
@@ -267,65 +348,91 @@ class SearchModule extends PLModule
             if ($nbResults == 11) {
                 $res .= '...|1'."\n";
             } else {
-                $res .= $result['field'].'|'.$result['nb'].(isset($result['id'])?('|'.$result['id']):'')."\n";
+                $res .= $result['field'].'|';
+                $res .= $result['nb'];
+                if (isset($result['id'])) {
+                    $res  .= '|'.$result['id'];
+                }
+                $res .= "\n";
             }
         }
-        XDB::query('REPLACE INTO search_autocomplete VALUES ({?}, {?}, {?}, NOW())',
-        		$type, $q, $res);
+        XDB::query('REPLACE INTO  `search_autocomplete`
+                          VALUES  ({?}, {?}, {?}, NOW())',
+                    $type, $q, $res);
         echo $res;
         exit();
     }
     
     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';
-    		switch ($type) {
-    		case 'binet':
-    				$db = 'binets_def';
-    				break;
-    		case 'fonction':
-    				$db = 'fonctions_def';
-    				$field = 'fonction_fr';
-    				break;
-    		case 'groupex':
-    				$db = 'groupesx_def';
-    				break;
-    		case 'nationalite':
-    				$db = 'geoloc_pays';
-    				$field = 'IF(nat=\'\', pays, nat)';
-    				$id = 'a2';
-    				break;
-    		case 'section':
-    				$db = 'sections';
-    				break;
-    		case 'secteur':
-    				$db = 'emploi_secteur';
-    				$field = 'label';
-    				break;
-    		default: exit();
-    		}
-    		if (isset($idVal)) {
-       			header('Content-Type: text/plain; charset="UTF-8"');
-    				$result = XDB::query('SELECT '.$field.' AS field FROM '.$db.' WHERE '.$id.' = {?} LIMIT 1',$idVal);
-    				echo $result->fetchOneCell();
-    		} else {
-		        header('Content-Type: text/xml; charset="UTF-8"');
-		    		$list = XDB::iterator('
-		    				SELECT
-		    						'.$field.' AS field,
-		    						'.$id.' AS id
-		    				FROM '.$db.'
-		    				ORDER BY '.$field);
-		    		echo '<select name="'.$type.'">';
-		    		while ($result = $list->next()) {
-		    				echo '<option value="'.$result['id'].'">'.htmlspecialchars($result['field']).'</option>';
-		    		}
-		    		echo '</select>';
-				}
-				    		
-    		exit();
+        // Give the list of all values possible of type and builds a select input for it
+        $field = '`text`';
+        $id = '`id`';
+        $where = '';
+
+        switch ($type) {
+          case 'binet':
+            $db = '`binets_def`';
+            break;
+          case 'country':
+            $db = '`geoloc_pays`';
+            $field = '`pays`';
+            $id = '`a2`';
+            $page->assign('onchange', 'changeCountry(this.value)');
+            break;
+          case 'fonction':
+            $db = '`fonctions_def`';
+            $field = '`fonction_fr`';
+            break;
+          case 'diploma':
+            header('Content-Type: text/xml; charset="UTF-8"');
+            $this->get_diplomas();
+            $page->changeTpl('search/adv.grade.form.tpl', NO_SKIN);
+            return;
+          case 'groupex':
+            $db = '`groupesx_def`';
+            break;
+          case 'nationalite':
+            $db = '`geoloc_pays` INNER JOIN 
+                   `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)';
+            $field = 'IF(`nat`=\'\', `pays`, `nat`)';
+            $id = '`a2`';
+            break;
+          case 'region':
+            $db = '`geoloc_region`';
+            $field = '`name`';
+            $id = '`region`'; 
+            if (isset($_REQUEST['country'])) {
+                $where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"';
+            }
+            break;
+          case 'school':
+            $db = '`applis_def`';
+            $page->assign('onchange', 'changeSchool(this.value)');
+            break;
+          case 'section':
+            $db = '`sections`';
+            break;
+          case 'secteur':
+            $db = '`emploi_secteur`';
+            $field = '`label`';
+            break;
+          default: exit();
+        }
+        if (isset($idVal)) {
+            header('Content-Type: text/plain; charset="UTF-8"');
+            $result = XDB::query('SELECT '.$field.' AS field FROM '.$db.' WHERE '.$id.' = {?} LIMIT 1',$idVal);
+            echo $result->fetchOneCell();
+            exit();
+        }
+        header('Content-Type: text/xml; charset="UTF-8"');
+        $page->changeTpl('include/field.select.tpl', NO_SKIN);
+        $page->assign('name', $type);
+        $page->assign('list', XDB::iterator('SELECT  '.$field.' AS field,
+                                                     '.$id.' AS id
+                                               FROM  '.$db.$where.'
+                                           GROUP BY  '.$field.'
+                                           ORDER BY  '.$field));
     }
 }