Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

main/inc/ajax/model.ajax.php

@@ -750,7 +750,7 @@ switch ($action) {
                         $count_skill_by_course[$course_item['code']] = $skills_in_course[$course_item['code']];
                     }
                 }
-                $item['photo'] = Display::img($user_info['avatar_small']);
+                $item['photo'] = Display::img($user_info['avatar_small'], $user_info['complete_name'], [], false);
                 $item['currently_learning'] = !empty($count_skill_by_course) ? array_sum($count_skill_by_course) : 0;
             }
         }

main/inc/lib/attendance.lib.php

@@ -693,7 +693,7 @@ class Attendance
 				$value['result_color_bar'] 	= $user_faults['color_bar'];
 			}
 
-			$photo = '<img src ="'.$userInfo['avatar_small'].'" />';
+            $photo = Display::img($userInfo['avatar_small'], $userInfo['complete_name'], [], false);
 
 			$value['photo'] = $photo;
 			$value['firstname'] = $user_data['firstname'];

main/inc/lib/display.lib.php

@@ -775,15 +775,18 @@ class Display
     /**
      * Returns the htmlcode for an image
      *
-     * @param string $image the filename of the file (in the main/img/ folder
+     * @param string $image_path the filename of the file (in the main/img/ folder
      * @param string $alt_text the alt text (probably a language variable)
      * @param array  $additional_attributes (for instance height, width, onclick, ...)
+     * @param boolean $filterPath Optional. Whether filter the image path. Default is true
      * @author Julio Montoya 2010
      */
-    public static function img($image_path, $alt_text = '', $additional_attributes = array())
+    public static function img($image_path, $alt_text = '', $additional_attributes = array(), $filterPath = true)
     {
         // Sanitizing the parameter $image_path
-        $image_path = Security::filter_img_path($image_path);
+        if ($filterPath) {
+            $image_path = Security::filter_img_path($image_path);
+        }
 
         // alt text = the image name if there is none provided (for XHTML compliance)
         if ($alt_text == '') {

main/inc/lib/document.lib.php

@@ -5522,7 +5522,7 @@ class DocumentManager
             }
         }
         if ($user_image) {
-            return Display::img($icon, $basename, array());
+            return Display::img($icon, $basename, array(), false);
         }
         return Display::return_icon($icon, $basename, array());
     }

main/user/user.php

@@ -647,7 +647,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
             if (api_is_allowed_to_edit(null, true)) {
 
                 $userInfo = api_get_user_info($user_id);
-                $photo = '<img src="'.$userInfo['avatar_small'].'" alt="'.$userInfo['complete_name'].'" title="'.$userInfo['complete_name'].'" />';
+                $photo = Display::img($userInfo['avatar_small'], $userInfo['complete_name'], [], false);
 
                 $temp[] = $user_id;
                 $temp[] = $photo;