Completed
Branch develop (f5af02)
by
unknown
17:35
created
htdocs/admin/tools/update.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
  *		\brief      Page to make a Dolibarr online upgrade
23 23
  */
24 24
 
25
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
26
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
25
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
26
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
27 27
 }
28 28
 
29 29
 // Load Dolibarr environment
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
64 64
 	//var_dump($result['content']);
65 65
 	if (function_exists('simplexml_load_string')) {
66
-		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
66
+		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
67 67
 	} else {
68 68
 		$sfurl = 'xml_not_available';
69 69
 	}
Please login to merge, or discard this patch.
htdocs/admin/supplier_proposal.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 $action = GETPOST('action', 'aZ09');
45 45
 $value = GETPOST('value', 'alpha');
46
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
46
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
47 47
 
48 48
 $label = GETPOST('label', 'alpha');
49 49
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		setEventMessages($langs->trans('Error'), null, 'errors');
212 212
 	} else {
213 213
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
214
-		header("Location: " . $_SERVER["PHP_SELF"]);
214
+		header("Location: ".$_SERVER["PHP_SELF"]);
215 215
 		exit();
216 216
 	}
217 217
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		setEventMessages($langs->trans('Error'), null, 'errors');
227 227
 	} else {
228 228
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
229
-		header("Location: " . $_SERVER["PHP_SELF"]);
229
+		header("Location: ".$_SERVER["PHP_SELF"]);
230 230
 		exit();
231 231
 	}
232 232
 }
Please login to merge, or discard this patch.
htdocs/admin/company.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->trans("Logo"), $tooltiplogo).'</label></td><td>';
490 490
 print '<div class="centpercent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
491 491
 if ($maxmin > 0) {
492
-	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
492
+	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
493 493
 }
494 494
 print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo" id="logo" accept="image/*">';
495 495
 print '</div>';
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 $maxfilesizearray = getMaxFileSizeArray();
532 532
 $maxmin = $maxfilesizearray['maxmin'];
533 533
 if ($maxmin > 0) {
534
-	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
534
+	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
535 535
 }
536 536
 print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo_squarred" id="logo_squarred" accept="image/*">';
537 537
 print '</div>';
Please login to merge, or discard this patch.
htdocs/core/tpl/commonfields_view.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
156 156
 		$rightpart .= ' tdtop';
157 157
 	}
158
-	$rightpart.= '">';
158
+	$rightpart .= '">';
159 159
 	$labeltoshow = '';
160 160
 	if (!empty($val['help'])) {
161 161
 		$labeltoshow .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 				$out = $object->showOutputField($val, $key, $value, '', '', '', 0);
196 196
 				$rightpart .= showValueWithClipboardCPButton($out, 0, $out);
197 197
 			} else {
198
-				$rightpart.= $object->showOutputField($val, $key, $value, '', '', '', 0);
198
+				$rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0);
199 199
 			}
200 200
 		}
201 201
 		if (preg_match('/^(text|html)/', $val['type'])) {
Please login to merge, or discard this patch.
htdocs/core/boxes/box_produits.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -150,9 +150,9 @@
 block discarded – undo
150 150
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
151 151
 					$productstatic->date_modification = $datem;
152 152
 
153
-					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
153
+					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read');
154 154
 					if ($productstatic->isService()) {
155
-						$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
155
+						$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read');
156 156
 					}
157 157
 
158 158
 					$this->info_box_contents[$line][] = array(
Please login to merge, or discard this patch.
htdocs/core/boxes/box_graph_ticket_by_severity.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 		$badgeStatus7 = '#baa32b';
84 84
 		$badgeStatus8 = '#993013';
85 85
 		$badgeStatus9 = '#e7f0f0';
86
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
87
-			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
86
+		if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) {
87
+			include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
88 88
 		}
89 89
 		$this->max = $max;
90 90
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		$colorseriesstat = array();
102 102
 		if ($user->hasRight('ticket', 'read')) {
103 103
 			$sql = "SELECT cts.rowid, cts.label, cts.code";
104
-			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts";
104
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as cts";
105 105
 			$sql .= " WHERE cts.active = 1";
106 106
 			$sql .= $this->db->order('cts.rowid', 'ASC');
107 107
 			$resql = $this->db->query($sql);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 			$dataseries = array();
139 139
 			$data = array();
140 140
 			$sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb";
141
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
141
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
142 142
 			$sql .= " WHERE t.fk_statut <> 8";
143 143
 			$sql .= " GROUP BY t.severity_code";
144 144
 			$resql = $this->db->query($sql);
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 				}
153 153
 				foreach ($listofoppcode as $rowid => $code) {
154 154
 					$dataseries[] = array(
155
-						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code),
155
+						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$code, 'c_ticket_severity', 'code', 'label', $code),
156 156
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
157 157
 					);
158 158
 				}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 					$stringtoprint .= $px1->show($totalnb ? 0 : 1);
191 191
 				}
192 192
 				$stringtoprint .= '</div>';
193
-				$this->info_box_contents[][]=array(
193
+				$this->info_box_contents[][] = array(
194 194
 					'td' => 'class="center"',
195 195
 					'text' => $stringtoprint
196 196
 				);
Please login to merge, or discard this patch.
htdocs/core/db/pgsql.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -756,10 +756,10 @@
 block discarded – undo
756 756
 	public function regexpsql($subject, $pattern, $sqlstring = false)
757 757
 	{
758 758
 		if ($sqlstring) {
759
-			return "(". $subject ." ~ '" . $pattern . "')";
759
+			return "(".$subject." ~ '".$pattern."')";
760 760
 		}
761 761
 
762
-		return "('". $subject ."' ~ '" . $pattern . "')";
762
+		return "('".$subject."' ~ '".$pattern."')";
763 763
 	}
764 764
 
765 765
 
Please login to merge, or discard this patch.
htdocs/core/ajax/row.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	if ($reshook > 0) {
133 133
 		$perm = $hookmanager->resArray['perm'];
134 134
 	}
135
-	if (! $perm) {
135
+	if (!$perm) {
136 136
 		// We should not be here. If we are not allowed to reorder rows, feature should not be visible on script.
137 137
 		// If we are here, it is a hack attempt, so we report a warning.
138 138
 		print 'Bad permission to modify position of lines for object in table '.$table_element_line;
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 	// Reorder line to have position of children lines sharing same counter than parent lines
156 156
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
157
-	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande','fk_contrat'))) {
157
+	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande', 'fk_contrat'))) {
158 158
 		$result = $row->line_order(true);
159 159
 	}
160 160
 } else {
Please login to merge, or discard this patch.
htdocs/core/lib/product.lib.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,11 +38,11 @@  discard block
 block discarded – undo
38 38
 	$langs->load("products");
39 39
 
40 40
 	$label = $langs->trans('Product');
41
-	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
41
+	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read');
42 42
 
43 43
 	if ($object->isService()) {
44 44
 		$label = $langs->trans('Service');
45
-		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
45
+		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read');
46 46
 	}
47 47
 
48 48
 	$h = 0;
@@ -276,10 +276,10 @@  discard block
 block discarded – undo
276 276
 		if (!empty($object->note_public)) {
277 277
 			$nbNote++;
278 278
 		}
279
-		$head[$h][0] = DOL_URL_ROOT .'/product/stock/productlot_note.php?id=' . $object->id;
279
+		$head[$h][0] = DOL_URL_ROOT.'/product/stock/productlot_note.php?id='.$object->id;
280 280
 		$head[$h][1] = $langs->trans('Notes');
281 281
 		if ($nbNote > 0) {
282
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
282
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
283 283
 		}
284 284
 		$head[$h][2] = 'note';
285 285
 		$h++;
Please login to merge, or discard this patch.