From f3f9f32fc7a084841dbd0f2e633fc709aafb7acf Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 10 Jul 2012 17:09:24 +0200
Subject: [PATCH] Should fix bug when adding user fields see #5025

---
 main/admin/user_fields.php       |  2 +-
 main/admin/user_fields_add.php   | 29 +++++++++--------------------
 main/inc/lib/usermanager.lib.php |  1 +
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/main/admin/user_fields.php b/main/admin/user_fields.php
index 7ee49045b8..9c7ad54905 100644
--- a/main/admin/user_fields.php
+++ b/main/admin/user_fields.php
@@ -188,7 +188,7 @@ function get_extra_fields($f,$n,$o,$d)
  * @since Dokeos 1.8.6
  */
 function type_filter($type) {
-    $types = UserManager::get_user_field_types($field_type);
+    $types = UserManager::get_user_field_types();
 	return $types[$type];
 }
 
diff --git a/main/admin/user_fields_add.php b/main/admin/user_fields_add.php
index 37d95822e7..eae84b6cff 100644
--- a/main/admin/user_fields_add.php
+++ b/main/admin/user_fields_add.php
@@ -1,4 +1,4 @@
-<?php // $Id: user_fields_add.php 20845 2009-05-19 17:27:22Z cfasanando $
+<?php
 /* For licensing terms, see /dokeos_license.txt */
 /**
 *	@package chamilo.admin
@@ -10,13 +10,13 @@ $cidReset = true;
 // including necessary libraries
 require_once '../inc/global.inc.php';
 
-
 // section for the tabs
 $this_section=SECTION_PLATFORM_ADMIN;
 
 // user permissions
 api_protect_admin_script();
-$htmlHeadXtra[] = '<script type="text/javascript">
+
+$htmlHeadXtra[] = '<script>
 function change_image_user_field (image_value) {
 	
 	if (image_value==1) {
@@ -102,12 +102,9 @@ $table_uf_val 	= Database :: get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array ('url' => 'user_fields.php', 'name' => get_lang('UserFields'));
-if ($_GET['action']<>'edit')
-{
+if ($_GET['action']<>'edit') {
 	$tool_name = get_lang('AddUserFields');
-}
-else
-{
+} else {
 	$tool_name = get_lang('EditUserFields');
 }
 // Create the form
@@ -123,16 +120,11 @@ $form->addRule('fieldtitle', get_lang('ThisFieldIsRequired'), 'required');
 // Field type
 $types = UserManager::get_user_field_types();
 
-$form->addElement('select','fieldtype',get_lang('FieldType'),$types,array('onchange'=>'change_image_user_field(this.value)'));
+$form->addElement('select','fieldtype',get_lang('FieldType'), $types, array('onchange'=>'change_image_user_field(this.value)'));
 $form->addRule('fieldtype', get_lang('ThisFieldIsRequired'), 'required');
 
 //Advanced parameters
-$form -> addElement('html','<div class="row">
-			<div class="label">&nbsp;</div>
-			<div class="formw">
-				<a href="javascript://" onclick=" return advanced_parameters()"><span id="img_plus_and_minus"><div style="vertical-align:top;" ><img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'</div></span></a>
-			</div>
-			</div>');
+$form -> addElement('advanced_settings','<a href="javascript://" onclick=" return advanced_parameters()"><span id="img_plus_and_minus"><div style="vertical-align:top;" ><img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'</div></span></a>');
 //When edit, the combobox displey the field type displeyed else none 	
 if ( (isset($_GET['action']) && $_GET['action'] == 'edit') && in_array($_GET['field_type'],array(3,4,5,8))) {
 	$form -> addElement('html','<div id="options" style="display:block">');
@@ -208,13 +200,10 @@ if( $form->validate()) {
 		$fielddefault = $field['fielddefaultvalue'];
 		$fieldoptions = $field['fieldoptions']; //comma-separated list of options
 
-		if (is_numeric($field['fieldid']) AND !empty($field['fieldid']))
-		{
+		if (is_numeric($field['fieldid']) AND !empty($field['fieldid'])) {
 			UserManager:: save_extra_field_changes($field['fieldid'],$fieldlabel,$fieldtype,$fieldtitle,$fielddefault,$fieldoptions);
 			$message = get_lang('FieldEdited');
-		}
-		else
-		{
+		} else {
 			$field_id = UserManager::create_extra_field($fieldlabel,$fieldtype,$fieldtitle,$fielddefault,$fieldoptions);
 			$message = get_lang('FieldAdded');
 		}
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index f5bc581fdd..86535eb0f3 100644
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -3680,6 +3680,7 @@ EOF;
         $types[self::USER_FIELD_TYPE_TAG]             = get_lang('FieldTypeTag');
         $types[self::USER_FIELD_TYPE_TIMEZONE]        = get_lang('FieldTypeTimezone');
         $types[self::USER_FIELD_TYPE_SOCIAL_PROFILE]  = get_lang('FieldTypeSocialProfile');
+        return $types;
     }
 
     function add_user_as_admin($user_id) {