@@ -357,7 +357,7 @@ |
||
| 357 | 357 | print '</td>' . "\n"; |
| 358 | 358 | print '</tr>' . "\n"; |
| 359 | 359 | |
| 360 | -$result = $object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type' => $mode, 't.entity' => array($user->entity,$conf->entity))); |
|
| 360 | +$result = $object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type' => $mode, 't.entity' => array($user->entity, $conf->entity))); |
|
| 361 | 361 | |
| 362 | 362 | if (!is_array($result) && $result < 0) { |
| 363 | 363 | setEventMessages($object->error, $object->errors, 'errors'); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | |
| 43 | 43 | $action = GETPOST('action', 'aZ09'); |
| 44 | 44 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 45 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 45 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 46 | 46 | |
| 47 | 47 | $value = GETPOST('value', 'alpha'); |
| 48 | 48 | $label = GETPOST('label', 'alpha'); |
@@ -693,7 +693,7 @@ |
||
| 693 | 693 | $maxfilesizearray = getMaxFileSizeArray(); |
| 694 | 694 | $maxmin = $maxfilesizearray['maxmin']; |
| 695 | 695 | if ($maxmin > 0) { |
| 696 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 696 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 697 | 697 | } |
| 698 | 698 | print '<input type="file" class="flat maxwidthinputfileonsmartphone" name="imagebackground" id="imagebackground"' . $disabled . '>'; |
| 699 | 699 | if ($disabled) { |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | print '<tr class="oddeven smtp_oauth_service hideifdefault"><td>' . $langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE") . '</td><td>'; |
| 451 | 451 | |
| 452 | 452 | // SuperAdministrator access only |
| 453 | - if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
| 453 | + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
| 454 | 454 | // @phan-suppress-next-line PhanPluginSuspiciousParamOrder |
| 455 | 455 | print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING); |
| 456 | 456 | } else { |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | // AUTH method |
| 554 | 554 | if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING'), array('smtps', 'swiftmailer'))) { |
| 555 | 555 | $authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN'); |
| 556 | - $text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '') ; |
|
| 556 | + $text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : ''); |
|
| 557 | 557 | print '<tr class="oddeven hideifdefault"><td>' . $langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE") . '</td><td>' . $text . '</td></tr>'; |
| 558 | 558 | } |
| 559 | 559 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | $action = GETPOST('action', 'aZ09'); |
| 48 | 48 | $value = GETPOST('value', 'alpha'); |
| 49 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 49 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 50 | 50 | |
| 51 | 51 | $label = GETPOST('label', 'alpha'); |
| 52 | 52 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | print '</form>'; |
| 818 | 818 | |
| 819 | 819 | |
| 820 | -print '<tr class="oddeven"><td>' . $langs->trans("InvoiceCheckPosteriorDate") . ' ' ; |
|
| 820 | +print '<tr class="oddeven"><td>' . $langs->trans("InvoiceCheckPosteriorDate") . ' '; |
|
| 821 | 821 | print $form->textwithpicto('', $langs->trans("InvoiceCheckPosteriorDateHelp"), 1, 'help') . '</td>'; |
| 822 | 822 | print '<td class="left" colspan="2">'; |
| 823 | 823 | print ajax_constantonoff('INVOICE_CHECK_POSTERIOR_DATE'); |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | |
| 54 | 54 | $value = GETPOST('value', 'alpha'); |
| 55 | 55 | $label = GETPOST('label', 'alpha'); |
| 56 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 56 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 57 | 57 | |
| 58 | 58 | $scandir = GETPOST('scan_dir', 'alpha'); |
| 59 | 59 | $type = 'invoice'; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | |
| 50 | 50 | $parameters = array(); |
| 51 | -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
| 51 | +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
| 52 | 52 | if ($reshook < 0) { |
| 53 | 53 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 54 | 54 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | // Parameters |
| 39 | 39 | $action = GETPOST('action', 'aZ09'); |
| 40 | 40 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 41 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 41 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 42 | 42 | |
| 43 | 43 | $value = GETPOST('value', 'alpha'); |
| 44 | 44 | |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | print '<tr class="oddeven nohover' . (in_array($tmpfieldlist, array('topic', 'joinfiles')) ? ' nobottom' : '') . '" id="tr-' . $tmpfieldlist . '-' . $rowid . '">'; |
| 1106 | 1106 | print '<td colspan="10">'; |
| 1107 | 1107 | |
| 1108 | - $fieldsforcontent = array('topic', 'email_from','joinfiles', 'content'); |
|
| 1108 | + $fieldsforcontent = array('topic', 'email_from', 'joinfiles', 'content'); |
|
| 1109 | 1109 | if (getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) { |
| 1110 | 1110 | $fieldsforcontent[] = 'content_lines'; |
| 1111 | 1111 | } |
@@ -1178,7 +1178,7 @@ discard block |
||
| 1178 | 1178 | continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled) |
| 1179 | 1179 | } |
| 1180 | 1180 | // Test on 'enabled' |
| 1181 | - if (! (int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
| 1181 | + if (!(int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
| 1182 | 1182 | $i++; |
| 1183 | 1183 | continue; // Email template not qualified |
| 1184 | 1184 | } |