Dolibarr / dolibarr

htdocs/hrm/job_agenda.php

Spacing +6 added lines, -6 removed lines

@@ -29,11 +29,11 @@ 
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'other'));
@@ -151,7 +151,7 @@ 
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 

htdocs/hrm/position_agenda.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
 require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
 
 
 // Load translation files required by the page
@@ -227,7 +227,7 @@ 
 		$filters['search_agenda_label'] = $search_agenda_label;
 		$filters['search_rowid'] = $search_rowid;
 
-		$object->fields['label']=array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
+		$object->fields['label'] = array(); // Usefull to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
 
 		// TODO Replace this with same code than into list.php
 		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);

htdocs/bookmarks/bookmarks.lib.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
 	$langs->load("bookmarks");
 
-	$authorized_var=array('limit','optioncss','contextpage');
+	$authorized_var = array('limit', 'optioncss', 'contextpage');
 	$url = $_SERVER["PHP_SELF"];
 	$url_param = array();
 	if (!empty($_SERVER["QUERY_STRING"])) {

htdocs/comm/card.php

Spacing +1 added lines, -1 removed lines

@@ -916,7 +916,7 @@
 	 * Latest orders
 	 */
 	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
-		$param ="";
+		$param = "";
 
 		$sql = "SELECT s.nom, s.rowid";
 		$sql .= ", c.rowid as cid, c.entity, c.total_ht";

dev/tools/dolibarr-postgres2mysql.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
  - If you're having problems creating your postgres dump, make sure you use "--format p --inserts"
  - Default output engine if not specified is InnoDB
 
-XHTML;
+xhtml;
 }
 
 /**
@@ -100,7 +100,7 @@ 
 function formatsize($s)
 {
 	if ($s < pow(2, 14)) {
-		return "{$s}B";
+		return "{$s}b";
 	} elseif ($s < pow(2, 20)) {
 		return sprintf("%.1f", round($s / 1024, 1)) . "K";
 	} elseif ($s < pow(2, 30)) {

Spacing +34 added lines, -34 removed lines

@@ -28,12 +28,12 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = dirname(__FILE__) . '/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute " . $script_file . " from command line, you must use PHP for CLI mode.\n";
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
 	exit();
 }
 
@@ -102,11 +102,11 @@ 
 	if ($s < pow(2, 14)) {
 		return "{$s}B";
 	} elseif ($s < pow(2, 20)) {
-		return sprintf("%.1f", round($s / 1024, 1)) . "K";
+		return sprintf("%.1f", round($s / 1024, 1))."K";
 	} elseif ($s < pow(2, 30)) {
-		return sprintf("%.1f", round($s / 1024 / 1024, 1)) . "M";
+		return sprintf("%.1f", round($s / 1024 / 1024, 1))."M";
 	} else {
-		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
+		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1))."G";
 	}
 }
 
@@ -138,7 +138,7 @@ 
 	}
 
 	$fs = filesize($infilename);
-	echo "Filesize: " . formatsize($fs) . "\n";
+	echo "Filesize: ".formatsize($fs)."\n";
 
 	while ($instr = fgets($infp)) {
 		$linenum++;
@@ -215,13 +215,13 @@ 
 
 	fputs($outfp, "\n");
 
-	fputs($outfp, '/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;' . "\n");
-	fputs($outfp, '/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;' . "\n");
-	fputs($outfp, '/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;' . "\n");
-	fputs($outfp, '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . "\n");
-	fputs($outfp, '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . "\n");
-	fputs($outfp, '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . "\n");
-	fputs($outfp, '/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;' . "\n");
+	fputs($outfp, '/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;'."\n");
+	fputs($outfp, '/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;'."\n");
+	fputs($outfp, '/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;'."\n");
+	fputs($outfp, '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;'."\n");
+	fputs($outfp, '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;'."\n");
+	fputs($outfp, '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;'."\n");
+	fputs($outfp, '/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;'."\n");
 
 	printf("Completed! %9d lines   %9d sql chunks\n\n", $linenum, $chunkcount);
 
@@ -250,8 +250,8 @@ 
 	}
 
 	if ($header) {
-		$output = "-- Converted with " . PRODUCT . "-" . VERSION . "\n";
-		$output .= "-- Converted on " . date("r") . "\n";
+		$output = "-- Converted with ".PRODUCT."-".VERSION."\n";
+		$output .= "-- Converted on ".date("r")."\n";
 		$output .= "\n";
 
 		$output .= "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n";
@@ -282,8 +282,8 @@ 
 
 		$reg = array();
 		if (preg_match('/CREATE SEQUENCE (?:public\.)(.*)_(id|rowid|id_comment)_seq/', $line, $reg)) {
-			$outputatend .= '-- Make field ' . $reg[2] . ' auto_increment for table ' . $reg[1] . "\n";
-			$outputatend .= 'ALTER TABLE ' . $reg[1] . ' CHANGE COLUMN ' . $reg[2] . ' ' . $reg[2] . ' INTEGER NOT NULL AUTO_INCREMENT;' . "\n\n";
+			$outputatend .= '-- Make field '.$reg[2].' auto_increment for table '.$reg[1]."\n";
+			$outputatend .= 'ALTER TABLE '.$reg[1].' CHANGE COLUMN '.$reg[2].' '.$reg[2].' INTEGER NOT NULL AUTO_INCREMENT;'."\n\n";
 			// var_dump($outputatend);
 		}
 
@@ -299,7 +299,7 @@ 
 
 			$reg2 = array();
 			if (preg_match('/CREATE TABLE ([^\s]+)/', $line, $reg2)) {
-				$output .= 'DROP TABLE IF EXISTS `' . $reg2[1] . '`;' . "\n";
+				$output .= 'DROP TABLE IF EXISTS `'.$reg2[1].'`;'."\n";
 			}
 			$output .= $line;
 			$linenumber++;
@@ -379,7 +379,7 @@ 
 				$arrayofprimaryalreadyintabledef[$in_create_table] = $in_create_table;
 			}
 
-			$specialfields = array("repeat","status","type","call");
+			$specialfields = array("repeat", "status", "type", "call");
 
 			$field = getfieldname($line);
 			if (in_array($field, $specialfields)) {
@@ -398,7 +398,7 @@ 
 				$lastchr = substr($output, -2, 1);
 				// echo "lastchr=$lastchr";
 				if ($lastchr == ",") {
-					$output = substr($output, 0, -2) . "\n";
+					$output = substr($output, 0, -2)."\n";
 				}
 			}
 
@@ -423,7 +423,7 @@ 
 				$after = str_replace(" (E'", " ('", $after);
 				$after = str_replace(", E'", ", '", $after);
 
-				$output .= $before . " VALUES " . $after;
+				$output .= $before." VALUES ".$after;
 				$linenumber++;
 				continue;
 			} else {
@@ -451,7 +451,7 @@ 
 					$inquotes = false;
 				}
 
-				$output .= $before . " VALUES " . $after;
+				$output .= $before." VALUES ".$after;
 				do {
 					$linenumber++;
 
@@ -501,14 +501,14 @@ 
 						$output .= str_replace("\n", "", $pkey);
 						// the postgres and mysql syntax for this is (at least, in the example im looking at)
 						// identical, so we can just add it as is.
-						$output .= $line . "\n";
+						$output .= $line."\n";
 					} else {
-						$output .= '-- ' . str_replace("\n", "", $pkey);
-						$output .= '-- ' . $line . "\n";
+						$output .= '-- '.str_replace("\n", "", $pkey);
+						$output .= '-- '.$line."\n";
 					}
 				} else {
-					$output .= '-- ' . str_replace("\n", "", $pkey);
-					$output .= '-- ' . $line . "\n";
+					$output .= '-- '.str_replace("\n", "", $pkey);
+					$output .= '-- '.$line."\n";
 				}
 			}
 		}
@@ -522,7 +522,7 @@ 
 				$tablename = str_replace('public.', '', $matches[2]);
 				$columns = $matches[3];
 				if ($tablename && $columns) {
-					$output .= "ALTER TABLE `" . $tablename . "` ADD INDEX " . $indexname . "( {$columns} ) ;\n";
+					$output .= "ALTER TABLE `".$tablename."` ADD INDEX ".$indexname."( {$columns} ) ;\n";
 				}
 			}
 		}
@@ -534,7 +534,7 @@ 
 				$tablename = str_replace('public.', '', $matches[2]);
 				$columns = str_replace('"', '', $matches[3]);
 				if ($tablename && $columns) {
-					$output .= "ALTER TABLE `" . $tablename . "` ADD UNIQUE INDEX " . $indexname . " ( {$columns} ) ;\n";
+					$output .= "ALTER TABLE `".$tablename."` ADD UNIQUE INDEX ".$indexname." ( {$columns} ) ;\n";
 				}
 			}
 		}
@@ -565,16 +565,16 @@ 
 			if ($line == "\\.\n") {
 				$in_insert = false;
 				if ($values) {
-					$output .= "INSERT INTO $heads VALUES\n" . implode(",\n", $values) . ";\n\n";
+					$output .= "INSERT INTO $heads VALUES\n".implode(",\n", $values).";\n\n";
 				}
 			} else {
 				$vals = explode('	', $line);
 				foreach ($vals as $i => $val) {
-					$vals[$i] = ($val == '\\N') ? 'NULL' : "'" . str_replace("'", "\\'", trim($val)) . "'";
+					$vals[$i] = ($val == '\\N') ? 'NULL' : "'".str_replace("'", "\\'", trim($val))."'";
 				}
-				$values[] = '(' . implode(',', $vals) . ')';
+				$values[] = '('.implode(',', $vals).')';
 				if (count($values) >= 1000) {
-					$output .= "INSERT INTO $heads VALUES\n" . implode(",\n", $values) . ";\n";
+					$output .= "INSERT INTO $heads VALUES\n".implode(",\n", $values).";\n";
 					$values = array();
 				}
 			}
@@ -583,5 +583,5 @@ 
 		$linenumber++;
 	}
 
-	return array('output' => $output,'outputatend' => $outputatend);
+	return array('output' => $output, 'outputatend' => $outputatend);
 }

dev/tools/test/namespacemig/bbb.class.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
  */
 class Bbb
 {
-	const BBB='bbb';
+	const BBB = 'bbb';
 
 	/**
 	 * do
@@ -29,7 +29,7 @@ 
 	{
 		global $globalaaa, $globalbbb;
 		echo 'dobbb'."\n";
-		$globalaaa.='+bbb';
-		$globalbbb.='+bbb';
+		$globalaaa .= '+bbb';
+		$globalbbb .= '+bbb';
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -25,9 +25,11 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		global $globalaaa, $globalbbb;
+	}
 		echo 'dobbb'."\n";
 		$globalaaa.='+bbb';
 		$globalbbb.='+bbb';

dev/tools/test/namespacemig/aaa.class.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 class Aaa
 {
-	const AAA='aaa';
+	const AAA = 'aaa';
 
 	/**
 	 * do

Braces +3 added lines, -1 removed lines

@@ -27,8 +27,10 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		echo 'doaaa'."\n";
 	}
+	}
 }

dev/tools/test/testtcpdf.php

Spacing +5 added lines, -5 removed lines

@@ -65,11 +65,11 @@
  - To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
 
 */
-$permissions=array('copy');
-$user_pass='aaa';
-$owner_pass=null;
-$mode=0;
-$pubkeys=null;
+$permissions = array('copy');
+$user_pass = 'aaa';
+$owner_pass = null;
+$mode = 0;
+$pubkeys = null;
 $pdf->SetProtection($permissions, $user_pass, $owner_pass, $mode, $pubkeys);
 
 // Example with public-key

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 Encryption Example
 
 Consult the source code documentation for the SetProtection() method.
-EOD;
+eod;
 
 // print a block of text using Write()
 $pdf->Write(0, $txt, '', 0, 'L', true, 0, false, false, 0);

dev/translation/strip_language_file.php

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -149,13 +149,13 @@ 
 
 			// key is redundant
 			if (array_key_exists($key, $aSecondary)) {
-				print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n";
+				print "key $key is redundant in file $lSecondaryFile (line: $cnt).\n";
 				continue;
 			}
 
 			// String has no value
 			if ($value == '') {
-				print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n";
+				print "key $key has no value in file $lSecondaryFile (line: $cnt).\n";
 				continue;
 			}
 
@@ -203,13 +203,13 @@ 
 
 			// key is redundant
 			if (array_key_exists($key, $aEnglish)) {
-				print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n";
+				print "key $key is redundant in file $lEnglishFile (line: $cnt).\n";
 				continue;
 			}
 
 			// String has no value
 			if ($value == '') {
-				print "Key $key has no value in file $lEnglishFile (line: $cnt).\n";
+				print "key $key has no value in file $lEnglishFile (line: $cnt).\n";
 				continue;
 			}
 
@@ -272,7 +272,7 @@ 
 
 			// key is redundant
 			if (array_key_exists($key, $aPrimary)) {
-				print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
+				print "key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
 				continue;
 			} else {
 				$fileFirstFound[$key] = $fileToProcess;
@@ -281,7 +281,7 @@ 
 
 			// String has no value
 			if ($value == '') {
-				print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n";
+				print "key $key has no value in file $lPrimaryFile (line: $cnt).\n";
 				continue;
 			}
 

Spacing +29 added lines, -29 removed lines

@@ -46,7 +46,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -66,8 +66,8 @@ 
 if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) {
 	$rc = 1;
 	$msg = '***** Script to clean language files *****'."\n";
-	$msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
-	print $msg . "(rc=$rc).\n";
+	$msg .= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
+	print $msg."(rc=$rc).\n";
 	exit($rc);
 }
 
@@ -79,14 +79,14 @@ 
 if ($filesToProcess == 'all') {
 	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
 	while ($dir->valid()) {
-		if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
-			$files[] =  $dir->getFilename();
+		if (!$dir->isDot() && $dir->isFile() && !preg_match('/^\./', $dir->getFilename())) {
+			$files[] = $dir->getFilename();
 		}
 		$dir->next();
 	}
-	$filesToProcess=$files;
+	$filesToProcess = $files;
 } else {
-	$filesToProcess=explode(',', $filesToProcess);
+	$filesToProcess = explode(',', $filesToProcess);
 }
 
 // Arguments should be OK here.
@@ -97,28 +97,28 @@ 
 	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
 	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
 	$lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess;
-	$output = $lSecondaryFile . '.delta';
+	$output = $lSecondaryFile.'.delta';
 
 	print "---- Process language file ".$lSecondaryFile."\n";
 
-	if (! is_readable($lPrimaryFile)) {
+	if (!is_readable($lPrimaryFile)) {
 		$rc = 2;
 		$msg = "Cannot read primary language file $lPrimaryFile.";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
-	if (! is_readable($lSecondaryFile)) {
+	if (!is_readable($lSecondaryFile)) {
 		$rc = 3;
 		$msg = "Cannot read secondary language file $lSecondaryFile. We discard this file.";
-		print $msg . "\n";
+		print $msg."\n";
 		continue;
 	}
 
-	if (! is_readable($lEnglishFile)) {
+	if (!is_readable($lEnglishFile)) {
 		$rc = 3;
 		$msg = "Cannot read english language file $lEnglishFile. We discard this file.";
-		print $msg . "\n";
+		print $msg."\n";
 		continue;
 	}
 
@@ -141,7 +141,7 @@ 
 
 			$a = mb_split('=', trim($line), 2);
 			if (count($a) != 2) {
-				print "ERROR in file $lSecondaryFile, line $cnt: " . trim($line) . "\n";
+				print "ERROR in file $lSecondaryFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
@@ -161,17 +161,17 @@ 
 
 			$aSecondary[$key] = trim($value);
 		}
-		if (! feof($handle)) {
+		if (!feof($handle)) {
 			$rc = 5;
 			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
+			print $msg." (rc=$rc).\n";
 			exit($rc);
 		}
 		fclose($handle);
 	} else {
 		$rc = 6;
 		$msg = "Cannot open file $lSecondaryFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
@@ -195,7 +195,7 @@ 
 
 			$a = mb_split('=', trim($line), 2);
 			if (count($a) != 2) {
-				print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n";
+				print "ERROR in file $lEnglishFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
@@ -215,17 +215,17 @@ 
 
 			$aEnglish[$key] = trim($value);
 		}
-		if (! feof($handle)) {
+		if (!feof($handle)) {
 			$rc = 5;
 			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
+			print $msg." (rc=$rc).\n";
 			exit($rc);
 		}
 		fclose($handle);
 	} else {
 		$rc = 6;
 		$msg = "Cannot open file $lEnglishFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
@@ -233,11 +233,11 @@ 
 
 	// Start reading and parsing Primary. See rules in header!
 
-	$arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand');
+	$arrayofkeytoalwayskeep = array('DIRECTION', 'FONTFORPDF', 'FONTSIZEFORPDF', 'SeparatorDecimal', 'SeparatorThousand');
 
 
 	if ($handle = fopen($lPrimaryFile, 'r')) {
-		if (! $oh = fopen($output, 'w')) {
+		if (!$oh = fopen($output, 'w')) {
 			print "ERROR in writing to file ".$output."\n";
 			exit;
 		}
@@ -264,7 +264,7 @@ 
 
 			$a = mb_split('=', trim($line), 2);
 			if (count($a) != 2) {
-				print "ERROR in file $lPrimaryFile, line $cnt: " . trim($line) . "\n";
+				print "ERROR in file $lPrimaryFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
@@ -296,7 +296,7 @@ 
 			// Key not in other file
 			if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)) {
 				//print "Key $key is a key we always want to see into secondary file (line: $cnt).\n";
-			} elseif (! array_key_exists($key, $aSecondary)) {
+			} elseif (!array_key_exists($key, $aSecondary)) {
 				//print "Key $key does NOT exist in secondary language (line: $cnt).\n";
 				continue;
 			}
@@ -311,10 +311,10 @@ 
 				fwrite($oh, $key."=".(empty($aSecondary[$key]) ? $aPrimary[$key] : $aSecondary[$key])."\n");
 			}
 		}
-		if (! feof($handle)) {
+		if (!feof($handle)) {
 			$rc = 7;
 			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
+			print $msg." (rc=$rc).\n";
 			exit($rc);
 		}
 		fclose($oh);
@@ -322,7 +322,7 @@ 
 	} else {
 		$rc = 8;
 		$msg = "Cannot open file $lPrimaryFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}