some improvements for search

diff --git a/htdocs/search.php b/htdocs/search.php
index a04f024..1c030f4 100644 (file)
--- 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.34 2004-10-25 12:41:04 x2000habouzit Exp $
+        $Id: search.php,v 1.35 2004-10-25 12:48:02 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -53,11 +53,6 @@ if (array_key_exists('rechercher', $_REQUEST)) {
     $womanField = new RefSField('woman',array('FIND_IN_SET(i.flags,\'femme\')+1'),'','','');
     $fields = new SFieldGroup(true,array($nameField,$firstnameField,$promo1Field,$promo2Field,$womanField));
     
-    if ($nameField->length()<2 && $firstnameField->length()<2 && 
-        (!logged() || !$promo1Field->is_a_single_promo()))
-    {
-       new ThrowError('Recherche trop générale.');
-    }
     $offset = new NumericSField('offset');
    
     $sql = 'SELECT SQL_CALC_FOUND_ROWS

diff --git a/templates/search.form.tpl b/templates/search.form.tpl
index e3b55b7..6e95266 100644 (file)
--- 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.22 2004-10-25 12:41:05 x2000habouzit Exp $
+        $Id: search.form.tpl,v 1.23 2004-10-25 12:48:02 x2000habouzit Exp $
  ***************************************************************************}
 
 <h1>
@@ -56,15 +56,15 @@
       <td>
         <select name="egal1">
           <option value="=" {if $smarty.request.egal1 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
-          <option value="&gt;" {if $smarty.request.egal1 eq ">"}selected="selected"{/if}>&nbsp;&gt;&nbsp;</option>
-          <option value="&lt;" {if $smarty.request.egal1 eq "<"}selected="selected"{/if}>&nbsp;&lt;&nbsp;</option>
+          <option value="&gt;=" {if $smarty.request.egal1 eq "&gt;="}selected="selected"{/if}>&nbsp;&gt;=&nbsp;</option>
+          <option value="&lt;=" {if $smarty.request.egal1 eq "&lt;="}selected="selected"{/if}>&nbsp;&lt;=&nbsp;</option>
         </select>
         <input type="text" name="promo1" size="4" maxlength="4" value="{$smarty.request.promo1}" />
         &nbsp;ET&nbsp;
         <select name="egal2">
           <option value="=" {if $smarty.request.egal2 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
-          <option value="&gt;" {if $smarty.request.egal2 eq ">"}selected="selected"{/if}>&nbsp;&gt;&nbsp;</option>
-          <option value="&lt;" {if $smarty.request.egal2 eq "<"}selected="selected"{/if}>&nbsp;&lt;&nbsp;</option>
+          <option value="&gt;=" {if $smarty.request.egal2 eq "&gt;="}selected="selected"{/if}>&nbsp;&gt;=&nbsp;</option>
+          <option value="&lt;=" {if $smarty.request.egal2 eq "&lt;="}selected="selected"{/if}>&nbsp;&lt;=&nbsp;</option>
         </select>
         <input type="text" name="promo2" size="4" maxlength="4" value="{$smarty.request.promo2}" />
       </td>
@@ -72,9 +72,9 @@
     <tr>
       <td>Sexe</td>
       <td>
-        <input type="radio" name="woman" value="0" checked="checked" />Homme ou femme&nbsp;
-        <input type="radio" name="woman" value="1" />Homme&nbsp;
-        <input type="radio" name="woman" value="2" />Femme
+        <input type="radio" name="woman" value="0" {if !$smarty.request.woman}checked="checked"{/if} />Homme ou femme&nbsp;
+        <input type="radio" name="woman" value="1" {if $smarty.request.woman eq 1}checked="checked"{/if} />Homme&nbsp;
+        <input type="radio" name="woman" value="2" {if $smarty.request.woman eq 2}checked="checked"{/if} />Femme
       </td>
     </tr>
 {if $advanced eq "1"}