From 1bf65e5880fdcc66791be212b1c79389ac4f03ec Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Fri, 26 Jan 2007 13:33:56 +0000
Subject: [PATCH] MDL-8096 - some more fixes for custom profile fields

---
 user/profile/definelib.php               | 11 +++++++----
 user/profile/field/menu/define.class.php |  2 +-
 user/profile/field/text/define.class.php |  4 +++-
 user/profile/lib.php                     |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/user/profile/definelib.php b/user/profile/definelib.php
index ec208263e4..1e1a46a9a3 100644
--- a/user/profile/definelib.php
+++ b/user/profile/definelib.php
@@ -23,11 +23,11 @@ class profile_define_base {
 
         $strrequired = get_string('required');
 
-        $form->addElement('text', 'shortname', get_string('profileshortname', 'admin'), 'maxlength="100" size="30"');
+        $form->addElement('text', 'shortname', get_string('profileshortname', 'admin'), 'maxlength="100" size="25"');
         $form->addRule('shortname', $strrequired, 'required', null, 'client');
         $form->setType('shortname', PARAM_ALPHANUM);
 
-        $form->addElement('text', 'name', get_string('profilename', 'admin'), 'size="30"');
+        $form->addElement('text', 'name', get_string('profilename', 'admin'), 'size="50"');
         $form->addRule('name', $strrequired, 'required', null, 'client');
         $form->setType('name', PARAM_MULTILANG);
 
@@ -92,9 +92,12 @@ class profile_define_base {
     function define_validate_common($data) {
         $err = array();
 
+        /// Check the shortname was not truncated by cleaning
+        if (empty($data->shortname)) {
+            $err['shortname'] = get_string('required');
+
         /// Check the shortname is unique
-        if (($field = get_record('user_info_field', 'shortname', $data->shortname)) and ($field->id <> $data->id)) {
-        //if (record_exists_select('user_info_field', 'shortname='.$data->shortname.' AND id<>'.$data->id)) {
+        } else if (($field = get_record('user_info_field', 'shortname', $data->shortname)) and ($field->id <> $data->id)) {
             $err['shortname'] = get_string('profileshortnamenotunique', 'admin');
         }
 
diff --git a/user/profile/field/menu/define.class.php b/user/profile/field/menu/define.class.php
index 126457a929..f824f07684 100644
--- a/user/profile/field/menu/define.class.php
+++ b/user/profile/field/menu/define.class.php
@@ -8,7 +8,7 @@ class profile_define_menu extends profile_define_base {
         $form->setType('param1', PARAM_MULTILANG);
 
         /// Default data
-        $form->addElement('text', 'defaultdata', get_string('profiledefaultdata', 'admin'), 'size="30"');
+        $form->addElement('text', 'defaultdata', get_string('profiledefaultdata', 'admin'), 'size="50"');
         $form->setType('defaultdata', PARAM_MULTILANG);
     }
 
diff --git a/user/profile/field/text/define.class.php b/user/profile/field/text/define.class.php
index 4c8c758b35..f0b6a2d6c8 100644
--- a/user/profile/field/text/define.class.php
+++ b/user/profile/field/text/define.class.php
@@ -4,15 +4,17 @@ class profile_define_text extends profile_define_base {
 
     function define_form_specific(&$form) {
         /// Default data
-        $form->addElement('text', 'defaultdata', get_string('profiledefaultdata', 'admin'), 'size="30"');
+        $form->addElement('text', 'defaultdata', get_string('profiledefaultdata', 'admin'), 'size="50"');
         $form->setType('defaultdata', PARAM_MULTILANG);
 
         /// Param 1 for text type is the size of the field
         $form->addElement('text', 'param1', get_string('profilefieldsize', 'admin'), 'size="6"');
+        $form->setDefault('param1', 50);
         $form->setType('param1', PARAM_INT);
 
         /// Param 2 for text type is the maxlength of the field
         $form->addElement('text', 'param2', get_string('profilefieldmaxlength', 'admin'), 'size="6"');
+        $form->setDefault('param2', 100);
         $form->setType('param2', PARAM_INT);
     }
 
diff --git a/user/profile/lib.php b/user/profile/lib.php
index 8f6036daa9..4c13ab4867 100644
--- a/user/profile/lib.php
+++ b/user/profile/lib.php
@@ -72,7 +72,7 @@ class profile_field_base {
         $usernew = $this->save_data_preprocess($usernew);
 
         if (!isset($usernew->{$this->inputname})) {
-            // field not present in form, probably locked and incisible - skip it!
+            // field not present in form, probably locked and invisible - skip it
             return;
         }
 
-- 
2.39.5