Browse Source

Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

Julio Montoya 11 years ago
parent
commit
e53ac5cfeb
2 changed files with 17 additions and 2 deletions
  1. 0 1
      main/inc/lib/fckeditor/fckeditor.php
  2. 17 1
      main/inc/lib/usermanager.lib.php

+ 0 - 1
main/inc/lib/fckeditor/fckeditor.php

@@ -49,7 +49,6 @@ function FCKeditor_IsCompatibleBrowser()
             $sAgent = $HTTP_USER_AGENT ;
         }
     }
-error_log($sAgent);
     if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false ) {
         $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
         return ($iVersion >= 5.5) ;

+ 17 - 1
main/inc/lib/usermanager.lib.php

@@ -29,6 +29,7 @@ class UserManager
     const USER_FIELD_TYPE_TAG = 10;
     const USER_FIELD_TYPE_TIMEZONE = 11;
     const USER_FIELD_TYPE_SOCIAL_PROFILE = 12;
+    const USER_FIELD_TYPE_FILE = 13;
 
     /**
      * The default constructor only instanciates an empty user object
@@ -1448,6 +1449,9 @@ class UserManager
                     UserManager::process_tags(explode(';', $fvalues), $user_id, $rowuf['id']);
                     return true;
                     break;
+                case self::USER_FIELD_TYPE_SELECT_MULTIPLE :
+                    // check code from UserManager::update_user_picture() to use something similar here
+                    break;
                 case self::USER_FIELD_TYPE_RADIO:
                 case self::USER_FIELD_TYPE_SELECT:
                 case self::USER_FIELD_TYPE_SELECT_MULTIPLE:
@@ -1479,7 +1483,7 @@ class UserManager
             $resufv = Database::query($sqlufv);
             $n = Database::num_rows($resufv);
             if ($n > 1) {
-                //problem, we already have to values for this field and user combination - keep last one
+                //problem, we already have two values for this field and user combination - keep last one
                 while ($rowufv = Database::fetch_array($resufv)) {
                     if ($n > 1) {
                         $sqld = "DELETE FROM $t_ufv WHERE id = ".$rowufv['id'];
@@ -4324,6 +4328,17 @@ EOF;
                     if ($field_details[7] == 0)
                         $form->freeze('extra_'.$field_details[1]);
                     break;
+                case self::USER_FIELD_TYPE_FILE:
+                    if (!empty($field_details[3])) {
+                        $uPaths = UserManager::get_user_picture_path_by_id($user_id);
+                        $path = '<a href="'.$uPaths['dir'].$field_details[3]."'>".$field_details[3].'</a>';
+                        $form->addElement('html', 'extra_'.$field_details[1].'_link', $path, null, '');
+                    }
+                    $form->addElement('file', 'extra_'.$field_details[1], $field_details[3], null, '');
+                    if ($field_details[7] == 0) {
+                        $form->freeze('extra_'.$field_details[1]);
+                    }
+                    break;
             }
         }
         $return = array();
@@ -4349,6 +4364,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');
+        $types[self::USER_FIELD_TYPE_FILE] = get_lang('FieldTypeFile');
 
         return $types;
     }