alxarafe / alixar

dolibarr/build/generate_filelist_xml.php

Braces +19 added lines, -12 removed lines

@@ -22,7 +22,10 @@ 
  * 		\brief      This script create a xml checksum file
  */
 
-if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');	// Do not create database handler $db
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+// Do not create database handler $db
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -56,7 +59,9 @@ 
 $i=0;
 while ($i < $argc)
 {
-    if (! empty($argv[$i])) parse_str($argv[$i]);
+    if (! empty($argv[$i])) {
+        parse_str($argv[$i]);
+    }
     if (preg_match('/includeconstant=/',$argv[$i]))
     {
         $tmp=explode(':', $includeconstant, 3);
@@ -84,8 +89,10 @@ 
 if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
 {
 	$release=DOL_VERSION;
-	if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
-}
+	if ($tmpver[1] && $tmpver[0] == 'auto') {
+	    $release.='-'.$tmpver[1];
+	}
+	}
 
 if (empty($includecustom))
 {
@@ -98,8 +105,7 @@ 
 	    	print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
 	        exit -1;
 	    }
-	}
-	else
+	} else
 	{
 		$tmpverter=explode('-', DOL_VERSION, 2);
 		if ($tmpverter[0] != $tmpverbis[0])
@@ -109,8 +115,7 @@ 
 			exit -1;
 		}
 	}
-}
-else
+} else
 {
     if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
     {
@@ -173,8 +178,9 @@ 
 	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
 	if ($newdir!=$dir) {
-        if ($needtoclose)
-            fputs($fp, '  </dir>'."\n");
+        if ($needtoclose) {
+                    fputs($fp, '  </dir>'."\n");
+        }
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
         $needtoclose=1;
@@ -216,8 +222,9 @@ 
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
 	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
     if ($newdir!=$dir) {
-        if ($needtoclose)
-            fputs($fp, '  </dir>'."\n");
+        if ($needtoclose) {
+                    fputs($fp, '  </dir>'."\n");
+        }
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
         $needtoclose=1;

dolibarr/dev/examples/code/create_invoice.php

Braces +5 added lines, -6 removed lines

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

dolibarr/dev/examples/code/create_user.php

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

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

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

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

Braces +329 added lines, -114 removed lines

@@ -87,9 +87,13 @@ 
 }
 
 echo "If you call this with argument \"unused=true\" it searches for the translation strings that exist in en_US but are never used.\n";
-if ($web) print "<br>";
+if ($web) {
+    print "<br>";
+}
 echo "IMPORTANT: that can take quite a lot of time (up to 10 minutes), you need to tune the max_execution_time on your php.ini accordingly.\n";
-if ($web) print "<br>";
+if ($web) {
+    print "<br>";
+}
 
 
 
@@ -156,9 +160,13 @@ 
 	}
 }
 
-if ($web) print "<h2>";
+if ($web) {
+    print "<h2>";
+}
 print "Duplicate strings in lang files in $workdir - ".count($dups)." found\n";
-if ($web) print "</h2>";
+if ($web) {
+    print "</h2>";
+}
 
 if ($web)
 {
@@ -179,15 +187,31 @@ 
 	$s='';
 
 	// Keyword $string
-	if ($web) $s.="<tr>";
-	if ($web) $s.="<td align=\"center\">";
-	if ($web) $s.=$count;
-	if ($web) $s.="</td>";
-	if ($web) $s.="<td>";
+	if ($web) {
+	    $s.="<tr>";
+	}
+	if ($web) {
+	    $s.="<td align=\"center\">";
+	}
+	if ($web) {
+	    $s.=$count;
+	}
+	if ($web) {
+	    $s.="</td>";
+	}
+	if ($web) {
+	    $s.="<td>";
+	}
 	$s.=$string;
-	if ($web) $s.="</td>";
-	if ($web) $s.="<td>";
-	if (! $web) $s.= ' : ';
+	if ($web) {
+	    $s.="</td>";
+	}
+	if ($web) {
+	    $s.="<td>";
+	}
+	if (! $web) {
+	    $s.= ' : ';
+	}
 
 	// Loop on each files keyword was found
     $duplicateinsamefile=0;
@@ -204,41 +228,76 @@ 
 	    $listoffilesforthisentry=array();
 	    foreach ($lines as $line => $translatedvalue)
 		{
-            if (! empty($listoffilesforthisentry[$file])) $duplicateinsamefile=1;
+            if (! empty($listoffilesforthisentry[$file])) {
+                $duplicateinsamefile=1;
+            }
             $listoffilesforthisentry[$file]=1;
 
 			$s.= "(".$line." - ".htmlentities($translatedvalue).") ";
 		}
-		if ($web) $s.="<br>";
+		if ($web) {
+		    $s.="<br>";
+		}
+	}
+	if ($web) {
+	    $s.="</td></tr>";
 	}
-	if ($web) $s.="</td></tr>";
 	$s.="\n";
 
-	if ($duplicateinsamefile) $sduplicateinsamefile .= $s;
-	else if ($inmain) $sinmainandother .= $s;
-	else if ($inadmin) $sininstallandadmin .= $s;
-	else $sother .= $s;
-}
+	if ($duplicateinsamefile) {
+	    $sduplicateinsamefile .= $s;
+	} else if ($inmain) {
+	    $sinmainandother .= $s;
+	} else if ($inadmin) {
+	    $sininstallandadmin .= $s;
+	} else {
+	    $sother .= $s;
+	}
+	}
 
-if (! $web) print "\n***** Entries duplicated in same file\n";
+if (! $web) {
+    print "\n***** Entries duplicated in same file\n";
+}
 print $sduplicateinsamefile;
-if (! $web && empty($sduplicateinsamefile)) print "None\n";
-if (! $web) print "\n";
+if (! $web && empty($sduplicateinsamefile)) {
+    print "None\n";
+}
+if (! $web) {
+    print "\n";
+}
 
-if (! $web) print "***** Entries in main and another (keep only entry in main)\n";
+if (! $web) {
+    print "***** Entries in main and another (keep only entry in main)\n";
+}
 print $sinmainandother;
-if (! $web && empty($sinmainandother)) print "None\n";
-if (! $web) print "\n";
+if (! $web && empty($sinmainandother)) {
+    print "None\n";
+}
+if (! $web) {
+    print "\n";
+}
 
-if (! $web) print "***** Entries in admin and another\n";
+if (! $web) {
+    print "***** Entries in admin and another\n";
+}
 print $sininstallandadmin;
-if (! $web && empty($sininstallandadmin)) print "None\n";
-if (! $web) print "\n";
+if (! $web && empty($sininstallandadmin)) {
+    print "None\n";
+}
+if (! $web) {
+    print "\n";
+}
 
-if (! $web) print "***** Other\n";
+if (! $web) {
+    print "***** Other\n";
+}
 print $sother;
-if (! $web && empty($sother)) print "None\n";
-if (! $web) print "\n";
+if (! $web && empty($sother)) {
+    print "None\n";
+}
+if (! $web) {
+    print "\n";
+}
 
 if ($web)
 {
@@ -258,93 +317,245 @@ 
 	{
     	$qualifiedforclean=1;
 	    // Check if we must keep this key to be into file for removal
-	    if (preg_match('/^Module\d+/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Permission\d+/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PermissionAdvanced\d+/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ProfId\d+/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Delays_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^BarcodeDesc/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Extrafield/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^LocalTax/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Country/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Civility/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Currency/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DemandReasonTypeSRC/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PaperFormat/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Duration/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^AmountLT/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TotalLT/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Month/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Short/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PL_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TE_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^newLT/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^LT[0-9]/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^Language_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DescADHERENT_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^SubmitTranslation/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^ModuleCompanyCode/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/InDolibarr$/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^Module\d+/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Permission\d+/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^PermissionAdvanced\d+/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^ProfId\d+/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Delays_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^BarcodeDesc/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Extrafield/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^LocalTax/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Country/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Civility/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Currency/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^DemandReasonTypeSRC/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^PaperFormat/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Duration/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^AmountLT/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^TotalLT/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Month/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^MonthShort/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Day\d/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Short/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^ExportDataset_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^ImportDataset_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^ActionAC_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^TypeLocaltax/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^StatusProspect/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^PL_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^TE_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^JuridicalStatus/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^CalcMode/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^newLT/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^LT[0-9]/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^TypeContact_contrat_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^ErrorPriceExpression/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^Language_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^DescADHERENT_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^SubmitTranslation/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^ModuleCompanyCode/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/InDolibarr$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
 	    // admin.lang
-	    if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) {
+	        $qualifiedforclean=0;
+	    }
 	    // boxes.lang
-	    if (preg_match('/^BoxTitleLast/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^BoxTitleLatest/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^BoxTitleLast/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^BoxTitleLatest/', $value)) {
+	        $qualifiedforclean=0;
+	    }
 	    // install.lang
-	    if (preg_match('/^KeepDefaultValues/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^KeepDefaultValues/', $value)) {
+	        $qualifiedforclean=0;
+	    }
 		// mail.lang
-	    if (preg_match('/MailingModuleDesc/i', $value)) $qualifiedforclean=0;
+	    if (preg_match('/MailingModuleDesc/i', $value)) {
+	        $qualifiedforclean=0;
+	    }
 	    // main.lang
-	    if (preg_match('/^Duration/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^FormatDate/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DateFormat/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^.b$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^Duration/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^FormatDate/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^DateFormat/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^.b$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^.*Bytes$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) {
+	        $qualifiedforclean=0;
+	    }
 		// modulebuilder
-		if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0;
+		if (preg_match('/^ModuleBuilderDesc/', $value)) {
+		    $qualifiedforclean=0;
+		}
 	    // orders
-	    if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^OrderSource/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^TypeContact_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
         // other.lang
-	    if (preg_match('/^Notify_/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^PredefinedMail/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^DemoCompany/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^WeightUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^LengthUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^SurfaceUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^VolumeUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^SizeUnit/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/^EMailText/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/ById$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/ByLogin$/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/^Notify_/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^PredefinedMail/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^DemoCompany/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^WeightUnit/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^LengthUnit/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^SurfaceUnit/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^VolumeUnit/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^SizeUnit/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/^EMailText/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/ById$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/ByLogin$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
 	    // printing
-	    if (preg_match('/PrintingDriverDesc$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/PrintTestDesc$/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/PrintingDriverDesc$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/PrintTestDesc$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
 	    // products
-	    if (preg_match('/GlobalVariableUpdaterType$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/OppStatus/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/AvailabilityType/', $value)) $qualifiedforclean=0;
-	    if (preg_match('/CardProduct/', $value)) $qualifiedforclean=0;
+	    if (preg_match('/GlobalVariableUpdaterType$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/OppStatus/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/AvailabilityType/', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/CardProduct/', $value)) {
+	        $qualifiedforclean=0;
+	    }
 
-	    if (preg_match('/sms/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/TF_/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/WithBankUsing/i', $value)) $qualifiedforclean=0;
-	    if (preg_match('/descWORKFLOW_/i', $value)) $qualifiedforclean=0;
+	    if (preg_match('/sms/i', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/TF_/i', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/WithBankUsing/i', $value)) {
+	        $qualifiedforclean=0;
+	    }
+	    if (preg_match('/descWORKFLOW_/i', $value)) {
+	        $qualifiedforclean=0;
+	    }
 
 	    if (! $qualifiedforclean)
 	    {
@@ -359,24 +570,28 @@ 
 		if (empty($output)) {
    			$unused[$value] = $line;
        		echo $line;        // $trad contains the \n
-		}
-		else
+		} else
 		{
 		    unset($output);
 		    //print 'X'.$output.'Y';
 		}
 	}
 
-	if (empty($unused)) print "No string not used found.\n";
-	else
+	if (empty($unused)) {
+	    print "No string not used found.\n";
+	} else
 	{
         $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
         print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
         file_put_contents($filetosave, implode("",$unused));
         print "To remove from original file, run command :\n";
-        if (($argv[2]?$argv[2]:"")) print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; ";
+        if (($argv[2]?$argv[2]:"")) {
+            print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; ";
+        }
         print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut  -b 3- > ".($argv[2]?$argv[2]:"");
-        if (($argv[2]?$argv[2]:"")) print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n";
+        if (($argv[2]?$argv[2]:"")) {
+            print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n";
+        }
 	}
 }
 

dolibarr/dev/translation/autotranslator.class.php

Braces +61 added lines, -21 removed lines

@@ -79,7 +79,9 @@ 
 		$counter = 1;
 		foreach($files as $file)
 		{
-			if ($this->_limittofile && $this->_limittofile != $file) continue;
+			if ($this->_limittofile && $this->_limittofile != $file) {
+			    continue;
+			}
 			$counter++;
 			$fileContent = null;
 			$refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file;
@@ -96,16 +98,43 @@ 
 				$arraytmp=dol_dir_list($this->_langDir,'directories',0);
 				foreach($arraytmp as $dirtmp)
 				{
-					if ($dirtmp['name'] === $this->_refLang) continue;	// We discard source language
+					if ($dirtmp['name'] === $this->_refLang) {
+					    continue;
+					}
+					// We discard source language
 					$tmppart=explode('_',$dirtmp['name']);
-					if (preg_match('/^en/i',$dirtmp['name']))  continue;	// We discard en_* languages
-					if (preg_match('/^fr/i',$dirtmp['name']))  continue;	// We discard fr_* languages
-					if (preg_match('/^es/i',$dirtmp['name']))  continue;	// We discard es_* languages
-					if (preg_match('/ca_ES/i',$dirtmp['name']))  continue;	// We discard es_CA language
-					if (preg_match('/pt_BR/i',$dirtmp['name']))  continue;	// We discard pt_BR language
-                    if (preg_match('/nl_BE/i',$dirtmp['name']))  continue;  // We discard nl_BE language
-					if (preg_match('/^\./i',$dirtmp['name']))  continue;	// We discard files .*
-					if (preg_match('/^CVS/i',$dirtmp['name']))  continue;	// We discard CVS
+					if (preg_match('/^en/i',$dirtmp['name'])) {
+					    continue;
+					}
+					// We discard en_* languages
+					if (preg_match('/^fr/i',$dirtmp['name'])) {
+					    continue;
+					}
+					// We discard fr_* languages
+					if (preg_match('/^es/i',$dirtmp['name'])) {
+					    continue;
+					}
+					// We discard es_* languages
+					if (preg_match('/ca_ES/i',$dirtmp['name'])) {
+					    continue;
+					}
+					// We discard es_CA language
+					if (preg_match('/pt_BR/i',$dirtmp['name'])) {
+					    continue;
+					}
+					// We discard pt_BR language
+                    if (preg_match('/nl_BE/i',$dirtmp['name'])) {
+                        continue;
+                    }
+                    // We discard nl_BE language
+					if (preg_match('/^\./i',$dirtmp['name'])) {
+					    continue;
+					}
+					// We discard files .*
+					if (preg_match('/^CVS/i',$dirtmp['name'])) {
+					    continue;
+					}
+					// We discard CVS
 					$targetlangs[]=$dirtmp['name'];
 				}
 				//var_dump($targetlangs);
@@ -123,8 +152,7 @@ 
 					// No file present, we generate file
 					echo "File not found: " . $destPath . ". We generate it.<br>\n";
 					$this->createTranslationFile($destPath,$my_destlang);
-				}
-				else
+				} else
 				{
 					echo "Updating file: " . $destPath . "<br>\n";
 				}
@@ -220,19 +248,27 @@ 
 			}
 		}
 
-		if ($key == 'CHARSET') $val=$this->_outputpagecode;
-		else if (preg_match('/^Format/',$key)) $val=$value;
-		else if ($value=='-') $val=$value;
-		else
+		if ($key == 'CHARSET') {
+		    $val=$this->_outputpagecode;
+		} else if (preg_match('/^Format/',$key)) {
+		    $val=$value;
+		} else if ($value=='-') {
+		    $val=$value;
+		} else
 		{
 			// If not translated then translate
-			if ($this->_outputpagecode == 'UTF-8') $val=$this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2));
-			else $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)));
+			if ($this->_outputpagecode == 'UTF-8') {
+			    $val=$this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2));
+			} else {
+			    $val=utf8_decode($this->translateTexts(array($value),substr($this->_refLang,0,2),substr($my_destlang,0,2)));
+			}
 		}
 
 		$val=trim($val);
 
-		if (empty($val)) return 0;
+		if (empty($val)) {
+		    return 0;
+		}
 
 		$this->_translatedFiles[$file][] = $key . '=' . $val ;
 		return 1;
@@ -292,9 +328,13 @@ 
 	{
 		// We want to be sure that src_lang and dest_lang are using 2 chars only
 		$tmp=explode('_',$src_lang);
-		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $src_lang=$tmp[0];
+		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) {
+		    $src_lang=$tmp[0];
+		}
 		$tmp=explode('_',$dest_lang);
-		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) $dest_lang=$tmp[0];
+		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) {
+		    $dest_lang=$tmp[0];
+		}
 
 		//setting language pair
 		$lang_pair = $src_lang.'|'.$dest_lang;

dolibarr/dev/initdemo/sftpget_and_loaddump.php

Braces +31 added lines, -13 removed lines

@@ -41,14 +41,32 @@ 
 
 // Include Dolibarr environment
 $res=0;
-if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php";
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php";
-if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php";
-if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php";
-if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php";
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
-if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
-if (! $res) die ("Failed to include master.inc.php file\n");
+if (! $res && file_exists($path."../../master.inc.php")) {
+    $res=@include $path."../../master.inc.php";
+}
+if (! $res && file_exists($path."../../htdocs/master.inc.php")) {
+    $res=@include $path."../../htdocs/master.inc.php";
+}
+if (! $res && file_exists("../master.inc.php")) {
+    $res=@include "../master.inc.php";
+}
+if (! $res && file_exists("../../master.inc.php")) {
+    $res=@include "../../master.inc.php";
+}
+if (! $res && file_exists("../../../master.inc.php")) {
+    $res=@include "../../../master.inc.php";
+}
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) {
+    $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php";
+}
+// Used on dev env only
+if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) {
+    $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php";
+}
+// Used on dev env only
+if (! $res) {
+    die ("Failed to include master.inc.php file\n");
+}
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 
@@ -94,8 +112,7 @@ 
 	{
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR);
 		exit(-5);
-	}
-	else
+	} else
 	{
 		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
 		/*
@@ -125,13 +142,14 @@ 
 		$return_var=0;
 		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
 		exec($fullcommand, $output, $return_var);
-		foreach($output as $line) print $line."\n";
+		foreach($output as $line) {
+		    print $line."\n";
+		}
 
 		//ssh2_sftp_unlink($sftp, $fileinstalllock);
 		//print $output;
 	}
-}
-else
+} else
 {
 	print 'Failed to connect to ssh2 to '.$server;
 	exit(-6);