Completed
Branch develop (1d589f)
by
unknown
21:18
created
htdocs/admin/tools/dolibarr_import.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
  * 		\brief      Page to import database
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
Please login to merge, or discard this patch.
htdocs/admin/tools/purge.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@
 block discarded – undo
21 21
  *		\brief      Page to purge files (temporary or not)
22 22
  */
23 23
 
24
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
25
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
24
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
25
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
26 26
 }
27 27
 
28 28
 // Load Dolibarr environment
Please login to merge, or discard this patch.
htdocs/admin/tools/listsessions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
  *      \brief      List of PHP sessions
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
Please login to merge, or discard this patch.
htdocs/admin/tools/export_files.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@
 block discarded – undo
23 23
  *		\brief      Page to export documents into a compressed file
24 24
  */
25 25
 
26
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
27
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
26
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
27
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
28 28
 }
29 29
 
30 30
 // Load Dolibarr environment
Please login to merge, or discard this patch.
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.