Dolibarr / dolibarr

htdocs/install/repair.php

Spacing +12 added lines, -12 removed lines

@@ -258,7 +258,7 @@ 
 		],
 		[
 			'name' => 'force_utf8mb4_on_tables',
-			'info' => 'Force utf8mb4 + row=dynamic, for mysql/mariadb only' . $warning_using_utf8mb4
+			'info' => 'Force utf8mb4 + row=dynamic, for mysql/mariadb only'.$warning_using_utf8mb4
 		],
 		[
 			'name' => 'force_collation_from_conf_on_tables',
@@ -283,8 +283,8 @@ 
 		$url_test = $_SERVER['PHP_SELF'].'?'.$option.'=test';
 		$url_confirmed = $_SERVER['PHP_SELF'].'?'.$option.'=confirmed';
 		print '<tr>';
-		print '<td>' . $option . '</td>';
-		print '<td>' . $info . '</td>';
+		print '<td>'.$option.'</td>';
+		print '<td>'.$info.'</td>';
 		print '<td class="center"><a href="'.$url_test.'" title="Launch test on option '.$option.'">test</a>'.($value == 'test' ? ' (X)' : '').'</td>';
 		print '<td class="center"><a href="'.$url_confirmed.'" title="Launch confirmed on option '.$option.'">confirmed</a>'.($value == 'confirmed' ? ' (X)' : '').'</td>';
 		print '</tr>';
@@ -1285,13 +1285,13 @@ 
 							}
 							if ($key == 'js') {
 								$value = $obj->value;
-								$valuearray = (array) json_decode($value);	// Force cast into array because sometimes it is a stdClass
+								$valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
 								$reloffile = $valuearray[0];
 								$reloffile = preg_replace('/^\//', '', $valuearray[0]);
 							}
 							if ($key == 'css') {
 								$value = $obj->value;
-								$valuearray = (array) json_decode($value);	// Force cast into array because sometimes it is a stdClass
+								$valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
 								if ($value && (!is_array($valuearray) || count($valuearray) == 0)) {
 									$valuearray = array();
 									$valuearray[0] = $value; // If value was not a json array but a string
@@ -1307,7 +1307,7 @@ 
 									$result = 'found'; // If error, we force like if we found to avoid any deletion
 								}
 							} else {
-								$result = 'found';	//
+								$result = 'found'; //
 							}
 
 							if (!$result) {
@@ -1882,7 +1882,7 @@ 
 
 					$sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'receptiondet_batch';
 					$sql_attach .= ' (fk_element, fk_product, fk_elementdet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)';
-					$sql_attach .= " VALUES (".$sql_attach_values.")";	// The string is already sanitized
+					$sql_attach .= " VALUES (".$sql_attach_values.")"; // The string is already sanitized
 				}
 
 				if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed') {
@@ -1929,16 +1929,16 @@ 
 
 // Repair llx_commande_fournisseur to eliminate duplicate reference
 if ($ok && GETPOST('repair_supplier_order_duplicate_ref')) {
-	require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
-	include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 	$db->begin();
 
 	$err = 0;
 
 	// Query to find all duplicate supplier orders
-	$sql = "SELECT * FROM " . MAIN_DB_PREFIX . "commande_fournisseur";
-	$sql .= " WHERE ref IN (SELECT cf.ref FROM " . MAIN_DB_PREFIX . "commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)";
+	$sql = "SELECT * FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+	$sql .= " WHERE ref IN (SELECT cf.ref FROM ".MAIN_DB_PREFIX."commande_fournisseur cf GROUP BY cf.ref, cf.entity HAVING COUNT(cf.rowid) > 1)";
 
 	// Build a list of ref => []CommandeFournisseur
 	$duplicateSupplierOrders = [];
@@ -1964,7 +1964,7 @@ 
 
 			$newRef = $supplierOrder->getNextNumRef($soc);
 
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "commande_fournisseur cf SET cf.ref = '" . $db->escape($newRef) . "' WHERE cf.rowid = " . (int) $supplierOrder->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur cf SET cf.ref = '".$db->escape($newRef)."' WHERE cf.rowid = ".(int) $supplierOrder->id;
 			if (!$db->query($sql)) {
 				$err++;
 			}

htdocs/mrp/mo_list.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode = GETPOST('mode', 'alpha');
-$groupby = GETPOST('groupby', 'aZ09');	// Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
+$groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
 
 $id = GETPOSTINT('id');
 
@@ -71,7 +71,7 @@ 
 
 //Data request for date
 $year   = GETPOST('change_dateyear', 'int');
-$month   = GETPOST('change_datemonth', 'int');
+$month = GETPOST('change_datemonth', 'int');
 $day   = GETPOST('change_dateday', 'int');
 $hour   = GETPOST('change_datehour', 'int');
 $min   = GETPOST('change_datemin', 'int');
@@ -90,7 +90,7 @@ 
 $object = new Mo($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -630,7 +630,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -729,7 +729,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		if ($key == "fk_product") {
 			print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 'p.ref', '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";

htdocs/bom/bom_list.php

Spacing +5 added lines, -5 removed lines

@@ -52,9 +52,9 @@ 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$mode        = GETPOST('mode', 'aZ');  // mode view (kanban or common)
+$mode        = GETPOST('mode', 'aZ'); // mode view (kanban or common)
 
-$id         = GETPOSTINT('id');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -84,7 +84,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -548,7 +548,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -643,7 +643,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		if ($key == "fk_product") {
 			print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 'p.ref', '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";

htdocs/core/lib/files.lib.php

Spacing +19 added lines, -19 removed lines

@@ -121,7 +121,7 @@ 
 	$utf8_path = preg_replace('/([\\/]+)$/', '', $utf8_path);
 
 	if (preg_match('/\*/', $utf8_path)) {
-		$utf8_path_array = glob($utf8_path, GLOB_ONLYDIR);	// This scan dir for files. If file does not exists, return empty.
+		$utf8_path_array = glob($utf8_path, GLOB_ONLYDIR); // This scan dir for files. If file does not exists, return empty.
 		//$os_path_array = dol_dir_list($utf8_path);
 	} else {
 		$utf8_path_array = array($utf8_path);
@@ -139,7 +139,7 @@ 
 				'types' => $types,
 				'recursive' => $recursive,
 				'filter' => $filter,
-				'excludefilter' => $exclude_array,  // Already converted to array.
+				'excludefilter' => $exclude_array, // Already converted to array.
 				'sortcriteria' => $sortcriteria,
 				'sortorder' => $sortorder,
 				'loaddate' => $loaddate,
@@ -172,7 +172,7 @@ 
 					$utf8_file = $os_file;
 				}
 
-				$utf8_fullpathfile = $utf8_path_cursor."/".$utf8_file;  // Temp variable for speed
+				$utf8_fullpathfile = $utf8_path_cursor."/".$utf8_file; // Temp variable for speed
 
 				// Check if file is qualified
 				$qualified = 1;
@@ -208,13 +208,13 @@ 
 								if (is_array($filter)) {
 									$chunks = array_chunk($filter, 500);
 									foreach ($chunks as $chunk) {
-										$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file);	// May failed if $filter too large
+										$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file); // May failed if $filter too large
 										if ($testpregmatch) {
 											break;
 										}
 									}
 								} else {
-									$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file);		// May failed if $filter too large
+									$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file); // May failed if $filter too large
 								}
 								if ($testpregmatch) {
 									$qualifiedforfilter = 1;
@@ -263,13 +263,13 @@ 
 							if (is_array($filter)) {
 								$chunks = array_chunk($filter, 500);
 								foreach ($chunks as $chunk) {
-									$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file);	// May failed if $filter too large
+									$testpregmatch = preg_match('/'.implode('|', $chunk).'/i', $utf8_file); // May failed if $filter too large
 									if ($testpregmatch) {
 										break;
 									}
 								}
 							} else {
-								$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file);		// May failed if $filter too large
+								$testpregmatch = preg_match('/'.$filter.'/i', $utf8_file); // May failed if $filter too large
 							}
 							if ($testpregmatch) {
 								$qualifiedforfilter = 1;
@@ -1019,7 +1019,7 @@ 
 	// Recursive function to copy all subdirectories and contents:
 	if (is_dir($ossrcfile)) {
 		$dir_handle = opendir($ossrcfile);
-		$tmpresult = 0;  // Initialised before loop to keep old behavior, may be needed inside loop
+		$tmpresult = 0; // Initialised before loop to keep old behavior, may be needed inside loop
 		while ($file = readdir($dir_handle)) {
 			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file)) {
 				if (is_dir($ossrcfile."/".$file)) {
@@ -1202,7 +1202,7 @@ 
 					if (!empty($moreinfo) && !empty($moreinfo['gen_or_uploaded'])) {
 						$ecmfile->gen_or_uploaded = $moreinfo['gen_or_uploaded'];
 					} else {
-						$ecmfile->gen_or_uploaded = 'unknown';	// 'generated', 'uploaded', 'api'
+						$ecmfile->gen_or_uploaded = 'unknown'; // 'generated', 'uploaded', 'api'
 					}
 					if (!empty($moreinfo) && !empty($moreinfo['description'])) {
 						$ecmfile->description = $moreinfo['description']; // indexed content
@@ -1555,7 +1555,7 @@ 
 
 		if ($return) {
 			dolChmod($file_name_osencoded);
-			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=" . getDolGlobalString('MAIN_UMASK'), LOG_DEBUG);
+			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".getDolGlobalString('MAIN_UMASK'), LOG_DEBUG);
 			return $successcode; // Success
 		} else {
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
@@ -1621,7 +1621,7 @@ 
 			$ok = true;
 			$globencoded = str_replace('[', '\[', $file_osencoded);
 			$globencoded = str_replace(']', '\]', $globencoded);
-			$listofdir = glob($globencoded);	// This scan dir for files. If file does not exists, return empty.
+			$listofdir = glob($globencoded); // This scan dir for files. If file does not exists, return empty.
 
 			if (!empty($listofdir) && is_array($listofdir)) {
 				foreach ($listofdir as $filename) {
@@ -2102,7 +2102,7 @@ 
 					$maxwidthmini = $tmparraysize['maxwidthmini'];
 					$maxheightmini = $tmparraysize['maxheightmini'];
 					//$quality = $tmparraysize['quality'];
-					$quality = 50;	// For thumbs, we force quality to 50
+					$quality = 50; // For thumbs, we force quality to 50
 
 					// Generate thumbs.
 					if ($generatethumbs) {
@@ -2296,7 +2296,7 @@ 
 			if (isset($object->table_element)) {
 				$ecmfile->src_object_type = $object->table_element;
 			} else {
-				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
+				dol_syslog('Error: object '.get_class($object).' has no table_element attribute.');
 				return -1;
 			}
 			if (isset($object->src_object_description)) {
@@ -2593,9 +2593,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1);
 						$relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1);
@@ -2867,9 +2867,9 @@ 
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$filePath = $file->getPath(); // the full path with filename using the $inputdir root.
 						$fileName = $file->getFilename();
-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+						$fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
 						//$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1);
 						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1);
@@ -3978,7 +3978,7 @@ 
 function archiveOrBackupFile($srcfile, $max_versions = 5, $archivedir = '', $suffix = "v", $moveorcopy = 'move')
 {
 	$base_file_pattern = ($archivedir ? $archivedir : dirname($srcfile)).'/'.basename($srcfile).".".$suffix;
-	$files_in_directory = glob($base_file_pattern . "*");
+	$files_in_directory = glob($base_file_pattern."*");
 
 	// Extract the modification timestamps for each file
 	$files_with_timestamps = [];
@@ -4019,7 +4019,7 @@ 
 	}
 
 	$timestamp = dol_now('gmt');
-	$new_backup = $srcfile . ".v" . $timestamp;
+	$new_backup = $srcfile.".v".$timestamp;
 
 	// Move or copy the original file to the new backup with the timestamp
 	if ($moveorcopy == 'move') {