Changing paths in the fckeditor ajaxmanager to deal with the new data folder changes. See: #5871

.htaccess

@@ -19,6 +19,9 @@
     # courses/MATHS/document/folder1/picture.jpg --> courses/MATHS/document/?file=folder1/picture.jpg
     RewriteRule ^courses/(.*)/document/(.*)$ web/courses/$1/document/?file=$2 [R,L]
 
+    # Portal default_platform_document files
+    RewriteRule ^data/default_platform_document/(.*)$ web/data/default_platform_document/?file=$1 [R,L]
+
     # Certificates
     # certificates/index.php?id=123 --> web/certificates/123
     RewriteCond %{QUERY_STRING} ^id=([0-9]*)

main/inc/global.inc.php

@@ -1099,7 +1099,7 @@ $userAccessPermissions = function (Request $request) use ($app) {
  * src/ChamiloLMS/Controller/LegacyController.php
  */
 
-// @todo put routes somewhere else yml file.
+// @todo put routes somewhere else, in a yml/php file .
 
 $app->get('/', 'legacy.controller:classicAction')
     ->before($courseAccessConditions)
@@ -1126,8 +1126,6 @@ $app->get('/userportal/{type}/{filter}/{page}', 'userPortal.controller:indexActi
 $app->get('/logout', 'index.controller:logoutAction')
     ->bind('logout');
 
-
-
 // Course home instead of courses/MATHS the new URL is web/courses/MATHS
 $app->match('/courses/{courseCode}/{sessionId}/', 'course_home.controller:indexAction', 'GET|POST')
     ->assert('sessionId', '\d+')
@@ -1165,8 +1163,9 @@ $app->match('/learnpath/subscribe_users/{lpId}', 'learnpath.controller:indexActi
     ->bind('subscribe_users');
 
 // Data document_templates
-$app->get('/data/document_templates/{file}', 'index.controller:dumpDataAction')
+$app->get('/data/document_templates/{file}', 'index.controller:getDocumentTemplateAction')
     ->bind('data');
-//var_dump($app['url_generator']->generate('index'));
 
+$app->get('/data/default_platform_document/', 'index.controller:getDefaultPlatformDocumentAction')
+    ->assert('type', '.+');
 return $app;

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_get_folder_listing.php

@@ -1,13 +1,10 @@
 <?php
-	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+
+require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php";
 echo '{';
 $count = 1;
-	foreach(getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v)
+foreach (getFolderListing(CONFIG_SYS_ROOT_PATH) as $k=>$v) {
-	{
-		
-
     echo (($count > 1)?', ':''). "'" . $v . "':'" . $k . "'";
     $count++;
 }
 echo "}";
-?>

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_text_editor.php

@@ -62,8 +62,7 @@
 				var currentName = '<?php echo basename($path); ?>';
 
 		jQuery(document).ready(
-		function()
+		function() {
-		{
 				editAreaLoader.init({
 				id: "content"	// id of the textarea to transform
 				,start_highlight: false	// if start with highlight
@@ -80,10 +79,6 @@
 				jQuery('#windowProcessing').jqm({modal:true});
 		}
 	);
-
-		
-
-			
 </script>
 
 <link href="theme/<?php echo CONFIG_THEME_NAME; ?>/css/ajaxtexteditor.css" type="text/css" rel="stylesheet" />

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

@@ -10,12 +10,14 @@
 * @since 31/December/2008
 */
 
-include '../../../../../../inc/global.inc.php'; // Integrating with Chamilo
+// Integrating with Chamilo
+require_once '../../../../../../inc/global.inc.php';
+
 api_block_anonymous_users();// from Chamilo
 
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php";
-
 require_once CLASS_SESSION_ACTION;
+
 $sessionAction = new SessionAction();
 
 if (CONFIG_LOAD_DOC_LATTER) {

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php

@@ -71,15 +71,15 @@ class manager
         if (defined('CONFIG_SYS_FOLDER_SHOWN_ON_TOP')) {
             $this->forceFolderOnTop = CONFIG_SYS_FOLDER_SHOWN_ON_TOP;
         }
-
         if (!is_null($path)) {
             $this->currentFolderPath = $path;
         } elseif (isset($_GET[$this->folderPathIndex]) && file_exists(base64_decode($_GET[$this->folderPathIndex])) && !is_file(base64_decode($_GET[$this->folderPathIndex]))) {
             $this->currentFolderPath = api_htmlentities(Security::remove_XSS($_GET[$this->folderPathIndex]));
+
         } elseif (isset($_SESSION[$this->lastVisitedFolderPathIndex]) && file_exists($_SESSION[$this->lastVisitedFolderPathIndex]) && !is_file($_SESSION[$this->lastVisitedFolderPathIndex])) {
             $this->currentFolderPath = $_SESSION[$this->lastVisitedFolderPathIndex];
         } else {
-            $this->currentFolderPath = CONFIG_SYS_DEFAULT_PATH;
+            $this->currentFolderPath = base64_encode(CONFIG_SYS_DEFAULT_PATH);
         }
 
         $this->currentFolderPath = (isUnderRoot($this->getCurrentFolderPath()) ? backslashToSlash((addTrailingSlash($this->getCurrentFolderPath()))) : CONFIG_SYS_DEFAULT_PATH);

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.upload.php

@@ -48,7 +48,6 @@ class Upload
 
     function isFileUploaded($indexInPost = "file")
     {
-
         $this->errCode = isset($_FILES[$indexInPost]['error']) ? $_FILES[$indexInPost]['error'] : 999;
         if ((isset($_FILES[$indexInPost]['error']) && $_FILES[$indexInPost] == 0) ||
             (!empty($_FILES[$indexInPost]['tmp_name']) && $_FILES[$indexInPost]['tmp_name'] != 'none')
@@ -210,14 +209,11 @@ class Upload
                 $fileName = $this->fileBaseName.'_'.$counter.$this->fileExtension;
             }
             $this->fileBaseName .= "_".$counter;
-
         }
-
         if (@move_uploaded_file($this->_value['tmp_name'], $dest.$fileName)) {
             @chmod($dest.$fileName, $this->uploadFileMode);
             $this->fileName = $fileName;
             $this->filePath = $dest.$fileName;
-
             return true;
         } else {
             return false;

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

@@ -75,25 +75,26 @@ these two paths accept relative path only, don't use absolute path
 
 // Integration for Chamilo
 
-if(!empty($_course['path']) && !isset($_GET['editor']) && isset($_GET['editor']) && $_GET['editor'] != 'stand_alone') {
+//if(!empty($_course['path']) && isset($_GET['editor']) && $_GET['editor'] != 'stand_alone') {
+if (isset($_course['path']) && !empty($_course['path'])) {
 	if (!empty($group_properties['directory'])) {
-		$PathChamiloAjaxFileManager='../../../../../../../courses/'.$_course['path'].'/document'.$group_properties['directory'].'/';
+		$PathChamiloAjaxFileManager='../../../../../../../data/courses/'.$_course['path'].'/document'.$group_properties['directory'].'/';
 	} else {
 		if(api_is_allowed_to_edit()) {
-			$PathChamiloAjaxFileManager='../../../../../../../courses/'.$_course['path'].'/document/';
+			$PathChamiloAjaxFileManager='../../../../../../../data/courses/'.$_course['path'].'/document/';
 		} else {
 			$current_session_id = api_get_session_id();
 			if ($current_session_id==0) {
-				$PathChamiloAjaxFileManager='../../../../../../../courses/'.$_course['path'].'/document/shared_folder/sf_user_'.api_get_user_id().'/';
+				$PathChamiloAjaxFileManager = '../../../../../../../data/courses/'.$_course['path'].'/document/shared_folder/sf_user_'.api_get_user_id().'/';
 			} else {
-				$PathChamiloAjaxFileManager='../../../../../../../courses/'.$_course['path'].'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/';
+				$PathChamiloAjaxFileManager = '../../../../../../../data/courses/'.$_course['path'].'/document/shared_folder_session_'.$current_session_id.'/sf_user_'.api_get_user_id().'/';
 			}
 		}
 	}
 } else {
 	if (api_is_platform_admin() && isset($_SESSION['this_section']) && $_SESSION['this_section']=='platform_admin') {
 		//home page portal
-		$PathChamiloAjaxFileManager='../../../../../../../home/default_platform_document/';
+		$PathChamiloAjaxFileManager = '../../../../../../../data/default_platform_document/';
 	} else {
 		//my profile
 		$my_path					= UserManager::get_user_picture_path_by_id(api_get_user_id(),'none');
@@ -113,8 +114,6 @@ define('CONFIG_SYS_ROOT_PATH',		$PathChamiloAjaxFileManager);
 
 // end chamilo
 
-
-
 define('CONFIG_SYS_FOLDER_SHOWN_ON_TOP', true); //show your folders on the top of list if true or order by name
 define("CONFIG_SYS_DIR_SESSION_PATH", session_save_path()); // Hack by Juan Carlos Raña
 define("CONFIG_SYS_PATTERN_FORMAT", 'list'); //three options: reg ,csv, list, this option define the parttern format for the following patterns
@@ -209,7 +208,6 @@ define('CONFIG_DEFAULT_VIEW', (CONFIG_SYS_THUMBNAIL_VIEW_ENABLE?'thumbnail':'det
 define('CONFIG_DEFAULT_PAGINATION_LIMIT', 10000); //change 10 by 10000 while pagination is deactivated on Chamilo
 define('CONFIG_LOAD_DOC_LATTER', false); //all documents will be loaded up after the template has been loaded to the client
 
-
 //General Option Declarations
 
 //LANGAUGAE DECLARATIONNS

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

@@ -71,16 +71,17 @@ require_once dirname(__FILE__).DIRECTORY_SEPARATOR.$configBaseFileName;
 
 
 // Loading the selected language file.
-require_once DIR_AJAX_LANGS.CONFIG_LANG_DEFAULT.".php";
+//This fires a lots of notices because you can't redefine PHP constants
 
+/*require_once DIR_AJAX_LANGS.CONFIG_LANG_DEFAULT.".php";
 // In order the manager not to look ugly in cases of incompleted translations,
 // we will initialize undefined language constants with English strings.
 if (CONFIG_LANG_DEFAULT != "en") {
     require_once(DIR_AJAX_LANGS."en.php");
-}
+}*/
 
+require_once DIR_AJAX_LANGS."en.php";
 require_once DIR_AJAX_INC."function.base.php";
-
 require_once dirname(__FILE__).DIRECTORY_SEPARATOR."class.session.php";
 
 $auth = new Auth();

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

@@ -274,8 +274,8 @@ function getParentPath($value) {
  * @return  boolean
  */
 function isUnderRoot($value) {
-    $roorPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH))));
+    $rootPath = strtolower(addTrailingSlash(backslashToSlash(getRealPath(CONFIG_SYS_ROOT_PATH))));
-    if (file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $roorPath) === 0) {
+    if (file_exists($value) && @strpos(strtolower(addTrailingSlash(backslashToSlash(getRealPath($value)))), $rootPath) === 0) {
         return true;
     }
     return false;
@@ -422,21 +422,21 @@ function getFileUrl($value) {
 
     $urlprefix = "";
     $urlsuffix = "";
-
     $value = backslashToSlash(getRealPath($value));
-
-
     $pos = stripos($value, $wwwroot);
     if ($pos !== false && $pos == 0) {
         $output = $urlprefix.substr($value, strlen($wwwroot)).$urlsuffix;
     } else {
         $output = $value;
     }
-
     $protocol = "http://";
     if (isset($_SERVER['HTTPS'])) {
         $protocol = "https://";
     }
+
+    //Removing /data folder in order to work like usual
+    $output = str_replace('/data/courses', '/courses', $output);
+    //$output = str_replace('/data/default_platform_document', '/default_platform_document', $output);
     return $protocol.addTrailingSlash(backslashToSlash($_SERVER['HTTP_HOST'])).removeBeginingSlash(backslashToSlash($output));
 }
 

main/inc/lib/fckeditor/repository.php

@@ -41,15 +41,6 @@ if (!file_exists($user_folder)) {
     @mkdir($user_folder, $permissions_for_new_directories, true);
 }
 
-// Creation of repository used by paltform administrators if it does not exist.
-if (api_is_platform_admin()) {
-    $homepage_folder = api_get_path(SYS_PATH).'home/default_platform_document/';
-    if (!file_exists($homepage_folder)) {
-        @mkdir($homepage_folder, $permissions_for_new_directories);
-    }
-}
-
-
 // Create course shared folders
 if (api_is_in_course()) {
     $course_dir = $_course['path'].'/document';

src/ChamiloLMS/Controller/IndexController.php

@@ -275,7 +275,12 @@ class IndexController extends CommonController
         return $html;
     }
 
-    public function dumpDataAction(Application $app)
+    /**
+     *
+     * @param Application $app
+     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse|void
+     */
+    public function getDocumentTemplateAction(Application $app)
     {
         try {
             $file = $app['request']->get('file');
@@ -286,7 +291,8 @@ class IndexController extends CommonController
         }
     }
 
-    public function getDocumentAction(Application $app, $courseCode) {
+    public function getDocumentAction(Application $app, $courseCode)
+    {
         try {
             $filePath = $app['request']->get('file');
             $file = $app['chamilo.filesystem']->getCourseDocument($courseCode, $filePath);
@@ -296,6 +302,17 @@ class IndexController extends CommonController
         }
     }
 
+    public function getDefaultPlatformDocumentAction(Application $app)
+    {
+        try {
+            $file = $app['request']->get('file');
+            $file = $app['chamilo.filesystem']->get('default_platform_document/'.$file);
+            return $app->sendFile($file->getPathname());
+        } catch (\InvalidArgumentException $e) {
+            return $app->abort(404, 'No file found');
+        }
+    }
+
     /**
      * Reacts on a failed login:
      * Displays an explanation with a link to the registration form.

whoisonline.php

@@ -169,7 +169,8 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
     exit;
 }
 
-$tpl = new Template(get_lang('UsersOnLineList'));
+$app['title'] = get_lang('UsersOnLineList');
+$tpl = $app['template'];
 
 if (api_get_setting('allow_social_tool') == 'true' && !api_is_anonymous()) {
     $tpl->set_help('Groups');