Completed
Branch develop (e79292)
by
unknown
24:24
created
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.
htdocs/resource/agenda.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
  */
96 96
 
97 97
 $parameters = array('id'=>$id);
98
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
98
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
99 99
 if ($reshook < 0) {
100 100
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
101 101
 }
Please login to merge, or discard this patch.
htdocs/fourn/facture/note.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@
 block discarded – undo
177 177
 			$facavoir->fetch($facid);
178 178
 			$invoicecredits[] = $facavoir->getNomUrl(1);
179 179
 		}
180
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
180
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir").implode(',', $invoicecredits).')';
181 181
 	}
182 182
 	/*
183 183
 	if ($facidnext > 0) {
Please login to merge, or discard this patch.
template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 		$maxfilesizearray = getMaxFileSizeArray();
188 188
 		$maxmin = $maxfilesizearray['maxmin'];
189 189
 		if ($maxmin > 0) {
190
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
190
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
191 191
 		}
192 192
 		$texte .= ' <input type="file" name="uploadfile">';
193 193
 		$texte .= '<input type="hidden" value="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
283 283
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
284 284
 
285
-				$newfiletmp = $objectref . '_' . $newfiletmp;
285
+				$newfiletmp = $objectref.'_'.$newfiletmp;
286 286
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
287 287
 
288 288
 				// Get extension (ods or odt)
@@ -292,11 +292,11 @@  discard block
 block discarded – undo
292 292
 					if ($format == '1') {
293 293
 						$format = '%Y%m%d%H%M%S';
294 294
 					}
295
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
295
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
296 296
 				} else {
297
-					$filename = $newfiletmp . '.' . $newfileformat;
297
+					$filename = $newfiletmp.'.'.$newfileformat;
298 298
 				}
299
-				$file = $dir . '/' . $filename;
299
+				$file = $dir.'/'.$filename;
300 300
 				//print "newdir=".$dir;
301 301
 				//print "newfile=".$newfile;
302 302
 				//print "file=".$file;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 				dol_mkdir($conf->mymodule->dir_temp);
306 306
 				if (!is_writable($conf->mymodule->dir_temp)) {
307 307
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mymodule->dir_temp);
308
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
308
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
309 309
 					return -1;
310 310
 				}
311 311
 
Please login to merge, or discard this patch.