Merge branch 'pr_ec_disabled_features' into 'master'

Remove deprecated PR_EC_DISABLED_FEATURES check

See merge request grommunio/grommunio-sync!103

Author: grammmike

lib/grommunio/grommunio.php

@@ -38,9 +38,6 @@ class Grommunio extends InterProcessData implements IBackend, ISearchProvider, I
 	private $stateFolder;
 	private $userDeviceData;
 
-	// gromox config parameter for PR_EC_ENABLED_FEATURES / PR_EC_DISABLED_FEATURES
-	public const MOBILE_ENABLED = 'mobile';
-
 	public const MAXAMBIGUOUSRECIPIENTS = 9999;
 	public const FREEBUSYENUMBLOCKS = 50;
 	public const MAXFREEBUSYSLOTS = 32767; // max length of 32k for the MergedFreeBusy element is allowed
@@ -3047,24 +3044,9 @@ private function getAddressbookDir() {
 	 * @throws FatalException if user is disabled for grommunio-sync
 	 */
 	private function isGSyncEnabled() {
-		$addressbook = $this->getAddressbook();
 		// this check needs to be performed on the store of the main (authenticated) user
-		$storeProps = mapi_getprops($this->storeCache[$this->mainUser], [PR_MAILBOX_OWNER_ENTRYID, PR_EC_ENABLED_FEATURES_L]);
-		$mobileDisabled = !($storeProps[PR_EC_ENABLED_FEATURES_L] & UP_EAS);
-		if (!$mobileDisabled) {
-			$mailuser = mapi_ab_openentry($addressbook, $storeProps[PR_MAILBOX_OWNER_ENTRYID]);
-			$enabledFeatures = mapi_getprops($mailuser, [PR_EC_DISABLED_FEATURES]);
-			if (isset($enabledFeatures[PR_EC_DISABLED_FEATURES]) && is_array($enabledFeatures[PR_EC_DISABLED_FEATURES])) {
-				$mobileDisabled = in_array(self::MOBILE_ENABLED, $enabledFeatures[PR_EC_DISABLED_FEATURES]);
-				$deviceId = Request::GetDeviceID();
-				// Checks for deviceId present in zarafaDisabledFeatures LDAP array attribute. Check is performed case insensitive.
-				$deviceIdDisabled = (($deviceId !== null) && in_array($deviceId, array_map('strtolower', $enabledFeatures[PR_EC_DISABLED_FEATURES]))) ? true : false;
-				if ($deviceIdDisabled) {
-					throw new FatalException(sprintf("User has deviceId %s disabled for usage with grommunio-sync.", $deviceId));
-				}
-			}
-		}
-		if ($mobileDisabled) {
+		$storeProps = mapi_getprops($this->storeCache[$this->mainUser], [PR_EC_ENABLED_FEATURES_L]);
+		if (!($storeProps[PR_EC_ENABLED_FEATURES_L] & UP_EAS)) {
 			throw new FatalException("User is disabled for grommunio-sync.");
 		}