Dolibarr / dolibarr

htdocs/core/class/commondocgenerator.class.php

Spacing +13 added lines, -13 removed lines

@@ -248,11 +248,11 @@ 
 	/**
 	 * @var float
 	 */
-	public $posxpicture;	// For picture
+	public $posxpicture; // For picture
 	/**
 	 * @var float
 	 */
-	public $posxdesc;		// For description
+	public $posxdesc; // For description
 	/**
 	 * @var float
 	 */
@@ -330,7 +330,7 @@ 
 		// phpcs:enable
 		global $conf, $extrafields;
 
-		$logotouse = $conf->user->dir_output . '/' . get_exdir(0, 0, 0, 0, $user, 'user') . 'photos/' . getImageFileNameForSize($user->photo, '_small');
+		$logotouse = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $user, 'user').'photos/'.getImageFileNameForSize($user->photo, '_small');
 
 		$array_user = array(
 			'myuser_lastname' => $user->lastname,
@@ -350,7 +350,7 @@ 
 			'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'),
@@ -679,16 +679,16 @@ 
 		$date = (isset($object->element) && $object->element == 'contrat' && isset($object->date_contrat)) ? $object->date_contrat : (isset($object->date) ? $object->date : null);
 
 		if ($object instanceof CommandeFournisseur) {
-			$object->date_validation =  $object->date_valid;
+			$object->date_validation = $object->date_valid;
 			$object->date_commande = $object->date;
 		}
 		$resarray = array(
 			$array_key.'_id' => $object->id,
 			$array_key.'_ref' => (property_exists($object, 'ref') ? $object->ref : ''),
-			$array_key.'_label' => (property_exists($object, 'label') ? $object->label : ''),  // @phan-suppress-current-line PhanUndeclaredProperty
+			$array_key.'_label' => (property_exists($object, 'label') ? $object->label : ''), // @phan-suppress-current-line PhanUndeclaredProperty
 			$array_key.'_ref_ext' => (property_exists($object, 'ref_ext') ? $object->ref_ext : ''),
 			$array_key.'_ref_customer' => (!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
-			$array_key.'_ref_supplier' => (!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),  // @phan-suppress-current-line PhanUndeclaredProperty
+			$array_key.'_ref_supplier' => (!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)), // @phan-suppress-current-line PhanUndeclaredProperty
 			$array_key.'_source_invoice_ref' => ((empty($invoice_source) || empty($invoice_source->ref)) ? '' : $invoice_source->ref),
 			// Dates
 			$array_key.'_hour' => dol_print_date($date, 'hour'),
@@ -696,7 +696,7 @@ 
 			$array_key.'_date_rfc' => dol_print_date($date, 'dayrfc'),
 			$array_key.'_date_limit' => (!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day') : ''),
 			$array_key.'_date_limit_rfc' => (!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'dayrfc') : ''),
-			$array_key.'_date_end' => (!empty($object->fin_validite) ? dol_print_date($object->fin_validite, 'day') : ''),  // @phan-suppress-current-line PhanUndeclaredProperty
+			$array_key.'_date_end' => (!empty($object->fin_validite) ? dol_print_date($object->fin_validite, 'day') : ''), // @phan-suppress-current-line PhanUndeclaredProperty
 			$array_key.'_date_creation' => dol_print_date($object->date_creation, 'day'),
 			$array_key.'_date_modification' => (!empty($object->date_modification) ? dol_print_date($object->date_modification, 'day') : ''),
 			$array_key.'_date_validation' => (!empty($object->date_validation) ? dol_print_date($object->date_validation, 'dayhour') : ''),
@@ -712,13 +712,13 @@ 
 			$array_key.'_incoterms' => (method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
 
 			$array_key.'_total_ht_locale' => price($object->total_ht, 0, $outputlangs),
-			$array_key.'_total_vat_locale' => (!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),  // @phan-suppress-current-line PhanUndeclaredProperty
+			$array_key.'_total_vat_locale' => (!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)), // @phan-suppress-current-line PhanUndeclaredProperty
 			$array_key.'_total_localtax1_locale' => price($object->total_localtax1, 0, $outputlangs),
 			$array_key.'_total_localtax2_locale' => price($object->total_localtax2, 0, $outputlangs),
 			$array_key.'_total_ttc_locale' => price($object->total_ttc, 0, $outputlangs),
 
 			$array_key.'_total_ht' => price2num($object->total_ht),
-			$array_key.'_total_vat' => (!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)),  // @phan-suppress-current-line PhanUndeclaredProperty
+			$array_key.'_total_vat' => (!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)), // @phan-suppress-current-line PhanUndeclaredProperty
 			$array_key.'_total_localtax1' => price2num($object->total_localtax1),
 			$array_key.'_total_localtax2' => price2num($object->total_localtax2),
 			$array_key.'_total_ttc' => price2num($object->total_ttc),
@@ -1041,7 +1041,7 @@ 
 			$array_key.'_ref' => $object->ref,
 			$array_key.'_ref_ext' => $object->ref_ext,
 			$array_key.'_ref_customer' => $object->ref_customer,
-			$array_key.'_date_delivery' => dol_print_date($object->date_delivery, 'day'),	// note: for shipment, delivery and reception: date_delivery, for orders: delivery_date
+			$array_key.'_date_delivery' => dol_print_date($object->date_delivery, 'day'), // note: for shipment, delivery and reception: date_delivery, for orders: delivery_date
 			$array_key.'_hour_delivery' => dol_print_date($object->date_delivery, 'hour'),
 			$array_key.'_date_creation' => dol_print_date($object->date_creation, 'day'),
 			$array_key.'_total_ht' => price($object->total_ht),
@@ -1109,7 +1109,7 @@ 
 			if ($object->volume_units < 50) {
 					$array_shipment[$array_key.'_total_volume'] = (empty($totalVolume)) ? '' : showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 			} else {
-					$array_shipment[$array_key.'_total_volume'] = (empty($totalVolume)) ? '' :  price($object->trueVolume, 0, $outputlangs, 0, 0).' '.measuringUnitString(0, "volume", $object->volume_units);
+					$array_shipment[$array_key.'_total_volume'] = (empty($totalVolume)) ? '' : price($object->trueVolume, 0, $outputlangs, 0, 0).' '.measuringUnitString(0, "volume", $object->volume_units);
 			}
 		} elseif (!empty($totalVolume)) {
 				$array_shipment[$array_key.'_total_volume'] = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs, -1, 'no', 1);
@@ -1820,7 +1820,7 @@ 
 				 * @param stdClass $b
 				 * @return int<-1,1>
 				 */
-				static function ($a, $b) {
+				static function($a, $b) {
 					return  ($a->rank > $b->rank) ? 1 : -1;
 				}
 			);

htdocs/core/modules/import/import_xlsx.modules.php

Spacing +53 added lines, -53 removed lines

@@ -32,7 +32,7 @@ 
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 
-require_once DOL_DOCUMENT_ROOT . '/core/modules/import/modules_import.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 
 
 /**
@@ -175,10 +175,10 @@ 
 		// phpcs:enable
 		global $user, $conf, $langs, $file;
 		// create a temporary object, the final output will be generated in footer
-		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs) . ' - Dolibarr ' . DOL_VERSION);
-		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import") . ' - ' . $file);
-		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import") . ' - ' . $file);
-		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import") . ' - ' . $file);
+		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
+		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
 
 		$this->workbook->setActiveSheetIndex(0);
 		$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
@@ -270,7 +270,7 @@ 
 		// phpcs:enable
 		$ret = 1;
 
-		dol_syslog(get_class($this) . "::open_file file=" . $file);
+		dol_syslog(get_class($this)."::open_file file=".$file);
 
 		$reader = new Xlsx();
 		$this->workbook = $reader->load($file);
@@ -435,7 +435,7 @@ 
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
 				if (!isset($tablewithentity_cache[$tablename])) {	// keep this test with "isset"
-					dol_syslog("Check if table " . $tablename . " has an entity field");
+					dol_syslog("Check if table ".$tablename." has an entity field");
 					$resql = $this->db->DDLDescTable($tablename, 'entity');
 					if ($resql) {
 						$obj = $this->db->fetch_object($resql);
@@ -508,12 +508,12 @@ 
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 										$class = $objimport->array_import_convertvalue[0][$val]['class'];
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
-										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] != '') {
-											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '') {
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
 										} else {
 											$resultload = dol_include_once($file);
 											if (empty($resultload)) {
-												dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+												dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 												break;
 											}
 											$classinstance = new $class($this->db);
@@ -555,12 +555,12 @@ 
 												$param_array = array('', '', $newval);
 												call_user_func_array(array($classinstance, $method), $param_array);
 											}
-											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] = $classinstance->id;
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
 
 											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
 											if ($classinstance->id != '') {	// id may be 0, it is a found value
 												$newval = $classinstance->id;
-											} elseif (! $error) {
+											} elseif (!$error) {
 												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
 													// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
@@ -589,19 +589,19 @@ 
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
 										$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
 										$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
-										if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] != '') {
-											$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
 										} else {
 											$resultload = dol_include_once($file);
 											if (empty($resultload)) {
-												dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', code=' . $code);
+												dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
 												break;
 											}
 											$classinstance = new $class($this->db);
 											// Try the fetch from code and ref
 											$param_array = array('', $newval, $code);
 											call_user_func_array(array($classinstance, $method), $param_array);
-											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] = $classinstance->id;
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
 											if ($classinstance->id > 0) {    // we found record
 												$newval = $classinstance->id;
 											} else {
@@ -626,19 +626,19 @@ 
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$units = $objimport->array_import_convertvalue[0][$val]['units'];
-									if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] != '') {
-										$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval];
+									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '') {
+										$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
 									} else {
 										$resultload = dol_include_once($file);
 										if (empty($resultload)) {
-											dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', units=' . $units);
+											dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
 											break;
 										}
 										$classinstance = new $class($this->db);
 										// Try the fetch from code or ref
 										call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
 										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
-										$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] = $scaleorid;
+										$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
 										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
 										if ($classinstance->id > 0) {	// we found record
 											$newval = $scaleorid ? $scaleorid : 0;
@@ -732,13 +732,13 @@ 
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
-										dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 										break;
 									}
 									$classinstance = new $class($this->db);
 									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, $key));
 									if (empty($classinstance->error) && empty($classinstance->errors)) {
-										$newval = $res; 	// We get new value computed.
+										$newval = $res; // We get new value computed.
 									} else {
 										$this->errors[$error]['type'] = 'CLASSERROR';
 										$this->errors[$error]['lib'] = implode(
@@ -770,16 +770,16 @@ 
 									$table = $reg[2];
 									$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
 
-									$cachekey = $field . '@' . $table;
+									$cachekey = $field.'@'.$table;
 									if (!empty($filter)) {
-										$cachekey .= ':' . $filter;
+										$cachekey .= ':'.$filter;
 									}
 
 									// Load content of field@table into cache array
 									if (!is_array($this->cachefieldtable[$cachekey])) { // If content of field@table not already loaded into cache
-										$sql = "SELECT " . $field . " as aliasfield FROM " . $table;
+										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
 										if (!empty($filter)) {
-											$sql .= ' WHERE ' . $filter;
+											$sql .= ' WHERE '.$filter;
 										}
 
 										$resql = $this->db->query($sql);
@@ -802,7 +802,7 @@ 
 									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
 										$tableforerror = $table;
 										if (!empty($filter)) {
-											$tableforerror .= ':' . $filter;
+											$tableforerror .= ':'.$filter;
 										}
 										// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
@@ -810,7 +810,7 @@ 
 										$errorforthistable++;
 										$error++;
 									}
-								} elseif (!preg_match('/' . $objimport->array_import_regex[0][$val] . '/i', $newval)) {
+								} elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
 									// If test is just a static regex
 									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
 									// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -839,11 +839,11 @@ 
 						if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
 							if (!in_array("socialnetworks", $listfields)) {
 								$listfields[] = "socialnetworks";
-								$socialkey = array_search("socialnetworks", $listfields);	// Return position of 'socialnetworks' key in array. Example socialkey=19
+								$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
 								$listvalues[$socialkey] = '';
 							}
 							if (!empty($newval) && $arrayrecord[($key)]['type'] > 0) {
-								$socialkey = array_search("socialnetworks", $listfields);	// Return position of 'socialnetworks' key in array. Example socialkey=19
+								$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
 								$socialnetwork = explode("_", $fieldname)[1];
 								if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
 									$json = new stdClass();
@@ -878,10 +878,10 @@ 
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
 					// Loop on each hidden fields to add them into listfields/listvalues
 					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
-						if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $key)) {
+						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) {
 							continue; // Not a field of current table
 						}
-						$keyfield = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+						$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 
 						if (in_array($keyfield, $listfields)) {	// avoid duplicates in insert
 							continue;
@@ -909,7 +909,7 @@ 
 									$type = $objimport->array_import_convertvalue[0][$fieldname]['type'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
-										dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 										break;
 									}
 									$classinstance = new $class($this->db);
@@ -945,7 +945,7 @@ 
 								}
 							}
 						} else {
-							$this->errors[$error]['lib'] = 'Bad value of profile setup ' . $val . ' for array_import_fieldshidden';
+							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
 							$this->errors[$error]['type'] = 'Import profile setup';
 							$error++;
 						}
@@ -972,14 +972,14 @@ 
 							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = "SELECT ".$fname." FROM " . $tablename;
+								$sqlSelect = "SELECT ".$fname." FROM ".$tablename;
 
 								$data = array_combine($listfields, $listvalues);
 
-								$where = array();	// filters to forge SQL request
+								$where = array(); // filters to forge SQL request
 								// @phpstan-ignore-next-line
 								'@phan-var string[] $where';
-								$filters = array();	// filters to forge output error message
+								$filters = array(); // filters to forge output error message
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
@@ -1004,7 +1004,7 @@ 
 									$where[] = "entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
 									$filters[] = "entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
 								}
-								$sqlSelect .= " WHERE " . implode(' AND ', $where);
+								$sqlSelect .= " WHERE ".implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -1035,7 +1035,7 @@ 
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
 								// Note: For extrafield tablename, we have in importfieldshidden_array an entry 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = "SELECT rowid FROM " . $tablename;
+								$sqlSelect = "SELECT rowid FROM ".$tablename;
 
 
 								if (empty($keyfield)) {
@@ -1069,35 +1069,35 @@ 
 								// We db escape social network field because he isn't in field creation
 								if (in_array("socialnetworks", $listfields)) {
 									$socialkey = array_search("socialnetworks", $listfields);
-									$tmpsql =  $listvalues[$socialkey];
+									$tmpsql = $listvalues[$socialkey];
 									$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
 								}
 
 								// Build SQL UPDATE request
-								$sqlstart = "UPDATE " . $tablename;
+								$sqlstart = "UPDATE ".$tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
-									$set[] = $key." = ".$val;	// $val was escaped/sanitized previously
+									$set[] = $key." = ".$val; // $val was escaped/sanitized previously
 								}
-								$sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
+								$sqlstart .= " SET ".implode(', ', $set).", import_key = '".$this->db->escape($importid)."'";
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlend = " WHERE " . $keyfield . " = ".((int) $lastinsertid);
+								$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								if ($is_table_category_link) {
 									'@phan-var-force string[] $where';
-									$sqlend = " WHERE " . implode(' AND ', $where);
+									$sqlend = " WHERE ".implode(' AND ', $where);
 								}
 
 								if (!empty($tablewithentity_cache[$tablename])) {
 									$sqlend .= " AND entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
 								}
 
-								$sql = $sqlstart . $sqlend;
+								$sql = $sqlstart.$sqlend;
 
 								// Run update request
 								$resql = $this->db->query($sql);
@@ -1118,22 +1118,22 @@ 
 							// We db escape social network field because he isn't in field creation
 							if (in_array("socialnetworks", $listfields)) {
 								$socialkey = array_search("socialnetworks", $listfields);
-								$tmpsql =  $listvalues[$socialkey];
+								$tmpsql = $listvalues[$socialkey];
 								$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
 							}
 
 							// Build SQL INSERT request
-							$sqlstart = "INSERT INTO " . $tablename . "(" . implode(", ", $listfields) . ", import_key";
-							$sqlend = ") VALUES(" . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
+							$sqlstart = "INSERT INTO ".$tablename."(".implode(", ", $listfields).", import_key";
+							$sqlend = ") VALUES(".implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
 							if (!empty($tablewithentity_cache[$tablename])) {
 								$sqlstart .= ", entity";
-								$sqlend .= ", " . $conf->entity;
+								$sqlend .= ", ".$conf->entity;
 							}
 							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart .= ", " . $objimport->array_import_tables_creator[0][$alias];
-								$sqlend .= ", " . $user->id;
+								$sqlstart .= ", ".$objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ", ".$user->id;
 							}
-							$sql = $sqlstart . $sqlend . ")";
+							$sql = $sqlstart.$sqlend.")";
 							//dol_syslog("import_xlsx.modules", LOG_DEBUG);
 
 							// Run insert request

htdocs/comm/propal/class/propal.class.php

Spacing +14 added lines, -14 removed lines

@@ -666,7 +666,7 @@ 
 			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
-			$pa_ht = price2num($pa_ht);  // do not convert to float here, it breaks the functioning of $pa_ht_isemptystring
+			$pa_ht = price2num($pa_ht); // do not convert to float here, it breaks the functioning of $pa_ht_isemptystring
 			if ($price_base_type == 'HT') {
 				$pu = $pu_ht;
 			} else {
@@ -894,7 +894,7 @@ 
 		}
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
-		$pa_ht = price2num($pa_ht);  // do not convert to float here, it breaks the functioning of $pa_ht_isemptystring
+		$pa_ht = price2num($pa_ht); // do not convert to float here, it breaks the functioning of $pa_ht_isemptystring
 		if (empty($qty) && empty($special_code)) {
 			$special_code = 3; // Set option tag
 		}
@@ -1479,7 +1479,7 @@ 
 			if ($objsoc->id > 0 && !empty($object->lines)) {
 				if ($update_prices === true && getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 					// If price per customer
-					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 				}
 
 				foreach ($object->lines as $line) {
@@ -1673,7 +1673,7 @@ 
 				$this->ref_customer         = $obj->ref_client;
 				$this->ref_ext              = $obj->ref_ext;
 
-				$this->total                = $obj->total_ttc;			// TODO deprecated
+				$this->total                = $obj->total_ttc; // TODO deprecated
 				$this->total_ttc            = $obj->total_ttc;
 				$this->total_ht             = $obj->total_ht;
 				$this->total_tva            = $obj->total_tva;
@@ -2588,7 +2588,7 @@ 
 	 */
 	public function closeProposal($user, $status, $note_private = '', $notrigger = 0, $note_public = '')
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$error = 0;
 		$now = dol_now();
@@ -2623,10 +2623,10 @@ 
 		if ($resql) {
 			// Status self::STATUS_REFUSED by default
 			$modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED', $this->model_pdf);
-			$trigger_name = 'PROPAL_CLOSE_REFUSED';		// used later in call_trigger()
+			$trigger_name = 'PROPAL_CLOSE_REFUSED'; // used later in call_trigger()
 
 			if ($status == self::STATUS_SIGNED) {	// Status self::STATUS_SIGNED
-				$trigger_name = 'PROPAL_CLOSE_SIGNED';	// used later in call_trigger()
+				$trigger_name = 'PROPAL_CLOSE_SIGNED'; // used later in call_trigger()
 				$modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_TOBILL') ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf;
 
 				// The connected company is classified as a client
@@ -2793,10 +2793,10 @@ 
 
 		$this->db->begin();
 
-		$sql = "UPDATE ". MAIN_DB_PREFIX . "propal";
-		$sql .= " SET fk_statut = " . self::STATUS_CANCELED . ",";
-		$sql .= " fk_user_modif = " . ((int) $user->id);
-		$sql .= " WHERE rowid = " . ((int) $this->id);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+		$sql .= " SET fk_statut = ".self::STATUS_CANCELED.",";
+		$sql .= " fk_user_modif = ".((int) $user->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -3159,7 +3159,7 @@ 
 					}
 				}
 				if (file_exists($dir)) {
-					$res = @dol_delete_dir_recursive($dir);		// delete files physically + into ecm tables
+					$res = @dol_delete_dir_recursive($dir); // delete files physically + into ecm tables
 					if (!$res) {
 						$this->error = 'ErrorFailToDeleteDir';
 						$this->errors[] = $this->error;
@@ -3563,7 +3563,7 @@ 
 		$this->multicurrency_code = $conf->currency;
 
 		// Lines
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 		while ($xnbp < $nbp) {
 			$line = new PropaleLigne($this->db);
@@ -3893,7 +3893,7 @@ 
 		}
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {

htdocs/product/inventory/class/inventory.class.php

Spacing +6 added lines, -6 removed lines

@@ -53,10 +53,10 @@ 
 	 */
 	public $picto = 'inventory';
 
-	const STATUS_DRAFT     = 0;		// Draft
-	const STATUS_VALIDATED = 1;		// Inventory is in process
-	const STATUS_RECORDED  = 2;		// Inventory is finisged. Stock movement has been recorded.
-	const STATUS_CANCELED  = 9;		// Canceled
+	const STATUS_DRAFT     = 0; // Draft
+	const STATUS_VALIDATED = 1; // Inventory is in process
+	const STATUS_RECORDED  = 2; // Inventory is finisged. Stock movement has been recorded.
+	const STATUS_CANCELED  = 9; // Canceled
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -96,7 +96,7 @@ 
 		'fk_warehouse'       => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'InventoryForASpecificWarehouse', 'picto' => 'stock', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'),
 		'fk_product'         => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'InventoryForASpecificProduct', 'picto' => 'product', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'),
 		'categories_product' => array('type' => 'chkbxlst:categorie:label:rowid::type=0:0:', 'label' => 'OrProductsWithCategories', 'visible' => 3, 'enabled' => 1, 'position' => 33, 'help' => '', 'picto' => 'category', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx'),
-		'date_inventory'     => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'),	// This date is not used so disabled by default.
+		'date_inventory'     => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default.
 		'date_creation'      => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500, 'csslist' => 'nowraponall'),
 		'tms'                => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501, 'csslist' => 'nowraponall'),
 		'date_validation'    => array('type' => 'datetime', 'label' => 'DateValidation', 'visible' => -2, 'enabled' => 1, 'position' => 502, 'csslist' => 'nowraponall'),
@@ -294,7 +294,7 @@ 
 					$TChildWarehouses = array();
 					$this->getChildWarehouse($this->fk_warehouse, $TChildWarehouses);
 					if (!empty($TChildWarehouses)) {
-						$sql .= " OR ps.fk_entrepot IN (" . $this->db->sanitize(implode(',', $TChildWarehouses)) . ")";
+						$sql .= " OR ps.fk_entrepot IN (".$this->db->sanitize(implode(',', $TChildWarehouses)).")";
 					}
 				}
 				$sql .= ')';

htdocs/reception/class/reception.class.php

Spacing +9 added lines, -9 removed lines

@@ -223,7 +223,7 @@ 
 		if (getDolGlobalString('RECEPTION_ADDON_NUMBER')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('RECEPTION_ADDON_NUMBER') . ".php";
+			$file = getDolGlobalString('RECEPTION_ADDON_NUMBER').".php";
 			$classname = getDolGlobalString('RECEPTION_ADDON_NUMBER');
 
 			// Include file with class
@@ -785,13 +785,13 @@ 
 				$this->fetch_origin();
 				if ($this->origin_object instanceof CommonObject && empty($this->origin_object->lines)) {
 					$res = $this->origin_object->fetch_lines();
-					$this->commandeFournisseur = null;	// deprecated
+					$this->commandeFournisseur = null; // deprecated
 					if ($res < 0) {
 						return $res;
 					}
 				} elseif ($this->origin_object instanceof CommandeFournisseur && empty($this->origin_object->lines)) {
 					$res = $this->origin_object->fetch_lines();
-					$this->commandeFournisseur = $this->origin_object;	// deprecated
+					$this->commandeFournisseur = $this->origin_object; // deprecated
 					if ($res < 0) {
 						return $res;
 					}
@@ -925,10 +925,10 @@ 
 			// check sell-by / eat-by date is mandatory
 			$errorMsgArr = Productlot::checkSellOrEatByMandatoryFromProductAndDates($product, $sellby, $eatby);
 			if (!empty($errorMsgArr)) {
-				$errorMessage = '<b>' . $product->ref . '</b> : ';
+				$errorMessage = '<b>'.$product->ref.'</b> : ';
 				$errorMessage .= '<ul>';
 				foreach ($errorMsgArr as $errorMsg) {
-					$errorMessage .= '<li>' . $errorMsg . '</li>';
+					$errorMessage .= '<li>'.$errorMsg.'</li>';
 				}
 				$errorMessage .= '</ul>';
 				$this->error = $errorMessage;
@@ -1373,7 +1373,7 @@ 
 		$result .= $linkend;
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -1419,7 +1419,7 @@ 
 		if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION_CLOSE")) {
 			$this->labelStatus[1]  = 'StatusReceptionValidatedToReceive';
 		}
-		$this->labelStatus[2]  = 'StatusReceptionProcessed';
+		$this->labelStatus[2] = 'StatusReceptionProcessed';
 
 		// List of short language codes for status
 		$this->labelStatusShort[-1] = 'StatusReceptionCanceledShort';
@@ -1524,12 +1524,12 @@ 
 
 		$this->fk_incoterms = 1;
 
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 		while ($xnbp < $nbp) {
 			$line = new CommandeFournisseurDispatch($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
-			$line->libelle = $langs->trans("Description")." ".$xnbp;	// deprecated
+			$line->libelle = $langs->trans("Description")." ".$xnbp; // deprecated
 			$line->label = $langs->trans("Description")." ".$xnbp;
 			$line->qty = 10;