Completed
Branch develop (c23a95)
by
unknown
18:46
created
htdocs/comm/mailing/card.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 							}
261 261
 						}
262 262
 						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
263
-							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
263
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm').'</a>';
264 264
 						}
265 265
 						/* For backward compatibility, deprecated */
266 266
 						if (isModEnabled('paypal') && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 	}
429 429
 
430 430
 	// Action send test emailing
431
-	if ($action == 'send' && ! $cancel) {
431
+	if ($action == 'send' && !$cancel) {
432 432
 		$error = 0;
433 433
 
434 434
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -1276,7 +1276,7 @@  discard block
 block discarded – undo
1276 1276
 			$maxfilesizearray = getMaxFileSizeArray();
1277 1277
 			$maxmin = $maxfilesizearray['maxmin'];
1278 1278
 			if ($maxmin > 0) {
1279
-				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
1279
+				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
1280 1280
 			}
1281 1281
 			$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
1282 1282
 			$out .= ' ';
Please login to merge, or discard this patch.
htdocs/comm/mailing/class/advtargetemailing.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$customerStatic->loadCacheOfProspStatus();
126 126
 		if (!empty($customerStatic->cacheprospectstatus)) {
127 127
 			foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) {
128
-				$this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label'];
128
+				$this->type_statuscommprospect[$dataProspectSt['id']] = $dataProspectSt['label'];
129 129
 			}
130 130
 		} else {
131 131
 			$this->type_statuscommprospect = array(
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 						}
629 629
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
630 630
 						if ($arrayquery['options_'.$key] > 0) {
631
-							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
631
+							$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
632 632
 						}
633 633
 					} else {
634 634
 						if (is_array($arrayquery['options_'.$key])) {
Please login to merge, or discard this patch.
htdocs/intracommreport/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@
 block discarded – undo
118 118
 if ($action == 'add' && $permissiontoadd) {
119 119
 	$object->label = trim($label);
120 120
 	$object->type = trim($exporttype);
121
-	$object->type_declaration =  $type_declaration;
121
+	$object->type_declaration = $type_declaration;
122 122
 	//$object->subscription = (int) $subscription;
123 123
 
124 124
 	// Fill array 'array_options' with data from add form
Please login to merge, or discard this patch.
htdocs/intracommreport/class/intracommreport.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	public $picto = 'intracommreport';
57 57
 
58 58
 
59
-	public $label; 		// ref ???
59
+	public $label; // ref ???
60 60
 
61 61
 	public $period;
62 62
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public $declaration_number;
69 69
 
70
-	public $type_declaration;		// deb or des
70
+	public $type_declaration; // deb or des
71 71
 
72 72
 
73 73
 	/**
Please login to merge, or discard this patch.
htdocs/don/payment/payment.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
 			// Create a line of payments
96 96
 			$payment = new PaymentDonation($db);
97 97
 			$payment->chid         = $chid;
98
-			$payment->datep     = $datepaid;
98
+			$payment->datep = $datepaid;
99 99
 			$payment->amounts      = $amounts; // Tableau de montant
100 100
 			$payment->paymenttype  = GETPOST("paymenttype", 'int');
101 101
 			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
Please login to merge, or discard this patch.
htdocs/don/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
 }
82 82
 $result = restrictedArea($user, 'don', $object->id);
83 83
 
84
-$permissiontoadd = $user->rights->don->creer;	// Used by the include of actions_dellink.inc.php
84
+$permissiontoadd = $user->rights->don->creer; // Used by the include of actions_dellink.inc.php
85 85
 
86 86
 
87 87
 /*
Please login to merge, or discard this patch.
htdocs/don/class/paymentdonation.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 
65 65
 	public $amounts = array(); // Array of amounts
66 66
 
67
-	public $fk_typepayment;	// Payment mode ID
68
-	public $paymenttype;	// Payment mode ID or Code. TODO Use only the code in this field.
67
+	public $fk_typepayment; // Payment mode ID
68
+	public $paymenttype; // Payment mode ID or Code. TODO Use only the code in this field.
69 69
 
70 70
 	public $num_payment;
71 71
 
@@ -269,8 +269,8 @@  discard block
 block discarded – undo
269 269
 				$this->tms            = $this->db->jdate($obj->tms);
270 270
 				$this->datep		  = $this->db->jdate($obj->datep);
271 271
 				$this->amount         = $obj->amount;
272
-				$this->fk_typepayment = $obj->fk_typepayment;	// Id on type of payent
273
-				$this->paymenttype    = $obj->fk_typepayment;	// Id on type of payment. We should store the code into paymenttype.
272
+				$this->fk_typepayment = $obj->fk_typepayment; // Id on type of payent
273
+				$this->paymenttype    = $obj->fk_typepayment; // Id on type of payment. We should store the code into paymenttype.
274 274
 				$this->num_payment    = $obj->num_payment;
275 275
 				$this->note_public    = $obj->note_public;
276 276
 				$this->fk_bank        = $obj->fk_bank;
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 		}
689 689
 
690 690
 		global $action;
691
-		$hookmanager->initHooks(array($this->element . 'dao'));
691
+		$hookmanager->initHooks(array($this->element.'dao'));
692 692
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
693 693
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
694 694
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/margin/customerMargins.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
 
66 66
 $startdate = $enddate = '';
67 67
 if (GETPOST('startdatemonth')) {
68
-	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'),  GETPOST('startdateday', 'int'),  GETPOST('startdateyear', 'int'));
68
+	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
69 69
 }
70 70
 if (GETPOST('enddatemonth')) {
71 71
 	$enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear'));
Please login to merge, or discard this patch.
htdocs/theme/eldy/global.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 if (!empty($conf->global->THEME_DARKMODEENABLED)) {
66 66
 	print "/* For dark mode */\n";
67 67
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
68
-		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
68
+		print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
69 69
 	} else {
70 70
 		print "@media not print {";
71 71
 	}
@@ -5052,7 +5052,7 @@  discard block
 block discarded – undo
5052 5052
 if (!empty($conf->global->THEME_DARKMODEENABLED)) {
5053 5053
 	print "/* For dark mode */\n";
5054 5054
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
5055
-		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
5055
+		print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
5056 5056
 	} else {
5057 5057
 		print "@media not print {";
5058 5058
 	}
Please login to merge, or discard this patch.