Dolibarr / dolibarr

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

dev/initdemo/sftpget_and_loaddump.php

Spacing +39 added lines, -39 removed lines

@@ -21,7 +21,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') {
@@ -30,39 +30,39 @@ 
 }
 
 // Global variables
-$error=0;
+$error = 0;
 
-$sourceserver=isset($argv[1])?$argv[1]:'';		// user@server:/src/file
-$password=isset($argv[2])?$argv[2]:'';
-$dataserver=isset($argv[3])?$argv[3]:'';
-$database=isset($argv[4])?$argv[4]:'';
-$loginbase=isset($argv[5])?$argv[5]:'';
-$passwordbase=isset($argv[6])?$argv[6]:'';
+$sourceserver = isset($argv[1]) ? $argv[1] : ''; // user@server:/src/file
+$password = isset($argv[2]) ? $argv[2] : '';
+$dataserver = isset($argv[3]) ? $argv[3] : '';
+$database = isset($argv[4]) ? $argv[4] : '';
+$loginbase = isset($argv[5]) ? $argv[5] : '';
+$passwordbase = isset($argv[6]) ? $argv[6] : '';
 
 // Include Dolibarr environment
-$res=0;
-if (! $res && file_exists($path."../../master.inc.php")) {
-	$res=@include $path."../../master.inc.php";
+$res = 0;
+if (!$res && file_exists($path."../../master.inc.php")) {
+	$res = @include $path."../../master.inc.php";
 }
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) {
-	$res=@include $path."../../htdocs/master.inc.php";
+if (!$res && file_exists($path."../../htdocs/master.inc.php")) {
+	$res = @include $path."../../htdocs/master.inc.php";
 }
-if (! $res && file_exists("../master.inc.php")) {
-	$res=@include "../master.inc.php";
+if (!$res && file_exists("../master.inc.php")) {
+	$res = @include "../master.inc.php";
 }
-if (! $res && file_exists("../../master.inc.php")) {
-	$res=@include "../../master.inc.php";
+if (!$res && file_exists("../../master.inc.php")) {
+	$res = @include "../../master.inc.php";
 }
-if (! $res && file_exists("../../../master.inc.php")) {
-	$res=@include "../../../master.inc.php";
+if (!$res && file_exists("../../../master.inc.php")) {
+	$res = @include "../../../master.inc.php";
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res) {
+if (!$res) {
 	die("Failed to include master.inc.php file\n");
 }
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -72,13 +72,13 @@ 
  *	Main
  */
 
-$login='';
-$server='';
+$login = '';
+$server = '';
 if (preg_match('/^(.*)@(.*):(.*)$/', $sourceserver, $reg)) {
-	$login=$reg[1];
-	$server=$reg[2];
-	$sourcefile=$reg[3];
-	$targetfile=basename($sourcefile);
+	$login = $reg[1];
+	$server = $reg[2];
+	$sourcefile = $reg[3];
+	$targetfile = basename($sourcefile);
 }
 if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase)) {
 	print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
@@ -88,22 +88,22 @@ 
 }
 
 
-$targetdir='/tmp';
+$targetdir = '/tmp';
 print "Get dump file from server ".$server.", path ".$sourcefile.", connect with login ".$login." loaded into localhost\n";
 
-$sftpconnectstring=$sourceserver;
+$sftpconnectstring = $sourceserver;
 print 'SFTP connect string : '.$sftpconnectstring."\n";
 //print 'SFTP password '.$password."\n";
 
 
 // SFTP connect
-if (! function_exists("ssh2_connect")) {
+if (!function_exists("ssh2_connect")) {
 	dol_print_error('', 'ssh2_connect function does not exists'); exit(1);
 }
 
 $connection = ssh2_connect($server, 22);
 if ($connection) {
-	if (! @ssh2_auth_password($connection, $login, $password)) {
+	if (!@ssh2_auth_password($connection, $login, $password)) {
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
 		exit(-5);
 	} else {
@@ -121,16 +121,16 @@ 
 		print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n";
 		ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile);
 
-		$fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+		$fullcommand = "cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		if (preg_match('/\.bz2$/', $targetfile)) {
-			$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+			$fullcommand = "bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		}
 		if (preg_match('/\.gz$/', $targetfile)) {
-			$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+			$fullcommand = "gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		}
 		print "Load dump with ".$fullcommand."\n";
-		$output=array();
-		$return_var=0;
+		$output = array();
+		$return_var = 0;
 		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
 		exec($fullcommand, $output, $return_var);
 		foreach ($output as $line) {

dev/initdemo/updatedemo.php

Spacing +34 added lines, -34 removed lines

@@ -21,7 +21,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') {
@@ -30,34 +30,34 @@ 
 }
 
 // Global variables
-$error=0;
+$error = 0;
 
-$confirm=isset($argv[1])?$argv[1]:'';
+$confirm = isset($argv[1]) ? $argv[1] : '';
 
 // Include Dolibarr environment
-$res=0;
-if (! $res && file_exists($path."../../master.inc.php")) {
-	$res=@include $path."../../master.inc.php";
+$res = 0;
+if (!$res && file_exists($path."../../master.inc.php")) {
+	$res = @include $path."../../master.inc.php";
 }
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) {
-	$res=@include $path."../../htdocs/master.inc.php";
+if (!$res && file_exists($path."../../htdocs/master.inc.php")) {
+	$res = @include $path."../../htdocs/master.inc.php";
 }
-if (! $res && file_exists("../master.inc.php")) {
-	$res=@include "../master.inc.php";
+if (!$res && file_exists("../master.inc.php")) {
+	$res = @include "../master.inc.php";
 }
-if (! $res && file_exists("../../master.inc.php")) {
-	$res=@include "../../master.inc.php";
+if (!$res && file_exists("../../master.inc.php")) {
+	$res = @include "../../master.inc.php";
 }
-if (! $res && file_exists("../../../master.inc.php")) {
-	$res=@include "../../../master.inc.php";
+if (!$res && file_exists("../../../master.inc.php")) {
+	$res = @include "../../../master.inc.php";
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res) {
+if (!$res) {
 	die("Failed to include master.inc.php file\n");
 }
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -76,10 +76,10 @@ 
 }
 
 
-$tmp=dol_getdate(dol_now());
+$tmp = dol_getdate(dol_now());
 
 
-$tables=array(
+$tables = array(
 	'propal'=>array(0=>'datep', 1=>'fin_validite', 2=>'date_valid', 3=>'date_cloture'),
 	'commande'=>array(0=>'date_commande', 1=>'date_valid', 2=>'date_cloture'),
 	'facture'=>array(0=>'datec', 0=>'datef', 1=>'date_valid', 2=>'date_lim_reglement'),
@@ -92,40 +92,40 @@ 
 	'ticket'=>array(0=>'datec', 1=>'date_read', 2=>'date_close')
 );
 
-$year=2010;
-$currentyear=$tmp['year'];
+$year = 2010;
+$currentyear = $tmp['year'];
 while ($year <= $currentyear) {
 	//$year=2021;
-	$delta1=($currentyear - $year);
-	$delta2=($currentyear - $year - 1);
+	$delta1 = ($currentyear - $year);
+	$delta2 = ($currentyear - $year - 1);
 	//$delta=-1;
 
 	if ($delta1) {
 		foreach ($tables as $tablekey => $tableval) {
 			print "Correct ".$tablekey." for year ".$year." and move them to current year ".$currentyear." ";
-			$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
+			$sql = "select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
 			//$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." > NOW()";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
-				$i=0;
+				$i = 0;
 				while ($i < $num) {
-					$obj=$db->fetch_object($resql);
+					$obj = $db->fetch_object($resql);
 					if ($obj) {
 						print ".";
-						$sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
-						$j=0;
+						$sql2 = "UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
+						$j = 0;
 						foreach ($tableval as $field) {
 							if ($j) {
-								$sql2.=", ";
+								$sql2 .= ", ";
 							}
-							$sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
+							$sql2 .= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
 							$j++;
 						}
-						$sql2.=" WHERE rowid = ".$obj->rowid;
+						$sql2 .= " WHERE rowid = ".$obj->rowid;
 						//print $sql2."\n";
 						$resql2 = $db->query($sql2);
-						if (! $resql2) {
+						if (!$resql2) {
 							dol_print_error($db);
 						}
 					}

dev/translation/strip_language_file.php

Spacing +33 added lines, -33 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') {
@@ -58,16 +58,16 @@ 
 
 // Get and check arguments
 
-$lPrimary = isset($argv[1])?$argv[1]:'';
-$lSecondary = isset($argv[2])?$argv[2]:'';
+$lPrimary = isset($argv[1]) ? $argv[1] : '';
+$lSecondary = isset($argv[2]) ? $argv[2] : '';
 $lEnglish = 'en_US';
-$filesToProcess = isset($argv[3])?$argv[3]:'';
+$filesToProcess = isset($argv[3]) ? $argv[3] : '';
 
 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;
 			}
@@ -308,13 +308,13 @@ 
 				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)
 				) {
 				//print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n";
-				fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n");
+				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);
 	}
 

dev/translation/autotranslator.class.php

Spacing +48 added lines, -48 removed lines

@@ -84,46 +84,46 @@ 
 			$counter++;
 			$fileContent = null;
 			$refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file;
-			$fileContent = file($refPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-			print "Processing file " . $file . ", with ".count($fileContent)." lines<br>\n";
+			$fileContent = file($refPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+			print "Processing file ".$file.", with ".count($fileContent)." lines<br>\n";
 
 			// Define target dirs
-			$targetlangs=array($this->_destlang);
+			$targetlangs = array($this->_destlang);
 			if ($this->_destlang == 'all') {
-				$targetlangs=array();
+				$targetlangs = array();
 
 				// If we must process all languages
-				$arraytmp=dol_dir_list($this->_langDir, 'directories', 0);
+				$arraytmp = dol_dir_list($this->_langDir, 'directories', 0);
 				foreach ($arraytmp as $dirtmp) {
 					if ($dirtmp['name'] === $this->_refLang) {
-						continue;	// We discard source language
+						continue; // We discard source language
 					}
-					$tmppart=explode('_', $dirtmp['name']);
+					$tmppart = explode('_', $dirtmp['name']);
 					if (preg_match('/^en/i', $dirtmp['name'])) {
-						continue;	// We discard en_* languages
+						continue; // We discard en_* languages
 					}
 					if (preg_match('/^fr/i', $dirtmp['name'])) {
-						continue;	// We discard fr_* languages
+						continue; // We discard fr_* languages
 					}
 					if (preg_match('/^es/i', $dirtmp['name'])) {
-						continue;	// We discard es_* languages
+						continue; // We discard es_* languages
 					}
 					if (preg_match('/ca_ES/i', $dirtmp['name'])) {
-						continue;	// We discard es_CA language
+						continue; // We discard es_CA language
 					}
 					if (preg_match('/pt_BR/i', $dirtmp['name'])) {
-						continue;	// We discard pt_BR language
+						continue; // We discard pt_BR language
 					}
 					if (preg_match('/nl_BE/i', $dirtmp['name'])) {
-						continue;  // We discard nl_BE language
+						continue; // We discard nl_BE language
 					}
 					if (preg_match('/^\./i', $dirtmp['name'])) {
-						continue;	// We discard files .*
+						continue; // We discard files .*
 					}
 					if (preg_match('/^CVS/i', $dirtmp['name'])) {
-						continue;	// We discard CVS
+						continue; // We discard CVS
 					}
-					$targetlangs[]=$dirtmp['name'];
+					$targetlangs[] = $dirtmp['name'];
 				}
 				//var_dump($targetlangs);
 			}
@@ -134,27 +134,27 @@ 
 
 				$destPath = $this->_langDir.$my_destlang.self::DIR_SEPARATOR.$file;
 				// Check destination file presence
-				if (! file_exists($destPath)) {
+				if (!file_exists($destPath)) {
 					// No file present, we generate file
-					echo "File not found: " . $destPath . ". We generate it.<br>\n";
+					echo "File not found: ".$destPath.". We generate it.<br>\n";
 					$this->createTranslationFile($destPath, $my_destlang);
 				} else {
-					echo "Updating file: " . $destPath . "<br>\n";
+					echo "Updating file: ".$destPath."<br>\n";
 				}
 
 				// Translate lines
-				$fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-				$newlines=0;
+				$fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+				$newlines = 0;
 				foreach ($fileContent as $line) {
 					$key = $this->getLineKey($line);
 					$value = $this->getLineValue($line);
 					if ($key && $value) {
-						$newlines+=$this->translateFileLine($fileContentDest, $file, $key, $value, $my_destlang);
+						$newlines += $this->translateFileLine($fileContentDest, $file, $key, $value, $my_destlang);
 					}
 				}
 
 				$this->updateTranslationFile($destPath, $file, $my_destlang);
-				echo "New translated lines: " . $newlines . "<br>\n";
+				echo "New translated lines: ".$newlines."<br>\n";
 				//if ($counter ==3) die('fim');
 			}
 		}
@@ -172,14 +172,14 @@ 
 	{
 		$this->_time_end = date('Y-m-d H:i:s');
 
-		if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0) {
+		if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file]) > 0) {
 			$fp = fopen($destPath, 'a');
 			fwrite($fp, "\n");
 			fwrite($fp, "\n");
 			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n");
 			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n");
 			foreach ($this->_translatedFiles[$file] as $line) {
-				fwrite($fp, $line . "\n");
+				fwrite($fp, $line."\n");
 			}
 			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
 			fclose($fp);
@@ -200,7 +200,7 @@ 
 		fwrite($fp, "/*\n");
 		fwrite($fp, " * Language code: {$my_destlang}\n");
 		fwrite($fp, " * Automatic generated via autotranslator.php tool\n");
-		fwrite($fp, " * Generation date " . $this->_time. "\n");
+		fwrite($fp, " * Generation date ".$this->_time."\n");
 		fwrite($fp, " */\n");
 		fclose($fp);
 		return;
@@ -231,27 +231,27 @@ 
 		}
 
 		if ($key == 'CHARSET') {
-			$val=$this->_outputpagecode;
+			$val = $this->_outputpagecode;
 		} elseif (preg_match('/^Format/', $key)) {
-			$val=$value;
-		} elseif ($value=='-') {
-			$val=$value;
+			$val = $value;
+		} elseif ($value == '-') {
+			$val = $value;
 		} else {
 			// If not translated then translate
 			if ($this->_outputpagecode == 'UTF-8') {
-				$val=$this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2));
+				$val = $this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2));
 			} else {
-				$val=utf8_decode($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)));
+				$val = utf8_decode($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)));
 			}
 		}
 
-		$val=trim($val);
+		$val = trim($val);
 
 		if (empty($val)) {
 			return 0;
 		}
 
-		$this->_translatedFiles[$file][] = $key . '=' . $val ;
+		$this->_translatedFiles[$file][] = $key.'='.$val;
 		return 1;
 	}
 
@@ -276,7 +276,7 @@ 
 	private function getLineValue($line)
 	{
 		$arraykey = explode('=', $line, 2);
-		return trim(isset($arraykey[1])?$arraykey[1]:'');
+		return trim(isset($arraykey[1]) ? $arraykey[1] : '');
 	}
 
 	/**
@@ -289,8 +289,8 @@ 
 	{
 		$dir = new DirectoryIterator($this->_langDir.$lang);
 		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();
 		}
@@ -308,20 +308,20 @@ 
 	private function translateTexts($src_texts, $src_lang, $dest_lang)
 	{
 		// We want to be sure that src_lang and dest_lang are using 2 chars only
-		$tmp=explode('_', $src_lang);
+		$tmp = explode('_', $src_lang);
 		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) {
-			$src_lang=$tmp[0];
+			$src_lang = $tmp[0];
 		}
-		$tmp=explode('_', $dest_lang);
+		$tmp = explode('_', $dest_lang);
 		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) {
-			$dest_lang=$tmp[0];
+			$dest_lang = $tmp[0];
 		}
 
 		//setting language pair
 		$lang_pair = $src_lang.'|'.$dest_lang;
 
-		$src_text_to_translate=preg_replace('/%s/', 'SSSSS', implode('', $src_texts));
-		$src_text_to_translate=preg_replace('/'.preg_quote('\n\n').'/', ' NNNNN ', $src_text_to_translate);
+		$src_text_to_translate = preg_replace('/%s/', 'SSSSS', implode('', $src_texts));
+		$src_text_to_translate = preg_replace('/'.preg_quote('\n\n').'/', ' NNNNN ', $src_text_to_translate);
 
 		// Define GET URL v1
 		//$url = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=".urlencode($src_text_to_translate)."&langpair=".urlencode($lang_pair);
@@ -333,7 +333,7 @@ 
 		// Send request
 		//print "Url to translate: ".$url."\n";
 
-		if (! function_exists("curl_init")) {
+		if (!function_exists("curl_init")) {
 			  print "Error, your PHP does not support curl functions.\n";
 			  die();
 		}
@@ -355,10 +355,10 @@ 
 			return false;
 		}
 
-		$rep=$json['data']['translations'][0]['translatedText'];
-		$rep=preg_replace('/SSSSS/i', '%s', $rep);
-		$rep=preg_replace('/NNNNN/i', '\n\n', $rep);
-		$rep=preg_replace('/&#39;/i', '\'', $rep);
+		$rep = $json['data']['translations'][0]['translatedText'];
+		$rep = preg_replace('/SSSSS/i', '%s', $rep);
+		$rep = preg_replace('/NNNNN/i', '\n\n', $rep);
+		$rep = preg_replace('/&#39;/i', '\'', $rep);
 
 		//print "OK ".join('',$src_texts).' => '.$rep."\n";
 

dev/translation/sanity_check_en_langfiles.php

Spacing +142 added lines, -142 removed lines

@@ -20,13 +20,13 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
-$web=0;
+$web = 0;
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	$web=1;
+	$web = 1;
 }
 
 
@@ -112,8 +112,8 @@ 
 	exit;
 }
 
-$dups=array();
-$exludefiles = array('.','..','README');
+$dups = array();
+$exludefiles = array('.', '..', 'README');
 $files = array_diff($files, $exludefiles);
 // To force a file: $files=array('myfile.lang');
 if (isset($argv[2])) {
@@ -124,18 +124,18 @@ 
 foreach ($files as $file) {
 	$path_file = pathinfo($file);
 	// we're only interested in .lang files
-	if ($path_file['extension']=='lang') {
+	if ($path_file['extension'] == 'lang') {
 		$content = file($workdir.$file);
 		foreach ($content as $line => $row) {
 			// don't want comment lines
 			if (substr($row, 0, 1) !== '#') {
 				// don't want lines without the separator (why should those even be here, anyway...)
-				if (strpos($row, '=')!==false) {
-					$row_array = explode('=', $row);		// $row_array[0] = key
-					$langstrings_3d[$path_file['basename']][$line+1]=$row_array[0];
-					$langstrings_3dtrans[$path_file['basename']][$line+1]=$row_array[1];
-					$langstrings_full[]=$row_array[0];
-					$langstrings_dist[$row_array[0]]=$row;
+				if (strpos($row, '=') !== false) {
+					$row_array = explode('=', $row); // $row_array[0] = key
+					$langstrings_3d[$path_file['basename']][$line + 1] = $row_array[0];
+					$langstrings_3dtrans[$path_file['basename']][$line + 1] = $row_array[1];
+					$langstrings_full[] = $row_array[0];
+					$langstrings_dist[$row_array[0]] = $row;
 				}
 			}
 		}
@@ -145,7 +145,7 @@ 
 foreach ($langstrings_3d as $filename => $file) {
 	foreach ($file as $linenum => $value) {
 		$keys = array_keys($langstrings_full, $value);
-		if (count($keys)>1) {
+		if (count($keys) > 1) {
 			foreach ($keys as $key) {
 				$dups[$value][$filename][$linenum] = trim($langstrings_3dtrans[$filename][$linenum]);
 			}
@@ -167,75 +167,75 @@ 
 	echo "<tbody>\n";
 }
 
-$sduplicateinsamefile='';
-$sinmainandother='';
-$sininstallandadmin='';
-$sother='';
+$sduplicateinsamefile = '';
+$sinmainandother = '';
+$sininstallandadmin = '';
+$sother = '';
 
 $count = 0;
 foreach ($dups as $string => $pages) {
 	$count++;
-	$s='';
+	$s = '';
 
 	// Keyword $string
 	if ($web) {
-		$s.="<tr>";
+		$s .= "<tr>";
 	}
 	if ($web) {
-		$s.="<td align=\"center\">";
+		$s .= "<td align=\"center\">";
 	}
 	if ($web) {
-		$s.=$count;
+		$s .= $count;
 	}
 	if ($web) {
-		$s.="</td>";
+		$s .= "</td>";
 	}
 	if ($web) {
-		$s.="<td>";
+		$s .= "<td>";
 	}
-	$s.=$string;
+	$s .= $string;
 	if ($web) {
-		$s.="</td>";
+		$s .= "</td>";
 	}
 	if ($web) {
-		$s.="<td>";
+		$s .= "<td>";
 	}
-	if (! $web) {
-		$s.= ' : ';
+	if (!$web) {
+		$s .= ' : ';
 	}
 
 	// Loop on each files keyword was found
-	$duplicateinsamefile=0;
-	$inmain=0;
-	$inadmin=0;
+	$duplicateinsamefile = 0;
+	$inmain = 0;
+	$inadmin = 0;
 	foreach ($pages as $file => $lines) {
 		if ($file == 'main.lang') {
-			$inmain=1; $inadmin=0;
+			$inmain = 1; $inadmin = 0;
 		}
-		if ($file == 'admin.lang' && ! $inmain) {
-			$inadmin=1;
+		if ($file == 'admin.lang' && !$inmain) {
+			$inadmin = 1;
 		}
 
-		$s.=$file." ";
+		$s .= $file." ";
 
 		// Loop on each line keword was found into file.
-		$listoffilesforthisentry=array();
+		$listoffilesforthisentry = array();
 		foreach ($lines as $line => $translatedvalue) {
 			if (!empty($listoffilesforthisentry[$file])) {
-				$duplicateinsamefile=1;
+				$duplicateinsamefile = 1;
 			}
-			$listoffilesforthisentry[$file]=1;
+			$listoffilesforthisentry[$file] = 1;
 
-			$s.= "(".$line." - ".htmlentities($translatedvalue).") ";
+			$s .= "(".$line." - ".htmlentities($translatedvalue).") ";
 		}
 		if ($web) {
-			$s.="<br>";
+			$s .= "<br>";
 		}
 	}
 	if ($web) {
-		$s.="</td></tr>";
+		$s .= "</td></tr>";
 	}
-	$s.="\n";
+	$s .= "\n";
 
 	if ($duplicateinsamefile) {
 		$sduplicateinsamefile .= $s;
@@ -248,47 +248,47 @@ 
 	}
 }
 
-if (! $web) {
+if (!$web) {
 	print "\n***** Entries duplicated in same file\n";
 }
 print $sduplicateinsamefile;
-if (! $web && empty($sduplicateinsamefile)) {
+if (!$web && empty($sduplicateinsamefile)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
-if (! $web) {
+if (!$web) {
 	print "***** Entries in main and another (keep only entry in main)\n";
 }
 print $sinmainandother;
-if (! $web && empty($sinmainandother)) {
+if (!$web && empty($sinmainandother)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
-if (! $web) {
+if (!$web) {
 	print "***** Entries in admin and another\n";
 }
 print $sininstallandadmin;
-if (! $web && empty($sininstallandadmin)) {
+if (!$web && empty($sininstallandadmin)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
-if (! $web) {
+if (!$web) {
 	print "***** Other\n";
 }
 print $sother;
-if (! $web && empty($sother)) {
+if (!$web && empty($sother)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
@@ -300,265 +300,265 @@ 
 
 // STEP 2 - Search key not used
 
-if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true')) {
+if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1] == 'unused=true')) {
 	print "***** Strings in en_US that are never used:\n";
 
-	$unused=array();
+	$unused = array();
 	foreach ($langstrings_dist as $value => $line) {
-		$qualifiedforclean=1;
+		$qualifiedforclean = 1;
 		// Check if we must keep this key to be into file for removal
 		if (preg_match('/^Module\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Permission\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PermissionAdvanced\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ProfId\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Delays_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^BarcodeDesc/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Extrafield/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^LocalTax/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Country/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Civility/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Currency/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DemandReasonTypeSRC/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PaperFormat/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Duration/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^AmountLT/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TotalLT/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Month/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^MonthShort/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Day\d/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Short/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ExportDataset_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ImportDataset_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ActionAC_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TypeLocaltax/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^StatusProspect/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PL_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TE_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^JuridicalStatus/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^CalcMode/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^newLT/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^LT[0-9]/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TypeContact_contrat_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ErrorPriceExpression/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Language_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DescADHERENT_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^SubmitTranslation/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ModuleCompanyCode/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/InDolibarr$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// admin.lang
 		if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// boxes.lang
 		if (preg_match('/^BoxTitleLast/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^BoxTitleLatest/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// install.lang
 		if (preg_match('/^KeepDefaultValues/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// mail.lang
 		if (preg_match('/MailingModuleDesc/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// main.lang
 		if (preg_match('/^Duration/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^FormatDate/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DateFormat/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^.b$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^.*Bytes$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// modulebuilder
 		if (preg_match('/^ModuleBuilderDesc/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// orders
 		if (preg_match('/^OrderSource/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TypeContact_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// other.lang
 		if (preg_match('/^Notify_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PredefinedMail/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DemoCompany/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^WeightUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^LengthUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^SurfaceUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^VolumeUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^SizeUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^EMailText/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/ById$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/ByLogin$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// printing
 		if (preg_match('/PrintingDriverDesc$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/PrintTestDesc$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// products
 		if (preg_match('/GlobalVariableUpdaterType$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/OppStatus/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/AvailabilityType/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/CardProduct/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 
 		if (preg_match('/sms/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/TF_/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/WithBankUsing/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/descWORKFLOW_/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 
-		if (! $qualifiedforclean) {
+		if (!$qualifiedforclean) {
 			continue;
 		}
 
 		//$search = '\'trans("'.$value.'")\'';
 		$search = '-e "\''.$value.'\'" -e \'"'.$value.'"\' -e "('.$value.')" -e "('.$value.',"';
-		$string =  'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*';
+		$string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*';
 		//print $string."<br>\n";
 		exec($string, $output);
 		if (empty($output)) {
 			$unused[$value] = $line;
-			echo $line;        // $trad contains the \n
+			echo $line; // $trad contains the \n
 		} else {
 			unset($output);
 			//print 'X'.$output.'Y';
@@ -568,16 +568,16 @@ 
 	if (empty($unused)) {
 		print "No string not used found.\n";
 	} else {
-		$filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
+		$filetosave = '/tmp/'.($argv[2] ? $argv[2] : "").'notused.lang';
 		print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
 		file_put_contents($filetosave, implode("", $unused));
 		print "To remove from original file, run command :\n";
-		if (($argv[2]?$argv[2]:"")) {
-			print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; ";
+		if (($argv[2] ? $argv[2] : "")) {
+			print 'cd htdocs/langs/en_US; mv '.($argv[2] ? $argv[2] : "")." ".($argv[2] ? $argv[2] : "").".tmp; ";
 		}
-		print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut  -b 3- > ".($argv[2]?$argv[2]:"");
-		if (($argv[2]?$argv[2]:"")) {
-			print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n";
+		print "diff ".($argv[2] ? $argv[2] : "").".tmp ".$filetosave." | grep \< | cut  -b 3- > ".($argv[2] ? $argv[2] : "");
+		if (($argv[2] ? $argv[2] : "")) {
+			print "; rm ".($argv[2] ? $argv[2] : "").".tmp;\n";
 		}
 	}
 }

dev/translation/autotranslator.php

Spacing +10 added lines, -10 removed lines

@@ -28,7 +28,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') {
@@ -45,17 +45,17 @@ 
 $langs->load("main");
 
 // Global variables
-$version='1.14';
-$error=0;
+$version = '1.14';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") *****\n";
-$dir=DOL_DOCUMENT_ROOT."/langs";
+$dir = DOL_DOCUMENT_ROOT."/langs";
 
 // Check parameters
-if (! isset($argv[3])) {
+if (!isset($argv[3])) {
 	print "Usage:   ".$script_file."  lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n";
 	print "Example: ".$script_file."  en_US         pt_PT              123456\n";
 	print "Rem:     lang_code to use can be found on https://translate.google.com\n";
@@ -66,18 +66,18 @@ 
 print 'Argument 1='.$argv[1]."\n";
 print 'Argument 2='.$argv[2]."\n";
 print 'Argument 3='.$argv[3]."\n";
-$file='';
+$file = '';
 if (isset($argv[4])) {
-	$file=$argv[4];
+	$file = $argv[4];
 	print 'Argument 4='.$argv[4]."\n";
 }
 print 'Files will be generated/updated in directory '.$dir."\n";
 
 if ($argv[2] != 'all') {
-	if (! is_dir($dir.'/'.$argv[2])) {
+	if (!is_dir($dir.'/'.$argv[2])) {
 		print 'Create directory '.$dir.'/'.$argv[2]."\n";
-		$result=mkdir($dir.'/'.$argv[2]);
-		if (! $result) {
+		$result = mkdir($dir.'/'.$argv[2]);
+		if (!$result) {
 			$db->close();
 			return -1;
 		}

dev/initdata/import-thirdparties.php

Spacing +53 added lines, -53 removed lines

@@ -28,27 +28,27 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 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";
 	exit;
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-thirdparties.php/i', '', $_SERVER["PHP_SELF"]);
+$path = preg_replace('/import-thirdparties.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$delimiter=',';
-$enclosure='"';
-$linelength=10000;
-$escape='/';
+$delimiter = ',';
+$enclosure = '"';
+$linelength = 10000;
+$escape = '/';
 
 // Global variables
-$version=DOL_VERSION;
-$confirmed=1;
-$error=0;
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
 
 
 /*
@@ -63,42 +63,42 @@ 
 $filepath = $argv[2];
 $filepatherr = $filepath.'.err';
 //$defaultlang = empty($argv[3])?'en_US':$argv[3];
-$startlinenb = empty($argv[3])?1:$argv[3];
-$endlinenb = empty($argv[4])?0:$argv[4];
+$startlinenb = empty($argv[3]) ? 1 : $argv[3];
+$endlinenb = empty($argv[4]) ? 0 : $argv[4];
 
-if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
+if (empty($mode) || !in_array($mode, array('test', 'confirm', 'confirmforced')) || empty($filepath)) {
 	print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
 	print "Usage:  $script_file test myfilepath.csv 2 1002\n";
 	print "\n";
 	exit(-1);
 }
-if (! file_exists($filepath)) {
+if (!file_exists($filepath)) {
 	print "Error: File ".$filepath." not found.\n";
 	print "\n";
 	exit(-1);
 }
 
-$ret=$user->fetch('', 'admin');
-if (! $ret > 0) {
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
 }
 $user->getrights();
 
 // Ask confirmation
-if (! $confirmed) {
+if (!$confirmed) {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
 }
 
 // Open input and output files
 $fhandle = fopen($filepath, 'r');
-if (! $fhandle) {
+if (!$fhandle) {
 	print 'Error: Failed to open file '.$filepath."\n";
 	exit(1);
 }
 $fhandleerr = fopen($filepatherr, 'w');
-if (! $fhandleerr) {
+if (!$fhandleerr) {
 	print 'Error: Failed to open file '.$filepatherr."\n";
 	exit(1);
 }
@@ -108,11 +108,11 @@ 
 
 $db->begin();
 
-$i=0;
-$nboflines=0;
-while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape)) {
+$i = 0;
+$nboflines = 0;
+while ($fields = fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape)) {
 	$i++;
-	$errorrecord=0;
+	$errorrecord = 0;
 
 	if ($startlinenb && $i < $startlinenb) {
 		continue;
@@ -128,8 +128,8 @@ 
 	$object->client = $fields[7];
 	$object->fournisseur = $fields[8];
 
-	$object->name = $fields[13]?trim($fields[13]):$fields[0];
-	$object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
+	$object->name = $fields[13] ?trim($fields[13]) : $fields[0];
+	$object->name_alias = $fields[0] != $fields[13] ?trim($fields[0]) : '';
 
 	$object->address = trim($fields[14]);
 	$object->zip = trim($fields[15]);
@@ -174,11 +174,11 @@ 
 
 
 	// Extrafields
-	$object->array_options['options_anastate']=price2num($fields[20]);
-	$object->array_options['options_anaregion']=price2num($fields[17]);
+	$object->array_options['options_anastate'] = price2num($fields[20]);
+	$object->array_options['options_anaregion'] = price2num($fields[17]);
 
-	if (! $errorrecord) {
-		$ret=$object->create($user);
+	if (!$errorrecord) {
+		$ret = $object->create($user);
 		if ($ret < 0) {
 			print " - Error in create result code = ".$ret." - ".$object->errorsToString();
 			$errorrecord++;
@@ -187,24 +187,24 @@ 
 		}
 	}
 
-	if (! $errorrecord) {
+	if (!$errorrecord) {
 		dol_syslog("Set price level");
 		$object->set_price_level($object->price_level, $user);
 	}
 
 	// Assign sales representative
-	if (! $errorrecord && $fields[3]) {
-		$salesrep=new User($db);
+	if (!$errorrecord && $fields[3]) {
+		$salesrep = new User($db);
 
-		$tmp=explode(' ', $fields[3], 2);
+		$tmp = explode(' ', $fields[3], 2);
 		$salesrep->firstname = trim($tmp[0]);
 		$salesrep->lastname = trim($tmp[1]);
 		if ($salesrep->lastname) {
-			$salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
+			$salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)).strtolower(substr($salesrep->lastname, 0));
 		} else {
-			$salesrep->login=strtolower($salesrep->firstname);
+			$salesrep->login = strtolower($salesrep->firstname);
 		}
-		$salesrep->login=preg_replace('/ /', '', $salesrep->login);
+		$salesrep->login = preg_replace('/ /', '', $salesrep->login);
 		$salesrep->fetch(0, $salesrep->login);
 
 		$result = $object->add_commercial($user, $salesrep->id);
@@ -218,19 +218,19 @@ 
 
 	dol_syslog("Add invoice contacts");
 	// Insert an invoice contact if there is an invoice email != standard email
-	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27]) {
-		$ret1=$ret2=0;
+	if (!$errorrecord && $fields[27] && $fields[26] != $fields[27]) {
+		$ret1 = $ret2 = 0;
 
 		$contact = new Contact($db);
 		$contact->lastname = $object->name;
-		$contact->address=$object->address;
-		$contact->zip=$object->zip;
-		$contact->town=$object->town;
-		$contact->country_id=$object->country_id;
-		$contact->email=$fields[27];
-		$contact->socid=$object->id;
-
-		$ret1=$contact->create($user);
+		$contact->address = $object->address;
+		$contact->zip = $object->zip;
+		$contact->town = $object->town;
+		$contact->country_id = $object->country_id;
+		$contact->email = $fields[27];
+		$contact->socid = $object->id;
+
+		$ret1 = $contact->create($user);
 		if ($ret1 > 0) {
 			//$ret2=$contact->add_contact($object->id, 'BILLING');
 		}
@@ -244,22 +244,22 @@ 
 
 	dol_syslog("Add delivery contacts");
 	// Insert a delivery contact
-	if (! $errorrecord && $fields[47]) {
-		$ret1=$ret2=0;
+	if (!$errorrecord && $fields[47]) {
+		$ret1 = $ret2 = 0;
 
 		$contact2 = new Contact($db);
 		$contact2->lastname = 'Service livraison - '.$fields[47];
 		$contact2->address = $fields[48];
 		$contact2->zip = $fields[50];
 		$contact2->town = $fields[51];
-		$contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
-		$contact2->note_public=$fields[54];
-		$contact2->socid=$object->id;
+		$contact2->country_id = dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
+		$contact2->note_public = $fields[54];
+		$contact2->socid = $object->id;
 
 		// Extrafields
-		$contact2->array_options['options_anazoneliv']=price2num($fields[53]);
+		$contact2->array_options['options_anazoneliv'] = price2num($fields[53]);
 
-		$ret1=$contact2->create($user);
+		$ret1 = $contact2->create($user);
 		if ($ret1 > 0) {
 			//$ret2=$contact2->add_contact($object->id, 'SHIPPING');
 		}
@@ -276,7 +276,7 @@ 
 
 	if ($errorrecord) {
 		fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-		$error++;    // $errorrecord will be reset
+		$error++; // $errorrecord will be reset
 	}
 }
 

dev/initdata/purge-data.php

Spacing +21 added lines, -21 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=__DIR__.'/';
+$path = __DIR__.'/';
 
 // Test si mode batch
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -35,7 +35,7 @@ 
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/purge-data.php/i', '', $_SERVER["PHP_SELF"]);
+$path = preg_replace('/purge-data.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -47,11 +47,11 @@ 
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 // List of sql to execute
-$sqls=array(
+$sqls = array(
 	'user'=>array(
 		"DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin') AND fk_user IN (select rowid FROM ".MAIN_DB_PREFIX."user where datec < '__DATE__')",
 		"DELETE FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin' AND datec < '__DATE__'",
@@ -182,7 +182,7 @@ 
 $option = $argv[2];
 $date = $argv[3];
 
-if (empty($mode) || ! in_array($mode, array('test','confirm'))) {
+if (empty($mode) || !in_array($mode, array('test', 'confirm'))) {
 	print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 	print "\n";
 	print "option can be ".implode(',', array_keys($sqls))."\n";
@@ -195,9 +195,9 @@ 
 	exit(-1);
 }
 if ($option != 'all') {
-	$listofoptions=explode(',', $option);
+	$listofoptions = explode(',', $option);
 	foreach ($listofoptions as $cursoroption) {
-		if (! in_array($cursoroption, array_keys($sqls))) {
+		if (!in_array($cursoroption, array_keys($sqls))) {
 			print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 			print "\n";
 			print "option '".$cursoroption."' must be in list ".implode(',', array_keys($sqls))."\n";
@@ -206,7 +206,7 @@ 
 	}
 }
 
-if (empty($date) || (! preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date != 'all')) {
+if (empty($date) || (!preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date != 'all')) {
 	print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 	print "\n";
 	print "date can be 'all' or 'YYYY-MM-DD' to delete record before YYYY-MM-DD\n";
@@ -221,13 +221,13 @@ 
 if (!empty($argv[4])) {
 	$db->close();
 	unset($db);
-	$db=getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
-	$user=new User($db);
+	$db = getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
+	$user = new User($db);
 }
 
 //var_dump($user->db->database_name);
-$ret=$user->fetch('', 'admin');
-if (! $ret > 0) {
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
 	print 'An admin user with login "admin" must exists to use this script.'."\n";
 	exit;
 }
@@ -242,7 +242,7 @@ 
 print "User = ".$db->database_user."\n";
 print "\n";
 
-if (! $confirmed) {
+if (!$confirmed) {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
 }
@@ -259,10 +259,10 @@ 
 {
 	global $db, $sqls;
 
-	$error=0;
+	$error = 0;
 	foreach ($sqls[$family] as $sql) {
 		if (preg_match('/^@/', $sql)) {
-			$newfamily=preg_replace('/@/', '', $sql);
+			$newfamily = preg_replace('/@/', '', $sql);
 			processfamily($newfamily, $date);
 			continue;
 		}
@@ -271,8 +271,8 @@ 
 
 		print "Run sql: ".$sql."\n";
 
-		$resql=$db->query($sql);
-		if (! $resql) {
+		$resql = $db->query($sql);
+		if (!$resql) {
 			if ($db->errno() != 'DB_ERROR_NOSUCHTABLE') {
 				$error++;
 			}
@@ -295,9 +295,9 @@ 
 
 $db->begin();
 
-$listofoptions=explode(',', $option);
+$listofoptions = explode(',', $option);
 foreach ($listofoptions as $cursoroption) {
-	$oldfamily='';
+	$oldfamily = '';
 	foreach ($sqls as $family => $familysql) {
 		if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) {
 			continue;
@@ -308,7 +308,7 @@ 
 		}
 		$oldfamily = $family;
 
-		$result=processfamily($family, $date);
+		$result = processfamily($family, $date);
 		if ($result < 0) {
 			$error++;
 			break;