Dolibarr / dolibarr

htdocs/categories/categorie_list.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The display mode ('list', 'kanban', 'hierarchy', 'calendar', 'gantt', ...)
-$groupby = GETPOST('groupby', 'aZ09');	// Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
+$groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
 if (empty($mode)) {
 	$mode = 'hierarchy';
 }
@@ -84,7 +84,7 @@ 
 $object = new Categorie($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->category->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -94,7 +94,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -432,10 +432,10 @@ 
 		$entry .= '<span class="noborderoncategories" '.$color.'>'.$li.'</span>';
 		if (!empty($conf->main_checkbox_left_column)) {
 			if ($user->hasRight('categorie', 'creer')) {
-				$entry .= ' &nbsp; <a class="editfielda" href="' . DOL_URL_ROOT . '/categories/edit.php?id=' . $val['id'] . $param . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type)) . '">' . img_edit() . '</a>';
+				$entry .= ' &nbsp; <a class="editfielda" href="'.DOL_URL_ROOT.'/categories/edit.php?id='.$val['id'].$param.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.urlencode($type)).'">'.img_edit().'</a>';
 			}
 			if ($user->hasRight('categorie', 'supprimer')) {
-				$entry .= ' &nbsp; <a class="deletefilelink" href="' . DOL_URL_ROOT . '/categories/viewcat.php?action=delete&token=' . newToken() . '&id=' . $val['id'] . $param . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?' . $param) . '&backtolist=' . urlencode($_SERVER["PHP_SELF"] . '?' . $param) . '">' . img_delete() . '</a>';
+				$entry .= ' &nbsp; <a class="deletefilelink" href="'.DOL_URL_ROOT.'/categories/viewcat.php?action=delete&token='.newToken().'&id='.$val['id'].$param.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">'.img_delete().'</a>';
 			}
 		}
 		$entry .= '</td>';
@@ -446,13 +446,13 @@ 
 		if (empty($conf->main_checkbox_left_column)) {
 			$entry .= '<td class="right" width="30px;">';
 			if ($user->hasRight('categorie', 'creer')) {
-				$entry .= '<a class="editfielda" href="' . DOL_URL_ROOT . '/categories/edit.php?id=' . $val['id'] . $param . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?type=' . urlencode($type)) . '">' . img_edit() . '</a>';
+				$entry .= '<a class="editfielda" href="'.DOL_URL_ROOT.'/categories/edit.php?id='.$val['id'].$param.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.urlencode($type)).'">'.img_edit().'</a>';
 			}
 			$entry .= '</td>';
 
 			$entry .= '<td class="center" width="30px;">';
 			if ($user->hasRight('categorie', 'supprimer')) {
-				$entry .= '<a class="deletefilelink" href="' . DOL_URL_ROOT . '/categories/viewcat.php?action=delete&token=' . newToken() . '&id=' . $val['id'] . $param . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?' . $param) . '&backtolist=' . urlencode($_SERVER["PHP_SELF"] . '?' . $param) . '">' . img_delete() . '</a>';
+				$entry .= '<a class="deletefilelink" href="'.DOL_URL_ROOT.'/categories/viewcat.php?action=delete&token='.newToken().'&id='.$val['id'].$param.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">'.img_delete().'</a>';
 			}
 			$entry .= '</td>';
 		}
@@ -525,7 +525,7 @@ 
 } else {
 	// Mode list
 
-	llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-acategory page-list bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for a horizontal scroll in the table instead of page
+	llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-acategory page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for a horizontal scroll in the table instead of page
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -655,7 +655,7 @@ 
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup
 	$selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -752,7 +752,7 @@ 
 		} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
-		$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+		$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 			$totalarray['nbfield']++;

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);
 				}
 			}
 
@@ -787,12 +787,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);
 				}
 			}
 
@@ -900,7 +900,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();
@@ -950,9 +950,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]);
@@ -976,7 +976,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;
 			}
 
@@ -984,7 +984,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))) {
@@ -1025,8 +1025,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;
@@ -1079,13 +1079,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);
@@ -1118,9 +1118,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;
 		}
 	}
 
@@ -1141,7 +1141,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');
 				}
 			}
 		}
@@ -1167,14 +1167,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");
@@ -1191,8 +1191,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++;
@@ -1225,8 +1225,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;