Dolibarr / dolibarr

dev/initdata/purge-data.php

Spacing +21 added lines, -21 removed lines

@@ -27,7 +27,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') {
@@ -36,7 +36,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';
@@ -48,11 +48,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__'",
@@ -183,7 +183,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";
@@ -196,9 +196,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";
@@ -207,7 +207,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";
@@ -222,12 +222,12 @@ 
 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);
 }
 
-$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/import-products.php

Spacing +22 added lines, -22 removed lines

@@ -29,14 +29,14 @@ 
 // 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';
@@ -67,39 +67,39 @@ 
 $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) {
+if (!$ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
 }
 $user->loadRights();
 
 // 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);
 }
@@ -109,11 +109,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;
@@ -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();
 		$errorrecord++;
@@ -169,9 +169,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++;
@@ -183,11 +183,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++;
@@ -200,7 +200,7 @@ 
 
 	if ($errorrecord) {
 		fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
-		$error++;    // $errorrecord will be reset
+		$error++; // $errorrecord will be reset
 	}
 }
 

dev/initdata/import-users.php

Spacing +19 added lines, -19 removed lines

@@ -29,14 +29,14 @@ 
 // 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';
@@ -67,39 +67,39 @@ 
 $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->loadRights();
 
 // 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);
 }
@@ -109,11 +109,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;
@@ -127,20 +127,20 @@ 
 	$object = new User($db);
 	$object->status = 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++;
@@ -152,7 +152,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-thirdparties.php

Spacing +41 added lines, -41 removed lines

@@ -29,14 +29,14 @@ 
 // 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-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';
@@ -67,39 +67,39 @@ 
 $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) {
+if (!$ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
 }
 $user->loadRights();
 
 // 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);
 }
@@ -109,11 +109,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;
@@ -175,11 +175,11 @@ 
 
 
 	// 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) {
-		$ret=$object->create($user);
+	if (!$errorrecord) {
+		$ret = $object->create($user);
 		if ($ret < 0) {
 			print " - Error in create result code = ".$ret." - ".$object->errorsToString();
 			$errorrecord++;
@@ -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]) {
-		$salesrep=new User($db);
+	if (!$errorrecord && $fields[3]) {
+		$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));
+			$salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)).strtolower(substr($salesrep->lastname, 0));
 		} else {
-			$salesrep->login=strtolower($salesrep->firstname);
+			$salesrep->login = strtolower($salesrep->firstname);
 		}
-		$salesrep->login=preg_replace('/ /', '', $salesrep->login);
+		$salesrep->login = preg_replace('/ /', '', $salesrep->login);
 		$salesrep->fetch(0, $salesrep->login);
 
 		$result = $object->add_commercial($user, $salesrep->id);
@@ -219,19 +219,19 @@ 
 
 	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;
+	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);
+		$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');
 		}
@@ -245,22 +245,22 @@ 
 
 	dol_syslog("Add delivery contacts");
 	// Insert a delivery contact
-	if (! $errorrecord && $fields[47]) {
-		$ret1=$ret2=0;
+	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;
+		$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');
 		}
@@ -277,7 +277,7 @@ 
 
 	if ($errorrecord) {
 		fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-		$error++;    // $errorrecord will be reset
+		$error++; // $errorrecord will be reset
 	}
 }
 

dev/build/generate_filelist_xml.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 if (!defined('NOREQUIREDB')) {
-	define('NOREQUIREDB', '1');	// Do not create database handler $db
+	define('NOREQUIREDB', '1'); // Do not create database handler $db
 }
 
 $sapi_type = php_sapi_name();
@@ -60,7 +60,7 @@ 
 $result = array();
 while ($i < $argc) {
 	if (!empty($argv[$i])) {
-		parse_str($argv[$i], $result);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
+		parse_str($argv[$i], $result); // set all params $release, $includecustom, $includeconstant, $buildzip ...
 	}
 	if (!empty($result["release"])) {
 		$release = $result["release"];
@@ -75,9 +75,9 @@ 
 		$buildzip = 1;
 	}
 	if (preg_match('/includeconstant=/', strval($argv[$i]))) {
-		$tmp = explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
+		$tmp = explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str()
 		if (count($tmp) != 3) {
-			print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n";
+			print "Error: Bad parameter includeconstant=".$result['includeconstant']."\n";
 			exit(1);
 		}
 		$includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
@@ -152,7 +152,7 @@ 
 }
 
 $gitcommit = 'seetag';
-$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release);	// Keep only x.y into x.y.z
+$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release); // Keep only x.y into x.y.z
 $fileforgit = dirname(dirname(dirname(__FILE__))).'/.git/refs/heads/'.$branchname;
 print "Try to get last commit ID from file ".$fileforgit."\n";
 $fileforgitcontent = file_get_contents($fileforgit);
@@ -180,7 +180,7 @@ 
 
 // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
 $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 
 $dir = '';
@@ -223,7 +223,7 @@ 
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
 $regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude = '(custom|documents|conf|install)$';  // Exclude dirs
+$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 foreach ($files as $filetmp) {
@@ -264,7 +264,7 @@ 
 fputs($fp, '<dolibarr_unalterable_files version="'.$release.'">'."\n");
 
 $regextoinclude = '(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/blockedlog', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 foreach ($files as $filetmp) {
@@ -292,7 +292,7 @@ 
 }
 // Add the SQL file
 $regextoinclude = 'llx_blockedlog.*(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/install/mysql/tables', 'files', 0, $regextoinclude, $regextoexclude, 'fullname');
 foreach ($files as $filetmp) {
 	$file = $filetmp['fullname'];

htdocs/modulebuilder/template/build/buildzip.php

Spacing +12 added lines, -12 removed lines

@@ -71,7 +71,7 @@ 
  */
 function detectModule()
 {
-	$name  = $version = "";
+	$name = $version = "";
 	$tab = glob("core/modules/mod*.class.php");
 	if (count($tab) == 0) {
 		echo "[fail] Error on auto detect data : there is no mod*.class.php file into core/modules dir\n";
@@ -212,15 +212,15 @@ 
 		// Loop through the files in source directory
 		while ($file = readdir($dir)) {
 			if (($file != '.') && ($file != '..')) {
-				if (is_dir($src . '/' . $file)) {
+				if (is_dir($src.'/'.$file)) {
 					// Recursively calling custom copy function
 					// for sub directory
-					if (!rcopy($src . '/' . $file, $dst . '/' . $file)) {
+					if (!rcopy($src.'/'.$file, $dst.'/'.$file)) {
 						return false;
 					}
 				} else {
 					if (!is_excluded($file)) {
-						if (!copy($src . '/' . $file, $dst . '/' . $file)) {
+						if (!copy($src.'/'.$file, $dst.'/'.$file)) {
 							return false;
 						}
 					}
@@ -254,7 +254,7 @@ 
 		if ($f->isDot()) {
 			continue;
 		} //skip . ..
-		$src = $folder . '/' . $f;
+		$src = $folder.'/'.$f;
 		$dst = substr($f->getPathname(), strlen($root));
 		if ($f->isDir()) {
 			if ($zip->addEmptyDir($dst)) {
@@ -268,7 +268,7 @@ 
 			}
 		}
 		if ($f->isFile()) {
-			if (! $zip->addFile($src, $dst)) {
+			if (!$zip->addFile($src, $dst)) {
 				return false;
 			}
 		}
@@ -281,22 +281,22 @@ 
  */
 
 list($mod, $version) = detectModule();
-$outzip = sys_get_temp_dir() . "/module_" . $mod . "-" . $version . ".zip";
+$outzip = sys_get_temp_dir()."/module_".$mod."-".$version.".zip";
 if (file_exists($outzip)) {
 	secureUnlink($outzip);
 }
 
 //copy all sources into system temp directory
-$tmpdir = tempnam(sys_get_temp_dir(), $mod . "-module");
+$tmpdir = tempnam(sys_get_temp_dir(), $mod."-module");
 secureUnlink($tmpdir);
 mkdirAndCheck($tmpdir);
-$dst = $tmpdir . "/" . $mod;
+$dst = $tmpdir."/".$mod;
 mkdirAndCheck($dst);
 
 foreach ($listOfModuleContent as $moduleContent) {
 	foreach (glob($moduleContent) as $entry) {
-		if (!rcopy($entry, $dst . '/' . $entry)) {
-			echo "[fail]  Error on copy " . $entry . " to " . $dst . "/" . $entry . "\n";
+		if (!rcopy($entry, $dst.'/'.$entry)) {
+			echo "[fail]  Error on copy ".$entry." to ".$dst."/".$entry."\n";
 			echo "Please take time to analyze the problem and fix the bug\n";
 			exit(8);
 		}
@@ -305,7 +305,7 @@ 
 
 $z = new ZipArchive();
 $z->open($outzip, ZIPARCHIVE::CREATE);
-zipDir($tmpdir, $z, $tmpdir . '/');
+zipDir($tmpdir, $z, $tmpdir.'/');
 $z->close();
 delTree($tmpdir);
 if (file_exists($outzip)) {

htdocs/public/webportal/webportal.main.inc.php

Spacing +13 added lines, -14 removed lines

@@ -63,15 +63,14 @@ 
 		$dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php
 
 		$tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ?
-			(empty($dolibarr_main_cookie_cryptkey) ? '' :
-				$dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id;
+			(empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id;
 		// Unique id of instance
 
 		// The recommended value (may be not defined for old versions)
 		if (!empty($tmp_instance_unique_id)) {
-			return sha1('webportal' . $tmp_instance_unique_id);
+			return sha1('webportal'.$tmp_instance_unique_id);
 		} else {
-			return sha1('webportal' . $_SERVER['SERVER_NAME'].$_SERVER['DOCUMENT_ROOT'].DOL_DOCUMENT_ROOT);
+			return sha1('webportal'.$_SERVER['SERVER_NAME'].$_SERVER['DOCUMENT_ROOT'].DOL_DOCUMENT_ROOT);
 		}
 	}
 }
@@ -82,12 +81,12 @@ 
 }
 include $relDir.'../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societeaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/public/webportal/lib/webportal.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/context.class.php';
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/webportalmember.class.php';
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/webportalpartnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/public/webportal/lib/webportal.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/context.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/webportalmember.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/webportalpartnership.class.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -98,8 +97,8 @@ 
 // Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
 // Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
 $prefix = dol_getprefix('');
-$sessionname = 'WEBPORTAL_SESSID_' . $prefix;
-$sessiontimeout = 'WEBPORTAL_SESSTIMEOUT_' . $prefix;
+$sessionname = 'WEBPORTAL_SESSID_'.$prefix;
+$sessiontimeout = 'WEBPORTAL_SESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout]) && session_status() === PHP_SESSION_NONE) {
 	ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 }
@@ -118,7 +117,7 @@ 
 
 if (!defined('WEBPORTAL_NOREQUIRETRAN') || (!defined('WEBPORTAL_NOLOGIN') && !empty($context->controllerInstance->accessNeedLoggedUser))) {
 	if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-		include_once DOL_DOCUMENT_ROOT . '/core/class/translate.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 		$langs = new Translate("", $conf);
 		$langcode = (GETPOST('lang', 'aZ09', 1) ? GETPOST('lang', 'aZ09', 1) : (empty($logged_user->conf->MAIN_LANG_DEFAULT) ? getDolGlobalString('MAIN_LANG_DEFAULT', 'auto') : $logged_user->conf->MAIN_LANG_DEFAULT));
 		if (defined('MAIN_LANG_DEFAULT')) {
@@ -285,7 +284,7 @@ 
 						if (!$error) {
 							if ($logged_thirdparty->default_lang != $langs->defaultlang && !defined('WEBPORTAL_NOREQUIRETRAN')) {
 								if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-									include_once DOL_DOCUMENT_ROOT . '/core/class/translate.class.php';
+									include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 									$langs = new Translate("", $conf);
 									$langs->setDefaultLang($logged_thirdparty->default_lang);
 								}

htdocs/societe/class/societe.class.php

Spacing +35 added lines, -35 removed lines

@@ -62,7 +62,7 @@ 
 	 * @var string		Prefix to check for any trigger code of any business class to prevent bad value for trigger code.
 	 * @see CommonTrigger::call_trigger()
 	 */
-	public $TRIGGER_PREFIX = 'COMPANY'; 	// to be overridden in child class implementations, i.e. 'BILL', 'TASK', 'PROPAL', etc.
+	public $TRIGGER_PREFIX = 'COMPANY'; // to be overridden in child class implementations, i.e. 'BILL', 'TASK', 'PROPAL', etc.
 
 	/**
 	 * @var string ID of module.
@@ -1087,8 +1087,8 @@ 
 			$sql .= ", '".$this->db->escape($this->ip)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ", ".(empty($this->vat_reverse_charge) ? '0' : '1');
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
 			}
 			$sql .= ")";
 
@@ -1141,7 +1141,7 @@ 
 				}
 
 				if ($ret >= 0) {
-					if (! $notrigger) {
+					if (!$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('COMPANY_CREATE', $user);
 						if ($result < 0) {
@@ -1385,7 +1385,7 @@ 
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
-							$this->errors[] = $langs->trans('CustomerAccountancyCodeShort') . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+							$this->errors[] = $langs->trans('CustomerAccountancyCodeShort')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 
@@ -1393,7 +1393,7 @@ 
 					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
-						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('CustomerAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('CustomerAccountancyCodeShort')).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER' && !empty($this->fournisseur)) {
 					// Check for unicity
@@ -1401,7 +1401,7 @@ 
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
-							$this->errors[] = $langs->trans('SupplierAccountancyCodeShort') . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+							$this->errors[] = $langs->trans('SupplierAccountancyCodeShort')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 
@@ -1409,7 +1409,7 @@ 
 					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
-						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('SupplierAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('SupplierAccountancyCodeShort')).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				}
 			}
@@ -1459,17 +1459,17 @@ 
 		$now = dol_now();
 
 		// Clean parameters
-		$this->id 			= $id;
-		$this->entity 		= ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+		$this->id = $id;
+		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 		$this->name 		= $this->name ? trim($this->name) : trim((string) $this->nom);
 		$this->nom 			= $this->name; // For backward compatibility
-		$this->name_alias 	= trim((string) $this->name_alias);
+		$this->name_alias = trim((string) $this->name_alias);
 		$this->ref_ext		= (empty($this->ref_ext) ? '' : trim($this->ref_ext));
 		$this->address		= trim((string) $this->address);
 		$this->zip 			= trim((string) $this->zip);
 		$this->town 		= trim((string) $this->town);
-		$this->state_id 	= (is_numeric($this->state_id)) ? (int) $this->state_id : 0;
-		$this->country_id 	= ($this->country_id > 0) ? $this->country_id : 0;
+		$this->state_id = (is_numeric($this->state_id)) ? (int) $this->state_id : 0;
+		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim((string) $this->phone);
 		$this->phone		= preg_replace("/\s/", "", $this->phone);
 		$this->phone		= preg_replace("/\./", "", $this->phone);
@@ -1479,7 +1479,7 @@ 
 		$this->fax			= trim((string) $this->fax);
 		$this->fax			= preg_replace("/\s/", "", $this->fax);
 		$this->fax			= preg_replace("/\./", "", $this->fax);
-		$this->email		= trim((string) $this->email);
+		$this->email = trim((string) $this->email);
 		$this->url			= $this->url ? clean_url($this->url, 0) : '';
 		$this->note_private = (empty($this->note_private) ? '' : trim($this->note_private));
 		$this->note_public  = (empty($this->note_public) ? '' : trim($this->note_public));
@@ -1648,7 +1648,7 @@ 
 			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape((string) $this->tva_assuj)."'" : "null");
 			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-				$sql .= ",vat_reverse_charge = " . ($this->vat_reverse_charge != '' ? "'" . $this->db->escape((string) $this->vat_reverse_charge) . "'" : 0);
+				$sql .= ",vat_reverse_charge = ".($this->vat_reverse_charge != '' ? "'".$this->db->escape((string) $this->vat_reverse_charge)."'" : 0);
 			}
 			$sql .= ",status = ".((int) $this->status);
 
@@ -1710,8 +1710,8 @@ 
 			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
 				if ($customer) {
 					$sql .= ", accountancy_code_customer_general = ".(!empty($this->accountancy_code_customer_general) ? "'".$this->db->escape($this->accountancy_code_customer_general)."'" : "null");
 					$sql .= ", code_compta = ".(!empty($this->code_compta_client) ? "'".$this->db->escape($this->code_compta_client)."'" : "null");
@@ -2110,7 +2110,7 @@ 
 					$this->vat_reverse_charge = 0;
 				}
 
-				$this->status				= $obj->status;
+				$this->status = $obj->status;
 
 				// Local Taxes
 				$this->localtax1_assuj      = $obj->localtax1_assuj;
@@ -2138,7 +2138,7 @@ 
 
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
-				$this->deposit_percent		= $obj->deposit_percent;
+				$this->deposit_percent = $obj->deposit_percent;
 				$this->transport_mode_id 	= $obj->transport_mode;
 				$this->mode_reglement_supplier_id = $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id = $obj->cond_reglement_supplier;
@@ -2303,7 +2303,7 @@ 
 		}
 
 		if ($sqlprof) {
-			$sqlprofquery = $sqlstart . " AND (".$sqlprof." )";
+			$sqlprofquery = $sqlstart." AND (".$sqlprof." )";
 			$resql = $this->db->query($sqlprofquery);
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
@@ -2356,7 +2356,7 @@ 
 		}
 
 		if ($sqlref) {
-			$sqlrefquery = $sqlstart . " AND (".$sqlref." )";
+			$sqlrefquery = $sqlstart." AND (".$sqlref." )";
 			$resql = $this->db->query($sqlrefquery);
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
@@ -2875,7 +2875,7 @@ 
 			$sortfield = 'u.lastname,u.firstname';
 		}
 		if (empty($sortorder)) {
-			$sortorder = str_repeat('ASC,', count(explode(',', $sortfield)) - 1) . 'ASC';
+			$sortorder = str_repeat('ASC,', count(explode(',', $sortfield)) - 1).'ASC';
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 
@@ -2892,10 +2892,10 @@ 
 					$reparray[$i]['firstname'] = $obj->firstname;
 					$reparray[$i]['email'] = $obj->email;
 					$reparray[$i]['phone'] = $obj->office_phone;
-					$reparray[$i]['office_phone'] = $obj->office_phone;			// Pro phone
+					$reparray[$i]['office_phone'] = $obj->office_phone; // Pro phone
 					$reparray[$i]['office_fax'] = $obj->office_fax;
-					$reparray[$i]['user_mobile'] = $obj->user_mobile;			// Pro mobile
-					$reparray[$i]['personal_mobile'] = $obj->personal_mobile;	// Personal mobile
+					$reparray[$i]['user_mobile'] = $obj->user_mobile; // Pro mobile
+					$reparray[$i]['personal_mobile'] = $obj->personal_mobile; // Personal mobile
 					$reparray[$i]['job'] = $obj->job;
 					$reparray[$i]['statut'] = $obj->status; // deprecated
 					$reparray[$i]['status'] = $obj->status;
@@ -3108,7 +3108,7 @@ 
 			$datas['status'] = ' '.$this->getLibStatut(5);
 		}
 		if (isset($this->client) && isset($this->fournisseur)) {
-			$datas['type'] = ' &nbsp; ' . $this->getTypeUrl(1, '', 0, 'span');
+			$datas['type'] = ' &nbsp; '.$this->getTypeUrl(1, '', 0, 'span');
 		}
 		$datas['name'] = '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag(dol_string_nohtmltag($this->name));
 		if (!empty($this->name_alias) && empty($noaliasinname)) {
@@ -3176,9 +3176,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (!$nofetch && isModEnabled('category') && $this->client) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories_customer'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_CUSTOMER, 1, 1);
+			$datas['categories_customer'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_CUSTOMER, 1, 1);
 		}
 		if (!empty($this->code_fournisseur) && $this->fournisseur) {
 			$datas['suppliercode'] = '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
@@ -3189,9 +3189,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (!$nofetch && isModEnabled('category') && $this->fournisseur) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories_supplier'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_SUPPLIER, 1, 1);
+			$datas['categories_supplier'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_SUPPLIER, 1, 1);
 		}
 
 		$datas['divclose'] = '</div>';
@@ -3738,7 +3738,7 @@ 
 	{
 		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type = 'ban' AND default_rib = 1 AND fk_soc = ". (int) $this->id;
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type = 'ban' AND default_rib = 1 AND fk_soc = ".(int) $this->id;
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$this->error = $this->db->lasterror();
@@ -4128,7 +4128,7 @@ 
 		global $langs;
 
 		if ($company_id > 0) {
-			$sql = "SELECT parent FROM " . MAIN_DB_PREFIX . "societe WHERE rowid = ".((int) $company_id);
+			$sql = "SELECT parent FROM ".MAIN_DB_PREFIX."societe WHERE rowid = ".((int) $company_id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				if ($obj = $this->db->fetch_object($resql)) {
@@ -4768,7 +4768,7 @@ 
 		$country_code = $country_label = '';
 		if (getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY')) {
 			$tmp = explode(':', getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY'));
-			$country_id =  (is_numeric($tmp[0])) ? (int) $tmp[0] : 0;
+			$country_id = (is_numeric($tmp[0])) ? (int) $tmp[0] : 0;
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
@@ -5654,7 +5654,7 @@ 
 		if (method_exists($this, 'getLibStatut')) {
 			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
-		$return .= '</div>';	// end info-box-content
+		$return .= '</div>'; // end info-box-content
 		$return .= '</div>';
 		$return .= '</div>';
 
@@ -5757,7 +5757,7 @@ 
 		global $conf, $langs, $hookmanager, $user, $action;
 
 		$error = 0;
-		$soc_origin = new Societe($this->db);		// The thirdparty that we will delete
+		$soc_origin = new Societe($this->db); // The thirdparty that we will delete
 
 		dol_syslog("mergeCompany merge thirdparty id=".$soc_origin_id." (will be deleted) into the thirdparty id=".$this->id);
 

htdocs/api/class/api_setup.class.php

Spacing +5 added lines, -5 removed lines

@@ -1295,7 +1295,7 @@ 
 					$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
 					$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
 					$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : '');	// This may be a string encoded with serialise() or json_encode()
+					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode()
 					$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
 					$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
 					$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
@@ -1407,7 +1407,7 @@ 
 					$answer[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
 					$answer[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
 					$answer[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-					$answer[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : '');	// This may be a string encoded with serialise() or json_encode()
+					$answer[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode()
 					$answer[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
 					$answer[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
 					$answer[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
@@ -2665,7 +2665,7 @@ 
 				throw new RestException(500, $langs->trans('XmlNotFound').': /install/'.$xmlshortfile);
 			}
 		} else {
-			$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only. Same is used into filecheck.php.
+			$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into filecheck.php.
 
 			// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
 			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != 400 && $xmlarray['http_code'] != 404) {
@@ -2734,7 +2734,7 @@ 
 
 				// Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
 				$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-				$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+				$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 				$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
 				// Fill file_list with files in signature, new files, modified files
@@ -2846,7 +2846,7 @@ 
 						$out .= '<tr class="oddeven">';
 						$out .= '<td>'.$i.'</td>'."\n";
 						$out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
-						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";  // @phan-suppress-current-line PhanTypeInvalidDimOffset,PhanTypeSuspiciousStringExpression
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n"; // @phan-suppress-current-line PhanTypeInvalidDimOffset,PhanTypeSuspiciousStringExpression
 						$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
 						$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
 						$totalsize += $size;