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

[ task #769 ] WYSIWYG for user signature

Browse Source
This commit is contained in:
fhenry 2013-03-16 09:43:09 +01:00
parent e71103ed02
commit 1f5ebb594a
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/user/class/user.class.php
View File

@ -201,7 +201,11 @@ class User extends CommonObject
$this->user_mobile = $obj->user_mobile; $this->user_mobile = $obj->user_mobile;
$this->email = $obj->email; $this->email = $obj->email;
$this->job = $obj->job; $this->job = $obj->job;
if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) && dol_textishtml(dol_html_entity_decode($obj->signature, ENT_COMPAT | ENT_HTML401))) {
$this->signature = dol_html_entity_decode($obj->signature, ENT_COMPAT | ENT_HTML401);
}else {
$this->signature = $obj->signature; $this->signature = $obj->signature;
}
$this->admin = $obj->admin; $this->admin = $obj->admin;
$this->note = $obj->note; $this->note = $obj->note;
$this->statut = $obj->statut; $this->statut = $obj->statut;

24
htdocs/user/fiche.php
View File

@ -886,7 +886,17 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Signature // Signature
print '<tr><td valign="top">'.$langs->trans("Signature").'</td>'; print '<tr><td valign="top">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
print '<textarea rows="'.ROWS_5.'" cols="90" name="signature">'.GETPOST('signature').'</textarea>'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)) {
$withfckeditor=1;
//Mailing is mandatory to have dolHTMLencode done by ckeditor
$ckeditortoolbar='dolibarr_mailings';
} else {
$withfckeditor=0;
$ckeditortoolbar='';
}
$doleditor=new DolEditor('signature',GETPOST('signature'),'',280,$ckeditortoolbar,'In',true,true,$withfckeditor,8,72);
print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// Multicompany // Multicompany
@ -1794,7 +1804,17 @@ else
// Signature // Signature
print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
print '<textarea name="signature" rows="5" cols="90">'.dol_htmlentitiesbr_decode($object->signature).'</textarea>'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
if (!empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)) {
$withfckeditor=1;
//Mailing is mandatory to have dolHTMLencode done by ckeditor
$ckeditortoolbar='dolibarr_mailings';
} else {
$withfckeditor=0;
$ckeditortoolbar='';
}
$doleditor=new DolEditor('signature',$object->signature,'',280,$ckeditortoolbar,'In',true,true,$withfckeditor,8,72);
print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// openid // openid