alxarafe / alixar

dolibarr/dev/tools/test/testtcpdf.php

Spacing +5 added lines, -5 removed lines

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

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();

Spacing +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ 
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@ 
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -65,43 +65,43 @@ 
 //$obj->initAsSpecimen();
 
 $obj->ref            = 'ABCDE';
-$obj->socid          = 4;	// Put id of third party (rowid in llx_societe table)
+$obj->socid          = 4; // Put id of third party (rowid in llx_societe table)
 $obj->date           = mktime();
 $obj->note           = 'A comment';
 $obj->cond_reglement_id = 1;
 
-$line1=new FactureLigne($db);
-$line1->tva_tx=10.0;
-$line1->remise_percent=0;
-$line1->qty=1;
-$line1->total_ht=100;
-$line1->total_tva=10;
-$line1->total_ttc=110;
-$obj->lines[]=$line1;
+$line1 = new FactureLigne($db);
+$line1->tva_tx = 10.0;
+$line1->remise_percent = 0;
+$line1->qty = 1;
+$line1->total_ht = 100;
+$line1->total_tva = 10;
+$line1->total_ttc = 110;
+$obj->lines[] = $line1;
 
 // Create invoice
-$idobject=$obj->create($user);
+$idobject = $obj->create($user);
 if ($idobject > 0)
 {
 	// Change status to validated
-	$result=$obj->validate($user);
+	$result = $obj->validate($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
 	else
 	{
 		$error++;
-		dol_print_error($db,$obj->error);
+		dol_print_error($db, $obj->error);
 	}
 }
 else
 {
 	$error++;
-	dol_print_error($db,$obj->error);
+	dol_print_error($db, $obj->error);
 }
 
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

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/get_contracts.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ 
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,17 +44,17 @@ 
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
 print "***** ".$script_file." (".$version.") *****\n";
-if (! isset($argv[1])) {	// Check parameters
+if (!isset($argv[1])) {	// Check parameters
     print "Usage: ".$script_file." id_thirdparty ...\n";
     exit;
 }
@@ -69,9 +69,9 @@ 
 
 // Create contract object
 $obj = new Contrat($db);
-$obj->socid=$argv[1];
+$obj->socid = $argv[1];
 
-$listofcontractsforcompany=$obj->getListOfContracts('all');
+$listofcontractsforcompany = $obj->getListOfContracts('all');
 
 print $listofcontractsforcompany;
 

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();

Spacing +11 added lines, -11 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ 
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@ 
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -68,16 +68,16 @@ 
 $obj->nom   = 'ABCDEF';
 
 // Create user
-$idobject=$obj->create($user);
+$idobject = $obj->create($user);
 if ($idobject > 0)
 {
 	// Change status to validated
-	$result=$obj->setStatut(1);
+	$result = $obj->setStatut(1);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
 	else
 	{
 		$error++;
-		dol_print_error($db,$obj->error);
+		dol_print_error($db, $obj->error);
 	}
 }
 else if ($obj->error == 'ErrorLoginAlreadyExists')
@@ -87,13 +87,13 @@ 
 else
 {
 	$error++;
-	dol_print_error($db,$obj->error);
+	dol_print_error($db, $obj->error);
 }
 
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

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();

Spacing +17 added lines, -17 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ 
 }
 
 // Global variables
-$version='1.11';
-$error=0;
+$version = '1.11';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@ 
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -65,41 +65,41 @@ 
 $com = new Commande($db);
 
 $com->ref            = 'ABCDE';
-$com->socid          = 4;	// Put id of third party (rowid in llx_societe table)
+$com->socid          = 4; // Put id of third party (rowid in llx_societe table)
 $com->date_commande  = mktime();
 $com->note           = 'A comment';
 $com->source         = 1;
 $com->remise_percent = 0;
 
-$orderline1=new OrderLine($db);
-$orderline1->tva_tx=10.0;
-$orderline1->remise_percent=0;
-$orderline1->qty=1;
-$com->lines[]=$orderline1;
+$orderline1 = new OrderLine($db);
+$orderline1->tva_tx = 10.0;
+$orderline1->remise_percent = 0;
+$orderline1->qty = 1;
+$com->lines[] = $orderline1;
 
 // Create order
-$idobject=$com->create($user);
+$idobject = $com->create($user);
 if ($idobject > 0)
 {
 	// Change status to validated
-	$result=$com->valid($user);
+	$result = $com->valid($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
 	else
 	{
 		$error++;
-		dol_print_error($db,$com->error);
+		dol_print_error($db, $com->error);
 	}
 }
 else
 {
 	$error++;
-	dol_print_error($db,$com->error);
+	dol_print_error($db, $com->error);
 }
 
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

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();

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ 
 }
 
 // Global variables
-$version='1.10';
-$error=0;
+$version = '1.10';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@ 
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -62,7 +62,7 @@ 
 require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
 // Create instance of object
-$myproduct=new Product($db);
+$myproduct = new Product($db);
 
 // Definition of product instance properties
 $myproduct->ref                = '1234';
@@ -86,12 +86,12 @@ 
 else
 {
 	$error++;
-	dol_print_error($db,$myproduct->error);
+	dol_print_error($db, $myproduct->error);
 }
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

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";

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -45,17 +45,17 @@ 
 $langs->load("main");
 
 // Global variables
-$version='1.14';
-$error=0;
+$version = '1.14';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") *****\n";
-$dir=DOL_DOCUMENT_ROOT."/langs";
+$dir = DOL_DOCUMENT_ROOT."/langs";
 
 // Check parameters
-if (! isset($argv[3])) {
+if (!isset($argv[3])) {
     print "Usage:   ".$script_file."  lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n";
     print "Example: ".$script_file."  en_US         pt_PT              123456\n";
     print "Rem:     lang_code to use can be found on http://www.google.com/language_tools\n";
@@ -66,21 +66,21 @@ 
 print 'Argument 1='.$argv[1]."\n";
 print 'Argument 2='.$argv[2]."\n";
 print 'Argument 3='.$argv[3]."\n";
-$file='';
+$file = '';
 if (isset($argv[4]))
 {
-	$file=$argv[4];
+	$file = $argv[4];
 	print 'Argument 4='.$argv[4]."\n";
 }
 print 'Files will be generated/updated in directory '.$dir."\n";
 
 if ($argv[2] != 'all')
 {
-	if (! is_dir($dir.'/'.$argv[2]))
+	if (!is_dir($dir.'/'.$argv[2]))
 	{
 		print 'Create directory '.$dir.'/'.$argv[2]."\n";
-		$result=mkdir($dir.'/'.$argv[2]);
-		if (! $result)
+		$result = mkdir($dir.'/'.$argv[2]);
+		if (!$result)
 		{
 			$db->close();
 			return -1;
@@ -90,7 +90,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";
 
-$langParser = new autoTranslator($argv[2],$argv[1],$dir,$file,$argv[3]);
+$langParser = new autoTranslator($argv[2], $argv[1], $dir, $file, $argv[3]);
 
 print "***** Finished *****\n";
 

dolibarr/dev/translation/strip_language_file.php

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";
 }
 
 

Spacing +58 added lines, -58 removed lines

@@ -46,7 +46,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -58,17 +58,17 @@ 
 
 // Get and check arguments
 
-$lPrimary = isset($argv[1])?$argv[1]:'';
-$lSecondary = isset($argv[2])?$argv[2]:'';
+$lPrimary = isset($argv[1]) ? $argv[1] : '';
+$lSecondary = isset($argv[2]) ? $argv[2] : '';
 $lEnglish = 'en_US';
-$filesToProcess = isset($argv[3])?$argv[3]:'';
+$filesToProcess = isset($argv[3]) ? $argv[3] : '';
 
 if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess))
 {
 	$rc = 1;
 	$msg = '***** Script to clean language files *****'."\n";
-	$msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
-	print $msg . "(rc=$rc).\n";
+	$msg .= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
+	print $msg."(rc=$rc).\n";
 	exit($rc);
 }
 
@@ -80,53 +80,53 @@ 
 if ($filesToProcess == 'all')
 {
 	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
-	while($dir->valid()) {
-		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) {
-			$files[] =  $dir->getFilename();
+	while ($dir->valid()) {
+		if (!$dir->isDot() && $dir->isFile() && !preg_match('/^\./', $dir->getFilename())) {
+			$files[] = $dir->getFilename();
 		}
 		$dir->next();
 	}
-	$filesToProcess=$files;
+	$filesToProcess = $files;
 }
-else $filesToProcess=explode(',',$filesToProcess);
+else $filesToProcess = explode(',', $filesToProcess);
 
 // Arguments should be OK here.
 
 
 // Loop on each file
-foreach($filesToProcess as $fileToProcess)
+foreach ($filesToProcess as $fileToProcess)
 {
 	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
 	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
 	$lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess;
-	$output = $lSecondaryFile . '.delta';
+	$output = $lSecondaryFile.'.delta';
 
 	print "---- Process language file ".$lSecondaryFile."\n";
 
-	if ( ! is_readable($lPrimaryFile) ) {
+	if (!is_readable($lPrimaryFile)) {
 		$rc = 2;
 		$msg = "Cannot read primary language file $lPrimaryFile.";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
-	if ( ! is_readable($lSecondaryFile) ) {
+	if (!is_readable($lSecondaryFile)) {
 		$rc = 3;
 		$msg = "Cannot read secondary language file $lSecondaryFile. We discard this file.";
-		print $msg . "\n";
+		print $msg."\n";
 		continue;
 	}
 
-	if ( ! is_readable($lEnglishFile) ) {
+	if (!is_readable($lEnglishFile)) {
 		$rc = 3;
 		$msg = "Cannot read english language file $lEnglishFile. We discard this file.";
-		print $msg . "\n";
+		print $msg."\n";
 		continue;
 	}
 
 	// Start reading and parsing Secondary
 
-	if ( $handle = fopen($lSecondaryFile, 'r') )
+	if ($handle = fopen($lSecondaryFile, 'r'))
 	{
 		print "Read Secondary File $lSecondaryFile:\n";
 		$cnt = 0;
@@ -135,41 +135,41 @@ 
 			$cnt++;
 
 			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
+			if (preg_match("/^\w*#/", $line)) {
 				continue;
 			}
 			// strip empty lines
-			if ( preg_match("/^\w*$/", $line) ) {
+			if (preg_match("/^\w*$/", $line)) {
 				continue;
 			}
 
 			$a = mb_split('=', trim($line), 2);
-			if ( count($a) != 2 ) {
-				print "ERROR in file $lSecondaryFile, line $cnt: " . trim($line) . "\n";
+			if (count($a) != 2) {
+				print "ERROR in file $lSecondaryFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
 			list($key, $value) = $a;
 
 			// key is redundant
-			if ( array_key_exists($key, $aSecondary) ) {
+			if (array_key_exists($key, $aSecondary)) {
 				print "Key $key is redundant in file $lSecondaryFile (line: $cnt).\n";
 				continue;
 			}
 
 			// String has no value
-			if ( $value == '' ) {
+			if ($value == '') {
 				print "Key $key has no value in file $lSecondaryFile (line: $cnt).\n";
 				continue;
 			}
 
 			$aSecondary[$key] = trim($value);
 		}
-		if ( ! feof($handle) )
+		if (!feof($handle))
 		{
 			$rc = 5;
 			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
+			print $msg." (rc=$rc).\n";
 			exit($rc);
 		}
 		fclose($handle);
@@ -177,14 +177,14 @@ 
 	else {
 		$rc = 6;
 		$msg = "Cannot open file $lSecondaryFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
 
 	// Start reading and parsing English
 
-	if ( $handle = fopen($lEnglishFile, 'r') )
+	if ($handle = fopen($lEnglishFile, 'r'))
 	{
 		print "Read English File $lEnglishFile:\n";
 		$cnt = 0;
@@ -193,41 +193,41 @@ 
 			$cnt++;
 
 			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
+			if (preg_match("/^\w*#/", $line)) {
 				continue;
 			}
 			// strip empty lines
-			if ( preg_match("/^\w*$/", $line) ) {
+			if (preg_match("/^\w*$/", $line)) {
 				continue;
 			}
 
 			$a = mb_split('=', trim($line), 2);
-			if ( count($a) != 2 ) {
-				print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n";
+			if (count($a) != 2) {
+				print "ERROR in file $lEnglishFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
 			list($key, $value) = $a;
 
 			// key is redundant
-			if ( array_key_exists($key, $aEnglish) ) {
+			if (array_key_exists($key, $aEnglish)) {
 				print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n";
 				continue;
 			}
 
 			// String has no value
-			if ( $value == '' ) {
+			if ($value == '') {
 				print "Key $key has no value in file $lEnglishFile (line: $cnt).\n";
 				continue;
 			}
 
 			$aEnglish[$key] = trim($value);
 		}
-		if ( ! feof($handle) )
+		if (!feof($handle))
 		{
 			$rc = 5;
 			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
+			print $msg." (rc=$rc).\n";
 			exit($rc);
 		}
 		fclose($handle);
@@ -235,7 +235,7 @@ 
 	else {
 		$rc = 6;
 		$msg = "Cannot open file $lEnglishFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 
@@ -243,12 +243,12 @@ 
 
 	// Start reading and parsing Primary. See rules in header!
 
-	$arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand');
+	$arrayofkeytoalwayskeep = array('DIRECTION', 'FONTFORPDF', 'FONTSIZEFORPDF', 'SeparatorDecimal', 'SeparatorThousand');
 
 
-	if ( $handle = fopen($lPrimaryFile, 'r') )
+	if ($handle = fopen($lPrimaryFile, 'r'))
 	{
-		if ( ! $oh = fopen($output, 'w') )
+		if (!$oh = fopen($output, 'w'))
 		{
 			print "ERROR in writing to file $output\n";
 			exit;
@@ -256,7 +256,7 @@ 
 
 		print "Read Primary File $lPrimaryFile and write ".$output.":\n";
 
-		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/','',$fileToProcess))."\n");
+		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/', '', $fileToProcess))."\n");
 
 		$cnt = 0;
 		while (($line = fgets($handle)) !== false)
@@ -264,24 +264,24 @@ 
 			$cnt++;
 
 			// strip comments
-			if ( preg_match("/^\w*#/", $line) ) {
+			if (preg_match("/^\w*#/", $line)) {
 				continue;
 			}
 			// strip empty lines
-			if ( preg_match("/^\w*$/", $line) ) {
+			if (preg_match("/^\w*$/", $line)) {
 				continue;
 			}
 
 			$a = mb_split('=', trim($line), 2);
-			if ( count($a) != 2 ) {
-				print "ERROR in file $lPrimaryFile, line $cnt: " . trim($line) . "\n";
+			if (count($a) != 2) {
+				print "ERROR in file $lPrimaryFile, line $cnt: ".trim($line)."\n";
 				continue;
 			}
 
 			list($key, $value) = $a;
 
 			// key is redundant
-			if ( array_key_exists($key, $aPrimary) ) {
+			if (array_key_exists($key, $aPrimary)) {
 				print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
 				continue;
 			}
@@ -292,7 +292,7 @@ 
 			}
 
 			// String has no value
-			if ( $value == '' ) {
+			if ($value == '') {
 				print "Key $key has no value in file $lPrimaryFile (line: $cnt).\n";
 				continue;
 			}
@@ -306,11 +306,11 @@ 
 			//print "Found primary key = ".$key."\n";
 
 			// Key not in other file
-			if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key))
+			if (in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key))
 			{
 				//print "Key $key is a key we always want to see into secondary file (line: $cnt).\n";
 			}
-			else if ( ! array_key_exists($key, $aSecondary))
+			else if (!array_key_exists($key, $aSecondary))
 			{
 				//print "Key $key does NOT exist in secondary language (line: $cnt).\n";
 				continue;
@@ -318,19 +318,19 @@ 
 
 			// String exists in both files and value into alternative language differs from main language but also from english files
 			if (
-				(! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
-			    && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
-				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)
+				(!empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
+			    && !empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
+				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)
 				)
 			{
 				//print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n";
-				fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n");
+				fwrite($oh, $key."=".(empty($aSecondary[$key]) ? $aPrimary[$key] : $aSecondary[$key])."\n");
 			}
 		}
-		if ( ! feof($handle) ) {
+		if (!feof($handle)) {
 			$rc = 7;
 			$msg = "Unexpected fgets() fail";
-			print $msg . " (rc=$rc).\n";
+			print $msg." (rc=$rc).\n";
 			exit($rc);
 		}
 		fclose($oh);
@@ -339,7 +339,7 @@ 
 	else {
 		$rc = 8;
 		$msg = "Cannot open file $lPrimaryFile";
-		print $msg . " (rc=$rc).\n";
+		print $msg." (rc=$rc).\n";
 		exit($rc);
 	}
 

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";

Spacing +144 added lines, -144 removed lines

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

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";
+        }
 	}
 }