@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | } |
| 452 | 452 | } |
| 453 | 453 | if (empty($nbemail)) { |
| 454 | - $nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere'));//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>'; |
|
| 454 | + $nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere')); //.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>'; |
|
| 455 | 455 | } |
| 456 | 456 | if ($htmltooltip) { |
| 457 | 457 | print $form->textwithpicto($nbemail, $htmltooltip, 1, 'info'); |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | } |
| 535 | 535 | print '</div>'; |
| 536 | 536 | print '<div class="tagtd"> </div>'; |
| 537 | - print '</div>'; // End tr |
|
| 537 | + print '</div>'; // End tr |
|
| 538 | 538 | |
| 539 | 539 | clearstatcache(); |
| 540 | 540 | |
@@ -604,14 +604,14 @@ discard block |
||
| 604 | 604 | } |
| 605 | 605 | print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"'); |
| 606 | 606 | print '</div>'; |
| 607 | - print '<div class="tagtd valignmiddle">'; // style="height: 4em" |
|
| 607 | + print '<div class="tagtd valignmiddle">'; // style="height: 4em" |
|
| 608 | 608 | print $obj->getDesc(); |
| 609 | 609 | print '</div>'; |
| 610 | 610 | |
| 611 | 611 | $nbofrecipient = -1; |
| 612 | 612 | |
| 613 | 613 | try { |
| 614 | - $obj->evenunsubscribe = $object->evenunsubscribe; // Set flag to include/exclude email that has opt-out. |
|
| 614 | + $obj->evenunsubscribe = $object->evenunsubscribe; // Set flag to include/exclude email that has opt-out. |
|
| 615 | 615 | |
| 616 | 616 | $nbofrecipient = $obj->getNbOfRecipients(''); |
| 617 | 617 | } catch (Exception $e) { |
@@ -664,7 +664,7 @@ discard block |
||
| 664 | 664 | $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
| 665 | 665 | print $hookmanager->resPrint; |
| 666 | 666 | |
| 667 | - print '</div>'; // End table |
|
| 667 | + print '</div>'; // End table |
|
| 668 | 668 | print '</div>'; |
| 669 | 669 | |
| 670 | 670 | print '<br>'; |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | $arrayofmassactions['reset_target'] = img_picto('', 'refresh', 'class="pictofixedwidth"').$langs->trans("ResetMailingTargetMassaction"); |
| 774 | 774 | } |
| 775 | 775 | $massactionbutton = $form->selectMassAction('', $arrayofmassactions); |
| 776 | - $morehtmlcenter .= $massactionbutton .'<br>'; |
|
| 776 | + $morehtmlcenter .= $massactionbutton.'<br>'; |
|
| 777 | 777 | |
| 778 | 778 | if ($object->status == $object::STATUS_DRAFT) { |
| 779 | 779 | $morehtmlcenter = '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ToClearAllRecipientsClickHere").'</span> <a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition smallpaddingimp">'.$langs->trans("TargetsReset").'</a>'; |
@@ -801,7 +801,7 @@ discard block |
||
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 804 | - $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : ''); // This also change content of $arrayfields with user setup |
|
| 804 | + $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : ''); // This also change content of $arrayfields with user setup |
|
| 805 | 805 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 806 | 806 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 807 | 807 | |
@@ -982,7 +982,7 @@ discard block |
||
| 982 | 982 | print '<td class="center nowraponall">'; |
| 983 | 983 | if ($obj->status != $object::STATUS_DRAFT) { // If status of target line is not draft |
| 984 | 984 | // Date sent |
| 985 | - print dol_print_date($db->jdate($obj->date_envoi), 'dayhour', 'tzuserrel'); // @TODO Must store date in date format |
|
| 985 | + print dol_print_date($db->jdate($obj->date_envoi), 'dayhour', 'tzuserrel'); // @TODO Must store date in date format |
|
| 986 | 986 | } |
| 987 | 987 | print '</td>'; |
| 988 | 988 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $langs->loadLangs(array('mails', 'admin', 'companies', 'categories')); |
| 50 | 50 | |
| 51 | 51 | $action = GETPOST('action', 'aZ09'); |
| 52 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
| 52 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
| 53 | 53 | |
| 54 | 54 | // Load variable for pagination |
| 55 | 55 | $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | } |
| 570 | 570 | } |
| 571 | 571 | if (empty($nbemail)) { |
| 572 | - $nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere'));//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>'; |
|
| 572 | + $nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere')); //.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>'; |
|
| 573 | 573 | } |
| 574 | 574 | if ($htmltooltip) { |
| 575 | 575 | print $form->textwithpicto($nbemail, $htmltooltip, 1, 'info'); |
@@ -680,7 +680,7 @@ discard block |
||
| 680 | 680 | print $formadvtargetemaling->selectAdvtargetemailingTemplate('template_id', $default_template, $langs->trans("SelectAPredefinedFilter"), $advTarget->type_element, 'minwidth100 valignmiddle'); |
| 681 | 681 | print '<input type="button" name="loadfilter" id="loadfilter" value="'.$langs->trans('AdvTgtLoadFilter').'" class="button smallpaddingimp"/>'; |
| 682 | 682 | print '<input type="button" name="deletefilter" id="deletefilter" value="'.$langs->trans('AdvTgtDeleteFilter').'" class="button smallpaddingimp"/>'; |
| 683 | - print '<input type="button" name="savefilter" id="savefilter" value="'.$langs->trans('AdvTgtSaveFilter').'" class="button smallpaddingimp"/>'; // Update filter |
|
| 683 | + print '<input type="button" name="savefilter" id="savefilter" value="'.$langs->trans('AdvTgtSaveFilter').'" class="button smallpaddingimp"/>'; // Update filter |
|
| 684 | 684 | print '</td><td>'."\n"; |
| 685 | 685 | print '</td></tr>'."\n"; |
| 686 | 686 | |
@@ -893,7 +893,7 @@ discard block |
||
| 893 | 893 | $socstatic = new Societe($db); |
| 894 | 894 | $elementtype = $socstatic->table_element; |
| 895 | 895 | // fetch optionals attributes and labels |
| 896 | - require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; |
|
| 896 | + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
|
| 897 | 897 | $extrafields = new ExtraFields($db); |
| 898 | 898 | $extrafields->fetch_name_optionals_label($elementtype); |
| 899 | 899 | foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) { |