Merge branch 'master' into '135-sync-issues-when-using-altnames-to-login'

# Conflicts:
#   lib/grommunio/grommunio.php

Author: grammmichi

lib/grommunio/grommunio.php

@@ -39,9 +39,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
@@ -3045,28 +3042,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, PR_SMTP_ADDRESS]);
-			// g-sync135: always use SMTP address (issue with altnames)
-			if (isset($enabledFeatures[PR_SMTP_ADDRESS])) {
-				Request::SetUserIdentifier($enabledFeatures[PR_SMTP_ADDRESS]);
-			}
-			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.");
 		}
 

lib/grommunio/mapiprovider.php

@@ -2492,8 +2492,8 @@ private function isDST($localtime, $tz) {
 		}
 
 		$year = gmdate("Y", $localtime);
-		$start = $this->getTimestampOfWeek($year, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"]);
-		$end = $this->getTimestampOfWeek($year, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"]);
+		$start = $this->getTimestampOfWeek($year, $tz["dststartmonth"], $tz["dststartweek"], $tz["dststartday"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"]);
+		$end = $this->getTimestampOfWeek($year, $tz["dstendmonth"], $tz["dstendweek"], $tz["dstendday"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"]);
 
 		if ($start < $end) {
 			// northern hemisphere (july = dst)