lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Sur fckeditor de mailing, on permet insertion de liens mais sans utilisation du browser local pour etre sur que les liens soient externes

Browse Source
This commit is contained in:
Laurent Destailleur 2007-05-20 23:53:09 +00:00
parent 206847f2a6
commit 2b7db237b9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/mailing/fiche.php
View File

@ -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

2
htdocs/lib/doleditor.class.php
View File

@ -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;

7
htdocs/viewimage.php
View File

@ -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')
{