diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index d31f3179fdb..ec57ec9fefb 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -272,6 +272,7 @@ class Conf $this->ldap->enabled=defined("MAIN_MODULE_LDAP")?MAIN_MODULE_LDAP:0; // Module FCKeditor $this->fckeditor->enabled=defined("MAIN_MODULE_FCKEDITOR")?MAIN_MODULE_FCKEDITOR:0; + $this->fckeditor->dir_images=DOL_DATA_ROOT."/fckeditor/images"; /* diff --git a/htdocs/includes/fckeditor/editor/filemanager/browser/default/connectors/php/config.php b/htdocs/includes/fckeditor/editor/filemanager/browser/default/connectors/php/config.php index fa82259d7b3..a0ca126c47f 100644 --- a/htdocs/includes/fckeditor/editor/filemanager/browser/default/connectors/php/config.php +++ b/htdocs/includes/fckeditor/editor/filemanager/browser/default/connectors/php/config.php @@ -18,19 +18,19 @@ * Frederico Caldeira Knabben (fredck@fckeditor.net) */ -global $Config ; +global $Config, $conf ; // SECURITY: You must explicitelly enable this "connector". (Set it to "true"). -$Config['Enabled'] = false ; +$Config['Enabled'] = true ; // Path to user files relative to the document root. -$Config['UserFilesPath'] = '/UserFiles/' ; +$Config['UserFilesPath'] = '/images/' ; // Fill the following value it you prefer to specify the absolute path for the // user files directory. Usefull if you are using a virtual directory, symbolic // link or alias. Examples: 'C:\\MySite\\UserFiles\\' or '/root/mysite/UserFiles/'. // Attention: The above 'UserFilesPath' must point to the same directory. -$Config['UserFilesAbsolutePath'] = '' ; +$Config['UserFilesAbsolutePath'] = $conf->fckeditor->dir_images ; // Due to security issues with Apache modules, it is reccomended to leave the // following setting enabled. diff --git a/htdocs/includes/fckeditor/editor/filemanager/upload/php/config.php b/htdocs/includes/fckeditor/editor/filemanager/upload/php/config.php index 4de5e9a1a3a..13e3c2ec643 100644 --- a/htdocs/includes/fckeditor/editor/filemanager/upload/php/config.php +++ b/htdocs/includes/fckeditor/editor/filemanager/upload/php/config.php @@ -18,7 +18,7 @@ * Frederico Caldeira Knabben (fredck@fckeditor.net) */ -global $Config ; +global $Config, $conf ; // SECURITY: You must explicitelly enable this "uploader". $Config['Enabled'] = true ;