Index: search.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/search.php,v
retrieving revision 1.68
diff -u -r1.68 search.php
--- search.php	24 Sep 2006 15:28:16 -0000	1.68
+++ search.php	19 Oct 2006 09:54:10 -0000
@@ -24,12 +24,12 @@
     $fromyear = optional_param('fromyear', 0, PARAM_INT);      // Starting date
     $fromhour = optional_param('fromhour', 0, PARAM_INT);      // Starting date
     $fromminute = optional_param('fromminute', 0, PARAM_INT);      // Starting date
+
     if ($timefromrestrict) {
         $datefrom = make_timestamp($fromyear, $frommonth, $fromday, $fromhour, $fromminute);
     } else {
         $datefrom = optional_param('datefrom', 0, PARAM_INT);      // Starting date
     }
-
     $timetorestrict = optional_param('timetorestrict', 0, PARAM_INT); // Use ending date
     $today = optional_param('today', 0, PARAM_INT);      // Ending date
     $tomonth = optional_param('tomonth', 0, PARAM_INT);      // Ending date
@@ -41,9 +41,6 @@
     } else {
         $dateto = optional_param('dateto', 0, PARAM_INT);      // Ending date
     }
-
-
-
     if (empty($search)) {   // Check the other parameters instead
         if (!empty($words)) {
             $search .= ' '.$words;
@@ -102,7 +99,10 @@
                  "<a href=\"index.php?id=$course->id\">$strforums</a> -> $strsearch", 'search.words',
                   "", "", "&nbsp;", navmenu($course));
 
-        forum_print_big_search_form($course);
+        //forum_print_big_search_form($course);
+        include('forum_search_form.php');
+        $forumform =new forum_search_form('search.php',compact('words','course','subject','phrase','user','userid','fullwords','notwords','datefrom','dateto'));
+        $forumform->display();
         print_footer($course);
         exit;
     }
@@ -127,8 +127,10 @@
             $words = $search;
         }
 
-        forum_print_big_search_form($course);
-
+        //forum_print_big_search_form($course);
+        include('forum_search_form.php');
+        $forumform =new forum_search_form('search.php',compact('words','course','subject','phrase','user','userid','fullwords','notwords','datefrom','dateto'));
+        $forumform->display();
         print_footer($course);
         exit;
     }
@@ -203,10 +205,10 @@
         // Hack for posts of format FORMAT_PLAIN. Otherwise html tags added by
         // the highlight() call bellow get stripped out by forum_print_post().
         if ($post->format == FORMAT_PLAIN) {
-            $post->message = s($post->message); 
-            $post->message = rebuildnolinktag($post->message); 
-            $post->message = str_replace(' ', '&nbsp; ', $post->message); 
-            $post->message = nl2br($post->message); 
+            $post->message = s($post->message);
+            $post->message = rebuildnolinktag($post->message);
+            $post->message = str_replace(' ', '&nbsp; ', $post->message);
+            $post->message = nl2br($post->message);
             $post->format = FORMAT_HTML;
         }
 
@@ -263,123 +265,18 @@
 
 
 
-function forum_print_big_search_form($course) {
-    global $CFG, $words, $subject, $phrase, $user, $userid, $fullwords, $notwords, $datefrom, $dateto;
 
-    print_simple_box(get_string('searchforumintro', 'forum'), 'center', '', '', 'searchbox', 'intro');
-
-    print_simple_box_start("center");
-
-    echo "<script type=\"text/javascript\" language=\"javascript\">\n";
-    echo "var timefromitems = ['fromday','frommonth','fromyear','fromhour', 'fromminute'];\n";
-    echo "var timetoitems = ['today','tomonth','toyear','tohour','tominute'];\n";
-    echo "</script>\n";
-
-    echo '<form name="search" action="search.php" method="get">';
-    echo '<input type="hidden" value="'.$course->id.'" name="id" alt="">';
-    echo '<table cellpadding="10" class="searchbox" id="form">';
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchwords', 'forum').':</td>';
-    echo '<td class="c1"><input type="text" size="35" name="words" value="'.s($words).'" alt=""></td>';
-    echo '</tr>';
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchphrase', 'forum').':</td>';
-    echo '<td class="c1"><input type="text" size="35" name="phrase" value="'.s($phrase).'" alt=""></td>';
-    echo '</tr>';
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchnotwords', 'forum').':</td>';
-    echo '<td class="c1"><input type="text" size="35" name="notwords" value="'.s($notwords).'" alt=""></td>';
-    echo '</tr>';
-
-    if ($CFG->dbtype == 'mysql' || $CFG->dbtype == 'postgres7') {
-        echo '<tr>';
-        echo '<td class="c0">'.get_string('searchfullwords', 'forum').':</td>';
-        echo '<td class="c1"><input type="text" size="35" name="fullwords" value="'.s($fullwords).'" alt=""></td>';
-        echo '</tr>';
-    }
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchdatefrom', 'forum').':</td>';
-    echo '<td class="c1">';
-    echo '<input name="timefromrestrict" type="checkbox" value="1" alt="'.get_string('searchdatefrom', 'forum').'" onclick="return lockoptions(\'search\', \'timefromrestrict\', timefromitems)" /> ';
-    if (empty($dateto)) {
-        $datefrom = make_timestamp(2000, 1, 1, 0, 0, 0);
-    }
-    print_date_selector('fromday', 'frommonth', 'fromyear', $datefrom);
-    print_time_selector('fromhour', 'fromminute', $datefrom);
-
-    echo '<input type="hidden" name="hfromday" value="0" />';
-    echo '<input type="hidden" name="hfrommonth" value="0" />';
-    echo '<input type="hidden" name="hfromyear" value="0" />';
-    echo '<input type="hidden" name="hfromhour" value="0" />';
-    echo '<input type="hidden" name="hfromminute" value="0" />';
-
-    echo '</td>';
-    echo '</tr>';
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchdateto', 'forum').':</td>';
-    echo '<td class="c1">';
-    echo '<input name="timetorestrict" type="checkbox" value="1" alt="'.get_string('searchdateto', 'forum').'" onclick="return lockoptions(\'search\', \'timetorestrict\', timetoitems)" /> ';
-    if (empty($dateto)) {
-        $dateto = time()+3600;
-    }
-    print_date_selector('today', 'tomonth', 'toyear', $dateto);
-    print_time_selector('tohour', 'tominute', $dateto);
-
-    echo '<input type="hidden" name="htoday" value="0" />';
-    echo '<input type="hidden" name="htomonth" value="0" />';
-    echo '<input type="hidden" name="htoyear" value="0" />';
-    echo '<input type="hidden" name="htohour" value="0" />';
-    echo '<input type="hidden" name="htominute" value="0" />';
-
-    echo '</td>';
-    echo '</tr>';
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchwhichforums', 'forum').':</td>';
-    echo '<td class="c1">';
-    choose_from_menu(forum_menu_list($course), 'forumid', '', get_string('allforums', 'forum'), '');
-    echo '</td>';
-    echo '</tr>';
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchsubject', 'forum').':</td>';
-    echo '<td class="c1"><input type="text" size="35" name="subject" value="'.s($subject).'" alt=""></td>';
-    echo '</tr>';
-
-    echo '<tr>';
-    echo '<td class="c0">'.get_string('searchuser', 'forum').':</td>';
-    echo '<td class="c1"><input type="text" size="35" name="user" value="'.s($user).'" alt=""></td>';
-    echo '</tr>';
-
-    echo '<tr>';
-    echo '<td class="submit" colspan="2" align="center">';
-    echo '<input type="submit" value="'.get_string('searchforums', 'forum').'" alt=""></td>';
-    echo '</tr>';
-
-    echo '</table>';
-    echo '</form>';
-
-    echo "<script type=\"text/javascript\">";
-    echo "lockoptions('search','timefromrestrict', timefromitems);";
-    echo "lockoptions('search','timetorestrict', timetoitems);";
-    echo "</script>\n";
-
-    print_simple_box_end();
-}
 
 
 function forum_clean_search_terms($words, $prefix='') {
-    $searchterms = explode(' ', $words);
+
+   $searchterms = explode(' ', $words);
     foreach ($searchterms as $key => $searchterm) {
         if (strlen($searchterm) < 2) {
             unset($searchterms[$key]);
         } else if ($prefix) {
             $searchterms[$key] = $prefix.$searchterm;
+            echo "vcv".$key;
         }
     }
     return trim(implode(' ', $searchterms));