@@ -54,7 +54,7 @@ |
||
| 54 | 54 | $checkread_key = GETPOST('MAILING_EMAIL_UNSUBSCRIBE_KEY', 'alpha'); |
| 55 | 55 | $contactbulkdefault = GETPOSTINT('MAILING_CONTACT_DEFAULT_BULK_STATUS'); |
| 56 | 56 | if (GETPOST('MAILING_DELAY', 'alpha') != '') { |
| 57 | - $mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3); // Not less than 1 millisecond. |
|
| 57 | + $mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3); // Not less than 1 millisecond. |
|
| 58 | 58 | } else { |
| 59 | 59 | $mailingdelay = ''; |
| 60 | 60 | } |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | print '<tr class="oddeven"><td><label for="logo">' . $form->textwithpicto($langs->trans("Logo"), $tooltiplogo) . '</label></td><td>'; |
| 532 | 532 | print '<div class="centpercent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">'; |
| 533 | 533 | if ($maxmin > 0) { |
| 534 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 534 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 535 | 535 | } |
| 536 | 536 | print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo" id="logo" accept="image/*">'; |
| 537 | 537 | print '</div>'; |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | $maxfilesizearray = getMaxFileSizeArray(); |
| 574 | 574 | $maxmin = $maxfilesizearray['maxmin']; |
| 575 | 575 | if ($maxmin > 0) { |
| 576 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 576 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 577 | 577 | } |
| 578 | 578 | print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo_squarred" id="logo_squarred" accept="image/*">'; |
| 579 | 579 | print '</div>'; |
@@ -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'); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -569,7 +569,7 @@ |
||
| 569 | 569 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 570 | 570 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 571 | 571 | } |
| 572 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 572 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 573 | 573 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 574 | 574 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : '')) . "\n"; |
| 575 | 575 | $totalarray['nbfield']++; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | $type = GETPOST('type', 'alpha'); |
| 47 | 47 | $value = GETPOST('value', 'alpha'); |
| 48 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 48 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 49 | 49 | |
| 50 | 50 | $label = GETPOST('label', 'alpha'); |
| 51 | 51 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | |
| 551 | 551 | |
| 552 | 552 | // Disallow to classify billed a supplier order without invoice |
| 553 | -print '<tr class="oddeven"><td>' . $langs->trans("SupplierOrderClassifyBilledWithoutInvoice") . ' ' ; |
|
| 553 | +print '<tr class="oddeven"><td>' . $langs->trans("SupplierOrderClassifyBilledWithoutInvoice") . ' '; |
|
| 554 | 554 | print $form->textwithpicto('', $langs->trans("SupplierOrderClassifyBilledWithoutInvoiceHelp"), 1, 'help') . '</td>'; |
| 555 | 555 | print '<td class="left" colspan="2">'; |
| 556 | 556 | print ajax_constantonoff('SUPPLIER_ORDER_DISABLE_CLASSIFY_BILLED_FROM_SUPPLIER_ORDER'); |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | print '<tr class="oddeven"><td>' . $langs->trans("MAIN_MAIL_SENDMODE") . '</td><td>'; |
| 371 | 371 | |
| 372 | 372 | // SuperAdministrator access only |
| 373 | - if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
| 373 | + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
| 374 | 374 | print $form->selectarray('MAIN_MAIL_SENDMODE', $listofmethods, getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail')); |
| 375 | 375 | } else { |
| 376 | 376 | $text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE')]; |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | print '<tr class="oddeven smtp_oauth_service"><td>' . $langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE") . '</td><td>'; |
| 513 | 513 | |
| 514 | 514 | // SuperAdministrator access only |
| 515 | - if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
| 515 | + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { |
|
| 516 | 516 | print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE); |
| 517 | 517 | } else { |
| 518 | 518 | $text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE')]; |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | $action = GETPOST('action', 'alpha'); |
| 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'); |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | print '<tr class="oddeven nohover" id="tr-aaa-' . $rowid . '">'; |
| 1111 | 1111 | print '<td colspan="10">'; |
| 1112 | 1112 | |
| 1113 | - $fieldsforcontent = array('topic', 'email_from','joinfiles', 'content'); |
|
| 1113 | + $fieldsforcontent = array('topic', 'email_from', 'joinfiles', 'content'); |
|
| 1114 | 1114 | if (getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) { |
| 1115 | 1115 | $fieldsforcontent[] = 'content_lines'; |
| 1116 | 1116 | } |
@@ -1183,7 +1183,7 @@ discard block |
||
| 1183 | 1183 | 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) |
| 1184 | 1184 | } |
| 1185 | 1185 | // Test on 'enabled' |
| 1186 | - if (! (int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
| 1186 | + if (!(int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
| 1187 | 1187 | $i++; |
| 1188 | 1188 | continue; // Email template not qualified |
| 1189 | 1189 | } |