From: x2000habouzit <x2000habouzit>
Date: Wed, 3 Nov 2004 22:15:21 +0000 (+0000)
Subject: really closes #165
X-Git-Tag: xorg/old~1080
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=2fb1d107fe81bd4ac5676b46b7761ecaf3aea318;p=platal.git

really closes #165
---

diff --git a/htdocs/search.php b/htdocs/search.php
index fc542e6..1edb12f 100644
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.php,v 1.40 2004-11-02 07:30:47 x2000habouzit Exp $
+        $Id: search.php,v 1.41 2004-11-03 22:15:21 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -50,12 +50,10 @@ if (array_key_exists('rechercher', $_REQUEST)) {
     }
     $promo1Field = new PromoSField('promo1','egal1',array('r.promo'),'');
     $promo2Field = new PromoSField('promo2','egal2',array('r.promo'),'');
-    $womanField = new RefSField('woman',array('FIND_IN_SET(u.flags,\'femme\')+1'),'','','');
-    $fields = new SFieldGroup(true,array($nameField,$firstnameField,$promo1Field,$promo2Field,$womanField));
+    $fields = new SFieldGroup(true,array($nameField,$firstnameField,$promo1Field,$promo2Field));
     
     if (!$nameField->length() && !$firstnameField->length()
-	&& empty($_REQUEST['promo1']) && empty($_REQUEST['promo2'])
-	&& !$_REQUEST['woman'])
+	&& empty($_REQUEST['promo1']) && empty($_REQUEST['promo2']))
     {
 	new ThrowError('Recherche trop générale.');
     }
diff --git a/templates/search.form.tpl b/templates/search.form.tpl
index dee27a8..1408938 100644
--- a/templates/search.form.tpl
+++ b/templates/search.form.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.form.tpl,v 1.24 2004-11-02 06:56:04 x2000habouzit Exp $
+        $Id: search.form.tpl,v 1.25 2004-11-03 22:15:22 x2000habouzit Exp $
  ***************************************************************************}
 
 <h1>
@@ -69,6 +69,7 @@
         <input type="text" name="promo2" size="4" maxlength="4" value="{$smarty.request.promo2}" />
       </td>
     </tr>
+{if $advanced eq "1"}
     <tr>
       <td>Sexe</td>
       <td>
@@ -77,7 +78,6 @@
         <input type="radio" name="woman" value="2" {if $smarty.request.woman eq 2}checked="checked"{/if} />Femme
       </td>
     </tr>
-{if $advanced eq "1"}
     <tr>
       <th colspan="2">Géographie</th>
     </tr>