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

Look and feel v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-09-19 21:02:06 +02:00
parent 9c97613b39
commit 574cba906f
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ class DolEditor
$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
} }
$pluginstodisable = 'elementspath,save,flash'; $pluginstodisable = 'elementspath,save,flash,div';
if (!empty($conf->dol_optimize_smallscreen)) { if (!empty($conf->dol_optimize_smallscreen)) {
$pluginstodisable .= ',scayt,wsc,find,undo'; $pluginstodisable .= ',scayt,wsc,find,undo';
} }

11
htdocs/core/class/html.formmail.class.php
View File

@ -822,7 +822,7 @@ class FormMail extends Form
$out .= '<br></div>'; $out .= '<br></div>';
} }
} elseif (empty($this->withmaindocfile)) { } elseif (empty($this->withmaindocfile)) {
$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>'; //$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
} }
if ($this->withfile == 2) { if ($this->withfile == 2) {
$maxfilesizearray = getMaxFileSizeArray(); $maxfilesizearray = getMaxFileSizeArray();
@ -837,7 +837,7 @@ class FormMail extends Form
$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />'; $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
} }
$out .= ' '; $out .= ' ';
$out .= '<input type="submit" class="button small" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />'; $out .= '<input type="submit" class="button smallpaddingimp" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
} }
} else { } else {
$out .= $this->withfile; $out .= $this->withfile;
@ -947,10 +947,13 @@ class FormMail extends Form
} }
$out .= '<tr>'; $out .= '<tr>';
$out .= '<td class="tdtop">'; $out .= '<td colspan="2">';
$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody'); $out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
$out .= '</td>'; $out .= '</td>';
$out .= '<td>'; $out .= '</tr>';
$out .= '<tr>';
$out .= '<td colspan="2">';
if ($this->withbodyreadonly) { if ($this->withbodyreadonly) {
$out .= nl2br($defaultmessage); $out .= nl2br($defaultmessage);
$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />'; $out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';

2
htdocs/core/lib/website2.lib.php
View File

@ -643,7 +643,7 @@ function showWebsiteTemplates(Website $website)
print '<br>'; print '<br>';
print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')'; print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>'; print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&token='.newToken().'&website='.urlencode($website->ref).'&templateuserfile='.urlencode($subdir).'" class="button">'.$langs->trans("Load").'</a>';
print '</div>'; print '</div>';
$i++; $i++;

2
htdocs/main.inc.php
View File

@ -518,7 +518,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
$sensitiveget = false; $sensitiveget = false;
if ((GETPOSTISSET('massaction') || GETPOST('action', 'aZ09')) && getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN') >= 3) { if ((GETPOSTISSET('massaction') || GETPOST('action', 'aZ09')) && getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN') >= 3) {
// All GET actions and mass actions are processed as sensitive. // All GET actions and mass actions are processed as sensitive.
if (GETPOSTISSET('massaction') || !in_array(GETPOST('action', 'aZ09'), array('create', 'file_manager', 'presend', 'presend_addmessage'))) { // We exclude the case action='create' and action='file_manager' that are legitimate if (GETPOSTISSET('massaction') || !in_array(GETPOST('action', 'aZ09'), array('create', 'createsite', 'file_manager', 'presend', 'presend_addmessage'))) { // We exclude the case action='create' and action='file_manager' that are legitimate
$sensitiveget = true; $sensitiveget = true;
} }
} elseif (getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN') >= 2) { } elseif (getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN') >= 2) {