';
+
+ $sysdir_array = UserManager::get_user_picture_path_by_id($safe_user_id, 'system');
+ $sysdir = $sysdir_array['dir'];
+ $webdir_array = UserManager::get_user_picture_path_by_id($safe_user_id, 'web');
if (strlen(trim($user_object->picture_uri)) > 0) {
- $sysdir_array = UserManager::get_user_picture_path_by_id($safe_user_id, 'system');
- $sysdir = $sysdir_array['dir'];
- $webdir_array = UserManager::get_user_picture_path_by_id($safe_user_id, 'web');
$webdir = $webdir_array['dir'];
- $fullurl = $webdir.$user_object->picture_uri;
+ $fullurl = $webdir;
+ $fullurl .= api_get_configuration_value('gravatar_enabled') ?
+ $webdir_array['file'] :
+ $user_object->picture_uri;
$system_image_path = $sysdir.$user_object->picture_uri;
list($width, $height, $type, $attr) = @getimagesize($system_image_path);
$height += 30;
@@ -1016,7 +1025,9 @@ class SocialManager extends UserManager
//echo '
';
$html .= '
';
} else {
- $html .= Display::return_icon('unknown.jpg', get_lang('Unknown'));
+ $html .= api_get_configuration_value('gravatar_enabled') ?
+ '
' :
+ Display::return_icon('unknown.jpg', get_lang('Unknown'));
}
if (!empty($status)) {
$html .= ''.$status.'
';
@@ -1059,10 +1070,9 @@ class SocialManager extends UserManager
*/
public static function display_productions($user_id)
{
- $sysdir_array = UserManager::get_user_picture_path_by_id($user_id, 'system', true);
- $sysdir = $sysdir_array['dir'];
$webdir_array = UserManager::get_user_picture_path_by_id($user_id, 'web', true);
- $webdir = $webdir_array['dir'];
+ $sysdir = UserManager::getUserPathById($user_id, 'system');
+ $webdir = UserManager::getUserPathById($user_id, 'web');
if (!is_dir($sysdir)) {
mkdir($sysdir, api_get_permissions_for_new_directories(), true);
@@ -1190,9 +1200,8 @@ class SocialManager extends UserManager
$tbl_message_attach = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT);
// create directory
- $pathUserInfo = UserManager::get_user_picture_path_by_id($userId, 'system', true);
$social = '/social/';
- $pathMessageAttach = $pathUserInfo['dir'] . 'message_attachments'. $social;
+ $pathMessageAttach = UserManager::getUserPathById($userId, 'system').'message_attachments'.$social;
$safeFileComment = Database::escape_string($fileComment);
$safeFileName = Database::escape_string($fileAttach['name']);
@@ -1246,6 +1255,7 @@ class SocialManager extends UserManager
if (empty($start)) {
$start = '0000-00-00';
}
+
$tblMessage = Database::get_main_table(TABLE_MESSAGE);
$tblMessageAttachement = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT);
@@ -1254,10 +1264,10 @@ class SocialManager extends UserManager
$limit = intval($limit);
$sql = "SELECT id, user_sender_id,user_receiver_id, send_date, content, parent_id,
- (SELECT ma.path FROM $tblMessageAttachement ma WHERE ma.message_id = tm.id ) as path,
- (SELECT ma.filename FROM $tblMessageAttachement ma WHERE ma.message_id = tm.id ) as filename
- FROM $tblMessage tm
- WHERE user_receiver_id = $userId
+ (SELECT ma.path FROM $tblMessageAttachement ma WHERE ma.message_id = tm.id ) as path,
+ (SELECT ma.filename FROM $tblMessageAttachement ma WHERE ma.message_id = tm.id ) as filename
+ FROM $tblMessage tm
+ WHERE user_receiver_id = $userId
AND send_date > '$start' ";
$sql .= (empty($messageStatus) || is_null($messageStatus)) ? '' : " AND msg_status = '$messageStatus' ";
$sql .= (empty($parentId) || is_null($parentId)) ? '' : " AND parent_id = '$parentId' ";
@@ -1426,9 +1436,13 @@ class SocialManager extends UserManager
$wallImage = '';
if (!empty($message['path'])) {
$pathUserInfo = UserManager::get_user_picture_path_by_id($authorId, 'web', true);
- $pathImg = $pathUserInfo['dir'] . 'message_attachments';
- $imageBig = $pathImg .self::getImagePath($message['path'], IMAGE_WALL_BIG);
- $imageSmall = $pathImg. self::getImagePath($message['path'], IMAGE_WALL_SMALL);
+ $imageBig = $pathUserInfo['file'];
+ $imageSmall = $pathUserInfo['file'];
+ if (!api_get_configuration_value('gravatar_enabled')) {
+ $pathImg = UserManager::getUserPathById($authorId, 'web').'message_attachments';
+ $imageBig = $pathImg .self::getImagePath($message['path'], IMAGE_WALL_BIG);
+ $imageSmall = $pathImg. self::getImagePath($message['path'], IMAGE_WALL_SMALL);
+ }
$wallImage = '
';
}
diff --git a/main/inc/lib/svg-edit/extensions/imagelib/users.php b/main/inc/lib/svg-edit/extensions/imagelib/users.php
index 38b4e4b235..74e633b3d6 100755
--- a/main/inc/lib/svg-edit/extensions/imagelib/users.php
+++ b/main/inc/lib/svg-edit/extensions/imagelib/users.php
@@ -10,11 +10,9 @@ require_once '../../../../../inc/global.inc.php';
api_protect_course_script();
api_block_anonymous_users();
-$my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'system');
-$user_disk_path = $my_path['dir'].'my_files/';
-
-$my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'web');
-$user_web_path = $my_path['dir'].'my_files/';
+$userId = api_get_user_id();
+$user_disk_path = UserManager::getUserPathById($userId, 'system').'my_files/';
+$user_web_path = UserManager::getUserPathById($userId, 'web').'my_files/';
//get all files and folders
$scan_files = scandir($user_disk_path);
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 72691c2dfe..0241e2470f 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -1234,10 +1234,10 @@ class UserManager
default: // Base: empty, the result path below will be relative.
$base = '';
}
-
+ $gravatarEnabled = api_get_configuration_value('gravatar_enabled');
$noPicturePath = array('dir' => $base.'img/', 'file' => 'unknown.jpg');
- if (empty($id) || empty($type)) {
+ if ((empty($id) || empty($type)) && !$gravatarEnabled) {
return $anonymous ? $noPicturePath : array('dir' => '', 'file' => '');
}
@@ -1247,7 +1247,7 @@ class UserManager
$sql = "SELECT email, picture_uri FROM $user_table WHERE user_id=".$user_id;
$res = Database::query($sql);
- if (!Database::num_rows($res)) {
+ if (!Database::num_rows($res) && !$gravatarEnabled) {
return $anonymous ? $noPicturePath : array('dir' => '', 'file' => '');
}
@@ -1265,27 +1265,23 @@ class UserManager
$dir = $base.$userPath;
}
- if (empty($picture_filename) ||
- (!empty($picture_filename) && !file_exists($systemImagePath.$picture_filename))
- ) {
- if ($anonymous) {
- return $noPicturePath;
- }
+ if ($gravatarEnabled) {
+ $avatarSize = api_getimagesize($noPicturePath['dir'].$noPicturePath['file']);
+ $avatarSize = $avatarSize['width'] > $avatarSize['height'] ?
+ $avatarSize['width'] :
+ $avatarSize['height'];
+ return array(
+ 'dir' => '',
+ 'file' => self::getGravatar(
+ $user['email'],
+ $avatarSize,
+ api_get_configuration_value('gravatar_type')
+ )
+ );
+ }
- if (api_get_configuration_value('gravatar_enabled')) {
- $avatarSize = api_getimagesize($noPicturePath['dir'].$noPicturePath['file']);
- $avatarSize = $avatarSize['width'] > $avatarSize['height'] ?
- $avatarSize['width'] :
- $avatarSize['height'];
- return array(
- 'dir' => '',
- 'file' => self::getGravatar(
- $user['email'],
- $avatarSize,
- api_get_configuration_value('gravatar_type')
- )
- );
- }
+ if (empty($picture_filename) && $anonymous) {
+ return $noPicturePath;
}
return array('dir' => $dir, 'file' => $picture_filename);
@@ -3247,6 +3243,7 @@ class UserManager
*/
public static function get_picture_user($user_id, $picture_file, $height, $size_picture = USER_IMAGE_SIZE_MEDIUM, $style = '')
{
+ $gravatarEnabled = api_get_configuration_value('gravatar_enabled');
$picture = array();
$picture['style'] = $style;
if ($picture_file == 'unknown.jpg') {
@@ -3261,7 +3258,9 @@ class UserManager
break;
}
$picture['file'] = api_get_path(WEB_CODE_PATH).'img/'.$picture_file;
- return $picture;
+ if (!$gravatarEnabled) {
+ return $picture;
+ }
}
switch ($size_picture) {
@@ -3319,6 +3318,9 @@ class UserManager
}
}
}
+ if ($gravatarEnabled) {
+ $picture['file'] = $image_array['file'];
+ }
return $picture;
}
@@ -5285,4 +5287,37 @@ EOF;
}
return $url;
}
+
+ /**
+ * Get user path from user ID (returns an array).
+ * The return format is a complete path, enabling recovery of the directory
+ * with dirname(). This also works for the functions dealing with the
+ * user's productions, as they are located in the same directory.
+ * @param integer User ID
+ * @param string Optional. Type of path to return (can be 'system', 'rel', 'web')
+ * @return string User path
+ */
+ public static function getUserPathById($id, $type = null)
+ {
+ $user_id = intval($id);
+ if (!$user_id) {
+ return null;
+ }
+ $userPath = "upload/users/$user_id/";
+ if (api_get_setting('split_users_upload_directory') === 'true') {
+ $userPath = 'upload/users/'.substr((string) $user_id, 0, 1).'/'.$user_id.'/';
+ }
+ switch ($type) {
+ case 'system': // Base: absolute system path.
+ $userPath = api_get_path(SYS_CODE_PATH).$userPath;
+ break;
+ case 'rel': // Base: semi-absolute web path (no server base).
+ $userPath = api_get_path(REL_CODE_PATH).$userPath;
+ break;
+ case 'web': // Base: absolute web path.
+ $userPath = api_get_path(WEB_CODE_PATH).$userPath;
+ break;
+ }
+ return $userPath;
+ }
}
diff --git a/main/messages/download.php b/main/messages/download.php
index b3b60933f0..f77f28fc72 100755
--- a/main/messages/download.php
+++ b/main/messages/download.php
@@ -78,7 +78,7 @@ if ($not_allowed_to_edit) {
if (!empty($row_users['group_id'])) {
$path_user_info = GroupPortalManager::get_group_picture_path_by_id($row_users['group_id'], 'system', true);
} else {
- $path_user_info = UserManager::get_user_picture_path_by_id($message_uid, 'system', true);
+ $path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
}
$full_file_name = $path_user_info['dir'].'message_attachments/'.$file_url;
diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php
index 9c25bb066b..6a577fd526 100755
--- a/main/mySpace/myStudents.php
+++ b/main/mySpace/myStudents.php
@@ -461,6 +461,7 @@ if (!empty($student_id)) {
echo '
';
echo '';
+ $gravatarEnabled = api_get_configuration_value('gravatar_enabled');
$image_array = UserManager :: get_user_picture_path_by_id($user_info['user_id'], 'web', false, true);
echo '';
@@ -470,8 +471,13 @@ if (!empty($student_id)) {
$big_image_size = api_getimagesize($big_image);
$big_image_width = $big_image_size['width'];
$big_image_height = $big_image_size['height'];
- $url_big_image = $big_image . '?rnd=' . time();
- $img_attributes = 'src="' . $image_file . '?rand=' . time() . '" ' .
+ $url_big_image = $image_file;
+ if (!$gravatarEnabled) {
+ $url_big_image = $big_image.'?rnd=' . time();
+ $image_file .= '?rnd=' . time();
+ }
+
+ $img_attributes = 'src="' . $image_file . '" ' .
'alt="' . $user_info['complete_name']. '" ' .
'style="float:' . ($text_dir == 'rtl' ? 'right' : 'left') . '; padding:5px;" ';
diff --git a/main/user/userInfo.php b/main/user/userInfo.php
index d2e5c9edaf..e6f65974b5 100755
--- a/main/user/userInfo.php
+++ b/main/user/userInfo.php
@@ -338,7 +338,10 @@ elseif ($displayMode == "viewContentEdit") {
$big_image_size = api_getimagesize($big_image);
$big_image_width= $big_image_size['width'];
$big_image_height= $big_image_size['height'];
- $url_big_image = $big_image.'?rnd='.time();
+ $url_big_image = $image_array['file'];
+ if (!api_get_configuration_value('gravatar_enabled')) {
+ $url_big_image = $big_image.'?rnd='.time();
+ }
if ($image_array['file']=='unknown.jpg') {
echo ' ';
@@ -428,8 +431,10 @@ elseif ($displayMode == "viewContentEdit") {
$big_image_size = api_getimagesize($big_image);
$big_image_width= $big_image_size['width'];
$big_image_height= $big_image_size['height'];
- $url_big_image = $big_image.'?rnd='.time();
-
+ $url_big_image = $image_array['file'];
+ if (!api_get_configuration_value('gravatar_enabled')) {
+ $url_big_image = $big_image.'?rnd='.time();
+ }
if ($image_array['file']=='unknown.jpg') {
echo '';
} else {
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 402d094e62..32b428eeea 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -1853,23 +1853,25 @@ class Wiki
$all_students_pages = array();
//data about teacher
- $userinfo = api_get_user_info(api_get_user_id());
+ $userId = api_get_user_id();
+ $userinfo = api_get_user_info($userId);
$username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username'], ENT_QUOTES));
$name = $userinfo['complete_name']." - ".$username;
- if (api_get_user_id()<>0) {
- $image_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'web',false, true);
+
+ $photo= '. "'.$name.'") ';
+
+ if ($userId) {
+ $image_path = UserManager::get_user_picture_path_by_id($userId, 'web', false, true);
$image_repository = $image_path['dir'];
$existing_image = $image_path['file'];
- $photo= ' ';
- } else {
- $photo= '';
+ $photo = ' ';
}
//teacher assignment title
$title_orig = $values['title'];
//teacher assignment reflink
- $link2teacher = $values['title'] = $title_orig."_uass".api_get_user_id();
+ $link2teacher = $values['title'] = $title_orig."_uass".$userId;
//first: teacher name, photo, and assignment description (original content)
// $content_orig_A=''.$photo.'
'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'
('.get_lang('Teacher').')
';
@@ -1883,7 +1885,7 @@ class Wiki
//Second: student list (names, photo and links to their works).
//Third: Create Students work pages.
foreach ($a_users_to_add as $o_user_to_add) {
- if ($o_user_to_add['user_id'] != api_get_user_id()) {
+ if ($o_user_to_add['user_id'] != $userId) {
//except that puts the task
$assig_user_id = $o_user_to_add['user_id']; //identifies each page as created by the student, not by teacher
$image_path = UserManager::get_user_picture_path_by_id($assig_user_id,'web',false, true);
@@ -1933,7 +1935,7 @@ class Wiki
}
foreach ($a_users_to_add as $o_user_to_add) {
- if ($o_user_to_add['user_id'] == api_get_user_id()) {
+ if ($o_user_to_add['user_id'] == $userId) {
$assig_user_id=$o_user_to_add['user_id'];
if ($assignment_type == 1) {
$values['title']= $title_orig;
@@ -3183,7 +3185,7 @@ class Wiki
$sql="SELECT * FROM $tbl_wiki_discuss reviews, $user_table user
WHERE reviews.c_id = $course_id AND reviews.publication_id='".$id."' AND user.user_id='".$firstuserid."'
- ORDER BY id DESC";
+ ORDER BY reviews.id DESC";
$result=Database::query($sql) or die(Database::error());
$countWPost = Database::num_rows($result);
@@ -3229,13 +3231,14 @@ class Wiki
$user_id = $row['userc_id'];
$name = $userinfo['complete_name'];
- if ($user_id<>0) {
+
+ $author_photo= ' ';
+
+ if ($user_id) {
$image_path = UserManager::get_user_picture_path_by_id($user_id,'web',false, true);
$image_repository = $image_path['dir'];
$existing_image = $image_path['file'];
$author_photo= ' ';
- } else {
- $author_photo= ' ';
}
//stars
diff --git a/src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php b/src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php
index ec03cad18a..29fc311908 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php
@@ -18,9 +18,9 @@ class PersonalDriver extends Driver implements DriverInterface
public function setup()
{
$userId = api_get_user_id();
- $path = \UserManager::get_user_picture_path_by_id($userId, 'none');
- if (!empty($path['dir'])) {
- $dir = api_get_path(SYS_CODE_PATH) . $path['dir'];
+ $path = \UserManager::getUserPathById($userId);
+ if (!empty($path)) {
+ $dir = api_get_path(SYS_CODE_PATH) . $path;
if (!is_dir($dir)) {
mkdir($dir);
@@ -44,21 +44,15 @@ class PersonalDriver extends Driver implements DriverInterface
if (!empty($userId)) {
// Adding user personal files
- $dir = \UserManager::get_user_picture_path_by_id(
- $userId,
- 'system'
- );
+ $dir = \UserManager::getUserPathById($userId, 'system');
- $dirWeb = \UserManager::get_user_picture_path_by_id(
- $userId,
- 'web'
- );
+ $dirWeb = \UserManager::getUserPathById($userId, 'web');
$driver = array(
'driver' => 'PersonalDriver',
'alias' => get_lang('MyFiles'),
- 'path' => $dir['dir'] . 'my_files',
- 'URL' => $dirWeb['dir'] . 'my_files',
+ 'path' => $dir.'my_files',
+ 'URL' => $dirWeb.'my_files',
'accessControl' => array($this, 'access')
);
|