aeration du code

diff --git a/htdocs/search.php b/htdocs/search.php
index 9bd51ae..e2a8601 100644 (file)
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -8,39 +8,47 @@ if ($public_directory)
 else
     new_skinned_page('search.tpl', AUTH_COOKIE);
 $page->assign('public_directory',$public_directory);
+
 if (array_key_exists('rechercher', $_REQUEST)) {
     $page->assign('formulaire',0);
+
     $nameField = new StringSField('name',array('u.nom','u.epouse','i.nom'),'i.nom');
     $firstnameField = new StringSField('firstname',array('u.prenom','i.prenom'),'i.prenom');
     $promoField = new PromoSField('promo','egal',array('u.promo','i.promo'),'i.promo');
     $fields = new SFieldGroup(true,array($nameField,$firstnameField,$promoField));
+    
     if ($nameField->length()<2 && $firstnameField->length()<2 && 
         ($public_directory || !$promoField->is_a_single_promo()))
-        new ThrowError('Recherche trop générale.');
+    {
+       new ThrowError('Recherche trop générale.');
+    }
     $offset = new NumericSField('offset');
+    
     $sql = 'SELECT SQL_CALC_FOUND_ROWS
-                    i.matricule_ax,i.matricule,
-                    u.nom!="" AS inscrit,
-                    IF(u.nom!="",u.nom,i.nom) AS nom,
-                    u.epouse,
-                    IF(u.prenom!="",u.prenom,i.prenom) AS prenom,
-                    IF(u.promo!="",u.promo,i.promo) AS promo,
-                    i.deces!=0 AS decede,
-                    u.username,
-                    c.uid AS contact
-            FROM identification AS i
-            LEFT JOIN auth_user_md5 AS u ON (i.matricule=u.matricule)
-            LEFT JOIN contacts AS c ON (c.uid='.
-            ((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).
-            ' AND c.contact=u.user_id)
-            WHERE '.$fields->get_where_statement().'
-            ORDER BY '.implode(',',array_filter(array($fields->get_order_statement(),
-            'promo DESC,nom,prenom'))).'
-            LIMIT '.$offset->value.','.$globals->search_results_per_page;
+                       i.matricule_ax,i.matricule,
+                       u.nom!="" AS inscrit,
+                       IF(u.nom!="",u.nom,i.nom) AS nom,
+                       u.epouse,
+                       IF(u.prenom!="",u.prenom,i.prenom) AS prenom,
+                       IF(u.promo!="",u.promo,i.promo) AS promo,
+                       i.deces!=0 AS decede,
+                       u.username,
+                       c.uid AS contact
+                 FROM  identification AS i
+            LEFT JOIN  auth_user_md5  AS u ON (i.matricule=u.matricule)
+            LEFT JOIN  contacts       AS c ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id)
+                WHERE  '.$fields->get_where_statement().'
+             ORDER BY  '.implode(',',array_filter(array($fields->get_order_statement(),'promo DESC,nom,prenom'))).'
+                LIMIT  '.$offset->value.','.$globals->search_results_per_page;
+    echo "<pre>$sql</pre>";
+
     $page->mysql_assign($sql, 'resultats', 'nb_resultats','nb_resultats_total');
+    
     if ($public_directory &&
-    $page->get_template_vars('nb_resultats_total')>$globals->public_max_search_results)
-        new ThrowError('Votre recherche a généré trop de résultats pour un affichage public.');
+       $page->get_template_vars('nb_resultats_total')>$globals->public_max_search_results)
+    {
+       new ThrowError('Votre recherche a généré trop de résultats pour un affichage public.');
+    }
     $nbpages = ($page->get_template_vars('nb_resultats_total')-1)/$globals->search_results_per_page;
     $page->assign('offsets',range(0,$nbpages));
     $page->assign('url_args',$fields->get_url());