From 69288159d3ecdbbaed6fa3dfdccce529a7b4d711 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Sun, 1 Feb 2009 17:18:02 +0100 Subject: [PATCH] [svn r18118] FS#2867 - FCKEditor: Platform administrators outside courses will use .../dokeos/home/default_platform_document/ repository. --- .../filemanager/browser/default/connectors/php/io.php | 3 --- .../editor/plugins/ImageManager/config.inc.php | 4 ++-- .../fckeditor/editor/plugins/ImageManager/manager.php | 2 ++ main/inc/lib/formvalidator/Element/html_editor.php | 10 +++++----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/filemanager/browser/default/connectors/php/io.php b/main/inc/lib/fckeditor/editor/filemanager/browser/default/connectors/php/io.php index c6822d3ff0..df34066d26 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/browser/default/connectors/php/io.php +++ b/main/inc/lib/fckeditor/editor/filemanager/browser/default/connectors/php/io.php @@ -64,10 +64,7 @@ function GetResourceTypeDirectory( $resourceType, $sCommand ) */ function GetUrlFromPath( $resourceType, $folderPath, $sCommand ) { - global $currentCourseRepositoryWeb; - //return CombinePaths( GetResourceTypePath( $resourceType, $sCommand ), $folderPath ) ; $resourceType =strtolower($resourceType); - //return $GLOBALS["UserFilesPath"] . $resourceType . $folderPath ; return $resourceType . $folderPath; } diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php index 8e6cf3a053..be881e5772 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php +++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php @@ -63,8 +63,8 @@ else if (api_is_platform_admin() && $_SESSION['this_section'] == 'platform_admin') { // 3. Platform administration activities. - $IMConfig['base_dir'] = $_configuration['root_sys'].'main/default_course_document/'; - $IMConfig['base_url'] = $_configuration['root_web'].'main/default_course_document/'; + $IMConfig['base_dir'] = $_configuration['root_sys'].'home/default_platform_document/'; + $IMConfig['base_url'] = $_configuration['root_web'].'home/default_platform_document/'; } else { diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php index cdedc57c4c..fa9b6fcc39 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php +++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php @@ -12,11 +12,13 @@ $manager = new ImageManager($IMConfig); $dirs = $manager->getDirs(); $var = explode('/',$_GET['base_url_alt']); + /* // if the base_url_alt parameter there is a default_course_document we change the allow upload parameter if (($var[count($var)-2] == 'default_course_document') && !api_is_platform_admin()) { $IMConfig['allow_upload']=false; } + */ ?> diff --git a/main/inc/lib/formvalidator/Element/html_editor.php b/main/inc/lib/formvalidator/Element/html_editor.php index 516dd693e6..a4910de23e 100644 --- a/main/inc/lib/formvalidator/Element/html_editor.php +++ b/main/inc/lib/formvalidator/Element/html_editor.php @@ -1,5 +1,5 @@ fck_editor->Config['CreateDocumentWebDir'])) { - $this -> fck_editor->Config['CreateDocumentWebDir'] = api_get_path(WEB_PATH).'main/default_course_document/'; + $this -> fck_editor->Config['CreateDocumentWebDir'] = api_get_path(WEB_PATH).'home/default_platform_document/'; } if (is_null($this -> fck_editor->Config['CreateDocumentDir'])) { - $this -> fck_editor->Config['CreateDocumentDir'] = api_get_path(WEB_PATH).'main/default_course_document/'; // This works, but it should be revised again. + $this -> fck_editor->Config['CreateDocumentDir'] = api_get_path(WEB_PATH).'home/default_platform_document/'; // A side-effect is in use here. } if (empty($this -> fck_editor->Config['BaseHref'])) { - $this -> fck_editor->Config['BaseHref'] = api_get_path(WEB_PATH).'main/default_course_document/'; + $this -> fck_editor->Config['BaseHref'] = api_get_path(WEB_PATH).'home/default_platform_document/'; } if (!$use_advanced_filemanager) { - $upload_path = api_get_path(REL_PATH).'main/default_course_document/'; + $upload_path = api_get_path(REL_PATH).'home/default_platform_document/'; } } else