From 202bea567e5bb06091292342c6272cf99d6abcc9 Mon Sep 17 00:00:00 2001
From: x2000bedo <x2000bedo>
Date: Sat, 27 Nov 2004 16:44:33 +0000
Subject: [PATCH] Closes #203

---
 htdocs/advanced_search.php    | 13 +++++++++----
 templates/search.adv.form.tpl | 22 +++++++++++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index 869ffa3..9477fd8 100644
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: advanced_search.php,v 1.35 2004-11-27 15:41:00 x2000bedo Exp $
+        $Id: advanced_search.php,v 1.36 2004-11-27 16:44:33 x2000bedo Exp $
  ***************************************************************************/
 
 require_once("xorg.inc.php");
@@ -80,6 +80,8 @@ else {
     $promo1Field = new PromoSField('promo1','egal1',array('u.promo'),'');
     $promo2Field = new PromoSField('promo2','egal2',array('u.promo'),'');
     $womanField = new RefSField('woman',array('FIND_IN_SET(u.flags,\'femme\')+1'),'','','');
+    $subscriberField = new RefSField('subscriber',array('!(u.perms IN (\'admin\',\'user\'))+1'),'','','');
+    $aliveField = new RefSField('alive',array('(u.deces!=0)+1'),'','','');
    
     $townField = new RefSField('ville',array('av.ville'),'adresses','av','u.user_id=av.uid',false);
     $countryField = new RefSField('pays',array('ap.pays'),'adresses','ap','u.user_id=ap.uid');
@@ -96,12 +98,15 @@ else {
     $sectionField = new RefSField('section',array('u.section'),'','','');
     $schoolField = new RefSField('school',array('as.aid'),'applis_ins','`as`','u.user_id=as.uid');
     $diplomaField = new RefSField('diploma',array('ad.type'),'applis_ins','ad','u.user_id=ad.uid');
-   
+  
+    $freeField = new RefSField('free',array('u.libre'),'','','',false);
+  
     $fields = new
-    SFieldGroup(true,array($nameField,$firstnameField,$promo1Field,$promo2Field,$womanField,
+    SFieldGroup(true,array($nameField,$firstnameField,$promo1Field,$promo2Field,$womanField,$subscriberField,$aliveField,
     $townField,$countryField,$regionField,
     $entrepriseField,$posteField,$secteurField,$cvField,
-    $nationaliteField,$binetField,$groupexField,$sectionField,$schoolField,$diplomaField));
+    $nationaliteField,$binetField,$groupexField,$sectionField,$schoolField,$diplomaField,
+    $freeField));
     
     if ($fields->too_large())
     {
diff --git a/templates/search.adv.form.tpl b/templates/search.adv.form.tpl
index eec49c8..f7309ee 100644
--- a/templates/search.adv.form.tpl
+++ b/templates/search.adv.form.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.adv.form.tpl,v 1.4 2004-11-27 15:54:00 x2000bedo Exp $
+        $Id: search.adv.form.tpl,v 1.5 2004-11-27 16:44:36 x2000bedo Exp $
  ***************************************************************************}
 
 <h1>Recherche avancée</h1>
@@ -79,6 +79,22 @@
       </td>
     </tr>
     <tr>
+      <td>Sur polytechnique.org</td>
+      <td>
+        <input type="radio" name="subscriber" value="0" {if !$smarty.request.subscriber}checked="checked"{/if} />Inscrit ou non&nbsp;
+        <input type="radio" name="subscriber" value="1" {if $smarty.request.subscriber eq 1}checked="checked"{/if} />Inscrit&nbsp;
+        <input type="radio" name="subscriber" value="2" {if $smarty.request.subscriber eq 2}checked="checked"{/if} />Non inscrit
+      </td>
+    </tr>
+    <tr>
+      <td>Décès</td>
+      <td>
+        <input type="radio" name="alive" value="0" {if !$smarty.request.alive}checked="checked"{/if} />Vivant ou décédé&nbsp;
+        <input type="radio" name="alive" value="1" {if $smarty.request.alive eq 1}checked="checked"{/if} />Vivant&nbsp;
+        <input type="radio" name="alive" value="2" {if $smarty.request.alive eq 2}checked="checked"{/if} />Décédé
+      </td>
+    </tr>
+    <tr>
       <th colspan="2">Géographie</th>
     </tr>
     <tr>
@@ -243,6 +259,10 @@
         </select>
       </td>
     </tr>
+    <tr>
+      <td>Commentaire contient</td>
+      <td><input type="text" name="free" size="32" value="{$smarty.request.free}" /></td>
+    </tr>
   </table>
   <div class="center">
     <br />
-- 
2.1.4