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

Work on task #10579 : Simplify code using editor

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-01 22:52:53 +00:00
parent abd19f59ba
commit f5dd8f1da1
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/adherents/admin/adherent.php
View File

@ -51,7 +51,6 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $value=$_POST["constvalue".$const]; if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $value=$_POST["constvalue".$const];
$type=$_POST["consttype"]; $type=$_POST["consttype"];
$constnote=isset($_POST["constnote"])?$_POST["constnote"]:''; $constnote=isset($_POST["constnote"])?$_POST["constnote"]:'';
$result=dolibarr_set_const($db,$const,$value,$typeconst[$type],0,$constnote,$conf->entity); $result=dolibarr_set_const($db,$const,$value,$typeconst[$type],0,$constnote,$conf->entity);
if ($result < 0) if ($result < 0)
{ {
@ -371,19 +370,9 @@ function form_constantes($tableau)
} }
else if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) else if (in_array($const,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL')))
{ {
// Editor wysiwyg require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
if ($conf->fckeditor->enabled) $doleditor=new DolEditor('constvalue'.$const,$obj->value,160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
{ $doleditor->Create();
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('constvalue'.$const,$obj->value,160,'dolibarr_notes','',false,false);
$doleditor->Create();
}
else
{
print '<textarea class="flat" name="constvalue'.$const.'" cols="60" rows="5" wrap="soft">';
print dol_htmlentitiesbr_decode($obj->value);
print '</textarea>';
}
print '</td><td>'; print '</td><td>';
print '<input type="hidden" name="consttype" value="texte">'; print '<input type="hidden" name="consttype" value="texte">';

5
htdocs/core/class/commonobject.class.php
View File

@ -1514,7 +1514,8 @@ class CommonObject
} }
if ($_GET["action"] == 'editline') if ($_GET["action"] == 'editline')
{ {
// editeur wysiwyg require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
// editeur wysiwyg
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
@ -1570,7 +1571,7 @@ class CommonObject
print "</form>\n"; print "</form>\n";
} }
} }
/** /**
* \brief Load type of canvas * \brief Load type of canvas
* \param id element id * \param id element id