Completed
Branch develop (8b51aa)
by
unknown
16:02
created
htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 				if ($result > 0) {
222 222
 					$info = $object->_load_ldap_info();
223 223
 					$dn = $object->_load_ldap_dn($info);
224
-					$search = "(" . $object->_load_ldap_dn($info, 2) . ")";
224
+					$search = "(".$object->_load_ldap_dn($info, 2).")";
225 225
 					$uAC = $ldap->getAttributeValues($search, "userAccountControl");
226 226
 					if ($uAC["count"] == 1) {
227 227
 						$userAccountControl = intval($uAC[0]);
@@ -235,11 +235,11 @@  discard block
 block discarded – undo
235 235
 						$info['userAccountControl'] = $userAccountControl;
236 236
 						$resUpdate = $ldap->update($dn, $info, $user, $dn);
237 237
 						if ($resUpdate < 0) {
238
-							$this->error = "ErrorLDAP " . $ldap->error;
238
+							$this->error = "ErrorLDAP ".$ldap->error;
239 239
 						}
240 240
 					}
241 241
 				} else {
242
-					$this->error = "ErrorLDAP " . $ldap->error;
242
+					$this->error = "ErrorLDAP ".$ldap->error;
243 243
 				}
244 244
 			}
245 245
 		} elseif ($action == 'USER_DELETE') {
Please login to merge, or discard this patch.
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
802 802
 
803 803
 			if (!empty($object->refuse_note)) {
804 804
 				$object->actionmsg .= '<br>';
805
-				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
805
+				$object->actionmsg .= $langs->trans("Reason").': '.$object->refuse_note;
806 806
 			}
807 807
 
808 808
 			$object->sendtoid = 0;
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
 
824 824
 			if (!empty($object->cancel_note)) {
825 825
 				$object->actionmsg .= '<br>';
826
-				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->cancel_note;
826
+				$object->actionmsg .= $langs->trans("Reason").': '.$object->cancel_note;
827 827
 			}
828 828
 
829 829
 			$object->sendtoid = 0;
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
 
845 845
 			if (!empty($object->context['comments'])) {
846 846
 				$object->actionmsg .= '<br>';
847
-				$object->actionmsg .= $langs->trans("Comment") . ': '.$object->context['comments'];
847
+				$object->actionmsg .= $langs->trans("Comment").': '.$object->context['comments'];
848 848
 			}
849 849
 
850 850
 			$object->sendtoid = 0;
@@ -1472,8 +1472,8 @@  discard block
 block discarded – undo
1472 1472
 		$actioncomm = new ActionComm($this->db);
1473 1473
 		$actioncomm->type_code   = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
1474 1474
 		$actioncomm->code        = 'AC_'.$action;
1475
-		$actioncomm->label       = $object->actionmsg2;		// Label of event
1476
-		$actioncomm->note_private = $object->actionmsg;		// Description
1475
+		$actioncomm->label       = $object->actionmsg2; // Label of event
1476
+		$actioncomm->note_private = $object->actionmsg; // Description
1477 1477
 		$actioncomm->fk_project  = $projectid;
1478 1478
 		$actioncomm->datep       = $now;
1479 1479
 		$actioncomm->datef       = $now;
Please login to merge, or discard this patch.
htdocs/core/lib/invoice.lib.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda.php?id='.$object->id;
122 122
 	$head[$h][1] = $langs->trans("Events");
123
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
123
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
124 124
 		$nbEvent = 0;
125 125
 		// Enable caching of thirdparty count actioncomm
126 126
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 			} else {
141 141
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
142 142
 			}
143
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
143
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
144 144
 		}
145 145
 
146 146
 		$head[$h][1] .= '/';
@@ -255,14 +255,14 @@  discard block
 block discarded – undo
255 255
 	$h = 0;
256 256
 	$head = array();
257 257
 
258
-	$head[$h][0] = DOL_URL_ROOT . '/compta/facture/card-rec.php?id=' . $object->id;
258
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id;
259 259
 	$head[$h][1] = $langs->trans("RepeatableInvoice");
260 260
 	$head[$h][2] = 'card';
261 261
 	$h++;
262 262
 
263 263
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda-rec.php?id='.$object->id;
264 264
 	$head[$h][1] = $langs->trans("Events");
265
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
265
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
266 266
 		$nbEvent = 0;
267 267
 		// Enable caching of thirdparty count actioncomm
268 268
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 			} else {
283 283
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
284 284
 			}
285
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
285
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
286 286
 		}
287 287
 
288 288
 		$head[$h][1] .= '/';
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 	$h = 0;
319 319
 	$head = array();
320 320
 
321
-	$head[$h][0] = DOL_URL_ROOT . '/fourn/facture/card-rec.php?id=' . $object->id;
321
+	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card-rec.php?id='.$object->id;
322 322
 	$head[$h][1] = $langs->trans("RepeatableSupplierInvoice");
323 323
 	$head[$h][2] = 'card';
324 324
 	$h++;
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 									,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30)
402 402
 									,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30));
403 403
 				*/
404
-				$dataseries[$i]=array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
404
+				$dataseries[$i] = array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
405 405
 				$i++;
406 406
 			}
407 407
 			if (!empty($dataseries[0])) {
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 				$dolgraph->setShowPercent(1);
449 449
 				$dolgraph->SetType(array('bars', 'bars', 'bars', 'bars', 'bars', 'bars'));
450 450
 				//$dolgraph->SetType(array('pie'));
451
-				$dolgraph->setHeight('160');	/* 160 min is required to show the 6 lines of legend */
451
+				$dolgraph->setHeight('160'); /* 160 min is required to show the 6 lines of legend */
452 452
 				$dolgraph->setWidth('450');
453 453
 				$dolgraph->setHideXValues(true);
454 454
 				if ($mode == 'customers') {
Please login to merge, or discard this patch.
htdocs/core/lib/xcal.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 					// the default behaviour but there is no way to change keeping old saved date compatible.
210 210
 					$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
211 211
 					// Local time should be used to prevent users in time zones earlier than GMT from being one day earlier
212
-					$prefix     = ";VALUE=DATE";
212
+					$prefix = ";VALUE=DATE";
213 213
 					if ($tzforfullday) {
214 214
 						$startdatef = dol_print_date($startdate, "dayxcard", 'gmt');
215 215
 					} else {
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 				$enddatef = dol_print_date($enddate, "dayhourxcard", 'gmt');
238 238
 
239 239
 				if ($fulldayevent) {
240
-					$prefix   = ";VALUE=DATE";
240
+					$prefix = ";VALUE=DATE";
241 241
 					// We add 1 second so we reach the +1 day needed for full day event (DTEND must be next day after event)
242 242
 					// This is mention in https://datatracker.ietf.org/doc/html/rfc5545:
243 243
 					// "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event."
Please login to merge, or discard this patch.
htdocs/core/lib/fichinter.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/agenda.php?id='.$object->id;
124 124
 	$head[$h][1] = $langs->trans('Events');
125
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
125
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
126 126
 		$nbEvent = 0;
127 127
 		// Enable caching of thirdparty count actioncomm
128 128
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 			} else {
143 143
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
144 144
 			}
145
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
145
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
146 146
 		}
147 147
 
148 148
 		$head[$h][1] .= '/';
Please login to merge, or discard this patch.
htdocs/core/lib/contract.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id;
101 101
 	$head[$h][1] = $langs->trans("Events");
102
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
102
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
103 103
 		$nbEvent = 0;
104 104
 		// Enable caching of thirdparty count actioncomm
105 105
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			} else {
120 120
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
121 121
 			}
122
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
122
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
123 123
 		}
124 124
 
125 125
 		$head[$h][1] .= '/';
Please login to merge, or discard this patch.
htdocs/core/lib/order.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
 	$head[$h][0] = DOL_URL_ROOT.'/commande/agenda.php?id='.$object->id;
133 133
 	$head[$h][1] = $langs->trans("Events");
134
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
134
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
135 135
 		$nbEvent = 0;
136 136
 		// Enable caching of thirdparty count actioncomm
137 137
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			} else {
152 152
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
153 153
 			}
154
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
154
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
155 155
 		}
156 156
 
157 157
 		$head[$h][1] .= '/';
Please login to merge, or discard this patch.
htdocs/core/lib/member.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	// Show agenda tab
129 129
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id;
130 130
 	$head[$h][1] = $langs->trans("Events");
131
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
131
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
132 132
 		$nbEvent = 0;
133 133
 		// Enable caching of thirdparty count actioncomm
134 134
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			} else {
148 148
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
149 149
 			}
150
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
150
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
151 151
 		}
152 152
 
153 153
 		$head[$h][1] .= '/';
Please login to merge, or discard this patch.
htdocs/core/lib/ajax.lib.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -552,11 +552,11 @@  discard block
 block discarded – undo
552 552
 	$out = '';
553 553
 
554 554
 	if (is_array($events) && count($events)) {   // If an array of js events to do were provided.
555
-		$out = '<!-- JS code to manage event for id = ' . $htmlname . ' -->
555
+		$out = '<!-- JS code to manage event for id = '.$htmlname.' -->
556 556
 	<script>
557 557
 		$(document).ready(function () {
558 558
 			jQuery("#'.$htmlname.'").change(function () {
559
-				var obj = '.json_encode($events) . ';
559
+				var obj = '.json_encode($events).';
560 560
 		   		$.each(obj, function(key,values) {
561 561
 	    			if (values.method.length) {
562 562
 	    				runJsCodeForEvent'.$htmlname.'(values);
@@ -675,9 +675,9 @@  discard block
 block discarded – undo
675 675
 						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid, token);
676 676
 					} else {';
677 677
 		if (empty($setzeroinsteadofdel)) {
678
-			$out .=' 	delConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);';
678
+			$out .= ' 	delConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);';
679 679
 		} else {
680
-			$out .=' 	setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token, 0);';
680
+			$out .= ' 	setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token, 0);';
681 681
 		}
682 682
 		$out .= '	}
683 683
 				});
Please login to merge, or discard this patch.