Dolibarr/sendrecurringinvoicebymail
1
0
Fork 0
Code Issues Pull requests Releases 6 Activity Actions

Compare commits

merge into: Dolibarr:master
Branches Tags
Dolibarr:master
Dolibarr:doleditor
Dolibarr:0.3.6
Dolibarr:0.3.5
Dolibarr:0.3.4
Dolibarr:0.3.3
Dolibarr:0.3.2
Dolibarr:0.3.1
...
pull from: Dolibarr:doleditor
Branches Tags
Dolibarr:master
Dolibarr:doleditor
Dolibarr:0.3.6
Dolibarr:0.3.5
Dolibarr:0.3.4
Dolibarr:0.3.3
Dolibarr:0.3.2
Dolibarr:0.3.1

3 commits
master ... doleditor

Author SHA1 Message Date
Chl
38a96d7ac2 Bump version 2022-07-23 19:54:56 +02:00
Chl
60b4a1fd99 Suite utilisation du doleditor: selon config. globale 2022-07-23 19:54:56 +02:00
Jé GDSOFT
59f543e196 utilisation du doleditor pour l'edition du corps du mail 2022-07-23 19:54:15 +02:00
2 changed files with 15 additions and 10 deletions
Show stats Expand all files Collapse all files

2
core/modules/modsendrecurringinvoicebymail.class.php
View file

@ -69,7 +69,7 @@ class modsendrecurringinvoicebymail extends DolibarrModules
$this->editor_url = 'https://code.bugness.org/Dolibarr/sendrecurringinvoicebymail';
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
$this->version = '0.3.2';
$this->version = '0.3.3';
//Url to the file with your last numberversion of this module
//$this->url_last_version = 'http://www.example.com/versionmodule.txt';

23
fiche-rec-tab1.php
View file

@ -147,7 +147,7 @@ do {
$mailObject->sendcc_thirdparty = in_array('thirdparty', GETPOST('sendcc_socpeople', 'array'));
$mailObject->subject = GETPOST('subject', 'alpha');
$mailObject->body = GETPOST('body', 'alpha');
$mailObject->body = GETPOST('body', 'restricthtml');
$mailObject->body_ishtml = (int)GETPOST('body_ishtml', 'int');
// Save into database
@ -300,16 +300,21 @@ do {
$output .= '<tr><td class="minwidth200" valign="top">';
$output .= $form->textwithpicto($langs->trans("MailText"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
$output .= "</td>\n<td>";
/*
// doleditor does some weird stuff, adding <br> and newlines, I'll get more into it when I have time.
// fallback to simple <textarea> for the time being.
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('body_plaintext', (GETPOST('body_plaintext', 'alpha') ? GETPOST('body_plaintext', 'alpha') : $mailObject->body_plaintext), '', 280);
$doleditor = new DolEditor(
'body',
(GETPOST('body', 'alpha') ? GETPOST('body', 'alpha') : $mailObject->body),
'',
280,
'dolibarr_mailings', // toolbar name
'In', // toolbar location
false, // toolbar start expanded
true, // use local browser
!empty($conf->global->FCKEDITOR_ENABLE_MAIL) // follow global conf about using ckeditor for mails.
);
$output .= $doleditor->Create(1);
*/
$output .= '<textarea id="body" name="body" rows="14" cols="80" class="flat">';
$output .= htmlentities(GETPOST('body', 'alpha') ? GETPOST('body', 'alpha') : $mailObject->body);
$output .= "</textarea>\n";
$output .= "</td></tr>\n";
// body_ishtml