Completed
Branch develop (d02c61)
by
unknown
18:56
created
htdocs/core/class/html.formfile.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@
 block discarded – undo
154 154
 			$maxphptoshow = $maxfilesizearray['maxphptoshow'];
155 155
 			$maxphptoshowparam = $maxfilesizearray['maxphptoshowparam'];
156 156
 			if ($maxmin > 0) {
157
-				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
157
+				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
158 158
 			}
159 159
 			$out .= '<input class="flat minwidth400 maxwidth200onsmartphone" type="file"';
160 160
 			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');
Please login to merge, or discard this patch.
htdocs/product/stock/massstockmove.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -315,14 +315,14 @@  discard block
 block discarded – undo
315 315
 		$importcsv = new ImportCsv($db, 'massstocklist');
316 316
 		//print $importcsv->separator;
317 317
 
318
-		$nblinesrecord = $importcsv->import_get_nb_of_lines($fullpath)-1;
318
+		$nblinesrecord = $importcsv->import_get_nb_of_lines($fullpath) - 1;
319 319
 		$importcsv->import_open_file($fullpath);
320 320
 		$labelsrecord = $importcsv->import_read_record();
321 321
 
322 322
 		if ($nblinesrecord < 1) {
323 323
 			setEventMessages($langs->trans("BadNumberOfLinesMustHaveAtLeastOneLinePlusTitle"), null, 'errors');
324 324
 		} else {
325
-			$i=0;
325
+			$i = 0;
326 326
 			$data = array();
327 327
 			$productstatic = new Product($db);
328 328
 			$warehousestatics = new Entrepot($db);
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 $maxfilesizearray = getMaxFileSizeArray();
485 485
 $maxmin = $maxfilesizearray['maxmin'];
486 486
 if ($maxmin > 0) {
487
-	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
487
+	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
488 488
 }
489 489
 print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
490 490
 $out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : '');
Please login to merge, or discard this patch.
htdocs/webhook/class/target.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 	/**
102 102
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
103 103
 	 */
104
-	public $fields=array(
104
+	public $fields = array(
105 105
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
106 106
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
107 107
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1',),
Please login to merge, or discard this patch.
htdocs/compta/sociales/list.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 $search_date_endday = GETPOST('search_date_endday', 'int');
59 59
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
60 60
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
61
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
61
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
62 62
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
63 63
 $search_date_limit_startday = GETPOST('search_date_limit_startday', 'int');
64 64
 $search_date_limit_startmonth = GETPOST('search_date_limit_startmonth', 'int');
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -727,7 +727,9 @@
 block discarded – undo
727 727
 				print $bankstatic->getNomUrl(1);
728 728
 			}
729 729
 			print '</td>';
730
-			if (!$i) $totalarray['nbfield']++;
730
+			if (!$i) {
731
+				$totalarray['nbfield']++;
732
+			}
731 733
 		}
732 734
 
733 735
 		// Amount
Please login to merge, or discard this patch.
htdocs/fichinter/index.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@
 block discarded – undo
96 96
 	$vals = array();
97 97
 	$bool = false;
98 98
 	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
99
-	if ($num>0) {
99
+	if ($num > 0) {
100 100
 		while ($row = $db->fetch_row($resql)) {
101 101
 			if (!isset($vals[$row[1]])) {
102 102
 				$vals[$row[1]] = 0;
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,9 @@
 block discarded – undo
114 114
 	print '<table class="noborder nohover centpercent">';
115 115
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
116 116
 	$listofstatus = array(Fichinter::STATUS_DRAFT, Fichinter::STATUS_VALIDATED);
117
-	if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) $listofstatus[] = Fichinter::STATUS_BILLED;
117
+	if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
118
+		$listofstatus[] = Fichinter::STATUS_BILLED;
119
+	}
118 120
 
119 121
 	foreach ($listofstatus as $status) {
120 122
 		$dataseries[] = array($fichinterstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
Please login to merge, or discard this patch.
htdocs/comm/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -552,9 +552,9 @@
 block discarded – undo
552 552
 			while ($i < $nbofloop) {
553 553
 				$obj = $db->fetch_object($resql);
554 554
 
555
-				$fichinterstatic->id=$obj->rowid;
556
-				$fichinterstatic->ref=$obj->ref;
557
-				$fichinterstatic->statut=$obj->fk_statut;
555
+				$fichinterstatic->id = $obj->rowid;
556
+				$fichinterstatic->ref = $obj->ref;
557
+				$fichinterstatic->statut = $obj->fk_statut;
558 558
 
559 559
 				$companystatic->id = $obj->socid;
560 560
 				$companystatic->name = $obj->name;
Please login to merge, or discard this patch.
htdocs/cron/list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -611,7 +611,7 @@
 block discarded – undo
611 611
 		print '<td class="center tdlastresultcode" title="'.dol_escape_htmltag($obj->lastresult).'">';
612 612
 		if ($obj->lastresult != '') {
613 613
 			if (empty($obj->lastresult)) {
614
-				print $obj->lastresult;		// Print '0'
614
+				print $obj->lastresult; // Print '0'
615 615
 			} else {
616 616
 				print '<span class="error">'.dol_escape_htmltag(dol_trunc($obj->lastresult)).'</div>';
617 617
 			}
Please login to merge, or discard this patch.
htdocs/admin/accountant.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -46,26 +46,26 @@
 block discarded – undo
46 46
  */
47 47
 
48 48
 $parameters = array();
49
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); 	// Note that $action and $object may have been modified by some hooks
49
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
50 50
 if ($reshook < 0) {
51 51
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
52 52
 }
53 53
 
54 54
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))
55 55
 || ($action == 'updateedit')) {
56
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME",    GETPOST("nom", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
57
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
58
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN",    GETPOST("town", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
59
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP",     GETPOST("zipcode", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
60
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE",   GETPOST("state_id", 'int'),            'chaine', 0, '', $conf->entity);
61
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION",  GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
62
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'),          'chaine', 0, '', $conf->entity);
63
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE",   GETPOST("tel", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
64
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX",     GETPOST("fax", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
65
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL",    GETPOST("mail", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
66
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB",     GETPOST("web", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
67
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE",    GETPOST("code", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
68
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE",    GETPOST("note", 'restricthtml'),       'chaine', 0, '', $conf->entity);
56
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
57
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
58
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
59
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
60
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity);
61
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
62
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity);
63
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
64
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
65
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
66
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
67
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
68
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity);
69 69
 
70 70
 	if ($action != 'updateedit' && !$error) {
71 71
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
Please login to merge, or discard this patch.
htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -208,12 +208,12 @@
 block discarded – undo
208 208
 
209 209
 		$numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now);
210 210
 		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
211
-		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
211
+		if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
212 212
 			$literaltype = '';
213
-			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
213
+			$literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type
214 214
 			switch ($literaltype) {
215 215
 				case 'EAN13': //EAN13 rowid = 2
216
-					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
216
+					if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13
217 217
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
218 218
 							$eansum = barcode_gen_ean_sum($ean);
219 219
 							$ean .= $eansum; //substitute the las character by the key
Please login to merge, or discard this patch.