Fixed problem with split users directories (fixes #2239)

main/document/document.php

@@ -411,7 +411,9 @@ if (!empty($_SESSION['_gid'])) {
 if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_setting('users_copy_files') == 'true' && api_get_user_id() != 0) {
 
     $clean_get_id = Security::remove_XSS($_GET['id']);
-    $user_folder  = api_get_path(SYS_CODE_PATH).'upload/users/'.api_get_user_id().'/my_files/';
+    $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'system');
+    $user_folder  = $my_path['dir'].'my_files/';
+    $my_path = null;
         if (!file_exists($user_folder)) {
             @mkdir($user_folder, $permissions_for_new_directories, true);
         }

main/inc/course_document.inc.php

@@ -73,8 +73,10 @@ if (api_is_in_course()) {
 		$http_www = $_configuration['root_web'].'home/default_platform_document/';
 	} else {
 		// 4. The user is outside courses.
-		$base_work_dir = $_configuration['root_sys'].'main/upload/users/'.api_get_user_id().'/my_files/';
-		$http_www = $_configuration['root_web'].'main/upload/users/'.api_get_user_id().'/my_files/';
+        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'system');
+		$base_work_dir = $my_path['dir'].'my_files/';
+        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'web');
+		$http_www = $my_path['dir'].'my_files/';
 	}
 }
 

main/inc/lib/fckeditor/editor/filemanager/connectors/php/config.php

@@ -71,7 +71,8 @@ if (api_is_in_course()) {
 		$Config['UserFilesPath'] = api_get_path(REL_PATH).'home/default_platform_document/';
 	} else {
 		// 4. The user is outside courses.
-		$Config['UserFilesPath'] = api_get_path(REL_PATH).'main/upload/users/'.api_get_user_id().'/my_files/';
+        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'rel');
+		$Config['UserFilesPath'] = $my_path['dir'].'my_files/';
 	}
 }
 

main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php

@@ -78,8 +78,10 @@ else
 	else
 	{
 		// 4. The user is outside courses.
-		$IMConfig['base_dir'] = $_configuration['root_sys'].'main/upload/users/'.api_get_user_id().'/my_files/';
-		$IMConfig['base_url'] = $_configuration['root_web'].'main/upload/users/'.api_get_user_id().'/my_files/';
+        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'system');
+		$IMConfig['base_dir'] = $my_path['dir'].'my_files/';
+        $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'web');
+		$IMConfig['base_url'] = $my_path['dir'].'my_files/';
 	}
 }
 

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php

@@ -123,7 +123,8 @@
 		else
 		{
 			//my profile
-			$PathChamiloAjaxFileManager='../../../../../../../main/upload/users/'.api_get_user_id().'/my_files/';
+            $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'none');
+			$PathChamiloAjaxFileManager='../../../../../../../main/'.$my_path['dir'].'my_files/';
 		}
 
 	}

main/inc/lib/fckeditor/fckeditor.php

@@ -521,8 +521,10 @@ class FCKeditor
                 $config['BaseHref'] = api_get_path(WEB_PATH).'home/default_platform_document/';
             } else {
                 // 4. The user is outside courses.
-                $config['CreateDocumentWebDir'] = api_get_path(WEB_PATH).'main/upload/users/'.api_get_user_id().'/my_files/';
-                $config['CreateDocumentDir'] = $relative_path_prefix.'upload/users/'.api_get_user_id().'/my_files/';
+                $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'system');
+                $config['CreateDocumentWebDir'] = $my_path['dir'].'my_files/';
+                $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'rel');
+                $config['CreateDocumentDir'] = $my_path['dir'].'my_files/';
                 $config['BaseHref'] = $script_path;
             }
         }

main/inc/lib/fckeditor/repository.php

@@ -34,7 +34,8 @@ if (!empty($_course['path'])) {
 	$is_user_in_group = GroupManager::is_user_in_group($_user['user_id'],$_SESSION['_gid']);
 }
 
-$user_folder = api_get_path(SYS_PATH).'main/upload/users/'.api_get_user_id().'/my_files/';
+$my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'system');
+$user_folder = $my_path['dir'].'my_files/';
 
 // Sanity checks for Chamilo.
 

main/inc/lib/usermanager.lib.php

@@ -762,9 +762,9 @@ class UserManager
 		$picture_filename = trim($user['picture_uri']);
 
 		if (api_get_setting('split_users_upload_directory') === 'true') {
-			if (!empty($picture_filename)) {
-				$dir = $base.'upload/users/'.substr($picture_filename, 0, 1).'/'.$user_id.'/';
-			} elseif ($preview) {
+			if (!empty($picture_filename) or $preview) {
+//				$dir = $base.'upload/users/'.substr($picture_filename, 0, 1).'/'.$user_id.'/';
+//			} elseif ($preview) {
 				$dir = $base.'upload/users/'.substr((string)$user_id, 0, 1).'/'.$user_id.'/';
 			} else {
 				$dir = $base.'upload/users/'.$user_id.'/';