Changeset 629 for trunk/search.php

Timestamp:

Dec 2, 2004, 1:45:57 PM (19 years ago)

Author:

gweltas

Message:

Search form update

File:

• trunk/search.php (modified) (6 diffs)

trunk/search.php

@@ -36 +36 @@
 if (isset($_POST['submit']))
 {
-  if ($_POST['search_keywords'] &&
-   !preg_match('/^\s*$/', $_POST['search_keywords']))
+  if ($_POST['search_allwords'] &&
+   !preg_match('/^\s*$/', $_POST['search_allwords']))
   {
     $local_search = array();
-        $search_keywords = $_POST['search_keywords'];
+        $search_keywords = $_POST['search_allwords'];
         $drop_char_match =   array('-', '^', '$', ';', '#', '&', '(', ')', '<', '>',
           '`', '\'', '"', '|', ',', '@', '_', '?', '%', '~', '.', '[', ']', '{', '}', 
@@ -52 +52 @@
         $words = preg_split('#\s+#', $search_keywords);
     $words = array_unique($words);
-        $search['fields']['keywords'] = array();
-        $search['fields']['keywords']['words'] =$words;
-        $search['fields']['keywords']['mode']= $_POST['mode'];
+        $search['fields']['allwords'] = array();
+        $search['fields']['allwords']['words'] =$words;
+        $search['fields']['allwords']['mode']= $_POST['mode'];
   }
   
@@ -83 +83 @@
   // duration
   $search_duration = 0;
-  if ( !empty($date) && !empty( $_POST['duration_day']) )
-  {
-        $search['fields'][$type_date]['mode'] =  $_POST['duration_day'];
+  if ( !empty($date) && !empty( $_POST['end_year']) )
+  {
+        $end_date = $_POST['end_year'].'.'.$_POST['end_month'].'.'.$_POST['end_day'];
+        $search['fields'][$type_date]['mode'] =  $end_date;
   }
  }
@@ -140 +141 @@
 $start_month .= '</select>';
 
-// year list
-$start_year = '<select name="start_year">';
-$start_year .= '<option value="0"> ---- </option>';
-$begin_year = date('Y', time())-10;
-for ($i = $begin_year; $i <= date('Y', time()); $i++)
-{
-        $start_year .= '<option value="' . $i . '">' . $i . '</option>';
-}
-$start_year .= '</select>';
-
+// day list
+$end_day = '<select name="end_day">';
+for ($i=0; $i <= 31; $i++)
+{
+        $end_day .= '<option value="' . $i . '" >' . ( ($i == 0) ? ' -- ' : str_pad($i, 2, '0', STR_PAD_LEFT) ) . '</option>';
+}
+$end_day .= '</select>';
+
+// month list
+$end_month = '<select name="end_month">';
+$end_month .= '<option value="0"> ------------ </option>';
+for ($i=1; $i <= 12; $i++)
+{
+        $end_month .= '<option value="' . $i . '">' . $lang['month'][$i] . '</option>';
+}
+$end_month .= '</select>';
 
 //
@@ -179 +186 @@
   'L_TODAY' => $lang['today'],
   'L_SEARCH_DATE_FROM'=>$lang['search_date_from'],
-  'L_SEARCH_DURATION'=>$lang['search_duration'],
+  'L_SEARCH_DATE_TO'=>$lang['search_date_to'],
   'L_DAYS'=>$lang['days'],
   'L_MONTH'=>$lang['w_month'],
@@ -192 +199 @@
   'TODAY_MONTH' => date('m', time()),
   'TODAY_YEAR' => date('Y', time()),
-  'S_CALENDAR_YEAR' => $start_year,
+  'E_CALENDAR_MONTH' => $end_month,
+        'E_CALENDAR_DAY' => $end_day,
   'S_CALENDAR_MONTH' => $start_month,
   'S_CALENDAR_DAY' => $start_day,