Test Failed
Push — master ( 19e7e7...e85ccb )
by
unknown
07:48
created
server/includes/upload_attachment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -452,7 +452,7 @@
 block discarded – undo
452 452
 		$props = [];
453 453
 
454 454
 		// Addresses field value.
455
-		$businessAddress = ($contactProps[$properties["business_address_street"]] ?? '' ) . "\n";
455
+		$businessAddress = ($contactProps[$properties["business_address_street"]] ?? '') . "\n";
456 456
 		$businessAddress .= ($contactProps[$properties["business_address_city"]] ?? '') . " ";
457 457
 		$businessAddress .= ($contactProps[$properties["business_address_state"]] ?? '') . " ";
458 458
 		$businessAddress .= ($contactProps[$properties["business_address_postal_code"]] ?? '') . "\n";
Please login to merge, or discard this patch.
plugins/files/php/modules/class.fileslistmodule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -219,7 +219,7 @@
 block discarded – undo
219 219
 		$backendDisplayName = $backend->backendDisplayName;
220 220
 		$backendVersion = $backend->backendVersion;
221 221
 		$cacheVersion = $this->getVersionFromCache($backendDisplayName, $accountID);
222
-		if(!is_string($cacheVersion)) {
222
+		if (!is_string($cacheVersion)) {
223 223
 			$cacheVersion = '0';
224 224
 		}
225 225
 		$dir = $this->getCache($accountID, $cachePath);
Please login to merge, or discard this patch.
server/includes/core/class.properties.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
247 247
 			$properties["reminderset"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;
248 248
 			$properties["flag_request"] = "PT_STRING8:PSETID_Common:" . PidLidFlagRequest;
249 249
 			$properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;
250
-			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence;                                     // AppointmentSequenceNumber
251
-			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203";                        // AppointmentLastSequence
250
+			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence; // AppointmentSequenceNumber
251
+			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203"; // AppointmentLastSequence
252 252
 			$properties["busystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidBusyStatus;
253 253
 			$properties["intendedbusystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidIntendedBusyStatus;
254 254
 			$properties["start"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
255 255
 			$properties["responselocation"] = "PT_STRING8:PSETID_Meeting:0x2";
256 256
 			$properties["location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
257
-			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229";            // PidLidFInvited, MeetingRequestWasSent
257
+			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229"; // PidLidFInvited, MeetingRequestWasSent
258 258
 			$properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
259 259
 			$properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
260 260
 			$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
@@ -262,11 +262,11 @@  discard block
 block discarded – undo
262 262
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
263 263
 			$properties["clipstart"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;
264 264
 			$properties["clipend"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;
265
-			$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD";                         // StartRecurTime
266
-			$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE";                         // StartRecurTime
267
-			$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF";                           // EndRecurDate
268
-			$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10";                          // EndRecurTime
269
-			$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";                          // LID_IS_EXCEPTION
265
+			$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD"; // StartRecurTime
266
+			$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE"; // StartRecurTime
267
+			$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF"; // EndRecurDate
268
+			$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10"; // EndRecurTime
269
+			$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
270 270
 			// Propose new time properties
271 271
 			$properties["proposed_start_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedStartWhole;
272 272
 			$properties["proposed_end_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedEndWhole;
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
 			$properties = [];
647 647
 			$properties["entryid"] = PR_ENTRYID;
648 648
 			$properties["parent_entryid"] = PR_PARENT_ENTRYID;
649
-			$properties["store_entryid"] = PR_STORE_ENTRYID;	// is this required ???
649
+			$properties["store_entryid"] = PR_STORE_ENTRYID; // is this required ???
650 650
 			$properties["icon_index"] = PR_ICON_INDEX;
651 651
 			$properties["message_class"] = PR_MESSAGE_CLASS;
652 652
 			$properties["message_flags"] = PR_MESSAGE_FLAGS;
@@ -960,9 +960,9 @@  discard block
 block discarded – undo
960 960
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
961 961
 			$properties["appointment_recurring_pattern"] = "PT_STRING8:PSETID_Appointment:" . PidLidRecurrencePattern;
962 962
 			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
963
-			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;	// ClipStart
964
-			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;		// ClipEnd
965
-			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";						// LID_IS_EXCEPTION
963
+			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart; // ClipStart
964
+			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd; // ClipEnd
965
+			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
966 966
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
967 967
 			$properties["alldayevent"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidAppointmentSubType;
968 968
 			$properties["tzdefstart"] = "PT_BINARY:PSETID_Appointment:" . PidLidAppointmentTimeZoneDefinitionStartDisplay;
@@ -1268,18 +1268,18 @@  discard block
 block discarded – undo
1268 1268
 			$properties["object_type"] = PR_OBJECT_TYPE;
1269 1269
 
1270 1270
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
1271
-			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;				// PidLidReminderSet
1272
-			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta;			// PidLidReminderDelta
1273
-			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime;			// PidLidReminderTime
1274
-			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;				// PidLidReminderSignalTime
1275
-
1276
-			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate;				// PidLidTaskDueDate
1277
-			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate;			// PidLidTaskStartDate
1278
-			$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";		// PidLidTaskResetReminder
1279
-			$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";			// PidLidTaskFRecurring
1271
+			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet; // PidLidReminderSet
1272
+			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta; // PidLidReminderDelta
1273
+			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime; // PidLidReminderTime
1274
+			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime; // PidLidReminderSignalTime
1275
+
1276
+			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate; // PidLidTaskDueDate
1277
+			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate; // PidLidTaskStartDate
1278
+			$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107"; // PidLidTaskResetReminder
1279
+			$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126"; // PidLidTaskFRecurring
1280 1280
 			$properties["taskmode"] = "PT_LONG:PSETID_Common:0x8518";
1281 1281
 
1282
-			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;			// PidLidRecurring
1282
+			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring; // PidLidRecurring
1283 1283
 			$properties["appointment_startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
1284 1284
 			$properties["appointment_enddate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
1285 1285
 			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;
Please login to merge, or discard this patch.
server/includes/templates/login.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,8 @@
 block discarded – undo
96 96
 		<div class="disclaimer">
97 97
 			<?php include '/etc/grommunio-web/disclaimer.html'; ?>
98 98
 		</div>
99
-		<?php } elseif (file_exists('disclaimer.html')) { ?>
99
+		<?php }
100
+elseif (file_exists('disclaimer.html')) { ?>
100 101
 		<div class="disclaimer">
101 102
 			<?php include 'disclaimer.html'; ?>
102 103
 		</div>
Please login to merge, or discard this patch.
server/includes/core/constants.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -26,17 +26,17 @@
 block discarded – undo
26 26
 
27 27
 	// used by distribution lists
28 28
 	define("WAB_GUID", pack("H*", "C091ADD3519DCF11A4A900AA0047FAA4"));
29
-	define("DL_USER", 0xC3);		//	195
30
-	define("DL_USER2", 0xD3);		//	211
31
-	define("DL_USER3", 0xE3);		//	227
29
+	define("DL_USER", 0xC3); //	195
30
+	define("DL_USER2", 0xD3); //	211
31
+	define("DL_USER3", 0xE3); //	227
32 32
 	/*
33 33
 	 * According to Exchange protocol, type property for oneoff contact
34 34
 	 * will be 0x00.
35 35
 	 */
36
-	define("DL_EXTERNAL_MEMBER", 0x00);		//	0
37
-	define("DL_DIST", 0xB4);		//	180
38
-	define("DL_USER_AB", 0xB5);		//	181
39
-	define("DL_DIST_AB", 0xB6);		//	182
36
+	define("DL_EXTERNAL_MEMBER", 0x00); //	0
37
+	define("DL_DIST", 0xB4); //	180
38
+	define("DL_USER_AB", 0xB5); //	181
39
+	define("DL_DIST_AB", 0xB6); //	182
40 40
 
41 41
 	// @FIXME these needs to be changed in mapitags.php
42 42
 
Please login to merge, or discard this patch.
server/includes/core/class.operations.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2067,9 +2067,9 @@  discard block
 block discarded – undo
2067 2067
 		$messageProps = [];
2068 2068
 		// It stores the values that is exception allowed or not false -> not allowed
2069 2069
 		$isExceptionAllowed = true;
2070
-		$delete = $actionType == 'delete';	// Flag for MeetingRequest Class whether to send update or cancel mail.
2071
-		$basedate = false;	// Flag for MeetingRequest Class whether to send an exception or not.
2072
-		$isReminderTimeAllowed = true;	// Flag to check reminder minutes is in range of the occurrences
2070
+		$delete = $actionType == 'delete'; // Flag for MeetingRequest Class whether to send update or cancel mail.
2071
+		$basedate = false; // Flag for MeetingRequest Class whether to send an exception or not.
2072
+		$isReminderTimeAllowed = true; // Flag to check reminder minutes is in range of the occurrences
2073 2073
 		$properties = $GLOBALS['properties']->getAppointmentProperties();
2074 2074
 		$send = false;
2075 2075
 		$oldProps = [];
@@ -3060,7 +3060,7 @@  discard block
 block discarded – undo
3060 3060
 			 * convert flags of PR_MESSAGE_FLAGS property to flags that is
3061 3061
 			 * used in mapi_message_setreadflag.
3062 3062
 			 */
3063
-			$flag = MAPI_DEFERRED_ERRORS;		// set unread flag, read receipt will be sent
3063
+			$flag = MAPI_DEFERRED_ERRORS; // set unread flag, read receipt will be sent
3064 3064
 
3065 3065
 			if (($flags & MSGFLAG_RN_PENDING) && isset($msg_action['send_read_receipt']) && $msg_action['send_read_receipt'] == false) {
3066 3066
 				$flag |= SUPPRESS_RECEIPT;
@@ -4201,7 +4201,7 @@  discard block
 block discarded – undo
4201 4201
 				try {
4202 4202
 					$oneoff = mapi_parseoneoff($entryid);
4203 4203
 				}
4204
-				catch(MAPIException $ex) {
4204
+				catch (MAPIException $ex) {
4205 4205
 					error_log(sprintf(
4206 4206
 						"readReplyRecipientEntry unable to open AB entry and mapi_parseoneoff failed: %s - %s",
4207 4207
 						get_mapi_error_name($ex->getCode()),
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -569,7 +569,7 @@
 block discarded – undo
569 569
 						// for with free/busy permission only opened shared calenders,
570 570
 						// so do not remove them from the IPM_COMMON_VIEWS
571 571
 						if ((isset($row[PR_WLINK_SECTION]) && $row[PR_WLINK_SECTION] != wbsidCalendar) ||
572
-						    !isset($row[PR_WLINK_SECTION])) {
572
+							!isset($row[PR_WLINK_SECTION])) {
573 573
 							array_push($faultyLinkMsg, $row[PR_ENTRYID]);
574 574
 						}
575 575
 
Please login to merge, or discard this patch.
server/includes/core/class.indexsqlite.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
 		else {
144 144
 			$first = true;
145 145
 			foreach ($search_patterns as $key => $search_pattern) {
146
-				switch($key) {
146
+				switch ($key) {
147 147
 					case 'message_classes':
148 148
 					case 'date_start':
149 149
 					case 'date_end':
Please login to merge, or discard this patch.
server/includes/core/class.mapisession.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -178,13 +178,13 @@  discard block
 block discarded – undo
178 178
 			$user = $this->getUser($store_props[PR_USER_ENTRYID]);
179 179
 
180 180
 			// receive userdata
181
-			$user_props = [ PR_ASSISTANT, PR_ASSISTANT_TELEPHONE_NUMBER, PR_BUSINESS2_TELEPHONE_NUMBER, PR_BUSINESS_TELEPHONE_NUMBER,
181
+			$user_props = [PR_ASSISTANT, PR_ASSISTANT_TELEPHONE_NUMBER, PR_BUSINESS2_TELEPHONE_NUMBER, PR_BUSINESS_TELEPHONE_NUMBER,
182 182
 				PR_COMPANY_NAME, PR_COUNTRY, PR_DEPARTMENT_NAME, PR_DISPLAY_NAME,
183 183
 				PR_EMAIL_ADDRESS, PR_EMS_AB_THUMBNAIL_PHOTO, PR_GIVEN_NAME, PR_HOME2_TELEPHONE_NUMBER,
184 184
 				PR_STREET_ADDRESS, PR_HOME_TELEPHONE_NUMBER, PR_INITIALS, PR_LOCALITY,
185 185
 				PR_MOBILE_TELEPHONE_NUMBER, PR_OFFICE_LOCATION, PR_PAGER_TELEPHONE_NUMBER, PR_POSTAL_CODE,
186 186
 				PR_PRIMARY_FAX_NUMBER, PR_PRIMARY_TELEPHONE_NUMBER, PR_SEARCH_KEY, PR_SMTP_ADDRESS,
187
-				PR_STATE_OR_PROVINCE, PR_SURNAME, PR_TITLE ];
187
+				PR_STATE_OR_PROVINCE, PR_SURNAME, PR_TITLE];
188 188
 
189 189
 			$user_props = mapi_getprops($user, $user_props);
190 190
 
@@ -1094,7 +1094,7 @@  discard block
 block discarded – undo
1094 1094
 					// Postfix display name of every contact folder with respective owner name
1095 1095
 					// it is mandatory to keep display-name different
1096 1096
 					$userStoreProps = mapi_getprops($openedUserStore, [PR_MAILBOX_OWNER_NAME]);
1097
-					for ($i = 0,$len = count($userContactFolders); $i < $len; ++$i) {
1097
+					for ($i = 0, $len = count($userContactFolders); $i < $len; ++$i) {
1098 1098
 						$userContactFolders[$i][PR_DISPLAY_NAME] = $userContactFolders[$i][PR_DISPLAY_NAME] . " - " . $userStoreProps[PR_MAILBOX_OWNER_NAME];
1099 1099
 					}
1100 1100
 
Please login to merge, or discard this patch.
server/includes/modules/class.addressbooklistmodule.php 2 patches
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -354,8 +354,7 @@  discard block
 block discarded – undo
354 354
 				function sorter($direction, $key) {
355 355
 					return function($a, $b) use ($direction, $key) {
356 356
 						return $direction == 'ASC' ?
357
-							strcasecmp($a['props'][$key] ?? '', $b['props'][$key] ?? '') :
358
-							strcasecmp($b['props'][$key] ?? '', $a['props'][$key] ?? '');
357
+							strcasecmp($a['props'][$key] ?? '', $b['props'][$key] ?? '') : strcasecmp($b['props'][$key] ?? '', $a['props'][$key] ?? '');
359 358
 					};
360 359
 				}
361 360
 				usort($items, sorter($sortingDir, $sortingField));
@@ -760,7 +759,7 @@  discard block
 block discarded – undo
760 759
 								],
761 760
 								[
762 761
 									RES_OR,
763
-									$tempRestrictions,     // all group restrictions
762
+									$tempRestrictions, // all group restrictions
764 763
 								],
765 764
 							],
766 765
 						],
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -908,14 +908,14 @@
 block discarded – undo
908 908
 						// Do not show contacts' folders in the AB list view for which
909 909
 						// the user has permissions, but hasn't added them to the folder hierarchy.
910 910
 						if (!empty($sharedUserSetting) &&
911
-						    !isset($sharedUserSetting['all']) &&
912
-						    !isset($sharedUserSetting['contact']) &&
913
-						    in_array($mainUserEntryId, array_column($grants, 'userid'))) {
911
+							!isset($sharedUserSetting['all']) &&
912
+							!isset($sharedUserSetting['contact']) &&
913
+							in_array($mainUserEntryId, array_column($grants, 'userid'))) {
914 914
 							continue;
915 915
 						}
916 916
 						if (isset($sharedUserSetting['all']) ||
917
-						    isset($sharedUserSetting['contact']) ||
918
-						    in_array($mainUserEntryId, array_column($grants, 'userid')))
917
+							isset($sharedUserSetting['contact']) ||
918
+							in_array($mainUserEntryId, array_column($grants, 'userid')))
919 919
 						{
920 920
 							$this->addFolder($folders, [
921 921
 								// Postfix display name of every contact folder with respective owner name
Please login to merge, or discard this patch.