Tidying up the interface.

Fixed default data bug in menu type.
moodle · Jan 12, 2007 · 253625c · 253625c
1 parent 55526ee
commit 253625c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/user/profile/field/menu/field.class.php b/user/profile/field/menu/field.class.php
@@ -41,6 +41,7 @@ function validate_data($data) {
     }
 
     function save_data_preprocess($data) {
+
         if (!isset($this->options[$data])) { /// validate_data should already have caught this
             return '';
         } else {
@@ -60,7 +61,9 @@ function edit_field_specific(&$form) {
 
     function edit_validate_specific($data) {
         $err = array();
-
+
+        $data->param1 = str_replace("\r", '', $data->param1);
+
         /// Check that we have at least 2 options
         if (($options = explode("\n", $data->param1)) === false) {
             $err['param1'] = get_string('profilemenunooptions', 'admin');
@@ -73,6 +76,13 @@ function edit_validate_specific($data) {
         }
         return $err;        
     }
+
+    function edit_save_preprocess($data) {
+        $data->param1 = str_replace("\r", '', $data->param1);
+
+        return $data;
+    }
+
 }
 
 ?>
diff --git a/user/profile/index.php b/user/profile/index.php
@@ -172,7 +172,7 @@
         } else {
 
             if ($id == 0) {
-                $strheading = get_string('profilecreatenewfield', 'admin');
+                $strheading = get_string('profilecreatenewfield', 'admin', $datatypes[$type]);
             } else {
                 $strheading = get_string('profileeditfield', 'admin', $field->name);
             }

diff --git a/user/profile/lib.php b/user/profile/lib.php
@@ -218,6 +218,8 @@ function edit_field_common (&$form) {
         $choices[2] = get_string('profilevisibleall', 'admin');
         $form->addElement('select', 'visible', get_string('profilevisible', 'admin'), $choices);
         $form->setType('visible', PARAM_INT);
+        $form->setDefault('visible', 2);
+        $form->setHelpButton('visible', array('profilevisible', get_string('profilevisible','admin')));
 
         unset($choices);
         $choices = profile_list_categories();