Dolibarr / dolibarr

htdocs/core/lib/geturl.lib.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 	// Turning on or off the ssl target certificate
 	if ($ssl_verifypeer < 0) {
 		global $dolibarr_main_prod;
-		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);
+		$ssl_verifypeer = ($dolibarr_main_prod ? true : false);
 	}
 	if (getDolGlobalString('MAIN_CURL_DISABLE_VERIFYPEER')) {
 		$ssl_verifypeer = 0;
@@ -117,7 +117,7 @@ 
 	// limit size of downloaded files. TODO Add MAIN_SECURITY_MAXFILESIZE_DOWNLOADED
 	$maxsize = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED');
 	if ($maxsize && defined('CURLOPT_MAXFILESIZE_LARGE')) {
-		curl_setopt($ch, CURLOPT_MAXFILESIZE_LARGE, $maxsize);  // @phan-suppress-current-line PhanTypeMismatchArgumentNullableInternal
+		curl_setopt($ch, CURLOPT_MAXFILESIZE_LARGE, $maxsize); // @phan-suppress-current-line PhanTypeMismatchArgumentNullableInternal
 	}
 	if ($maxsize && defined('CURLOPT_MAXFILESIZE')) {
 		curl_setopt($ch, CURLOPT_MAXFILESIZE, $maxsize);
@@ -135,7 +135,7 @@ 
 		$array_param = null;
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
 		if (!is_array($param)) {
-			parse_str($param, $array_param);  // @phan-suppress-current-line PhanPluginConstantVariableNull
+			parse_str($param, $array_param); // @phan-suppress-current-line PhanPluginConstantVariableNull
 		} else {
 			dol_syslog("parameter param must be a string", LOG_WARNING);
 			$array_param = $param;

htdocs/core/class/html.formfile.class.php

Spacing +6 added lines, -6 removed lines

@@ -110,7 +110,7 @@ 
 
 		$out .= '<div class="centpercent nobordernopadding valignmiddle"><div class="inline-block marginrightonly">';
 		if ($maxmin > 0) {
-			$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		$out .= '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="'.$htmlname.'" id="'.$htmlname.'" accept="image/*">';
 		$out .= '</div>';
@@ -240,7 +240,7 @@ 
 		$maxphptoshow = $maxfilesizearray['maxphptoshow'];
 		$maxphptoshowparam = $maxfilesizearray['maxphptoshowparam'];
 		if ($maxmin > 0) {
-			$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		$out .= '<input class="flat minwidth400 maxwidth200onsmartphone" type="file"';
 		$out .= ((getDolGlobalString('MAIN_DISABLE_MULTIPLE_FILEUPLOAD') || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');
@@ -949,7 +949,7 @@ 
 
 			// Loop on each file found
 			if (is_array($file_list)) {
-				'@phan-var-force array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string}> $file_list';  // phan limitations loose typing information with empty() tests, etc.  Force again.
+				'@phan-var-force array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string}> $file_list'; // phan limitations loose typing information with empty() tests, etc.  Force again.
 				// Defined relative dir to DOL_DATA_ROOT
 				$relativedir = '';
 				if ($filedir) {
@@ -1220,7 +1220,7 @@ 
 
 				$this->infofiles['nboffiles']++;
 				$this->infofiles['files'][] = $file['fullname'];
-				$ext = (string) pathinfo($file['name'], PATHINFO_EXTENSION);  // pathinfo returns a string here (cast for static analysis)
+				$ext = (string) pathinfo($file['name'], PATHINFO_EXTENSION); // pathinfo returns a string here (cast for static analysis)
 				if (!array_key_exists($ext, $this->infofiles['extensions'])) {
 					$this->infofiles['extensions'][$ext] = 1;
 				} else {
@@ -1502,7 +1502,7 @@ 
 						$modulepart = basename(dirname($file['path']));
 					}
 					if (empty($relativepath)) {
-						$relativepath = preg_replace('/\/(.+)/', '', $filepath) . '/';
+						$relativepath = preg_replace('/\/(.+)/', '', $filepath).'/';
 					}
 
 					$editline = 0;
@@ -1780,7 +1780,7 @@ 
 
 			if ($nboflines > 1 && is_object($object)) {
 				if (!empty($conf->use_javascript_ajax) && $permtoeditline) {
-					$table_element_line = 'ecm_files';	// used by ajaxrow.tpl.php
+					$table_element_line = 'ecm_files'; // used by ajaxrow.tpl.php
 					include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 				}
 			}

htdocs/core/customreports.php

Spacing +16 added lines, -16 removed lines

@@ -209,7 +209,7 @@ 
 }
 
 // Fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label('all');	// We load all extrafields definitions for all objects
+$extrafields->fetch_name_optionals_label('all'); // We load all extrafields definitions for all objects
 //$extrafields->fetch_name_optionals_label($object->table_element_line);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
@@ -222,7 +222,7 @@ 
 
 // If string is not an universal filter string, we try to convert it into universal filter syntax string
 $errorstr = '';
-forgeSQLFromUniversalSearchCriteria($search_component_params_input, $errorstr);	// Try conversion UFS->SQL
+forgeSQLFromUniversalSearchCriteria($search_component_params_input, $errorstr); // Try conversion UFS->SQL
 //var_dump($errorstr);
 if ($errorstr) {
 	$value = $search_component_params_input;
@@ -234,14 +234,14 @@ 
 	$crits = explode(' ', trim($value)); // the string after the name of the field. Explode on each AND
 	$res = '';
 
-	$i1 = 0;	// count the nb of and criteria added (all fields / criteria)
+	$i1 = 0; // count the nb of and criteria added (all fields / criteria)
 	foreach ($crits as $crit) {		// Loop on each AND criteria
 		$crit = trim($crit);
 
-		$i2 = 0;	// count the nb of valid criteria added for this first criteria
+		$i2 = 0; // count the nb of valid criteria added for this first criteria
 		$newres = '';
 		$tmpcrits = explode('|', $crit);
-		$i3 = 0;	// count the nb of valid criteria added for this current field
+		$i3 = 0; // count the nb of valid criteria added for this current field
 		foreach ($tmpcrits as $tmpcrit) {
 			if ($tmpcrit !== '0' && empty($tmpcrit)) {
 				continue;
@@ -259,8 +259,8 @@ 
 				}
 			}
 
-			$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit);		// the name of the field
-			$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit);	// the condition after the name of the field
+			$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit); // the name of the field
+			$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit); // the condition after the name of the field
 			//var_dump($field); var_dump($tmpcrit); var_dump($i3);
 
 			$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
@@ -636,7 +636,7 @@ 
 	foreach ($arrayofmesures as $key => $val) {
 		$simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
 	}
-	print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300 widthcentpercentminusx', 1, 0, '', '', $langs->trans("Measures"));	// Fill the array $arrayofmeasures with possible fields
+	print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300 widthcentpercentminusx', 1, 0, '', '', $langs->trans("Measures")); // Fill the array $arrayofmeasures with possible fields
 	print '</div>';
 
 	// XAxis
@@ -644,14 +644,14 @@ 
 	print '<div class="divadvancedsearchfield">';
 	print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span><span class="fas fa-caret-down caretdownaxis" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span></div>';
 	//var_dump($arrayofxaxis);
-	print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400 widthcentpercentminusx');	// Fill the array $arrayofxaxis with possible fields
+	print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400 widthcentpercentminusx'); // Fill the array $arrayofxaxis with possible fields
 	print '</div>';
 
 	// Group by
 	$count = 0;
 	print '<div class="divadvancedsearchfield">';
 	print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("GroupBy")).'"></span></div>';
-	print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300 widthcentpercentminusx', $langs->trans("GroupBy"));	// Fill the array $arrayofgroupby with possible fields
+	print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300 widthcentpercentminusx', $langs->trans("GroupBy")); // Fill the array $arrayofgroupby with possible fields
 	print '</div>';
 
 
@@ -810,7 +810,7 @@ 
 			//var_dump($arrayofgroupby);
 			$tmpforloop = dolExplodeIntoArray($arrayofxaxis[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -837,7 +837,7 @@ 
 			//var_dump($arrayofgroupby[$val]); var_dump($tmpval);
 			$tmpforloop = dolExplodeIntoArray($arrayofgroupby[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -864,7 +864,7 @@ 
 			//var_dump($arrayofgroupby);
 			$tmpforloop = dolExplodeIntoArray($arrayofmesures[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -898,7 +898,7 @@ 
 				$tmpval = explode('.', $val);
 				$tmpforloop = dolExplodeIntoArray($arrayoffilterfields[$val]['tablefromt'], ',');
 				foreach ($tmpforloop as $tmptable => $tmptablealias) {
-					if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+					if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 						$tmpforexplode = explode('__', $tmptablealias);
 						$endpart = end($tmpforexplode);
 						$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -934,9 +934,9 @@ 
 			* @param array<int, string> $matches
 			* @return string
 			*/
-			function (array $matches): string {
+			function(array $matches): string {
 				global $db;
-				$column = $matches[1] . '.' . $matches[2];
+				$column = $matches[1].'.'.$matches[2];
 				$operator = $matches[3];
 				$year = (int) $matches[4];
 				$month = (int) $matches[5];

htdocs/core/filemanagerdol/connectors/php/connector.lib.php

Spacing +2 added lines, -2 removed lines

@@ -300,7 +300,7 @@ 
 	global $user;
 
 	if (!isset($_FILES)) {
-		global $_FILES;	// @phan-suppress-current-line PhanPluginConstantVariableNull
+		global $_FILES; // @phan-suppress-current-line PhanPluginConstantVariableNull
 	}
 	$sErrorNumber = '0';
 	$sFileName = '';
@@ -639,7 +639,7 @@ 
 function GetRootPath()
 {
 	if (!isset($_SERVER)) {
-		global $_SERVER;  // @phan-suppress-current-line PhanPluginConstantVariableNull
+		global $_SERVER; // @phan-suppress-current-line PhanPluginConstantVariableNull
 	}
 	$sRealPath = realpath('./');
 	// #2124 ensure that no slash is at the end

htdocs/core/filemanagerdol/connectors/php/connector.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 
 ob_start();
 
-require 'config.inc.php';	// This include the main.inc.php
+require 'config.inc.php'; // This include the main.inc.php
 require 'connector.lib.php';
 
 if (!$Config['Enabled']) {
@@ -63,7 +63,7 @@ 
 	if ($sCommand == 'FileUpload') {
 		FileUpload($sResourceType, $sCurrentFolder, $sCommand);
 		// @phan-suppress-next-line PhanPluginUnreachableCode
-		return;  // FileUpload exits @phpstan-ignore-line
+		return; // FileUpload exits @phpstan-ignore-line
 	}
 
 	CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);

htdocs/core/menus/standard/eldy.lib.php

Spacing +3 added lines, -3 removed lines

@@ -1702,7 +1702,7 @@ 
 				$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110);
 				$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120);
 				if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-					$newmenu->add("/accountancy/admin/report_list.php?id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingReport"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 125);
+					$newmenu->add("/accountancy/admin/report_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingReport"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 125);
 				}
 				$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 130);
 			}
@@ -1772,7 +1772,7 @@ 
 								$nature = "expensereports";
 							}
 							if ($objp->nature == 1 && isModEnabled('asset')) {
-								$nature = "various";	// Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists.
+								$nature = "various"; // Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists.
 							}
 							if ($objp->nature == 8) {
 								$nature = "inventory";
@@ -1797,7 +1797,7 @@ 
 									$journallabel = '<span class="opacitymedium">('.$langs->trans($objp->label).')</span>'; // Label of bank account in llx_accounting_journal
 								}
 
-								$key = $langs->trans("AccountingJournalType".$objp->nature);	// $objp->nature is 1, 2, 3 ...
+								$key = $langs->trans("AccountingJournalType".$objp->nature); // $objp->nature is 1, 2, 3 ...
 								$transferlabel = (($objp->nature && $key != "AccountingJournalType".$objp->nature) ? $key.($journallabelwithoutspan != $key ? ' '.$journallabel : '') : $journallabel);
 
 								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $transferlabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire'));

htdocs/accountancy/class/accountancyreport.class.php

Spacing +34 added lines, -34 removed lines

@@ -126,7 +126,7 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO " . $this->db->prefix() . $this->table_element . " (";
+		$sql = "INSERT INTO ".$this->db->prefix().$this->table_element." (";
 		if ($this->rowid > 0) {
 			$sql .= "rowid, ";
 		}
@@ -137,29 +137,29 @@ 
 		$sql .= "entity";
 		$sql .= ") VALUES (";
 		if ($this->rowid > 0) {
-			$sql .= " " . ((int) $this->rowid) . ",";
+			$sql .= " ".((int) $this->rowid).",";
 		}
-		$sql .= " " . (!isset($this->code) ? "NULL" : "'" . $this->db->escape($this->code) . "'") . ",";
-		$sql .= " " . (!isset($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'") . ",";
-		$sql .= " " . (!isset($this->fk_country) ? 'NULL' : ((int) $this->fk_country)) . ",";
-		$sql .= " " . (!isset($this->active) ? 'NULL' : ((int) $this->active));
-		$sql .= ", " . ((int) $conf->entity);
+		$sql .= " ".(!isset($this->code) ? "NULL" : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->fk_country) ? 'NULL' : ((int) $this->fk_country)).",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : ((int) $this->active));
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this) . "::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -186,19 +186,19 @@ 
 		$sql .= " t.label,";
 		$sql .= " t.fk_country,";
 		$sql .= " t.active";
-		$sql .= " FROM " . $this->db->prefix() . $this->table_element . " as t";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		if ($id) {
-			$sql .= " WHERE t.rowid = " . ((int) $id);
+			$sql .= " WHERE t.rowid = ".((int) $id);
 		} else {
-			$sql .= " WHERE t.entity IN (" . getEntity('c_accounting_report') . ")"; // Don't use entity if you use rowid
+			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_report').")"; // Don't use entity if you use rowid
 			if ($code) {
-				$sql .= " AND t.code = '" . $this->db->escape($code) . "'";
+				$sql .= " AND t.code = '".$this->db->escape($code)."'";
 			} elseif ($label) {
-				$sql .= " AND t.label = '" . $this->db->escape($label) . "'";
+				$sql .= " AND t.label = '".$this->db->escape($label)."'";
 			}
 		}
 
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -214,7 +214,7 @@ 
 
 			return 1;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -251,27 +251,27 @@ 
 		// Put here code to add control on parameters values
 
 		// Update request
-		$sql = "UPDATE " . $this->db->prefix() . $this->table_element . " SET";
-		$sql .= " code=" . (isset($this->code) ? "'" . $this->db->escape($this->code) . "'" : "null") . ",";
-		$sql .= " label=" . (isset($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null") . ",";
-		$sql .= " fk_country=" . (isset($this->fk_country) ? ((int) $this->fk_country) : "null") . ",";
-		$sql .= " active=" . (isset($this->active) ? ((int) $this->active) : "null");
-		$sql .= " WHERE rowid=" . ((int) $this->id);
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " fk_country=".(isset($this->fk_country) ? ((int) $this->fk_country) : "null").",";
+		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null");
+		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this) . "::update " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -294,23 +294,23 @@ 
 		global $conf, $langs;
 		$error = 0;
 
-		$sql = "DELETE FROM " . $this->db->prefix() . $this->table_element;
-		$sql .= " WHERE rowid=" . ((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
+		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;

htdocs/fourn/class/fournisseur.facture.class.php

Spacing +33 added lines, -33 removed lines

@@ -225,7 +225,7 @@ 
 	/**
 	 * @var int ID
 	 */
-	public $fk_account;		// default bank account
+	public $fk_account; // default bank account
 
 	/**
 	 * @var int Transport mode id
@@ -436,7 +436,7 @@ 
 		if ($this->fac_rec > 0) {
 			$this->fk_fac_rec_source = $this->fac_rec;
 
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
 			$_facrec = new FactureFournisseurRec($this->db);
 			$result = $_facrec->fetch($this->fac_rec);
 			$result = $_facrec->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); // This load $_facrec->linkedObjectsIds
@@ -471,7 +471,7 @@ 
 			$this->location_incoterms = $_facrec->location_incoterms;
 
 			// Clean parameters
-			if (! $this->type) {
+			if (!$this->type) {
 				$this->type = self::TYPE_STANDARD;
 			}
 			$this->note_public = trim($this->note_public);
@@ -480,11 +480,11 @@ 
 
 			$this->array_options = $_facrec->array_options;
 
-			if (! $this->mode_reglement_id) {
+			if (!$this->mode_reglement_id) {
 				$this->mode_reglement_id = 0;
 			}
 			$this->status = self::STATUS_DRAFT;
-			$this->statut = self::STATUS_DRAFT;	// deprecated
+			$this->statut = self::STATUS_DRAFT; // deprecated
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
 			// We do not add link to template invoice or next invoice will be linked to all generated invoices
@@ -494,7 +494,7 @@ 
 
 			// For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
 			if ($_facrec->frequency > 0) {
-				$this->ref_supplier = trim($this->ref_supplier . '_' . ($_facrec->nb_gen_done + 1));
+				$this->ref_supplier = trim($this->ref_supplier.'_'.($_facrec->nb_gen_done + 1));
 				dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
 				if (empty($_facrec->date_when)) {
 					$_facrec->date_when = $now;
@@ -730,7 +730,7 @@ 
 			/*
 			 * Insert lines of template invoices
 			 */
-			if (! $error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) {
+			if (!$error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) {
 				foreach ($_facrec->lines as $i => $val) {
 					if ($_facrec->lines[$i]->fk_product) {
 						$prod = new Product($this->db);
@@ -745,7 +745,7 @@ 
 					$localtax1_tx=get_localtax($tva_tx,1,$soc,$mysoc,$tva_npr);
 					$localtax2_tx=get_localtax($tva_tx,2,$soc,$mysoc,$tva_npr);
 					*/
-					$tva_tx = $_facrec->lines[$i]->tva_tx . ($_facrec->lines[$i]->vat_src_code ? '(' . $_facrec->lines[$i]->vat_src_code . ')' : '');
+					$tva_tx = $_facrec->lines[$i]->tva_tx.($_facrec->lines[$i]->vat_src_code ? '('.$_facrec->lines[$i]->vat_src_code.')' : '');
 					$tva_npr = $_facrec->lines[$i]->info_bits;
 					if (empty($tva_tx)) {
 						$tva_npr = 0;
@@ -758,8 +758,8 @@ 
 					$buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
 
 					// If buyprice not defined from template invoice, we try to guess the best value
-					if (! $buyprice && $_facrec->lines[$i]->fk_product > 0) {
-						require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+					if (!$buyprice && $_facrec->lines[$i]->fk_product > 0) {
+						require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 						$producttmp = new ProductFournisseur($this->db);
 						$producttmp->fetch($_facrec->lines[$i]->fk_product);
 
@@ -945,11 +945,11 @@ 
 				$this->id = $obj->rowid;
 				$this->ref = $obj->ref ? $obj->ref : $obj->rowid; // We take rowid if ref is empty for backward compatibility
 
-				$this->ref_supplier         = $obj->ref_supplier;
-				$this->ref_ext			    = $obj->ref_ext;
-				$this->entity				= $obj->entity;
+				$this->ref_supplier = $obj->ref_supplier;
+				$this->ref_ext = $obj->ref_ext;
+				$this->entity = $obj->entity;
 				$this->type					= empty($obj->type) ? self::TYPE_STANDARD : $obj->type;
-				$this->subtype				= (int) $obj->subtype;
+				$this->subtype = (int) $obj->subtype;
 				$this->socid				= $obj->fk_soc;
 				$this->datec				= $this->db->jdate($obj->datec);
 				$this->date					= $this->db->jdate($obj->datef);
@@ -967,13 +967,13 @@ 
 				$this->total_tva			= $obj->total_tva;
 				$this->total_ttc			= $obj->total_ttc;
 				$this->status				= $obj->status;
-				$this->statut				= $obj->status;	// For backward compatibility
-				$this->fk_statut			= $obj->status;	// For backward compatibility
+				$this->statut				= $obj->status; // For backward compatibility
+				$this->fk_statut			= $obj->status; // For backward compatibility
 				$this->user_creation_id     = $obj->fk_user_author;
-				$this->author				= $obj->fk_user_author;	// deprecated
+				$this->author				= $obj->fk_user_author; // deprecated
 				$this->user_validation_id   = $obj->fk_user_valid;
 				$this->fk_facture_source	= $obj->fk_facture_source;
-				$this->vat_reverse_charge	= empty($obj->vat_reverse_charge) ? 0 : 1;
+				$this->vat_reverse_charge = empty($obj->vat_reverse_charge) ? 0 : 1;
 				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
 				$this->fk_project           = $obj->fk_project;
 				$this->cond_reglement_id	= $obj->fk_cond_reglement;
@@ -1009,7 +1009,7 @@ 
 
 				$this->extraparams = isset($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
 
-				$this->socid  = $obj->socid;
+				$this->socid = $obj->socid;
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -1076,11 +1076,11 @@ 
 					$line->date_end         = $obj->date_end;
 					$line->product_ref      = $obj->product_ref;
 					$line->ref              = $obj->product_ref;
-					$line->ref_supplier		= $obj->ref_supplier;
+					$line->ref_supplier = $obj->ref_supplier;
 					$line->libelle			= $obj->label;
 					$line->label  			= $obj->label;
 					$line->product_barcode  = $obj->product_barcode;
-					$line->product_desc		= $obj->product_desc;
+					$line->product_desc = $obj->product_desc;
 					$line->subprice         = $obj->pu_ht;
 					$line->pu_ht            = $obj->pu_ht;
 					$line->pu_ttc			= $obj->pu_ttc;
@@ -1090,7 +1090,7 @@ 
 					$line->localtax2_tx		= $obj->localtax2_tx;
 					$line->localtax1_type	= $obj->localtax1_type;
 					$line->localtax2_type	= $obj->localtax2_type;
-					$line->qty				= $obj->qty;
+					$line->qty = $obj->qty;
 					$line->remise_percent   = $obj->remise_percent;
 					$line->fk_remise_except = $obj->fk_remise_except;
 					//$line->tva			= $obj->total_tva; // deprecated
@@ -2449,7 +2449,7 @@ 
 
 		$line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs((float) $qty) : (float) $qty); // For credit note, quantity is always positive and unit price negative
 		$line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs((float) $pu_ht) : (float) $pu_ht); // For credit note, unit price always negative, always positive otherwise
-		$line->pu_ht = $line->subprice;  // deprecated
+		$line->pu_ht = $line->subprice; // deprecated
 		$line->pu_ttc = ($this->type == self::TYPE_CREDIT_NOTE ? -abs((float) $pu_ttc) : (float) $pu_ttc); // For credit note, unit price always negative, always positive otherwise
 
 		$line->remise_percent = $remise_percent;
@@ -2734,7 +2734,7 @@ 
 
 			while ($obj = $this->db->fetch_object($resql)) {
 				$facturestatic->date_echeance = $this->db->jdate($obj->datefin);
-				$facturestatic->statut = $obj->status;	// For backward compatibility
+				$facturestatic->statut = $obj->status; // For backward compatibility
 				$facturestatic->status = $obj->status;
 
 				$response->nbtodo++;
@@ -2947,7 +2947,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) {
@@ -2978,7 +2978,7 @@ 
 
 		$mybool = false;
 
-		$file = getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') . ".php";
+		$file = getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER').".php";
 		$classname = getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER');
 
 		// Include file with class
@@ -3169,15 +3169,15 @@ 
 		// Load source object
 		$object->fetch($fromid);
 		$object->id = 0;
-		$object->statut = self::STATUS_DRAFT;	// For backward compatibility
+		$object->statut = self::STATUS_DRAFT; // For backward compatibility
 		$object->status = self::STATUS_DRAFT;
 
 		$object->fetch_thirdparty(); // We need it to recalculate VAT localtaxes according to main sale taxes and vendor
 
 		// Clear fields
 		$object->ref_supplier       = (empty($this->ref_supplier) ? $langs->trans("CopyOf").' '.$object->ref_supplier : $this->ref_supplier);
-		$object->author             = $user->id;  // FIXME? user_validation_id is replacement for author
-		$object->user_validation_id = 0;  // FIXME?  user_validation_id is replacement for author
+		$object->author             = $user->id; // FIXME? user_validation_id is replacement for author
+		$object->user_validation_id = 0; // FIXME?  user_validation_id is replacement for author
 		$object->fk_facture_source  = 0;
 		$object->date_creation      = '';
 		$object->date_validation    = '';
@@ -3480,14 +3480,14 @@ 
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
-		$sql .= " WHERE f.paye = 0";	// Only unpaid
-		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;	// Only validated status
+		$sql .= " WHERE f.paye = 0"; // Only unpaid
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED; // Only validated status
 		if ($datetouse == 'invoicedate') {
 			$sql .= " AND f.datef = '".$this->db->idate($tmpidate, 'gmt')."'";
 		} else {
 			$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
 		}
-		$sql .= " AND f.entity IN (".getEntity('supplier_invoice', 0).")";	// One batch process only one company (no sharing)
+		$sql .= " AND f.entity IN (".getEntity('supplier_invoice', 0).")"; // One batch process only one company (no sharing)
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
 		}
@@ -3707,7 +3707,7 @@ 
 								$actioncomm->create($user);
 							}
 
-							$this->db->commit();	// We always commit
+							$this->db->commit(); // We always commit
 						}
 
 						if ($errormesg) {

htdocs/fourn/class/fournisseur.commande.class.php

Spacing +19 added lines, -19 removed lines

@@ -521,7 +521,7 @@ 
 			$this->ref_supplier = $obj->ref_supplier;
 			$this->socid = $obj->fk_soc;
 			$this->fourn_id = $obj->fk_soc;
-			$this->statut = $obj->status;	// deprecated
+			$this->statut = $obj->status; // deprecated
 			$this->status = $obj->status;
 			$this->billed = $obj->billed;
 			$this->user_author_id = $obj->user_author_id;
@@ -552,7 +552,7 @@ 
 			$this->fk_project = $obj->fk_project;
 			$this->cond_reglement_id = $obj->fk_cond_reglement;
 			$this->cond_reglement_code = $obj->cond_reglement_code;
-			$this->cond_reglement = $obj->cond_reglement_label;			// deprecated
+			$this->cond_reglement = $obj->cond_reglement_label; // deprecated
 			$this->cond_reglement_label = $obj->cond_reglement_label;
 			$this->cond_reglement_doc = $obj->cond_reglement_doc;
 			$this->fk_account = $obj->fk_account;
@@ -685,10 +685,10 @@ 
 					$sqlsearchpackage .= ' WHERE entity IN ('.getEntity('product_fournisseur_price').")";
 					$sqlsearchpackage .= " AND fk_product = ".((int) $objp->fk_product);
 					$sqlsearchpackage .= " AND ref_fourn = '".$this->db->escape($objp->ref_supplier)."'";
-					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty);	// required to be qualified
-					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")";	// required to be qualified
+					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty); // required to be qualified
+					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")"; // required to be qualified
 					$sqlsearchpackage .= " AND fk_soc = ".((int) $this->socid);
-					$sqlsearchpackage .= " ORDER BY packaging ASC";		// Take the smaller package first
+					$sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first
 					$sqlsearchpackage .= " LIMIT 1";
 
 					$resqlsearchpackage = $this->db->query($sqlsearchpackage);
@@ -716,7 +716,7 @@ 
 				$line->multicurrency_total_tva = $objp->multicurrency_total_tva;
 				$line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
 
-				$line->info_bits      	   = $objp->info_bits;
+				$line->info_bits = $objp->info_bits;
 				$line->special_code        = $objp->special_code;
 				$line->fk_parent_line      = $objp->fk_parent_line;
 
@@ -843,7 +843,7 @@ 
 			if (!$error) {
 				$result = 1;
 				$this->status = self::STATUS_VALIDATED;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->ref = $num;
 			}
 
@@ -1086,7 +1086,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) {
@@ -1576,7 +1576,7 @@ 
 			$this->multicurrency_tx = 1;
 		}
 
-		$this->statut = self::STATUS_DRAFT;	// deprecated
+		$this->statut = self::STATUS_DRAFT; // deprecated
 		$this->status = self::STATUS_DRAFT;
 
 		$sql = "INSERT INTO ".$this->db->prefix()."commande_fournisseur (";
@@ -1662,10 +1662,10 @@ 
 						$line->date_end,
 						$line->array_options,
 						$line->fk_unit,
-						$line->multicurrency_subprice,  // pu_ht_devise
-						$line->origin,     // origin
-						$line->origin_id,  // origin_id
-						$line->rang,       // rang
+						$line->multicurrency_subprice, // pu_ht_devise
+						$line->origin, // origin
+						$line->origin_id, // origin_id
+						$line->rang, // rang
 						$line->special_code
 					);
 					if ($result < 0) {
@@ -2039,7 +2039,7 @@ 
 			$this->db->begin();
 
 			$product_type = $type;
-			$label = '';	// deprecated
+			$label = ''; // deprecated
 
 			if ($fk_product > 0) {
 				if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {	// Not the common case
@@ -2101,7 +2101,7 @@ 
 					if ($qty < $prod->packaging) {
 						$qty = $prod->packaging;
 					} else {
-						if (!empty($prod->packaging) && (fmod((float) $qty, $prod->packaging)  > 0.000001)) {
+						if (!empty($prod->packaging) && (fmod((float) $qty, $prod->packaging) > 0.000001)) {
 							$coeff = intval((float) $qty / $prod->packaging) + 1;
 							$qty = (float) $prod->packaging * $coeff;
 							setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
@@ -2182,7 +2182,7 @@ 
 			$this->line->total_localtax2 = (float) $total_localtax2;
 			$this->line->total_ttc = (float) $total_ttc;
 			$this->line->product_type = $type;
-			$this->line->special_code   = (!empty($special_code) ? $special_code : 0);
+			$this->line->special_code = (!empty($special_code) ? $special_code : 0);
 			$this->line->origin = $origin;
 			$this->line->origin_id = $origin_id;
 			$this->line->fk_unit = $fk_unit;
@@ -2193,8 +2193,8 @@ 
 			// Multicurrency
 			$this->line->fk_multicurrency = $this->fk_multicurrency;
 			$this->line->multicurrency_code = $this->multicurrency_code;
-			$this->line->multicurrency_subprice	= (float) $pu_ht_devise;
-			$this->line->multicurrency_total_ht 	= (float) $multicurrency_total_ht;
+			$this->line->multicurrency_subprice = (float) $pu_ht_devise;
+			$this->line->multicurrency_total_ht = (float) $multicurrency_total_ht;
 			$this->line->multicurrency_total_tva 	= (float) $multicurrency_total_tva;
 			$this->line->multicurrency_total_ttc 	= (float) $multicurrency_total_ttc;
 
@@ -3390,7 +3390,7 @@ 
 		global $conf, $langs;
 
 		if (!dol_strlen($modele)) {
-			$modele = '';	// No doc template/generation by default
+			$modele = ''; // No doc template/generation by default
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;