Completed
Branch develop (f5af02)
by
unknown
17:35
created
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/user/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 	|| (($user->id != $id) && $user->hasRight("user", "user", "passsword")));
61 61
 }
62 62
 
63
-$permissiontoadd = $caneditfield;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
63
+$permissiontoadd = $caneditfield; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
64 64
 $permtoedit = $caneditfield;
65 65
 
66 66
 // Security check
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/core/lib/images.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
184 184
 
185
-	$infoImg = getimagesize($filetoread); 			// Get data about src image
185
+	$infoImg = getimagesize($filetoread); // Get data about src image
186 186
 	$imgWidth = $infoImg[0]; // Largeur de l'image
187 187
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
188 188
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 	}
302 302
 
303 303
 	// Set transparent color according to image extension
304
-	$trans_colour = -1;	// By default, undefined
304
+	$trans_colour = -1; // By default, undefined
305 305
 	switch ($newExt) {
306 306
 		case 'gif':	// Gif
307 307
 			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF
Please login to merge, or discard this patch.
htdocs/core/lib/date.lib.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -291,11 +291,11 @@  discard block
 block discarded – undo
291 291
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
292 292
 			}
293 293
 		} elseif ($format == 'allhourminsec') {
294
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
294
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
295 295
 		} elseif ($format == 'allhourmin') {
296
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60)));
296
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
297 297
 		} elseif ($format == 'allhour') {
298
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600)));
298
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600)));
299 299
 		}
300 300
 	} elseif ($format == 'hour') {	// only hour part
301 301
 		$sTime = dol_print_date($iSecond, '%H', true);
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
 				$date_1sunsept = strtotime('next thursday', strtotime('next sunday', mktime(0, 0, 0, 9, 1, $annee)));
907 907
 				$jour_1sunsept = date("d", $date_1sunsept);
908 908
 				$mois_1sunsept = date("m", $date_1sunsept);
909
-				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie=true;
909
+				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie = true;
910 910
 				// Geneva fast in Switzerland
911 911
 			}
912 912
 		}
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.