From f59f3032c61bdda45181866636ddceed6fd062b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 1 May 2016 16:34:50 +0200 Subject: [PATCH] NEW: Rename path for generic medias files into '/medias' instead of fckeditor. Add location of medias into title of media browser of ckeditor. Work on website module --- htdocs/core/class/doleditor.class.php | 2 +- .../browser/default/browser.php | 11 +- .../filemanagerdol/connectors/php/config.php | 7 +- .../filemanagerdol/connectors/php/upload.php | 2 +- htdocs/core/lib/files.lib.php | 16 +- htdocs/core/modules/modFckeditor.class.php | 4 +- htdocs/core/modules/modWebsites.class.php | 6 +- htdocs/document.php | 6 +- htdocs/install/upgrade2.php | 2 + htdocs/langs/en_US/main.lang | 1 + htdocs/langs/en_US/website.lang | 6 +- htdocs/main.inc.php | 2 +- htdocs/public/websites/index.php | 90 ++++++- htdocs/theme/eldy/ckeditor/config.js | 2 - htdocs/theme/eldy/style.css.php | 6 +- htdocs/theme/md/ckeditor/config.js | 2 - htdocs/theme/md/style.css.php | 6 +- htdocs/viewimage.php | 4 +- htdocs/websites/index.php | 236 ++++++++++++++++-- 19 files changed, 353 insertions(+), 58 deletions(-) diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 8564a18822e..2a9114cbd2c 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -52,7 +52,7 @@ class DolEditor * @param string $content Content of WYSIWIG field * @param int $width Width in pixel of edit area (auto by default) * @param int $height Height in pixel of edit area (200px by default) - * @param string $toolbarname Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', ') + * @param string $toolbarname Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly') * @param string $toolbarlocation Where bar is stored : * 'In' each window has its own toolbar * 'Out:name' share toolbar into the div called 'name' diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php index f542bdf59b6..15e44621bcf 100644 --- a/htdocs/core/filemanagerdol/browser/default/browser.php +++ b/htdocs/core/filemanagerdol/browser/default/browser.php @@ -19,15 +19,20 @@ * along with this program. If not, see . */ -define('NOTOKENRENEWAL',1); // Disables token renewal +//define('NOTOKENRENEWAL',1); // Disables token renewal +//require '../../../../main.inc.php'; +require '../../connectors/php/config.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php + +global $Config; + + -require '../../../../main.inc.php'; ?> - FCKeditor - Resources Browser + <?php echo $langs->trans("MediaBrowser").' - '.$Config['UserFilesAbsolutePathRelative']; ?>