Completed
Branch develop (091b9c)
by
unknown
19:44
created
htdocs/core/login/functions_http.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
  */
77 77
 function decodeHttpBasicAuth($value)
78 78
 {
79
-	$encoded_basic_auth = substr($value, 6);	// Remove the "Basic " string
79
+	$encoded_basic_auth = substr($value, 6); // Remove the "Basic " string
80 80
 	$decoded_basic_auth = base64_decode($encoded_basic_auth);
81 81
 	$credentials_basic_auth = explode(':', $decoded_basic_auth);
82 82
 
Please login to merge, or discard this patch.
htdocs/printing/admin/printing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@
 block discarded – undo
201 201
 			$i++;
202 202
 
203 203
 			if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') {
204
-				$keyforprovider = '';	// @BUG This must be set
204
+				$keyforprovider = ''; // @BUG This must be set
205 205
 
206 206
 				// Token
207 207
 				print '<tr class="oddeven">';
Please login to merge, or discard this patch.
htdocs/user/virtualcard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 	print $langs->trans("Text");
289 289
 	print '</td><td>';
290 290
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
291
-	$extendededitor = 0;	// We force no WYSIWYG editor
291
+	$extendededitor = 0; // We force no WYSIWYG editor
292 292
 	$doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, $extendededitor, ROWS_5, '90%');
293 293
 	$doleditor->Create();
294 294
 	print "</td></tr>\n";
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
 	print '<br>';
304 304
 
305
-	print '</div>';	// End hide/show
305
+	print '</div>'; // End hide/show
306 306
 
307 307
 	print '<br>';
308 308
 
Please login to merge, or discard this patch.
dev/tools/dolibarr-postgres2mysql.php 2 patches
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
  - If you're having problems creating your postgres dump, make sure you use "--format p --inserts"
62 62
  - Default output engine if not specified is InnoDB
63 63
 
64
-XHTML;
64
+xhtml;
65 65
 }
66 66
 
67 67
 /**
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 function formatsize($s)
101 101
 {
102 102
 	if ($s < pow(2, 14)) {
103
-		return "{$s}B";
103
+		return "{$s}b";
104 104
 	} elseif ($s < pow(2, 20)) {
105 105
 		return sprintf("%.1f", round($s / 1024, 1)) . "K";
106 106
 	} elseif ($s < pow(2, 30)) {
Please login to merge, or discard this patch.
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -28,12 +28,12 @@  discard block
 block discarded – undo
28 28
 
29 29
 $sapi_type = php_sapi_name();
30 30
 $script_file = basename(__FILE__);
31
-$path = dirname(__FILE__) . '/';
31
+$path = dirname(__FILE__).'/';
32 32
 
33 33
 // Test si mode batch
34 34
 $sapi_type = php_sapi_name();
35 35
 if (substr($sapi_type, 0, 3) == 'cgi') {
36
-	echo "Error: You are using PHP for CGI. To execute " . $script_file . " from command line, you must use PHP for CLI mode.\n";
36
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
37 37
 	exit();
38 38
 }
39 39
 
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
102 102
 	if ($s < pow(2, 14)) {
103 103
 		return "{$s}B";
104 104
 	} elseif ($s < pow(2, 20)) {
105
-		return sprintf("%.1f", round($s / 1024, 1)) . "K";
105
+		return sprintf("%.1f", round($s / 1024, 1))."K";
106 106
 	} elseif ($s < pow(2, 30)) {
107
-		return sprintf("%.1f", round($s / 1024 / 1024, 1)) . "M";
107
+		return sprintf("%.1f", round($s / 1024 / 1024, 1))."M";
108 108
 	} else {
109
-		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
109
+		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1))."G";
110 110
 	}
111 111
 }
112 112
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	}
139 139
 
140 140
 	$fs = filesize($infilename);
141
-	echo "Filesize: " . formatsize($fs) . "\n";
141
+	echo "Filesize: ".formatsize($fs)."\n";
142 142
 
143 143
 	while ($instr = fgets($infp)) {
144 144
 		$linenum++;
@@ -215,13 +215,13 @@  discard block
 block discarded – undo
215 215
 
216 216
 	fputs($outfp, "\n");
217 217
 
218
-	fputs($outfp, '/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;' . "\n");
219
-	fputs($outfp, '/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;' . "\n");
220
-	fputs($outfp, '/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;' . "\n");
221
-	fputs($outfp, '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . "\n");
222
-	fputs($outfp, '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . "\n");
223
-	fputs($outfp, '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . "\n");
224
-	fputs($outfp, '/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;' . "\n");
218
+	fputs($outfp, '/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;'."\n");
219
+	fputs($outfp, '/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;'."\n");
220
+	fputs($outfp, '/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;'."\n");
221
+	fputs($outfp, '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;'."\n");
222
+	fputs($outfp, '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;'."\n");
223
+	fputs($outfp, '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;'."\n");
224
+	fputs($outfp, '/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;'."\n");
225 225
 
226 226
 	printf("Completed! %9d lines   %9d sql chunks\n\n", $linenum, $chunkcount);
227 227
 
@@ -250,8 +250,8 @@  discard block
 block discarded – undo
250 250
 	}
251 251
 
252 252
 	if ($header) {
253
-		$output = "-- Converted with " . PRODUCT . "-" . VERSION . "\n";
254
-		$output .= "-- Converted on " . date("r") . "\n";
253
+		$output = "-- Converted with ".PRODUCT."-".VERSION."\n";
254
+		$output .= "-- Converted on ".date("r")."\n";
255 255
 		$output .= "\n";
256 256
 
257 257
 		$output .= "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n";
@@ -282,8 +282,8 @@  discard block
 block discarded – undo
282 282
 
283 283
 		$reg = array();
284 284
 		if (preg_match('/CREATE SEQUENCE (?:public\.)(.*)_(id|rowid|id_comment)_seq/', $line, $reg)) {
285
-			$outputatend .= '-- Make field ' . $reg[2] . ' auto_increment for table ' . $reg[1] . "\n";
286
-			$outputatend .= 'ALTER TABLE ' . $reg[1] . ' CHANGE COLUMN ' . $reg[2] . ' ' . $reg[2] . ' INTEGER NOT NULL AUTO_INCREMENT;' . "\n\n";
285
+			$outputatend .= '-- Make field '.$reg[2].' auto_increment for table '.$reg[1]."\n";
286
+			$outputatend .= 'ALTER TABLE '.$reg[1].' CHANGE COLUMN '.$reg[2].' '.$reg[2].' INTEGER NOT NULL AUTO_INCREMENT;'."\n\n";
287 287
 			// var_dump($outputatend);
288 288
 		}
289 289
 
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 
300 300
 			$reg2 = array();
301 301
 			if (preg_match('/CREATE TABLE ([^\s]+)/', $line, $reg2)) {
302
-				$output .= 'DROP TABLE IF EXISTS `' . $reg2[1] . '`;' . "\n";
302
+				$output .= 'DROP TABLE IF EXISTS `'.$reg2[1].'`;'."\n";
303 303
 			}
304 304
 			$output .= $line;
305 305
 			$linenumber++;
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 				$arrayofprimaryalreadyintabledef[$in_create_table] = $in_create_table;
380 380
 			}
381 381
 
382
-			$specialfields = array("repeat","status","type","call");
382
+			$specialfields = array("repeat", "status", "type", "call");
383 383
 
384 384
 			$field = getfieldname($line);
385 385
 			if (in_array($field, $specialfields)) {
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
 				$lastchr = substr($output, -2, 1);
399 399
 				// echo "lastchr=$lastchr";
400 400
 				if ($lastchr == ",") {
401
-					$output = substr($output, 0, -2) . "\n";
401
+					$output = substr($output, 0, -2)."\n";
402 402
 				}
403 403
 			}
404 404
 
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 				$after = str_replace(" (E'", " ('", $after);
424 424
 				$after = str_replace(", E'", ", '", $after);
425 425
 
426
-				$output .= $before . " VALUES " . $after;
426
+				$output .= $before." VALUES ".$after;
427 427
 				$linenumber++;
428 428
 				continue;
429 429
 			} else {
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 					$inquotes = false;
452 452
 				}
453 453
 
454
-				$output .= $before . " VALUES " . $after;
454
+				$output .= $before." VALUES ".$after;
455 455
 				do {
456 456
 					$linenumber++;
457 457
 
@@ -501,14 +501,14 @@  discard block
 block discarded – undo
501 501
 						$output .= str_replace("\n", "", $pkey);
502 502
 						// the postgres and mysql syntax for this is (at least, in the example im looking at)
503 503
 						// identical, so we can just add it as is.
504
-						$output .= $line . "\n";
504
+						$output .= $line."\n";
505 505
 					} else {
506
-						$output .= '-- ' . str_replace("\n", "", $pkey);
507
-						$output .= '-- ' . $line . "\n";
506
+						$output .= '-- '.str_replace("\n", "", $pkey);
507
+						$output .= '-- '.$line."\n";
508 508
 					}
509 509
 				} else {
510
-					$output .= '-- ' . str_replace("\n", "", $pkey);
511
-					$output .= '-- ' . $line . "\n";
510
+					$output .= '-- '.str_replace("\n", "", $pkey);
511
+					$output .= '-- '.$line."\n";
512 512
 				}
513 513
 			}
514 514
 		}
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
 				$tablename = str_replace('public.', '', $matches[2]);
523 523
 				$columns = $matches[3];
524 524
 				if ($tablename && $columns) {
525
-					$output .= "ALTER TABLE `" . $tablename . "` ADD INDEX " . $indexname . "( {$columns} ) ;\n";
525
+					$output .= "ALTER TABLE `".$tablename."` ADD INDEX ".$indexname."( {$columns} ) ;\n";
526 526
 				}
527 527
 			}
528 528
 		}
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 				$tablename = str_replace('public.', '', $matches[2]);
535 535
 				$columns = str_replace('"', '', $matches[3]);
536 536
 				if ($tablename && $columns) {
537
-					$output .= "ALTER TABLE `" . $tablename . "` ADD UNIQUE INDEX " . $indexname . " ( {$columns} ) ;\n";
537
+					$output .= "ALTER TABLE `".$tablename."` ADD UNIQUE INDEX ".$indexname." ( {$columns} ) ;\n";
538 538
 				}
539 539
 			}
540 540
 		}
@@ -565,16 +565,16 @@  discard block
 block discarded – undo
565 565
 			if ($line == "\\.\n") {
566 566
 				$in_insert = false;
567 567
 				if ($values) {
568
-					$output .= "INSERT INTO $heads VALUES\n" . implode(",\n", $values) . ";\n\n";
568
+					$output .= "INSERT INTO $heads VALUES\n".implode(",\n", $values).";\n\n";
569 569
 				}
570 570
 			} else {
571 571
 				$vals = explode('	', $line);
572 572
 				foreach ($vals as $i => $val) {
573
-					$vals[$i] = ($val == '\\N') ? 'NULL' : "'" . str_replace("'", "\\'", trim($val)) . "'";
573
+					$vals[$i] = ($val == '\\N') ? 'NULL' : "'".str_replace("'", "\\'", trim($val))."'";
574 574
 				}
575
-				$values[] = '(' . implode(',', $vals) . ')';
575
+				$values[] = '('.implode(',', $vals).')';
576 576
 				if (count($values) >= 1000) {
577
-					$output .= "INSERT INTO $heads VALUES\n" . implode(",\n", $values) . ";\n";
577
+					$output .= "INSERT INTO $heads VALUES\n".implode(",\n", $values).";\n";
578 578
 					$values = array();
579 579
 				}
580 580
 			}
@@ -583,5 +583,5 @@  discard block
 block discarded – undo
583 583
 		$linenumber++;
584 584
 	}
585 585
 
586
-	return array('output' => $output,'outputatend' => $outputatend);
586
+	return array('output' => $output, 'outputatend' => $outputatend);
587 587
 }
Please login to merge, or discard this patch.
dev/tools/test/namespacemig/bbb.class.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
  */
19 19
 class Bbb
20 20
 {
21
-	const BBB='bbb';
21
+	const BBB = 'bbb';
22 22
 
23 23
 	/**
24 24
 	 * do
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	{
30 30
 		global $globalaaa, $globalbbb;
31 31
 		echo 'dobbb'."\n";
32
-		$globalaaa.='+bbb';
33
-		$globalbbb.='+bbb';
32
+		$globalaaa .= '+bbb';
33
+		$globalbbb .= '+bbb';
34 34
 	}
35 35
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,9 +25,11 @@
 block discarded – undo
25 25
 	 *
26 26
 	 * @return void
27 27
 	 */
28
-	public function do()
28
+	public function do {
29
+		()
29 30
 	{
30 31
 		global $globalaaa, $globalbbb;
32
+	}
31 33
 		echo 'dobbb'."\n";
32 34
 		$globalaaa.='+bbb';
33 35
 		$globalbbb.='+bbb';
Please login to merge, or discard this patch.
dev/tools/test/namespacemig/aaa.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
  */
21 21
 class Aaa
22 22
 {
23
-	const AAA='aaa';
23
+	const AAA = 'aaa';
24 24
 
25 25
 	/**
26 26
 	 * do
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,8 +27,10 @@
 block discarded – undo
27 27
 	 *
28 28
 	 * @return void
29 29
 	 */
30
-	public function do()
30
+	public function do {
31
+		()
31 32
 	{
32 33
 		echo 'doaaa'."\n";
33 34
 	}
35
+	}
34 36
 }
Please login to merge, or discard this patch.
dev/tools/test/testtcpdf.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -65,11 +65,11 @@
 block discarded – undo
65 65
  - To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
66 66
 
67 67
 */
68
-$permissions=array('copy');
69
-$user_pass='aaa';
70
-$owner_pass=null;
71
-$mode=0;
72
-$pubkeys=null;
68
+$permissions = array('copy');
69
+$user_pass = 'aaa';
70
+$owner_pass = null;
71
+$mode = 0;
72
+$pubkeys = null;
73 73
 $pdf->SetProtection($permissions, $user_pass, $owner_pass, $mode, $pubkeys);
74 74
 
75 75
 // Example with public-key
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
 Encryption Example
124 124
 
125 125
 Consult the source code documentation for the SetProtection() method.
126
-EOD;
126
+eod;
127 127
 
128 128
 // print a block of text using Write()
129 129
 $pdf->Write(0, $txt, '', 0, 'L', true, 0, false, false, 0);
Please login to merge, or discard this patch.
dev/translation/autotranslator.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 $sapi_type = php_sapi_name();
30 30
 $script_file = basename(__FILE__);
31
-$path=dirname(__FILE__).'/';
31
+$path = dirname(__FILE__).'/';
32 32
 
33 33
 // Test if batch mode
34 34
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
45 45
 $langs->load("main");
46 46
 
47 47
 // Global variables
48
-$version='1.14';
49
-$error=0;
48
+$version = '1.14';
49
+$error = 0;
50 50
 
51 51
 
52 52
 // -------------------- START OF YOUR CODE HERE --------------------
53 53
 @set_time_limit(0);
54 54
 print "***** ".$script_file." (".$version.") *****\n";
55
-$dir=DOL_DOCUMENT_ROOT."/langs";
55
+$dir = DOL_DOCUMENT_ROOT."/langs";
56 56
 
57 57
 // Check parameters
58
-if (! isset($argv[3])) {
58
+if (!isset($argv[3])) {
59 59
 	print "Usage:   ".$script_file."  lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n";
60 60
 	print "Example: ".$script_file."  en_US         pt_PT              123456\n";
61 61
 	print "Rem:     lang_code to use can be found on https://translate.google.com\n";
@@ -66,18 +66,18 @@  discard block
 block discarded – undo
66 66
 print 'Argument 1='.$argv[1]."\n";
67 67
 print 'Argument 2='.$argv[2]."\n";
68 68
 print 'Argument 3='.$argv[3]."\n";
69
-$file='';
69
+$file = '';
70 70
 if (isset($argv[4])) {
71
-	$file=$argv[4];
71
+	$file = $argv[4];
72 72
 	print 'Argument 4='.$argv[4]."\n";
73 73
 }
74 74
 print 'Files will be generated/updated in directory '.$dir."\n";
75 75
 
76 76
 if ($argv[2] != 'all') {
77
-	if (! is_dir($dir.'/'.$argv[2])) {
77
+	if (!is_dir($dir.'/'.$argv[2])) {
78 78
 		print 'Create directory '.$dir.'/'.$argv[2]."\n";
79
-		$result=mkdir($dir.'/'.$argv[2]);
80
-		if (! $result) {
79
+		$result = mkdir($dir.'/'.$argv[2]);
80
+		if (!$result) {
81 81
 			$db->close();
82 82
 			return -1;
83 83
 		}
Please login to merge, or discard this patch.
dev/initdata/generate-thirdparty.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 
106 106
 print "Generates ".GEN_NUMBER_SOCIETE." companies\n";
107 107
 for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++) {
108
-	print "Company $s\n";
108
+	print "company $s\n";
109 109
 	$soc = new Societe($db);
110 110
 	$soc->name = "Company num ".time()."$s";
111 111
 	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
 $sapi_type = php_sapi_name();
28 28
 $script_file = basename(__FILE__);
29
-$path=dirname(__FILE__).'/';
29
+$path = dirname(__FILE__).'/';
30 30
 
31 31
 // Test si mode batch
32 32
 $sapi_type = php_sapi_name();
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Recupere root dolibarr
39 39
 //$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
40
-require __DIR__. '/../../htdocs/master.inc.php';
40
+require __DIR__.'/../../htdocs/master.inc.php';
41 41
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
42 42
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
43 43
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
46 46
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
47 47
 
48
-$listoftown = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
49
-$listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
48
+$listoftown = array("Auray", "Baden", "Vannes", "Pirouville", "Haguenau", "Souffelweiersheim", "Illkirch-Graffenstaden", "Lauterbourg", "Picauville", "Sainte-Mère Eglise", "Le Bono");
49
+$listoflastname = array("Joe", "Marc", "Steve", "Laurent", "Nico", "Isabelle", "Dorothee", "Saby", "Brigitte", "Karine", "Jose-Anne", "Celine", "Virginie");
50 50
 
51 51
 
52 52
 /*
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
 define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
57 57
 
58 58
 
59
-$ret=$user->fetch('', 'admin');
60
-if (! $ret > 0) {
59
+$ret = $user->fetch('', 'admin');
60
+if (!$ret > 0) {
61 61
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
62 62
 	exit;
63 63
 }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 
67 67
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
68
-$resql=$db->query($sql);
68
+$resql = $db->query($sql);
69 69
 if ($resql) {
70 70
 	$num = $db->num_rows($resql);
71 71
 	$i = 0;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 }
78 78
 
79 79
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
80
-$resql=$db->query($sql);
80
+$resql = $db->query($sql);
81 81
 if ($resql) {
82 82
 	$num = $db->num_rows($resql);
83 83
 	$i = 0;
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 }
92 92
 
93 93
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
94
-$resql=$db->query($sql);
94
+$resql = $db->query($sql);
95 95
 if ($resql) {
96 96
 	$num = $db->num_rows($resql);
97 97
 	$i = 0;
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
 	print "Company $s\n";
112 112
 	$soc = new Societe($db);
113 113
 	$soc->name = "Company num ".time()."$s";
114
-	$soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
115
-	$soc->client = mt_rand(1, 2);		// Une societe sur 2 est prospect, l'autre client
116
-	$soc->fournisseur = mt_rand(0, 1);	// Une societe sur 2 est fournisseur
117
-	$soc->code_client='CU'.time()."$s";
118
-	$soc->code_fournisseur='SU'.time()."$s";
119
-	$soc->tva_assuj=1;
120
-	$soc->country_id=1;
121
-	$soc->country_code='FR';
114
+	$soc->town = $listoftown[mt_rand(0, count($listoftown) - 1)];
115
+	$soc->client = mt_rand(1, 2); // Une societe sur 2 est prospect, l'autre client
116
+	$soc->fournisseur = mt_rand(0, 1); // Une societe sur 2 est fournisseur
117
+	$soc->code_client = 'CU'.time()."$s";
118
+	$soc->code_fournisseur = 'SU'.time()."$s";
119
+	$soc->tva_assuj = 1;
120
+	$soc->country_id = 1;
121
+	$soc->country_code = 'FR';
122 122
 	// Un client sur 3 a une remise de 5%
123
-	$user_remise=mt_rand(1, 3);
124
-	if ($user_remise==3) {
125
-		$soc->remise_percent=5;
123
+	$user_remise = mt_rand(1, 3);
124
+	if ($user_remise == 3) {
125
+		$soc->remise_percent = 5;
126 126
 	}
127 127
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
128 128
 	$soc->note_private = 'Company created by the script generate-societe.php';
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 			$contact = new Contact($db);
136 136
 			$contact->socid = $soc->id;
137 137
 			$contact->lastname = "Lastname".$c;
138
-			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname)-1)];
138
+			$contact->firstname = $listoflastname[mt_rand(0, count($listoflastname) - 1)];
139 139
 			if ($contact->create($user)) {
140 140
 			}
141 141
 		}
Please login to merge, or discard this patch.