alxarafe / alixar

dolibarr/dev/examples/code/create_invoice.php

Indentation +14 added lines, -14 removed lines

@@ -83,19 +83,19 @@ 
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {
-	// Change status to validated
-	$result=$obj->validate($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
-		$error++;
-		dol_print_error($db,$obj->error);
-	}
+    // Change status to validated
+    $result=$obj->validate($user);
+    if ($result > 0) print "OK Object created with id ".$idobject."\n";
+    else
+    {
+        $error++;
+        dol_print_error($db,$obj->error);
+    }
 }
 else
 {
-	$error++;
-	dol_print_error($db,$obj->error);
+    $error++;
+    dol_print_error($db,$obj->error);
 }
 
 
@@ -103,13 +103,13 @@ 
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Braces +5 added lines, -6 removed lines

@@ -85,14 +85,14 @@ 
 {
 	// Change status to validated
 	$result=$obj->validate($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
+	if ($result > 0) {
+	    print "OK Object created with id ".$idobject."\n";
+	} else
 	{
 		$error++;
 		dol_print_error($db,$obj->error);
 	}
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$obj->error);
@@ -105,8 +105,7 @@ 
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

dolibarr/dev/examples/code/create_user.php

Indentation +15 added lines, -15 removed lines

@@ -71,23 +71,23 @@ 
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {
-	// Change status to validated
-	$result=$obj->setStatut(1);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
-		$error++;
-		dol_print_error($db,$obj->error);
-	}
+    // Change status to validated
+    $result=$obj->setStatut(1);
+    if ($result > 0) print "OK Object created with id ".$idobject."\n";
+    else
+    {
+        $error++;
+        dol_print_error($db,$obj->error);
+    }
 }
 else if ($obj->error == 'ErrorLoginAlreadyExists')
 {
-     print "User with login ".$obj->login." already exists\n";
+        print "User with login ".$obj->login." already exists\n";
 }
 else
 {
-	$error++;
-	dol_print_error($db,$obj->error);
+    $error++;
+    dol_print_error($db,$obj->error);
 }
 
 
@@ -95,13 +95,13 @@ 
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Braces +6 added lines, -8 removed lines

@@ -73,18 +73,17 @@ 
 {
 	// Change status to validated
 	$result=$obj->setStatut(1);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
+	if ($result > 0) {
+	    print "OK Object created with id ".$idobject."\n";
+	} else
 	{
 		$error++;
 		dol_print_error($db,$obj->error);
 	}
-}
-else if ($obj->error == 'ErrorLoginAlreadyExists')
+} else if ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$obj->error);
@@ -97,8 +96,7 @@ 
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

dolibarr/dev/examples/code/create_order.php

Indentation +14 added lines, -14 removed lines

@@ -81,19 +81,19 @@ 
 $idobject=$com->create($user);
 if ($idobject > 0)
 {
-	// Change status to validated
-	$result=$com->valid($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
-		$error++;
-		dol_print_error($db,$com->error);
-	}
+    // Change status to validated
+    $result=$com->valid($user);
+    if ($result > 0) print "OK Object created with id ".$idobject."\n";
+    else
+    {
+        $error++;
+        dol_print_error($db,$com->error);
+    }
 }
 else
 {
-	$error++;
-	dol_print_error($db,$com->error);
+    $error++;
+    dol_print_error($db,$com->error);
 }
 
 
@@ -101,13 +101,13 @@ 
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Braces +5 added lines, -6 removed lines

@@ -83,14 +83,14 @@ 
 {
 	// Change status to validated
 	$result=$com->valid($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
+	if ($result > 0) {
+	    print "OK Object created with id ".$idobject."\n";
+	} else
 	{
 		$error++;
 		dol_print_error($db,$com->error);
 	}
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$com->error);
@@ -103,8 +103,7 @@ 
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

dolibarr/dev/examples/code/create_product.php

Indentation +7 added lines, -7 removed lines

@@ -81,25 +81,25 @@
 $idobject = $myproduct->create($user);
 if ($idobject > 0)
 {
-	print "OK Object created with id ".$idobject."\n";
+    print "OK Object created with id ".$idobject."\n";
 }
 else
 {
-	$error++;
-	dol_print_error($db,$myproduct->error);
+    $error++;
+    dol_print_error($db,$myproduct->error);
 }
 
 // -------------------- END OF YOUR CODE --------------------
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Braces +2 added lines, -4 removed lines

@@ -82,8 +82,7 @@ 
 if ($idobject > 0)
 {
 	print "OK Object created with id ".$idobject."\n";
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$myproduct->error);
@@ -95,8 +94,7 @@ 
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

dolibarr/dev/translation/autotranslator.php

Indentation +12 added lines, -12 removed lines

@@ -69,23 +69,23 @@
 $file='';
 if (isset($argv[4]))
 {
-	$file=$argv[4];
-	print 'Argument 4='.$argv[4]."\n";
+    $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]))
-	{
-		print 'Create directory '.$dir.'/'.$argv[2]."\n";
-		$result=mkdir($dir.'/'.$argv[2]);
-		if (! $result)
-		{
-			$db->close();
-			return -1;
-		}
-	}
+    if (! is_dir($dir.'/'.$argv[2]))
+    {
+        print 'Create directory '.$dir.'/'.$argv[2]."\n";
+        $result=mkdir($dir.'/'.$argv[2]);
+        if (! $result)
+        {
+            $db->close();
+            return -1;
+        }
+    }
 }
 
 require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";

dolibarr/dev/translation/strip_language_file.php

Indentation +266 added lines, -266 removed lines

@@ -50,8 +50,8 @@ 
 
 // Test if batch mode
 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;
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
 }
 
 $rc = 0;
@@ -65,11 +65,11 @@ 
 
 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";
-	exit($rc);
+    $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";
+    exit($rc);
 }
 
 $aPrimary = array();
@@ -79,14 +79,14 @@ 
 // Define array $filesToProcess
 if ($filesToProcess == 'all')
 {
-	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
-	while($dir->valid()) {
-		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) {
-			$files[] =  $dir->getFilename();
-		}
-		$dir->next();
-	}
-	$filesToProcess=$files;
+    $dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
+    while($dir->valid()) {
+        if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) {
+            $files[] =  $dir->getFilename();
+        }
+        $dir->next();
+    }
+    $filesToProcess=$files;
 }
 else $filesToProcess=explode(',',$filesToProcess);
 
@@ -96,257 +96,257 @@ 
 // Loop on each file
 foreach($filesToProcess as $fileToProcess)
 {
-	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
-	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
-	$lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess;
-	$output = $lSecondaryFile . '.delta';
-
-	print "---- Process language file ".$lSecondaryFile."\n";
-
-	if ( ! is_readable($lPrimaryFile) ) {
-		$rc = 2;
-		$msg = "Cannot read primary language file $lPrimaryFile.";
-		print $msg . " (rc=$rc).\n";
-		exit($rc);
-	}
-
-	if ( ! is_readable($lSecondaryFile) ) {
-		$rc = 3;
-		$msg = "Cannot read secondary language file $lSecondaryFile. We discard this file.";
-		print $msg . "\n";
-		continue;
-	}
-
-	if ( ! is_readable($lEnglishFile) ) {
-		$rc = 3;
-		$msg = "Cannot read english language file $lEnglishFile. We discard this file.";
-		print $msg . "\n";
-		continue;
-	}
-
-	// Start reading and parsing Secondary
-
-	if ( $handle = fopen($lSecondaryFile, 'r') )
-	{
-		print "Read Secondary File $lSecondaryFile:\n";
-		$cnt = 0;
-		while (($line = fgets($handle)) !== false)
-		{
-			$cnt++;
-
-			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
-				continue;
-			}
-			// strip empty lines
-			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";
-				continue;
-			}
-
-			list($key, $value) = $a;
-
-			// key is redundant
-			if ( array_key_exists($key, $aSecondary) ) {
-				print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n";
-				continue;
-			}
-
-			// String has no value
-			if ( $value == '' ) {
-				print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n";
-				continue;
-			}
-
-			$aSecondary[$key] = trim($value);
-		}
-		if ( ! feof($handle) )
-		{
-			$rc = 5;
-			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
-			exit($rc);
-		}
-		fclose($handle);
-	}
-	else {
-		$rc = 6;
-		$msg = "Cannot open file $lSecondaryFile";
-		print $msg . " (rc=$rc).\n";
-		exit($rc);
-	}
-
-
-	// Start reading and parsing English
-
-	if ( $handle = fopen($lEnglishFile, 'r') )
-	{
-		print "Read English File $lEnglishFile:\n";
-		$cnt = 0;
-		while (($line = fgets($handle)) !== false)
-		{
-			$cnt++;
-
-			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
-				continue;
-			}
-			// strip empty lines
-			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";
-				continue;
-			}
-
-			list($key, $value) = $a;
-
-			// key is redundant
-			if ( array_key_exists($key, $aEnglish) ) {
-				print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n";
-				continue;
-			}
-
-			// String has no value
-			if ( $value == '' ) {
-				print "Key $key has no value in file $lEnglishFile (line: $cnt).\n";
-				continue;
-			}
-
-			$aEnglish[$key] = trim($value);
-		}
-		if ( ! feof($handle) )
-		{
-			$rc = 5;
-			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
-			exit($rc);
-		}
-		fclose($handle);
-	}
-	else {
-		$rc = 6;
-		$msg = "Cannot open file $lEnglishFile";
-		print $msg . " (rc=$rc).\n";
-		exit($rc);
-	}
-
-
-
-	// Start reading and parsing Primary. See rules in header!
-
-	$arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand');
-
-
-	if ( $handle = fopen($lPrimaryFile, 'r') )
-	{
-		if ( ! $oh = fopen($output, 'w') )
-		{
-			print "ERROR in writing to file $output\n";
-			exit;
-		}
-
-		print "Read Primary File $lPrimaryFile and write ".$output.":\n";
-
-		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/','',$fileToProcess))."\n");
-
-		$cnt = 0;
-		while (($line = fgets($handle)) !== false)
-		{
-			$cnt++;
-
-			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
-				continue;
-			}
-			// strip empty lines
-			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";
-				continue;
-			}
-
-			list($key, $value) = $a;
-
-			// key is redundant
-			if ( array_key_exists($key, $aPrimary) ) {
-				print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
-				continue;
-			}
-			else
-			{
-				$fileFirstFound[$key] = $fileToProcess;
-				$lineFirstFound[$key] = $cnt;
-			}
-
-			// String has no value
-			if ( $value == '' ) {
-				print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n";
-				continue;
-			}
-
-			$aPrimary[$key] = trim($value);
-			$fileFirstFound[$key] = $fileToProcess;
-			$lineFirstFound[$key] = $cnt;
-
-			// ----- Process output now -----
-
-			//print "Found primary key = ".$key."\n";
-
-			// 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";
-			}
-			else if ( ! array_key_exists($key, $aSecondary))
-			{
-				//print "Key $key does NOT exist in secondary language (line: $cnt).\n";
-				continue;
-			}
-
-			// 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)
-				)
-			{
-				//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");
-			}
-		}
-		if ( ! feof($handle) ) {
-			$rc = 7;
-			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
-			exit($rc);
-		}
-		fclose($oh);
-		fclose($handle);
-	}
-	else {
-		$rc = 8;
-		$msg = "Cannot open file $lPrimaryFile";
-		print $msg . " (rc=$rc).\n";
-		exit($rc);
-	}
-
-	print "Output can be found at $output.\n";
-
-	print "To rename all .delta files, you can do:\n";
-	print '> for fic in `ls htdocs/langs/'.$lSecondary.'/*.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
+    $lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
+    $lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
+    $lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess;
+    $output = $lSecondaryFile . '.delta';
+
+    print "---- Process language file ".$lSecondaryFile."\n";
+
+    if ( ! is_readable($lPrimaryFile) ) {
+        $rc = 2;
+        $msg = "Cannot read primary language file $lPrimaryFile.";
+        print $msg . " (rc=$rc).\n";
+        exit($rc);
+    }
+
+    if ( ! is_readable($lSecondaryFile) ) {
+        $rc = 3;
+        $msg = "Cannot read secondary language file $lSecondaryFile. We discard this file.";
+        print $msg . "\n";
+        continue;
+    }
+
+    if ( ! is_readable($lEnglishFile) ) {
+        $rc = 3;
+        $msg = "Cannot read english language file $lEnglishFile. We discard this file.";
+        print $msg . "\n";
+        continue;
+    }
+
+    // Start reading and parsing Secondary
+
+    if ( $handle = fopen($lSecondaryFile, 'r') )
+    {
+        print "Read Secondary File $lSecondaryFile:\n";
+        $cnt = 0;
+        while (($line = fgets($handle)) !== false)
+        {
+            $cnt++;
+
+            // strip comments
+            if ( preg_match("/^\w*#/", $line) ) {
+                continue;
+            }
+            // strip empty lines
+            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";
+                continue;
+            }
+
+            list($key, $value) = $a;
+
+            // key is redundant
+            if ( array_key_exists($key, $aSecondary) ) {
+                print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n";
+                continue;
+            }
+
+            // String has no value
+            if ( $value == '' ) {
+                print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n";
+                continue;
+            }
+
+            $aSecondary[$key] = trim($value);
+        }
+        if ( ! feof($handle) )
+        {
+            $rc = 5;
+            $msg = "Unexpected fgets() fail";
+            print $msg . " (rc=$rc).\n";
+            exit($rc);
+        }
+        fclose($handle);
+    }
+    else {
+        $rc = 6;
+        $msg = "Cannot open file $lSecondaryFile";
+        print $msg . " (rc=$rc).\n";
+        exit($rc);
+    }
+
+
+    // Start reading and parsing English
+
+    if ( $handle = fopen($lEnglishFile, 'r') )
+    {
+        print "Read English File $lEnglishFile:\n";
+        $cnt = 0;
+        while (($line = fgets($handle)) !== false)
+        {
+            $cnt++;
+
+            // strip comments
+            if ( preg_match("/^\w*#/", $line) ) {
+                continue;
+            }
+            // strip empty lines
+            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";
+                continue;
+            }
+
+            list($key, $value) = $a;
+
+            // key is redundant
+            if ( array_key_exists($key, $aEnglish) ) {
+                print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n";
+                continue;
+            }
+
+            // String has no value
+            if ( $value == '' ) {
+                print "Key $key has no value in file $lEnglishFile (line: $cnt).\n";
+                continue;
+            }
+
+            $aEnglish[$key] = trim($value);
+        }
+        if ( ! feof($handle) )
+        {
+            $rc = 5;
+            $msg = "Unexpected fgets() fail";
+            print $msg . " (rc=$rc).\n";
+            exit($rc);
+        }
+        fclose($handle);
+    }
+    else {
+        $rc = 6;
+        $msg = "Cannot open file $lEnglishFile";
+        print $msg . " (rc=$rc).\n";
+        exit($rc);
+    }
+
+
+
+    // Start reading and parsing Primary. See rules in header!
+
+    $arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand');
+
+
+    if ( $handle = fopen($lPrimaryFile, 'r') )
+    {
+        if ( ! $oh = fopen($output, 'w') )
+        {
+            print "ERROR in writing to file $output\n";
+            exit;
+        }
+
+        print "Read Primary File $lPrimaryFile and write ".$output.":\n";
+
+        fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/','',$fileToProcess))."\n");
+
+        $cnt = 0;
+        while (($line = fgets($handle)) !== false)
+        {
+            $cnt++;
+
+            // strip comments
+            if ( preg_match("/^\w*#/", $line) ) {
+                continue;
+            }
+            // strip empty lines
+            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";
+                continue;
+            }
+
+            list($key, $value) = $a;
+
+            // key is redundant
+            if ( array_key_exists($key, $aPrimary) ) {
+                print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
+                continue;
+            }
+            else
+            {
+                $fileFirstFound[$key] = $fileToProcess;
+                $lineFirstFound[$key] = $cnt;
+            }
+
+            // String has no value
+            if ( $value == '' ) {
+                print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n";
+                continue;
+            }
+
+            $aPrimary[$key] = trim($value);
+            $fileFirstFound[$key] = $fileToProcess;
+            $lineFirstFound[$key] = $cnt;
+
+            // ----- Process output now -----
+
+            //print "Found primary key = ".$key."\n";
+
+            // 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";
+            }
+            else if ( ! array_key_exists($key, $aSecondary))
+            {
+                //print "Key $key does NOT exist in secondary language (line: $cnt).\n";
+                continue;
+            }
+
+            // 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)
+                )
+            {
+                //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");
+            }
+        }
+        if ( ! feof($handle) ) {
+            $rc = 7;
+            $msg = "Unexpected fgets() fail";
+            print $msg . " (rc=$rc).\n";
+            exit($rc);
+        }
+        fclose($oh);
+        fclose($handle);
+    }
+    else {
+        $rc = 8;
+        $msg = "Cannot open file $lPrimaryFile";
+        print $msg . " (rc=$rc).\n";
+        exit($rc);
+    }
+
+    print "Output can be found at $output.\n";
+
+    print "To rename all .delta files, you can do:\n";
+    print '> for fic in `ls htdocs/langs/'.$lSecondary.'/*.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }
 
 

Braces +7 added lines, -11 removed lines

@@ -87,8 +87,9 @@ 
 		$dir->next();
 	}
 	$filesToProcess=$files;
+} else {
+    $filesToProcess=explode(',',$filesToProcess);
 }
-else $filesToProcess=explode(',',$filesToProcess);
 
 // Arguments should be OK here.
 
@@ -173,8 +174,7 @@ 
 			exit($rc);
 		}
 		fclose($handle);
-	}
-	else {
+	} else {
 		$rc = 6;
 		$msg = "Cannot open file $lSecondaryFile";
 		print $msg . " (rc=$rc).\n";
@@ -231,8 +231,7 @@ 
 			exit($rc);
 		}
 		fclose($handle);
-	}
-	else {
+	} else {
 		$rc = 6;
 		$msg = "Cannot open file $lEnglishFile";
 		print $msg . " (rc=$rc).\n";
@@ -284,8 +283,7 @@ 
 			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;
-			}
-			else
+			} else
 			{
 				$fileFirstFound[$key] = $fileToProcess;
 				$lineFirstFound[$key] = $cnt;
@@ -309,8 +307,7 @@ 
 			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;
@@ -335,8 +332,7 @@ 
 		}
 		fclose($oh);
 		fclose($handle);
-	}
-	else {
+	} else {
 		$rc = 8;
 		$msg = "Cannot open file $lPrimaryFile";
 		print $msg . " (rc=$rc).\n";

dolibarr/dev/translation/sanity_check_en_langfiles.php

Indentation +179 added lines, -179 removed lines

@@ -107,8 +107,8 @@ 
 $files = scandir($workdir);
 if (empty($files))
 {
-	echo "Can't scan workdir = ".$workdir;
-	exit;
+    echo "Can't scan workdir = ".$workdir;
+    exit;
 }
 
 $dups=array();
@@ -122,38 +122,38 @@ 
 $langstrings_3d = array();
 $langstrings_full = array();
 foreach ($files AS $file) {
-	$path_file = pathinfo($file);
-	// we're only interested in .lang files
-	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;
-				}
-			}
-		}
-	}
+    $path_file = pathinfo($file);
+    // we're only interested in .lang files
+    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;
+                }
+            }
+        }
+    }
 }
 
 foreach ($langstrings_3d AS $filename => $file)
 {
-	foreach ($file AS $linenum => $value)
-	{
-		$keys = array_keys($langstrings_full, $value);
-		if (count($keys)>1)
-		{
-				foreach ($keys AS $key) {
-					$dups[$value][$filename][$linenum] = trim($langstrings_3dtrans[$filename][$linenum]);
-				}
-		}
-	}
+    foreach ($file AS $linenum => $value)
+    {
+        $keys = array_keys($langstrings_full, $value);
+        if (count($keys)>1)
+        {
+                foreach ($keys AS $key) {
+                    $dups[$value][$filename][$linenum] = trim($langstrings_3dtrans[$filename][$linenum]);
+                }
+        }
+    }
 }
 
 if ($web) print "<h2>";
@@ -175,49 +175,49 @@ 
 $count = 0;
 foreach ($dups as $string => $pages)
 {
-	$count++;
-	$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.= ' : ';
-
-	// Loop on each files keyword was found
+    $count++;
+    $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.= ' : ';
+
+    // Loop on each files keyword was found
     $duplicateinsamefile=0;
-	$inmain=0;
+    $inmain=0;
     $inadmin=0;
-	foreach ($pages AS $file => $lines)
-	{
+    foreach ($pages AS $file => $lines)
+    {
         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();
-	    foreach ($lines as $line => $translatedvalue)
-		{
+        // Loop on each line keword was found into file.
+        $listoffilesforthisentry=array();
+        foreach ($lines as $line => $translatedvalue)
+        {
             if (! empty($listoffilesforthisentry[$file])) $duplicateinsamefile=1;
             $listoffilesforthisentry[$file]=1;
 
-			$s.= "(".$line." - ".htmlentities($translatedvalue).") ";
-		}
-		if ($web) $s.="<br>";
-	}
-	if ($web) $s.="</td></tr>";
-	$s.="\n";
-
-	if ($duplicateinsamefile) $sduplicateinsamefile .= $s;
-	else if ($inmain) $sinmainandother .= $s;
-	else if ($inadmin) $sininstallandadmin .= $s;
-	else $sother .= $s;
+            $s.= "(".$line." - ".htmlentities($translatedvalue).") ";
+        }
+        if ($web) $s.="<br>";
+    }
+    if ($web) $s.="</td></tr>";
+    $s.="\n";
+
+    if ($duplicateinsamefile) $sduplicateinsamefile .= $s;
+    else if ($inmain) $sinmainandother .= $s;
+    else if ($inadmin) $sininstallandadmin .= $s;
+    else $sother .= $s;
 }
 
 if (! $web) print "\n***** Entries duplicated in same file\n";
@@ -254,122 +254,122 @@ 
     print "***** Strings in en_US that are never used:\n";
 
     $unused=array();
-	foreach ($langstrings_dist AS $value => $line)
-	{
-    	$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;
-	    // admin.lang
-	    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;
-	    // install.lang
-	    if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0;
-		// mail.lang
-	    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;
-		// modulebuilder
-		if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0;
-	    // orders
-	    if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0;
+    foreach ($langstrings_dist AS $value => $line)
+    {
+        $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;
+        // admin.lang
+        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;
+        // install.lang
+        if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0;
+        // mail.lang
+        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;
+        // modulebuilder
+        if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0;
+        // orders
+        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;
-	    // printing
-	    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('/^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;
+        // 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)
+        {
             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.'*';
-		//print $string."<br>\n";
-		exec($string,$output);
-		if (empty($output)) {
-   			$unused[$value] = $line;
-       		echo $line;        // $trad contains the \n
-		}
-		else
-		{
-		    unset($output);
-		    //print 'X'.$output.'Y';
-		}
-	}
-
-	if (empty($unused)) print "No string not used found.\n";
-	else
-	{
+        }
+
+        //$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.'*';
+        //print $string."<br>\n";
+        exec($string,$output);
+        if (empty($output)) {
+                $unused[$value] = $line;
+                echo $line;        // $trad contains the \n
+        }
+        else
+        {
+            unset($output);
+            //print 'X'.$output.'Y';
+        }
+    }
+
+    if (empty($unused)) print "No string not used found.\n";
+    else
+    {
         $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));
@@ -377,7 +377,7 @@ 
         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";
-	}
+    }
 }
 
 echo "\n";

Braces +329 added lines, -114 removed lines

@@ -87,9 +87,13 @@ 
 }
 
 echo "If you call this with argument \"unused=true\" it searches for the translation strings that exist in en_US but are never used.\n";
-if ($web) print "<br>";
+if ($web) {
+    print "<br>";
+}
 echo "IMPORTANT: that can take quite a lot of time (up to 10 minutes), you need to tune the max_execution_time on your php.ini accordingly.\n";
-if ($web) print "<br>";
+if ($web) {
+    print "<br>";
+}
 
 
 
@@ -156,9 +160,13 @@ 
 	}
 }
 
-if ($web) print "<h2>";
+if ($web) {
+    print "<h2>";
+}
 print "Duplicate strings in lang files in $workdir - ".count($dups)." found\n";
-if ($web) print "</h2>";
+if ($web) {
+    print "</h2>";
+}
 
 if ($web)
 {
@@ -179,15 +187,31 @@ 
 	$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>";
+	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.="</td>";
+	}
+	if ($web) {
+	    $s.="<td>";
+	}
+	if (! $web) {
+	    $s.= ' : ';
+	}
 
 	// Loop on each files keyword was found
     $duplicateinsamefile=0;
@@ -204,41 +228,76 @@ 
 	    $listoffilesforthisentry=array();
 	    foreach ($lines as $line => $translatedvalue)
 		{
-            if (! empty($listoffilesforthisentry[$file])) $duplicateinsamefile=1;
+            if (! empty($listoffilesforthisentry[$file])) {
+                $duplicateinsamefile=1;
+            }
             $listoffilesforthisentry[$file]=1;
 
 			$s.= "(".$line." - ".htmlentities($translatedvalue).") ";
 		}
-		if ($web) $s.="<br>";
+		if ($web) {
+		    $s.="<br>";
+		}
+	}
+	if ($web) {
+	    $s.="</td></tr>";
 	}
-	if ($web) $s.="</td></tr>";
 	$s.="\n";
 
-	if ($duplicateinsamefile) $sduplicateinsamefile .= $s;
-	else if ($inmain) $sinmainandother .= $s;
-	else if ($inadmin) $sininstallandadmin .= $s;
-	else $sother .= $s;
-}
+	if ($duplicateinsamefile) {
+	    $sduplicateinsamefile .= $s;
+	} else if ($inmain) {
+	    $sinmainandother .= $s;
+	} else if ($inadmin) {
+	    $sininstallandadmin .= $s;
+	} 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)
 {
@@ -258,93 +317,245 @@ 
 	{
     	$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('/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 (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)
 	    {
@@ -359,24 +570,28 @@ 
 		if (empty($output)) {
    			$unused[$value] = $line;
        		echo $line;        // $trad contains the \n
-		}
-		else
+		} else
 		{
 		    unset($output);
 		    //print 'X'.$output.'Y';
 		}
 	}
 
-	if (empty($unused)) print "No string not used found.\n";
-	else
+	if (empty($unused)) {
+	    print "No string not used found.\n";
+	} else
 	{
         $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";
+        if (($argv[2]?$argv[2]:"")) {
+            print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n";
+        }
 	}
 }
 

dolibarr/dev/translation/autotranslator.class.php

Indentation +299 added lines, -299 removed lines

@@ -27,17 +27,17 @@ 
  */
 class autoTranslator
 {
-	private $_translatedFiles = array();
-	private $_destlang = '';
-	private $_refLang = '';
-	private $_langDir = '';
-	private $_limittofile = '';
-	private $_time;
-	private $_time_end;
-	private $_outputpagecode = 'UTF-8';
-	private $_apikey;
-	//private $_outputpagecode = 'ISO-8859-1';
-	const DIR_SEPARATOR = '/';
+    private $_translatedFiles = array();
+    private $_destlang = '';
+    private $_refLang = '';
+    private $_langDir = '';
+    private $_limittofile = '';
+    private $_time;
+    private $_time_end;
+    private $_outputpagecode = 'UTF-8';
+    private $_apikey;
+    //private $_outputpagecode = 'ISO-8859-1';
+    const DIR_SEPARATOR = '/';
 
 
     /**
@@ -53,296 +53,296 @@ 
     function __construct($_destlang,$_refLang,$_langDir,$_limittofile,$_apikey)
     {
 
-		// Set enviorment variables
-		$this->_destlang = $_destlang;
-		$this->_refLang = $_refLang;
-		$this->_langDir = $_langDir.self::DIR_SEPARATOR;
-		$this->_time = date('Y-m-d H:i:s');
-		$this->_limittofile = $_limittofile;
+        // Set enviorment variables
+        $this->_destlang = $_destlang;
+        $this->_refLang = $_refLang;
+        $this->_langDir = $_langDir.self::DIR_SEPARATOR;
+        $this->_time = date('Y-m-d H:i:s');
+        $this->_limittofile = $_limittofile;
         $this->_apikey = $_apikey;
 
-		// Translate
-		//ini_set('default_charset','UTF-8');
-		ini_set('default_charset',$this->_outputpagecode);
-		$this->parseRefLangTranslationFiles();
-	}
-
-	/**
-	 * 	Parse file
-	 *
-	 * 	@return	void
-	 */
-	private function parseRefLangTranslationFiles()
-	{
-
-		$files = $this->getTranslationFilesArray($this->_refLang);
-		$counter = 1;
-		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";
-
-			// Define target dirs
-			$targetlangs=array($this->_destlang);
-			if ($this->_destlang == 'all')
-			{
-				$targetlangs=array();
-
-				// If we must process all languages
-				$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
+        // Translate
+        //ini_set('default_charset','UTF-8');
+        ini_set('default_charset',$this->_outputpagecode);
+        $this->parseRefLangTranslationFiles();
+    }
+
+    /**
+     * 	Parse file
+     *
+     * 	@return	void
+     */
+    private function parseRefLangTranslationFiles()
+    {
+
+        $files = $this->getTranslationFilesArray($this->_refLang);
+        $counter = 1;
+        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";
+
+            // Define target dirs
+            $targetlangs=array($this->_destlang);
+            if ($this->_destlang == 'all')
+            {
+                $targetlangs=array();
+
+                // If we must process all languages
+                $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'];
-				}
-				//var_dump($targetlangs);
-			}
-
-			// Process translation of source file for each target languages
-			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))
-				{
-					// No file present, we generate file
-					echo "File not found: " . $destPath . ". We generate it.<br>\n";
-					$this->createTranslationFile($destPath,$my_destlang);
-				}
-				else
-				{
-					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){
-					$key = $this->getLineKey($line);
-					$value = $this->getLineValue($line);
-					if ($key && $value)
-					{
-						$newlines+=$this->translateFileLine($fileContentDest,$file,$key,$value,$my_destlang);
-					}
-				}
-
-				$this->updateTranslationFile($destPath,$file,$my_destlang);
-				echo "New translated lines: " . $newlines . "<br>\n";
-				//if ($counter ==3) die('fim');
-			}
-		}
-	}
-
-	/**
-	 * Update file with new translations
-	 *
-	 * @param 	string	$destPath		Target path
-	 * @param 	string	$file			File
-	 * @param 	string	$my_destlang		Target language code
-	 * @return	void
-	 */
-	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)
-		{
-			$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, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
-			fclose($fp);
-		}
-		return;
-	}
-
-	/**
-	 * Create a new translation file
-	 *
-	 * @param 	string	$path			Path
-	 * @param 	string	$my_destlang		Target language code
-	 * @return	void
-	 */
-	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, " */\n");
-		fclose($fp);
-		return;
-	}
-
-	/**
-	 * Put in array _translatedFiles[$file], line of a new tranlated pair
-	 *
-	 * @param 	string	$content		Existing content of dest file
-	 * @param 	string	$file			Target file name translated (xxxx.lang)
-	 * @param 	string	$key			Key to translate
-	 * @param 	string	$value			Existing value in source file
-	 * @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)
-	{
-
-		//print "key    =".$key."\n";
-		foreach( $content as $line ) {
-			$destKey = $this->getLineKey($line);
-			$destValue = $this->getLineValue($line);
-			// If translated return
-			//print "destKey=".$destKey."\n";
-			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;
-		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)));
-		}
-
-		$val=trim($val);
-
-		if (empty($val)) return 0;
-
-		$this->_translatedFiles[$file][] = $key . '=' . $val ;
-		return 1;
-	}
-
-	/**
-	 * getLineKey
-	 *
-	 * @param 	string 	$line	Line found into file
-	 * @return	string	Key
-	 */
-	private function getLineKey($line)
-	{
-		$arraykey = explode('=',$line,2);
-		return trim($arraykey[0]);
-	}
-
-	/**
-	 * getLineValue
-	 *
-	 * @param 	string 	$line	Line found into file
-	 * @return	string	Value
-	 */
-	private function getLineValue($line)
-	{
-		$arraykey = explode('=',$line,2);
-		return trim(isset($arraykey[1])?$arraykey[1]:'');
-	}
-
-	/**
-	 * getTranslationFilesArray
-	 *
-	 * @param 	string 	$lang	Language code
-	 * @return	array	Array
-	 */
-	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();
-			}
-			$dir->next();
-		}
-		return $files;
-	}
-
-	/**
-	 * Return translation of a value
-	 *
-	 * @param 	array	$src_texts		Array with one value
-	 * @param 	string	$src_lang		Language code source (us, fr, it, ...)
-	 * @param 	string	$dest_lang		Language code target (es, de, ...)
-	 * @return 	string					Value translated
-	 */
-	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];
-
-		//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);
-
-		// 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);
-		// Example: http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=Setup%20area&langpair=en_US|fr_FR
+                    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)
+            {
+                $this->_translatedFiles = array();
+
+                $destPath = $this->_langDir.$my_destlang.self::DIR_SEPARATOR.$file;
+                // Check destination file presence
+                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);
+                }
+                else
+                {
+                    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){
+                    $key = $this->getLineKey($line);
+                    $value = $this->getLineValue($line);
+                    if ($key && $value)
+                    {
+                        $newlines+=$this->translateFileLine($fileContentDest,$file,$key,$value,$my_destlang);
+                    }
+                }
+
+                $this->updateTranslationFile($destPath,$file,$my_destlang);
+                echo "New translated lines: " . $newlines . "<br>\n";
+                //if ($counter ==3) die('fim');
+            }
+        }
+    }
+
+    /**
+     * Update file with new translations
+     *
+     * @param 	string	$destPath		Target path
+     * @param 	string	$file			File
+     * @param 	string	$my_destlang		Target language code
+     * @return	void
+     */
+    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)
+        {
+            $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, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
+            fclose($fp);
+        }
+        return;
+    }
+
+    /**
+     * Create a new translation file
+     *
+     * @param 	string	$path			Path
+     * @param 	string	$my_destlang		Target language code
+     * @return	void
+     */
+    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, " */\n");
+        fclose($fp);
+        return;
+    }
+
+    /**
+     * Put in array _translatedFiles[$file], line of a new tranlated pair
+     *
+     * @param 	string	$content		Existing content of dest file
+     * @param 	string	$file			Target file name translated (xxxx.lang)
+     * @param 	string	$key			Key to translate
+     * @param 	string	$value			Existing value in source file
+     * @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)
+    {
+
+        //print "key    =".$key."\n";
+        foreach( $content as $line ) {
+            $destKey = $this->getLineKey($line);
+            $destValue = $this->getLineValue($line);
+            // If translated return
+            //print "destKey=".$destKey."\n";
+            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;
+        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)));
+        }
+
+        $val=trim($val);
+
+        if (empty($val)) return 0;
+
+        $this->_translatedFiles[$file][] = $key . '=' . $val ;
+        return 1;
+    }
+
+    /**
+     * getLineKey
+     *
+     * @param 	string 	$line	Line found into file
+     * @return	string	Key
+     */
+    private function getLineKey($line)
+    {
+        $arraykey = explode('=',$line,2);
+        return trim($arraykey[0]);
+    }
+
+    /**
+     * getLineValue
+     *
+     * @param 	string 	$line	Line found into file
+     * @return	string	Value
+     */
+    private function getLineValue($line)
+    {
+        $arraykey = explode('=',$line,2);
+        return trim(isset($arraykey[1])?$arraykey[1]:'');
+    }
+
+    /**
+     * getTranslationFilesArray
+     *
+     * @param 	string 	$lang	Language code
+     * @return	array	Array
+     */
+    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();
+            }
+            $dir->next();
+        }
+        return $files;
+    }
+
+    /**
+     * Return translation of a value
+     *
+     * @param 	array	$src_texts		Array with one value
+     * @param 	string	$src_lang		Language code source (us, fr, it, ...)
+     * @param 	string	$dest_lang		Language code target (es, de, ...)
+     * @return 	string					Value translated
+     */
+    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];
+
+        //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);
+
+        // 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);
+        // Example: http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=Setup%20area&langpair=en_US|fr_FR
         // Define GET URL v2
-		$url = "https://www.googleapis.com/language/translate/v2?key=".$this->_apikey."&q=".urlencode($src_text_to_translate)."&source=".urlencode($src_lang)."&target=".urlencode($dest_lang);
-		// Example: https://www.googleapis.com/language/translate/v2?key=_apikey&q=Setup%20area&source=en_US&target=fr_FR
-
-		// Send request
-		//print "Url to translate: ".$url."\n";
-
-		if (! function_exists("curl_init"))
-		{
-		      print "Error, your PHP does not support curl functions.\n";
-		      die();
-		}
-
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_REFERER, "Mozilla");
-		$body = curl_exec($ch);
-		curl_close($ch);
-		//sleep(1);	// This is to avoid to overload server.
-
-		// now, process the JSON string
-		$json = json_decode($body, true);
-
-		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);
-
-		//print "OK ".join('',$src_texts).' => '.$rep."\n";
-
-		return $rep;
-	}
+        $url = "https://www.googleapis.com/language/translate/v2?key=".$this->_apikey."&q=".urlencode($src_text_to_translate)."&source=".urlencode($src_lang)."&target=".urlencode($dest_lang);
+        // Example: https://www.googleapis.com/language/translate/v2?key=_apikey&q=Setup%20area&source=en_US&target=fr_FR
+
+        // Send request
+        //print "Url to translate: ".$url."\n";
+
+        if (! function_exists("curl_init"))
+        {
+                print "Error, your PHP does not support curl functions.\n";
+                die();
+        }
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_REFERER, "Mozilla");
+        $body = curl_exec($ch);
+        curl_close($ch);
+        //sleep(1);	// This is to avoid to overload server.
+
+        // now, process the JSON string
+        $json = json_decode($body, true);
+
+        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);
+
+        //print "OK ".join('',$src_texts).' => '.$rep."\n";
+
+        return $rep;
+    }
 }

Braces +61 added lines, -21 removed lines

@@ -79,7 +79,9 @@ 
 		$counter = 1;
 		foreach($files as $file)
 		{
-			if ($this->_limittofile && $this->_limittofile != $file) continue;
+			if ($this->_limittofile && $this->_limittofile != $file) {
+			    continue;
+			}
 			$counter++;
 			$fileContent = null;
 			$refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file;
@@ -96,16 +98,43 @@ 
 				$arraytmp=dol_dir_list($this->_langDir,'directories',0);
 				foreach($arraytmp as $dirtmp)
 				{
-					if ($dirtmp['name'] === $this->_refLang) continue;	// We discard source language
+					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
+					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);
@@ -123,8 +152,7 @@ 
 					// No file present, we generate file
 					echo "File not found: " . $destPath . ". We generate it.<br>\n";
 					$this->createTranslationFile($destPath,$my_destlang);
-				}
-				else
+				} else
 				{
 					echo "Updating file: " . $destPath . "<br>\n";
 				}
@@ -220,19 +248,27 @@ 
 			}
 		}
 
-		if ($key == 'CHARSET') $val=$this->_outputpagecode;
-		else if (preg_match('/^Format/',$key)) $val=$value;
-		else if ($value=='-') $val=$value;
-		else
+		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);
 
-		if (empty($val)) return 0;
+		if (empty($val)) {
+		    return 0;
+		}
 
 		$this->_translatedFiles[$file][] = $key . '=' . $val ;
 		return 1;
@@ -292,9 +328,13 @@ 
 	{
 		// 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];
+		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];
+		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) {
+		    $dest_lang=$tmp[0];
+		}
 
 		//setting language pair
 		$lang_pair = $src_lang.'|'.$dest_lang;

dolibarr/dev/initdemo/sftpget_and_loaddump.php

Indentation +46 added lines, -46 removed lines

@@ -25,8 +25,8 @@ 
 
 // Test if batch mode
 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;
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
 }
 
 // Global variables
@@ -60,17 +60,17 @@ 
 $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";
-	print "Return code: 0 if success, <>0 if error\n";
-	print "Warning, this script may take a long time.\n";
-	exit(-1);
+    print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
+    print "Return code: 0 if success, <>0 if error\n";
+    print "Warning, this script may take a long time.\n";
+    exit(-1);
 }
 
 
@@ -84,21 +84,21 @@ 
 
 // SFTP connect
 if (! function_exists("ssh2_connect")) {
-	dol_print_error('','ssh2_connect function does not exists'); exit(1);
+    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))
-	{
-		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR);
-		exit(-5);
-	}
-	else
-	{
-		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
-		/*
+    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
+    {
+        //$stream = ssh2_exec($connection, '/usr/bin/php -i');
+        /*
 		print "Generate dump ".$filesys1.'.bz2'."\n";
 			$stream = ssh2_exec($connection, "mysqldump -u debian-sys-maint -p4k9Blxl2snq4FHXY -h 127.0.0.1 --single-transaction -K --tables -c -e --hex-blob --default-character-set=utf8 saasplex | bzip2 -1 > ".$filesys1.'.bz2');
 			stream_set_blocking($stream, true);
@@ -106,35 +106,35 @@ 
 			$output = stream_get_contents($stream);
 		*/
 
-		$sftp = ssh2_sftp($connection);
-
-		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="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;
-		}
-		print "Load dump with ".$fullcommand."\n";
-		$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";
-
-		//ssh2_sftp_unlink($sftp, $fileinstalllock);
-		//print $output;
-	}
+        $sftp = ssh2_sftp($connection);
+
+        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="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;
+        }
+        print "Load dump with ".$fullcommand."\n";
+        $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";
+
+        //ssh2_sftp_unlink($sftp, $fileinstalllock);
+        //print $output;
+    }
 }
 else
 {
-	print 'Failed to connect to ssh2 to '.$server;
-	exit(-6);
+    print 'Failed to connect to ssh2 to '.$server;
+    exit(-6);
 }
 
 

Braces +31 added lines, -13 removed lines

@@ -41,14 +41,32 @@ 
 
 // 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");
+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';
 
 
@@ -94,8 +112,7 @@ 
 	{
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR);
 		exit(-5);
-	}
-	else
+	} else
 	{
 		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
 		/*
@@ -125,13 +142,14 @@ 
 		$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;
 	}
-}
-else
+} else
 {
 	print 'Failed to connect to ssh2 to '.$server;
 	exit(-6);