From 2b7db237b93b215c0d42be5702775dc617448635 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 20 May 2007 23:53:09 +0000 Subject: [PATCH] Fix: Sur fckeditor de mailing, on permet insertion de liens mais sans utilisation du browser local pour etre sur que les liens soient externes --- htdocs/comm/mailing/fiche.php | 4 ++-- htdocs/lib/doleditor.class.php | 2 +- htdocs/viewimage.php | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 73726c4445f..57b66c3ff2b 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -249,7 +249,7 @@ if ($_GET["action"] == 'create') if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('body',$objp->description,320,'dolibarr_mailings','',true); + $doleditor=new DolEditor('body',$objp->description,320,'dolibarr_mailings','',true,false); $doleditor->Create(); } else @@ -452,7 +452,7 @@ else if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('body',$mil->body,320,'dolibarr_mailings','',true); + $doleditor=new DolEditor('body',$mil->body,320,'dolibarr_mailings','',true,false); $doleditor->Create(); } else diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php index 55e7a231ca5..62e3274bba1 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/lib/doleditor.class.php @@ -51,7 +51,7 @@ class DolEditor \param toolbarstartexpanded visible ou non au démarrage \param modulepart modulepart pour protection wrapper download viewimage */ - function DolEditor($htmlname,$content,$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=false) + function DolEditor($htmlname,$content,$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true) { global $conf,$langs; diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index f756163c40e..58cd705ef1d 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -205,6 +205,13 @@ if ($modulepart) $original_file=$conf->fckeditor->dir_output.'/'.$original_file; } + // Wrapping pour les images wysiwyg mailing + if ($modulepart == 'mailing') + { + $accessallowed=1; + $original_file=$conf->mailing->dir_output.'/'.$original_file; + } + // Wrapping pour les graph energie if ($modulepart == 'graph_stock') {