alxarafe / alixar

dolibarr/dev/initdemo/sftpget_and_loaddump.php

Indentation +46 added lines, -46 removed lines

@@ -25,8 +25,8 @@ 
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit;
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
 }
 
 // Global variables
@@ -60,17 +60,17 @@ 
 $server='';
 if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg))
 {
-	$login=$reg[1];
-	$server=$reg[2];
-	$sourcefile=$reg[3];
-	$targetfile=basename($sourcefile);
+    $login=$reg[1];
+    $server=$reg[2];
+    $sourcefile=$reg[3];
+    $targetfile=basename($sourcefile);
 }
 if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase))
 {
-	print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
-	print "Return code: 0 if success, <>0 if error\n";
-	print "Warning, this script may take a long time.\n";
-	exit(-1);
+    print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
+    print "Return code: 0 if success, <>0 if error\n";
+    print "Warning, this script may take a long time.\n";
+    exit(-1);
 }
 
 
@@ -84,21 +84,21 @@ 
 
 // SFTP connect
 if (! function_exists("ssh2_connect")) {
-	dol_print_error('','ssh2_connect function does not exists'); exit(1);
+    dol_print_error('','ssh2_connect function does not exists'); exit(1);
 }
 
 $connection = ssh2_connect($server, 22);
 if ($connection)
 {
-	if (! @ssh2_auth_password($connection, $login, $password))
-	{
-		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR);
-		exit(-5);
-	}
-	else
-	{
-		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
-		/*
+    if (! @ssh2_auth_password($connection, $login, $password))
+    {
+        dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR);
+        exit(-5);
+    }
+    else
+    {
+        //$stream = ssh2_exec($connection, '/usr/bin/php -i');
+        /*
 		print "Generate dump ".$filesys1.'.bz2'."\n";
 			$stream = ssh2_exec($connection, "mysqldump -u debian-sys-maint -p4k9Blxl2snq4FHXY -h 127.0.0.1 --single-transaction -K --tables -c -e --hex-blob --default-character-set=utf8 saasplex | bzip2 -1 > ".$filesys1.'.bz2');
 			stream_set_blocking($stream, true);
@@ -106,35 +106,35 @@ 
 			$output = stream_get_contents($stream);
 		*/
 
-		$sftp = ssh2_sftp($connection);
-
-		print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n";
-		ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile);
-
-		$fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
-		if (preg_match('/\.bz2$/',$targetfile))
-		{
-			$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
-		}
-		if (preg_match('/\.gz$/',$targetfile))
-		{
-			$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
-		}
-		print "Load dump with ".$fullcommand."\n";
-		$output=array();
-		$return_var=0;
-		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
-		exec($fullcommand, $output, $return_var);
-		foreach($output as $line) print $line."\n";
-
-		//ssh2_sftp_unlink($sftp, $fileinstalllock);
-		//print $output;
-	}
+        $sftp = ssh2_sftp($connection);
+
+        print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n";
+        ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile);
+
+        $fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+        if (preg_match('/\.bz2$/',$targetfile))
+        {
+            $fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+        }
+        if (preg_match('/\.gz$/',$targetfile))
+        {
+            $fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+        }
+        print "Load dump with ".$fullcommand."\n";
+        $output=array();
+        $return_var=0;
+        print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
+        exec($fullcommand, $output, $return_var);
+        foreach($output as $line) print $line."\n";
+
+        //ssh2_sftp_unlink($sftp, $fileinstalllock);
+        //print $output;
+    }
 }
 else
 {
-	print 'Failed to connect to ssh2 to '.$server;
-	exit(-6);
+    print 'Failed to connect to ssh2 to '.$server;
+    exit(-6);
 }
 
 

Spacing +38 added lines, -38 removed lines

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

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

dolibarr/dev/initdemo/updatedemo.php

Indentation +5 added lines, -5 removed lines

@@ -25,8 +25,8 @@ 
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit;
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
 }
 
 // Global variables
@@ -53,9 +53,9 @@ 
 
 if (empty($confirm))
 {
-	print "Usage: $script_file confirm\n";
-	print "Return code: 0 if success, <>0 if error\n";
-	exit(-1);
+    print "Usage: $script_file confirm\n";
+    print "Return code: 0 if success, <>0 if error\n";
+    exit(-1);
 }
 
 

Spacing +28 added lines, -28 removed lines

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

Braces +34 added lines, -11 removed lines

@@ -36,14 +36,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';
 
 
@@ -102,19 +120,24 @@ 
                         $j=0;
                         foreach($tableval as $field)
                         {
-                            if ($j) $sql2.=", ";
+                            if ($j) {
+                                $sql2.=", ";
+                            }
                             $sql2.= $field." = DATE_ADD(".$field.", INTERVAL ".$delta." YEAR)";
                             $j++;
                         }
                         $sql2.=" WHERE rowid = ".$obj->rowid;
                         //print $sql2."\n";
                         $resql2 = $db->query($sql2);
-                        if (! $resql2) dol_print_error($db);
+                        if (! $resql2) {
+                            dol_print_error($db);
+                        }
                     }
                     $i++;
                 }
+            } else {
+                dol_print_error($db);
             }
-            else dol_print_error($db);
         }
     }
 

dolibarr/dev/initdata/generate-order.php

Indentation +37 added lines, -37 removed lines

@@ -113,13 +113,13 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe where client in (1, 3)";
 $resql=$db->query($sql);
 if ($resql) {
-	$num_thirdparties = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_thirdparties) {
-		$i++;
-	    $row = $db->fetch_row($resql);
-		$societesid[$i] = $row[0];
-	}
+    $num_thirdparties = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_thirdparties) {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $societesid[$i] = $row[0];
+    }
 }
 else { print "err"; }
 
@@ -127,13 +127,13 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num) {
-		$i++;
-	    $row = $db->fetch_row($resql);
-		$commandesid[$i] = $row[0];
-	}
+    $num = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num) {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $commandesid[$i] = $row[0];
+    }
 }
 else { print "err"; }
 
@@ -142,14 +142,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-  $num_prods = $db->num_rows($resql);
-  $i = 0;
-  while ($i < $num_prods)
+    $num_prods = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_prods)
     {
-      $i++;
+        $i++;
 
-      $row = $db->fetch_row($resql);
-      $prodids[$i] = $row[0];
+        $row = $db->fetch_row($resql);
+        $prodids[$i] = $row[0];
     }
 }
 
@@ -183,8 +183,8 @@ 
     $db->begin();
 
     $result=$object->create($fuser);
-	if ($result >= 0)
-	{
+    if ($result >= 0)
+    {
         $nbp = mt_rand(2, 5);
         $xnbp = 0;
         while ($xnbp < $nbp)
@@ -200,24 +200,24 @@ 
             $xnbp++;
         }
 
-	    $result=$object->valid($fuser);
-		if ($result > 0)
-		{
+        $result=$object->valid($fuser);
+        if ($result > 0)
+        {
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-		}
-		else
-		{
+        }
+        else
+        {
             print " KO\n";
-		    $db->rollback();
-		    dol_print_error($db,$object->error);
-		}
-	}
-	else
-	{
+            $db->rollback();
+            dol_print_error($db,$object->error);
+        }
+    }
+    else
+    {
         print " KO\n";
-	    $db->rollback();
-	    dol_print_error($db,$object->error);
-	}
+        $db->rollback();
+        dol_print_error($db,$object->error);
+    }
 }
 

Spacing +66 added lines, -66 removed lines

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

Braces +4 added lines, -8 removed lines

@@ -120,8 +120,7 @@ 
 	    $row = $db->fetch_row($resql);
 		$societesid[$i] = $row[0];
 	}
-}
-else { print "err"; }
+} else { print "err"; }
 
 $commandesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
@@ -134,8 +133,7 @@ 
 	    $row = $db->fetch_row($resql);
 		$commandesid[$i] = $row[0];
 	}
-}
-else { print "err"; }
+} else { print "err"; }
 
 $prodids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
@@ -205,15 +203,13 @@ 
 		{
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-		}
-		else
+		} else
 		{
             print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db,$object->error);
 		}
-	}
-	else
+	} else
 	{
         print " KO\n";
 	    $db->rollback();

dolibarr/dev/initdata/purge-data.php

Indentation +11 added lines, -11 removed lines

@@ -81,11 +81,11 @@ 
         'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
         'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
     ),
-	'supplier_order'=>array(
+    'supplier_order'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
     ),
-	'supplier_invoice'=>array(
+    'supplier_invoice'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
     ),
@@ -116,9 +116,9 @@ 
         'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_batch',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_lot',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product',
     ),
     'project'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',
@@ -137,7 +137,7 @@ 
         'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
         'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
         'DELETE FROM '.MAIN_DB_PREFIX.'societe_rib',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe',
     )
 );
 
@@ -172,18 +172,18 @@ 
 // Replace database handler
 if (! empty($argv[3]))
 {
-	$db->close();
-	unset($db);
-	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
-	$user=new User($db);
+    $db->close();
+    unset($db);
+    $db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
+    $user=new User($db);
 }
 
 //var_dump($user->db->database_name);
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'An admin user with login "admin" must exists to use this script.'."\n";
-	exit;
+    print 'An admin user with login "admin" must exists to use this script.'."\n";
+    exit;
 }
 //$user->getrights();
 

Spacing +25 added lines, -25 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -35,7 +35,7 @@ 
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]);
+$path = preg_replace('/purge-data.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -47,11 +47,11 @@ 
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 // List of sql to execute
-$sqls=array(
+$sqls = array(
     'user'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin')",
         'DELETE FROM '.MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin'",
@@ -150,37 +150,37 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $option = $argv[2];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
+if (empty($mode) || !in_array($mode, array('test', 'confirm'))) {
     print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
     print "\n";
-    print "option can be ".implode(',',array_keys($sqls))."\n";
+    print "option can be ".implode(',', array_keys($sqls))."\n";
     exit(-1);
 }
 
-if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
+if (empty($option) || !in_array($option, array_merge(array('all'), array_keys($sqls)))) {
     print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
     print "\n";
-    print "option can be ".implode(',',array_keys($sqls))."\n";
+    print "option can be ".implode(',', array_keys($sqls))."\n";
     exit(-1);
 }
 
 // Replace database handler
-if (! empty($argv[3]))
+if (!empty($argv[3]))
 {
 	$db->close();
 	unset($db);
-	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
-	$user=new User($db);
+	$db = getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
+	$user = new User($db);
 }
 
 //var_dump($user->db->database_name);
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'An admin user with login "admin" must exists to use this script.'."\n";
 	exit;
@@ -195,7 +195,7 @@ 
 print "User = ".$db->database_user."\n";
 print "\n";
 
-if (! $confirmed)
+if (!$confirmed)
 {
     print "Hit Enter to continue or CTRL+C to stop...\n";
     $input = trim(fgets(STDIN));
@@ -212,19 +212,19 @@ 
 {
     global $db, $sqls;
 
-    $error=0;
-    foreach($sqls[$family] as $sql)
+    $error = 0;
+    foreach ($sqls[$family] as $sql)
     {
-        if (preg_match('/^@/',$sql))
+        if (preg_match('/^@/', $sql))
         {
-            $newfamily=preg_replace('/@/','',$sql);
+            $newfamily = preg_replace('/@/', '', $sql);
             processfamily($newfamily);
             continue;
         }
 
         print "Run sql: ".$sql."\n";
-        $resql=$db->query($sql);
-        if (! $resql)
+        $resql = $db->query($sql);
+        if (!$resql)
         {
             if ($db->errno() != 'DB_ERROR_NOSUCHTABLE')
             {
@@ -247,15 +247,15 @@ 
 
 $db->begin();
 
-$oldfamily='';
-foreach($sqls as $family => $familysql)
+$oldfamily = '';
+foreach ($sqls as $family => $familysql)
 {
     if ($option && $option != 'all' && $option != $family) continue;
 
     if ($family != $oldfamily) print "Process action for family ".$family."\n";
     $oldfamily = $family;
 
-    $result=processfamily($family);
+    $result = processfamily($family);
     if ($result < 0)
     {
         $error++;

Braces +13 added lines, -7 removed lines

@@ -240,9 +240,12 @@ 
         }
     }
 
-    if ($error) return -1;
-    else return 1;
-}
+    if ($error) {
+        return -1;
+    } else {
+        return 1;
+    }
+    }
 
 
 $db->begin();
@@ -250,9 +253,13 @@ 
 $oldfamily='';
 foreach($sqls as $family => $familysql)
 {
-    if ($option && $option != 'all' && $option != $family) continue;
+    if ($option && $option != 'all' && $option != $family) {
+        continue;
+    }
 
-    if ($family != $oldfamily) print "Process action for family ".$family."\n";
+    if ($family != $oldfamily) {
+        print "Process action for family ".$family."\n";
+    }
     $oldfamily = $family;
 
     $result=processfamily($family);
@@ -267,8 +274,7 @@ 
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
+} else
 {
     print "Commit all changes.\n";
     $db->commit();

dolibarr/dev/initdata/generate-invoice.php

Indentation +55 added lines, -55 removed lines

@@ -26,8 +26,8 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
-	exit;
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
 }
 
 // Recupere root dolibarr
@@ -98,8 +98,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -109,14 +109,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_thirdparties = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_thirdparties)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$socids[$i] = $row[0];
-	}
+    $num_thirdparties = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_thirdparties)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $socids[$i] = $row[0];
+    }
 }
 
 $prodids = array();
@@ -124,65 +124,65 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_prods = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_prods)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$prodids[$i] = $row[0];
-	}
+    $num_prods = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_prods)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $prodids[$i] = $row[0];
+    }
 }
 
 $i=0;
 $result=0;
 while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 {
-	$i++;
-	$socid = mt_rand(1, $num_thirdparties);
+    $i++;
+    $socid = mt_rand(1, $num_thirdparties);
 
-	print "Invoice ".$i." for socid ".$socid;
+    print "Invoice ".$i." for socid ".$socid;
 
-	$object = new Facture($db);
-	$object->socid = $socids[$socid];
-	$object->date = $dates[mt_rand(1, count($dates)-1)];
-	$object->cond_reglement_id = 3;
-	$object->mode_reglement_id = 3;
+    $object = new Facture($db);
+    $object->socid = $socids[$socid];
+    $object->date = $dates[mt_rand(1, count($dates)-1)];
+    $object->cond_reglement_id = 3;
+    $object->mode_reglement_id = 3;
 
     $fuser = new User($db);
     $fuser->fetch(mt_rand(1,2));
     $fuser->getRights();
     
-	$result=$object->create($fuser);
-	if ($result >= 0)
-	{
-		$nbp = mt_rand(2, 5);
-		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
-			$prodid = mt_rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
-		    if ($result < 0)
+    $result=$object->create($fuser);
+    if ($result >= 0)
+    {
+        $nbp = mt_rand(2, 5);
+        $xnbp = 0;
+        while ($xnbp < $nbp)
+        {
+            $prodid = mt_rand(1, $num_prods);
+            $product=new Product($db);
+            $result=$product->fetch($prodids[$prodid]);
+            $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+            if ($result < 0)
             {
                 dol_print_error($db,$propal->error);
             }
             $xnbp++;
-		}
+        }
 
-	    $result=$object->validate($fuser);
-		if ($result)
-		{
-			print " OK with ref ".$object->ref."\n";;
-		}
-		else
-		{
-			dol_print_error($db,$object->error);
-		}
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
-	}
+        $result=$object->validate($fuser);
+        if ($result)
+        {
+            print " OK with ref ".$object->ref."\n";;
+        }
+        else
+        {
+            dol_print_error($db,$object->error);
+        }
+    }
+    else
+    {
+        dol_print_error($db,$object->error);
+    }
 }

Spacing +66 added lines, -66 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -175,13 +175,11 @@
 		if ($result)
 		{
 			print " OK with ref ".$object->ref."\n";;
-		}
-		else
+		} else
 		{
 			dol_print_error($db,$object->error);
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db,$object->error);
 	}

dolibarr/dev/initdata/generate-thirdparty.php

Indentation +9 added lines, -9 removed lines

@@ -55,8 +55,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -64,21 +64,21 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
 $resql=$db->query($sql);
 if ($resql) {
-  $num = $db->num_rows($resql); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+    $num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
 }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
@@ -98,9 +98,9 @@ 
     $soc->tva_assuj=1;
     $soc->country_id=1;
     $soc->country_code='FR';
-	// Un client sur 3 a une remise de 5%
+    // Un client sur 3 a une remise de 5%
     $user_remise=mt_rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
-	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
+    print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
     $soc->note_private = 'Company created by the script generate-societe.php';
     $socid = $soc->create();
 
@@ -124,7 +124,7 @@ 
     }
     else
     {
-    	print "Error: ".$soc->error."\n";
+        print "Error: ".$soc->error."\n";
     }
 }
 

Spacing +25 added lines, -25 removed lines

@@ -33,7 +33,7 @@ 
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require __DIR__.'/../../htdocs/master.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -41,8 +41,8 @@ 
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-$listoftown = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
-$listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
+$listoftown = array("Auray", "Baden", "Vannes", "Pirouville", "Haguenau", "Souffelweiersheim", "Illkirch-Graffenstaden", "Lauterbourg", "Picauville", "Sainte-Mère Eglise", "Le Bono");
+$listoflastname = array("Joe", "Marc", "Steve", "Laurent", "Nico", "Isabelle", "Dorothee", "Saby", "Brigitte", "Karine", "Jose-Anne", "Celine", "Virginie");
 
 
 /*
@@ -52,8 +52,8 @@ 
 define(GEN_NUMBER_SOCIETE, 10);
 
 
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -62,59 +62,59 @@ 
 
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
   $num = $db->num_rows($resql); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+  while ($i < $num) {      $row = $db->fetch_row($resql); $productsid[$i] = $row[0]; $i++; }
 }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql); $i = 0;
-    while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
+    while ($i < $num) { $row = $db->fetch_row($resql); $societesid[$i] = $row[0]; $i++; }
 } else { print "err"; }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql); $i = 0;
-    while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
+    while ($i < $num) { $row = $db->fetch_row($resql); $commandesid[$i] = $row[0]; $i++; }
 } else { print "err"; }
 
 
 
 print "Generates ".GEN_NUMBER_SOCIETE." companies\n";
-for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
+for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++)
 {
     print "Company $s\n";
     $soc = new Societe($db);
     $soc->name = "Company num ".time()."$s";
-    $soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
-    $soc->client = mt_rand(1,2);		// Une societe sur 2 est prospect, l'autre client
-    $soc->fournisseur = mt_rand(0,1);	// Une societe sur 2 est fournisseur
-    $soc->code_client='CU'.time()."$s";
-    $soc->code_fournisseur='SU'.time()."$s";
-    $soc->tva_assuj=1;
-    $soc->country_id=1;
-    $soc->country_code='FR';
+    $soc->town = $listoftown[mt_rand(0, count($listoftown) - 1)];
+    $soc->client = mt_rand(1, 2); // Une societe sur 2 est prospect, l'autre client
+    $soc->fournisseur = mt_rand(0, 1); // Une societe sur 2 est fournisseur
+    $soc->code_client = 'CU'.time()."$s";
+    $soc->code_fournisseur = 'SU'.time()."$s";
+    $soc->tva_assuj = 1;
+    $soc->country_id = 1;
+    $soc->country_code = 'FR';
 	// Un client sur 3 a une remise de 5%
-    $user_remise=mt_rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
+    $user_remise = mt_rand(1, 3); if ($user_remise == 3) $soc->remise_percent = 5;
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
     $soc->note_private = 'Company created by the script generate-societe.php';
     $socid = $soc->create();
 
     if ($socid >= 0)
     {
-        $rand = mt_rand(1,4);
+        $rand = mt_rand(1, 4);
         print "> Generates $rand contact(s)\n";
-        for ($c = 0 ; $c < $rand ; $c++)
+        for ($c = 0; $c < $rand; $c++)
         {
             $contact = new Contact($db);
             $contact->socid = $soc->id;
             $contact->lastname = "Lastname".$c;
-            $contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
-            if ( $contact->create($user) )
+            $contact->firstname = $listoflastname[mt_rand(0, count($listoflastname) - 1)];
+            if ($contact->create($user))
             {
 
             }

Braces +4 added lines, -3 removed lines

@@ -99,7 +99,9 @@ 
     $soc->country_id=1;
     $soc->country_code='FR';
 	// Un client sur 3 a une remise de 5%
-    $user_remise=mt_rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
+    $user_remise=mt_rand(1,3); if ($user_remise==3) {
+        $soc->remise_percent=5;
+    }
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
     $soc->note_private = 'Company created by the script generate-societe.php';
     $socid = $soc->create();
@@ -121,8 +123,7 @@ 
         }
 
         print "Company ".$s." created nom=".$soc->name."\n";
-    }
-    else
+    } else
     {
     	print "Error: ".$soc->error."\n";
     }

dolibarr/dev/initdata/import-thirdparties.php

Indentation +94 added lines, -94 removed lines

@@ -81,8 +81,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -182,116 +182,116 @@ 
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - Creation OK with name ".$object->name." - id = ".$ret;
-    	}
+        else
+        {
+            print " - Creation OK with name ".$object->name." - id = ".$ret;
+        }
     }
 
     if (! $errorrecord)
     {
         dol_syslog("Set price level");
-	    $object->set_price_level($object->price_level, $user);
+        $object->set_price_level($object->price_level, $user);
+    }
+
+    // Assign sales representative
+    if (! $errorrecord && $fields[3])
+    {
+        $salesrep=new User($db);
+
+        $tmp=explode(' ',$fields[3],2);
+        $salesrep->firstname = trim($tmp[0]);
+        $salesrep->lastname = trim($tmp[1]);
+        if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
+        else $salesrep->login=strtolower($salesrep->firstname);
+        $salesrep->login=preg_replace('/ /','',$salesrep->login);
+        $salesrep->fetch(0,$salesrep->login);
+
+        $result = $object->add_commercial($user, $salesrep->id);
+        if ($result < 0)
+        {
+            print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+        else
+        {
+            print " - create link sale representative OK";
+        }
     }
 
-	// Assign sales representative
-	if (! $errorrecord && $fields[3])
-	{
-    	$salesrep=new User($db);
-
-    	$tmp=explode(' ',$fields[3],2);
-    	$salesrep->firstname = trim($tmp[0]);
-    	$salesrep->lastname = trim($tmp[1]);
-    	if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
-    	else $salesrep->login=strtolower($salesrep->firstname);
-    	$salesrep->login=preg_replace('/ /','',$salesrep->login);
-    	$salesrep->fetch(0,$salesrep->login);
-
-    	$result = $object->add_commercial($user, $salesrep->id);
-    	if ($result < 0)
-    	{
-    	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
-    	    $errorrecord++;
-    	}
-    	else
-    	{
-    	    print " - create link sale representative OK";
-    	}
-	}
-
-	dol_syslog("Add invoice contacts");
-	// Insert an invoice contact if there is an invoice email != standard email
-	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
-	{
-	    $ret1=$ret2=0;
-
-	    $contact = new Contact($db);
-	    $contact->lastname = $object->name;
-	    $contact->address=$object->address;
-	    $contact->zip=$object->zip;
-	    $contact->town=$object->town;
-	    $contact->country_id=$object->country_id;
-	    $contact->email=$fields[27];
-	    $contact->socid=$object->id;
-
-	    $ret1=$contact->create($user);
-	    if ($ret1 > 0)
-	    {
-	        //$ret2=$contact->add_contact($object->id, 'BILLING');
-	    }
-	    if ($ret1 < 0 || $ret2 < 0)
+    dol_syslog("Add invoice contacts");
+    // Insert an invoice contact if there is an invoice email != standard email
+    if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
+    {
+        $ret1=$ret2=0;
+
+        $contact = new Contact($db);
+        $contact->lastname = $object->name;
+        $contact->address=$object->address;
+        $contact->zip=$object->zip;
+        $contact->town=$object->town;
+        $contact->country_id=$object->country_id;
+        $contact->email=$fields[27];
+        $contact->socid=$object->id;
+
+        $ret1=$contact->create($user);
+        if ($ret1 > 0)
+        {
+            //$ret2=$contact->add_contact($object->id, 'BILLING');
+        }
+        if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - create contact OK";
-    	}
-	}
-
-	dol_syslog("Add delivery contacts");
-	// Insert a delivery contact
-	if (! $errorrecord && $fields[47])
-	{
-	    $ret1=$ret2=0;
-
-	    $contact2 = new Contact($db);
-	    $contact2->lastname = 'Service livraison - '.$fields[47];
-	    $contact2->address = $fields[48];
-	    $contact2->zip = $fields[50];
-	    $contact2->town = $fields[51];
-	    $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
-	    $contact2->note_public=$fields[54];
-	    $contact2->socid=$object->id;
-
-	    // Extrafields
-	    $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
-
-	    $ret1=$contact2->create($user);
-	    if ($ret1 > 0)
-	    {
-	        //$ret2=$contact2->add_contact($object->id, 'SHIPPING');
-	    }
-	    if ($ret1 < 0 || $ret2 < 0)
+        else
+        {
+            print " - create contact OK";
+        }
+    }
+
+    dol_syslog("Add delivery contacts");
+    // Insert a delivery contact
+    if (! $errorrecord && $fields[47])
+    {
+        $ret1=$ret2=0;
+
+        $contact2 = new Contact($db);
+        $contact2->lastname = 'Service livraison - '.$fields[47];
+        $contact2->address = $fields[48];
+        $contact2->zip = $fields[50];
+        $contact2->town = $fields[51];
+        $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
+        $contact2->note_public=$fields[54];
+        $contact2->socid=$object->id;
+
+        // Extrafields
+        $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
+
+        $ret1=$contact2->create($user);
+        if ($ret1 > 0)
+        {
+            //$ret2=$contact2->add_contact($object->id, 'SHIPPING');
+        }
+        if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - create contact OK";
-    	}
-	}
+        else
+        {
+            print " - create contact OK";
+        }
+    }
 
 
-	print "\n";
+    print "\n";
 
-	if ($errorrecord)
-	{
-	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
-	}
+    if ($errorrecord)
+    {
+        fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+        $error++;    // $errorrecord will be reset
+    }
 }
 
 

Spacing +55 added lines, -55 removed lines

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

Braces +25 added lines, -17 removed lines

@@ -119,8 +119,12 @@ 
     $i++;
     $errorrecord=0;
 
-    if ($startlinenb && $i < $startlinenb) continue;
-    if ($endlinenb && $i > $endlinenb) continue;
+    if ($startlinenb && $i < $startlinenb) {
+        continue;
+    }
+    if ($endlinenb && $i > $endlinenb) {
+        continue;
+    }
 
     $nboflines++;
 
@@ -147,8 +151,12 @@ 
     if ($fields[36])
     {
         $condpayment = trim($fields[36]);
-        if ($condpayment == 'A la commande') $condpayment = 'A réception de commande';
-        if ($condpayment == 'A reception facture') $condpayment = 'Réception de facture';
+        if ($condpayment == 'A la commande') {
+            $condpayment = 'A réception de commande';
+        }
+        if ($condpayment == 'A reception facture') {
+            $condpayment = 'Réception de facture';
+        }
         $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid', 1);
         if (empty($object->cond_reglement_id))
         {
@@ -165,7 +173,9 @@ 
 
     // Set price level
     $object->price_level = 1;
-    if ($labeltype == 'Revendeur') $object->price_level = 2;
+    if ($labeltype == 'Revendeur') {
+        $object->price_level = 2;
+    }
 
     print "Process line nb ".$i.", name ".$object->name;
 
@@ -181,8 +191,7 @@ 
         {
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
+        } else
     	{
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
@@ -202,8 +211,11 @@ 
     	$tmp=explode(' ',$fields[3],2);
     	$salesrep->firstname = trim($tmp[0]);
     	$salesrep->lastname = trim($tmp[1]);
-    	if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
-    	else $salesrep->login=strtolower($salesrep->firstname);
+    	if ($salesrep->lastname) {
+    	    $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
+    	} else {
+    	    $salesrep->login=strtolower($salesrep->firstname);
+    	}
     	$salesrep->login=preg_replace('/ /','',$salesrep->login);
     	$salesrep->fetch(0,$salesrep->login);
 
@@ -212,8 +224,7 @@ 
     	{
     	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
     	    $errorrecord++;
-    	}
-    	else
+    	} else
     	{
     	    print " - create link sale representative OK";
     	}
@@ -243,8 +254,7 @@ 
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
+        } else
     	{
     	    print " - create contact OK";
     	}
@@ -277,8 +287,7 @@ 
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
+        } else
     	{
     	    print " - create contact OK";
     	}
@@ -305,8 +314,7 @@ 
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
+} else
 {
     print "Commit all changes.\n";
     $db->commit();

dolibarr/dev/initdata/import-users.php

Indentation +14 added lines, -14 removed lines

@@ -81,8 +81,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -143,18 +143,18 @@ 
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
     }
-	else
-	{
-	    print " - Creation OK with login ".$object->login." - id = ".$ret;
-	}
-
-	print "\n";
-
-	if ($errorrecord)
-	{
-	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
-	}
+    else
+    {
+        print " - Creation OK with login ".$object->login." - id = ".$ret;
+    }
+
+    print "\n";
+
+    if ($errorrecord)
+    {
+        fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+        $error++;    // $errorrecord will be reset
+    }
 }
 
 

Spacing +29 added lines, -29 removed lines

@@ -28,27 +28,27 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
     exit;
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-users.php/i','',$_SERVER["PHP_SELF"]);
+$path = preg_replace('/import-users.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$delimiter=',';
-$enclosure='"';
-$linelength=10000;
-$escape='/';
+$delimiter = ',';
+$enclosure = '"';
+$linelength = 10000;
+$escape = '/';
 
 // Global variables
-$version=DOL_VERSION;
-$confirmed=1;
-$error=0;
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
 
 
 /*
@@ -57,29 +57,29 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $filepath = $argv[2];
 $filepatherr = $filepath.'.err';
 //$defaultlang = empty($argv[3])?'en_US':$argv[3];
-$startlinenb = empty($argv[3])?1:$argv[3];
-$endlinenb = empty($argv[4])?0:$argv[4];
+$startlinenb = empty($argv[3]) ? 1 : $argv[3];
+$endlinenb = empty($argv[4]) ? 0 : $argv[4];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+if (empty($mode) || !in_array($mode, array('test', 'confirm', 'confirmforced')) || empty($filepath)) {
     print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
     print "Usage:  $script_file test myfilepath.csv 2 1002\n";
     print "\n";
     exit(-1);
 }
-if (! file_exists($filepath)) {
+if (!file_exists($filepath)) {
     print "Error: File ".$filepath." not found.\n";
     print "\n";
     exit(-1);
 }
 
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -87,7 +87,7 @@ 
 $user->getrights();
 
 // Ask confirmation
-if (! $confirmed)
+if (!$confirmed)
 {
     print "Hit Enter to continue or CTRL+C to stop...\n";
     $input = trim(fgets(STDIN));
@@ -95,13 +95,13 @@ 
 
 // Open input and ouput files
 $fhandle = fopen($filepath, 'r');
-if (! $fhandle)
+if (!$fhandle)
 {
     print 'Error: Failed to open file '.$filepath."\n";
     exit(1);
 }
 $fhandleerr = fopen($filepatherr, 'w');
-if (! $fhandleerr)
+if (!$fhandleerr)
 {
     print 'Error: Failed to open file '.$filepatherr."\n";
     exit(1);
@@ -112,12 +112,12 @@ 
 
 $db->begin();
 
-$i=0;
-$nboflines=0;
-while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+$i = 0;
+$nboflines = 0;
+while ($fields = fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
-    $errorrecord=0;
+    $errorrecord = 0;
 
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
@@ -127,17 +127,17 @@ 
     $object = new User($db);
     $object->statut = 1;
 
-    $tmp=explode(' ',$fields[3],2);
+    $tmp = explode(' ', $fields[3], 2);
     $object->firstname = trim($tmp[0]);
     $object->lastname = trim($tmp[1]);
-    if ($object->lastname) $object->login = strtolower(substr($object->firstname, 0, 1)) . strtolower(substr($object->lastname, 0));
-    else $object->login=strtolower($object->firstname);
-    $object->login=preg_replace('/ /','',$object->login);
+    if ($object->lastname) $object->login = strtolower(substr($object->firstname, 0, 1)).strtolower(substr($object->lastname, 0));
+    else $object->login = strtolower($object->firstname);
+    $object->login = preg_replace('/ /', '', $object->login);
     $object->password = 'init';
 
     print "Process line nb ".$i.", login ".$object->login;
 
-    $ret=$object->create($user);
+    $ret = $object->create($user);
     if ($ret < 0)
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
@@ -153,7 +153,7 @@ 
 	if ($errorrecord)
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
+	    $error++; // $errorrecord will be reset
 	}
 }
 

Braces +13 added lines, -8 removed lines

@@ -119,8 +119,12 @@ 
     $i++;
     $errorrecord=0;
 
-    if ($startlinenb && $i < $startlinenb) continue;
-    if ($endlinenb && $i > $endlinenb) continue;
+    if ($startlinenb && $i < $startlinenb) {
+        continue;
+    }
+    if ($endlinenb && $i > $endlinenb) {
+        continue;
+    }
 
     $nboflines++;
 
@@ -130,8 +134,11 @@ 
     $tmp=explode(' ',$fields[3],2);
     $object->firstname = trim($tmp[0]);
     $object->lastname = trim($tmp[1]);
-    if ($object->lastname) $object->login = strtolower(substr($object->firstname, 0, 1)) . strtolower(substr($object->lastname, 0));
-    else $object->login=strtolower($object->firstname);
+    if ($object->lastname) {
+        $object->login = strtolower(substr($object->firstname, 0, 1)) . strtolower(substr($object->lastname, 0));
+    } else {
+        $object->login=strtolower($object->firstname);
+    }
     $object->login=preg_replace('/ /','',$object->login);
     $object->password = 'init';
 
@@ -142,8 +149,7 @@ 
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
-    }
-	else
+    } else
 	{
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
@@ -168,8 +174,7 @@ 
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
+} else
 {
     print "Commit all changes.\n";
     $db->commit();

dolibarr/dev/initdata/import-products.php

Indentation +37 added lines, -37 removed lines

@@ -81,8 +81,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -164,56 +164,56 @@ 
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
     }
-	else
-	{
-	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
-	}
+    else
+    {
+        print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
+    }
 
-	dol_syslog("Add prices");
+    dol_syslog("Add prices");
 
     // If we use price level, insert price for each level
-	if (! $errorrecord && 1)
-	{
-	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
-	    $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
-	    if ($ret1 < 0 || $ret2 < 0)
+    if (! $errorrecord && 1)
+    {
+        $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+        $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
+        if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - updatePrice OK";
-    	}
-	}
+        else
+        {
+            print " - updatePrice OK";
+        }
+    }
 
-	dol_syslog("Add multilangs");
+    dol_syslog("Add multilangs");
 
-	// Add alternative languages
-	if (! $errorrecord && 1)
-	{
-    	$produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
-	    $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
+    // Add alternative languages
+    if (! $errorrecord && 1)
+    {
+        $produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
+        $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
 
-    	$ret=$produit->setMultiLangs($user);
+        $ret=$produit->setMultiLangs($user);
         if ($ret < 0)
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - setMultiLangs OK";
-    	}
-	}
-
-	print "\n";
-
-	if ($errorrecord)
-	{
-	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
-	}
+        else
+        {
+            print " - setMultiLangs OK";
+        }
+    }
+
+    print "\n";
+
+    if ($errorrecord)
+    {
+        fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
+        $error++;    // $errorrecord will be reset
+    }
 }
 
 

Spacing +34 added lines, -34 removed lines

@@ -28,27 +28,27 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
     exit;
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]);
+$path = preg_replace('/import-products.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$delimiter=',';
-$enclosure='"';
-$linelength=10000;
-$escape='/';
+$delimiter = ',';
+$enclosure = '"';
+$linelength = 10000;
+$escape = '/';
 
 // Global variables
-$version=DOL_VERSION;
-$confirmed=1;
-$error=0;
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
 
 
 /*
@@ -57,29 +57,29 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $filepath = $argv[2];
 $filepatherr = $filepath.'.err';
-$defaultlang = empty($argv[3])?'en_US':$argv[3];
-$startlinenb = empty($argv[4])?1:$argv[4];
-$endlinenb = empty($argv[5])?0:$argv[5];
+$defaultlang = empty($argv[3]) ? 'en_US' : $argv[3];
+$startlinenb = empty($argv[4]) ? 1 : $argv[4];
+$endlinenb = empty($argv[5]) ? 0 : $argv[5];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+if (empty($mode) || !in_array($mode, array('test', 'confirm', 'confirmforced')) || empty($filepath)) {
     print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";
     print "Usage:  $script_file test myfilepath.csv fr_FR 2 1002\n";
     print "\n";
     exit(-1);
 }
-if (! file_exists($filepath)) {
+if (!file_exists($filepath)) {
     print "Error: File ".$filepath." not found.\n";
     print "\n";
     exit(-1);
 }
 
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -87,7 +87,7 @@ 
 $user->getrights();
 
 // Ask confirmation
-if (! $confirmed)
+if (!$confirmed)
 {
     print "Hit Enter to continue or CTRL+C to stop...\n";
     $input = trim(fgets(STDIN));
@@ -95,13 +95,13 @@ 
 
 // Open input and ouput files
 $fhandle = fopen($filepath, 'r');
-if (! $fhandle)
+if (!$fhandle)
 {
     print 'Error: Failed to open file '.$filepath."\n";
     exit(1);
 }
 $fhandleerr = fopen($filepatherr, 'w');
-if (! $fhandleerr)
+if (!$fhandleerr)
 {
     print 'Error: Failed to open file '.$filepatherr."\n";
     exit(1);
@@ -112,12 +112,12 @@ 
 
 $db->begin();
 
-$i=0;
+$i = 0;
 $nboflines++;
-while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+while ($fields = fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
-    $errorrecord=0;
+    $errorrecord = 0;
 
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
@@ -135,7 +135,7 @@ 
     $produit->volume = price2num($fields[8]);
     $produit->volume_unit = 0;
     $produit->weight = price2num($fields[9]);
-    $produit->weight_units = 0;          // -3 = g
+    $produit->weight_units = 0; // -3 = g
 
     $produit->customcode = $fields[10];
     $produit->barcode = $fields[1];
@@ -156,9 +156,9 @@ 
     $produit->cost_price = price2num($fields[16]);
 
     // Extrafields
-    $produit->array_options['options_ecotaxdeee']=price2num($fields[17]);
+    $produit->array_options['options_ecotaxdeee'] = price2num($fields[17]);
 
-    $ret=$produit->create($user);
+    $ret = $produit->create($user);
     if ($ret < 0)
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
@@ -172,10 +172,10 @@ 
 	dol_syslog("Add prices");
 
     // If we use price level, insert price for each level
-	if (! $errorrecord && 1)
+	if (!$errorrecord && 1)
 	{
-	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
-	    $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
+	    $ret1 = $produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+	    $ret2 = $produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
 	    if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
@@ -190,12 +190,12 @@ 
 	dol_syslog("Add multilangs");
 
 	// Add alternative languages
-	if (! $errorrecord && 1)
+	if (!$errorrecord && 1)
 	{
-    	$produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
-	    $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
+    	$produit->multilangs['fr_FR'] = array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
+	    $produit->multilangs['en_US'] = array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
 
-    	$ret=$produit->setMultiLangs($user);
+    	$ret = $produit->setMultiLangs($user);
         if ($ret < 0)
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
@@ -212,7 +212,7 @@ 
 	if ($errorrecord)
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
+	    $error++; // $errorrecord will be reset
 	}
 }
 

Braces +10 added lines, -10 removed lines

@@ -119,8 +119,12 @@ 
     $i++;
     $errorrecord=0;
 
-    if ($startlinenb && $i < $startlinenb) continue;
-    if ($endlinenb && $i > $endlinenb) continue;
+    if ($startlinenb && $i < $startlinenb) {
+        continue;
+    }
+    if ($endlinenb && $i > $endlinenb) {
+        continue;
+    }
 
     $nboflines++;
 
@@ -163,8 +167,7 @@ 
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
-    }
-	else
+    } else
 	{
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
@@ -180,8 +183,7 @@ 
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
+        } else
     	{
     	    print " - updatePrice OK";
     	}
@@ -200,8 +202,7 @@ 
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
+        } else
     	{
     	    print " - setMultiLangs OK";
     	}
@@ -227,8 +228,7 @@ 
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
+} else
 {
     print "Commit all changes.\n";
     $db->commit();