diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index b5bd4d045f6..e244941ff58 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -189,7 +189,19 @@ else
show_skin(null,1);
print ' '."\n";
- print load_fiche_titre($langs->trans("TestSubmitForm"),'(mode='.$mode.')','');
+ $listofmodes=array('dolibarr_mailings','dolibarr_notes','dolibarr_details','Full');
+ $linkstomode='';
+ foreach($listofmodes as $newmode)
+ {
+ if ($linkstomode) $linkstomode.=' - ';
+ $linkstomode.='';
+ if ($mode == $newmode) $linkstomode.='';
+ $linkstomode.=$newmode;
+ if ($mode == $newmode) $linkstomode.='';
+ $linkstomode.='';
+ }
+ $linkstomode.='';
+ print load_fiche_titre($langs->trans("TestSubmitForm"),$linkstomode,'');
print '';
$uselocalbrowser=true;
$readonly=($mode=='dolibarr_readonly'?1:0);
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 8564a18822e..ff31823976e 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'
@@ -148,7 +148,10 @@ class DolEditor
{
global $conf,$langs;
- $found=0;
+ $fullpage=False;
+ $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed
+
+ $found=0;
$out='';
if ($this->tool == 'fckeditor')
@@ -186,7 +189,8 @@ class DolEditor
customConfig : ckeditorConfig,
readOnly : '.($this->readonly?'true':'false').',
htmlEncodeOutput :'.$htmlencode_force.',
- allowedContent :'.(empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)?'false':'true').',
+ allowedContent :'.($disallowAnyContent?'false':'true').',
+ fullPage : '.($fullpage?'true':'false').',
toolbar: \''.$this->toolbarname.'\',
toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
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']; ?>