Index: lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/message/lib.php,v
retrieving revision 1.47
diff -u -r1.47 lib.php
--- lib.php	26 Sep 2006 05:07:05 -0000	1.47
+++ lib.php	17 Oct 2006 10:46:58 -0000
@@ -1,7 +1,7 @@
 <?php
 /// library functions for messaging
 
-
+include_once $CFG->libdir.'/formslib.php';
 define ('MESSAGE_SHORTLENGTH', 300);
 define ('MESSAGE_WINDOW', true);          // We are in a message window (so don't pop up a new one!)
 
@@ -226,60 +226,60 @@
 
 function message_print_search() {
     global $USER;
+    include('message_search_form.php');
+    $searchform =new search_user('index.php');  
     
-    if ($frm = data_submitted()) {
-    
-        message_print_search_results($frm);
+    if ($data = $searchform->data_submitted()) {
+        if(!isset($data->mycourses)){
+            $data->mycourses=0;        
+        }
+        if(!isset($data->includeblocked )){
+            $data->includeblocked =0;        
+        }      
+       message_print_search_results($data);
         
     } else {
         // find all courses this use has readallmessages capabilities in
         if ($teachers = get_user_capability_course('moodle/site:readallmessages')) {
-            $courses = get_courses('all', 'c.sortorder ASC', 'c.id, c.shortname');
+            $courses = get_courses('all', 'c.sortorder ASC', 'c.id, c.shortname');  
             $cs = '<select name="courseselect">';
-            foreach ($teachers as $tcourse) {
-                $cs .= "<option value=\"$tcourse->course\">".$courses[$tcourse->id]->shortname."</option>\n";
+            foreach ($teachers as $tcourse) {               
+               if(!empty($courses[$tcourse->id]->shortname)){
+                $cs .= "<option value=\"$tcourse->id\">".$courses[$tcourse->id]->shortname."</option>";
+               }
             }
             $cs .= '</select>';
+            
         }
-        
-        include('search.html');
+        $searchform->display();
+       
     }
 }
 
 function message_print_settings() {
     global $USER;
     
-    if ($frm = data_submitted()) {
-
+    include('message_settings_form.php');
+    $searchmessage =new print_user_message('index.php');
+    if ($data = $searchmessage->data_submitted()) {   
+      
+      
         $pref = array();
-        $pref['message_showmessagewindow'] = (isset($frm->showmessagewindow)) ? '1' : '0';
-        $pref['message_beepnewmessage'] = (isset($frm->beepnewmessage)) ? '1' : '0';
-        $pref['message_blocknoncontacts'] = (isset($frm->blocknoncontacts)) ? '1' : '0';
-        $pref['message_usehtmleditor'] = (isset($frm->usehtmleditor)) ? '1' : '0';
-        $pref['message_emailmessages'] = (isset($frm->emailmessages)) ? '1' : '0';
-        $pref['message_emailtimenosee'] = ((int)$frm->emailtimenosee > 0) ? (int)$frm->emailtimenosee : '10';
-        $pref['message_emailaddress'] = (!empty($frm->emailaddress)) ? $frm->emailaddress : $USER->email;
-        $pref['message_emailformat'] = (isset($frm->emailformat)) ? $frm->emailformat : FORMAT_PLAIN;
+        $pref['message_showmessagewindow'] = (isset($data->showmessagewindow)) ? '1' : '0';
+        $pref['message_beepnewmessage'] = (isset($data->beepnewmessage)) ? '1' : '0';
+        $pref['message_blocknoncontacts'] = (isset($data->blocknoncontacts)) ? '1' : '0';
+        $pref['message_usehtmleditor'] = (isset($data->usehtmleditor)) ? '1' : '0';
+        $pref['message_emailmessages'] = (isset($data->emailmessages)) ? '1' : '0';
+        $pref['message_emailtimenosee'] = ((int)$data->emailtimenosee > 0) ? (int)$data->emailtimenosee : '10';
+        $pref['message_emailaddress'] = (!empty($data->emailaddress)) ? $data->emailaddress : $USER->email;
+        $pref['message_emailformat'] = (isset($data->emailformat)) ? $data->emailformat : FORMAT_PLAIN;
 
         set_user_preferences($pref);
-        
+                
         redirect('index.php', get_string('settingssaved', 'message'), 1);
     }
+      $searchmessage->display();
 
-    $cbshowmessagewindow = (get_user_preferences('message_showmessagewindow', 1) == '1') ? 'checked="checked"' : '';
-    $cbbeepnewmessage = (get_user_preferences('message_beepnewmessage', 0) == '1') ? 'checked="checked"' : '';
-    $cbblocknoncontacts = (get_user_preferences('message_blocknoncontacts', 0) == '1') ? 'checked="checked"' : '';
-    $cbusehtmleditor = (get_user_preferences('message_usehtmleditor', 0) == '1') ? 'checked="checked"' : '';
-    $cbemailmessages = (get_user_preferences('message_emailmessages', 1) == '1') ? 'checked="checked"' : '';
-    $txemailaddress = get_user_preferences('message_emailaddress', $USER->email);
-    $txemailtimenosee = get_user_preferences('message_emailtimenosee', 10);
-    $format_select = choose_from_menu( array(FORMAT_PLAIN => get_string('formatplain'),
-                                             FORMAT_HTML  => get_string('formathtml')),
-                                       'emailformat',
-                                       get_user_preferences('message_emailformat', FORMAT_PLAIN),
-                                       false, '', '0', true );
-    
-    include('settings.html');
 }
 
 
@@ -337,6 +337,7 @@
 function message_print_search_results($frm) {
     global $USER, $CFG;
 
+
     echo '<div align="center">';
 
     /// search for person