Inspection of "Daily Inspection: Merge pull request #27853 from t..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (22b42d)

unknown

created 2024-01-29 16:33 UTC

Status

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -24,8 +24,8 @@  discard block
 block discarded – undo
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 // Translations
 $langs->loadLangs(array("admin", "webportal", "website"));
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
@@ -54,12 +54,12 @@  discard block
 block discarded – undo
 $useFormSetup = 1;
 
 if (!class_exists('FormSetup')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 }
 
 $formSetup = new FormSetup($db);
 
-require_once __DIR__ . '/../class/webPortalTheme.class.php';
+require_once __DIR__.'/../class/webPortalTheme.class.php';
 $webPortalTheme = new WebPortalTheme();
 
 // Setup conf for secondary color
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 // Force always edit mode
 if (empty($action) || $action == 'update') {
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 llxHeader('', $langs->trans($title), $help_url);
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -132,10 +132,10 @@  discard block
 block discarded – undo
 } elseif (!empty($formSetup->items)) {
 	print $formSetup->generateOutput();
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 } else {
-	print '<br>' . $langs->trans("NothingToSetup");
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 

Please login to merge, or discard this patch.

htdocs/webportal/admin/setup.php 1 patch

Spacing +63 added lines, -63 removed lines patch added patch discarded remove patch

@@ -24,8 +24,8 @@  discard block
 block discarded – undo
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 // Translations
 $langs->loadLangs(array("admin", "webportal", "website"));
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 $useFormSetup = 1;
 
 if (!class_exists('FormSetup')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 }
 $formSetup = new FormSetup($db);
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
 $item->nameText = $langs->transnoentities('UrlPublicInterfaceLabelAdmin');
 $item->fieldAttr = array('placeholder' => 'https://');
 $item->helpText = $langs->transnoentities('UrlPublicInterfaceHelpAdmin');
-require_once __DIR__ . '/../class/context.class.php';
+require_once __DIR__.'/../class/context.class.php';
 //$context = Context::getInstance();
 //$item->fieldOutputOverride = '<a target="_blank" href="'.Context::getRootConfigUrl().'" >'.img_picto('', 'globe', 'class="pictofixedwidth"').Context::getRootConfigUrl().'</a>';
 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'aZ09');
@@ -149,10 +149,10 @@  discard block
 block discarded – undo
 	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/webportal/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
 			$filefound = 1;
-			$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
+			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
 		$module = new $classname($db);
 
 		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: " . DOL_URL_ROOT . "/document.php?modulepart=webportal-" . strtolower($tmpobjectkey) . "&file=SPECIMEN.pdf");
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=webportal-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
 			return;
 		} else {
 			setEventMessages($module->error, null, 'errors');
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . "_ADDON";
+		$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'set') {
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
 	if ($ret > 0) {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
-			$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
+			$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
 	// Set or unset default model
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
+		$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 			// The constant that was read before the new set
 			// We therefore requires a variable to have a coherent view
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 } elseif ($action == 'unsetdoc') {
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
+		$constforval = 'WEBPORTAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
 	}
 }
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
 llxHeader('', $langs->trans($title), $help_url);
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
 } elseif (!empty($formSetup->items)) {
 	print $formSetup->generateOutput();
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 } else {
-	print '<br>' . $langs->trans("NothingToSetup");
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 
@@ -303,26 +303,26 @@  discard block
 block discarded – undo
 
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<td>' . $langs->trans("Name") . '</td>';
-		print '<td>' . $langs->trans("Description") . '</td>';
-		print '<td class="nowrap">' . $langs->trans("Example") . '</td>';
-		print '<td class="center" width="60">' . $langs->trans("Status") . '</td>';
-		print '<td class="center" width="16">' . $langs->trans("ShortInfo") . '</td>';
-		print '</tr>' . "\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
 
 		clearstatcache();
 
 		foreach ($dirmodels as $reldir) {
-			$dir = dol_buildpath($reldir . "core/modules/" . $moduledir);
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
 
 			if (is_dir($dir)) {
 				$handle = opendir($dir);
 				if (is_resource($handle)) {
 					while (($file = readdir($handle)) !== false) {
-						if (strpos($file, 'mod_' . strtolower($myTmpObjectKey) . '_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 							$file = substr($file, 0, dol_strlen($file) - 4);
 
-							require_once $dir . '/' . $file . '.php';
+							require_once $dir.'/'.$file.'.php';
 
 							$module = new $file($db);
 
@@ -335,9 +335,9 @@  discard block
 block discarded – undo
 							}
 
 							if ($module->isEnabled()) {
-								dol_include_once('/' . $moduledir . '/class/' . strtolower($myTmpObjectKey) . '.class.php');
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
 
-								print '<tr class="oddeven"><td>' . $module->name . "</td><td>\n";
+								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 								print $module->info();
 								print '</td>';
 
@@ -346,20 +346,20 @@  discard block
 block discarded – undo
 								$tmp = $module->getExample();
 								if (preg_match('/^Error/', $tmp)) {
 									$langs->load("errors");
-									print '<div class="error">' . $langs->trans($tmp) . '</div>';
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
 								} elseif ($tmp == 'NotConfigured') {
 									print $langs->trans($tmp);
 								} else {
 									print $tmp;
 								}
-								print '</td>' . "\n";
+								print '</td>'."\n";
 
 								print '<td class="center">';
-								$constforvar = 'WEBPORTAL_' . strtoupper($myTmpObjectKey) . '_ADDON';
+								$constforvar = 'WEBPORTAL_'.strtoupper($myTmpObjectKey).'_ADDON';
 								if (getDolGlobalString($constforvar) == $file) {
 									print img_picto($langs->trans("Activated"), 'switch_on');
 								} else {
-									print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setmod&token=' . newToken() . '&object=' . strtolower($myTmpObjectKey) . '&value=' . urlencode($file) . '">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
 									print img_picto($langs->trans("Disabled"), 'switch_off');
 									print '</a>';
 								}
@@ -370,18 +370,18 @@  discard block
 block discarded – undo
 
 								// Info
 								$htmltooltip = '';
-								$htmltooltip .= '' . $langs->trans("Version") . ': <b>' . $module->getVersion() . '</b><br>';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 
 								$nextval = $module->getNextValue($mytmpinstance);
 								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-									$htmltooltip .= '' . $langs->trans("NextValue") . ': ';
+									$htmltooltip .= ''.$langs->trans("NextValue").': ';
 									if ($nextval) {
 										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
 										}
-										$htmltooltip .= $nextval . '<br>';
+										$htmltooltip .= $nextval.'<br>';
 									} else {
-										$htmltooltip .= $langs->trans($module->error) . '<br>';
+										$htmltooltip .= $langs->trans($module->error).'<br>';
 									}
 								}
 
@@ -412,9 +412,9 @@  discard block
 block discarded – undo
 		// Load array def with activated templates
 		$def = array();
 		$sql = "SELECT nom";
-		$sql .= " FROM " . $db->prefix() . "document_model";
-		$sql .= " WHERE type = '" . $db->escape($type) . "'";
-		$sql .= " AND entity = " . $conf->entity;
+		$sql .= " FROM ".$db->prefix()."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
 		if ($resql) {
 			$i = 0;
@@ -430,19 +430,19 @@  discard block
 block discarded – undo
 
 		print "<table class=\"noborder\" width=\"100%\">\n";
 		print "<tr class=\"liste_titre\">\n";
-		print '<td>' . $langs->trans("Name") . '</td>';
-		print '<td>' . $langs->trans("Description") . '</td>';
-		print '<td class="center" width="60">' . $langs->trans("Status") . "</td>\n";
-		print '<td class="center" width="60">' . $langs->trans("Default") . "</td>\n";
-		print '<td class="center" width="38">' . $langs->trans("ShortInfo") . '</td>';
-		print '<td class="center" width="38">' . $langs->trans("Preview") . '</td>';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
 		print "</tr>\n";
 
 		clearstatcache();
 
 		foreach ($dirmodels as $reldir) {
 			foreach (array('', '/doc') as $valdir) {
-				$realpath = $reldir . "core/modules/" . $moduledir . $valdir;
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
 				$dir = dol_buildpath($realpath);
 
 				if (is_dir($dir)) {
@@ -456,11 +456,11 @@  discard block
 block discarded – undo
 
 						foreach ($filelist as $file) {
 							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
-								if (file_exists($dir . '/' . $file)) {
+								if (file_exists($dir.'/'.$file)) {
 									$name = substr($file, 4, dol_strlen($file) - 16);
 									$classname = substr($file, 0, dol_strlen($file) - 12);
 
-									require_once $dir . '/' . $file;
+									require_once $dir.'/'.$file;
 									$module = new $classname($db);
 
 									$modulequalified = 1;
@@ -484,40 +484,40 @@  discard block
 block discarded – undo
 
 										// Active
 										if (in_array($name, $def)) {
-											print '<td class="center">' . "\n";
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=del&token=' . newToken() . '&value=' . urlencode($name) . '">';
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'">';
 											print img_picto($langs->trans("Enabled"), 'switch_on');
 											print '</a>';
 											print '</td>';
 										} else {
-											print '<td class="center">' . "\n";
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=set&token=' . newToken() . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</a>';
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 											print "</td>";
 										}
 
 										// Default
 										print '<td class="center">';
-										$constforvar = 'WEBPORTAL_' . strtoupper($myTmpObjectKey) . '_ADDON_PDF';
+										$constforvar = 'WEBPORTAL_'.strtoupper($myTmpObjectKey).'_ADDON_PDF';
 										if (getDolGlobalString($constforvar) == $name) {
 											//print img_picto($langs->trans("Default"), 'on');
 											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=unsetdoc&token=' . newToken() . '&object=' . urlencode(strtolower($myTmpObjectKey)) . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '&amp;type=' . urlencode($type) . '" alt="' . $langs->trans("Disable") . '">' . img_picto($langs->trans("Enabled"), 'on') . '</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&object='.urlencode(strtolower($myTmpObjectKey)).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 										} else {
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setdoc&token=' . newToken() . '&object=' . urlencode(strtolower($myTmpObjectKey)) . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '" alt="' . $langs->trans("Default") . '">' . img_picto($langs->trans("Disabled"), 'off') . '</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&object='.urlencode(strtolower($myTmpObjectKey)).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
 										// Info
-										$htmltooltip = '' . $langs->trans("Name") . ': ' . $module->name;
-										$htmltooltip .= '<br>' . $langs->trans("Type") . ': ' . ($module->type ? $module->type : $langs->trans("Unknown"));
+										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
 										if ($module->type == 'pdf') {
-											$htmltooltip .= '<br>' . $langs->trans("Width") . '/' . $langs->trans("Height") . ': ' . $module->page_largeur . '/' . $module->page_hauteur;
+											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 										}
-										$htmltooltip .= '<br>' . $langs->trans("Path") . ': ' . preg_replace('/^\//', '', $realpath) . '/' . $file;
+										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-										$htmltooltip .= '<br><br><u>' . $langs->trans("FeaturesSupported") . ':</u>';
-										$htmltooltip .= '<br>' . $langs->trans("Logo") . ': ' . yn($module->option_logo, 1, 1);
-										$htmltooltip .= '<br>' . $langs->trans("MultiLanguage") . ': ' . yn($module->option_multilang, 1, 1);
+										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
 										print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
 										// Preview
 										print '<td class="center">';
 										if ($module->type == 'pdf') {
-											$newname = preg_replace('/_' . preg_quote(strtolower($myTmpObjectKey), '/') . '/', '', $name);
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=specimen&module=' . urlencode($newname) . '&object=' . urlencode($myTmpObjectKey) . '">' . img_object($langs->trans("Preview"), 'pdf') . '</a>';
+											$newname = preg_replace('/_'.preg_quote(strtolower($myTmpObjectKey), '/').'/', '', $name);
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($newname).'&object='.urlencode($myTmpObjectKey).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 										}

Please login to merge, or discard this patch.

htdocs/webportal/admin/configcss.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -25,8 +25,8 @@  discard block
 block discarded – undo
 
 // Load Dolibarr environment
 require_once "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
 
 // Translations
 $langs->loadLangs(array("admin", "hrm", "other", "website"));
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
 );
 
 // Subheader
-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
@@ -107,14 +107,14 @@  discard block
 block discarded – undo
 print dol_get_fiche_head($head, 'css', $langs->trans($title), -1, "webportal");
 
 // Setup page goes here
-echo '<span class="opacitymedium">' . $langs->trans("WebPortalCSS") . '</span><br><br>';
+echo '<span class="opacitymedium">'.$langs->trans("WebPortalCSS").'</span><br><br>';
 
 //WYSIWYG Editor
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-print '<form enctype="multipart/form-data" method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
+print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 
-print '<input type="hidden" name="token" value="' . newToken() . '">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updatecss">';
 
 clearstatcache();
@@ -130,13 +130,13 @@  discard block
 block discarded – undo
 
 $doleditor = new DolEditor('WEBPORTAL_CUSTOM_CSS', $customcssValue, '80%', 400, 'Basic', 'In', true, false, 'ace', 10, '90%');
 $doleditor->Create(0, '', true, 'css', 'css');
-print '</td></tr>' . "\n";
+print '</td></tr>'."\n";
 
-print '</table>' . "\n";
+print '</table>'."\n";
 print '</div>';
 
 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-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>';
 

Please login to merge, or discard this patch.

htdocs/webportal/class/html.formcardwebportal.class.php 1 patch

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -150,15 +150,15 @@  discard block
 block discarded – undo
 		global $hookmanager, $langs;
 
 		$elementEnUpper = strtoupper($elementEn);
-		$objectclass = 'WebPortal' . ucfirst($elementEn);
+		$objectclass = 'WebPortal'.ucfirst($elementEn);
 
-		$elementCardAccess = getDolGlobalString('WEBPORTAL_' . $elementEnUpper . '_CARD_ACCESS', 'hidden');
+		$elementCardAccess = getDolGlobalString('WEBPORTAL_'.$elementEnUpper.'_CARD_ACCESS', 'hidden');
 		if ($elementCardAccess == 'hidden' || $id <= 0) {
 			accessforbidden();
 		}
 
 		// load module libraries
-		dol_include_once('/webportal/class/webportal' . $elementEn . '.class.php');
+		dol_include_once('/webportal/class/webportal'.$elementEn.'.class.php');
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('website', 'other'));
@@ -169,15 +169,15 @@  discard block
 block discarded – undo
 		$action = GETPOST('action', 'aZ09');
 		$confirm = GETPOST('confirm', 'alpha');
 		$cancel = GETPOST('cancel', 'aZ09');
-		$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'webportal' . $elementEn . 'card'; // To manage different context of search
-		$backtopage = GETPOST('backtopage', 'alpha');                    // if not set, a default page will be used
-		$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');    // if not set, $backtopage will be used
+		$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'webportal'.$elementEn.'card'; // To manage different context of search
+		$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
+		$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 		$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
 
 		// Initialize technical objects
 		$object = new $objectclass($this->db);
 		//$extrafields = new ExtraFields($db);
-		$hookmanager->initHooks(array('webportal' . $elementEn . 'card', 'globalcard')); // Note that conf->hooks_modules contains array
+		$hookmanager->initHooks(array('webportal'.$elementEn.'card', 'globalcard')); // Note that conf->hooks_modules contains array
 
 		// Fetch optionals attributes and labels
 		//$extrafields->fetch_name_optionals_label($object->table_element);
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
 		}
 
 		// Load object
-		include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+		include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 		// Security check (enable the most restrictive one)
 		if (!isModEnabled('webportal')) {
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
 		$this->permissiontodelete = $permissiontodelete;
 		$this->permissionnote = $permissionnote;
 		$this->permissiondellink = $permissiondellink;
-		$this->titleKey = $objectclass . 'CardTitle';
+		$this->titleKey = $objectclass.'CardTitle';
 		$this->ref = $ref;
 	}
 
@@ -245,17 +245,17 @@  discard block
 block discarded – undo
 
 		if (empty($backtopage) || ($cancel && empty($id))) {
 			if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-				$backtopage = $context->getControllerUrl($elementEn . 'card');
+				$backtopage = $context->getControllerUrl($elementEn.'card');
 			}
 		}
 
 		// Action to cancel record
 		if ($cancel) {
 			if (!empty($backtopageforcancel)) {
-				header("Location: " . $backtopageforcancel);
+				header("Location: ".$backtopageforcancel);
 				exit;
 			} elseif (!empty($backtopage)) {
-				header("Location: " . $backtopage);
+				header("Location: ".$backtopage);
 				exit;
 			}
 			$action = '';
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
 			foreach ($object->fields as $key => $val) {
 				// Check if field was submitted to be edited
 				if ($object->fields[$key]['type'] == 'duration') {
-					if (!GETPOSTISSET($key . 'hour') || !GETPOSTISSET($key . 'min')) {
+					if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) {
 						continue; // The field was not submitted to be saved
 					}
 				} elseif ($object->fields[$key]['type'] == 'boolean') {
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
 						$dateDay = (int) $dateArr[2];
 					}
 					// extract time HH:ii:ss for hours, minutes and seconds
-					$postTime = GETPOST($key . '_time', 'alphanohtml');
+					$postTime = GETPOST($key.'_time', 'alphanohtml');
 					$timeArr = explode(':', $postTime);
 					$timeHours = 12;
 					$timeMinutes = 0;
@@ -335,8 +335,8 @@  discard block
 block discarded – undo
 					}
 					$value = dol_mktime($timeHours, $timeMinutes, $timeSeconds, $dateMonth, $dateDay, $dateYear);
 				} elseif ($object->fields[$key]['type'] == 'duration') {
-					if (GETPOST($key . 'hour', 'int') != '' || GETPOST($key . 'min', 'int') != '') {
-						$value = 60 * 60 * GETPOST($key . 'hour', 'int') + 60 * GETPOST($key . 'min', 'int');
+					if (GETPOST($key.'hour', 'int') != '' || GETPOST($key.'min', 'int') != '') {
+						$value = 60 * 60 * GETPOST($key.'hour', 'int') + 60 * GETPOST($key.'min', 'int');
 					} else {
 						$value = '';
 					}
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
 					$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 					$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
 					if ($urltogo && empty($noback)) {
-						header("Location: " . $urltogo);
+						header("Location: ".$urltogo);
 						exit;
 					}
 				} else {
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
 		// main information - begin
 		$html .= '<div class="header-card-main-information">';
 		// ref
-		$html .= '<div><strong>' . $object->ref . '</strong></div>';
+		$html .= '<div><strong>'.$object->ref.'</strong></div>';
 		// full name
 		$fullname = '';
 		if (method_exists($object, 'getFullName')) {
@@ -474,11 +474,11 @@  discard block
 block discarded – undo
 		if ($object->element == 'member') {
 			if ($object->morphy == 'mor' && !empty($object->societe)) {
 				$html .= dol_htmlentities($object->societe);
-				$html .= (!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . $addgendertxt . ')' : '';
+				$html .= (!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).$addgendertxt.')' : '';
 			} else {
-				$html .= dol_htmlentities($fullname) . $addgendertxt;
+				$html .= dol_htmlentities($fullname).$addgendertxt;
 				if (empty($object->fk_soc)) {
-					$html .= (!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '';
+					$html .= (!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '';
 				}
 			}
 		} else {
@@ -568,23 +568,23 @@  discard block
 block discarded – undo
 
 			$value = $object->$key;
 
-			$html .= '<div class="grid field_' . $key . '">';
+			$html .= '<div class="grid field_'.$key.'">';
 
-			$html .= '<div class="' . (empty($val['tdcss']) ? '' : $val['tdcss']) . ' fieldname_' . $key;
+			$html .= '<div class="'.(empty($val['tdcss']) ? '' : $val['tdcss']).' fieldname_'.$key;
 			$html .= '">';
 			$labeltoshow = '';
-			$labeltoshow .= '<strong>' . $langs->trans($val['label']) . '</strong>';
+			$labeltoshow .= '<strong>'.$langs->trans($val['label']).'</strong>';
 			$html .= $labeltoshow;
 			$html .= '</div>';
 
-			$html .= '<div class="valuefield fieldname_' . $key;
+			$html .= '<div class="valuefield fieldname_'.$key;
 			if (!empty($val['cssview'])) {
-				$html .= ' ' . $val['cssview'];
+				$html .= ' '.$val['cssview'];
 			}
 			$html .= '">';
 			if ($key == 'lang') {
 				$langs->load('languages');
-				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				$labellang = ($value ? $langs->trans('Language_'.$value) : '');
 				//$html .= picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
 				$html .= $labellang;
 			} else {
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
 				continue; // We don't want this field
 			}
 
-			$html .= '<div class="grid field_' . $key . '">';
+			$html .= '<div class="grid field_'.$key.'">';
 			$html .= '<div class="titlefieldcreate';
 			if (isset($val['notnull']) && $val['notnull'] > 0) {
 				$html .= ' required';
@@ -676,15 +676,15 @@  discard block
 block discarded – undo
 				$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
 			} elseif (in_array($val['type'], array('date', 'datetime'))) {
 				$isPostDate = GETPOSTISSET($key);
-				$isPostTime = GETPOSTISSET($key . '_time');
+				$isPostTime = GETPOSTISSET($key.'_time');
 				if ($isPostDate) {
 					$postDate = GETPOST($key, 'alphanohtml');
 					if ($isPostTime) {
-						$postTime = GETPOST($key . '_time', 'alphanohtml') . ':00';
+						$postTime = GETPOST($key.'_time', 'alphanohtml').':00';
 					} else {
 						$postTime = '00:00:00';
 					}
-					$valueDateTimeStr = $postDate . ' ' . $postTime;
+					$valueDateTimeStr = $postDate.' '.$postTime;
 				} else {
 					// format date timestamp to YYYY-MM-DD HH:ii:ss
 					$valueDateTimeStr = dol_print_date($object->$key, '%Y-%m-%d %H:%M:%S');
@@ -756,19 +756,19 @@  discard block
 block discarded – undo
 			$html .= '<article>';
 			//$html .= load_fiche_titre($title, '', 'object_'.$object->picto);
 			$html .= '<header>';
-			$html .= '<h2>' . $title . '</h2>';
+			$html .= '<h2>'.$title.'</h2>';
 			$html .= '</header>';
 
 			$url_file = $context->getControllerUrl($context->controller, '', false);
-			$html .= '<form method="POST" action="' . $url_file . '">';
+			$html .= '<form method="POST" action="'.$url_file.'">';
 			$html .= $context->getFormToken();
 			$html .= '<input type="hidden" name="action" value="update">';
-			$html .= '<input type="hidden" name="id" value="' . $object->id . '">';
+			$html .= '<input type="hidden" name="id" value="'.$object->id.'">';
 			if ($backtopage) {
-				$html .= '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+				$html .= '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 			}
 			if ($backtopageforcancel) {
-				$html .= '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+				$html .= '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 			}
 
 			//$html .= '<table>'."\n";
@@ -782,8 +782,8 @@  discard block
 block discarded – undo
 
 			// Save and Cancel buttons
 			$html .= '<div class="grid">';
-			$html .= '<div><input type="submit" name="save" role="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '" /></div>';
-			$html .= '<div><input type="submit" name="cancel" role="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '" /></div>';
+			$html .= '<div><input type="submit" name="save" role="button" value="'.dol_escape_htmltag($langs->trans('Save')).'" /></div>';
+			$html .= '<div><input type="submit" name="cancel" role="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'" /></div>';
 			$html .= '</div>';
 
 			$html .= '</form>';
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
 
 			// Buttons for actions
 			if ($action != 'presend' && $action != 'editline') {
-				$html .= '<div>' . "\n";
+				$html .= '<div>'."\n";
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if ($reshook < 0) {
@@ -834,10 +834,10 @@  discard block
 block discarded – undo
 				if (empty($reshook)) {
 					if ($permissiontoadd) {
 						$url_file = $context->getControllerUrl($context->controller, '', false);
-						$html .= '<a href="' . $url_file . '&id=' . $object->id . '&action=edit" role="button">' . $langs->trans('Modify') . '</a>';
+						$html .= '<a href="'.$url_file.'&id='.$object->id.'&action=edit" role="button">'.$langs->trans('Modify').'</a>';
 					}
 				}
-				$html .= '</div>' . "\n";
+				$html .= '</div>'."\n";
 			}
 		}
 

Please login to merge, or discard this patch.

htdocs/fourn/facture/card-rec.php 1 patch

Spacing +170 added lines, -170 removed lines patch added patch discarded remove patch

@@ -32,17 +32,17 @@  discard block
 block discarded – undo
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (isModEnabled('project')) {
-	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'compta', 'admin', 'other', 'products', 'banks', 'suppliers'));
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
 	$page = 0;
 }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) {
+if (!$sortorder) {
 	$sortorder = 'DESC';
 }
-if (! $sortfield) {
+if (!$sortfield) {
 	$sortfield = 'f.titre';
 }
 $pageprev = $page - 1;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 $object = new FactureFournisseurRec($db);
 if (($id > 0 || $title) && $action != 'create' && $action != 'add') {
 	$ret = $object->fetch($id, $title);
-	if (! $ret) {
+	if (!$ret) {
 		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
 	}
 }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
 	$action = 'list';
 	$massaction = '';
 }
-if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -155,18 +155,18 @@  discard block
 block discarded – undo
 	}
 
 	// Selection of new fields
-	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Set note
-	include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Create predefined invoice
 	if ($action == 'add') {
-		if (! GETPOST('title', 'alphanohtml')) {
+		if (!GETPOST('title', 'alphanohtml')) {
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
 			$action = "create";
 			$error++;
@@ -189,10 +189,10 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$object->titre = GETPOST('title', 'alphanohtml'); // deprecated
 			$object->title = GETPOST('title', 'alphanohtml');
-			$object->libelle = GETPOST('libelle', 'alpha');	// deprecated
+			$object->libelle = GETPOST('libelle', 'alpha'); // deprecated
 			$object->label = GETPOST('libelle', 'alpha');
 			$object->fk_project = GETPOSTINT('projectid');
 			$object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
 				$action = "create";
 			}
 
-			if (! $error) {
+			if (!$error) {
 				$db->commit();
 
-				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id);
 				exit;
 			} else {
 				$db->rollback();
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
 	if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && ($user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer"))) {
 		$object->delete($user);
 
-		header('Location: ' . DOL_URL_ROOT . '/fourn/facture/list-rec.php');
+		header('Location: '.DOL_URL_ROOT.'/fourn/facture/list-rec.php');
 		exit;
 	}
 
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
 		$result = $object->setValueFrom('titre', $title, '', null, 'text', '', $user);
 
 		if ($result > 0) {
-			$object->titre = $title;	// deprecated
+			$object->titre = $title; // deprecated
 			$object->title = $title;
 			$object->ref = $object->title;
 		} else {
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $object->insertExtraFields('BILLREC_MODIFY');
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -440,8 +440,8 @@  discard block
 block discarded – undo
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty' . $predef, 'alpha'), 'MS', 2);
-		$remise_percent = price2num(GETPOST('remise_percent' . $predef), '', 2);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), '', 2);
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
 		if (is_array($extralabelsline)) {
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key . $predef]);
+				unset($_POST["options_".$key.$predef]);
 			}
 		}
 
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (! ($price_ht >= 0) || $price_ht == '')) {    // Unit price can be 0 but not ''
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (!($price_ht >= 0) || $price_ht == '')) {    // Unit price can be 0 but not ''
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
 		}
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if (! $error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
+		if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			$ret = $object->fetch($id);
 			if ($ret < 0) {
 				dol_print_error($db, $object->error);
@@ -520,8 +520,8 @@  discard block
 block discarded – undo
 			$ret = $object->fetch_thirdparty();
 
 			// Clean parameters
-			$date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
-			$date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
 			// Define special_code for special lines
@@ -618,23 +618,23 @@  discard block
 block discarded – undo
 							$outputlangs->load('products');
 						}
 						if (!empty($prod->customcode)) {
-							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
 						}
 						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
 						}
 						if (!empty($prod->country_code)) {
-							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $outputlangs, 0);
 						}
 					} else {
 						if (!empty($prod->customcode)) {
-							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
 						}
 						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
 						}
 						if (!empty($prod->country_code)) {
-							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
 						}
 					}
 					$tmptxt .= ')';
@@ -660,8 +660,8 @@  discard block
 block discarded – undo
 			$date_end_fill = !empty(GETPOST('date_end_fill', 'int')) ? GETPOST('date_end_fill', 'int') : null;
 
 			// Margin
-			$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we must keep this value
+			$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
+			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
 
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
@@ -727,8 +727,8 @@  discard block
 block discarded – undo
 				$action = '';
 			}
 		}
-	} elseif ($action == 'updateline' && $usercancreate && ! GETPOST('cancel', 'alpha')) {
-		if (! $object->fetch($id) > 0) {
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) {
+		if (!$object->fetch($id) > 0) {
 			dol_print_error($db);
 		}
 		$object->fetch_thirdparty();
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
 			$objectline->array_options = $array_options;
 			$result = $objectline->insertExtraFields();
 			if ($result < 0) {
-				setEventMessages($langs->trans('Error') . $result, null, 'errors');
+				setEventMessages($langs->trans('Error').$result, null, 'errors');
 			}
 		}
 
@@ -773,13 +773,13 @@  discard block
 block discarded – undo
 		if (is_array($extralabelsline)) {
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key]);
+				unset($_POST["options_".$key]);
 			}
 		}
 
 		// Define special_code for special lines
 		$special_code = GETPOST('special_code', 'int');
-		if (! GETPOST('qty', 'alpha')) {
+		if (!GETPOST('qty', 'alpha')) {
 			$special_code = 3;
 		}
 
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
 		$date_end_fill = !empty(GETPOST('date_end_fill', 'int')) ? GETPOST('date_end_fill', 'int') : 'NULL';
 
 		// Update line
-		if (! $error) {
+		if (!$error) {
 			$result = $object->updateline(GETPOST('lineid', 'int'), GETPOST('productid', 'int'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
 			if ($result >= 0) {
 				$object->fetch($object->id); // Reload lines
@@ -899,10 +899,10 @@  discard block
 block discarded – undo
 	if ($object->fetch($id) > 0) {
 		$result = $object->fetch_lines();
 
-		print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="add">';
-		print '<input type="hidden" name="facid" value="' . $object->id . '">';
+		print '<input type="hidden" name="facid" value="'.$object->id.'">';
 
 		print dol_get_fiche_head(null, '', '', 0);
 
@@ -919,17 +919,17 @@  discard block
 block discarded – undo
 		$object->fetch_thirdparty();
 
 		// Title
-		print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Title") . '</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="title" value="' . dol_escape_htmltag(GETPOST("title", 'alphanohtml')) . '" autofocus>';
+		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
+		print '<input class="flat quatrevingtpercent" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus>';
 		print '</td></tr>';
 
 		// Ref supplier
-		print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("RefSupplier") . '</td><td>';
-		print '<input class="flat maxwidth500" type="text" name="ref_supplier" value="' . $object->ref_supplier . '">';
+		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("RefSupplier").'</td><td>';
+		print '<input class="flat maxwidth500" type="text" name="ref_supplier" value="'.$object->ref_supplier.'">';
 		print '</td></tr>';
 
 		// Third party
-		print '<tr><td class="titlefieldcreate">' . $langs->trans("Customer") . '</td><td>' . $object->thirdparty->getNomUrl(1, 'customer') . '</td>';
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("Customer").'</td><td>'.$object->thirdparty->getNomUrl(1, 'customer').'</td>';
 		print '</tr>';
 
 		$note_public = GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : $object->note_public;
@@ -938,30 +938,30 @@  discard block
 block discarded – undo
 		// Help of substitution key
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%m') . ')';
-		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($object->date, '%m') . ')';
-		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%m') . ')';
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%B') . ')';
-		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($object->date, '%B') . ')';
-		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%B') . ')';
-		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, -1, 'y'), '%Y') . ')';
-		$substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($object->date, '%Y') . ')';
-		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, 1, 'y'), '%Y') . ')';
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%m').')';
+		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date, '%m').')';
+		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%m').')';
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%B').')';
+		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date, '%B').')';
+		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%B').')';
+		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'y'), '%Y').')';
+		$substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date, '%Y').')';
+		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'), '%Y').')';
 		// Only on template invoices
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen") . (isset($object->date_when) ? ' (' . $langs->trans("Example") . ': ' .dol_print_date($object->date_when, 'dayhour') . ')' : '');
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen") . (isset($object->date_when) ? ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date_when, $object->frequency, $object->unit_frequency), 'dayhour') . ')' : '');
+		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").(isset($object->date_when) ? ' ('.$langs->trans("Example").': '.dol_print_date($object->date_when, 'dayhour').')' : '');
+		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").(isset($object->date_when) ? ' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date_when, $object->frequency, $object->unit_frequency), 'dayhour').')' : '');
 		$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $langs->trans("Count");
 		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $langs->trans("MaxPeriodNumber");
 
-		$htmltext = '<i>' . $langs->trans("FollowingConstantsWillBeSubstituted") . ':<br>';
+		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach ($substitutionarray as $key => $val) {
-			$htmltext .= $key . ' = ' . $langs->trans($val) . '<br>';
+			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 		}
 		$htmltext .= '</i>';
 
 		// Label
-		print '<tr><td class="titlefieldcreate">' . $langs->trans("Label") . '</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="libelle" value="' . $object->label . '">';
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td>';
+		print '<input class="flat quatrevingtpercent" type="text" name="libelle" value="'.$object->label.'">';
 		print '</td></tr>';
 
 		// Public note
@@ -986,38 +986,38 @@  discard block
 block discarded – undo
 		}
 
 		// Author
-		print "<tr><td>" . $langs->trans("Author") . "</td><td>" . $user->getFullName($langs) . "</td></tr>";
+		print "<tr><td>".$langs->trans("Author")."</td><td>".$user->getFullName($langs)."</td></tr>";
 
 		// Payment term
-		print "<tr><td>" . $langs->trans("PaymentConditions") . "</td><td>";
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->cond_reglement_id, 'none');
+		print "<tr><td>".$langs->trans("PaymentConditions")."</td><td>";
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		print "</td></tr>";
 
 		// Payment mode
-		print "<tr><td>" . $langs->trans("PaymentMode") . "</td><td>";
-		$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none', '', 1);
+		print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', '', 1);
 		print "</td></tr>";
 
 		// Project
 		if (isModEnabled('project') && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
 			$projectid = GETPOST('projectid') ? GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
-			print '<tr><td>' . $langs->trans('Project') . '</td><td>';
+			print '<tr><td>'.$langs->trans('Project').'</td><td>';
 			$numprojet = $formproject->select_projects($object->thirdparty->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, '');
-			print ' &nbsp; <a href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $object->thirdparty->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $object->thirdparty->id . (!empty($id) ? '&id=' . $id : '')) . '">' . $langs->trans("AddProject") . '</a>';
+			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->thirdparty->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$object->thirdparty->id.(!empty($id) ? '&id='.$id : '')).'">'.$langs->trans("AddProject").'</a>';
 			print '</td></tr>';
 		}
 
 		// Bank account
 		if ($object->fk_account > 0) {
-			print "<tr><td>" . $langs->trans('BankAccount') . "</td><td>";
-			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'none');
+			print "<tr><td>".$langs->trans('BankAccount')."</td><td>";
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 			print "</td></tr>";
 		}
 
 		// Model pdf
-		print "<tr><td>" . $langs->trans('Model') . "</td><td>";
-		include_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+		print "<tr><td>".$langs->trans('Model')."</td><td>";
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 		$list = ModelePDFSuppliersInvoices::liste_modeles($db);
 		print $form->selectarray('modelpdf', $list, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
 		print "</td></tr>";
@@ -1028,7 +1028,7 @@  discard block
 block discarded – undo
 
 		// Autogeneration
 		$title = $langs->trans("Recurrence");
-		print load_fiche_titre(img_picto('', 'recurring', 'class="pictofixedwidth"') . $title, '', '');
+		print load_fiche_titre(img_picto('', 'recurring', 'class="pictofixedwidth"').$title, '', '');
 
 		print '<span class="opacitymedium">'.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name')).'</span><br><br>';
 
@@ -1037,30 +1037,30 @@  discard block
 block discarded – undo
 		print '<table class="border centpercent">';
 
 		// Frequency + unit
-		print '<tr><td class="titlefieldcreate">' . $form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency')) . "</td><td>";
-		print "<input type='text' name='frequency' value='" . GETPOST('frequency', 'int') . "' size='4' />&nbsp;" . $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
+		print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
+		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;".$form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
 		// Date next run
-		print "<tr><td>" . $langs->trans('NextDateToExecution') . "</td><td>";
+		print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
 		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
 		print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
 		print "</td></tr>";
 
 		// Number max of generation
-		print "<tr><td>" . $langs->trans("MaxPeriodNumber") . "</td><td>";
-		print '<input type="text" name="nb_gen_max" value="' . GETPOST('nb_gen_max') . '" size="5" />';
+		print "<tr><td>".$langs->trans("MaxPeriodNumber")."</td><td>";
+		print '<input type="text" name="nb_gen_max" value="'.GETPOST('nb_gen_max').'" size="5" />';
 		print "</td></tr>";
 
 		// Auto validate the invoice
-		print "<tr><td>" . $langs->trans("StatusOfAutoGeneratedInvoices") . "</td><td>";
+		print "<tr><td>".$langs->trans("StatusOfAutoGeneratedInvoices")."</td><td>";
 		$select = array('0' => $langs->trans('BillStatusDraft'), '1' => $langs->trans('BillStatusValidated'));
 		print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
 		print "</td></tr>";
 
 		// Auto generate document
 		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
-			print "<tr><td>" . $langs->trans("StatusOfGeneratedDocuments") . "</td><td>";
+			print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
 			$select = array('0' => $langs->trans('DoNotGenerateDoc'), '1' => $langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
@@ -1103,7 +1103,7 @@  discard block
 block discarded – undo
 
 		print "</form>\n";
 	} else {
-		dol_print_error(null, "Error, no invoice " . $object->id);
+		dol_print_error(null, "Error, no invoice ".$object->id);
 	}
 } else {
 	/*
@@ -1117,12 +1117,12 @@  discard block
 block discarded – undo
 
 		// Confirmation de la suppression d'une ligne produit
 		if ($action == 'ask_deleteline') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
 		}
 
 		// Confirm delete of repeatable invoice
 		if ($action == 'ask_deleteinvoice') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
 		}
 
 		print $formconfirm;
@@ -1136,7 +1136,7 @@  discard block
 block discarded – undo
 
 		// Recurring invoice content
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/fourn/facture/list-rec.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans('BackToList') . '</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list-rec.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans('BackToList').'</a>';
 
 		$morehtmlref = '';
 		if ($action != 'edittitle') {
@@ -1149,33 +1149,33 @@  discard block
 block discarded – undo
 		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
-		$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 
 		// Project
 		if (isModEnabled('project')) {
 			$langs->load('projects');
-			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($usercancreate) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
 				if ($action == 'classify') {
-					$morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-					$morehtmlref .= '<input type="hidden" name="token" value="' . newToken() . '">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 					$morehtmlref .= '</form>';
 				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
 					$project = new Project($db);
 					$project->fetch($object->fk_project);
-					$morehtmlref .= ' : ' . $project->getNomUrl(1);
+					$morehtmlref .= ' : '.$project->getNomUrl(1);
 					if ($project->title) {
-						$morehtmlref .= ' - ' . $project->title;
+						$morehtmlref .= ' - '.$project->title;
 					}
 				} else {
 					$morehtmlref .= '';
@@ -1194,34 +1194,34 @@  discard block
 block discarded – undo
 
 		print '<table class="border centpercent tableforfield">';
 
-		print '<tr><td class="titlefield">' . $langs->trans('Author') . '</td><td>';
+		print '<tr><td class="titlefield">'.$langs->trans('Author').'</td><td>';
 		print $author->getNomUrl(-1);
 		print "</td></tr>";
 
 		// Label
 		print '<tr>';
-		print '<td>' . $form->editfieldkey("Label", 'libelle', $object->libelle, $object, $usercancreate) . '</td>';
-		print '<td>' . $form->editfieldval("Label", 'libelle', $object->libelle, $object, $usercancreate) . '</td>';
+		print '<td>'.$form->editfieldkey("Label", 'libelle', $object->libelle, $object, $usercancreate).'</td>';
+		print '<td>'.$form->editfieldval("Label", 'libelle', $object->libelle, $object, $usercancreate).'</td>';
 		print '</tr>';
 
-		print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
-		print '<td>' . price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<tr><td>'.$langs->trans('AmountHT').'</td>';
+		print '<td>'.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 
-		print '<tr><td>' . $langs->trans("AmountVAT") . '</td><td>' . price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 
 		// Amount Local Taxes
 		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) {    // Localtax1
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap">' . price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency) . '</td></tr>';
+			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+			print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {    // Localtax2
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-			print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency) . '</td></tr>';
+			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+			print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
-		print '<tr><td>' . $langs->trans("AmountTTC") . '</td><td colspan="3">' . price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 
 		// Payment term
@@ -1230,14 +1230,14 @@  discard block
 block discarded – undo
 		print $langs->trans('PaymentConditionsShort');
 		print '</td>';
 		if ($action != 'editconditions' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&token=' . newToken() . '&facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editconditions') {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
 		}
 
 		print '</td></tr>';
@@ -1248,14 +1248,14 @@  discard block
 block discarded – undo
 		print $langs->trans('PaymentMode');
 		print '</td>';
 		if ($action != 'editmode' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editmode&token=' . newToken() . '&facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode') {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 		} else {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'none');
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
 
@@ -1268,12 +1268,12 @@  discard block
 block discarded – undo
 			print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 			print '</td>';
 			if ($usercancreate && $action != 'editmulticurrencycode' && $object->suspended == $object::STATUS_SUSPENDED) {
-				print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td><td>';
 			$htmlname = (($usercancreate && $action == 'editmulticurrencycode') ? 'multicurrency_code' : 'none');
-			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, $htmlname);
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_code, $htmlname);
 			print '</td></tr>';
 
 			// Multicurrency rate
@@ -1284,7 +1284,7 @@  discard block
 block discarded – undo
 				print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 				print '</td>';
 				if ($usercancreate && $action != 'editmulticurrencyrate' && $object->suspended == $object::STATUS_SUSPENDED && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
-					print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 				}
 				print '</tr></table>';
 				print '</td><td>';
@@ -1292,12 +1292,12 @@  discard block
 block discarded – undo
 					if ($action == 'actualizemulticurrencyrate') {
 						list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
 					}
-					$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
+					$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, ($usercancreate ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
 				} else {
-					$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+					$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
 					if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 						print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=actualizemulticurrencyrate">' . $langs->trans("ActualizeCurrency") . '</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=actualizemulticurrencyrate">'.$langs->trans("ActualizeCurrency").'</a>';
 						print '</div>';
 					}
 				}
@@ -1313,24 +1313,24 @@  discard block
 block discarded – undo
 
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m') . ')';
-		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%m') . ')';
-		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%m') . ')';
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B') . ')';
-		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%B') . ')';
-		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B') . ')';
-		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y') . ')';
-		$substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%Y') . ')';
-		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y') . ')';
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m').')';
+		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%m').')';
+		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%m').')';
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B').')';
+		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%B').')';
+		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B').')';
+		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')';
+		$substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')';
+		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y').')';
 		// Only on template invoices
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(($object->date_when ? $object->date_when : dol_now()), 'dayhour') . ')';
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree(($object->date_when ? $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour') . ')';
+		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date(($object->date_when ? $object->date_when : dol_now()), 'dayhour').')';
+		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree(($object->date_when ? $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour').')';
 		$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $object->nb_gen_done;
 		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $object->nb_gen_max;
 
-		$htmltext = '<i>' . $langs->trans("FollowingConstantsWillBeSubstituted") . ':<br>';
+		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach ($substitutionarray as $key => $val) {
-			$htmltext .= $key . ' = ' . $langs->trans($val) . '<br>';
+			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 		}
 		$htmltext .= '</i>';
 
@@ -1338,7 +1338,7 @@  discard block
 block discarded – undo
 		print '<tr><td>';
 		print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $usercancreate);
 		print '</td><td class="wordbreak">';
-		print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $usercancreate, 'textarea:' . ROWS_4 . ':90%', '', null, null, '', 1);
+		print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $usercancreate, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
 		print '</td>';
 		print '</tr>';
 
@@ -1346,7 +1346,7 @@  discard block
 block discarded – undo
 		print '<tr><td>';
 		print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $usercancreate);
 		print '</td><td class="wordbreak">';
-		print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $usercancreate, 'textarea:' . ROWS_4 . ':90%', '', null, null, '', 1);
+		print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $usercancreate, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
 		print '</td>';
 		print '</tr>';
 
@@ -1356,14 +1356,14 @@  discard block
 block discarded – undo
 		print $langs->trans('BankAccount');
 		print '<td>';
 		if ($action != 'editbankaccount' && $usercancreate && $object->statut == FactureFournisseurRec::STATUS_NOTSUSPENDED) {
-			print '<td class="right"><a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=editbankaccount&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetBankAccount'), 1) . '</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount') {
-			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'fk_account', 1);
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 		} else {
-			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'none');
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
 		print '</tr>';
@@ -1374,18 +1374,18 @@  discard block
 block discarded – undo
 		print $langs->trans('Model');
 		print '<td>';
 		if ($action != 'editmodelpdf' && $usercancreate && $object->statut == FactureFournisseurRec::STATUS_NOTSUSPENDED) {
-			print '<td class="right"><a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=editmodelpdf&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetModel'), 1) . '</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=editmodelpdf&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmodelpdf') {
-			include_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 			$list = array();
 			$models = ModelePDFSuppliersInvoices::liste_modeles($db);
 			foreach ($models as $k => $model) {
-				$list[] = str_replace(':', '|', $k) . ':' . $model;
+				$list[] = str_replace(':', '|', $k).':'.$model;
 			}
-			$select = 'select;' . implode(',', $list);
+			$select = 'select;'.implode(',', $list);
 			//TODO : Droits
 			print $form->editfieldval($langs->trans('Model'), 'modelpdf', $object->model_pdf, $object, $usercancreate, $select);
 		} else {
@@ -1396,7 +1396,7 @@  discard block
 block discarded – undo
 
 		// Other attributes
 		$cols = 2;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 
@@ -1412,7 +1412,7 @@  discard block
 block discarded – undo
 
 		print '<table class="border centpercent tableforfield">';
 
-		print '<tr><td colspan="2">' . img_picto('', 'recurring', 'class="pictofixedwidth"') . $title . '</td></tr>';
+		print '<tr><td colspan="2">'.img_picto('', 'recurring', 'class="pictofixedwidth"').$title.'</td></tr>';
 
 		// if "frequency" is empty or = 0, the recurrence is disabled
 		print '<tr><td style="width: 50%">';
@@ -1420,23 +1420,23 @@  discard block
 block discarded – undo
 		print $langs->trans('Frequency');
 		print '</td>';
 		if ($action != 'editfrequency' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&token=' . newToken() . '&facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editfrequency&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editfrequency') {
-			print '<form method="post" action="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '">';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'">';
 			print '<input type="hidden" name="action" value="setfrequency">';
-			print '<input type="hidden" name="token" value="' . newToken() . '">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<table class="nobordernopadding">';
 			print '<tr><td>';
-			print "<input type='text' name='frequency' value='" . $object->frequency . "' size='5' />&nbsp;" . $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
+			print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
 			print '</td>';
-			print '<td class="left"><input type="submit" class="button button-edit" value="' . $langs->trans("Modify") . '"></td>';
+			print '<td class="left"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		} else {
 			if ($object->frequency > 0) {
-				print $langs->trans('FrequencyPer_' . $object->unit_frequency, $object->frequency);
+				print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
 			} else {
 				print $langs->trans("NotARecurringInvoiceTemplate");
 			}
@@ -1455,8 +1455,8 @@  discard block
 block discarded – undo
 			print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
 		}
 		//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
-		if (! $object->isMaxNbGenReached()) {
-			if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
+		if (!$object->isMaxNbGenReached()) {
+			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
 				print img_warning($langs->trans("Late"));
 			}
 		} else {
@@ -1489,7 +1489,7 @@  discard block
 block discarded – undo
 			print $langs->trans("StatusOfAutoGeneratedInvoices");
 		}
 		print '</td><td>';
-		$select = 'select;0:' . $langs->trans('BillStatusDraft') . ',1:' . $langs->trans('BillStatusValidated');
+		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
 		if ($action == 'auto_validate' || $object->frequency > 0) {
 			print $form->editfieldval($langs->trans("StatusOfAutoGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $usercancreate, $select);
 		}
@@ -1505,7 +1505,7 @@  discard block
 block discarded – undo
 			}
 			print '</td>';
 			print '<td>';
-			$select = 'select;0:' . $langs->trans('DoNotGenerateDoc') . ',1:' . $langs->trans('AutogenerateDoc');
+			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
 			if ($action == 'generate_pdf' || $object->frequency > 0) {
 				print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $usercancreate, $select);
 			}
@@ -1529,7 +1529,7 @@  discard block
 block discarded – undo
 			print '<table class="border centpercent tableforfield">';
 
 			// Nb of generation already done
-			print '<tr><td style="width: 50%">' . $langs->trans("NbOfGenerationDone") . '</td>';
+			print '<tr><td style="width: 50%">'.$langs->trans("NbOfGenerationDone").'</td>';
 			print '<td>';
 			print $object->nb_gen_done ? $object->nb_gen_done : '0';
 			print '</td>';
@@ -1554,15 +1554,15 @@  discard block
 block discarded – undo
 		print '<div class="clearboth"></div><br>';
 
 		// Lines
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
-        	<input type="hidden" name="token" value="' . newToken() . '">
-        	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+        	<input type="hidden" name="token" value="' . newToken().'">
+        	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
         	<input type="hidden" name="mode" value="">
-        	<input type="hidden" name="id" value="' . $object->id . '">
+        	<input type="hidden" name="id" value="' . $object->id.'">
         	';
 
 		if (!empty($conf->use_javascript_ajax) && $object->statut == 0) {
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
 		print '<div class="div-table-responsive-no-min">';
@@ -1619,24 +1619,24 @@  discard block
 block discarded – undo
 		if (empty($object->suspended)) {
 			if ($usercancreate) {
 				if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("MaxGenerationReached")) . '">' . $langs->trans("CreateBill") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
 				} else {
 					if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $object->thirdparty->id . '&fac_rec=' . $object->id . '">' . $langs->trans("CreateBill") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("DateIsNotEnough")) . '">' . $langs->trans("CreateBill") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
 					}
 				}
 			} else {
-				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans("CreateBill") . '</a></div>';
+				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
 			}
 		}
 
 		if ($usercancreate) {
 			if (empty($object->suspended)) {
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=disable&id=' . $object->id . '&token=' . newToken() . '">' . $langs->trans("Disable") . '</a></div>';
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=disable&id='.$object->id.'&token='.newToken().'">'.$langs->trans("Disable").'</a></div>';
 			} else {
-				print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=enable&id=' . $object->id . '&token=' . newToken() . '">' . $langs->trans("Enable") . '</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=enable&id='.$object->id.'&token='.newToken().'">'.$langs->trans("Enable").'</a></div>';
 			}
 		}
 

Please login to merge, or discard this patch.

htdocs/core/modules/modWebPortal.class.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
  *  \ingroup    webportal
  *  \brief      Description and activation file for module WebPortal
  */
-include_once DOL_DOCUMENT_ROOT . '/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *  Description and activation class for module WebPortal
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
 		// Key used in llx_const table to save module status enabled/disabled (where WEBPORTAL is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
 		$this->rights = array();
 		$r = 0;
 		// Add here entries to declare new permissions
-		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
+		$this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Administer users of the customer/partner webportal module'; // Permission label
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'write';

Please login to merge, or discard this patch.

htdocs/main.inc.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -99,9 +99,9 @@  discard block
 block discarded – undo
 	//print "before decoding $val\n";
 	do {
 		$oldval = $val;
-		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);	// Decode '&colon;', '&apos;', '&Tab;', '&NewLine', ...
+		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5); // Decode '&colon;', '&apos;', '&Tab;', '&NewLine', ...
 		// Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
-		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
+		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function($m) {
 			// Decode '&#110;', ...
 			return realCharForNumericEntities($m);
 		}, $val);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
 		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
 		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
-		$inj += preg_match('/update[^&=\w].*set.+=/i', $val);	// the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
+		$inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
 		$inj += preg_match('/union.+select/i', $val);
 	}
 	if ($type == 3) {
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
 		session_set_cookie_params($sessioncookieparams);
 	}
 	session_name($sessionname);
-	session_start();	// This call the open and read of session handler
+	session_start(); // This call the open and read of session handler
 	//exit;	// this exist generates a call to write and close
 }
 
@@ -398,11 +398,11 @@  discard block
 block discarded – undo
 	if (!$ok) {
 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
 			print 'Sorry, your application is offline.'."\n";
-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "' . getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
+			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
 		} else {
-			print 'Sorry, your application is offline. Only administrator user "' . getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
+			print 'Sorry, your application is offline. Only administrator user "'.getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/';
 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
 		}
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
 					print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
 					print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0";
 					if (getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN')) {
-						print " instead of " . getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
+						print " instead of ".getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
 					}
 					print " into setup).\n";
 				}
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
 		$sessiontokenforthisurl = (empty($_SESSION['token']) ? '' : $_SESSION['token']);
 		// TODO Get the sessiontokenforthisurl into an array of session token (one array per base URL so we can use the CSRF per page and we keep ability for several tabs per url in a browser)
 	if (GETPOSTISSET('token') && GETPOST('token') != 'notrequired' && GETPOST('token', 'alpha') != $sessiontokenforthisurl) {
-		dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referrer=".(empty($_SERVER['HTTP_REFERER'])?'':$_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING);
+		dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referrer=".(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING);
 		//dol_syslog("_SESSION['token']=".$sessiontokenforthisurl, LOG_DEBUG);
 		// Do not output anything on standard output because this create problems when using the BACK button on browsers. So we just set a message into session.
 		if (!defined('NOTOKENRENEWAL')) {
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
 		unset($_GET['action']);
 		unset($_GET['confirmmassaction']);
 		unset($_GET['massaction']);
-		unset($_GET['token']);			// TODO Make a redirect if we have a token in url to remove it ?
+		unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
 		if (isset($savid)) {
 			$_POST['id'] = ((int) $savid);
 		}
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
 
 		$allowedmethodtopostusername = 3;
 		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
-			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');	// Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
+			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD'); // Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
 		}
 		// TODO Remove use of $_COOKIE['login_dolibarr'] ? Replace $usertotest = with $usertotest = GETPOST("username", "alpha", $allowedmethodtopostusername);
 		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_@\-\.]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
@@ -922,7 +922,7 @@  discard block
 block discarded – undo
 				if (!empty($_SERVER["HTTP_USER_AGENT"]) && $_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
 					http_response_code(401); // It makes easier to understand if session was broken during security tests
 				}
-				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));	// This include http headers
+				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
 			}
 			exit;
 		}
@@ -1268,7 +1268,7 @@  discard block
 block discarded – undo
 } else {
 	// We may have NOLOGIN set, but NOREQUIREUSER not
 	if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) {
-		$user->loadDefaultValues();		// Load default values for everybody (works even if $user->id = 0
+		$user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
 	}
 }
 
@@ -1448,7 +1448,7 @@  discard block
 block discarded – undo
 
 if (!empty(GETPOST('seteventmessages', 'alpha'))) {
 	$message = GETPOST('seteventmessages', 'alpha');
-	$messages  = explode(',', $message);
+	$messages = explode(',', $message);
 	foreach ($messages as $key => $msg) {
 		$tmp = explode(':', $msg);
 		setEventMessages($tmp[0], null, !empty($tmp[1]) ? $tmp[1] : 'mesgs');
@@ -1753,7 +1753,7 @@  discard block
 block discarded – undo
 
 		if (getDolGlobalString('THEME_ELDY_TOPMENU_BACK1')) {
 			// TODO: use auto theme color switch
-			print '<meta name="theme-color" content="rgb(' . getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
+			print '<meta name="theme-color" content="rgb('.getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
 		}
 
 		// Auto refresh page
@@ -2070,7 +2070,7 @@  discard block
 block discarded – undo
 			print $head."\n";
 		}
 		if (getDolGlobalString('MAIN_HTML_HEADER')) {
-			print getDolGlobalString('MAIN_HTML_HEADER') . "\n";
+			print getDolGlobalString('MAIN_HTML_HEADER')."\n";
 		}
 
 		$parameters = array();
@@ -2847,7 +2847,7 @@  discard block
 block discarded – undo
 		$langs->load(explode('@', $item['name'])[1]);
 		$dropDownQuickAddHtml .= '
 			<a class="dropdown-item quickadd-item" href="'.DOL_URL_ROOT.$item['url'].'" title="'.$langs->trans(explode('@', $item['title'])[0]).'">
-			'. img_picto('', $item['picto'], 'style="width:18px;"') . ' ' . $langs->trans(explode('@', $item['name'])[0]) . '</a>
+			'. img_picto('', $item['picto'], 'style="width:18px;"').' '.$langs->trans(explode('@', $item['name'])[0]).'</a>
 		';
 	}
 
@@ -3695,7 +3695,7 @@  discard block
 block discarded – undo
 		$forceping = GETPOST('forceping', 'alpha');
 		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping) {
 			//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
-			$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256');	// Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+			$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
 			if (!getDolGlobalString('MAIN_FIRST_PING_OK_DATE')
 				|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && (getDolGlobalString('MAIN_FIRST_PING_OK_ID') != 'disabled'))

Please login to merge, or discard this patch.

htdocs/website/class/website.class.php 1 patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -1111,8 +1111,8 @@  discard block
 block discarded – undo
 			$stringtoexport = str_replace('file=js/'.$website->ref.'/', "file=js/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/image/'.$website->ref.'/', "medias/image/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/js/'.$website->ref.'/', "medias/js/__WEBSITE_KEY__/", $stringtoexport);
-			$stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport);	// When we have a link src="image/websiteref/file.png" into html content
-			$stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport);	// When we have a link src="/image/websiteref/file.png" into html content
+			$stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content
+			$stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content
 			$stringtoexport = str_replace('"js/'.$website->ref.'/', '"js/__WEBSITE_KEY__/', $stringtoexport);
 			$stringtoexport = str_replace('"/js/'.$website->ref.'/', '"/js/__WEBSITE_KEY__/', $stringtoexport);
 
@@ -1383,7 +1383,7 @@  discard block
 block discarded – undo
 				foreach ($aliasesarray as $aliasshortcuttocreate) {
 					if (trim($aliasshortcuttocreate)) {
 						$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
-						$result = dolSavePageAlias($filealias, $object, $objectpagestatic);	// This includes also a copy into sublanguage directories.
+						$result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories.
 						if (!$result) {
 							$this->errors[] = 'Failed to write file '.basename($filealias);
 							$error++;
@@ -1404,7 +1404,7 @@  discard block
 block discarded – undo
 				$filetpl = $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php';
 			}
 			$filewrapper = $pathofwebsite.'/wrapper.php';
-			dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object);	// This includes also a version of index.php into sublanguage directories
+			dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories
 		}
 
 		if ($error) {
@@ -1633,7 +1633,7 @@  discard block
 block discarded – undo
 
 		$sourcedir = $conf->website->dir_output."/".$website->ref;
 
-		$fichierEtat = $sourcedir . '/filelist-lastwrite-doctemplates.txt';
+		$fichierEtat = $sourcedir.'/filelist-lastwrite-doctemplates.txt';
 
 		// Get array with hash of files
 		$etatPrecedent = $this->checkPreviousState($fichierEtat);
@@ -1654,7 +1654,7 @@  discard block
 block discarded – undo
 				$modifications[] = $file;
 			}
 
-			$etatPrecedent[$file['name']] = $hashActuel;	// we store he new hash to record it later on disk.
+			$etatPrecedent[$file['name']] = $hashActuel; // we store he new hash to record it later on disk.
 		}
 
 		// Replace modified files into the doctemplates directory.
@@ -1687,11 +1687,11 @@  discard block
 block discarded – undo
 								}
 								$getContentSource = file_get_contents($destdir.'/containers/'.$nomFichierModifie);
 								$nextpage = max($tabnumpage) + 1;
-								$chaineModifiee = preg_replace('/page\d+\.tpl\.php/', 'page' . $nextpage . '.tpl.php', $getContentSource);
+								$chaineModifiee = preg_replace('/page\d+\.tpl\.php/', 'page'.$nextpage.'.tpl.php', $getContentSource);
 								$write = file_put_contents($destdir.'/containers/'.$nomFichierModifie, $chaineModifiee);
 								if ($write !== false) {
-									if (!touch($destdir.'/containers/'."page" . $nextpage . ".tpl.php")) {
-										setEventMessages("Please check permission to create  <b>page" . $nextpage . ".tpl.php</b> in template <b>".$website->name_template."</b>", null, 'errors');
+									if (!touch($destdir.'/containers/'."page".$nextpage.".tpl.php")) {
+										setEventMessages("Please check permission to create  <b>page".$nextpage.".tpl.php</b> in template <b>".$website->name_template."</b>", null, 'errors');
 									}
 									$fileFounded = '';
 									foreach ($arraySourcedir as $file) {
@@ -1708,9 +1708,9 @@  discard block
 block discarded – undo
 											if (!is_writable($file['fullname'])) {
 												dolChmod($file['fullname'], '0664');
 											}
-											$diff = $this->showDifferences(file_get_contents($destdir.'/containers/'."page" . $nextpage . ".tpl.php"), file_get_contents($file['fullname']), array($nextpage,$this->extractNumberFromFilename($file['name'])));
+											$diff = $this->showDifferences(file_get_contents($destdir.'/containers/'."page".$nextpage.".tpl.php"), file_get_contents($file['fullname']), array($nextpage, $this->extractNumberFromFilename($file['name'])));
 											if ($diff != -1) {
-												$replace = $this->replaceLineUsingNum($destdir.'/containers/'."page" . $nextpage . ".tpl.php", $diff);
+												$replace = $this->replaceLineUsingNum($destdir.'/containers/'."page".$nextpage.".tpl.php", $diff);
 												if ($replace !== false) {
 													setEventMessages("Copy file <b>page".$nextpage.".tpl.php</b> in template <b>".$this->name_template."</b> with success", null, 'warnings');
 												}
@@ -1856,7 +1856,7 @@  discard block
 block discarded – undo
 	 */
 	public function initFilesStatus($sourcedir)
 	{
-		$fichierEtat = $sourcedir . '/filelist-lastwrite-doctemplates.txt';
+		$fichierEtat = $sourcedir.'/filelist-lastwrite-doctemplates.txt';
 
 		$etatPrecedent = $this->checkPreviousState($fichierEtat);
 
@@ -1956,7 +1956,7 @@  discard block
 block discarded – undo
 				$destContent = file_get_contents($fileNeeded['fullname']);
 
 				$numOfPageDest = $this->extractNumberFromFilename($fileNeeded['name']);
-				$differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest,$numOfPageSource));
+				$differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest, $numOfPageSource));
 				$differences['file_destination'] = $fileNeeded;
 			}
 			return $differences;
@@ -1997,9 +1997,9 @@  discard block
 block discarded – undo
 		$linefound = array();
 		$countNumPage = count($exceptNumPge);
 
-		for ($i = 0;$i< $countNumPage; $i++) {
-			$linefound[$i]['meta'] = '/content="' . preg_quote($exceptNumPge[$i], '/') . '" \/>/';
-			$linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote($exceptNumPge[$i], '/') . '\);/';
+		for ($i = 0; $i < $countNumPage; $i++) {
+			$linefound[$i]['meta'] = '/content="'.preg_quote($exceptNumPge[$i], '/').'" \/>/';
+			$linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", '.preg_quote($exceptNumPge[$i], '/').'\);/';
 		}
 
 		$maxLines = max(count($lines1), count($lines2));
@@ -2021,13 +2021,13 @@  discard block
 block discarded – undo
 			if ($lineContent1 !== $lineContent2) {
 				if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) {
 					// Ligne deleted de la source
-					$diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1;
+					$diff["Supprimée à la ligne ".($lineNum + 1)] = $lineContent1;
 				} elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) {
 					// Nouvelle ligne added dans la destination
-					$diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2;
+					$diff["Ajoutée à la ligne ".($lineNum + 1)] = $lineContent2;
 				} else {
 					// Différence found it
-					$diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2;
+					$diff["Modifiée à la ligne ".($lineNum + 1)] = $lineContent2;
 				}
 			}
 		}
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
 
 		$pairesRemplacement = array();
 		if (!empty($linesShouldnNotChange)) {
-			$i =0;
+			$i = 0;
 			foreach ($linesShouldnNotChange as $numLigne => $ligneRemplacement) {
 				if (isset($linesShouldnChange[$numLigne])) {
 					$pairesRemplacement[$ligneRemplacement] = $linesShouldnChange[$numLigne];
@@ -2077,7 +2077,7 @@  discard block
 block discarded – undo
 		$userId = fileowner($desfFile);
 		if ($userId !== false) {
 			// Obtain user information from the ID
-			if (function_exists('posix_getpwuid')&& function_exists('posix_getpwuid')) {
+			if (function_exists('posix_getpwuid') && function_exists('posix_getpwuid')) {
 				$uid = posix_geteuid();
 				$userInfoM = posix_getpwuid($uid);
 

Please login to merge, or discard this patch.

htdocs/core/class/commondocgenerator.class.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -153,8 +153,8 @@  discard block
 block discarded – undo
 	public $posxlabel;
 	public $posxup;
 	public $posxref;
-	public $posxpicture;	// For picture
-	public $posxdesc;		// For description
+	public $posxpicture; // For picture
+	public $posxdesc; // For description
 	public $posxqty;
 	public $posxpuht;
 	public $posxtva;
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
 			'myuser_email'=>$user->email,
 			'myuser_logo'=>$logotouse,
 			'myuser_job'=>$user->job,
-			'myuser_web'=>'',	// url not exist in $user object
+			'myuser_web'=>'', // url not exist in $user object
 			'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'),
 			'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'),
 			'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
 
 		if (get_class($object) == 'CommandeFournisseur') {
 			/* @var $object CommandeFournisseur*/
-			$object->date_validation =  $object->date_valid;
+			$object->date_validation = $object->date_valid;
 			$object->date_commande = $object->date;
 		}
 		$resarray = array(
@@ -615,10 +615,10 @@  discard block
 block discarded – undo
 			$resarray[$array_key.'_bank_bic'] = (empty($bank_account) ? '' : $bank_account->bic);
 			$resarray[$array_key.'_bank_label'] = (empty($bank_account) ? '' : $bank_account->label);
 			$resarray[$array_key.'_bank_number'] = (empty($bank_account) ? '' : $bank_account->number);
-			$resarray[$array_key.'_bank_proprio'] =(empty($bank_account) ? '' : $bank_account->proprio);
-			$resarray[$array_key.'_bank_address'] =(empty($bank_account) ? '' : $bank_account->address);
-			$resarray[$array_key.'_bank_state'] =(empty($bank_account) ? '' : $bank_account->state);
-			$resarray[$array_key.'_bank_country'] =(empty($bank_account) ? '' : $bank_account->country);
+			$resarray[$array_key.'_bank_proprio'] = (empty($bank_account) ? '' : $bank_account->proprio);
+			$resarray[$array_key.'_bank_address'] = (empty($bank_account) ? '' : $bank_account->address);
+			$resarray[$array_key.'_bank_state'] = (empty($bank_account) ? '' : $bank_account->state);
+			$resarray[$array_key.'_bank_country'] = (empty($bank_account) ? '' : $bank_account->country);
 		}
 
 		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
 			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
 			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
 		} else { // empty replacement
-			$resarray[$array_key.'_project_ref'] ='';
+			$resarray[$array_key.'_project_ref'] = '';
 			$resarray[$array_key.'_project_title'] = '';
 			$resarray[$array_key.'_project_description'] = '';
 			$resarray[$array_key.'_project_date_start'] = '';
@@ -1478,7 +1478,7 @@  discard block
 block discarded – undo
 
 		if (!empty($fields)) {
 			// Sort extrafields by rank
-			uasort($fields, function ($a, $b) {
+			uasort($fields, function($a, $b) {
 				return  ($a->rank > $b->rank) ? 1 : -1;
 			});
 

Please login to merge, or discard this patch.

		@@ -1111,8 +1111,8 @@ discard block
		block discarded – undo
1111	1111	$stringtoexport = str_replace('file=js/'.$website->ref.'/', "file=js/__WEBSITE_KEY__/", $stringtoexport);
1112	1112	$stringtoexport = str_replace('medias/image/'.$website->ref.'/', "medias/image/__WEBSITE_KEY__/", $stringtoexport);
1113	1113	$stringtoexport = str_replace('medias/js/'.$website->ref.'/', "medias/js/__WEBSITE_KEY__/", $stringtoexport);
1114		- $stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content
1115		- $stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content
	1114	+ $stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content
	1115	+ $stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content
1116	1116	$stringtoexport = str_replace('"js/'.$website->ref.'/', '"js/__WEBSITE_KEY__/', $stringtoexport);
1117	1117	$stringtoexport = str_replace('"/js/'.$website->ref.'/', '"/js/__WEBSITE_KEY__/', $stringtoexport);
1118	1118
		@@ -1383,7 +1383,7 @@ discard block
		block discarded – undo
1383	1383	foreach ($aliasesarray as $aliasshortcuttocreate) {
1384	1384	if (trim($aliasshortcuttocreate)) {
1385	1385	$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
1386		- $result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories.
	1386	+ $result = dolSavePageAlias($filealias, $object, $objectpagestatic); // This includes also a copy into sublanguage directories.
1387	1387	if (!$result) {
1388	1388	$this->errors[] = 'Failed to write file '.basename($filealias);
1389	1389	$error++;
		@@ -1404,7 +1404,7 @@ discard block
		block discarded – undo
1404	1404	$filetpl = $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php';
1405	1405	}
1406	1406	$filewrapper = $pathofwebsite.'/wrapper.php';
1407		- dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories
	1407	+ dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories
1408	1408	}
1409	1409
1410	1410	if ($error) {
		@@ -1633,7 +1633,7 @@ discard block
		block discarded – undo
1633	1633
1634	1634	$sourcedir = $conf->website->dir_output."/".$website->ref;
1635	1635
1636		- $fichierEtat = $sourcedir . '/filelist-lastwrite-doctemplates.txt';
	1636	+ $fichierEtat = $sourcedir.'/filelist-lastwrite-doctemplates.txt';
1637	1637
1638	1638	// Get array with hash of files
1639	1639	$etatPrecedent = $this->checkPreviousState($fichierEtat);
		@@ -1654,7 +1654,7 @@ discard block
		block discarded – undo
1654	1654	$modifications[] = $file;
1655	1655	}
1656	1656
1657		- $etatPrecedent[$file['name']] = $hashActuel; // we store he new hash to record it later on disk.
	1657	+ $etatPrecedent[$file['name']] = $hashActuel; // we store he new hash to record it later on disk.
1658	1658	}
1659	1659
1660	1660	// Replace modified files into the doctemplates directory.
		@@ -1687,11 +1687,11 @@ discard block
		block discarded – undo
1687	1687	}
1688	1688	$getContentSource = file_get_contents($destdir.'/containers/'.$nomFichierModifie);
1689	1689	$nextpage = max($tabnumpage) + 1;
1690		- $chaineModifiee = preg_replace('/page\d+\.tpl\.php/', 'page' . $nextpage . '.tpl.php', $getContentSource);
	1690	+ $chaineModifiee = preg_replace('/page\d+\.tpl\.php/', 'page'.$nextpage.'.tpl.php', $getContentSource);
1691	1691	$write = file_put_contents($destdir.'/containers/'.$nomFichierModifie, $chaineModifiee);
1692	1692	if ($write !== false) {
1693		- if (!touch($destdir.'/containers/'."page" . $nextpage . ".tpl.php")) {
1694		- setEventMessages("Please check permission to create <b>page" . $nextpage . ".tpl.php</b> in template <b>".$website->name_template."</b>", null, 'errors');
	1693	+ if (!touch($destdir.'/containers/'."page".$nextpage.".tpl.php")) {
	1694	+ setEventMessages("Please check permission to create <b>page".$nextpage.".tpl.php</b> in template <b>".$website->name_template."</b>", null, 'errors');
1695	1695	}
1696	1696	$fileFounded = '';
1697	1697	foreach ($arraySourcedir as $file) {
		@@ -1708,9 +1708,9 @@ discard block
		block discarded – undo
1708	1708	if (!is_writable($file['fullname'])) {
1709	1709	dolChmod($file['fullname'], '0664');
1710	1710	}
1711		- $diff = $this->showDifferences(file_get_contents($destdir.'/containers/'."page" . $nextpage . ".tpl.php"), file_get_contents($file['fullname']), array($nextpage,$this->extractNumberFromFilename($file['name'])));
	1711	+ $diff = $this->showDifferences(file_get_contents($destdir.'/containers/'."page".$nextpage.".tpl.php"), file_get_contents($file['fullname']), array($nextpage, $this->extractNumberFromFilename($file['name'])));
1712	1712	if ($diff != -1) {
1713		- $replace = $this->replaceLineUsingNum($destdir.'/containers/'."page" . $nextpage . ".tpl.php", $diff);
	1713	+ $replace = $this->replaceLineUsingNum($destdir.'/containers/'."page".$nextpage.".tpl.php", $diff);
1714	1714	if ($replace !== false) {
1715	1715	setEventMessages("Copy file <b>page".$nextpage.".tpl.php</b> in template <b>".$this->name_template."</b> with success", null, 'warnings');
1716	1716	}
		@@ -1856,7 +1856,7 @@ discard block
		block discarded – undo
1856	1856	*/
1857	1857	public function initFilesStatus($sourcedir)
1858	1858	{
1859		- $fichierEtat = $sourcedir . '/filelist-lastwrite-doctemplates.txt';
	1859	+ $fichierEtat = $sourcedir.'/filelist-lastwrite-doctemplates.txt';
1860	1860
1861	1861	$etatPrecedent = $this->checkPreviousState($fichierEtat);
1862	1862
		@@ -1956,7 +1956,7 @@ discard block
		block discarded – undo
1956	1956	$destContent = file_get_contents($fileNeeded['fullname']);
1957	1957
1958	1958	$numOfPageDest = $this->extractNumberFromFilename($fileNeeded['name']);
1959		- $differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest,$numOfPageSource));
	1959	+ $differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest, $numOfPageSource));
1960	1960	$differences['file_destination'] = $fileNeeded;
1961	1961	}
1962	1962	return $differences;
		@@ -1997,9 +1997,9 @@ discard block
		block discarded – undo
1997	1997	$linefound = array();
1998	1998	$countNumPage = count($exceptNumPge);
1999	1999
2000		- for ($i = 0;$i< $countNumPage; $i++) {
2001		- $linefound[$i]['meta'] = '/content="' . preg_quote($exceptNumPge[$i], '/') . '" \/>/';
2002		- $linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote($exceptNumPge[$i], '/') . '\);/';
	2000	+ for ($i = 0; $i < $countNumPage; $i++) {
	2001	+ $linefound[$i]['meta'] = '/content="'.preg_quote($exceptNumPge[$i], '/').'" \/>/';
	2002	+ $linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", '.preg_quote($exceptNumPge[$i], '/').'\);/';
2003	2003	}
2004	2004
2005	2005	$maxLines = max(count($lines1), count($lines2));
		@@ -2021,13 +2021,13 @@ discard block
		block discarded – undo
2021	2021	if ($lineContent1 !== $lineContent2) {
2022	2022	if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) {
2023	2023	// Ligne deleted de la source
2024		- $diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1;
	2024	+ $diff["Supprimée à la ligne ".($lineNum + 1)] = $lineContent1;
2025	2025	} elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) {
2026	2026	// Nouvelle ligne added dans la destination
2027		- $diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2;
	2027	+ $diff["Ajoutée à la ligne ".($lineNum + 1)] = $lineContent2;
2028	2028	} else {
2029	2029	// Différence found it
2030		- $diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2;
	2030	+ $diff["Modifiée à la ligne ".($lineNum + 1)] = $lineContent2;
2031	2031	}
2032	2032	}
2033	2033	}
		@@ -2040,7 +2040,7 @@ discard block
		block discarded – undo
2040	2040
2041	2041	$pairesRemplacement = array();
2042	2042	if (!empty($linesShouldnNotChange)) {
2043		- $i =0;
	2043	+ $i = 0;
2044	2044	foreach ($linesShouldnNotChange as $numLigne => $ligneRemplacement) {
2045	2045	if (isset($linesShouldnChange[$numLigne])) {
2046	2046	$pairesRemplacement[$ligneRemplacement] = $linesShouldnChange[$numLigne];
		@@ -2077,7 +2077,7 @@ discard block
		block discarded – undo
2077	2077	$userId = fileowner($desfFile);
2078	2078	if ($userId !== false) {
2079	2079	// Obtain user information from the ID
2080		- if (function_exists('posix_getpwuid')&& function_exists('posix_getpwuid')) {
	2080	+ if (function_exists('posix_getpwuid') && function_exists('posix_getpwuid')) {
2081	2081	$uid = posix_geteuid();
2082	2082	$userInfoM = posix_getpwuid($uid);
2083	2083

		@@ -24,8 +24,8 @@ discard block
		block discarded – undo
24	24
25	25	// Load Dolibarr environment
26	26	require_once "../../main.inc.php";
27		-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
28		-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
	27	+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
	28	+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
29	29
30	30	// Translations
31	31	$langs->loadLangs(array("admin", "webportal", "website"));
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	// Parameters
37	37	$action = GETPOST('action', 'aZ09');
38	38	$backtopage = GETPOST('backtopage', 'alpha');
39		-$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
	39	+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
40	40
41	41	$value = GETPOST('value', 'alpha');
42	42	$label = GETPOST('label', 'alpha');
		@@ -54,12 +54,12 @@ discard block
		block discarded – undo
54	54	$useFormSetup = 1;
55	55
56	56	if (!class_exists('FormSetup')) {
57		- require_once DOL_DOCUMENT_ROOT . '/core/class/html.formsetup.class.php';
	57	+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
58	58	}
59	59
60	60	$formSetup = new FormSetup($db);
61	61
62		-require_once __DIR__ . '/../class/webPortalTheme.class.php';
	62	+require_once __DIR__.'/../class/webPortalTheme.class.php';
63	63	$webPortalTheme = new WebPortalTheme();
64	64
65	65	// Setup conf for secondary color
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	* Actions
96	96	*/
97	97
98		-include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
	98	+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
99	99
100	100	// Force always edit mode
101	101	if (empty($action) \|\| $action == 'update') {
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	llxHeader('', $langs->trans($title), $help_url);
116	116
117	117	// Subheader
118		-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
	118	+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
119	119
120	120	print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
121	121
		@@ -132,10 +132,10 @@ discard block
		block discarded – undo
132	132	} elseif (!empty($formSetup->items)) {
133	133	print $formSetup->generateOutput();
134	134	print '<div class="tabsAction">';
135		- print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>';
	135	+ print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
136	136	print '</div>';
137	137	} else {
138		- print '<br>' . $langs->trans("NothingToSetup");
	138	+ print '<br>'.$langs->trans("NothingToSetup");
139	139	}
140	140
141	141

		@@ -25,8 +25,8 @@ discard block
		block discarded – undo
25	25
26	26	// Load Dolibarr environment
27	27	require_once "../../main.inc.php";
28		-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
29		-require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php";
	28	+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
	29	+require_once DOL_DOCUMENT_ROOT."/webportal/lib/webportal.lib.php";
30	30
31	31	// Translations
32	32	$langs->loadLangs(array("admin", "hrm", "other", "website"));
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	);
99	99
100	100	// Subheader
101		-$linkback = '<a href="' . ($backtopage ? $backtopage : DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans("BackToModuleList") . '</a>';
	101	+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
102	102
103	103	print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
104	104
		@@ -107,14 +107,14 @@ discard block
		block discarded – undo
107	107	print dol_get_fiche_head($head, 'css', $langs->trans($title), -1, "webportal");
108	108
109	109	// Setup page goes here
110		-echo '<span class="opacitymedium">' . $langs->trans("WebPortalCSS") . '</span><br><br>';
	110	+echo '<span class="opacitymedium">'.$langs->trans("WebPortalCSS").'</span><br><br>';
111	111
112	112	//WYSIWYG Editor
113		-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
	113	+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
114	114
115		-print '<form enctype="multipart/form-data" method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
	115	+print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
116	116
117		-print '<input type="hidden" name="token" value="' . newToken() . '">';
	117	+print '<input type="hidden" name="token" value="'.newToken().'">';
118	118	print '<input type="hidden" name="action" value="updatecss">';
119	119
120	120	clearstatcache();
		@@ -130,13 +130,13 @@ discard block
		block discarded – undo
130	130
131	131	$doleditor = new DolEditor('WEBPORTAL_CUSTOM_CSS', $customcssValue, '80%', 400, 'Basic', 'In', true, false, 'ace', 10, '90%');
132	132	$doleditor->Create(0, '', true, 'css', 'css');
133		-print '</td></tr>' . "\n";
	133	+print '</td></tr>'."\n";
134	134
135		-print '</table>' . "\n";
	135	+print '</table>'."\n";
136	136	print '</div>';
137	137
138	138	print '<div class="center">';
139		-print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
	139	+print '<input class="button button-save reposition buttonforacesave" type="submit" name="submit" value="'.$langs->trans("Save").'">';
140	140	//print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
141	141	print '</div>';
142	142

		@@ -150,15 +150,15 @@ discard block
		block discarded – undo
150	150	global $hookmanager, $langs;
151	151
152	152	$elementEnUpper = strtoupper($elementEn);
153		- $objectclass = 'WebPortal' . ucfirst($elementEn);
	153	+ $objectclass = 'WebPortal'.ucfirst($elementEn);
154	154
155		- $elementCardAccess = getDolGlobalString('WEBPORTAL_' . $elementEnUpper . '_CARD_ACCESS', 'hidden');
	155	+ $elementCardAccess = getDolGlobalString('WEBPORTAL_'.$elementEnUpper.'_CARD_ACCESS', 'hidden');
156	156	if ($elementCardAccess == 'hidden' \|\| $id <= 0) {
157	157	accessforbidden();
158	158	}
159	159
160	160	// load module libraries
161		- dol_include_once('/webportal/class/webportal' . $elementEn . '.class.php');
	161	+ dol_include_once('/webportal/class/webportal'.$elementEn.'.class.php');
162	162
163	163	// Load translation files required by the page
164	164	$langs->loadLangs(array('website', 'other'));
		@@ -169,15 +169,15 @@ discard block
		block discarded – undo
169	169	$action = GETPOST('action', 'aZ09');
170	170	$confirm = GETPOST('confirm', 'alpha');
171	171	$cancel = GETPOST('cancel', 'aZ09');
172		- $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'webportal' . $elementEn . 'card'; // To manage different context of search
173		- $backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
174		- $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
	172	+ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'webportal'.$elementEn.'card'; // To manage different context of search
	173	+ $backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
	174	+ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
175	175	$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
176	176
177	177	// Initialize technical objects
178	178	$object = new $objectclass($this->db);
179	179	//$extrafields = new ExtraFields($db);
180		- $hookmanager->initHooks(array('webportal' . $elementEn . 'card', 'globalcard')); // Note that conf->hooks_modules contains array
	180	+ $hookmanager->initHooks(array('webportal'.$elementEn.'card', 'globalcard')); // Note that conf->hooks_modules contains array
181	181
182	182	// Fetch optionals attributes and labels
183	183	//$extrafields->fetch_name_optionals_label($object->table_element);
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	}
189	189
190	190	// Load object
191		- include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
	191	+ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
192	192
193	193	// Security check (enable the most restrictive one)
194	194	if (!isModEnabled('webportal')) {
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	$this->permissiontodelete = $permissiontodelete;
213	213	$this->permissionnote = $permissionnote;
214	214	$this->permissiondellink = $permissiondellink;
215		- $this->titleKey = $objectclass . 'CardTitle';
	215	+ $this->titleKey = $objectclass.'CardTitle';
216	216	$this->ref = $ref;
217	217	}
218	218
		@@ -245,17 +245,17 @@ discard block
		block discarded – undo
245	245
246	246	if (empty($backtopage) \|\| ($cancel && empty($id))) {
247	247	if (empty($backtopage) \|\| ($cancel && strpos($backtopage, '__ID__'))) {
248		- $backtopage = $context->getControllerUrl($elementEn . 'card');
	248	+ $backtopage = $context->getControllerUrl($elementEn.'card');
249	249	}
250	250	}
251	251
252	252	// Action to cancel record
253	253	if ($cancel) {
254	254	if (!empty($backtopageforcancel)) {
255		- header("Location: " . $backtopageforcancel);
	255	+ header("Location: ".$backtopageforcancel);
256	256	exit;
257	257	} elseif (!empty($backtopage)) {
258		- header("Location: " . $backtopage);
	258	+ header("Location: ".$backtopage);
259	259	exit;
260	260	}
261	261	$action = '';
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	foreach ($object->fields as $key => $val) {
267	267	// Check if field was submitted to be edited
268	268	if ($object->fields[$key]['type'] == 'duration') {
269		- if (!GETPOSTISSET($key . 'hour') \|\| !GETPOSTISSET($key . 'min')) {
	269	+ if (!GETPOSTISSET($key.'hour') \|\| !GETPOSTISSET($key.'min')) {
270	270	continue; // The field was not submitted to be saved
271	271	}
272	272	} elseif ($object->fields[$key]['type'] == 'boolean') {
		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	$dateDay = (int) $dateArr[2];
318	318	}
319	319	// extract time HH:ii:ss for hours, minutes and seconds
320		- $postTime = GETPOST($key . '_time', 'alphanohtml');
	320	+ $postTime = GETPOST($key.'_time', 'alphanohtml');
321	321	$timeArr = explode(':', $postTime);
322	322	$timeHours = 12;
323	323	$timeMinutes = 0;
		@@ -335,8 +335,8 @@ discard block
		block discarded – undo
335	335	}
336	336	$value = dol_mktime($timeHours, $timeMinutes, $timeSeconds, $dateMonth, $dateDay, $dateYear);
337	337	} elseif ($object->fields[$key]['type'] == 'duration') {
338		- if (GETPOST($key . 'hour', 'int') != '' \|\| GETPOST($key . 'min', 'int') != '') {
339		- $value = 60 * 60 * GETPOST($key . 'hour', 'int') + 60 * GETPOST($key . 'min', 'int');
	338	+ if (GETPOST($key.'hour', 'int') != '' \|\| GETPOST($key.'min', 'int') != '') {
	339	+ $value = 60 * 60 * GETPOST($key.'hour', 'int') + 60 * GETPOST($key.'min', 'int');
340	340	} else {
341	341	$value = '';
342	342	}
		@@ -405,7 +405,7 @@ discard block
		block discarded – undo
405	405	$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
406	406	$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
407	407	if ($urltogo && empty($noback)) {
408		- header("Location: " . $urltogo);
	408	+ header("Location: ".$urltogo);
409	409	exit;
410	410	}
411	411	} else {
		@@ -464,7 +464,7 @@ discard block
		block discarded – undo
464	464	// main information - begin
465	465	$html .= '<div class="header-card-main-information">';
466	466	// ref
467		- $html .= '<div><strong>' . $object->ref . '</strong></div>';
	467	+ $html .= '<div><strong>'.$object->ref.'</strong></div>';
468	468	// full name
469	469	$fullname = '';
470	470	if (method_exists($object, 'getFullName')) {
		@@ -474,11 +474,11 @@ discard block
		block discarded – undo
474	474	if ($object->element == 'member') {
475	475	if ($object->morphy == 'mor' && !empty($object->societe)) {
476	476	$html .= dol_htmlentities($object->societe);
477		- $html .= (!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . $addgendertxt . ')' : '';
	477	+ $html .= (!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).$addgendertxt.')' : '';
478	478	} else {
479		- $html .= dol_htmlentities($fullname) . $addgendertxt;
	479	+ $html .= dol_htmlentities($fullname).$addgendertxt;
480	480	if (empty($object->fk_soc)) {
481		- $html .= (!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '';
	481	+ $html .= (!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '';
482	482	}
483	483	}
484	484	} else {
		@@ -568,23 +568,23 @@ discard block
		block discarded – undo
568	568
569	569	$value = $object->$key;
570	570
571		- $html .= '<div class="grid field_' . $key . '">';
	571	+ $html .= '<div class="grid field_'.$key.'">';
572	572
573		- $html .= '<div class="' . (empty($val['tdcss']) ? '' : $val['tdcss']) . ' fieldname_' . $key;
	573	+ $html .= '<div class="'.(empty($val['tdcss']) ? '' : $val['tdcss']).' fieldname_'.$key;
574	574	$html .= '">';
575	575	$labeltoshow = '';
576		- $labeltoshow .= '<strong>' . $langs->trans($val['label']) . '</strong>';
	576	+ $labeltoshow .= '<strong>'.$langs->trans($val['label']).'</strong>';
577	577	$html .= $labeltoshow;
578	578	$html .= '</div>';
579	579
580		- $html .= '<div class="valuefield fieldname_' . $key;
	580	+ $html .= '<div class="valuefield fieldname_'.$key;
581	581	if (!empty($val['cssview'])) {
582		- $html .= ' ' . $val['cssview'];
	582	+ $html .= ' '.$val['cssview'];
583	583	}
584	584	$html .= '">';
585	585	if ($key == 'lang') {
586	586	$langs->load('languages');
587		- $labellang = ($value ? $langs->trans('Language_' . $value) : '');
	587	+ $labellang = ($value ? $langs->trans('Language_'.$value) : '');
588	588	//$html .= picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
589	589	$html .= $labellang;
590	590	} else {
		@@ -644,7 +644,7 @@ discard block
		block discarded – undo
644	644	continue; // We don't want this field
645	645	}
646	646
647		- $html .= '<div class="grid field_' . $key . '">';
	647	+ $html .= '<div class="grid field_'.$key.'">';
648	648	$html .= '<div class="titlefieldcreate';
649	649	if (isset($val['notnull']) && $val['notnull'] > 0) {
650	650	$html .= ' required';
		@@ -676,15 +676,15 @@ discard block
		block discarded – undo
676	676	$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
677	677	} elseif (in_array($val['type'], array('date', 'datetime'))) {
678	678	$isPostDate = GETPOSTISSET($key);
679		- $isPostTime = GETPOSTISSET($key . '_time');
	679	+ $isPostTime = GETPOSTISSET($key.'_time');
680	680	if ($isPostDate) {
681	681	$postDate = GETPOST($key, 'alphanohtml');
682	682	if ($isPostTime) {
683		- $postTime = GETPOST($key . '_time', 'alphanohtml') . ':00';
	683	+ $postTime = GETPOST($key.'_time', 'alphanohtml').':00';
684	684	} else {
685	685	$postTime = '00:00:00';
686	686	}
687		- $valueDateTimeStr = $postDate . ' ' . $postTime;
	687	+ $valueDateTimeStr = $postDate.' '.$postTime;
688	688	} else {
689	689	// format date timestamp to YYYY-MM-DD HH:ii:ss
690	690	$valueDateTimeStr = dol_print_date($object->$key, '%Y-%m-%d %H:%M:%S');
		@@ -756,19 +756,19 @@ discard block
		block discarded – undo
756	756	$html .= '<article>';
757	757	//$html .= load_fiche_titre($title, '', 'object_'.$object->picto);
758	758	$html .= '<header>';
759		- $html .= '<h2>' . $title . '</h2>';
	759	+ $html .= '<h2>'.$title.'</h2>';
760	760	$html .= '</header>';
761	761
762	762	$url_file = $context->getControllerUrl($context->controller, '', false);
763		- $html .= '<form method="POST" action="' . $url_file . '">';
	763	+ $html .= '<form method="POST" action="'.$url_file.'">';
764	764	$html .= $context->getFormToken();
765	765	$html .= '<input type="hidden" name="action" value="update">';
766		- $html .= '<input type="hidden" name="id" value="' . $object->id . '">';
	766	+ $html .= '<input type="hidden" name="id" value="'.$object->id.'">';
767	767	if ($backtopage) {
768		- $html .= '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
	768	+ $html .= '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
769	769	}
770	770	if ($backtopageforcancel) {
771		- $html .= '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
	771	+ $html .= '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
772	772	}
773	773
774	774	//$html .= '<table>'."\n";
		@@ -782,8 +782,8 @@ discard block
		block discarded – undo
782	782
783	783	// Save and Cancel buttons
784	784	$html .= '<div class="grid">';
785		- $html .= '<div><input type="submit" name="save" role="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '" /></div>';
786		- $html .= '<div><input type="submit" name="cancel" role="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '" /></div>';
	785	+ $html .= '<div><input type="submit" name="save" role="button" value="'.dol_escape_htmltag($langs->trans('Save')).'" /></div>';
	786	+ $html .= '<div><input type="submit" name="cancel" role="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'" /></div>';
787	787	$html .= '</div>';
788	788
789	789	$html .= '</form>';
		@@ -824,7 +824,7 @@ discard block
		block discarded – undo
824	824
825	825	// Buttons for actions
826	826	if ($action != 'presend' && $action != 'editline') {
827		- $html .= '<div>' . "\n";
	827	+ $html .= '<div>'."\n";
828	828	$parameters = array();
829	829	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
830	830	if ($reshook < 0) {
		@@ -834,10 +834,10 @@ discard block
		block discarded – undo
834	834	if (empty($reshook)) {
835	835	if ($permissiontoadd) {
836	836	$url_file = $context->getControllerUrl($context->controller, '', false);
837		- $html .= '<a href="' . $url_file . '&id=' . $object->id . '&action=edit" role="button">' . $langs->trans('Modify') . '</a>';
	837	+ $html .= '<a href="'.$url_file.'&id='.$object->id.'&action=edit" role="button">'.$langs->trans('Modify').'</a>';
838	838	}
839	839	}
840		- $html .= '</div>' . "\n";
	840	+ $html .= '</div>'."\n";
841	841	}
842	842	}
843	843

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	* \ingroup webportal
25	25	* \brief Description and activation file for module WebPortal
26	26	*/
27		-include_once DOL_DOCUMENT_ROOT . '/core/modules/DolibarrModules.class.php';
	27	+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
28	28
29	29	/**
30	30	* Description and activation class for module WebPortal
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
76	76
77	77	// Key used in llx_const table to save module status enabled/disabled (where WEBPORTAL is value of property name of module in uppercase)
78		- $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
	78	+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
79	79
80	80	// Name of image file used for this module.
81	81	// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
		@@ -264,7 +264,7 @@ discard block
		block discarded – undo
264	264	$this->rights = array();
265	265	$r = 0;
266	266	// Add here entries to declare new permissions
267		- $this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
	267	+ $this->rights[$r][0] = $this->numero.sprintf("%02d", $r + 1); // Permission id (must not be already used)
268	268	$this->rights[$r][1] = 'Administer users of the customer/partner webportal module'; // Permission label
269	269	$this->rights[$r][3] = 0;
270	270	$this->rights[$r][4] = 'write';

		@@ -99,9 +99,9 @@ discard block
		block discarded – undo
99	99	//print "before decoding $val\n";
100	100	do {
101	101	$oldval = $val;
102		- $val = html_entity_decode($val, ENT_QUOTES \| ENT_HTML5); // Decode '&colon;', ''', '&Tab;', '&NewLine', ...
	102	+ $val = html_entity_decode($val, ENT_QUOTES \| ENT_HTML5); // Decode '&colon;', ''', '&Tab;', '&NewLine', ...
103	103	// Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
104		- $val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
	104	+ $val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function($m) {
105	105	// Decode 'n', ...
106	106	return realCharForNumericEntities($m);
107	107	}, $val);
		@@ -140,7 +140,7 @@ discard block
		block discarded – undo
140	140	$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
141	141	$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
142	142	$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
143		- $inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
	143	+ $inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
144	144	$inj += preg_match('/union.+select/i', $val);
145	145	}
146	146	if ($type == 3) {
		@@ -370,7 +370,7 @@ discard block
		block discarded – undo
370	370	session_set_cookie_params($sessioncookieparams);
371	371	}
372	372	session_name($sessionname);
373		- session_start(); // This call the open and read of session handler
	373	+ session_start(); // This call the open and read of session handler
374	374	//exit; // this exist generates a call to write and close
375	375	}
376	376
		@@ -398,11 +398,11 @@ discard block
		block discarded – undo
398	398	if (!$ok) {
399	399	if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
400	400	print 'Sorry, your application is offline.'."\n";
401		- print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "' . getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
	401	+ print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
402	402	$nexturl = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
403	403	print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
404	404	} else {
405		- print 'Sorry, your application is offline. Only administrator user "' . getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
	405	+ print 'Sorry, your application is offline. Only administrator user "'.getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
406	406	$nexturl = DOL_URL_ROOT.'/';
407	407	print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
408	408	}
		@@ -604,7 +604,7 @@ discard block
		block discarded – undo
604	604	print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
605	605	print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0";
606	606	if (getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN')) {
607		- print " instead of " . getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
	607	+ print " instead of ".getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
608	608	}
609	609	print " into setup).\n";
610	610	}
		@@ -616,7 +616,7 @@ discard block
		block discarded – undo
616	616	$sessiontokenforthisurl = (empty($_SESSION['token']) ? '' : $_SESSION['token']);
617	617	// TODO Get the sessiontokenforthisurl into an array of session token (one array per base URL so we can use the CSRF per page and we keep ability for several tabs per url in a browser)
618	618	if (GETPOSTISSET('token') && GETPOST('token') != 'notrequired' && GETPOST('token', 'alpha') != $sessiontokenforthisurl) {
619		- dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referrer=".(empty($_SERVER['HTTP_REFERER'])?'':$_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET\|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING);
	619	+ dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referrer=".(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET\|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING);
620	620	//dol_syslog("_SESSION['token']=".$sessiontokenforthisurl, LOG_DEBUG);
621	621	// Do not output anything on standard output because this create problems when using the BACK button on browsers. So we just set a message into session.
622	622	if (!defined('NOTOKENRENEWAL')) {
		@@ -632,7 +632,7 @@ discard block
		block discarded – undo
632	632	unset($_GET['action']);
633	633	unset($_GET['confirmmassaction']);
634	634	unset($_GET['massaction']);
635		- unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
	635	+ unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
636	636	if (isset($savid)) {
637	637	$_POST['id'] = ((int) $savid);
638	638	}
		@@ -799,7 +799,7 @@ discard block
		block discarded – undo
799	799
800	800	$allowedmethodtopostusername = 3;
801	801	if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
802		- $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD'); // Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
	802	+ $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD'); // Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
803	803	}
804	804	// TODO Remove use of $_COOKIE['login_dolibarr'] ? Replace $usertotest = with $usertotest = GETPOST("username", "alpha", $allowedmethodtopostusername);
805	805	$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_@\-\.]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
		@@ -922,7 +922,7 @@ discard block
		block discarded – undo
922	922	if (!empty($_SERVER["HTTP_USER_AGENT"]) && $_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
923	923	http_response_code(401); // It makes easier to understand if session was broken during security tests
924	924	}
925		- dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
	925	+ dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
926	926	}
927	927	exit;
928	928	}
		@@ -1268,7 +1268,7 @@ discard block
		block discarded – undo
1268	1268	} else {
1269	1269	// We may have NOLOGIN set, but NOREQUIREUSER not
1270	1270	if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) {
1271		- $user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
	1271	+ $user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
1272	1272	}
1273	1273	}
1274	1274
		@@ -1448,7 +1448,7 @@ discard block
		block discarded – undo
1448	1448
1449	1449	if (!empty(GETPOST('seteventmessages', 'alpha'))) {
1450	1450	$message = GETPOST('seteventmessages', 'alpha');
1451		- $messages = explode(',', $message);
	1451	+ $messages = explode(',', $message);
1452	1452	foreach ($messages as $key => $msg) {
1453	1453	$tmp = explode(':', $msg);
1454	1454	setEventMessages($tmp[0], null, !empty($tmp[1]) ? $tmp[1] : 'mesgs');
		@@ -1753,7 +1753,7 @@ discard block
		block discarded – undo
1753	1753
1754	1754	if (getDolGlobalString('THEME_ELDY_TOPMENU_BACK1')) {
1755	1755	// TODO: use auto theme color switch
1756		- print '<meta name="theme-color" content="rgb(' . getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
	1756	+ print '<meta name="theme-color" content="rgb('.getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
1757	1757	}
1758	1758
1759	1759	// Auto refresh page
		@@ -2070,7 +2070,7 @@ discard block
		block discarded – undo
2070	2070	print $head."\n";
2071	2071	}
2072	2072	if (getDolGlobalString('MAIN_HTML_HEADER')) {
2073		- print getDolGlobalString('MAIN_HTML_HEADER') . "\n";
	2073	+ print getDolGlobalString('MAIN_HTML_HEADER')."\n";
2074	2074	}
2075	2075
2076	2076	$parameters = array();
		@@ -2847,7 +2847,7 @@ discard block
		block discarded – undo
2847	2847	$langs->load(explode('@', $item['name'])[1]);
2848	2848	$dropDownQuickAddHtml .= '
2849	2849	<a class="dropdown-item quickadd-item" href="'.DOL_URL_ROOT.$item['url'].'" title="'.$langs->trans(explode('@', $item['title'])[0]).'">
2850		- '. img_picto('', $item['picto'], 'style="width:18px;"') . ' ' . $langs->trans(explode('@', $item['name'])[0]) . '</a>
	2850	+ '. img_picto('', $item['picto'], 'style="width:18px;"').' '.$langs->trans(explode('@', $item['name'])[0]).'</a>
2851	2851	';
2852	2852	}
2853	2853
		@@ -3695,7 +3695,7 @@ discard block
		block discarded – undo
3695	3695	$forceping = GETPOST('forceping', 'alpha');
3696	3696	if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') \|\| $forceping) {
3697	3697	//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
3698		- $hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
	3698	+ $hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
3699	3699
3700	3700	if (!getDolGlobalString('MAIN_FIRST_PING_OK_DATE')
3701	3701	\|\| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && (getDolGlobalString('MAIN_FIRST_PING_OK_ID') != 'disabled'))

		@@ -153,8 +153,8 @@ discard block
		block discarded – undo
153	153	public $posxlabel;
154	154	public $posxup;
155	155	public $posxref;
156		- public $posxpicture; // For picture
157		- public $posxdesc; // For description
	156	+ public $posxpicture; // For picture
	157	+ public $posxdesc; // For description
158	158	public $posxqty;
159	159	public $posxpuht;
160	160	public $posxtva;
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	'myuser_email'=>$user->email,
214	214	'myuser_logo'=>$logotouse,
215	215	'myuser_job'=>$user->job,
216		- 'myuser_web'=>'', // url not exist in $user object
	216	+ 'myuser_web'=>'', // url not exist in $user object
217	217	'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'),
218	218	'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'),
219	219	'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
		@@ -529,7 +529,7 @@ discard block
		block discarded – undo
529	529
530	530	if (get_class($object) == 'CommandeFournisseur') {
531	531	/* @var $object CommandeFournisseur*/
532		- $object->date_validation = $object->date_valid;
	532	+ $object->date_validation = $object->date_valid;
533	533	$object->date_commande = $object->date;
534	534	}
535	535	$resarray = array(
		@@ -615,10 +615,10 @@ discard block
		block discarded – undo
615	615	$resarray[$array_key.'_bank_bic'] = (empty($bank_account) ? '' : $bank_account->bic);
616	616	$resarray[$array_key.'_bank_label'] = (empty($bank_account) ? '' : $bank_account->label);
617	617	$resarray[$array_key.'_bank_number'] = (empty($bank_account) ? '' : $bank_account->number);
618		- $resarray[$array_key.'_bank_proprio'] =(empty($bank_account) ? '' : $bank_account->proprio);
619		- $resarray[$array_key.'_bank_address'] =(empty($bank_account) ? '' : $bank_account->address);
620		- $resarray[$array_key.'_bank_state'] =(empty($bank_account) ? '' : $bank_account->state);
621		- $resarray[$array_key.'_bank_country'] =(empty($bank_account) ? '' : $bank_account->country);
	618	+ $resarray[$array_key.'_bank_proprio'] = (empty($bank_account) ? '' : $bank_account->proprio);
	619	+ $resarray[$array_key.'_bank_address'] = (empty($bank_account) ? '' : $bank_account->address);
	620	+ $resarray[$array_key.'_bank_state'] = (empty($bank_account) ? '' : $bank_account->state);
	621	+ $resarray[$array_key.'_bank_country'] = (empty($bank_account) ? '' : $bank_account->country);
622	622	}
623	623
624	624	if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
		@@ -641,7 +641,7 @@ discard block
		block discarded – undo
641	641	$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
642	642	$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
643	643	} else { // empty replacement
644		- $resarray[$array_key.'_project_ref'] ='';
	644	+ $resarray[$array_key.'_project_ref'] = '';
645	645	$resarray[$array_key.'_project_title'] = '';
646	646	$resarray[$array_key.'_project_description'] = '';
647	647	$resarray[$array_key.'_project_date_start'] = '';
		@@ -1478,7 +1478,7 @@ discard block
		block discarded – undo
1478	1478
1479	1479	if (!empty($fields)) {
1480	1480	// Sort extrafields by rank
1481		- uasort($fields, function ($a, $b) {
	1481	+ uasort($fields, function($a, $b) {
1482	1482	return ($a->rank > $b->rank) ? 1 : -1;
1483	1483	});
1484	1484

Dolibarr / dolibarr

Branch — develop (22b42d)

Status

Category

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +63 added lines, -63 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

Spacing +170 added lines, -170 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch