Dolibarr / dolibarr

htdocs/public/recruitment/view.php

Spacing +10 added lines, -10 removed lines

@@ -55,7 +55,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/public.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/public.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
@@ -185,7 +185,7 @@ 
 	$ok = false;
 	if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_RECRUITMENT') && is_object($captchaobj)) {
 		if (method_exists($captchaobj, 'validateCodeAfterLoginSubmit')) {
-			$ok = $captchaobj->validateCodeAfterLoginSubmit();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$ok = $captchaobj->validateCodeAfterLoginSubmit(); // @phan-suppress-current-line PhanUndeclaredMethod
 		} else {
 			print 'Error, the captcha handler '.get_class($captchaobj).' does not have any method validateCodeAfterLoginSubmit()';
 		}
@@ -198,8 +198,8 @@ 
 	}
 	if (!$error) {
 		$sql = "SELECT rrc.rowid FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rrc";
-		$sql .= " WHERE rrc.email = '". $db->escape($email)."'";
-		$sql .= " AND rrc.entity IN (". getEntity($object->element, 0).")";
+		$sql .= " WHERE rrc.email = '".$db->escape($email)."'";
+		$sql .= " AND rrc.entity IN (".getEntity($object->element, 0).")";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
@@ -264,7 +264,7 @@ 
 	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("RecruitmentCandidatureSaved"), null);
-		header("Location: " . $backtopage);
+		header("Location: ".$backtopage);
 		exit;
 	} else {
 		$db->rollback();
@@ -290,7 +290,7 @@ 
 
 $head = '';
 if (getDolGlobalString('MAIN_RECRUITMENT_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_RECRUITMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('MAIN_RECRUITMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -363,7 +363,7 @@ 
 
 if (getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE')) {
 	print '<div class="backimagepublicrecruitment">';
-	print '<img id="idRECRUITMENT_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE').'">';
+	print '<img id="idRECRUITMENT_IMAGE_PUBLIC_INTERFACE" src="'.getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE').'">';
 	print '</div>';
 }
 
@@ -377,7 +377,7 @@ 
 	if (preg_match('/^\((.*)\)$/', $conf->global->RECRUITMENT_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
 	} else {
-		$text .= getDolGlobalString('RECRUITMENT_NEWFORM_TEXT') . "<br>\n";
+		$text .= getDolGlobalString('RECRUITMENT_NEWFORM_TEXT')."<br>\n";
 	}
 	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
@@ -488,7 +488,7 @@ 
 
 		// Other attributes
 		$object = new RecruitmentCandidature($db);
-		$parameters['tpl_context'] = 'public';	// define template context to public
+		$parameters['tpl_context'] = 'public'; // define template context to public
 		$parameters['tdclass'] = 'left';
 		$extrafields->fetch_name_optionals_label("recruitment_recruitmentcandidature");
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
@@ -501,7 +501,7 @@ 
 		if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_RECRUITMENT') && is_object($captchaobj)) {
 			print '<tr><td class="titlefield"><label><span class="fieldrequired">'.$langs->trans($captchaobj->getFieldInputTitle()).'</span></label></td><td><br>';
 			if (method_exists($captchaobj, 'getCaptchaCodeForForm')) {
-				print $captchaobj->getCaptchaCodeForForm('');  // @phan-suppress-current-line PhanUndeclaredMethod
+				print $captchaobj->getCaptchaCodeForForm(''); // @phan-suppress-current-line PhanUndeclaredMethod
 			} else {
 				print 'Error, the captcha handler '.get_class($captchaobj).' does not have any method getCaptchaCodeForForm()';
 			}

htdocs/core/class/translate.class.php

Spacing +45 added lines, -45 removed lines

@@ -131,9 +131,9 @@ 
 			$more = array();
 			$i = 0;
 			foreach ($conf->file->dol_document_root as $dir) {
-				$newdir = $dir . getDolGlobalString('MAIN_FORCELANGDIR'); // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'
+				$newdir = $dir.getDolGlobalString('MAIN_FORCELANGDIR'); // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'
 				if (!in_array($newdir, $this->dir)) {
-					$more['module_' . $i] = $newdir;
+					$more['module_'.$i] = $newdir;
 					$i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
 				}
 			}
@@ -163,13 +163,13 @@ 
 			if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep)) {
 				$srclang = $longforshort[strtolower($langpart[0])];
 			} elseif (!is_numeric($langpart[1])) {		// Second part YY may be a numeric with some Chrome browser
-				$srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[1]);
-				$longforlong = array('no_nb' => 'nb_NO');	// When lang and code are inverted by browser
+				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);
+				$longforlong = array('no_nb' => 'nb_NO'); // When lang and code are inverted by browser
 				if (isset($longforlong[strtolower($srclang)])) {
 					$srclang = $longforlong[strtolower($srclang)];
 				}
 			} else {
-				$srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
 			}
 		} else {						// If it's for a codetouse that is a short code xx
 			// Array to convert short lang code into long code.
@@ -182,7 +182,7 @@ 
 			if (isset($longforshort[strtolower($langpart[0])])) {
 				$srclang = $longforshort[strtolower($langpart[0])];
 			} elseif (!empty($langpart[0])) {
-				$srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);
+				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
 			} else {
 				$srclang = 'en_US';
 			}
@@ -262,7 +262,7 @@ 
 
 		// Check parameters
 		if (empty($domain)) {
-			dol_print_error(null, get_class($this) . "::Load ErrorWrongParameters");
+			dol_print_error(null, get_class($this)."::Load ErrorWrongParameters");
 			return -1;
 		}
 		if ($this->defaultlang === 'none_NONE') {
@@ -309,18 +309,18 @@ 
 		}
 
 		if (empty($langofdir)) {	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
-			dol_syslog("Error: " . get_class($this) . "::load was called for domain=" . $domain . " but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
+			dol_syslog("Error: ".get_class($this)."::load was called for domain=".$domain." but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
 			return -1;
 		}
 
 		$usecachekey = '';
 		foreach ($this->dir as $searchdir) {
 			// Directory of translation files
-			$file_lang = $searchdir . ($modulename ? '/' . $modulename : '') . "/langs/" . $langofdir . "/" . $newdomain . ".lang";
+			$file_lang = $searchdir.($modulename ? '/'.$modulename : '')."/langs/".$langofdir."/".$newdomain.".lang";
 			$file_lang_osencoded = dol_osencode($file_lang);
 
 			//$filelangexists = is_file($file_lang_osencoded);
-			$filelangexists = @is_file($file_lang_osencoded);	// avoid [php:warn]
+			$filelangexists = @is_file($file_lang_osencoded); // avoid [php:warn]
 
 			//dol_syslog(get_class($this).'::Load Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' file_lang='.$file_lang." => filelangexists=".$filelangexists);
 			//print 'Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' this->_tab_loaded[newdomain]='.$this->_tab_loaded[$newdomain].' file_lang='.$file_lang." => filelangexists=".$filelangexists."\n";
@@ -333,7 +333,7 @@ 
 				$usecachekey = '';
 				// Using a memcached server
 				if (isModEnabled('memcached') && getDolGlobalString('MEMCACHED_SERVER')) {
-					$usecachekey = $newdomain . '_' . $langkey . '_' . md5($file_lang); // Should not contains special chars
+					$usecachekey = $newdomain.'_'.$langkey.'_'.md5($file_lang); // Should not contains special chars
 				} elseif (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {
 					// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
 					$usecachekey = $newdomain;
@@ -341,7 +341,7 @@ 
 
 				if ($usecachekey) {
 					//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
-					require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 					$tmparray = dol_getcache($usecachekey);
 					if (is_array($tmparray) && count($tmparray)) {
 						$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
@@ -403,7 +403,7 @@ 
 		if ($alt == 0) {
 			// This function MUST NOT contains call to syslog
 			//dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);
-			$langofdir = strtolower($langarray[0]) . '_' . strtoupper($langarray[0]);
+			$langofdir = strtolower($langarray[0]).'_'.strtoupper($langarray[0]);
 			if ($langofdir == 'el_EL') {
 				$langofdir = 'el_GR'; // main parent for el_CY is not 'el_EL' but 'el_GR'
 			}
@@ -435,7 +435,7 @@ 
 		// This part is deprecated and replaced with table llx_overwrite_trans
 		// Kept for backward compatibility.
 		if (empty($loadfromfileonly)) {
-			$overwritekey = 'MAIN_OVERWRITE_TRANS_' . $this->defaultlang;
+			$overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;
 			if (getDolGlobalString($overwritekey)) {    // Overwrite translation with key1:newstring1,key2:newstring2
 				// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
 				$tmparray = explode(',', getDolGlobalString($overwritekey));
@@ -452,7 +452,7 @@ 
 		if ($usecachekey && count($tabtranslatedomain)) {
 			$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
 			if ($ressetcache < 0) {
-				$error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;
+				$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
 				dol_syslog($error, LOG_ERR);
 			}
 		}
@@ -505,7 +505,7 @@ 
 		$langofdir = $this->defaultlang;
 
 		if (empty($langofdir)) {	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
-			dol_syslog("Error: " . get_class($this) . "::loadFromDatabase was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
+			dol_syslog("Error: ".get_class($this)."::loadFromDatabase was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
 			return -1;
 		}
 
@@ -516,7 +516,7 @@ 
 		$usecachekey = '';
 		// Using a memcached server
 		if (isModEnabled('memcached') && getDolGlobalString('MEMCACHED_SERVER')) {
-			$usecachekey = $newdomain . '_' . $langofdir; // Should not contains special chars
+			$usecachekey = $newdomain.'_'.$langofdir; // Should not contains special chars
 		} elseif (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {
 			// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
 			$usecachekey = $newdomain;
@@ -524,7 +524,7 @@ 
 
 		if ($usecachekey) {
 			//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 			$tmparray = dol_getcache($usecachekey);
 			if (is_array($tmparray) && count($tmparray)) {
 				$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
@@ -574,7 +574,7 @@ 
 					if ($usecachekey && count($tabtranslatedomain)) {
 						$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
 						if ($ressetcache < 0) {
-							$error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;
+							$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
 							dol_syslog($error, LOG_ERR);
 						}
 					}
@@ -668,12 +668,12 @@ 
 			$str = $this->tab_translate[$key];
 
 			// Make some string replacement after translation
-			$replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;
+			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
 			if (getDolGlobalString($replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
 				$tmparray = explode(';', getDolGlobalString($replacekey));
 				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
-					$str = preg_replace('/' . preg_quote($tmparray2[0], '/') . '/', $tmparray2[1], $str);
+					$str = preg_replace('/'.preg_quote($tmparray2[0], '/').'/', $tmparray2[1], $str);
 				}
 			}
 
@@ -786,12 +786,12 @@ 
 			$str = $this->tab_translate[$key];
 
 			// Make some string replacement after translation
-			$replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;
+			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
 			if (getDolGlobalString($replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
 				$tmparray = explode(';', getDolGlobalString($replacekey));
 				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
-					$str = preg_replace('/' . preg_quote($tmparray2[0], '/') . '/', $tmparray2[1], $str);
+					$str = preg_replace('/'.preg_quote($tmparray2[0], '/').'/', $tmparray2[1], $str);
 				}
 			}
 
@@ -899,7 +899,7 @@ 
 		$this->load("languages");
 
 		// We scan directory langs to detect available languages
-		$handle = opendir($langdir . "/langs");
+		$handle = opendir($langdir."/langs");
 		$langs_available = array();
 		while ($dir = trim(readdir($handle))) {
 			$regs = array();
@@ -949,9 +949,9 @@ 
 				}
 
 				if ($usecode == 1 || getDolGlobalString('MAIN_SHOW_LANGUAGE_CODE')) {
-					$langs_available[$dir] = $dir . ': ' . dol_trunc($this->trans('Language_' . $dir), $maxlength);
+					$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
 				} else {
-					$langs_available[$dir] = $this->trans('Language_' . $dir);
+					$langs_available[$dir] = $this->trans('Language_'.$dir);
 				}
 				if ($mainlangonly) {
 					$langs_available[$dir] = str_replace(' (United States)', '', $langs_available[$dir]);
@@ -975,7 +975,7 @@ 
 		// phpcs:enable
 		// Test si fichier dans repertoire de la langue
 		foreach ($this->dir as $searchdir) {
-			if (is_readable(dol_osencode($searchdir . "/langs/" . $this->defaultlang . "/" . $filename))) {
+			if (is_readable(dol_osencode($searchdir."/langs/".$this->defaultlang."/".$filename))) {
 				return true;
 			}
 
@@ -983,7 +983,7 @@ 
 				$filenamealt = null;
 				// Test si fichier dans repertoire de la langue alternative
 				if ($this->defaultlang != "en_US") {
-					$filenamealt = $searchdir . "/langs/en_US/" . $filename;
+					$filenamealt = $searchdir."/langs/en_US/".$filename;
 				}
 				//else $filenamealt = $searchdir."/langs/fr_FR/".$filename;
 				if ($filenamealt !== null && is_readable(dol_osencode($filenamealt))) {
@@ -1024,8 +1024,8 @@ 
 			}
 
 			$fonc = 'numberwords';
-			if (file_exists($newdir . '/functions_' . $fonc . '.lib.php')) {
-				include_once $newdir . '/functions_' . $fonc . '.lib.php';
+			if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) {
+				include_once $newdir.'/functions_'.$fonc.'.lib.php';
 				if (function_exists('numberwords_getLabelFromNumber')) {
 					$newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
 					break;
@@ -1078,13 +1078,13 @@ 
 		}
 
 		// Not found in loaded language file nor in cache. So we will take the label into database.
-		$sql = "SELECT " . $fieldlabel . " as label";
-		$sql .= " FROM " . $db->prefix() . $tablename;
-		$sql .= " WHERE " . $fieldkey . " = '" . $db->escape($keyforselect ? $keyforselect : $key) . "'";
+		$sql = "SELECT ".$fieldlabel." as label";
+		$sql .= " FROM ".$db->prefix().$tablename;
+		$sql .= " WHERE ".$fieldkey." = '".$db->escape($keyforselect ? $keyforselect : $key)."'";
 		if ($filteronentity) {
-			$sql .= " AND entity IN (" . getEntity($tablename) . ')';
+			$sql .= " AND entity IN (".getEntity($tablename).')';
 		}
-		dol_syslog(get_class($this) . '::getLabelFromKey', LOG_DEBUG);
+		dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
@@ -1117,9 +1117,9 @@ 
 		$symbol = $this->getCurrencySymbol($currency_code);
 
 		if (in_array($currency_code, array('USD'))) {
-			return $symbol . $amount;
+			return $symbol.$amount;
 		} else {
-			return $amount . $symbol;
+			return $amount.$symbol;
 		}
 	}
 
@@ -1140,7 +1140,7 @@ 
 
 			if (isset($this->cache_currencies[$currency_code]) && !empty($this->cache_currencies[$currency_code]['unicode']) && is_array($this->cache_currencies[$currency_code]['unicode'])) {  // @phan-suppress-current-line PhanTypeMismatchProperty
 				foreach ($this->cache_currencies[$currency_code]['unicode'] as $unicode) {
-					$currency_sign .= mb_convert_encoding("&#" . $unicode . ";", "UTF-8", 'HTML-ENTITIES');
+					$currency_sign .= mb_convert_encoding("&#".$unicode.";", "UTF-8", 'HTML-ENTITIES');
 				}
 			}
 		}
@@ -1166,14 +1166,14 @@ 
 		}
 
 		$sql = "SELECT code_iso, label, unicode";
-		$sql .= " FROM " . $db->prefix() . "c_currencies";
+		$sql .= " FROM ".$db->prefix()."c_currencies";
 		$sql .= " WHERE active = 1";
 		if (!empty($currency_code)) {
-			$sql .= " AND code_iso = '" . $db->escape($currency_code) . "'";
+			$sql .= " AND code_iso = '".$db->escape($currency_code)."'";
 		}
 		//$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later
 
-		dol_syslog(get_class($this) . '::loadCacheCurrencies', LOG_DEBUG);
+		dol_syslog(get_class($this).'::loadCacheCurrencies', LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql) {
 			$this->load("dict");
@@ -1190,8 +1190,8 @@ 
 				$obj = $db->fetch_object($resql);
 				if ($obj) {
 					// If a translation exists, we use it lese we use the default label
-					$this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency" . $obj->code_iso) != "Currency" . $obj->code_iso ? $this->trans("Currency" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
-					$this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode((empty($obj->unicode) ? '' : $obj->unicode), true);  // @phan-suppress-current-line PhanTypeMismatchProperty
+					$this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency".$obj->code_iso) != "Currency".$obj->code_iso ? $this->trans("Currency".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
+					$this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode((empty($obj->unicode) ? '' : $obj->unicode), true); // @phan-suppress-current-line PhanTypeMismatchProperty
 					$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
 				}
 				$i++;
@@ -1224,8 +1224,8 @@ 
 		$substitutionarray = array();
 
 		foreach ($this->tab_translate as $code => $label) {
-			$substitutionarray['lang_' . $code] = $label;
-			$substitutionarray['__(' . $code . ')__'] = $label;
+			$substitutionarray['lang_'.$code] = $label;
+			$substitutionarray['__('.$code.')__'] = $label;
 		}
 
 		return $substitutionarray;

htdocs/accountancy/class/accountingjournal.class.php

Spacing +45 added lines, -45 removed lines

@@ -115,7 +115,7 @@ 
 	{
 		$valid_nature = array(1, 2, 3, 4, 5, 8, 9);
 		if (!in_array((int) $this->nature, $valid_nature)) {
-			$this->error = get_class($this)."::Create Error invalid field nature '" . strval($this->nature) . "'";
+			$this->error = get_class($this)."::Create Error invalid field nature '".strval($this->nature)."'";
 			dol_syslog($this->error, LOG_ERR);
 			return -1;
 		}
@@ -123,23 +123,23 @@ 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_journal";
 		$sql .= " (entity, code, label, nature, active)";
 		$sql .= " VALUES ("
-			. ((int) $this->entity)           .",'"
-			. $this->db->escape($this->code)  ."','"
-			. $this->db->escape($this->label) ."',"
-			. ((int) $this->nature)           .","
-			. ((int) $this->active)           .")";
+			. ((int) $this->entity).",'"
+			. $this->db->escape($this->code)."','"
+			. $this->db->escape($this->label)."',"
+			. ((int) $this->nature).","
+			. ((int) $this->active).")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->error = get_class($this)."::Create Error: " . $this->db->lasterror();
+			$this->error = get_class($this)."::Create Error: ".$this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			return -1;
 		}
 
 		$id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_journal");
 		if ($id <= 0) {
-			$this->error = get_class($this)."::Create Error " . $id . ": " . $this->db->lasterror();
+			$this->error = get_class($this)."::Create Error ".$id.": ".$this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			return -2;
 		}
@@ -181,7 +181,7 @@ 
 					$this->rowid		= $obj->rowid;
 
 					$this->code			= $obj->code;
-					$this->ref			= $obj->code;
+					$this->ref = $obj->code;
 					$this->label		= $obj->label;
 					$this->nature		= $obj->nature;
 					$this->active		= $obj->active;
@@ -408,10 +408,10 @@ 
 			return array();
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/asset/class/assetdepreciationoptions.class.php';
 
 		$langs->loadLangs(array("assets"));
 
@@ -427,22 +427,22 @@ 
 		$sql .= "SELECT ad.fk_asset AS rowid, a.ref AS asset_ref, a.label AS asset_label, a.acquisition_value_ht AS asset_acquisition_value_ht";
 		$sql .= ", a.disposal_date AS asset_disposal_date, a.disposal_amount_ht AS asset_disposal_amount_ht, a.disposal_subject_to_vat AS asset_disposal_subject_to_vat";
 		$sql .= ", ad.rowid AS depreciation_id, ad.depreciation_mode, ad.ref AS depreciation_ref, ad.depreciation_date, ad.depreciation_ht, ad.accountancy_code_debit, ad.accountancy_code_credit";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation as ad";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "asset as a ON a.rowid = ad.fk_asset";
-		$sql .= " WHERE a.entity IN (" . getEntity('asset', 0) . ')'; // We don't share object for accountancy, we use source object sharing
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_depreciation as ad";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."asset as a ON a.rowid = ad.fk_asset";
+		$sql .= " WHERE a.entity IN (".getEntity('asset', 0).')'; // We don't share object for accountancy, we use source object sharing
 		$sql .= " AND a.status > 0";
 		if ($in_bookkeeping == 'already') {
-			$sql .= " AND EXISTS (SELECT iab.fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
+			$sql .= " AND EXISTS (SELECT iab.fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
 		} elseif ($in_bookkeeping == 'notyet') {
-			$sql .= " AND NOT EXISTS (SELECT iab.fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
+			$sql .= " AND NOT EXISTS (SELECT iab.fk_docdet FROM ".MAIN_DB_PREFIX."accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
 		}
 		$sql .= " AND ad.ref != ''"; // not reversal lines
 		if ($date_start && $date_end) {
-			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate($date_start) . "' AND ad.depreciation_date <= '" . $this->db->idate($date_end) . "'";
+			$sql .= " AND ad.depreciation_date >= '".$this->db->idate($date_start)."' AND ad.depreciation_date <= '".$this->db->idate($date_end)."'";
 		}
 		// Define begin binding date
 		if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate(getDolGlobalInt('ACCOUNTING_DATE_START_BINDING')) . "'";
+			$sql .= " AND ad.depreciation_date >= '".$this->db->idate(getDolGlobalInt('ACCOUNTING_DATE_START_BINDING'))."'";
 		}
 		$sql .= " ORDER BY ad.depreciation_date";
 
@@ -528,7 +528,7 @@ 
 					if ($type == 'view') {
 						$account_to_show = length_accountg($account);
 						if (($account_to_show == "") || $account_to_show == 'NotDefined') {
-							$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
+							$account_to_show = '<span class="error">'.$langs->trans("AssetInAccountNotDefined").'</span>';
 						}
 
 						$blocks[] = array(
@@ -536,7 +536,7 @@ 
 							'piece' => $element_link,
 							'account_accounting' => $account_to_show,
 							'subledger_account' => '',
-							'label_operation' => $label_operation . ' - ' . $depreciation_ref,
+							'label_operation' => $label_operation.' - '.$depreciation_ref,
 							'debit' => $mt < 0 ? price(-$mt) : '',
 							'credit' => $mt >= 0 ? price($mt) : '',
 						);
@@ -555,7 +555,7 @@ 
 								'subledger_label' => '',
 								'numero_compte' => $account,
 								'label_compte' => $account_infos['label'],
-								'label_operation' => $element_name_formatted_0 . ' - ' . $depreciation_ref,
+								'label_operation' => $element_name_formatted_0.' - '.$depreciation_ref,
 								'montant' => $mt,
 								'sens' => $mt < 0 ? 'D' : 'C',
 								'debit' => $mt < 0 ? -$mt : 0,
@@ -570,12 +570,12 @@ 
 						}
 					} else { // $type == 'csv'
 						$blocks[] = array(
-							$depreciation_date,                                   	// Date
-							$element_static->ref,                                	// Piece
-							$account_infos['code_formatted_1'],                		// AccountAccounting
-							$element_name_formatted_0 . ' - ' . $depreciation_ref,  // LabelOperation
-							$mt < 0 ? price(-$mt) : '',                        		// Debit
-							$mt >= 0 ? price($mt) : '',                        		// Credit
+							$depreciation_date, // Date
+							$element_static->ref, // Piece
+							$account_infos['code_formatted_1'], // AccountAccounting
+							$element_name_formatted_0.' - '.$depreciation_ref, // LabelOperation
+							$mt < 0 ? price(-$mt) : '', // Debit
+							$mt >= 0 ? price($mt) : '', // Credit
 						);
 					}
 				}
@@ -597,7 +597,7 @@ 
 
 					// Get accountancy codes
 					//---------------------------
-					require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/asset/class/assetaccountancycodes.class.php';
 					$accountancy_codes = new AssetAccountancyCodes($this->db);
 					$result = $accountancy_codes->fetchAccountancyCodes($element_static->id);
 					if ($result < 0) {
@@ -648,7 +648,7 @@ 
 									if ($type == 'view') {
 										$account_to_show = length_accountg($account);
 										if (($account_to_show == "") || $account_to_show == 'NotDefined') {
-											$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
+											$account_to_show = '<span class="error">'.$langs->trans("AssetInAccountNotDefined").'</span>';
 										}
 
 										$blocks[] = array(
@@ -656,7 +656,7 @@ 
 											'piece' => $element_link,
 											'account_accounting' => $account_to_show,
 											'subledger_account' => '',
-											'label_operation' => $label_operation . ' - ' . $disposal_ref,
+											'label_operation' => $label_operation.' - '.$disposal_ref,
 											'debit' => $mt < 0 ? price(-$mt) : '',
 											'credit' => $mt >= 0 ? price($mt) : '',
 										);
@@ -675,7 +675,7 @@ 
 												'subledger_label' => '',
 												'numero_compte' => $account,
 												'label_compte' => $account_infos['label'],
-												'label_operation' => $element_name_formatted_0 . ' - ' . $disposal_ref,
+												'label_operation' => $element_name_formatted_0.' - '.$disposal_ref,
 												'montant' => $mt,
 												'sens' => $mt < 0 ? 'D' : 'C',
 												'debit' => $mt < 0 ? -$mt : 0,
@@ -690,12 +690,12 @@ 
 										}
 									} else { // $type == 'csv'
 										$blocks[] = array(
-											$disposal_date,                                    // Date
-											$element_static->ref,                              // Piece
-											$account_infos['code_formatted_1'],                // AccountAccounting
-											$element_name_formatted_0 . ' - ' . $disposal_ref, // LabelOperation
-											$mt < 0 ? price(-$mt) : '',                        // Debit
-											$mt >= 0 ? price($mt) : '',                        // Credit
+											$disposal_date, // Date
+											$element_static->ref, // Piece
+											$account_infos['code_formatted_1'], // AccountAccounting
+											$element_name_formatted_0.' - '.$disposal_ref, // LabelOperation
+											$mt < 0 ? price(-$mt) : '', // Debit
+											$mt >= 0 ? price($mt) : '', // Credit
 										);
 									}
 								}
@@ -759,7 +759,7 @@ 
 	public function writeIntoBookkeeping(User $user, &$journal_data = array(), $max_nb_errors = 10)
 	{
 		global $conf, $langs, $hookmanager;
-		require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
 		$error = 0;
 
@@ -859,7 +859,7 @@ 
 					$error++;
 					$error_for_line++;
 					$journal_data[$element_id]['error'] = 'amountsnotbalanced';
-					$this->errors[] = 'Try to insert a non balanced transaction in book for ' . json_encode($element['blocks']) . '. Canceled. Surely a bug.';
+					$this->errors[] = 'Try to insert a non balanced transaction in book for '.json_encode($element['blocks']).'. Canceled. Surely a bug.';
 				}
 
 				if (!$error_for_line) {
@@ -957,12 +957,12 @@ 
 			}
 
 			if (!empty($header)) {
-				$out .= '"' . implode('"' . $sep . '"', $header) . '"' . "\n";
+				$out .= '"'.implode('"'.$sep.'"', $header).'"'."\n";
 			}
 			foreach ($journal_data as $element_id => $element) {
 				foreach ($element['blocks'] as $lines) {
 					foreach ($lines as $line) {
-						$out .= '"' . implode('"' . $sep . '"', $line) . '"' . "\n";
+						$out .= '"'.implode('"'.$sep.'"', $line).'"'."\n";
 					}
 				}
 			}
@@ -980,8 +980,8 @@ 
 	public function getAccountingAccountInfos($account)
 	{
 		if (!isset(self::$accounting_account_cached[$account])) {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-			require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 			$accountingaccount = new AccountingAccount($this->db);
 			$result = $accountingaccount->fetch(0, $account, true);
 			if ($result > 0) {

htdocs/accountancy/bookkeeping/listbyaccount.php

Spacing +53 added lines, -53 removed lines

@@ -69,7 +69,7 @@ 
 }
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : $context_default;
 
-$search_doc_date = GETPOSTDATE('doc_date', 'getpost');	// deprecated. Can use 'search_date_start/end'
+$search_doc_date = GETPOSTDATE('doc_date', 'getpost'); // deprecated. Can use 'search_date_start/end'
 
 $search_date_startyear = GETPOSTINT('search_date_startyear');
 $search_date_startmonth = GETPOSTINT('search_date_startmonth');
@@ -170,9 +170,9 @@ 
 	$sql = "SELECT date_start, date_end";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 	if (getDolGlobalInt('ACCOUNTANCY_FISCALYEAR_DEFAULT')) {
-		$sql .= " WHERE rowid = " . getDolGlobalInt('ACCOUNTANCY_FISCALYEAR_DEFAULT');
+		$sql .= " WHERE rowid = ".getDolGlobalInt('ACCOUNTANCY_FISCALYEAR_DEFAULT');
 	} else {
-		$sql .= " WHERE date_start < '" . $db->idate(dol_now()) . "' and date_end > '" . $db->idate(dol_now()) . "'";
+		$sql .= " WHERE date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
 	}
 	$sql .= $db->plimit(1);
 	$res = $db->query($sql);
@@ -316,7 +316,7 @@ 
 		$search_date_due_start = '';
 		// Due date end
 		$search_date_due_end_day = '';
-		$search_date_due_end_month =  '';
+		$search_date_due_end_month = '';
 		$search_date_due_end_year = '';
 		$search_date_due_end = '';
 		$search_lettering_code = '';
@@ -368,7 +368,7 @@ 
 		} else {
 			$filter['t.numero_compte>='] = $search_accountancy_code_start;
 		}
-		$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
 	}
 	if (!empty($search_accountancy_code_end)) {
 		if ($type == 'sub') {
@@ -376,7 +376,7 @@ 
 		} else {
 			$filter['t.numero_compte<='] = $search_accountancy_code_end;
 		}
-		$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
 	}
 	if (!empty($search_label_account)) {
 		$filter['t.label_compte'] = $search_label_account;
@@ -468,7 +468,7 @@ 
 		} else {
 			$object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter);
 		}
-		require_once DOL_DOCUMENT_ROOT . '/core/modules/accountancy/doc/pdf_ledger.modules.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/modules/accountancy/doc/pdf_ledger.modules.php';
 		$pdf = new pdf_ledger($db);
 		$pdf->fromDate = $search_date_start;
 		$pdf->toDate = $search_date_end;
@@ -613,7 +613,7 @@ 
 			}
 
 			if (!$error) {
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		} elseif ($massaction == 'letteringmanual' && $permissiontoadd) {
@@ -623,7 +623,7 @@ 
 				setEventMessages('', $lettering->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans($result == 0 ? 'AccountancyNoLetteringModified' : 'AccountancyOneLetteringModifiedSuccessfully'), array(), 'mesgs');
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		} elseif ($type == 'sub' && $massaction == 'letteringpartial') {
@@ -633,7 +633,7 @@ 
 				setEventMessages('', $lettering->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans($result == 0 ? 'AccountancyNoLetteringModified' : 'AccountancyOneLetteringModifiedSuccessfully'), array(), 'mesgs');
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		} elseif ($action == 'unletteringauto' && $confirm == "yes" && $permissiontoadd) {
@@ -654,7 +654,7 @@ 
 			}
 
 			if (!$error) {
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		} elseif ($action == 'unletteringmanual' && $confirm == "yes" && $permissiontoadd) {
@@ -664,7 +664,7 @@ 
 				setEventMessages('', $lettering->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans($result == 0 ? 'AccountancyNoUnletteringModified' : 'AccountancyOneUnletteringModifiedSuccessfully'), array(), 'mesgs');
-				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				header('Location: '.$_SERVER['PHP_SELF'].'?noreset=1'.$param);
 				exit();
 			}
 		}
@@ -759,7 +759,7 @@ 
 				} else {
 					$subledger_start_account = $subledger_end_account = '';
 				}
-				print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="' . $_SERVER["PHP_SELF"] . '?mode=customer&socid='.$socid.'&type=sub&search_accountancy_code_start='.$subledger_start_account.'&search_accountancy_code_end='.$subledger_end_account.'">';
+				print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?mode=customer&socid='.$socid.'&type=sub&search_accountancy_code_start='.$subledger_start_account.'&search_accountancy_code_end='.$subledger_end_account.'">';
 			} else {
 				print '<span class="a-mesure marginleftonly marginrightonly">';
 			}
@@ -779,7 +779,7 @@ 
 				} else {
 					$subledger_start_account = $subledger_end_account = '';
 				}
-				print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="' . $_SERVER["PHP_SELF"] . '?mode=supplier&socid='.$socid.'&type=sub&search_accountancy_code_start='.$subledger_start_account.'&search_accountancy_code_end='.$subledger_end_account.'">';
+				print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?mode=supplier&socid='.$socid.'&type=sub&search_accountancy_code_start='.$subledger_start_account.'&search_accountancy_code_end='.$subledger_end_account.'">';
 			} else {
 				print '<span class="a-mesure marginleftonly marginrightonly">';
 			}
@@ -824,7 +824,7 @@ 
 		$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 0);
 	}
 	//$num = count($object->lines);
-	$num = $result;						// $result is total nb of lines, or limit + 1, but $object->lines is always limited to $limit
+	$num = $result; // $result is total nb of lines, or limit + 1, but $object->lines is always limited to $limit
 
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -840,13 +840,13 @@ 
 // List of mass actions available
 $arrayofmassactions = array();
 if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accounting', 'mouvements', 'creer')) {
-	$arrayofmassactions['letteringauto'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('LetteringAuto');
-	$arrayofmassactions['preunletteringauto'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('UnletteringAuto');
-	$arrayofmassactions['letteringmanual'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('LetteringManual');
+	$arrayofmassactions['letteringauto'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans('LetteringAuto');
+	$arrayofmassactions['preunletteringauto'] = img_picto('', 'uncheck', 'class="pictofixedwidth"').$langs->trans('UnletteringAuto');
+	$arrayofmassactions['letteringmanual'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans('LetteringManual');
 	if ($type == 'sub') {
-		$arrayofmassactions['letteringpartial'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('LetteringPartial');
+		$arrayofmassactions['letteringpartial'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans('LetteringPartial');
 	}
-	$arrayofmassactions['preunletteringmanual'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('UnletteringManual');
+	$arrayofmassactions['preunletteringmanual'] = img_picto('', 'uncheck', 'class="pictofixedwidth"').$langs->trans('UnletteringManual');
 }
 if ($user->hasRight('accounting', 'mouvements', 'creer')) {
 	$arrayofmassactions['preclonebookkeepingwriting'] = img_picto('', 'clone', 'class="pictofixedwidth"').$langs->trans("Clone");
@@ -875,7 +875,7 @@ 
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if (!empty($socid)) {
-	print '<input type="hidden" name="socid" value="' . $socid . '">';
+	print '<input type="hidden" name="socid" value="'.$socid.'">';
 }
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -892,16 +892,16 @@ 
 if (empty($reshook)) {
 	// Remove navigation buttons if in thirdparty tab mode, except for PDF printing
 	if (empty($socid)) {
-		$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?' . $param);
+		$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 		if ($type == 'sub') {
-			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
-			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$url_param, '', 1, array('morecss' => 'marginleftonly'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?type=sub&'.$url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 		} else {
-			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?type=sub&'.$url_param, '', 1, array('morecss' => 'marginleftonly'));
 		}
 	}
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ExportToPdf'), '', 'fa fa-file-pdf paddingleft', $_SERVER['PHP_SELF'] . '?action=exporttopdf'.(!empty($type) ? '&type=sub' : '').'&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ExportToPdf'), '', 'fa fa-file-pdf paddingleft', $_SERVER['PHP_SELF'].'?action=exporttopdf'.(!empty($type) ? '&type=sub' : '').'&'.$url_param, '', 1, array('morecss' => 'marginleftonly'));
 
 	$newcardbutton .= dolGetButtonTitleSeparator();
 
@@ -925,7 +925,7 @@ 
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeleteBookkeepingWriting"), $langs->trans("ConfirmMassDeleteBookkeepingWritingQuestion", count($toselect)), "deletebookkeepingwriting", null, '', 0, 200, 500, 1);
 } elseif ($massaction == 'preassignaccountbookkeepingwriting') {
 	$input = $formaccounting->select_account('', 'account', 1);
-	$formquestion = array(array('type' => 'other', 'name' => 'account', 'label' => '<span class="fieldrequired">' . $langs->trans("AccountAccountingShort") . '</span>', 'value' => $input),);
+	$formquestion = array(array('type' => 'other', 'name' => 'account', 'label' => '<span class="fieldrequired">'.$langs->trans("AccountAccountingShort").'</span>', 'value' => $input),);
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("confirmMassAssignAccountBookkeepingWritingConfirm"), $langs->trans("ConfirmMassAssignAccountBookkeepingWritingQuestion", count($toselect)), "assignaccountbookkeepingwriting", $formquestion, '', 0, 200, 500, 1);
 } elseif ($massaction == 'preclonebookkeepingwriting') {
 	$input1 = $form->selectDate('', 'massdate', 0, 0, 0, "create_mvt", 1, 1);
@@ -934,7 +934,7 @@ 
 		array(
 			'type' => 'other',
 			'name' => 'massdate',
-			'label' => '<span class="fieldrequired">' . $langs->trans("Docdate") . '</span>',
+			'label' => '<span class="fieldrequired">'.$langs->trans("Docdate").'</span>',
 			'value' => $input1
 		)
 	);
@@ -943,7 +943,7 @@ 
 		$formquestion[] = array(
 			'type' => 'text',
 			'name' => 'code_journal',
-			'label' => '<span class="fieldrequired">' . $langs->trans("Codejournal") . '</span>',
+			'label' => '<span class="fieldrequired">'.$langs->trans("Codejournal").'</span>',
 			'value' => $input2
 		);
 	}
@@ -958,7 +958,7 @@ 
 	);
 } elseif ($massaction == 'prereturnaccountbookkeepingwriting') {
 	$input1 = $form->selectDate('', 'massdate', 0, 0, 0, "create_mvt", 1, 1);
-	$formquestion = array(array('type' => 'other', 'name' => 'massdate', 'label' => '<span class="fieldrequired">' . $langs->trans("Docdate") . '</span>', 'value' => $input1));
+	$formquestion = array(array('type' => 'other', 'name' => 'massdate', 'label' => '<span class="fieldrequired">'.$langs->trans("Docdate").'</span>', 'value' => $input1));
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassReturnAccountBookkeepingWriting"), $langs->trans("ConfirmMassReturnAccountBookkeepingWritingQuestion", count($toselect)), "returnaccountbookkeepingwriting", $formquestion, '', 0, 200, 500, 1);
 }
 
@@ -1010,8 +1010,8 @@ 
 }
 
 if (empty($socid)) {
-	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="previous_account" accesskey="p" title="' . $conf->browser->stringforfirstkey . ' p" class="classfortooltip" href="#"><i class="fa fa-chevron-left"></i></a>';
-	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="next_account" accesskey="n" title="' . $conf->browser->stringforfirstkey . ' n" class="classfortooltip" href="#"><i class="fa fa-chevron-right"></i></a>';
+	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="previous_account" accesskey="p" title="'.$conf->browser->stringforfirstkey.' p" class="classfortooltip" href="#"><i class="fa fa-chevron-left"></i></a>';
+	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="next_account" accesskey="n" title="'.$conf->browser->stringforfirstkey.' n" class="classfortooltip" href="#"><i class="fa fa-chevron-right"></i></a>';
 	$moreforfilter .= <<<SCRIPT
 <script type="text/javascript">
 	jQuery(document).ready(function() {
@@ -1042,7 +1042,7 @@ 
 
 if (empty($socid)) {
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('AccountingCategory') . ': ';
+	$moreforfilter .= $langs->trans('AccountingCategory').': ';
 	$moreforfilter .= '<div class="nowrap inline-block">';
 	$moreforfilter .= $formaccounting->select_accounting_category($search_account_category, 'search_account_category', 1, 0, 0, 0);
 	$moreforfilter .= '</div>';
@@ -1229,9 +1229,9 @@ 
 
 $displayed_account_number = null; // Start with undefined to be able to distinguish with empty
 
-$objectstatic = null;  // Init for static analysis
-$objectlink = '';  // Init for static analysis
-$result = -1;  // Init for static analysis
+$objectstatic = null; // Init for static analysis
+$objectlink = ''; // Init for static analysis
+$result = -1; // Init for static analysis
 
 // Loop on record
 // --------------------------------------------------------------------
@@ -1247,12 +1247,12 @@ 
 $totalarray['val']['totalbalance'] = 0;
 
 // Init for static analysis
-$colspan = 0;			// colspan before field 'label of operation'
-$colspanend = 0;		// colspan after debit/credit
+$colspan = 0; // colspan before field 'label of operation'
+$colspanend = 0; // colspan after debit/credit
 $accountg = '-';
 
-$colspan = 0;			// colspan before field 'label of operation'
-$colspanend = 3;		// colspan after debit/credit
+$colspan = 0; // colspan before field 'label of operation'
+$colspanend = 3; // colspan after debit/credit
 if (!empty($arrayfields['t.piece_num']['checked'])) { $colspan++; }
 if (!empty($arrayfields['t.code_journal']['checked'])) { $colspan++; }
 if (!empty($arrayfields['t.doc_date']['checked'])) { $colspan++; }
@@ -1276,8 +1276,8 @@ 
 	}
 	//if (empty($accountg)) $accountg = '-';
 
-	$colspan = 0;			// colspan before field 'label of operation'
-	$colspanend = 0;		// colspan after debit/credit
+	$colspan = 0; // colspan before field 'label of operation'
+	$colspanend = 0; // colspan after debit/credit
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		$colspan++;
 	}
@@ -1330,9 +1330,9 @@ 
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
 			if ($type == 'sub') {
-				print '<td class="right" colspan="' . $colspan . '">' . $langs->trans("TotalForAccount") . ' ' . length_accounta($displayed_account_number) . ':</td>';
+				print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accounta($displayed_account_number).':</td>';
 			} else {
-				print '<td class="right" colspan="' . $colspan . '">' . $langs->trans("TotalForAccount") . ' ' . length_accountg($displayed_account_number) . ':</td>';
+				print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accountg($displayed_account_number).':</td>';
 			}
 			print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>';
 			print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>';
@@ -1371,9 +1371,9 @@ 
 				print length_accounta($line->subledger_account);
 			} else {
 				// Should not happen: subledger account must be null or a non empty value
-				print '<span class="error">' . $langs->trans("Unknown");
+				print '<span class="error">'.$langs->trans("Unknown");
 				if ($line->subledger_label) {
-					print ' (' . $line->subledger_label . ')';
+					print ' ('.$line->subledger_label.')';
 					$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
 				} else {
 					$htmltext = 'EmptyStringForSubledgerAccountAndSubledgerLabel';
@@ -1383,9 +1383,9 @@ 
 			}
 		} else {
 			if ($line->numero_compte != "" && $line->numero_compte != '-1') {
-				print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
+				print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
 			} else {
-				print '<span class="error">' . $langs->trans("Unknown") . '</span>';
+				print '<span class="error">'.$langs->trans("Unknown").'</span>';
 			}
 		}
 		print '</td>';
@@ -1406,7 +1406,7 @@ 
 			if (in_array($line->id, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
+			print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
 		}
 		print '</td>';
 		if (!$i) {
@@ -1501,7 +1501,7 @@ 
 		} elseif ($line->doc_type == 'bank') {
 			print $objectstatic->getNomUrl(1);
 			$bank_ref = strstr($line->doc_ref, '-');
-			print " " . $bank_ref;
+			print " ".$bank_ref;
 		} else {
 			print $line->doc_ref;
 		}
@@ -1614,7 +1614,7 @@ 
 			if (in_array($line->id, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
+			print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
 		}
 		print '</td>';
 		if (!$i) {
@@ -1675,7 +1675,7 @@ 
 }
 
 // Show total line
-$trforbreaknobg = 1;	// used in list_print_total.tpl.php
+$trforbreaknobg = 1; // used in list_print_total.tpl.php
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found

htdocs/product/stock/stocktransfer/stocktransfer_card.php

Spacing +23 added lines, -23 removed lines

@@ -60,8 +60,8 @@ 
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
-$backtopage = GETPOST('backtopage', 'alpha');					// if not set, a default page will be used
-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
+$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 $qty = GETPOSTINT('qty');
 $fk_product = GETPOSTINT('fk_product');
 $fk_warehouse_source = GETPOSTINT('fk_warehouse_source');
@@ -432,7 +432,7 @@ 
 $date_prevue_depart = $object->date_prevue_depart;
 $date_prevue_depart_plus_delai = $date_prevue_depart;
 if ($object->lead_time_for_warning > 0) {
-	$date_prevue_depart_plus_delai = strtotime(date('Y-m-d', $date_prevue_depart) . ' + '.$object->lead_time_for_warning.' day');
+	$date_prevue_depart_plus_delai = strtotime(date('Y-m-d', $date_prevue_depart).' + '.$object->lead_time_for_warning.' day');
 }
 if (!empty($date_prevue_depart) && $date_prevue_depart_plus_delai < strtotime(date('Y-m-d'))) {
 	print "$('.valuefield.fieldname_date_prevue_depart').append('";
@@ -507,28 +507,28 @@ 
 
 // Part to edit record
 if (($id || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("StockTransfer"), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("StockTransfer"), '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="' . $object->id . '">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	print dol_get_fiche_head();
 
-	print '<table class="border centpercent tableforfieldedit">' . "\n";
+	print '<table class="border centpercent tableforfieldedit">'."\n";
 
 	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 
 	// Other attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 	print '</table>';
 
@@ -564,28 +564,28 @@ 
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	} elseif ($action == 'destock') { // Destock confirmation
 		// Create an array for form
-		$formquestion = array(	'text' => '',
+		$formquestion = array('text' => '',
 			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestock', $object->ref), 'size' => 40),
 			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DestockAllProduct'), '', 'confirm_destock', $formquestion, 'yes', 1);
 	} elseif ($action == 'destockcancel') { // Destock confirmation cancel
 		// Create an array for form
-		$formquestion = array(	'text' => '',
+		$formquestion = array('text' => '',
 			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestockCancel', $object->ref), 'size' => 40),
 			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DestockAllProductCancel'), '', 'confirm_destockcancel', $formquestion, 'yes', 1);
 	} elseif ($action == 'addstock') { // Addstock confirmation
 		// Create an array for form
-		$formquestion = array(	'text' => '',
+		$formquestion = array('text' => '',
 			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStock', $object->ref), 'size' => 40),
 			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AddStockAllProduct'), '', 'confirm_addstock', $formquestion, 'yes', 1);
 	} elseif ($action == 'addstockcancel') { // Addstock confirmation cancel
 		// Create an array for form
-		$formquestion = array(	'text' => '',
+		$formquestion = array('text' => '',
 			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStockCancel', $object->ref), 'size' => 40),
 			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
@@ -881,13 +881,13 @@ 
 				print '<input type="submit" class="button buttongen marginbottomonly" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 			} else {
 				print '<td class="right">';
-				print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $line->id . '#line_' . $line->id . '">';
-				print img_edit() . '</a>';
+				print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id.'">';
+				print img_edit().'</a>';
 				print '</td>';
 				print '<td class="right">';
 				// Ensure the delete line link embeds a CSRF token.
-				$deleteLineUrl = $_SERVER["PHP_SELF"] . '?id=' . $id . '&action=deleteline&lineid=' . $line->id . '&token=' . newToken();
-				print '<a href="' . $deleteLineUrl . '">' . img_delete($langs->trans("Remove")) . '</a>';
+				$deleteLineUrl = $_SERVER["PHP_SELF"].'?id='.$id.'&action=deleteline&lineid='.$line->id.'&token='.newToken();
+				print '<a href="'.$deleteLineUrl.'">'.img_delete($langs->trans("Remove")).'</a>';
 				print '</td>';
 			}
 
@@ -991,7 +991,7 @@ 
 		print '<td></td>';
 
 		// Button to add line
-		print '<td class="right" colspan="2"><input type="submit" class="button" name="addline" value="' . dol_escape_htmltag($langs->trans('Add')) . '"></td>';
+		print '<td class="right" colspan="2"><input type="submit" class="button" name="addline" value="'.dol_escape_htmltag($langs->trans('Add')).'"></td>';
 
 		// Grad and drop lines
 		print '<td></td>';
@@ -1095,9 +1095,9 @@ 
 		// Documents
 		if ($includedocgeneration) {
 			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
+			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->stocktransfer->dir_output.'/'.$object->element.'/'.$objref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $permissiontoread; // If you can read, you can build the PDF to read content
 			$delallowed = $permissiontoadd; // If you can create/edit, you can remove a file on card
 			print $formfile->showdocuments('stocktransfer:StockTransfer', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);

htdocs/main.inc.php

Spacing +36 added lines, -36 removed lines

@@ -42,7 +42,7 @@ 
 //@ini_set('memory_limit', '128M');	// This may be useless if memory is hard limited by your PHP
 
 // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
-$micro_start_time = 0;	// Used as global var into printCommonFooter()
+$micro_start_time = 0; // Used as global var into printCommonFooter()
 if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
 	list($usec, $sec) = explode(" ", microtime());
 	$micro_start_time = ((float) $usec + (float) $sec);
@@ -137,7 +137,7 @@ 
 		session_set_cookie_params($sessioncookieparams);
 	}
 	session_name($sessionname);
-	dol_session_start();	// This call the open and read of session handler
+	dol_session_start(); // This call the open and read of session handler
 	//exit;	// this exist generates a call to write and close
 }
 
@@ -174,12 +174,12 @@ 
 	if (!$ok) {
 		if (session_id() && isset($_SESSION["dol_login"]) && !in_array($_SESSION["dol_login"], explode(';', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')))) {
 			print 'Sorry, your application is offline.'."\n";
-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator users (' . str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
-			$nexturl = dolBuildUrl(DOL_URL_ROOT . '/user/logout.php', [], true);
+			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator users ('.str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
+			$nexturl = dolBuildUrl(DOL_URL_ROOT.'/user/logout.php', [], true);
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
 		} else {
-			print 'Sorry, your application is offline. Only administrator users (' . str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
-			$nexturl = dolBuildUrl(DOL_URL_ROOT . '/');
+			print 'Sorry, your application is offline. Only administrator users ('.str_replace(';', ', ', getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')).') is allowed to connect for the moment.'."\n";
+			$nexturl = dolBuildUrl(DOL_URL_ROOT.'/');
 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
 		}
 		exit;
@@ -410,7 +410,7 @@ 
 					print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
 					print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0";
 					if (getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN')) {
-						print " instead of " . getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
+						print " instead of ".getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
 					}
 					print " into setup).\n";
 				}
@@ -438,7 +438,7 @@ 
 		unset($_GET['action']);
 		unset($_GET['confirmmassaction']);
 		unset($_GET['massaction']);
-		unset($_GET['token']);			// TODO Make a redirect if we have a token in url to remove it ?
+		unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
 		if (isset($savid)) {
 			$_POST['id'] = ((int) $savid);
 		}
@@ -460,18 +460,18 @@ 
 	foreach ($disabled_modules as $module) {
 		if ($module) {
 			if (empty($conf->$module)) {
-				$conf->$module = new stdClass(); 	// To avoid warnings
+				$conf->$module = new stdClass(); // To avoid warnings
 			}
 
-			$conf->$module->enabled = false;		// Old usage
+			$conf->$module->enabled = false; // Old usage
 			unset($conf->modules[$module]);
 
 			foreach ($modulepartkeys as $modulepartkey) {
 				unset($conf->modules_parts[$modulepartkey][$module]);
 			}
 			if ($module == 'fournisseur') {		// Special case
-				$conf->supplier_order->enabled = 0;		// Old usage
-				$conf->supplier_invoice->enabled = 0;	// Old usage
+				$conf->supplier_order->enabled = 0; // Old usage
+				$conf->supplier_invoice->enabled = 0; // Old usage
 				unset($conf->modules['supplier_order']);
 				unset($conf->modules['supplier_invoice']);
 			}
@@ -568,7 +568,7 @@ 
 				if ($dol_use_jmobile) {
 					$query += ['dol_use_jmobile='.$dol_use_jmobile];
 				}
-				header("Location: " . dolBuildUrl(DOL_URL_ROOT . '/public/demo/index.php', $query));
+				header("Location: ".dolBuildUrl(DOL_URL_ROOT.'/public/demo/index.php', $query));
 				exit;
 			}
 		}
@@ -616,12 +616,12 @@ 
 					if (is_object($captchaobj) && method_exists($captchaobj, 'validateCodeAfterLoginSubmit')) {
 						$ok = $captchaobj->validateCodeAfterLoginSubmit(); // @phan-suppress-current-line PhanUndeclaredMethod
 					} else {
-						$_SESSION["dol_loginmesg"] =  'Error, the captcha handler '.get_class($captchaobj).' does not have any method validateCodeAfterLoginSubmit()';
+						$_SESSION["dol_loginmesg"] = 'Error, the captcha handler '.get_class($captchaobj).' does not have any method validateCodeAfterLoginSubmit()';
 						$test = false;
 						$error++;
 					}
 				} else {
-					$_SESSION["dol_loginmesg"] =  'Error, the captcha handler class '.$classname.' was not found after the include';
+					$_SESSION["dol_loginmesg"] = 'Error, the captcha handler class '.$classname.' was not found after the include';
 					$test = false;
 					$error++;
 				}
@@ -665,7 +665,7 @@ 
 
 		$allowedmethodtopostusername = 3;
 		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
-			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');	// Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
+			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD'); // Note a value of 2 is not compatible with some authentication methods that put username as GET parameter
 		}
 		// TODO Remove use of $_COOKIE['login_dolibarr'] by replacing line with $usertotest = GETPOST("username", "alpha", $allowedmethodtopostusername); ?
 		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_@\-\.]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
@@ -814,7 +814,7 @@ 
 				}
 
 				// Show login form
-				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));	// This include http headers
+				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
 			}
 			exit;
 		}
@@ -875,7 +875,7 @@ 
 			if (GETPOST('lang', 'aZ09')) {
 				$paramsurl += ['lang' => (string) GETPOST('lang', 'aZ09')];
 			}
-			header('Location: '.dolBuildUrl(DOL_URL_ROOT . '/index.php', $paramsurl));
+			header('Location: '.dolBuildUrl(DOL_URL_ROOT.'/index.php', $paramsurl));
 			exit;
 		} else {
 			// User is loaded, we may need to change language for him according to its choice
@@ -1173,7 +1173,7 @@ 
 } else {
 	// We may have NOLOGIN set, but NOREQUIREUSER not
 	if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) {
-		$user->loadDefaultValues();		// Load default values for everybody (works even if $user->id = 0
+		$user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
 	}
 }
 
@@ -1236,7 +1236,7 @@ 
 	$conf->dol_optimize_smallscreen = 1;
 
 	if (getDolGlobalInt('PRODUIT_DESC_IN_FORM') == 1) {
-		$conf->global->PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE = 0;	// This was set to PRODUIT_DESC_IN_FORM and is forced to 0 if smartphone in this case
+		$conf->global->PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE = 0; // This was set to PRODUIT_DESC_IN_FORM and is forced to 0 if smartphone in this case
 	}
 }
 // Replace themes bugged with jmobile with eldy
@@ -1324,7 +1324,7 @@ 
 	define('ROWS_9', 8);
 }
 
-$heightforframes = 52;	// Used by frames.php page
+$heightforframes = 52; // Used by frames.php page
 
 // Init menu manager
 if (!defined('NOREQUIREMENU')) {
@@ -1364,7 +1364,7 @@ 
 
 if (!empty(GETPOST('seteventmessages', 'alpha'))) {
 	$message = GETPOST('seteventmessages', 'alpha');
-	$messages  = explode(',', $message);
+	$messages = explode(',', $message);
 	foreach ($messages as $key => $msg) {
 		$tmp = explode(':', $msg);
 		setEventMessages($tmp[0], null, !empty($tmp[1]) ? $tmp[1] : 'mesgs');
@@ -1703,7 +1703,7 @@ 
 		}
 
 		if (getDolGlobalString('THEME_ELDY_TOPMENU_BACK1')) {
-			print '<meta name="theme-color" content="rgb(' . getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
+			print '<meta name="theme-color" content="rgb('.getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
 		}
 
 		// Auto refresh page
@@ -1792,9 +1792,9 @@ 
 					$jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
 				}
 				if (constant('JS_JQUERY_UI')) {
-					print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n"; // Forced JQuery
+					print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // Forced JQuery
 				} else {
-					print '<link rel="stylesheet" type="text/css" href="' . DOL_URL_ROOT . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n"; // JQuery
+					print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
 				}
 			}
 			if (!defined('DISABLE_JQUERY_JNOTIFY')) {
@@ -1827,7 +1827,7 @@ 
 
 		if (!defined('DISABLE_CSS_DEFAULT_THEME')) {
 			print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-			print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
+			print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
 		}
 
 		// To fix old chrome bug
@@ -1901,9 +1901,9 @@ 
 			}
 			if (!defined('DISABLE_JQUERY_UI')) {
 				if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
-					print '<script nonce="' . getNonce() . '" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+					print '<script nonce="'.getNonce().'" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				} else {
-					print '<script nonce="' . getNonce() . '" src="' . DOL_URL_ROOT . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+					print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				}
 			}
 			// jQuery jnotify
@@ -1993,7 +1993,7 @@ 
 			// Global js function
 			print '<!-- Includes JS of Dolibarr -->'."\n";
 			if (!defined('DISABLE_LIB_HEAD_JS')) {
-				print '<script nonce="' . getNonce() . '" src="' . DOL_URL_ROOT . '/core/js/lib_head.js.php?lang=' . $langs->defaultlang . ($ext ? '&amp;' . $ext : '') . '"></script>' . "\n";
+				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
 			}
 
 			// Leaflet
@@ -2044,7 +2044,7 @@ 
 			print $head."\n";
 		}
 		if (getDolGlobalString('MAIN_HTML_HEADER')) {
-			print getDolGlobalString('MAIN_HTML_HEADER') . "\n";
+			print getDolGlobalString('MAIN_HTML_HEADER')."\n";
 		}
 
 		$parameters = array();
@@ -2172,7 +2172,7 @@ 
 
 		$toprightmenu .= '</div>';
 
-		$toprightmenu .= '</div>'."\n";		 // end div class="login_block_tools"
+		$toprightmenu .= '</div>'."\n"; // end div class="login_block_tools"
 
 
 		// Add block for other tools
@@ -2193,7 +2193,7 @@ 
 
 		// Link to module builder
 		if (isModEnabled('modulebuilder')) {
-			$text = '<a href="' . dolBuildUrl(DOL_URL_ROOT . '/modulebuilder/index.php', ['mainmenu' => 'home', 'leftmenu' => 'admintools']) .'" target="modulebuilder">';
+			$text = '<a href="'.dolBuildUrl(DOL_URL_ROOT.'/modulebuilder/index.php', ['mainmenu' => 'home', 'leftmenu' => 'admintools']).'" target="modulebuilder">';
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
 			$text .= '</a>';
@@ -2473,7 +2473,7 @@ 
 	}
 
 	if (empty($urllogout)) {
-		$urllogout = dolBuildUrl(DOL_URL_ROOT . '/user/logout.php', [], true);
+		$urllogout = dolBuildUrl(DOL_URL_ROOT.'/user/logout.php', [], true);
 	}
 
 	// Defined the links for bottom of card
@@ -2882,7 +2882,7 @@ 
 		$langs->load(explode('@', $item['name'])[1]);
 		$dropDownQuickAddHtml .= '
 			<a class="dropdown-item quickadd-item" href="'.DOL_URL_ROOT.$item['url'].'" title="'.$langs->trans(explode('@', $item['title'])[0]).'">
-			'. img_picto('', $item['picto'], 'style="width:18px;"') . ' ' . $langs->trans(explode('@', $item['name'])[0]) . '</a>
+			'. img_picto('', $item['picto'], 'style="width:18px;"').' '.$langs->trans(explode('@', $item['name'])[0]).'</a>
 		';
 	}
 
@@ -2987,7 +2987,7 @@ 
  */
 function top_menu_search()
 {
-	global $langs, $conf, $db, $user, $hookmanager;	// used by htdocs/core/ajax/selectsearchbox.php
+	global $langs, $conf, $db, $user, $hookmanager; // used by htdocs/core/ajax/selectsearchbox.php
 
 	$html = '';
 
@@ -3727,7 +3727,7 @@ 
 		$forceping = GETPOST('forceping', 'alpha');
 		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping) {
 			//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.getDolGlobalString('MAIN_FIRST_PING_OK_ID').' -->';
-			$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256');	// Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+			$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
 			if (!getDolGlobalString('MAIN_FIRST_PING_OK_DATE')
 				|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != getDolGlobalString('MAIN_FIRST_PING_OK_ID')) && (getDolGlobalString('MAIN_FIRST_PING_OK_ID') != 'disabled'))