Dolibarr / dolibarr

htdocs/variants/admin/product_attribute_extrafields.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
  * View
  */
 
-$title =  $langs->trans("ProductAttributeExtrafieldsSetup");
+$title = $langs->trans("ProductAttributeExtrafieldsSetup");
 llxHeader('', $title);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';

htdocs/admin/mailing.php

Spacing +22 added lines, -22 removed lines

@@ -27,8 +27,8 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
 /**
  * @var Conf $conf
@@ -67,7 +67,7 @@ 
 	$batchlimit = GETPOSTINT('MAILING_LIMIT_SENDBYWEB');
 
 	if (GETPOST('MAILING_DELAY', 'alpha') != '') {
-		$mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3);		// Not less than 1 millisecond.
+		$mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3); // Not less than 1 millisecond.
 	} else {
 		$mailingdelay = '';
 	}
@@ -142,12 +142,12 @@ 
 $constname = 'MAILING_EMAIL_UNSUBSCRIBE_KEY';
 
 // Add button to autosuggest a key
-include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 print dolJSToSetRandomPassword($constname);
 
 print '<br>';
-print '<form method="post" action="' . $_SERVER["PHP_SELF"] . '">';
-print '<input type="hidden" name="token" value="' . newToken() . '">';
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
 print '<table class="noborder centpercent">';
@@ -160,28 +160,28 @@ 
 
 print '<tr class="oddeven"><td>';
 $help = img_help(1, $langs->trans("EMailHelpMsgSPFDKIM"));
-print $langs->trans("MailingEMailFrom") . ' ' . $help . '</td><td>';
-print '<input class="minwidth100" type="text" name="MAILING_EMAIL_FROM" value="' . getDolGlobalString('MAILING_EMAIL_FROM') . '">';
+print $langs->trans("MailingEMailFrom").' '.$help.'</td><td>';
+print '<input class="minwidth100" type="text" name="MAILING_EMAIL_FROM" value="'.getDolGlobalString('MAILING_EMAIL_FROM').'">';
 if (getDolGlobalString('MAILING_EMAIL_FROM') && !isValidEmail($conf->global->MAILING_EMAIL_FROM)) {
-	print ' ' . img_warning($langs->trans("BadEMail"));
+	print ' '.img_warning($langs->trans("BadEMail"));
 }
 print '</td>';
-print '<td class="hideonsmartphone"><span class="opacitymedium">' . dol_escape_htmltag(($mysoc->name ? $mysoc->name : 'MyName') . ' <noreply@example.com>') . '</span></td>';
+print '<td class="hideonsmartphone"><span class="opacitymedium">'.dol_escape_htmltag(($mysoc->name ? $mysoc->name : 'MyName').' <noreply@example.com>').'</span></td>';
 print '</tr>';
 
 print '<tr class="oddeven"><td>';
-print $langs->trans("MailingEMailError") . '</td><td>';
-print '<input class="minwidth100" type="text" name="MAILING_EMAIL_ERRORSTO" value="' . getDolGlobalString('MAILING_EMAIL_ERRORSTO') . '">';
+print $langs->trans("MailingEMailError").'</td><td>';
+print '<input class="minwidth100" type="text" name="MAILING_EMAIL_ERRORSTO" value="'.getDolGlobalString('MAILING_EMAIL_ERRORSTO').'">';
 if (getDolGlobalString('MAILING_EMAIL_ERRORSTO') && !isValidEmail(getDolGlobalString('MAILING_EMAIL_ERRORSTO'))) {
-	print ' ' . img_warning($langs->trans("BadEMail"));
+	print ' '.img_warning($langs->trans("BadEMail"));
 }
 print '</td>';
-print '<td class="hideonsmartphone"><span class="opacitymedium">' . dol_escape_htmltag('<webmaster@example.com>') . '</span></td>';
+print '<td class="hideonsmartphone"><span class="opacitymedium">'.dol_escape_htmltag('<webmaster@example.com>').'</span></td>';
 print '</tr>';
 
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("MailingDelay"), $langs->trans("IfDefinedUseAValueBeetween", '0.001', '10')) . '</td><td>';
-print '<input class="width75" type="text" name="MAILING_DELAY" value="' . getDolGlobalString('MAILING_DELAY') . '">';
+print $form->textwithpicto($langs->trans("MailingDelay"), $langs->trans("IfDefinedUseAValueBeetween", '0.001', '10')).'</td><td>';
+print '<input class="width75" type="text" name="MAILING_DELAY" value="'.getDolGlobalString('MAILING_DELAY').'">';
 print '</td>';
 print '<td class="hideonsmartphone"></td>';
 print '</tr>';
@@ -191,10 +191,10 @@ 
 // It is also used as a security key parameter.
 
 print '<tr class="oddeven"><td>';
-print $langs->trans("ActivateCheckReadKey") . '</td><td>';
-print '<input class="minwidth100 maxwdith250 widthcentpercentminusx" type="text" name="MAILING_EMAIL_UNSUBSCRIBE_KEY" id="MAILING_EMAIL_UNSUBSCRIBE_KEY" value="' . getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') . '">';
+print $langs->trans("ActivateCheckReadKey").'</td><td>';
+print '<input class="minwidth100 maxwdith250 widthcentpercentminusx" type="text" name="MAILING_EMAIL_UNSUBSCRIBE_KEY" id="MAILING_EMAIL_UNSUBSCRIBE_KEY" value="'.getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY').'">';
 if (!empty($conf->use_javascript_ajax)) {
-	print '&nbsp;' . img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
 print '</td>';
 print '<td class="hideonsmartphone"></td>';
@@ -202,7 +202,7 @@ 
 
 // default blacklist from mailing
 print '<tr class="oddeven">';
-print '<td>' . $langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")) . '</td>';
+print '<td>'.$langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")).'</td>';
 print '<td>';
 $blacklist_setting = array(0 => $langs->trans('No'), 1 => $langs->trans('Yes'), 2 => $langs->trans('DefaultStatusEmptyMandatory'));
 print $form->selectarray("MAILING_CONTACT_DEFAULT_BULK_STATUS", $blacklist_setting, getDolGlobalString('MAILING_CONTACT_DEFAULT_BULK_STATUS'));
@@ -213,10 +213,10 @@ 
 // Limit number for each mailing batch, displayed only if this value is not defined in the conf.php file
 print '<tr class="oddeven">';
 $help = img_help(1, $langs->trans("MailingNumberOfEmailsPerBatchHelp"));
-print '<td>' . $langs->trans("MailingNumberOfEmailsPerBatch") . ' ' . $help . '</td>';
+print '<td>'.$langs->trans("MailingNumberOfEmailsPerBatch").' '.$help.'</td>';
 print '<td>';
 if (empty($conf->file->mailing_limit_sendbyweb)) {
-	print '<input class="width75 right" type="number" name="MAILING_LIMIT_SENDBYWEB" id="MAILING_LIMIT_SENDBYWEB" value="' . getDolGlobalString('MAILING_LIMIT_SENDBYWEB') . '">';
+	print '<input class="width75 right" type="number" name="MAILING_LIMIT_SENDBYWEB" id="MAILING_LIMIT_SENDBYWEB" value="'.getDolGlobalString('MAILING_LIMIT_SENDBYWEB').'">';
 } else {
 	print $conf->file->mailing_limit_sendbyweb;
 }

htdocs/admin/subtotals.php

Spacing +35 added lines, -35 removed lines

@@ -28,10 +28,10 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/doleditor.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doleditor.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 /**
  * @var Conf $conf
@@ -73,14 +73,14 @@ 
 $max_depth = 0;
 
 foreach ($modules as $const => $desc) {
-	$const_depth = getDolGlobalString('SUBTOTAL_' . $const . '_MAX_DEPTH');
+	$const_depth = getDolGlobalString('SUBTOTAL_'.$const.'_MAX_DEPTH');
 	$max_depth = max($const_depth, $max_depth);
 }
 
 $colors = array();
 
 for ($i = 0; $i < $max_depth; $i++) {
-	$colors['SUBTOTAL_BACK_COLOR_LEVEL_' . ($i + 1)] = array('level' => $i + 1, 'color' => getDolGlobalString('SUBTOTAL_BACK_COLOR_LEVEL_' . ($i + 1), $default));
+	$colors['SUBTOTAL_BACK_COLOR_LEVEL_'.($i + 1)] = array('level' => $i + 1, 'color' => getDolGlobalString('SUBTOTAL_BACK_COLOR_LEVEL_'.($i + 1), $default));
 }
 
 /*
@@ -90,14 +90,14 @@ 
 if (preg_match('/^SUBTOTAL_.*$/', $action)) {
 	if (preg_match('/^.*_MAX_DEPTH$/', $action)) {
 		dolibarr_set_const($db, $action, GETPOSTINT($action), 'int', 0, '', $conf->entity);
-		header("Location: " . $_SERVER['PHP_SELF']);
+		header("Location: ".$_SERVER['PHP_SELF']);
 		setEventMessages($langs->trans("SetupSaved"), null);
 		exit;
 	} else {
 		$value = getDolGlobalInt($action, 0);
 		$value == 0 ? $value = 1 : $value = 0;
 		dolibarr_set_const($db, $action, $value, 'chaine', 0, '', $conf->entity);
-		header("Location: " . $_SERVER['PHP_SELF']);
+		header("Location: ".$_SERVER['PHP_SELF']);
 		setEventMessages($langs->trans("SetupSaved"), null);
 		exit;
 	}
@@ -111,7 +111,7 @@ 
 		}
 	}
 
-	header("Location: " . $_SERVER["PHP_SELF"]);
+	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
 }
 
@@ -131,10 +131,10 @@ 
 } else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td width="1100">' . $langs->trans("Settings") . '</td>';
-	print '<td class="center">' . $langs->trans("Title") . '</td>';
-	print '<td class="center">' . $langs->trans("Subtotal") . '</td>';
-	print '<td class="center">' . $langs->trans("MaxSubtotalLevel") . '</td>';
+	print '<td width="1100">'.$langs->trans("Settings").'</td>';
+	print '<td class="center">'.$langs->trans("Title").'</td>';
+	print '<td class="center">'.$langs->trans("Subtotal").'</td>';
+	print '<td class="center">'.$langs->trans("MaxSubtotalLevel").'</td>';
 	print "</tr>\n";
 
 	// Modules
@@ -146,9 +146,9 @@ 
 
 		$langs->load($desc['lang']);
 
-		$constante_title = 'SUBTOTAL_TITLE_' . $const;
-		$constante_subtotal = 'SUBTOTAL_' . $const;
-		print '<!-- constant = ' . $constante_subtotal . ' -->' . "\n";
+		$constante_title = 'SUBTOTAL_TITLE_'.$const;
+		$constante_subtotal = 'SUBTOTAL_'.$const;
+		print '<!-- constant = '.$constante_subtotal.' -->'."\n";
 		print '<tr class="oddeven">';
 		print '<td>';
 		if (isset($desc['old_pdf'])) {
@@ -160,25 +160,25 @@ 
 
 		print '<td class="center">';
 		$value_title = getDolGlobalInt($constante_title, 0);
-		print '<a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=' . $constante_title . '&token=' . newToken() . '">';
-		print $value_title == 0 ? img_picto($langs->trans("Disabled"), 'switch_off') : img_picto($langs->trans("Enabled"), 'switch_on') . '</a>';
+		print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action='.$constante_title.'&token='.newToken().'">';
+		print $value_title == 0 ? img_picto($langs->trans("Disabled"), 'switch_off') : img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 		print '</td>';
 
 		print '<td class="center">';
 		$value_subtotal = getDolGlobalInt($constante_subtotal, 0);
-		print '<a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?action=' . $constante_subtotal . '&token=' . newToken() . '">';
-		print $value_subtotal == 0 ? img_picto($langs->trans("Disabled"), 'switch_off') : img_picto($langs->trans("Enabled"), 'switch_on') . '</a>';
+		print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action='.$constante_subtotal.'&token='.newToken().'">';
+		print $value_subtotal == 0 ? img_picto($langs->trans("Disabled"), 'switch_off') : img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 		print '</td>';
 
 		print '<td class="center">';
 		$can_modify = !($value_subtotal == 0 && $value_title == 0);
-		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '" >';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
-		print '<input type="hidden" name="action" value="SUBTOTAL_' . $const . '_MAX_DEPTH">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" >';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="SUBTOTAL_'.$const.'_MAX_DEPTH">';
 		print '<input size="3" type="text"';
 		print $can_modify ? '' : ' disabled="disabled" ';
-		print 'name="SUBTOTAL_' . $const . '_MAX_DEPTH" value="' . getDolGlobalString('SUBTOTAL_' . $const . '_MAX_DEPTH', $can_modify ? 2 : 0) . '">';
-		print $can_modify ? '<input type="submit" class="button button-edit reposition smallpaddingimp" name="Button"value="' . $langs->trans("Modify") . '">' : '';
+		print 'name="SUBTOTAL_'.$const.'_MAX_DEPTH" value="'.getDolGlobalString('SUBTOTAL_'.$const.'_MAX_DEPTH', $can_modify ? 2 : 0).'">';
+		print $can_modify ? '<input type="submit" class="button button-edit reposition smallpaddingimp" name="Button"value="'.$langs->trans("Modify").'">' : '';
 		print '</form>';
 		print '</td>';
 
@@ -189,33 +189,33 @@ 
 
 	// Other options
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update_colors">';
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td>' . $langs->trans("Other") . '</td>';
+	print '<td>'.$langs->trans("Other").'</td>';
 	print '<td></td>';
 	print "</tr>\n";
 
 	foreach ($colors as $key => $value) {
 		print '<tr class="oddeven">';
-		print '<td>' . $langs->trans("SubtotalLineBackColor", $value['level']) . '</td>';
+		print '<td>'.$langs->trans("SubtotalLineBackColor", $value['level']).'</td>';
 		print '<td class="center width250">';
-		print $formother->selectColor(colorArrayToHex(colorStringToArray($value['color'], array()), $default), $key, '', 1, array(), '', '', $default) . ' ';
-		print ' &nbsp; <span class="nowraponall opacitymedium">' . $langs->trans("Default") . '</span>: <strong>' . $default . '</strong>';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes") . ', ' . $langs->trans("PressF5AfterChangingThis"));
+		print $formother->selectColor(colorArrayToHex(colorStringToArray($value['color'], array()), $default), $key, '', 1, array(), '', '', $default).' ';
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong>';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 		print '</td>';
 		print '</tr>';
 	}
 
-	print '</table>' . "\n";
+	print '</table>'."\n";
 }
 
 print '<div class="center">';
-print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
-print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
+print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+print '<input class="button button-cancel reposition" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</div>';
 
 // End of page

htdocs/admin/expensereport_rules.php

Spacing +42 added lines, -42 removed lines

@@ -45,7 +45,7 @@ 
 $langs->loadLangs(array("admin", "other", "trips", "errors", "dict"));
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('admin', 'dictionaryadmin','expensereport_rules'));
+$hookmanager->initHooks(array('admin', 'dictionaryadmin', 'expensereport_rules'));
 
 $object = new ExpenseReportRule($db);
 
@@ -156,7 +156,7 @@ 
 			}
 
 			if (!$error) {
-				header('Location: ' . $_SERVER['PHP_SELF']);
+				header('Location: '.$_SERVER['PHP_SELF']);
 				exit;
 			} else {
 				$action = '';
@@ -170,7 +170,7 @@ 
 			dol_print_error($object->db);
 		}
 
-		header('Location: ' . $_SERVER['PHP_SELF']);
+		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	}
 
@@ -205,41 +205,41 @@ 
 $head = expensereport_admin_prepare_head();
 print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
 
-echo '<span class="opacitymedium">' . $langs->trans('ExpenseReportRulesDesc') . '</span>';
+echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
 print '<br><br>';
 
 if ($action != 'edit') {
-	echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
-	echo '<input type="hidden" name="token" value="' . newToken() . '" />';
+	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
+	echo '<input type="hidden" name="token" value="'.newToken().'" />';
 	echo '<input type="hidden" name="action" value="save" />';
 
 	echo '<table class="noborder centpercent">';
 
 	echo '<tr class="liste_titre headerexpensereportrules">';
-	echo '<th class="linecolapplyto">' . $langs->trans('ExpenseReportApplyTo') . '</th>';
-	echo '<th class="linecoltype">' . $langs->trans('Type') . '</th>';
-	echo '<th class="linecollimiton">' . $langs->trans('ExpenseReportLimitOn') . '</th>';
-	echo '<th class="linecoldatestart">' . $langs->trans('ExpenseReportDateStart') . '</th>';
-	echo '<th class="linecoldateend">' . $langs->trans('ExpenseReportDateEnd') . '</th>';
-	echo '<th class="linecollimitamount">' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
-	echo '<th class="linecolrestrictive">' . $langs->trans('ExpenseReportRestrictive') . '</th>';
+	echo '<th class="linecolapplyto">'.$langs->trans('ExpenseReportApplyTo').'</th>';
+	echo '<th class="linecoltype">'.$langs->trans('Type').'</th>';
+	echo '<th class="linecollimiton">'.$langs->trans('ExpenseReportLimitOn').'</th>';
+	echo '<th class="linecoldatestart">'.$langs->trans('ExpenseReportDateStart').'</th>';
+	echo '<th class="linecoldateend">'.$langs->trans('ExpenseReportDateEnd').'</th>';
+	echo '<th class="linecollimitamount">'.$langs->trans('ExpenseReportLimitAmount').'</th>';
+	echo '<th class="linecolrestrictive">'.$langs->trans('ExpenseReportRestrictive').'</th>';
 	echo '<th>&nbsp;</th>';
 	echo '</tr>';
 
 	echo '<tr class="oddeven">';
 	echo '<td>';
-	echo '<div class="float linecolapplyto">' . $form->selectarray('apply_to', $tab_apply, '', 0) . '</div>';
-	echo '<div id="user" class="float linecoluser">' . $form->select_dolusers('', 'fk_user') . '</div>';
-	echo '<div id="group" class="float linecolgroup">' . $form->select_dolgroups(0, 'fk_usergroup') . '</div>';
+	echo '<div class="float linecolapplyto">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>';
+	echo '<div id="user" class="float linecoluser">'.$form->select_dolusers('', 'fk_user').'</div>';
+	echo '<div id="group" class="float linecolgroup">'.$form->select_dolgroups(0, 'fk_usergroup').'</div>';
 	echo '</td>';
 
-	echo '<td class="linecoltype">' . $form->selectExpense('', 'fk_c_type_fees', 0, 1, 1) . '</td>';
-	echo '<td class="linecoltyperule">' . $form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0) . '</td>';
-	echo '<td class="linecoldatestart">' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', 0, 0, 0, '', 1, 0) . '</td>';
-	echo '<td class="linecoldateend">' . $form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', 0, 0, 0, '', 1, 0) . '</td>';
+	echo '<td class="linecoltype">'.$form->selectExpense('', 'fk_c_type_fees', 0, 1, 1).'</td>';
+	echo '<td class="linecoltyperule">'.$form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0).'</td>';
+	echo '<td class="linecoldatestart">'.$form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', 0, 0, 0, '', 1, 0).'</td>';
+	echo '<td class="linecoldateend">'.$form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', 0, 0, 0, '', 1, 0).'</td>';
 	echo '<td class="linecolamount"><input type="text" value="" class="maxwidth100" name="amount" class="amount right" /></td>';
-	echo '<td class="linecolrestrictive">' . $form->selectyesno('restrictive', 0, 1) . '</td>';
-	echo '<td class="right linecolbutton"><input type="submit" class="button button-add" value="' . $langs->trans('Add') . '" /></td>';
+	echo '<td class="linecolrestrictive">'.$form->selectyesno('restrictive', 0, 1).'</td>';
+	echo '<td class="right linecolbutton"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" /></td>';
 	echo '</tr>';
 
 	echo '</table>';
@@ -247,11 +247,11 @@ 
 }
 
 
-echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
-echo '<input type="hidden" name="token" value="' . newToken() . '" />';
+echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
+echo '<input type="hidden" name="token" value="'.newToken().'" />';
 
 if ($action == 'edit') {
-	echo '<input type="hidden" name="id" value="' . $object->id . '" />';
+	echo '<input type="hidden" name="id" value="'.$object->id.'" />';
 	echo '<input type="hidden" name="action" value="save" />';
 }
 
@@ -261,13 +261,13 @@ 
 echo '<table class="noborder centpercent">';
 
 echo '<tr class="liste_titre expensereportrules">';
-echo '<th class="linecolapplyto">' . $langs->trans('ExpenseReportApplyTo') . '</th>';
-echo '<th class="linecoltype">' . $langs->trans('Type') . '</th>';
-echo '<th class="linecollimiton">' . $langs->trans('ExpenseReportLimitOn') . '</th>';
-echo '<th class="linecoldatestart">' . $langs->trans('ExpenseReportDateStart') . '</th>';
-echo '<th class="linecoldateend">' . $langs->trans('ExpenseReportDateEnd') . '</th>';
-echo '<th class="linecollimitamount">' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
-echo '<th class="linecolrestrictive">' . $langs->trans('ExpenseReportRestrictive') . '</th>';
+echo '<th class="linecolapplyto">'.$langs->trans('ExpenseReportApplyTo').'</th>';
+echo '<th class="linecoltype">'.$langs->trans('Type').'</th>';
+echo '<th class="linecollimiton">'.$langs->trans('ExpenseReportLimitOn').'</th>';
+echo '<th class="linecoldatestart">'.$langs->trans('ExpenseReportDateStart').'</th>';
+echo '<th class="linecoldateend">'.$langs->trans('ExpenseReportDateEnd').'</th>';
+echo '<th class="linecollimitamount">'.$langs->trans('ExpenseReportLimitAmount').'</th>';
+echo '<th class="linecolrestrictive">'.$langs->trans('ExpenseReportRestrictive').'</th>';
 echo '<th>&nbsp;</th>';
 echo '</tr>';
 
@@ -277,16 +277,16 @@ 
 	echo '<td class="linecolusergroup">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
-		echo '<div class="float">' . $form->selectarray('apply_to', $tab_apply, $selected, 0) . '</div>';
-		echo '<div id="user" class="float">' . $form->select_dolusers($object->fk_user, 'fk_user') . '</div>';
-		echo '<div id="group" class="float">' . $form->select_dolgroups($object->fk_usergroup, 'fk_usergroup') . '</div>';
+		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
+		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
+		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
 	} else {
 		if ($rule->is_for_all > 0) {
 			echo $tab_apply['A'];
 		} elseif ($rule->fk_usergroup > 0) {
-			echo $tab_apply['G'] . ' (' . $rule->getGroupLabel() . ')';
+			echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
 		} elseif ($rule->fk_user > 0) {
-			echo $tab_apply['U'] . ' (' . $rule->getUserName() . ')';
+			echo $tab_apply['U'].' ('.$rule->getUserName().')';
 		}
 	}
 	echo '</td>';
@@ -339,7 +339,7 @@ 
 	// Amount
 	echo '<td class="linecolamount">';
 	if ($action == 'edit' && $object->id == $rule->id) {
-		echo '<input type="text" value="' . price2num($object->amount) . '" name="amount" class="amount width50 right" />';
+		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount width50 right" />';
 	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
 	}
@@ -357,11 +357,11 @@ 
 
 	echo '<td class="center">';
 	if ($object->id != $rule->id) {
-		echo '<a class="editfielda paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=edit&token=' . newToken() . '&id=' . $rule->id . '">' . img_edit() . '</a>&nbsp;';
-		echo '<a class="paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=delete&token=' . newToken() . '&id=' . $rule->id . '">' . img_delete() . '</a>';
+		echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
+		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
 	} else {
-		echo '<input type="submit" class="button button-edit" value="' . $langs->trans('Update') . '" />&nbsp;';
-		echo '<a href="' . $_SERVER['PHP_SELF'] . '" class="button button-cancel">' . $langs->trans("Cancel") . '</a>';
+		echo '<input type="submit" class="button button-edit" value="'.$langs->trans('Update').'" />&nbsp;';
+		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button button-cancel">'.$langs->trans("Cancel").'</a>';
 	}
 	echo '</td>';
 

htdocs/admin/bomline_extrafields.php

Spacing +7 added lines, -7 removed lines

@@ -29,8 +29,8 @@ 
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/bom/lib/bom.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 /**
  * @var Conf $conf
@@ -62,7 +62,7 @@ 
  * Actions
  */
 
-require DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 
 /*
@@ -85,7 +85,7 @@ 
 
 print dol_get_fiche_head($head, 'bomline_extrafields', $langs->trans("ExtraFields"), -1, 'account');
 
-require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_view.tpl.php';
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
 print dol_get_fiche_end();
 
@@ -93,7 +93,7 @@ 
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<a class="butAction reposition" href="' . $_SERVER["PHP_SELF"] . '?action=create">' . $langs->trans("NewAttribute") . '</a>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
@@ -105,7 +105,7 @@ 
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-	require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -115,7 +115,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-	require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page

htdocs/core/ajax/mailtemplate.php

Spacing +9 added lines, -9 removed lines

@@ -101,9 +101,9 @@ 
 		'__MYCOMPANY_PHONE_MOBILE__' => $mysoc->phone_mobile,
 		'__MYCOMPANY_FAX__' => $mysoc->fax,
 
-		'__MYCOMPANY_ADDRESS_WITH_PICTO__' => $mycompanyaddress ? '<img src="data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iNCIgdmlld0JveD0iMCAwIDI0IDI0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxwYXRoIGQ9Ik0xMiAyMmM1LjUyIDAgMTAtNC40OCAxMC0xMFMxNy41MiAyIDEyIDIgMiA2LjQ4IDIgMTJzNC40OCAxMCAxMCAxMHoiLz4KICA8Y2lyY2xlIGN4PSIxMiIgY3k9IjEyIiByPSIzIi8+Cjwvc3ZnPg==" style="height: 20px; width: 20px; display: inline-block; vertical-align: middle;"> ' . $mycompanyaddress : '',
-		'__MYCOMPANY_EMAIL_WITH_PICTO__' => $mysoc->email ? '<img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2NCA2NCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij4KICA8cmVjdCB4PSI0IiB5PSIxMiIgd2lkdGg9IjU2IiBoZWlnaHQ9IjQwIiByeD0iNCIgcnk9IjQiIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSI0Ii8+CiAgPHBvbHlsaW5lIHBvaW50cz0iNiwxNCAzMiwzNiA1OCwxNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBzdHJva2Utd2lkdGg9IjQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+" style="height: 20px; width: 20px; display: inline-block; vertical-align: middle;"> ' . $mysoc->email : '',
-		'__MYCOMPANY_PHONE_PRO_WITH_PICTO__' => $mysoc->phone ? '<img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MTIgNTEyIj48IS0tIUZvbnQgQXdlc29tZSBGcmVlIHY3LjAuMCBieSBAYm9udGF3ZXNvbWUgLSBodHRwczovL2ZvbnRhd2Vzb21lLmNvbSBMaWNlbnNlIC0gaHR0cHM6Ly9mb250YXdlc29tZS5jb20vbGljZW5zZS9mcmVlIENvcHlyaWdodCAyMDI1IEZvbnRjb25zLCBJbmMuLS0+PHBhdGggZD0iTTE2MC4yIDI1QzE1Mi4zIDYuMSAxMzEuNy0zLjkgMTEyLjEgMS40bC01LjUgMS41Yy02NC42IDE3LjYtMTE5LjggODAuMi0xMDMuNyAxNTYuNCAzNy4xIDE3NSA3NC44IDMxMi43IDM0OS44IDM0OS44IDc2LjMgMTYuMiAxMzguOC0zOS4xIDE1Ni40LTEwMy43bDEuNS01LjVjNS40LTE5LjctNC43LTQwLjMtMjMuNS00OC4xbC05Ny4zLTQwLjVjLTE2LjUtNi45LTM1LjYtMi4xLTQ3IDExLjhsLTM4LjYgNDcuMkMyMzMuOSAzMzUuNCAxNzcuMyAyNzcgMTQ0LjggMjA1LjNMMTg5IDE2OS4zYzEzLjktMTEuMyAxOC42LTMwLjQgMTEuOC00N0wxNjAuMiAyNXoiLz48L3N2Zz4=" style="height: 20px; width: 20px; display: inline-block; vertical-align: middle;"> ' . $mysoc->phone : '',
+		'__MYCOMPANY_ADDRESS_WITH_PICTO__' => $mycompanyaddress ? '<img src="data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iNCIgdmlld0JveD0iMCAwIDI0IDI0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxwYXRoIGQ9Ik0xMiAyMmM1LjUyIDAgMTAtNC40OCAxMC0xMFMxNy41MiAyIDEyIDIgMiA2LjQ4IDIgMTJzNC40OCAxMCAxMCAxMHoiLz4KICA8Y2lyY2xlIGN4PSIxMiIgY3k9IjEyIiByPSIzIi8+Cjwvc3ZnPg==" style="height: 20px; width: 20px; display: inline-block; vertical-align: middle;"> '.$mycompanyaddress : '',
+		'__MYCOMPANY_EMAIL_WITH_PICTO__' => $mysoc->email ? '<img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2NCA2NCIgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0Ij4KICA8cmVjdCB4PSI0IiB5PSIxMiIgd2lkdGg9IjU2IiBoZWlnaHQ9IjQwIiByeD0iNCIgcnk9IjQiIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSI0Ii8+CiAgPHBvbHlsaW5lIHBvaW50cz0iNiwxNCAzMiwzNiA1OCwxNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBzdHJva2Utd2lkdGg9IjQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+" style="height: 20px; width: 20px; display: inline-block; vertical-align: middle;"> '.$mysoc->email : '',
+		'__MYCOMPANY_PHONE_PRO_WITH_PICTO__' => $mysoc->phone ? '<img src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MTIgNTEyIj48IS0tIUZvbnQgQXdlc29tZSBGcmVlIHY3LjAuMCBieSBAYm9udGF3ZXNvbWUgLSBodHRwczovL2ZvbnRhd2Vzb21lLmNvbSBMaWNlbnNlIC0gaHR0cHM6Ly9mb250YXdlc29tZS5jb20vbGljZW5zZS9mcmVlIENvcHlyaWdodCAyMDI1IEZvbnRjb25zLCBJbmMuLS0+PHBhdGggZD0iTTE2MC4yIDI1QzE1Mi4zIDYuMSAxMzEuNy0zLjkgMTEyLjEgMS40bC01LjUgMS41Yy02NC42IDE3LjYtMTE5LjggODAuMi0xMDMuNyAxNTYuNCAzNy4xIDE3NSA3NC44IDMxMi43IDM0OS44IDM0OS44IDc2LjMgMTYuMiAxMzguOC0zOS4xIDE1Ni40LTEwMy43bDEuNS01LjVjNS40LTE5LjctNC43LTQwLjMtMjMuNS00OC4xbC05Ny4zLTQwLjVjLTE2LjUtNi45LTM1LjYtMi4xLTQ3IDExLjhsLTM4LjYgNDcuMkMyMzMuOSAzMzUuNCAxNzcuMyAyNzcgMTQ0LjggMjA1LjNMMTg5IDE2OS4zYzEzLjktMTEuMyAxOC42LTMwLjQgMTEuOC00N0wxNjAuMiAyNXoiLz48L3N2Zz4=" style="height: 20px; width: 20px; display: inline-block; vertical-align: middle;"> '.$mysoc->phone : '',
 	);
 
 	$listsocialnetworks = '';
@@ -149,7 +149,7 @@ 
 		 * @param 	array<int,string> $matches	Array of matches
 		 * @return 	string 						Translated string for the key
 		 */
-		function ($matches) {
+		function($matches) {
 			global $langs;
 			return $langs->trans($matches[1]);
 		},
@@ -180,14 +180,14 @@ 
 
 			$newsList .= '<div style="display: flex; align-items: flex-start; justify-content: flex-start; width: 100%; max-width: 800px; margin-top: 20px;margin-bottom: 50px; padding: 20px;">
                             <div style="flex-grow: 1; margin-right: 30px; max-width: 600px; margin-left: 100px;">
-                                <h2 style="margin: 0; font-size: 1.5em;">' . htmlentities(empty($post['title']) ? '' : $post['title']) . '</h2>
-                                <p style="margin: 10px 0; color: #555;">' . htmlentities(empty($post['description']) ? '' : $post['description']) . '</p>
-                                <span style="display: block; margin-bottom: 5px; color: #888;">Created By: <strong>' . htmlentities(empty($post['user_fullname']) ? '' : $post['user_fullname']) . '</strong></span>
+                                <h2 style="margin: 0; font-size: 1.5em;">' . htmlentities(empty($post['title']) ? '' : $post['title']).'</h2>
+                                <p style="margin: 10px 0; color: #555;">' . htmlentities(empty($post['description']) ? '' : $post['description']).'</p>
+                                <span style="display: block; margin-bottom: 5px; color: #888;">Created By: <strong>' . htmlentities(empty($post['user_fullname']) ? '' : $post['user_fullname']).'</strong></span>
                                 <br>
-                                <span style="display: block; color: #888;">' . dol_print_date((empty($post['date_creation']) ? dol_now() : $post['date_creation']), 'daytext', 'tzserver', $langs) . '</span>
+                                <span style="display: block; color: #888;">' . dol_print_date((empty($post['date_creation']) ? dol_now() : $post['date_creation']), 'daytext', 'tzserver', $langs).'</span>
                             </div>
                             <div style="flex-shrink: 0; margin-left: 100px; float: right;">
-                                ' . (!empty($post['image']) ? '<img alt="Image" width="130px" height="130px" style="border-radius: 10px;" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=medias&file=' . htmlentities($post['image']) . '">' : '<img alt="Gray rectangle" width="130px" height="130px" style="border-radius: 10px;" src="__GRAY_RECTANGLE__">') . '
+                                ' . (!empty($post['image']) ? '<img alt="Image" width="130px" height="130px" style="border-radius: 10px;" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.htmlentities($post['image']).'">' : '<img alt="Gray rectangle" width="130px" height="130px" style="border-radius: 10px;" src="__GRAY_RECTANGLE__">').'
                             </div>
                         </div>';
 		}

htdocs/core/boxes/box_funnel_of_prospection.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 			$sql .= " WHERE p.entity IN (".getEntity('project').")";
 			$sql .= " AND p.fk_opp_status = cls.rowid";
 			$sql .= " AND p.fk_statut = 1"; // Opened projects only
-			$sql .= " AND cls.active = 1"; 	// Active opportunities status only
+			$sql .= " AND cls.active = 1"; // Active opportunities status only
 			$sql .= " AND cls.code NOT IN ('LOST', 'WON')";
 			$sql .= " GROUP BY p.fk_opp_status, cls.code, cls.position";
 			$sql .= " ORDER BY cls.position, p.fk_opp_status, cls.code";