Completed
Branch develop (eb876f)
by
unknown
21:14
created
htdocs/public/test/test_buttons.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		$actionType = 'delete';
63 63
 		$n++;
64 64
 		$id = 'mybuttonid'.$n;
65
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
65
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
66 66
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
67 67
 
68 68
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		$actionType = 'danger';
71 71
 		$n++;
72 72
 		$id = 'mybuttonid'.$n;
73
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
73
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
74 74
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
75 75
 
76 76
 	?>
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 		$actionType = 'delete';
96 96
 		$n++;
97 97
 		$id = 'mybuttonid'.$n;
98
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
98
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
99 99
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
100 100
 
101 101
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		$actionType = 'danger';
104 104
 		$n++;
105 105
 		$id = 'mybuttonid'.$n;
106
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
106
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
107 107
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
108 108
 
109 109
 	?>
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 		$actionType = 'delete';
135 135
 		$n++;
136 136
 		$id = 'mybuttonid'.$n;
137
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
137
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
138 138
 
139 139
 		$params = array(
140 140
 			'confirm' => array(
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		$actionType = 'delete';
174 174
 		$n++;
175 175
 		$id = 'mybuttonid'.$n;
176
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
176
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
177 177
 
178 178
 		$params = array(
179 179
 			'confirm' => array(
Please login to merge, or discard this patch.
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 		$maxfilesizearray = getMaxFileSizeArray();
182 182
 		$maxmin = $maxfilesizearray['maxmin'];
183 183
 		if ($maxmin > 0) {
184
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
184
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
185 185
 		}
186 186
 		$texte .= ' <input type="file" name="uploadfile">';
187 187
 		$texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
279 279
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
280 280
 
281
-				$newfiletmp = $objectref . '_' . $newfiletmp;
281
+				$newfiletmp = $objectref.'_'.$newfiletmp;
282 282
 
283 283
 				// Get extension (ods or odt)
284 284
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -287,11 +287,11 @@  discard block
 block discarded – undo
287 287
 					if ($format == '1') {
288 288
 						$format = '%Y%m%d%H%M%S';
289 289
 					}
290
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
290
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
291 291
 				} else {
292
-					$filename = $newfiletmp . '.' . $newfileformat;
292
+					$filename = $newfiletmp.'.'.$newfileformat;
293 293
 				}
294
-				$file = $dir . '/' . $filename;
294
+				$file = $dir.'/'.$filename;
295 295
 				//print "newdir=".$dir;
296 296
 				//print "newfile=".$newfile;
297 297
 				//print "file=".$file;
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 				dol_mkdir($conf->product->dir_temp);
301 301
 				if (!is_writable($conf->product->dir_temp)) {
302 302
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp);
303
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
303
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
304 304
 					return -1;
305 305
 				}
306 306
 
Please login to merge, or discard this patch.
modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
298 298
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
299 299
 
300
-				$newfiletmp = $objectref . '_' . $newfiletmp;
300
+				$newfiletmp = $objectref.'_'.$newfiletmp;
301 301
 
302 302
 				// Get extension (ods or odt)
303 303
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -306,11 +306,11 @@  discard block
 block discarded – undo
306 306
 					if ($format == '1') {
307 307
 						$format = '%Y%m%d%H%M%S';
308 308
 					}
309
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
309
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
310 310
 				} else {
311
-					$filename = $newfiletmp . '.' . $newfileformat;
311
+					$filename = $newfiletmp.'.'.$newfileformat;
312 312
 				}
313
-				$file = $dir . '/' . $filename;
313
+				$file = $dir.'/'.$filename;
314 314
 				//print "newdir=".$dir;
315 315
 				//print "newfile=".$newfile;
316 316
 				//print "file=".$file;
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 				dol_mkdir($conf->supplier_proposal->dir_temp);
320 320
 				if (!is_writable($conf->supplier_proposal->dir_temp)) {
321 321
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->supplier_proposal->dir_temp);
322
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
322
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
323 323
 					return -1;
324 324
 				}
325 325
 
Please login to merge, or discard this patch.
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 		$maxfilesizearray = getMaxFileSizeArray();
217 217
 		$maxmin = $maxfilesizearray['maxmin'];
218 218
 		if ($maxmin > 0) {
219
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
219
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
220 220
 		}
221 221
 		$texte .= ' <input type="file" name="uploadfile">';
222 222
 		$texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
312 312
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
313 313
 
314
-				$newfiletmp = $objectref . '_' . $newfiletmp;
314
+				$newfiletmp = $objectref.'_'.$newfiletmp;
315 315
 
316 316
 				// Get extension (ods or odt)
317 317
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -320,11 +320,11 @@  discard block
 block discarded – undo
320 320
 					if ($format == '1') {
321 321
 						$format = '%Y%m%d%H%M%S';
322 322
 					}
323
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
323
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
324 324
 				} else {
325
-					$filename = $newfiletmp . '.' . $newfileformat;
325
+					$filename = $newfiletmp.'.'.$newfileformat;
326 326
 				}
327
-				$file = $dir . '/' . $filename;
327
+				$file = $dir.'/'.$filename;
328 328
 				//print "newdir=".$dir;
329 329
 				//print "newfile=".$newfile;
330 330
 				//print "file=".$file;
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 				dol_mkdir($conf->propal->multidir_temp[$object->entity]);
334 334
 				if (!is_writable($conf->propal->dir_temp)) {
335 335
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->propal->dir_temp);
336
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
336
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
337 337
 					return -1;
338 338
 				}
339 339
 
Please login to merge, or discard this patch.
htdocs/core/modules/member/doc/doc_generic_member_odt.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		$maxfilesizearray = getMaxFileSizeArray();
174 174
 		$maxmin = $maxfilesizearray['maxmin'];
175 175
 		if ($maxmin > 0) {
176
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
176
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
177 177
 		}
178 178
 		$texte .= ' <input type="file" name="uploadfile">';
179 179
 		$texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
269 269
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
270 270
 
271
-				$newfiletmp = $objectref . '_' . $newfiletmp;
271
+				$newfiletmp = $objectref.'_'.$newfiletmp;
272 272
 
273 273
 				// Get extension (ods or odt)
274 274
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -277,11 +277,11 @@  discard block
 block discarded – undo
277 277
 					if ($format == '1') {
278 278
 						$format = '%Y%m%d%H%M%S';
279 279
 					}
280
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
280
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
281 281
 				} else {
282
-					$filename = $newfiletmp . '.' . $newfileformat;
282
+					$filename = $newfiletmp.'.'.$newfileformat;
283 283
 				}
284
-				$file = $dir . '/' . $filename;
284
+				$file = $dir.'/'.$filename;
285 285
 				//print "newdir=".$dir;
286 286
 				//print "newfile=".$newfile;
287 287
 				//print "file=".$file;
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 				dol_mkdir($conf->adherent->dir_temp);
291 291
 				if (!is_writable($conf->adherent->dir_temp)) {
292 292
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->adherent->dir_temp);
293
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
293
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
294 294
 					return -1;
295 295
 				}
296 296
 
Please login to merge, or discard this patch.
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 		$maxfilesizearray = getMaxFileSizeArray();
202 202
 		$maxmin = $maxfilesizearray['maxmin'];
203 203
 		if ($maxmin > 0) {
204
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
204
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
205 205
 		}
206 206
 		$texte .= ' <input type="file" name="uploadfile">';
207 207
 		$texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
298 298
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
299 299
 
300
-				$newfiletmp = $objectref . '_' . $newfiletmp;
300
+				$newfiletmp = $objectref.'_'.$newfiletmp;
301 301
 
302 302
 				// Get extension (ods or odt)
303 303
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -306,11 +306,11 @@  discard block
 block discarded – undo
306 306
 					if ($format == '1') {
307 307
 						$format = '%Y%m%d%H%M%S';
308 308
 					}
309
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
309
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
310 310
 				} else {
311
-					$filename = $newfiletmp . '.' . $newfileformat;
311
+					$filename = $newfiletmp.'.'.$newfileformat;
312 312
 				}
313
-				$file = $dir . '/' . $filename;
313
+				$file = $dir.'/'.$filename;
314 314
 				//print "newdir=".$dir;
315 315
 				//print "newfile=".$newfile;
316 316
 				//print "file=".$file;
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 				dol_mkdir($conf->user->dir_temp);
320 320
 				if (!is_writable($conf->user->dir_temp)) {
321 321
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->user->dir_temp);
322
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
322
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
323 323
 					return -1;
324 324
 				}
325 325
 
Please login to merge, or discard this patch.
htdocs/core/filemanagerdol/connectors/php/connector.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 
25 25
 ob_start();
26 26
 
27
-require 'config.inc.php';	// This include the main.inc.php
27
+require 'config.inc.php'; // This include the main.inc.php
28 28
 require 'connector.lib.php';
29 29
 
30 30
 if (!$Config['Enabled']) {
Please login to merge, or discard this patch.
htdocs/cron/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -550,7 +550,7 @@
 block discarded – undo
550 550
 		$langs->load($reg[1]);
551 551
 	}
552 552
 
553
-	$labeltoshow =  preg_replace('/:.*$/', '', $object->label);
553
+	$labeltoshow = preg_replace('/:.*$/', '', $object->label);
554 554
 
555 555
 	$morehtmlref = '<div class="refidno">';
556 556
 	$morehtmlref .= $langs->trans($labeltoshow);
Please login to merge, or discard this patch.
htdocs/societe/price.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 
48 48
 // Get parameters
49 49
 $action 		= GETPOST('action', 'aZ09');
50
-$search_prod 	= GETPOST('search_prod', 'alpha');
50
+$search_prod = GETPOST('search_prod', 'alpha');
51 51
 $cancel 		= GETPOST('cancel', 'alpha');
52 52
 $search_label 	= GETPOST('search_label', 'alpha');
53 53
 $search_price 	= GETPOST('search_price');
Please login to merge, or discard this patch.