Completed
Branch develop (a99e44)
by
unknown
15:19
created
htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,11 +160,11 @@
 block discarded – undo
160 160
 		dol_mkdir($conf->barcode->dir_temp);
161 161
 		if (!is_writable($conf->barcode->dir_temp)) {
162 162
 			$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->barcode->dir_temp);
163
-			dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
163
+			dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
164 164
 			return -1;
165 165
 		}
166 166
 
167
-		$file = $conf->barcode->dir_temp . '/barcode_' . $code . '_' . $encoding . '.png';
167
+		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
168 168
 
169 169
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
170 170
 		if (empty($tcpdfEncoding)) {
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/modules/asset/doc/doc_generic_asset_odt.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
 				dol_mkdir($conf->asset->dir_temp);
286 286
 				if (!is_writable($conf->asset->dir_temp)) {
287 287
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->asset->dir_temp);
288
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
288
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
289 289
 					return -1;
290 290
 				}
291 291
 
Please login to merge, or discard this patch.
htdocs/core/filemanagerdol/connectors/php/connector.lib.php 1 patch
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.
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/accountancy/admin/defaultaccounts.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 print '<tr class="oddeven value">';
279 279
 // Param
280 280
 print '<td>';
281
-print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT');
281
+print img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT');
282 282
 print '</td>';
283 283
 // Value
284 284
 print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
@@ -288,13 +288,13 @@  discard block
 block discarded – undo
288 288
 
289 289
 if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') != '-1') {
290 290
 	print '<tr class="oddeven">';
291
-	print '<td>' . img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnCustomerDeposit") . '</td>';
291
+	print '<td>'.img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnCustomerDeposit").'</td>';
292 292
 	if (getDolGlobalInt('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
293
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
293
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
294 294
 		print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning');
295 295
 		print '</a></td>';
296 296
 	} else {
297
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
297
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
298 298
 		print img_picto($langs->trans("Disabled"), 'switch_off');
299 299
 		print '</a></td>';
300 300
 	}
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 print '<tr class="oddeven value">';
306 306
 // Param
307 307
 print '<td>';
308
-print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT');
308
+print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT');
309 309
 print '</td>';
310 310
 // Value
311 311
 print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
@@ -315,13 +315,13 @@  discard block
 block discarded – undo
315 315
 
316 316
 if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') != '-1') {
317 317
 	print '<tr class="oddeven">';
318
-	print '<td>' . img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnSupplierDeposit") . '</td>';
318
+	print '<td>'.img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnSupplierDeposit").'</td>';
319 319
 	if (getDolGlobalInt('ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT')) {
320
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
320
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
321 321
 		print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning');
322 322
 		print '</a></td>';
323 323
 	} else {
324
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
324
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
325 325
 		print img_picto($langs->trans("Disabled"), 'switch_off');
326 326
 		print '</a></td>';
327 327
 	}
Please login to merge, or discard this patch.
htdocs/takepos/pay.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 $disablejs = 0;
70 70
 $disablehead = 0;
71 71
 
72
-$head='<link rel="stylesheet" href="css/pos.css.php">';
72
+$head = '<link rel="stylesheet" href="css/pos.css.php">';
73 73
 if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) {
74 74
 	$head .= '<link rel="stylesheet" href="css/colorful.css">';
75 75
 }
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 
678 678
 <?php
679 679
 // Add code from hooks
680
-$parameters=array();
680
+$parameters = array();
681 681
 $hookmanager->executeHooks('completePayment', $parameters, $invoice);
682 682
 print $hookmanager->resPrint;
683 683
 ?>
Please login to merge, or discard this patch.
htdocs/admin/ldap.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -161,21 +161,21 @@
 block discarded – undo
161 161
 if (isModEnabled('societe')) {
162 162
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
163 163
 	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_CONTACT_ACTIVE'), 'activecontact', array(Ldap::SYNCHRO_LDAP_TO_DOLIBARR));
164
-	print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnContactActiveExample") . '</span></td></tr>';
164
+	print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnContactActiveExample").'</span></td></tr>';
165 165
 }
166 166
 
167 167
 // Synchro member active
168 168
 if (isModEnabled('adherent')) {
169
-	print '<tr class="oddeven"><td>' . $langs->trans("LDAPDnMemberActive") . '</td><td>';
169
+	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>';
170 170
 	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_ACTIVE'), 'activemembers', array(), 2);
171
-	print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnMemberActiveExample") . '</span></td></tr>';
171
+	print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnMemberActiveExample").'</span></td></tr>';
172 172
 }
173 173
 
174 174
 // Synchro member type active
175 175
 if (isModEnabled('adherent')) {
176
-	print '<tr class="oddeven"><td>' . $langs->trans("LDAPDnMemberTypeActive") . '</td><td>';
176
+	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberTypeActive").'</td><td>';
177 177
 	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE'), 'activememberstypes', array(), 2);
178
-	print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnMemberTypeActiveExample") . '</span></td></tr>';
178
+	print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnMemberTypeActiveExample").'</span></td></tr>';
179 179
 }
180 180
 
181 181
 // Fields from hook
Please login to merge, or discard this patch.