Dolibarr / dolibarr

htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php

Spacing +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
 		// Clean data
 		// $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml');
 
-		if ($this->knowledgerecord->create(DolibarrApiAccess::$user)<0) {
+		if ($this->knowledgerecord->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating KnowledgeRecord", array_merge(array($this->knowledgerecord->error), $this->knowledgerecord->errors));
 		}
 		return $this->knowledgerecord->id;

htdocs/modulebuilder/template/class/api_mymodule.class.php

Spacing +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
 		// Clean data
 		// $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml');
 
-		if ($this->myobject->create(DolibarrApiAccess::$user)<0) {
+		if ($this->myobject->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors));
 		}
 		return $this->myobject->id;

htdocs/contact/consumption.php

Spacing +1 added lines, -1 removed lines

@@ -366,7 +366,7 @@
 $param .= "&type_element=".urlencode($type_element);
 
 $total_qty = 0;
-$num=0;
+$num = 0;
 if ($sql_select) {
 	$resql = $db->query($sql);
 	if (!$resql) {

htdocs/core/tpl/extrafields_list_search_sql.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -33,11 +33,11 @@ 
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
 			} elseif (is_array($crit)) {
 				if ($crit['start'] !== '' && $crit['end'] !== '') {
-					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." BETWEEN '". $db->idate($crit['start']). "' AND '".$db->idate($crit['end']) . "')";
+					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." BETWEEN '".$db->idate($crit['start'])."' AND '".$db->idate($crit['end'])."')";
 				} elseif ($crit['start'] !== '') {
-					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." >= '". $db->idate($crit['start'])."')";
+					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." >= '".$db->idate($crit['start'])."')";
 				} elseif ($crit['end'] !== '') {
-					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." <= '". $db->idate($crit['end'])."')";
+					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." <= '".$db->idate($crit['end'])."')";
 				}
 			}
 		} elseif (in_array($typ, array('boolean'))) {
@@ -57,7 +57,7 @@ 
 				$mode_search = 2; // Search on a foreign key int
 			}
 			if (in_array($typ, array('sellist')) && !is_numeric($crit)) {
-				$mode_search = 0;// Search on a foreign key string
+				$mode_search = 0; // Search on a foreign key string
 			}
 			if (in_array($typ, array('chkbxlst', 'checkbox', 'select'))) {
 				$mode_search = 4; // Search on a multiselect field with sql type = text

htdocs/core/class/cgenericdic.class.php

Spacing +2 added lines, -2 removed lines

@@ -33,12 +33,12 @@
 	/**
 	 * @var string Id to identify managed objects
 	 */
-	public $element = 'undefined';	// Will be defined into constructor
+	public $element = 'undefined'; // Will be defined into constructor
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'undefined';	// Will be defined into constructor
+	public $table_element = 'undefined'; // Will be defined into constructor
 
 	/**
 	 * @var CtyperesourceLine[] Lines

htdocs/core/class/dolreceiptprinter.class.php

Spacing +3 added lines, -3 removed lines

@@ -648,7 +648,7 @@ 
 							if ($line->fk_product) {
 								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - strlen($line->subprice) - 10 - 1;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
-								$this->printer->text($line->ref . $spaces . $line->qty . str_pad(price($line->subprice), 10, ' ', STR_PAD_LEFT) . ' ' . str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT) . "\n");
+								$this->printer->text($line->ref.$spaces.$line->qty.str_pad(price($line->subprice), 10, ' ', STR_PAD_LEFT).' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n \n");
 							} else {
 								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - strlen($line->subprice) - 10 - 1;
@@ -717,7 +717,7 @@ 
 						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_CURR_DATE':
-						if (strlen($vals[$tplline]['value'])<2) $this->printer->text(date('d/m/Y H:i:s')."\n");
+						if (strlen($vals[$tplline]['value']) < 2) $this->printer->text(date('d/m/Y H:i:s')."\n");
 						else $this->printer->text(date($vals[$tplline]['value'])."\n");
 						break;
 					case 'DOL_LINE_FEED':
@@ -803,7 +803,7 @@ 
 						$this->printer->getPrintConnector() -> write("\x1e");
 						break;
 					case 'DOL_BEEP_ALTERNATIVE': //if DOL_BEEP not works
-						$this->printer->getPrintConnector() -> write(Printer::ESC . "B" . chr(4) . chr(1));
+						$this->printer->getPrintConnector() -> write(Printer::ESC."B".chr(4).chr(1));
 						break;
 					case 'DOL_PRINT_ORDER_LINES':
 						foreach ($object->lines as $line) {

Braces +5 added lines, -2 removed lines

@@ -717,8 +717,11 @@
 						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_CURR_DATE':
-						if (strlen($vals[$tplline]['value'])<2) $this->printer->text(date('d/m/Y H:i:s')."\n");
-						else $this->printer->text(date($vals[$tplline]['value'])."\n");
+						if (strlen($vals[$tplline]['value'])<2) {
+							$this->printer->text(date('d/m/Y H:i:s')."\n");
+						} else {
+							$this->printer->text(date($vals[$tplline]['value'])."\n");
+						}
 						break;
 					case 'DOL_LINE_FEED':
 						$this->printer->feed();

htdocs/recruitment/class/api_recruitment.class.php

Spacing +2 added lines, -2 removed lines

@@ -366,7 +366,7 @@ 
 		// Clean data
 		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
-		if ($this->jobposition->create(DolibarrApiAccess::$user)<0) {
+		if ($this->jobposition->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating jobposition", array_merge(array($this->jobposition->error), $this->jobposition->errors));
 		}
 		return $this->jobposition->id;
@@ -398,7 +398,7 @@ 
 		// Clean data
 		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
-		if ($this->candidature->create(DolibarrApiAccess::$user)<0) {
+		if ($this->candidature->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating candidature", array_merge(array($this->candidature->error), $this->candidature->errors));
 		}
 		return $this->candidature->id;

Indentation +9 added lines, -9 removed lines

@@ -371,15 +371,15 @@
 	}
 
 	/**
-	* Create candidature object
-	*
-	* @param array $request_data   Request datas
-	* @return int  ID of candidature
-	*
-	* @throws RestException
-	*
-	* @url	POST candidature/
-	*/
+	 * Create candidature object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of candidature
+	 *
+	 * @throws RestException
+	 *
+	 * @url	POST candidature/
+	 */
 	public function postCandidature($request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->hasRight('recruitment', 'recruitmentjobposition', 'write')) {

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

Braces +4 added lines, -1 removed lines

@@ -894,7 +894,10 @@
 									if ($num_rows == 1) {
 										$res = $this->db->fetch_object($resql);
 										$lastinsertid = $res->rowid;
-										if ($is_table_category_link) $lastinsertid = 'linktable'; // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
+										if ($is_table_category_link) {
+											$lastinsertid = 'linktable';
+										}
+										// used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
 										$last_insert_id_array[$tablename] = $lastinsertid;
 									} elseif ($num_rows > 1) {
 										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));

Spacing +54 added lines, -54 removed lines

@@ -29,7 +29,7 @@ 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 
-require_once DOL_DOCUMENT_ROOT . '/core/modules/import/modules_import.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 
 
 /**
@@ -152,10 +152,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"));
@@ -248,7 +248,7 @@ 
 		global $langs;
 		$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);
@@ -401,7 +401,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);
@@ -474,12 +474,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('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 												break;
 											}
 											$classinstance = new $class($this->db);
@@ -521,12 +521,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'])) {
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
@@ -553,19 +553,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('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', code=' . $code);
+												dol_print_error('', '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 {
@@ -589,19 +589,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('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', units=' . $units);
+											dol_print_error('', '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;
@@ -693,12 +693,12 @@ 
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
-										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										dol_print_error('', '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));
-									$newval = $res; 	// We get new value computed.
+									$newval = $res; // We get new value computed.
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
@@ -721,16 +721,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);
@@ -753,14 +753,14 @@ 
 									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
 										$tableforerror = $table;
 										if (!empty($filter)) {
-											$tableforerror .= ':' . $filter;
+											$tableforerror .= ':'.$filter;
 										}
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$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>";
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
@@ -787,11 +787,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();
@@ -830,18 +830,18 @@ 
 							continue; // Not a field of current table
 						}
 						if ($val == 'user->id') {
-							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listvalues[] = ((int) $user->id);
 						} elseif (preg_match('/^lastrowid-/', $val)) {
 							$tmp = explode('-', $val);
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
-							$keyfield = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listfields[] = $keyfield;
 							$listvalues[] = $lastinsertid;
 							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
 						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
-							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listvalues[] = "'".$this->db->escape($tmp[1])."'";
 						} elseif (preg_match('/^rule-/', $val)) {
 							$fieldname = $key;
@@ -852,7 +852,7 @@ 
 									$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
-										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 										break;
 									}
 									$classinstance = new $class($this->db);
@@ -866,7 +866,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++;
 						}
@@ -886,19 +886,19 @@ 
 						$fname = 'rowid';
 						if (strpos($tablename, '_categorie_') !== false) {
 							$is_table_category_link = true;
-							$fname='*';
+							$fname = '*';
 						}
 
 						if (!empty($updatekeys)) {
 							// 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
-								$filters = array();	// filters to forge output error message
+								$where = array(); // filters to forge SQL request
+								$filters = array(); // filters to forge output error message
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
@@ -923,7 +923,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) {
@@ -952,7 +952,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 enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = "SELECT rowid FROM " . $tablename;
+								$sqlSelect = "SELECT rowid FROM ".$tablename;
 
 
 								if (empty($keyfield)) {
@@ -986,34 +986,34 @@ 
 								// 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;
 								}
-								$sqlstart .= " SET " . implode(', ', $set);
+								$sqlstart .= " SET ".implode(', ', $set);
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlend = " WHERE " . $keyfield . " = ".((int) $lastinsertid);
+								$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								if ($is_table_category_link) {
-									$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);
@@ -1034,22 +1034,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/core/modules/import/import_csv.modules.php

Braces +4 added lines, -1 removed lines

@@ -894,7 +894,10 @@
 									if ($num_rows == 1) {
 										$res = $this->db->fetch_object($resql);
 										$lastinsertid = $res->rowid;
-										if ($is_table_category_link) $lastinsertid = 'linktable'; // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
+										if ($is_table_category_link) {
+											$lastinsertid = 'linktable';
+										}
+										// used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
 										$last_insert_id_array[$tablename] = $lastinsertid;
 									} elseif ($num_rows > 1) {
 										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));

Spacing +11 added lines, -11 removed lines

@@ -482,7 +482,7 @@ 
 											//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'])) {
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
@@ -654,7 +654,7 @@ 
 									}
 									$classinstance = new $class($this->db);
 									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, ($key - 1)));
-									$newval = $res; 	// We get new value computed.
+									$newval = $res; // We get new value computed.
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
@@ -743,12 +743,12 @@ 
 						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
+								$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
 								$listvalues[$socialkey] = '';
 							}
 							//var_dump($newval); var_dump($arrayrecord[($key - 1)]['type']);
 							if (!empty($newval) && $arrayrecord[($key - 1)]['type'] > 0) {
-								$socialkey = array_search("socialnetworks", $listfields);	// Return position of 'socialnetworks' key in array
+								$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
 								//var_dump('sk='.$socialkey);	// socialkey=19
 								$socialnetwork = explode("_", $fieldname)[1];
 								if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
@@ -809,7 +809,7 @@ 
 									$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
-										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 										break;
 									}
 									$classinstance = new $class($this->db);
@@ -843,7 +843,7 @@ 
 						$fname = 'rowid';
 						if (strpos($tablename, '_categorie_') !== false) {
 							$is_table_category_link = true;
-							$fname='*';
+							$fname = '*';
 						}
 
 						if (!empty($updatekeys)) {
@@ -852,8 +852,8 @@ 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
 								$sqlSelect = "SELECT ".$fname." FROM ".$tablename;
 								$data = array_combine($listfields, $listvalues);
-								$where = array();	// filters to forge SQL request
-								$filters = array();	// filters to forge output error message
+								$where = array(); // filters to forge SQL request
+								$filters = array(); // filters to forge output error message
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
@@ -940,7 +940,7 @@ 
 								// 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)."'";
 								}
 
@@ -960,7 +960,7 @@ 
 								$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								if ($is_table_category_link) {
-									$sqlend = " WHERE " . implode(' AND ', $where);
+									$sqlend = " WHERE ".implode(' AND ', $where);
 								}
 
 								if (!empty($tablewithentity_cache[$tablename])) {
@@ -988,7 +988,7 @@ 
 							// 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)."'";
 							}