Completed
Branch develop (0be59c)
by
unknown
14:45
created
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/stock/doc/doc_generic_stock_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="STOCK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
280 280
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
281 281
 
282
-				$newfiletmp = $objectref . '_' . $newfiletmp;
282
+				$newfiletmp = $objectref.'_'.$newfiletmp;
283 283
 
284 284
 				// Get extension (ods or odt)
285 285
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -288,11 +288,11 @@  discard block
 block discarded – undo
288 288
 					if ($format == '1') {
289 289
 						$format = '%Y%m%d%H%M%S';
290 290
 					}
291
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
291
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
292 292
 				} else {
293
-					$filename = $newfiletmp . '.' . $newfileformat;
293
+					$filename = $newfiletmp.'.'.$newfileformat;
294 294
 				}
295
-				$file = $dir . '/' . $filename;
295
+				$file = $dir.'/'.$filename;
296 296
 				//print "newdir=".$dir;
297 297
 				//print "newfile=".$newfile;
298 298
 				//print "file=".$file;
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 				dol_mkdir($conf->product->dir_temp);
302 302
 				if (!is_writable($conf->product->dir_temp)) {
303 303
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp);
304
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
304
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
305 305
 					return -1;
306 306
 				}
307 307
 
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/modules/contract/doc/doc_generic_contract_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 		$maxfilesizearray = getMaxFileSizeArray();
171 171
 		$maxmin = $maxfilesizearray['maxmin'];
172 172
 		if ($maxmin > 0) {
173
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
173
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
174 174
 		}
175 175
 		$texte .= ' <input type="file" name="uploadfile">';
176 176
 		$texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
267 267
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
268 268
 
269
-				$newfiletmp = $objectref . '_' . $newfiletmp;
269
+				$newfiletmp = $objectref.'_'.$newfiletmp;
270 270
 
271 271
 				// Get extension (ods or odt)
272 272
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -275,11 +275,11 @@  discard block
 block discarded – undo
275 275
 					if ($format == '1') {
276 276
 						$format = '%Y%m%d%H%M%S';
277 277
 					}
278
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
278
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
279 279
 				} else {
280
-					$filename = $newfiletmp . '.' . $newfileformat;
280
+					$filename = $newfiletmp.'.'.$newfileformat;
281 281
 				}
282
-				$file = $dir . '/' . $filename;
282
+				$file = $dir.'/'.$filename;
283 283
 				//print "newdir=".$dir;
284 284
 				//print "newfile=".$newfile;
285 285
 				//print "file=".$file;
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 				dol_mkdir($conf->contrat->dir_temp);
289 289
 				if (!is_writable($conf->contrat->dir_temp)) {
290 290
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->contrat->dir_temp);
291
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
291
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
292 292
 					return -1;
293 293
 				}
294 294
 
Please login to merge, or discard this patch.
htdocs/core/filemanagerdol/connectors/php/connector.lib.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -374,7 +374,7 @@
 block discarded – undo
374 374
 	echo <<<EOF
375 375
 <script type="text/javascript">
376 376
 (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
377
-EOF;
377
+eof;
378 378
 
379 379
 	if ($errorNumber && $errorNumber != 201) {
380 380
 		$fileUrl = "";
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@
 block discarded – undo
266 266
 
267 267
 				switch ($sErrorMsg) {
268 268
 					case '':
269
-						$sErrorNumber = '0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
269
+						$sErrorNumber = '0'; // @phan-suppress-current-line PhanPluginRedundantAssignment
270 270
 						break;
271 271
 					case 'Invalid argument':
272 272
 					case 'No such file or directory':
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.