Dolibarr / dolibarr

dev/initdata/generate-thirdparty.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 
 print "Generates ".GEN_NUMBER_SOCIETE." companies\n";
 for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++) {
-	print "Company $s\n";
+	print "company $s\n";
 	$soc = new Societe($db);
 	$soc->name = "Company num ".time()."$s";
 	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];

Spacing +20 added lines, -20 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
 $sapi_type = php_sapi_name();
@@ -37,7 +37,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';
@@ -45,8 +45,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");
 
 
 /*
@@ -56,8 +56,8 @@ 
 define('GEN_NUMBER_SOCIETE', $argv[1] ?? 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;
 }
@@ -65,7 +65,7 @@ 
 
 
 $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) {
@@ -76,7 +76,7 @@ 
 }
 
 $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) {
@@ -89,7 +89,7 @@ 
 }
 
 $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) {
@@ -108,17 +108,17 @@ 
 	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';
@@ -131,7 +131,7 @@ 
 			$contact = new Contact($db);
 			$contact->socid = $soc->id;
 			$contact->lastname = "Lastname".$c;
-			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
+			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname) - 1)];
 			if ($contact->create($user)) {
 			}
 		}

dev/initdata/purge-data.php

Spacing +21 added lines, -21 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=__DIR__.'/';
+$path = __DIR__.'/';
 
 // 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') AND fk_user IN (select rowid FROM ".MAIN_DB_PREFIX."user where datec < '__DATE__')",
 		"DELETE FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin' AND datec < '__DATE__'",
@@ -182,7 +182,7 @@ 
 $option = $argv[2];
 $date = $argv[3];
 
-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) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 	print "\n";
 	print "option can be ".implode(',', array_keys($sqls))."\n";
@@ -195,9 +195,9 @@ 
 	exit(-1);
 }
 if ($option != 'all') {
-	$listofoptions=explode(',', $option);
+	$listofoptions = explode(',', $option);
 	foreach ($listofoptions as $cursoroption) {
-		if (! in_array($cursoroption, array_keys($sqls))) {
+		if (!in_array($cursoroption, array_keys($sqls))) {
 			print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 			print "\n";
 			print "option '".$cursoroption."' must be in list ".implode(',', array_keys($sqls))."\n";
@@ -206,7 +206,7 @@ 
 	}
 }
 
-if (empty($date) || (! preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date != 'all')) {
+if (empty($date) || (!preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date != 'all')) {
 	print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 	print "\n";
 	print "date can be 'all' or 'YYYY-MM-DD' to delete record before YYYY-MM-DD\n";
@@ -221,13 +221,13 @@ 
 if (!empty($argv[4])) {
 	$db->close();
 	unset($db);
-	$db=getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
-	$user=new User($db);
+	$db = getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
+	$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;
 }
@@ -242,7 +242,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));
 }
@@ -259,10 +259,10 @@ 
 {
 	global $db, $sqls;
 
-	$error=0;
+	$error = 0;
 	foreach ($sqls[$family] as $sql) {
 		if (preg_match('/^@/', $sql)) {
-			$newfamily=preg_replace('/@/', '', $sql);
+			$newfamily = preg_replace('/@/', '', $sql);
 			processfamily($newfamily, $date);
 			continue;
 		}
@@ -271,8 +271,8 @@ 
 
 		print "Run sql: ".$sql."\n";
 
-		$resql=$db->query($sql);
-		if (! $resql) {
+		$resql = $db->query($sql);
+		if (!$resql) {
 			if ($db->errno() != 'DB_ERROR_NOSUCHTABLE') {
 				$error++;
 			}
@@ -295,9 +295,9 @@ 
 
 $db->begin();
 
-$listofoptions=explode(',', $option);
+$listofoptions = explode(',', $option);
 foreach ($listofoptions as $cursoroption) {
-	$oldfamily='';
+	$oldfamily = '';
 	foreach ($sqls as $family => $familysql) {
 		if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) {
 			continue;
@@ -308,7 +308,7 @@ 
 		}
 		$oldfamily = $family;
 
-		$result=processfamily($family, $date);
+		$result = processfamily($family, $date);
 		if ($result < 0) {
 			$error++;
 			break;

dev/initdata/generate-product.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 	$produit->tva_tx = "20.0";
 	$ret=$produit->create($user);
 	if ($ret < 0) {
-		print "Error $ret - ".$produit->error."\n";
+		print "error $ret - ".$produit->error."\n";
 	} else {
 		print " OK with ref ".$produit->ref."\n";
 	}

Spacing +12 added lines, -12 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
 $sapi_type = php_sapi_name();
@@ -37,7 +37,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';
 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';
@@ -53,8 +53,8 @@ 
 define('GEN_NUMBER_PRODUIT', $argv[1] ?? 100);
 
 
-$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,31 +62,31 @@ 
 
 
 $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++;
+		$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++;
+		$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++;
+		$row = $db->fetch_row($resql); $commandesid[$i] = $row[0]; $i++;
 	}
 } else {
 	print "err";
@@ -99,12 +99,12 @@ 
 	$produit = new Product($db);
 	$produit->type = mt_rand(0, 1);
 	$produit->status = 1;
-	$produit->ref = ($produit->type?'S':'P').time().$s;
+	$produit->ref = ($produit->type ? 'S' : 'P').time().$s;
 	$produit->label = 'Label '.time().$s;
 	$produit->description = 'Description '.time().$s;
 	$produit->price = mt_rand(1, 999.99);
 	$produit->tva_tx = "20.0";
-	$ret=$produit->create($user);
+	$ret = $produit->create($user);
 	if ($ret < 0) {
 		print "Error $ret - ".$produit->error."\n";
 	} else {

dev/initdata/import-users.php

Spacing +28 added lines, -28 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 "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\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;
 
 
 /*
@@ -63,42 +63,42 @@ 
 $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;
 }
 $user->getrights();
 
 // Ask confirmation
-if (! $confirmed) {
+if (!$confirmed) {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
 }
 
 // Open input and output 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);
 }
@@ -108,11 +108,11 @@ 
 
 $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;
@@ -126,20 +126,20 @@ 
 	$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));
+		$object->login = strtolower(substr($object->firstname, 0, 1)).strtolower(substr($object->lastname, 0));
 	} else {
-		$object->login=strtolower($object->firstname);
+		$object->login = strtolower($object->firstname);
 	}
-	$object->login=preg_replace('/ /', '', $object->login);
+	$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();
 		$errorrecord++;
@@ -151,7 +151,7 @@ 
 
 	if ($errorrecord) {
 		fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-		$error++;    // $errorrecord will be reset
+		$error++; // $errorrecord will be reset
 	}
 }
 

dev/initdata/import-products.php

Spacing +33 added lines, -33 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 "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\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;
 
 
 /*
@@ -62,43 +62,43 @@ 
 $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;
 }
 $user->getrights();
 
 // Ask confirmation
-if (! $confirmed) {
+if (!$confirmed) {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
 }
 
 // Open input and output 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);
 }
@@ -108,11 +108,11 @@ 
 
 $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;
@@ -134,7 +134,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];
@@ -155,9 +155,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();
 		$errorrecord++;
@@ -168,9 +168,9 @@ 
 	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 (!$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++;
@@ -182,11 +182,11 @@ 
 	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);
+	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++;
@@ -199,7 +199,7 @@ 
 
 	if ($errorrecord) {
 		fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
-		$error++;    // $errorrecord will be reset
+		$error++; // $errorrecord will be reset
 	}
 }
 

htdocs/ticket/document.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 	accessforbidden();
 }
 
-$permissiontoadd = $user->rights->ticket->write;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+$permissiontoadd = $user->rights->ticket->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 
 
 /*

htdocs/salaries/class/salary.class.php

Indentation +3 added lines, -3 removed lines

@@ -446,7 +446,7 @@ 
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between payment salary and line generate into llx_bank
 	 *
@@ -455,7 +455,7 @@ 
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'salary SET fk_bank = '.((int) $id_bank);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 		$result = $this->db->query($sql);
@@ -692,7 +692,7 @@ 
 		return $this->LibStatut($this->paye, $mode, $alreadypaid);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a given status
 	 *

Braces +39 added lines, -13 removed lines

@@ -201,7 +201,9 @@ 
 		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('SALARY_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -382,7 +384,9 @@ 
 		$sql .= ", salary";
 		$sql .= ", fk_typepayment";
 		$sql .= ", fk_account";
-		if ($this->note) $sql .= ", note";
+		if ($this->note) {
+			$sql .= ", note";
+		}
 		$sql .= ", label";
 		$sql .= ", datesp";
 		$sql .= ", dateep";
@@ -400,7 +404,9 @@ 
 		$sql .= ", ".($this->salary > 0 ? ((double) $this->salary) : "null");
 		$sql .= ", ".($this->type_payment > 0 ? ((int) $this->type_payment) : 0);
 		$sql .= ", ".($this->accountid > 0 ? ((int) $this->accountid) : "null");
-		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+		if ($this->note) {
+			$sql .= ", '".$this->db->escape($this->note)."'";
+		}
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->idate($this->datesp)."'";
 		$sql .= ", '".$this->db->idate($this->dateep)."'";
@@ -428,9 +434,13 @@ 
 
 				// Call trigger
 				$result = $this->call_trigger('SALARY_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
-			} else $error++;
+			} else {
+				$error++;
+			}
 
 			if (!$error) {
 				$this->db->commit();
@@ -503,7 +513,10 @@ 
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$result = '';
 		$params = [
@@ -564,8 +577,11 @@ 
 		$hookmanager->initHooks(array('salarypayment'));
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -591,7 +607,9 @@ 
 			$amount = 0;
 
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			if ($obj) {
+				$amount = $obj->amount ? $obj->amount : 0;
+			}
 
 			$this->db->free($resql);
 			return $amount;
@@ -718,15 +736,23 @@ 
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			}
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			}
 		}
 
 		$statusType = 'status1';
-		if ($status == 0 && $alreadypaid <> 0) $statusType = 'status3';
-		if ($status == 1) $statusType = 'status6';
+		if ($status == 0 && $alreadypaid <> 0) {
+			$statusType = 'status3';
+		}
+		if ($status == 1) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}

Spacing +1 added lines, -1 removed lines

@@ -497,7 +497,7 @@
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');

htdocs/salaries/list.php

Spacing +2 added lines, -2 removed lines

@@ -349,7 +349,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -637,7 +637,7 @@ 
 	$userstatic->login = $obj->login;
 	$userstatic->email = $obj->email;
 	$userstatic->socid = $obj->fk_soc;
-	$userstatic->statut = $obj->status;		// deprecated
+	$userstatic->statut = $obj->status; // deprecated
 	$userstatic->status = $obj->status;
 	$userstatic->photo = $obj->photo;
 

Braces +3 added lines, -1 removed lines

@@ -719,7 +719,9 @@
 
 		// Payment mode
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("PaymentTypeShort".$obj->payment_code)).'">';
-		if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		if (!empty($obj->payment_code)) {
+			print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;

htdocs/holiday/view_log.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 $action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction         = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$mode      = GETPOST('mode', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 $show_files         = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
 $confirm            = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel             = GETPOST('cancel', 'alpha'); // We click on a Cancel button