diff --git a/htdocs/includes/dolibarr_changes.txt b/htdocs/includes/dolibarr_changes.txt index 1b18928d62b..df066fc11f6 100644 --- a/htdocs/includes/dolibarr_changes.txt +++ b/htdocs/includes/dolibarr_changes.txt @@ -7,6 +7,15 @@ FCKEDITOR: ---------- If fckeditor files are replaced by new version, following changes must be done: +* Edit file fckeditor/editor/filemanager/browser/default/browser.css +********************************************************** +Edit this file to put neutral colors (this theme is used for all themes) + +* Replace files and images in themes/fckeditor directories +********************************************************** +Replace in themes, files in fckeditor by new ones. Then edit them +to get back colors that match the theme. + * Edit fckconfig.js to set: *************************** (Rem: Pas requis car deja géré dans le fichier fckconfig.js qui est dans le repertoire du theme) @@ -17,8 +26,8 @@ FCKConfig.FlashUpload = false ; * Edit htdocs\includes\fckeditor\editor\filemanager\connectors\php\config.php to set: ***************************************************************************************************** -//require_once("../../../../../../../../master.inc.php"); -require_once("../../../../../../../../conf/conf.php"); // car include master.inc.php ne marche pas +//require_once("../../../../../../master.inc.php"); +require_once("../../../../../../conf/conf.php"); // car include master.inc.php ne marche pas $uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root); $pos = strstr ($uri, '/'); // $pos contient alors url sans nom domaine if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a '' @@ -37,3 +46,14 @@ $Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=fckeditor&fil //$Config['UserFilesAbsolutePath'] = $conf->fckeditor->dir_output; // ne fonctionne pas $Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root.'/fckeditor/'; + +// After file is uploaded, sometimes it is required to change its permissions +// so that it was possible to access it at the later time. +// If possible, it is recommended to set more restrictive permissions, like 0755. +// Set to 0 to disable this feature. +// Note: not needed on Windows-based servers. +$Config['ChmodOnUpload'] = 0775 ; + +// See comments above. +// Used when creating folders that does not exist. +$Config['ChmodOnFolderCreate'] = 0775 ; diff --git a/htdocs/includes/fckeditor/editor/filemanager/browser/default/browser.css b/htdocs/includes/fckeditor/editor/filemanager/browser/default/browser.css index 6d5b3ab52e1..c7431b55162 100644 --- a/htdocs/includes/fckeditor/editor/filemanager/browser/default/browser.css +++ b/htdocs/includes/fckeditor/editor/filemanager/browser/default/browser.css @@ -23,7 +23,7 @@ body { - background-color: #f1f1e3; + background-color: #f1f1f1; } form @@ -34,8 +34,8 @@ form .Frame { - background-color: #f1f1e3; - border-color: #f1f1e3; + background-color: #f1f1f1; + border-color: #f1f1f1; border-right: thin inset; border-top: thin inset; border-left: thin inset; @@ -75,7 +75,7 @@ body, td, input, select border-left: #737357 1px solid; color: #3b3b1f; border-bottom: #737357 1px solid; - background-color: #c7c78f; + background-color: #bfbfbf; } .FolderListCurrentFolder img diff --git a/htdocs/includes/fckeditor/editor/filemanager/connectors/php/config.php b/htdocs/includes/fckeditor/editor/filemanager/connectors/php/config.php index 3c012806815..8a02755a62e 100644 --- a/htdocs/includes/fckeditor/editor/filemanager/connectors/php/config.php +++ b/htdocs/includes/fckeditor/editor/filemanager/connectors/php/config.php @@ -24,8 +24,8 @@ global $Config ; -//require_once("../../../../../../../../master.inc.php"); -require_once("../../../../../../../../conf/conf.php"); // ajouté car include master.inc.php ne marche pas +//require_once("../../../../../../master.inc.php"); +require_once("../../../../../../conf/conf.php"); // ajouté car include master.inc.php ne marche pas $uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root); $pos = strstr ($uri, '/'); // $pos contient alors url sans nom domaine if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a '' @@ -34,14 +34,14 @@ define('DOL_URL_ROOT', $pos); /* $conf->syslog->enabled=1; define('SYSLOG_FILE','c:/log/dolibarr/dolibarr.log'); -require_once("../../../../../../../../lib/functions.lib.php"); +require_once("../../../../../../lib/functions.lib.php"); dolibarr_syslog("eee".$conf->fckeditor->dir_output); */ // SECURITY: You must explicitly enable this "connector". (Set it to "true"). // WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only // authenticated users can access this file or use some kind of session checking. -$Config['Enabled'] = false ; +$Config['Enabled'] = true ; // Path to user files relative to the document root. @@ -76,11 +76,11 @@ $Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js") ; // If possible, it is recommended to set more restrictive permissions, like 0755. // Set to 0 to disable this feature. // Note: not needed on Windows-based servers. -$Config['ChmodOnUpload'] = 0777 ; +$Config['ChmodOnUpload'] = 0775 ; // See comments above. // Used when creating folders that does not exist. -$Config['ChmodOnFolderCreate'] = 0777 ; +$Config['ChmodOnFolderCreate'] = 0775 ; /* Configuration settings for each Resource Type