Passed
Push — master ( 4d7880...348e1a )
by
unknown
06:02 queued 27s
created
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 1 patch
Spacing   +3 added lines, -5 removed lines patch added patch discarded remove patch
@@ -184,8 +184,7 @@  discard block
 block discarded – undo
184 184
 						}
185 185
 						// a shared contact is either a single contact item or a distribution list
186 186
 						$item['display_type_ex'] = $user_data[PR_ICON_INDEX] == 512 ?
187
-							DTE_FLAG_ACL_CAPABLE | DT_MAILUSER :
188
-							DTE_FLAG_ACL_CAPABLE | DT_MAILUSER | DT_DISTLIST;
187
+							DTE_FLAG_ACL_CAPABLE | DT_MAILUSER : DTE_FLAG_ACL_CAPABLE | DT_MAILUSER | DT_DISTLIST;
189 188
 						$item['display_type'] = $user_data[PR_ICON_INDEX] == 512 ? DT_MAILUSER : DT_DISTLIST;
190 189
 						$item['fileas'] = $item['display_name'];
191 190
 						$item['surname'] = isset($user_data[PR_SURNAME]) ? $user_data[PR_SURNAME] : '';
@@ -354,8 +353,7 @@  discard block
 block discarded – undo
354 353
 				function sorter($direction, $key) {
355 354
 					return function($a, $b) use ($direction, $key) {
356 355
 						return $direction == 'ASC' ?
357
-							strcasecmp($a['props'][$key] ?? '', $b['props'][$key] ?? '') :
358
-							strcasecmp($b['props'][$key] ?? '', $a['props'][$key] ?? '');
356
+							strcasecmp($a['props'][$key] ?? '', $b['props'][$key] ?? '') : strcasecmp($b['props'][$key] ?? '', $a['props'][$key] ?? '');
359 357
 					};
360 358
 				}
361 359
 				usort($items, sorter($sortingDir, $sortingField));
@@ -760,7 +758,7 @@  discard block
 block discarded – undo
760 758
 								],
761 759
 								[
762 760
 									RES_OR,
763
-									$tempRestrictions,     // all group restrictions
761
+									$tempRestrictions, // all group restrictions
764 762
 								],
765 763
 							],
766 764
 						],
Please login to merge, or discard this patch.