alxarafe / alixar

dolibarr/dev/translation/autotranslator.php

Spacing +11 added lines, -11 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 http://www.google.com/language_tools\n";
@@ -66,21 +66,21 @@ 
 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;
@@ -90,7 +90,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";
 
-$langParser = new autoTranslator($argv[2],$argv[1],$dir,$file,$argv[3]);
+$langParser = new autoTranslator($argv[2], $argv[1], $dir, $file, $argv[3]);
 
 print "***** Finished *****\n";
 

dolibarr/dev/translation/strip_language_file.php

Spacing +58 added lines, -58 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,17 +58,17 @@ 
 
 // 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);
 }
 
@@ -80,53 +80,53 @@ 
 if ($filesToProcess == 'all')
 {
 	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
-	while($dir->valid()) {
-		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) {
-			$files[] =  $dir->getFilename();
+	while ($dir->valid()) {
+		if (!$dir->isDot() && $dir->isFile() && !preg_match('/^\./', $dir->getFilename())) {
+			$files[] = $dir->getFilename();
 		}
 		$dir->next();
 	}
-	$filesToProcess=$files;
+	$filesToProcess = $files;
 }
-else $filesToProcess=explode(',',$filesToProcess);
+else $filesToProcess = explode(',', $filesToProcess);
 
 // Arguments should be OK here.
 
 
 // Loop on each file
-foreach($filesToProcess as $fileToProcess)
+foreach ($filesToProcess as $fileToProcess)
 {
 	$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;
 	}
 
 	// Start reading and parsing Secondary
 
-	if ( $handle = fopen($lSecondaryFile, 'r') )
+	if ($handle = fopen($lSecondaryFile, 'r'))
 	{
 		print "Read Secondary File $lSecondaryFile:\n";
 		$cnt = 0;
@@ -135,41 +135,41 @@ 
 			$cnt++;
 
 			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
+			if (preg_match("/^\w*#/", $line)) {
 				continue;
 			}
 			// strip empty lines
-			if ( preg_match("/^\w*$/", $line) ) {
+			if (preg_match("/^\w*$/", $line)) {
 				continue;
 			}
 
 			$a = mb_split('=', trim($line), 2);
-			if ( count($a) != 2 ) {
-				print "ERROR in file $lSecondaryFile, line $cnt: " . trim($line) . "\n";
+			if (count($a) != 2) {
+				print "ERROR in file $lSecondaryFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
 			list($key, $value) = $a;
 
 			// key is redundant
-			if ( array_key_exists($key, $aSecondary) ) {
+			if (array_key_exists($key, $aSecondary)) {
 				print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n";
 				continue;
 			}
 
 			// String has no value
-			if ( $value == '' ) {
+			if ($value == '') {
 				print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n";
 				continue;
 			}
 
 			$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);
@@ -177,14 +177,14 @@ 
 	else {
 		$rc = 6;
 		$msg = "Cannot open file $lSecondaryFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
 
 	// Start reading and parsing English
 
-	if ( $handle = fopen($lEnglishFile, 'r') )
+	if ($handle = fopen($lEnglishFile, 'r'))
 	{
 		print "Read English File $lEnglishFile:\n";
 		$cnt = 0;
@@ -193,41 +193,41 @@ 
 			$cnt++;
 
 			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
+			if (preg_match("/^\w*#/", $line)) {
 				continue;
 			}
 			// strip empty lines
-			if ( preg_match("/^\w*$/", $line) ) {
+			if (preg_match("/^\w*$/", $line)) {
 				continue;
 			}
 
 			$a = mb_split('=', trim($line), 2);
-			if ( count($a) != 2 ) {
-				print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n";
+			if (count($a) != 2) {
+				print "ERROR in file $lEnglishFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
 			list($key, $value) = $a;
 
 			// key is redundant
-			if ( array_key_exists($key, $aEnglish) ) {
+			if (array_key_exists($key, $aEnglish)) {
 				print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n";
 				continue;
 			}
 
 			// String has no value
-			if ( $value == '' ) {
+			if ($value == '') {
 				print "Key $key has no value in file $lEnglishFile (line: $cnt).\n";
 				continue;
 			}
 
 			$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);
@@ -235,7 +235,7 @@ 
 	else {
 		$rc = 6;
 		$msg = "Cannot open file $lEnglishFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
@@ -243,12 +243,12 @@ 
 
 	// 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 ($handle = fopen($lPrimaryFile, 'r'))
 	{
-		if ( ! $oh = fopen($output, 'w') )
+		if (!$oh = fopen($output, 'w'))
 		{
 			print "ERROR in writing to file $output\n";
 			exit;
@@ -256,7 +256,7 @@ 
 
 		print "Read Primary File $lPrimaryFile and write ".$output.":\n";
 
-		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/','',$fileToProcess))."\n");
+		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/', '', $fileToProcess))."\n");
 
 		$cnt = 0;
 		while (($line = fgets($handle)) !== false)
@@ -264,24 +264,24 @@ 
 			$cnt++;
 
 			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
+			if (preg_match("/^\w*#/", $line)) {
 				continue;
 			}
 			// strip empty lines
-			if ( preg_match("/^\w*$/", $line) ) {
+			if (preg_match("/^\w*$/", $line)) {
 				continue;
 			}
 
 			$a = mb_split('=', trim($line), 2);
-			if ( count($a) != 2 ) {
-				print "ERROR in file $lPrimaryFile, line $cnt: " . trim($line) . "\n";
+			if (count($a) != 2) {
+				print "ERROR in file $lPrimaryFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
 			list($key, $value) = $a;
 
 			// key is redundant
-			if ( array_key_exists($key, $aPrimary) ) {
+			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";
 				continue;
 			}
@@ -292,7 +292,7 @@ 
 			}
 
 			// String has no value
-			if ( $value == '' ) {
+			if ($value == '') {
 				print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n";
 				continue;
 			}
@@ -306,11 +306,11 @@ 
 			//print "Found primary key = ".$key."\n";
 
 			// Key not in other file
-			if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key))
+			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";
 			}
-			else if ( ! array_key_exists($key, $aSecondary))
+			else if (!array_key_exists($key, $aSecondary))
 			{
 				//print "Key $key does NOT exist in secondary language (line: $cnt).\n";
 				continue;
@@ -318,19 +318,19 @@ 
 
 			// String exists in both files and value into alternative language differs from main language but also from english files
 			if (
-				(! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
-			    && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
-				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)
+				(!empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
+			    && !empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
+				|| 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);
@@ -339,7 +339,7 @@ 
 	else {
 		$rc = 8;
 		$msg = "Cannot open file $lPrimaryFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 

dolibarr/dev/translation/sanity_check_en_langfiles.php

Spacing +144 added lines, -144 removed lines

@@ -20,14 +20,14 @@ 
 
 $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;
 }
 
 
@@ -111,9 +111,9 @@ 
 	exit;
 }
 
-$dups=array();
-$exludefiles = array('.','..','README');
-$files = array_diff($files,$exludefiles);
+$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) !== '#') {
+			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;
 				}
 			}
 		}
@@ -147,7 +147,7 @@ 
 	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,52 +167,52 @@ 
     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>";
-	if ($web) $s.="<td align=\"center\">";
-	if ($web) $s.=$count;
-	if ($web) $s.="</td>";
-	if ($web) $s.="<td>";
-	$s.=$string;
-	if ($web) $s.="</td>";
-	if ($web) $s.="<td>";
-	if (! $web) $s.= ' : ';
+	if ($web) $s .= "<tr>";
+	if ($web) $s .= "<td align=\"center\">";
+	if ($web) $s .= $count;
+	if ($web) $s .= "</td>";
+	if ($web) $s .= "<td>";
+	$s .= $string;
+	if ($web) $s .= "</td>";
+	if ($web) $s .= "<td>";
+	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; }
-        if ($file == 'admin.lang' && ! $inmain) { $inadmin=1; }
+        if ($file == 'main.lang') { $inmain = 1; $inadmin = 0; }
+        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;
-            $listoffilesforthisentry[$file]=1;
+            if (!empty($listoffilesforthisentry[$file])) $duplicateinsamefile = 1;
+            $listoffilesforthisentry[$file] = 1;
 
-			$s.= "(".$line." - ".htmlentities($translatedvalue).") ";
+			$s .= "(".$line." - ".htmlentities($translatedvalue).") ";
 		}
-		if ($web) $s.="<br>";
+		if ($web) $s .= "<br>";
 	}
-	if ($web) $s.="</td></tr>";
-	$s.="\n";
+	if ($web) $s .= "</td></tr>";
+	$s .= "\n";
 
 	if ($duplicateinsamefile) $sduplicateinsamefile .= $s;
 	else if ($inmain) $sinmainandother .= $s;
@@ -220,25 +220,25 @@ 
 	else $sother .= $s;
 }
 
-if (! $web) print "\n***** Entries duplicated in same file\n";
+if (!$web) print "\n***** Entries duplicated in same file\n";
 print $sduplicateinsamefile;
-if (! $web && empty($sduplicateinsamefile)) print "None\n";
-if (! $web) print "\n";
+if (!$web && empty($sduplicateinsamefile)) print "None\n";
+if (!$web) print "\n";
 
-if (! $web) print "***** Entries in main and another (keep only entry in main)\n";
+if (!$web) print "***** Entries in main and another (keep only entry in main)\n";
 print $sinmainandother;
-if (! $web && empty($sinmainandother)) print "None\n";
-if (! $web) print "\n";
+if (!$web && empty($sinmainandother)) print "None\n";
+if (!$web) print "\n";
 
-if (! $web) print "***** Entries in admin and another\n";
+if (!$web) print "***** Entries in admin and another\n";
 print $sininstallandadmin;
-if (! $web && empty($sininstallandadmin)) print "None\n";
-if (! $web) print "\n";
+if (!$web && empty($sininstallandadmin)) print "None\n";
+if (!$web) print "\n";
 
-if (! $web) print "***** Other\n";
+if (!$web) print "***** Other\n";
 print $sother;
-if (! $web && empty($sother)) print "None\n";
-if (! $web) print "\n";
+if (!$web && empty($sother)) print "None\n";
+if (!$web) print "\n";
 
 if ($web)
 {
@@ -249,116 +249,116 @@ 
 
 // 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;
-	    if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Country/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Civility/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Currency/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Duration/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Month/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Short/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PL_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TE_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^newLT/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Language_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^Module\d+/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Delays_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Extrafield/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^LocalTax/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Country/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Civility/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Currency/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Duration/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^AmountLT/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^TotalLT/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Month/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^MonthShort/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Day\d/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Short/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^PL_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^TE_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^CalcMode/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^newLT/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^Language_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean = 0;
 	    // admin.lang
-	    if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean = 0;
 	    // boxes.lang
-	    if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean = 0;
 	    // install.lang
-	    if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean = 0;
 		// mail.lang
-	    if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean=0;
+	    if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean = 0;
 	    // main.lang
-	    if (preg_match('/^Duration/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^.b$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^Duration/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^FormatDate/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^DateFormat/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^.b$/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean = 0;
 		// modulebuilder
-		if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0;
+		if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean = 0;
 	    // orders
-	    if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^OrderSource/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean = 0;
         // other.lang
-	    if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/ById$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^Notify_/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/^EMailText/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/ById$/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/ByLogin$/', $value)) $qualifiedforclean = 0;
 	    // printing
-	    if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean = 0;
 	    // products
-	    if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/CardProduct/', $value)) $qualifiedforclean=0;
-
-	    if (preg_match('/sms/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/TF_/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0;
-
-	    if (! $qualifiedforclean)
+	    if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/OppStatus/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/CardProduct/', $value)) $qualifiedforclean = 0;
+
+	    if (preg_match('/sms/i', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/TF_/i', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean = 0;
+	    if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean = 0;
+
+	    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);
+		exec($string, $output);
 		if (empty($output)) {
    			$unused[$value] = $line;
-       		echo $line;        // $trad contains the \n
+       		echo $line; // $trad contains the \n
 		}
 		else
 		{
@@ -370,13 +370,13 @@ 
 	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));
+        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; ";
-        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";
+        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";
 	}
 }
 

dolibarr/dev/translation/autotranslator.class.php

Spacing +65 added lines, -65 removed lines

@@ -50,7 +50,7 @@ 
      * @param   string $_apikey         Api key
      * @return void
      */
-    function __construct($_destlang,$_refLang,$_langDir,$_limittofile,$_apikey)
+    function __construct($_destlang, $_refLang, $_langDir, $_limittofile, $_apikey)
     {
 
 		// Set enviorment variables
@@ -63,7 +63,7 @@ 
 
 		// Translate
 		//ini_set('default_charset','UTF-8');
-		ini_set('default_charset',$this->_outputpagecode);
+		ini_set('default_charset', $this->_outputpagecode);
 		$this->parseRefLangTranslationFiles();
 	}
 
@@ -77,72 +77,72 @@ 
 
 		$files = $this->getTranslationFilesArray($this->_refLang);
 		$counter = 1;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if ($this->_limittofile && $this->_limittofile != $file) continue;
 			$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);
-				foreach($arraytmp as $dirtmp)
+				$arraytmp = dol_dir_list($this->_langDir, 'directories', 0);
+				foreach ($arraytmp as $dirtmp)
 				{
-					if ($dirtmp['name'] === $this->_refLang) continue;	// We discard source language
-					$tmppart=explode('_',$dirtmp['name']);
-					if (preg_match('/^en/i',$dirtmp['name']))  continue;	// We discard en_* languages
-					if (preg_match('/^fr/i',$dirtmp['name']))  continue;	// We discard fr_* languages
-					if (preg_match('/^es/i',$dirtmp['name']))  continue;	// We discard es_* languages
-					if (preg_match('/ca_ES/i',$dirtmp['name']))  continue;	// We discard es_CA language
-					if (preg_match('/pt_BR/i',$dirtmp['name']))  continue;	// We discard pt_BR language
-                    if (preg_match('/nl_BE/i',$dirtmp['name']))  continue;  // We discard nl_BE language
-					if (preg_match('/^\./i',$dirtmp['name']))  continue;	// We discard files .*
-					if (preg_match('/^CVS/i',$dirtmp['name']))  continue;	// We discard CVS
-					$targetlangs[]=$dirtmp['name'];
+					if ($dirtmp['name'] === $this->_refLang) continue; // We discard source language
+					$tmppart = explode('_', $dirtmp['name']);
+					if (preg_match('/^en/i', $dirtmp['name']))  continue; // We discard en_* languages
+					if (preg_match('/^fr/i', $dirtmp['name']))  continue; // We discard fr_* languages
+					if (preg_match('/^es/i', $dirtmp['name']))  continue; // We discard es_* languages
+					if (preg_match('/ca_ES/i', $dirtmp['name']))  continue; // We discard es_CA language
+					if (preg_match('/pt_BR/i', $dirtmp['name']))  continue; // We discard pt_BR language
+                    if (preg_match('/nl_BE/i', $dirtmp['name']))  continue; // We discard nl_BE language
+					if (preg_match('/^\./i', $dirtmp['name']))  continue; // We discard files .*
+					if (preg_match('/^CVS/i', $dirtmp['name']))  continue; // We discard CVS
+					$targetlangs[] = $dirtmp['name'];
 				}
 				//var_dump($targetlangs);
 			}
 
 			// Process translation of source file for each target languages
-			foreach($targetlangs as $my_destlang)
+			foreach ($targetlangs as $my_destlang)
 			{
 				$this->_translatedFiles = array();
 
 				$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";
-					$this->createTranslationFile($destPath,$my_destlang);
+					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;
-				foreach($fileContent as $line){
+				$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";
+				$this->updateTranslationFile($destPath, $file, $my_destlang);
+				echo "New translated lines: ".$newlines."<br>\n";
 				//if ($counter ==3) die('fim');
 			}
 		}
@@ -156,19 +156,19 @@ 
 	 * @param 	string	$my_destlang		Target language code
 	 * @return	void
 	 */
-	private function updateTranslationFile($destPath,$file,$my_destlang)
+	private function updateTranslationFile($destPath, $file, $my_destlang)
 	{
 		$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");
+			foreach ($this->_translatedFiles[$file] as $line) {
+				fwrite($fp, $line."\n");
 			}
 			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
 			fclose($fp);
@@ -183,13 +183,13 @@ 
 	 * @param 	string	$my_destlang		Target language code
 	 * @return	void
 	 */
-	private function createTranslationFile($path,$my_destlang)
+	private function createTranslationFile($path, $my_destlang)
 	{
 		$fp = fopen($path, 'w+');
 		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;
@@ -205,36 +205,36 @@ 
 	 * @param	string	$my_destlang	Language code (ie: fr_FR)
 	 * @return	int						0=Nothing translated, 1=Record translated
 	 */
-	private function translateFileLine($content,$file,$key,$value,$my_destlang)
+	private function translateFileLine($content, $file, $key, $value, $my_destlang)
 	{
 
 		//print "key    =".$key."\n";
-		foreach( $content as $line ) {
+		foreach ($content as $line) {
 			$destKey = $this->getLineKey($line);
 			$destValue = $this->getLineValue($line);
 			// If translated return
 			//print "destKey=".$destKey."\n";
-			if ( trim($destKey) == trim($key) )
+			if (trim($destKey) == trim($key))
 			{	// Found already existing translation (key already exits in dest file)
 				return 0;
 			}
 		}
 
-		if ($key == 'CHARSET') $val=$this->_outputpagecode;
-		else if (preg_match('/^Format/',$key)) $val=$value;
-		else if ($value=='-') $val=$value;
+		if ($key == 'CHARSET') $val = $this->_outputpagecode;
+		else if (preg_match('/^Format/', $key)) $val = $value;
+		else if ($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));
-			else $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)));
+			if ($this->_outputpagecode == 'UTF-8') $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=trim($val);
+		$val = trim($val);
 
 		if (empty($val)) return 0;
 
-		$this->_translatedFiles[$file][] = $key . '=' . $val ;
+		$this->_translatedFiles[$file][] = $key.'='.$val;
 		return 1;
 	}
 
@@ -246,7 +246,7 @@ 
 	 */
 	private function getLineKey($line)
 	{
-		$arraykey = explode('=',$line,2);
+		$arraykey = explode('=', $line, 2);
 		return trim($arraykey[0]);
 	}
 
@@ -258,8 +258,8 @@ 
 	 */
 	private function getLineValue($line)
 	{
-		$arraykey = explode('=',$line,2);
-		return trim(isset($arraykey[1])?$arraykey[1]:'');
+		$arraykey = explode('=', $line, 2);
+		return trim(isset($arraykey[1]) ? $arraykey[1] : '');
 	}
 
 	/**
@@ -271,9 +271,9 @@ 
 	private function getTranslationFilesArray($lang)
 	{
 		$dir = new DirectoryIterator($this->_langDir.$lang);
-		while($dir->valid()) {
-			if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) {
-				$files[] =  $dir->getFilename();
+		while ($dir->valid()) {
+			if (!$dir->isDot() && $dir->isFile() && !preg_match('/^\./', $dir->getFilename())) {
+				$files[] = $dir->getFilename();
 			}
 			$dir->next();
 		}
@@ -291,16 +291,16 @@ 
 	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);
-		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang=$tmp[0];
-		$tmp=explode('_',$dest_lang);
-		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang=$tmp[0];
+		$tmp = explode('_', $src_lang);
+		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang = $tmp[0];
+		$tmp = explode('_', $dest_lang);
+		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) $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);
@@ -312,7 +312,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();
@@ -329,17 +329,17 @@ 
 		// now, process the JSON string
 		$json = json_decode($body, true);
 
-		if ((! empty($json['responseStatus']) && $json['responseStatus'] != 200)
+		if ((!empty($json['responseStatus']) && $json['responseStatus'] != 200)
 		|| count($json['data']['translations']) == 0)
 		{
 		    print "Error: ".$json['responseStatus']." ".$url."\n";
 			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";
 

dolibarr/dev/initdemo/sftpget_and_loaddump.php

Spacing +38 added lines, -38 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,25 +30,25 @@ 
 }
 
 // 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";
-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 && 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) die ("Failed to include master.inc.php file\n");
+$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("../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 "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res) die ("Failed to include master.inc.php file\n");
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
@@ -56,14 +56,14 @@ 
  *	Main
  */
 
-$login='';
-$server='';
-if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg))
+$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))
 {
@@ -74,25 +74,25 @@ 
 }
 
 
-$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")) {
-	dol_print_error('','ssh2_connect function does not exists'); exit(1);
+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);
+		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
 		exit(-5);
 	}
 	else
@@ -111,21 +111,21 @@ 
 		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;
-		if (preg_match('/\.bz2$/',$targetfile))
+		$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))
+		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) print $line."\n";
+		foreach ($output as $line) print $line."\n";
 
 		//ssh2_sftp_unlink($sftp, $fileinstalllock);
 		//print $output;

dolibarr/dev/initdemo/updatedemo.php

Spacing +28 added lines, -28 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,20 +30,20 @@ 
 }
 
 // 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";
-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 && 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) die ("Failed to include master.inc.php file\n");
+$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("../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 "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res) die ("Failed to include master.inc.php file\n");
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
@@ -59,10 +59,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=>'datef', 1=>'date_valid', 2=>'date_lim_reglement'),
@@ -72,44 +72,44 @@ 
     'supplier_proposal'=>array(0=>'datec', 1=>'date_valid', 2=>'date_cloture')
 );
 
-$year=2010;
-$currentyear=$tmp['year'];
+$year = 2010;
+$currentyear = $tmp['year'];
 while ($year <= $currentyear)
 {
     //$year=2021;
-    $delta=($currentyear - $year);
+    $delta = ($currentyear - $year);
     //$delta=-1;
 
     if ($delta)
     {
-        foreach($tables as $tablekey => $tableval)
+        foreach ($tables as $tablekey => $tableval)
         {
             print "\nCorrect ".$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;
-                        foreach($tableval as $field)
+                        $sql2 = "UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
+                        $j = 0;
+                        foreach ($tableval as $field)
                         {
-                            if ($j) $sql2.=", ";
-                            $sql2.= $field." = DATE_ADD(".$field.", INTERVAL ".$delta." YEAR)";
+                            if ($j) $sql2 .= ", ";
+                            $sql2 .= $field." = DATE_ADD(".$field.", INTERVAL ".$delta." YEAR)";
                             $j++;
                         }
-                        $sql2.=" WHERE rowid = ".$obj->rowid;
+                        $sql2 .= " WHERE rowid = ".$obj->rowid;
                         //print $sql2."\n";
                         $resql2 = $db->query($sql2);
-                        if (! $resql2) dol_print_error($db);
+                        if (!$resql2) dol_print_error($db);
                     }
                     $i++;
                 }

dolibarr/dev/initdata/generate-order.php

Spacing +66 added lines, -66 removed lines

@@ -33,7 +33,7 @@ 
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require __DIR__.'/../../htdocs/master.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -49,59 +49,59 @@ 
 
 define(GEN_NUMBER_COMMANDE, 10);
 $year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
-    mktime(12,0,0,1,9,$year),
-    mktime(12,0,0,2,13,$year),
-    mktime(12,0,0,2,23,$year),
-    mktime(12,0,0,3,30,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,5,9,$year),
-    mktime(12,0,0,5,1,$year),
-    mktime(12,0,0,5,13,$year),
-    mktime(12,0,0,5,19,$year),
-    mktime(12,0,0,5,23,$year),
-    mktime(12,0,0,6,3,$year),
-    mktime(12,0,0,6,19,$year),
-    mktime(12,0,0,6,24,$year),
-    mktime(12,0,0,7,3,$year),
-    mktime(12,0,0,7,9,$year),
-    mktime(12,0,0,7,23,$year),
-    mktime(12,0,0,7,30,$year),
-    mktime(12,0,0,8,9,$year),
-    mktime(12,0,0,9,23,$year),
-    mktime(12,0,0,10,3,$year),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,1,3,($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,12,12,$year),
-    mktime(12,0,0,12,13,$year),
+$dates = array(mktime(12, 0, 0, 1, 3, $year),
+    mktime(12, 0, 0, 1, 9, $year),
+    mktime(12, 0, 0, 2, 13, $year),
+    mktime(12, 0, 0, 2, 23, $year),
+    mktime(12, 0, 0, 3, 30, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 5, 9, $year),
+    mktime(12, 0, 0, 5, 1, $year),
+    mktime(12, 0, 0, 5, 13, $year),
+    mktime(12, 0, 0, 5, 19, $year),
+    mktime(12, 0, 0, 5, 23, $year),
+    mktime(12, 0, 0, 6, 3, $year),
+    mktime(12, 0, 0, 6, 19, $year),
+    mktime(12, 0, 0, 6, 24, $year),
+    mktime(12, 0, 0, 7, 3, $year),
+    mktime(12, 0, 0, 7, 9, $year),
+    mktime(12, 0, 0, 7, 23, $year),
+    mktime(12, 0, 0, 7, 30, $year),
+    mktime(12, 0, 0, 8, 9, $year),
+    mktime(12, 0, 0, 9, 23, $year),
+    mktime(12, 0, 0, 10, 3, $year),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 1, 3, ($year - 1)),
+    mktime(12, 0, 0, 1, 9, ($year - 1)),
+    mktime(12, 0, 0, 2, 13, ($year - 1)),
+    mktime(12, 0, 0, 2, 23, ($year - 1)),
+    mktime(12, 0, 0, 3, 30, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 5, 9, ($year - 1)),
+    mktime(12, 0, 0, 5, 1, ($year - 1)),
+    mktime(12, 0, 0, 5, 13, ($year - 1)),
+    mktime(12, 0, 0, 5, 19, ($year - 1)),
+    mktime(12, 0, 0, 5, 23, ($year - 1)),
+    mktime(12, 0, 0, 6, 3, ($year - 1)),
+    mktime(12, 0, 0, 6, 19, ($year - 1)),
+    mktime(12, 0, 0, 6, 24, ($year - 1)),
+    mktime(12, 0, 0, 7, 3, ($year - 1)),
+    mktime(12, 0, 0, 7, 9, ($year - 1)),
+    mktime(12, 0, 0, 7, 23, ($year - 1)),
+    mktime(12, 0, 0, 7, 30, ($year - 1)),
+    mktime(12, 0, 0, 8, 9, ($year - 1)),
+    mktime(12, 0, 0, 9, 23, ($year - 1)),
+    mktime(12, 0, 0, 10, 3, ($year - 1)),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 12, 12, $year),
+    mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('','admin');
+$ret = $user->fetch('', 'admin');
 if ($ret <= 0)
 {
     print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -111,7 +111,7 @@ 
 
 $societesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe where client in (1, 3)";
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
 	$num_thirdparties = $db->num_rows($resql);
 	$i = 0;
@@ -125,7 +125,7 @@ 
 
 $commandesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
@@ -157,14 +157,14 @@ 
 
 
 print "Build ".GEN_NUMBER_COMMANDE." orders\n";
-for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
+for ($s = 0; $s < GEN_NUMBER_COMMANDE; $s++)
 {
     print "Process order ".$s."\n";
 
     $object = new Commande($db);
 
     $object->socid          = $societesid[mt_rand(1, $num_thirdparties)];
-    $object->date_commande  = $dates[mt_rand(1, count($dates)-1)];
+    $object->date_commande  = $dates[mt_rand(1, count($dates) - 1)];
     $object->note           = 'My small comment about this order. Hum. Nothing.';
     $object->source         = 1;
     $object->fk_project     = 0;
@@ -174,15 +174,15 @@ 
     $object->more_reglement_id = mt_rand(0, 7);
     $object->availability_id = mt_rand(0, 1);
     
-    $listofuserid=array(12,13,16);
+    $listofuserid = array(12, 13, 16);
     
     $fuser = new User($db);
-    $fuser->fetch($listofuserid[mt_rand(0,2)]);
+    $fuser->fetch($listofuserid[mt_rand(0, 2)]);
     $fuser->getRights();
     
     $db->begin();
 
-    $result=$object->create($fuser);
+    $result = $object->create($fuser);
 	if ($result >= 0)
 	{
         $nbp = mt_rand(2, 5);
@@ -190,17 +190,17 @@ 
         while ($xnbp < $nbp)
         {
             $prodid = mt_rand(1, $num_prods);
-            $product=new Product($db);
-            $result=$product->fetch($prodids[$prodid]);
-            $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+            $product = new Product($db);
+            $result = $product->fetch($prodids[$prodid]);
+            $result = $object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, 0, 0, $product->price_base_type, $product->price_ttc, '', '', $product->type);
             if ($result <= 0)
             {
-                dol_print_error($db,$object->error);
+                dol_print_error($db, $object->error);
             }
             $xnbp++;
         }
 
-	    $result=$object->valid($fuser);
+	    $result = $object->valid($fuser);
 		if ($result > 0)
 		{
             $db->commit();
@@ -210,14 +210,14 @@ 
 		{
             print " KO\n";
 		    $db->rollback();
-		    dol_print_error($db,$object->error);
+		    dol_print_error($db, $object->error);
 		}
 	}
 	else
 	{
         print " KO\n";
 	    $db->rollback();
-	    dol_print_error($db,$object->error);
+	    dol_print_error($db, $object->error);
 	}
 }
 

dolibarr/dev/initdata/purge-data.php

Spacing +25 added lines, -25 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // 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')",
         'DELETE FROM '.MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin'",
@@ -150,37 +150,37 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $option = $argv[2];
 
-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) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
     print "\n";
-    print "option can be ".implode(',',array_keys($sqls))."\n";
+    print "option can be ".implode(',', array_keys($sqls))."\n";
     exit(-1);
 }
 
-if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
+if (empty($option) || !in_array($option, array_merge(array('all'), array_keys($sqls)))) {
     print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
     print "\n";
-    print "option can be ".implode(',',array_keys($sqls))."\n";
+    print "option can be ".implode(',', array_keys($sqls))."\n";
     exit(-1);
 }
 
 // Replace database handler
-if (! empty($argv[3]))
+if (!empty($argv[3]))
 {
 	$db->close();
 	unset($db);
-	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
-	$user=new User($db);
+	$db = getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
+	$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;
@@ -195,7 +195,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));
@@ -212,19 +212,19 @@ 
 {
     global $db, $sqls;
 
-    $error=0;
-    foreach($sqls[$family] as $sql)
+    $error = 0;
+    foreach ($sqls[$family] as $sql)
     {
-        if (preg_match('/^@/',$sql))
+        if (preg_match('/^@/', $sql))
         {
-            $newfamily=preg_replace('/@/','',$sql);
+            $newfamily = preg_replace('/@/', '', $sql);
             processfamily($newfamily);
             continue;
         }
 
         print "Run sql: ".$sql."\n";
-        $resql=$db->query($sql);
-        if (! $resql)
+        $resql = $db->query($sql);
+        if (!$resql)
         {
             if ($db->errno() != 'DB_ERROR_NOSUCHTABLE')
             {
@@ -247,15 +247,15 @@ 
 
 $db->begin();
 
-$oldfamily='';
-foreach($sqls as $family => $familysql)
+$oldfamily = '';
+foreach ($sqls as $family => $familysql)
 {
     if ($option && $option != 'all' && $option != $family) continue;
 
     if ($family != $oldfamily) print "Process action for family ".$family."\n";
     $oldfamily = $family;
 
-    $result=processfamily($family);
+    $result = processfamily($family);
     if ($result < 0)
     {
         $error++;

dolibarr/dev/initdata/generate-invoice.php

Spacing +66 added lines, -66 removed lines

@@ -32,7 +32,7 @@ 
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require __DIR__.'/../../htdocs/master.inc.php';
 require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
 require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
@@ -43,60 +43,60 @@ 
 
 define(GEN_NUMBER_FACTURE, 1);
 $year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
-    mktime(12,0,0,1,9,$year),
-    mktime(12,0,0,2,13,$year),
-    mktime(12,0,0,2,23,$year),
-    mktime(12,0,0,3,30,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,5,9,$year),
-    mktime(12,0,0,5,1,$year),
-    mktime(12,0,0,5,13,$year),
-    mktime(12,0,0,5,19,$year),
-    mktime(12,0,0,5,23,$year),
-    mktime(12,0,0,6,3,$year),
-    mktime(12,0,0,6,19,$year),
-    mktime(12,0,0,6,24,$year),
-    mktime(12,0,0,7,3,$year),
-    mktime(12,0,0,7,9,$year),
-    mktime(12,0,0,7,23,$year),
-    mktime(12,0,0,7,30,$year),
-    mktime(12,0,0,8,9,$year),
-    mktime(12,0,0,9,23,$year),
-    mktime(12,0,0,10,3,$year),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,1,3,($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,12,12,$year),
-    mktime(12,0,0,12,13,$year),
+$dates = array(mktime(12, 0, 0, 1, 3, $year),
+    mktime(12, 0, 0, 1, 9, $year),
+    mktime(12, 0, 0, 2, 13, $year),
+    mktime(12, 0, 0, 2, 23, $year),
+    mktime(12, 0, 0, 3, 30, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 5, 9, $year),
+    mktime(12, 0, 0, 5, 1, $year),
+    mktime(12, 0, 0, 5, 13, $year),
+    mktime(12, 0, 0, 5, 19, $year),
+    mktime(12, 0, 0, 5, 23, $year),
+    mktime(12, 0, 0, 6, 3, $year),
+    mktime(12, 0, 0, 6, 19, $year),
+    mktime(12, 0, 0, 6, 24, $year),
+    mktime(12, 0, 0, 7, 3, $year),
+    mktime(12, 0, 0, 7, 9, $year),
+    mktime(12, 0, 0, 7, 23, $year),
+    mktime(12, 0, 0, 7, 30, $year),
+    mktime(12, 0, 0, 8, 9, $year),
+    mktime(12, 0, 0, 9, 23, $year),
+    mktime(12, 0, 0, 10, 3, $year),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 1, 3, ($year - 1)),
+    mktime(12, 0, 0, 1, 9, ($year - 1)),
+    mktime(12, 0, 0, 2, 13, ($year - 1)),
+    mktime(12, 0, 0, 2, 23, ($year - 1)),
+    mktime(12, 0, 0, 3, 30, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 5, 9, ($year - 1)),
+    mktime(12, 0, 0, 5, 1, ($year - 1)),
+    mktime(12, 0, 0, 5, 13, ($year - 1)),
+    mktime(12, 0, 0, 5, 19, ($year - 1)),
+    mktime(12, 0, 0, 5, 23, ($year - 1)),
+    mktime(12, 0, 0, 6, 3, ($year - 1)),
+    mktime(12, 0, 0, 6, 19, ($year - 1)),
+    mktime(12, 0, 0, 6, 24, ($year - 1)),
+    mktime(12, 0, 0, 7, 3, ($year - 1)),
+    mktime(12, 0, 0, 7, 9, ($year - 1)),
+    mktime(12, 0, 0, 7, 23, ($year - 1)),
+    mktime(12, 0, 0, 7, 30, ($year - 1)),
+    mktime(12, 0, 0, 8, 9, ($year - 1)),
+    mktime(12, 0, 0, 9, 23, ($year - 1)),
+    mktime(12, 0, 0, 10, 3, ($year - 1)),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 12, 12, $year),
+    mktime(12, 0, 0, 12, 13, $year),
 );
 
-$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;
@@ -134,8 +134,8 @@ 
 	}
 }
 
-$i=0;
-$result=0;
+$i = 0;
+$result = 0;
 while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 {
 	$i++;
@@ -145,15 +145,15 @@ 
 
 	$object = new Facture($db);
 	$object->socid = $socids[$socid];
-	$object->date = $dates[mt_rand(1, count($dates)-1)];
+	$object->date = $dates[mt_rand(1, count($dates) - 1)];
 	$object->cond_reglement_id = 3;
 	$object->mode_reglement_id = 3;
 
     $fuser = new User($db);
-    $fuser->fetch(mt_rand(1,2));
+    $fuser->fetch(mt_rand(1, 2));
     $fuser->getRights();
     
-	$result=$object->create($fuser);
+	$result = $object->create($fuser);
 	if ($result >= 0)
 	{
 		$nbp = mt_rand(2, 5);
@@ -161,28 +161,28 @@ 
 		while ($xnbp < $nbp)
 		{
 			$prodid = mt_rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+			$product = new Product($db);
+			$result = $product->fetch($prodids[$prodid]);
+			$result = $object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
 		    if ($result < 0)
             {
-                dol_print_error($db,$propal->error);
+                dol_print_error($db, $propal->error);
             }
             $xnbp++;
 		}
 
-	    $result=$object->validate($fuser);
+	    $result = $object->validate($fuser);
 		if ($result)
 		{
-			print " OK with ref ".$object->ref."\n";;
+			print " OK with ref ".$object->ref."\n"; ;
 		}
 		else
 		{
-			dol_print_error($db,$object->error);
+			dol_print_error($db, $object->error);
 		}
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }