Completed
Branch develop (c23a95)
by
unknown
18:46
created
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/system/security.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 $todisabletext = '';
133 133
 $i = 0;
134 134
 foreach ($arrayoffunctionstodisable as $functiontodisable) {
135
-	if (! in_array($functiontodisable, $arrayoffunctionsdisabled)) {
135
+	if (!in_array($functiontodisable, $arrayoffunctionsdisabled)) {
136 136
 		if ($i > 0) {
137 137
 			$todisabletext .= ', ';
138 138
 		}
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 $todisabletext = '';
148 148
 $i = 0;
149 149
 foreach ($arrayoffunctionstodisable2 as $functiontodisable) {
150
-	if (! in_array($functiontodisable, $arrayoffunctionsdisabled)) {
150
+	if (!in_array($functiontodisable, $arrayoffunctionsdisabled)) {
151 151
 		if ($i > 0) {
152 152
 			$todisabletext .= ', ';
153 153
 		}
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 print '<br>';
219 219
 print '<br>';
220 220
 
221
-print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: ';		// $conffile is defined into filefunc.inc.php
221
+print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: '; // $conffile is defined into filefunc.inc.php
222 222
 $perms = fileperms($dolibarr_main_document_root.'/'.$conffile);
223 223
 if ($perms) {
224 224
 	if (($perms & 0x0004) || ($perms & 0x0002)) {
@@ -402,11 +402,11 @@  discard block
 block discarded – undo
402 402
 $umask = getDolGlobalString('MAIN_UMASK');
403 403
 
404 404
 print '<strong>'.$langs->trans("UMask").'</strong>: ';
405
-if (! in_array($umask, array('600', '660', '0600', '0660'))) {
405
+if (!in_array($umask, array('600', '660', '0600', '0660'))) {
406 406
 	print img_warning().' ';
407 407
 }
408 408
 print $umask;
409
-if (! in_array($umask, array('600', '660', '0600', '0660'))) {
409
+if (!in_array($umask, array('600', '660', '0600', '0660'))) {
410 410
 	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0600 | 0660)</span>';
411 411
 }
412 412
 print '<br>';
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/mailing.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	$checkread_key = GETPOST('MAILING_EMAIL_UNSUBSCRIBE_KEY', 'alpha');
54 54
 	$contactbulkdefault = GETPOST('MAILING_CONTACT_DEFAULT_BULK_STATUS', 'int');
55 55
 	if (GETPOST('MAILING_DELAY', 'alpha') != '') {
56
-		$mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3);		// Not less than 1 millisecond.
56
+		$mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3); // Not less than 1 millisecond.
57 57
 	} else {
58 58
 		$mailingdelay = '';
59 59
 	}
@@ -181,9 +181,9 @@  discard block
 block discarded – undo
181 181
 
182 182
 // default blacklist from mailing
183 183
 print '<tr class="oddeven">';
184
-print '<td>' . $langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")) . '</td>';
184
+print '<td>'.$langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")).'</td>';
185 185
 print '<td>';
186
-$blacklist_setting=array(0=>$langs->trans('No'), 1=>$langs->trans('Yes'), 2=>$langs->trans('DefaultStatusEmptyMandatory'));
186
+$blacklist_setting = array(0=>$langs->trans('No'), 1=>$langs->trans('Yes'), 2=>$langs->trans('DefaultStatusEmptyMandatory'));
187 187
 print $form->selectarray("MAILING_CONTACT_DEFAULT_BULK_STATUS", $blacklist_setting, $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS);
188 188
 print '</td>';
189 189
 print '<td class="hideonsmartphone"></td>';
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/admin_extrafields_view.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
 <!-- BEGIN PHP TEMPLATE admin_extrafields_view.tpl.php -->
39 39
 <?php
40 40
 
41
-$title = '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '': $textobject).'</span><br>'."\n";
41
+$title = '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '' : $textobject).'</span><br>'."\n";
42 42
 //if ($action != 'create' && $action != 'edit') {
43 43
 $newcardbutton = dolGetButtonTitle($langs->trans('NewAttribute'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=create', '', (($action != 'create' && $action != 'edit') ? 1 : 1));
44 44
 /*} else {
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.