grommunio / grommunio-sync

lib/grommunio/grommunio.php

Indentation +2928 added lines, -2928 removed lines

@@ -21,2359 +21,2359 @@ 
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
 class Grommunio extends InterProcessData implements IBackend, ISearchProvider, IStateMachine {
-	private $mainUser;
-	private $session;
-	private $defaultstore;
-	private $store;
-	private $storeName;
-	private $storeCache;
-	private $notifications;
-	private $changesSink;
-	private $changesSinkFolders;
-	private $changesSinkHierarchyHash;
-	private $changesSinkStores;
-	private $wastebasket;
-	private $addressbook;
-	private $folderStatCache;
-	private $impersonateUser;
-	private $stateFolder;
-	private $userDeviceData;
-
-	// KC 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
-	public const HALFHOURSECONDS = 1800;
-
-	/**
-	 * Constructor of the grommunio Backend.
-	 */
-	public function __construct() {
-		$this->session = false;
-		$this->store = false;
-		$this->storeName = false;
-		$this->storeCache = [];
-		$this->notifications = false;
-		$this->changesSink = false;
-		$this->changesSinkFolders = [];
-		$this->changesSinkStores = [];
-		$this->changesSinkHierarchyHash = false;
-		$this->wastebasket = false;
-		$this->session = false;
-		$this->folderStatCache = [];
-		$this->impersonateUser = false;
-		$this->stateFolder = null;
-
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio using PHP-MAPI version: %s - PHP version: %s", phpversion("mapi"), phpversion()));
-
-		# Interprocessdata
-		$this->allocate = 0;
-		$this->type = "grommunio-sync:userdevices";
-		$this->userDeviceData = "grommunio-sync:statefoldercache";
-		parent::__construct();
-	}
-
-	/**
-	 * Indicates which StateMachine should be used.
-	 *
-	 * @return bool Grommunio uses own state machine
-	 */
-	public function GetStateMachine() {
-		return $this;
-	}
-
-	/**
-	 * Returns the Grommunio as it implements the ISearchProvider interface
-	 * This could be overwritten by the global configuration.
-	 *
-	 * @return object Implementation of ISearchProvider
-	 */
-	public function GetSearchProvider() {
-		return $this;
-	}
-
-	/**
-	 * Indicates which AS version is supported by the backend.
-	 *
-	 * @return string AS version constant
-	 */
-	public function GetSupportedASVersion() {
-		return GSync::ASV_141;
-	}
-
-	/**
-	 * Authenticates the user with the configured grommunio server.
-	 *
-	 * @param string $username
-	 * @param string $domain
-	 * @param string $password
-	 * @param mixed  $user
-	 * @param mixed  $pass
-	 *
-	 * @throws AuthenticationRequiredException
-	 *
-	 * @return bool
-	 */
-	public function Logon($user, $domain, $pass) {
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Trying to authenticate user '%s'..", $user));
-
-		$this->mainUser = strtolower($user);
-		// TODO the impersonated user should be passed directly to IBackend->Logon() - ZP-1351
-		if (Request::GetImpersonatedUser()) {
-			$this->impersonateUser = strtolower(Request::GetImpersonatedUser());
-		}
-
-		// check if we are impersonating someone
-		// $defaultUser will be used for $this->defaultStore
-		if ($this->impersonateUser !== false) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Impersonation active - authenticating: '%s' - impersonating '%s'", $this->mainUser, $this->impersonateUser));
-			$defaultUser = $this->impersonateUser;
-		}
-		else {
-			$defaultUser = $this->mainUser;
-		}
-
-		$deviceId = Request::GetDeviceID();
-
-		try {
-			// check if notifications are available in php-mapi
-			if (function_exists('mapi_feature') && mapi_feature('LOGONFLAGS')) {
-				// send grommunio-sync version and user agent to ZCP - ZP-589
-				if (Utils::CheckMapiExtVersion('7.2.0')) {
-					$gsync_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
-					$user_agent = ($deviceId) ? GSync::GetDeviceManager()->GetUserAgent() : "unknown";
-					$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0, $gsync_version, $user_agent);
-				}
-				else {
-					$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0);
-				}
-				$this->notifications = true;
-			}
-			// old fashioned session
-			else {
-				$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER);
-				$this->notifications = false;
-			}
-
-			if (mapi_last_hresult()) {
-				SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->Logon(): login failed with error code: 0x%X", mapi_last_hresult()));
-				if (mapi_last_hresult() == MAPI_E_NETWORK_ERROR) {
-					throw new ServiceUnavailableException("Error connecting to KC (login)");
-				}
-			}
-		}
-		catch (MAPIException $ex) {
-			throw new AuthenticationRequiredException($ex->getDisplayMessage());
-		}
-
-		if (!$this->session) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): logon failed for user '%s'", $this->mainUser));
-			$this->defaultstore = false;
-
-			return false;
-		}
-
-		// Get/open default store
-		$this->defaultstore = $this->openMessageStore($this->mainUser);
-
-		// To impersonate, we overwrite the defaultstore. We still need to open it before we can do that.
-		if ($this->impersonateUser) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Impersonating user '%s'", $defaultUser));
-			$this->defaultstore = $this->openMessageStore($defaultUser);
-		}
-
-		if (mapi_last_hresult() == MAPI_E_FAILONEPROVIDER) {
-			throw new ServiceUnavailableException("Error connecting to KC (open store)");
-		}
-
-		if ($this->defaultstore === false) {
-			throw new AuthenticationRequiredException(sprintf("Grommunio->Logon(): User '%s' has no default store", $defaultUser));
-		}
-
-		$this->store = $this->defaultstore;
-		$this->storeName = $defaultUser;
-
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): User '%s' is authenticated%s", $this->mainUser, ($this->impersonateUser ? " impersonating '" . $this->impersonateUser . "'" : '')));
-
-		$this->isGSyncEnabled();
-
-		// check if this is a Zarafa 7 store with unicode support
-		MAPIUtils::IsUnicodeStore($this->store);
-
-		// open the state folder
-		$this->getStateFolder($deviceId);
-
-		return true;
-	}
-
-	/**
-	 * Setup the backend to work on a specific store or checks ACLs there.
-	 * If only the $store is submitted, all Import/Export/Fetch/Etc operations should be
-	 * performed on this store (switch operations store).
-	 * If the ACL check is enabled, this operation should just indicate the ACL status on
-	 * the submitted store, without changing the store for operations.
-	 * For the ACL status, the currently logged on user MUST have access rights on
-	 *  - the entire store - admin access if no folderid is sent, or
-	 *  - on a specific folderid in the store (secretary/full access rights).
-	 *
-	 * The ACLcheck MUST fail if a folder of the authenticated user is checked!
-	 *
-	 * @param string $store        target store, could contain a "domain\user" value
-	 * @param bool   $checkACLonly if set to true, Setup() should just check ACLs
-	 * @param string $folderid     if set, only ACLs on this folderid are relevant
-	 *
-	 * @return bool
-	 */
-	public function Setup($store, $checkACLonly = false, $folderid = false) {
-		list($user, $domain) = Utils::SplitDomainUser($store);
-
-		if (!isset($this->mainUser)) {
-			return false;
-		}
-
-		$mainUser = $this->mainUser;
-		// when impersonating we need to check against the impersonated user
-		if ($this->impersonateUser) {
-			$mainUser = $this->impersonateUser;
-		}
-
-		if ($user === false) {
-			$user = $mainUser;
-		}
-
-		// This is a special case. A user will get his entire folder structure by the foldersync by default.
-		// The ACL check is executed when an additional folder is going to be sent to the mobile.
-		// Configured that way the user could receive the same folderid twice, with two different names.
-		if ($mainUser == $user && $checkACLonly && $folderid && !$this->impersonateUser) {
-			SLog::Write(LOGLEVEL_DEBUG, "Grommunio->Setup(): Checking ACLs for folder of the users defaultstore. Fail is forced to avoid folder duplications on mobile.");
-
-			return false;
-		}
-
-		// get the users store
-		$userstore = $this->openMessageStore($user);
-
-		// only proceed if a store was found, else return false
-		if ($userstore) {
-			// only check permissions
-			if ($checkACLonly == true) {
-				// check for admin rights
-				if (!$folderid) {
-					if ($user != $this->mainUser) {
-						if ($this->impersonateUser) {
-							$storeProps = mapi_getprops($userstore, [PR_IPM_SUBTREE_ENTRYID]);
-							$rights = $this->HasSecretaryACLs($userstore, '', $storeProps[PR_IPM_SUBTREE_ENTRYID]);
-							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for secretary ACLs on root folder of impersonated store '%s': '%s'", $user, Utils::PrintAsString($rights)));
-						}
-						else {
-							$zarafauserinfo = @nsp_getuserinfo($this->mainUser);
-							$rights = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin']) ? true : false;
-							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for admin ACLs on store '%s': '%s'", $user, Utils::PrintAsString($rights)));
-						}
-					}
-					// the user has always full access to his own store
-					else {
-						$rights = true;
-						SLog::Write(LOGLEVEL_DEBUG, "Grommunio->Setup(): the user has always full access to his own store");
-					}
-
-					return $rights;
-				}
-				// check permissions on this folder
-
-				$rights = $this->HasSecretaryACLs($userstore, $folderid);
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for secretary ACLs on '%s' of store '%s': '%s'", $folderid, $user, Utils::PrintAsString($rights)));
-
-				return $rights;
-			}
-
-			// switch operations store
-			// this should also be done if called with user = mainuser or user = false
-			// which means to switch back to the default store
-
-			// switch active store
-			$this->store = $userstore;
-			$this->storeName = $user;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Logs off
-	 * Free/Busy information is updated for modified calendars
-	 * This is done after the synchronization process is completed.
-	 *
-	 * @return bool
-	 */
-	public function Logoff() {
-		return true;
-	}
-
-	/**
-	 * Returns an array of SyncFolder types with the entire folder hierarchy
-	 * on the server (the array itself is flat, but refers to parents via the 'parent' property.
-	 *
-	 * provides AS 1.0 compatibility
-	 *
-	 * @return array SYNC_FOLDER
-	 */
-	public function GetHierarchy() {
-		$folders = [];
-		$mapiprovider = new MAPIProvider($this->session, $this->store);
-		$storeProps = $mapiprovider->GetStoreProps();
-
-		// for SYSTEM user open the public folders
-		if (strtoupper($this->storeName) == "SYSTEM") {
-			$rootfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-		}
-		else {
-			$rootfolder = mapi_msgstore_openentry($this->store);
-		}
-
-		$rootfolderprops = mapi_getprops($rootfolder, [PR_SOURCE_KEY]);
-
-		$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
-		$rows = mapi_table_queryallrows($hierarchy, [PR_DISPLAY_NAME, PR_PARENT_ENTRYID, PR_ENTRYID, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_CONTAINER_CLASS, PR_ATTR_HIDDEN, PR_EXTENDED_FOLDER_FLAGS, PR_FOLDER_TYPE]);
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): fetched %d folders from MAPI", count($rows)));
-
-		foreach ($rows as $row) {
-			// do not display hidden and search folders
-			if ((isset($row[PR_ATTR_HIDDEN]) && $row[PR_ATTR_HIDDEN]) ||
-				(isset($row[PR_FOLDER_TYPE]) && $row[PR_FOLDER_TYPE] == FOLDER_SEARCH) ||
-				// for SYSTEM user $row[PR_PARENT_SOURCE_KEY] == $rootfolderprops[PR_SOURCE_KEY] is true, but we need those folders
-				(isset($row[PR_PARENT_SOURCE_KEY]) && $row[PR_PARENT_SOURCE_KEY] == $rootfolderprops[PR_SOURCE_KEY] && strtoupper($this->storeName) != "SYSTEM")) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): ignoring folder '%s' as it's a hidden/search/root folder", (isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "unknown")));
-
-				continue;
-			}
-			$folder = $mapiprovider->GetFolder($row);
-			if ($folder) {
-				$folders[] = $folder;
-			}
-			else {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): ignoring folder '%s' as MAPIProvider->GetFolder() did not return a SyncFolder object", (isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "unknown")));
-			}
-		}
-
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): processed %d folders, starting parent remap", count($folders)));
-		// reloop the folders to make sure all parentids are mapped correctly
-		$dm = GSync::GetDeviceManager();
-		foreach ($folders as $folder) {
-			if ($folder->parentid !== "0") {
-				// SYSTEM user's parentid points to $rootfolderprops[PR_SOURCE_KEY], but they need to be on the top level
-				$folder->parentid = (strtoupper($this->storeName) == "SYSTEM" && $folder->parentid == bin2hex($rootfolderprops[PR_SOURCE_KEY])) ? '0' : $dm->GetFolderIdForBackendId($folder->parentid);
-			}
-		}
-
-		return $folders;
-	}
-
-	/**
-	 * Returns the importer to process changes from the mobile
-	 * If no $folderid is given, hierarchy importer is expected.
-	 *
-	 * @param string $folderid (opt)
-	 *
-	 * @return object(ImportChanges)
-	 */
-	public function GetImporter($folderid = false) {
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetImporter() folderid: '%s'", Utils::PrintAsString($folderid)));
-		if ($folderid !== false) {
-			// check if the user of the current store has permissions to import to this folderid
-			if ($this->storeName != $this->mainUser && !$this->hasSecretaryACLs($this->store, $folderid)) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetImporter(): missing permissions on folderid: '%s'.", Utils::PrintAsString($folderid)));
-
-				return false;
-			}
-
-			return new ImportChangesICS($this->session, $this->store, hex2bin($folderid));
-		}
-
-		return new ImportChangesICS($this->session, $this->store);
-	}
-
-	/**
-	 * Returns the exporter to send changes to the mobile
-	 * If no $folderid is given, hierarchy exporter is expected.
-	 *
-	 * @param string $folderid (opt)
-	 *
-	 * @throws StatusException
-	 *
-	 * @return object(ExportChanges)
-	 */
-	public function GetExporter($folderid = false) {
-		if ($folderid !== false) {
-			// check if the user of the current store has permissions to export from this folderid
-			if ($this->storeName != $this->mainUser && !$this->hasSecretaryACLs($this->store, $folderid)) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetExporter(): missing permissions on folderid: '%s'.", Utils::PrintAsString($folderid)));
-
-				return false;
-			}
-
-			return new ExportChangesICS($this->session, $this->store, hex2bin($folderid));
-		}
-
-		return new ExportChangesICS($this->session, $this->store);
-	}
-
-	/**
-	 * Sends an e-mail
-	 * This messages needs to be saved into the 'sent items' folder.
-	 *
-	 * @param SyncSendMail $sm SyncSendMail object
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function SendMail($sm) {
-		// Check if imtomapi function is available and use it to send the mime message.
-		// It is available since ZCP 7.0.6
-		// @see http://jira.zarafa.com/browse/ZCP-9508
-		if (!(function_exists('mapi_feature') && mapi_feature('INETMAPI_IMTOMAPI'))) {
-			throw new StatusException("Grommunio->SendMail(): ZCP/KC version is too old, INETMAPI_IMTOMAPI is not available. Install at least ZCP version 7.0.6 or later.", SYNC_COMMONSTATUS_MAILSUBMISSIONFAILED, null, LOGLEVEL_FATAL);
-
-			return false;
-		}
-		$mimeLength = strlen($sm->mime);
-		SLog::Write(LOGLEVEL_DEBUG, sprintf(
-			"Grommunio->SendMail(): RFC822: %d bytes  forward-id: '%s' reply-id: '%s' parent-id: '%s' SaveInSent: '%s' ReplaceMIME: '%s'",
-			$mimeLength,
-			Utils::PrintAsString($sm->forwardflag),
-			Utils::PrintAsString($sm->replyflag),
-			Utils::PrintAsString((isset($sm->source->folderid) ? $sm->source->folderid : false)),
-			Utils::PrintAsString(($sm->saveinsent)),
-			Utils::PrintAsString(isset($sm->replacemime))
-		));
-		if ($mimeLength == 0) {
-			throw new StatusException("Grommunio->SendMail(): empty mail data", SYNC_COMMONSTATUS_MAILSUBMISSIONFAILED);
-		}
-
-		$sendMailProps = MAPIMapping::GetSendMailProperties();
-		$sendMailProps = getPropIdsFromStrings($this->defaultstore, $sendMailProps);
-
-		// Open the outbox and create the message there
-		$storeprops = mapi_getprops($this->defaultstore, [$sendMailProps["outboxentryid"], $sendMailProps["ipmsentmailentryid"]]);
-		if (isset($storeprops[$sendMailProps["outboxentryid"]])) {
-			$outbox = mapi_msgstore_openentry($this->defaultstore, $storeprops[$sendMailProps["outboxentryid"]]);
-		}
-
-		if (!$outbox) {
-			throw new StatusException(sprintf("Grommunio->SendMail(): No Outbox found or unable to create message: 0x%X", mapi_last_hresult()), SYNC_COMMONSTATUS_SERVERERROR);
-		}
-
-		$mapimessage = mapi_folder_createmessage($outbox);
-
-		// message properties to be set
-		$mapiprops = [];
-		// only save the outgoing in sent items folder if the mobile requests it
-		$mapiprops[$sendMailProps["sentmailentryid"]] = $storeprops[$sendMailProps["ipmsentmailentryid"]];
-
-		SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): Use the mapi_inetmapi_imtomapi function");
-		$ab = mapi_openaddressbook($this->session);
-		mapi_inetmapi_imtomapi($this->session, $this->defaultstore, $ab, $mapimessage, $sm->mime, []);
-
-		// Set the appSeqNr so that tracking tab can be updated for meeting request updates
-		// @see http://jira.zarafa.com/browse/ZP-68
-		$meetingRequestProps = MAPIMapping::GetMeetingRequestProperties();
-		$meetingRequestProps = getPropIdsFromStrings($this->defaultstore, $meetingRequestProps);
-		$props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS, $meetingRequestProps["goidtag"], $sendMailProps["internetcpid"], $sendMailProps["body"], $sendMailProps["html"], $sendMailProps["rtf"], $sendMailProps["rtfinsync"]]);
-
-		// Convert sent message's body to UTF-8 if it was a HTML message.
-		// @see http://jira.zarafa.com/browse/ZP-505 and http://jira.zarafa.com/browse/ZP-555
-		if (isset($props[$sendMailProps["internetcpid"]]) && $props[$sendMailProps["internetcpid"]] != INTERNET_CPID_UTF8 && MAPIUtils::GetNativeBodyType($props) == SYNC_BODYPREFERENCE_HTML) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): Sent email cpid is not unicode (%d). Set it to unicode and convert email html body.", $props[$sendMailProps["internetcpid"]]));
-			$mapiprops[$sendMailProps["internetcpid"]] = INTERNET_CPID_UTF8;
-
-			$bodyHtml = MAPIUtils::readPropStream($mapimessage, PR_HTML);
-			$bodyHtml = Utils::ConvertCodepageStringToUtf8($props[$sendMailProps["internetcpid"]], $bodyHtml);
-			$mapiprops[$sendMailProps["html"]] = $bodyHtml;
-
-			mapi_setprops($mapimessage, $mapiprops);
-		}
-		if (stripos($props[PR_MESSAGE_CLASS], "IPM.Schedule.Meeting.Resp.") === 0) {
-			// search for calendar items using goid
-			$mr = new Meetingrequest($this->defaultstore, $mapimessage);
-			$appointments = $mr->findCalendarItems($props[$meetingRequestProps["goidtag"]]);
-			if (is_array($appointments) && !empty($appointments)) {
-				$app = mapi_msgstore_openentry($this->defaultstore, $appointments[0]);
-				$appprops = mapi_getprops($app, [$meetingRequestProps["appSeqNr"]]);
-				if (isset($appprops[$meetingRequestProps["appSeqNr"]]) && $appprops[$meetingRequestProps["appSeqNr"]]) {
-					$mapiprops[$meetingRequestProps["appSeqNr"]] = $appprops[$meetingRequestProps["appSeqNr"]];
-					SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): Set sequence number to:%d", $appprops[$meetingRequestProps["appSeqNr"]]));
-				}
-			}
-		}
-
-		// Delete the PR_SENT_REPRESENTING_* properties because some android devices
-		// do not send neither From nor Sender header causing empty PR_SENT_REPRESENTING_NAME and
-		// PR_SENT_REPRESENTING_EMAIL_ADDRESS properties and "broken" PR_SENT_REPRESENTING_ENTRYID
-		// which results in spooler not being able to send the message.
-		// @see http://jira.zarafa.com/browse/ZP-85
-		mapi_deleteprops(
-			$mapimessage,
-			[
-				$sendMailProps["sentrepresentingname"],
-				$sendMailProps["sentrepresentingemail"],
-				$sendMailProps["representingentryid"],
-				$sendMailProps["sentrepresentingaddt"],
-				$sendMailProps["sentrepresentinsrchk"],
-			]
-		);
-
-		if (isset($sm->source->itemid) && $sm->source->itemid) {
-			// answering an email in a public/shared folder
-			// TODO as the store is setup, we should actually user $this->store instead of $this->defaultstore - nevertheless we need to make sure this store is able to send mail (has an outbox)
-			if (!$this->Setup(GSync::GetAdditionalSyncFolderStore($sm->source->folderid))) {
-				throw new StatusException(sprintf("Grommunio->SendMail() could not Setup() the backend for folder id '%s'", $sm->source->folderid), SYNC_COMMONSTATUS_SERVERERROR);
-			}
-
-			$entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($sm->source->folderid), hex2bin($sm->source->itemid));
-			if ($entryid) {
-				$fwmessage = mapi_msgstore_openentry($this->store, $entryid);
-			}
-
-			if (isset($fwmessage) && $fwmessage) {
-				// update icon and last_verb when forwarding or replying message
-				// reply-all (verb 103) is not supported, as we cannot really detect this case
-				if ($sm->forwardflag) {
-					$updateProps = [
-						PR_ICON_INDEX => 262,
-						PR_LAST_VERB_EXECUTED => 104,
-					];
-				}
-				elseif ($sm->replyflag) {
-					$updateProps = [
-						PR_ICON_INDEX => 261,
-						PR_LAST_VERB_EXECUTED => 102,
-					];
-				}
-				if (isset($updateProps)) {
-					$updateProps[PR_LAST_VERB_EXECUTION_TIME] = time();
-					mapi_setprops($fwmessage, $updateProps);
-					mapi_savechanges($fwmessage);
-				}
-
-				// only attach the original message if the mobile does not send it itself
-				if (!isset($sm->replacemime)) {
-					// get message's body in order to append forward or reply text
-					if (!isset($body)) {
-						$body = MAPIUtils::readPropStream($mapimessage, PR_BODY);
-					}
-					if (!isset($bodyHtml)) {
-						$bodyHtml = MAPIUtils::readPropStream($mapimessage, PR_HTML);
-					}
-					$cpid = mapi_getprops($fwmessage, [$sendMailProps["internetcpid"]]);
-					if ($sm->forwardflag) {
-						// attach the original attachments to the outgoing message
-						$this->copyAttachments($mapimessage, $fwmessage);
-					}
-
-					// regarding the conversion @see ZP-470
-					if (strlen($body) > 0) {
-						$fwbody = MAPIUtils::readPropStream($fwmessage, PR_BODY);
-						// if only the old message's cpid is set, convert from old charset to utf-8
-						if (isset($cpid[$sendMailProps["internetcpid"]]) && $cpid[$sendMailProps["internetcpid"]] != INTERNET_CPID_UTF8) {
-							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): convert plain forwarded message charset (only fw set) from '%s' to '65001'", $cpid[$sendMailProps["internetcpid"]]));
-							$fwbody = Utils::ConvertCodepageStringToUtf8($cpid[$sendMailProps["internetcpid"]], $fwbody);
-						}
-						// otherwise to the general conversion
-						else {
-							SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): no charset conversion done for plain forwarded message");
-							$fwbody = w2u($fwbody);
-						}
-
-						$mapiprops[$sendMailProps["body"]] = $body . "\r\n\r\n" . $fwbody;
-					}
-
-					if (strlen($bodyHtml) > 0) {
-						$fwbodyHtml = MAPIUtils::readPropStream($fwmessage, PR_HTML);
-						// if only new message's cpid is set, convert to UTF-8
-						if (isset($cpid[$sendMailProps["internetcpid"]]) && $cpid[$sendMailProps["internetcpid"]] != INTERNET_CPID_UTF8) {
-							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): convert html forwarded message charset (only fw set) from '%s' to '65001'", $cpid[$sendMailProps["internetcpid"]]));
-							$fwbodyHtml = Utils::ConvertCodepageStringToUtf8($cpid[$sendMailProps["internetcpid"]], $fwbodyHtml);
-						}
-						// otherwise to the general conversion
-						else {
-							SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): no charset conversion done for html forwarded message");
-							$fwbodyHtml = w2u($fwbodyHtml);
-						}
-
-						$mapiprops[$sendMailProps["html"]] = $bodyHtml . "<br><br>" . $fwbodyHtml;
-					}
-				}
-			}
-			else {
-				// no fwmessage could be opened and we need it because we do not replace mime
-				if (!isset($sm->replacemime) || $sm->replacemime == false) {
-					throw new StatusException(sprintf("Grommunio->SendMail(): Could not open message id '%s' in folder id '%s' to be replied/forwarded: 0x%X", $sm->source->itemid, $sm->source->folderid, mapi_last_hresult()), SYNC_COMMONSTATUS_ITEMNOTFOUND);
-				}
-			}
-		}
-
-		mapi_setprops($mapimessage, $mapiprops);
-		mapi_savechanges($mapimessage);
-		mapi_message_submitmessage($mapimessage);
-		$hr = mapi_last_hresult();
-
-		if ($hr) {
-			switch ($hr) {
-				case MAPI_E_STORE_FULL:
-					$code = SYNC_COMMONSTATUS_MAILBOXQUOTAEXCEEDED;
-					break;
-
-				default:
-					$code = SYNC_COMMONSTATUS_MAILSUBMISSIONFAILED;
-					break;
-			}
-
-			throw new StatusException(sprintf("Grommunio->SendMail(): Error saving/submitting the message to the Outbox: 0x%X", $hr), $code);
-		}
-
-		SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): email submitted");
-
-		return true;
-	}
-
-	/**
-	 * Returns all available data of a single message.
-	 *
-	 * @param string            $folderid
-	 * @param string            $id
-	 * @param ContentParameters $contentparameters flag
-	 *
-	 * @throws StatusException
-	 *
-	 * @return object(SyncObject)
-	 */
-	public function Fetch($folderid, $id, $contentparameters) {
-		// SEARCH fetches with folderid == false and PR_ENTRYID as ID
-		if (!$folderid) {
-			$entryid = hex2bin($id);
-			$sk = $id;
-		}
-		else {
-			// id might be in the new longid format, so we have to split it here
-			list($fsk, $sk) = Utils::SplitMessageId($id);
-			// get the entry id of the message
-			$entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid), hex2bin($sk));
-		}
-		if (!$entryid) {
-			throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error getting entryid: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
-		}
-
-		// open the message
-		$message = mapi_msgstore_openentry($this->store, $entryid);
-		if (!$message) {
-			throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error, unable to open message: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
-		}
-
-		// convert the mapi message into a SyncObject and return it
-		$mapiprovider = new MAPIProvider($this->session, $this->store);
-
-		// override truncation
-		$contentparameters->SetTruncation(SYNC_TRUNCATION_ALL);
-		// TODO check for body preferences
-		return $mapiprovider->GetMessage($message, $contentparameters);
-	}
-
-	/**
-	 * Returns the waste basket.
-	 *
-	 * @return string
-	 */
-	public function GetWasteBasket() {
-		if ($this->wastebasket) {
-			return $this->wastebasket;
-		}
-
-		$storeprops = mapi_getprops($this->defaultstore, [PR_IPM_WASTEBASKET_ENTRYID]);
-		if (isset($storeprops[PR_IPM_WASTEBASKET_ENTRYID])) {
-			$wastebasket = mapi_msgstore_openentry($this->defaultstore, $storeprops[PR_IPM_WASTEBASKET_ENTRYID]);
-			$wastebasketprops = mapi_getprops($wastebasket, [PR_SOURCE_KEY]);
-			if (isset($wastebasketprops[PR_SOURCE_KEY])) {
-				$this->wastebasket = bin2hex($wastebasketprops[PR_SOURCE_KEY]);
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetWasteBasket(): Got waste basket with id '%s'", $this->wastebasket));
-
-				return $this->wastebasket;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the content of the named attachment as stream.
-	 *
-	 * @param string $attname
-	 *
-	 * @throws StatusException
-	 *
-	 * @return SyncItemOperationsAttachment
-	 */
-	public function GetAttachmentData($attname) {
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetAttachmentData('%s')", $attname));
-
-		if (!strpos($attname, ":")) {
-			throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, attachment requested for non-existing item", $attname), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
-		}
-
-		list($id, $attachnum, $parentEntryid) = explode(":", $attname);
-		if (isset($parentEntryid)) {
-			$this->Setup(GSync::GetAdditionalSyncFolderStore($parentEntryid));
-		}
-
-		$entryid = hex2bin($id);
-		$message = mapi_msgstore_openentry($this->store, $entryid);
-		if (!$message) {
-			throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open item for attachment data for id '%s' with: 0x%X", $attname, $id, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
-		}
-
-		MAPIUtils::ParseSmime($this->session, $this->defaultstore, $this->getAddressbook(), $message);
-		$attach = mapi_message_openattach($message, $attachnum);
-		if (!$attach) {
-			throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment number '%s' with: 0x%X", $attname, $attachnum, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
-		}
-
-		// get necessary attachment props
-		$attprops = mapi_getprops($attach, [PR_ATTACH_MIME_TAG, PR_ATTACH_MIME_TAG_W, PR_ATTACH_METHOD]);
-		$attachment = new SyncItemOperationsAttachment();
-		// check if it's an embedded message and open it in such a case
-		if (isset($attprops[PR_ATTACH_METHOD]) && $attprops[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG) {
-			$embMessage = mapi_attach_openobj($attach);
-			$addrbook = $this->getAddressbook();
-			$stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $embMessage, ['use_tnef' => -1]);
-			// set the default contenttype for this kind of messages
-			$attachment->contenttype = "message/rfc822";
-		}
-		else {
-			$stream = mapi_openproperty($attach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
-		}
-
-		if (!$stream) {
-			throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment data stream: 0x%X", $attname, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
-		}
-
-		// put the mapi stream into a wrapper to get a standard stream
-		$attachment->data = MAPIStreamWrapper::Open($stream);
-		if (isset($attprops[PR_ATTACH_MIME_TAG])) {
-			$attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG];
-		}
-		elseif (isset($attprops[PR_ATTACH_MIME_TAG_W])) {
-			$attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG_W];
-		}
-		// TODO default contenttype
-		return $attachment;
-	}
-
-	/**
-	 * Deletes all contents of the specified folder.
-	 * This is generally used to empty the trash (wastebasked), but could also be used on any
-	 * other folder.
-	 *
-	 * @param string $folderid
-	 * @param bool   $includeSubfolders (opt) also delete sub folders, default true
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function EmptyFolder($folderid, $includeSubfolders = true) {
-		$folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
-		if (!$folderentryid) {
-			throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open folder (no entry id)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
-		}
-		$folder = mapi_msgstore_openentry($this->store, $folderentryid);
-
-		if (!$folder) {
-			throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open parent folder (open entry)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
-		}
-
-		$flags = 0;
-		if ($includeSubfolders) {
-			$flags = DEL_ASSOCIATED;
-		}
-
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->EmptyFolder('%s','%s'): emptying folder", $folderid, Utils::PrintAsString($includeSubfolders)));
-
-		// empty folder!
-		mapi_folder_emptyfolder($folder, $flags);
-		if (mapi_last_hresult()) {
-			throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, mapi_folder_emptyfolder() failed: 0x%X", $folderid, Utils::PrintAsString($includeSubfolders), mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Processes a response to a meeting request.
-	 * CalendarID is a reference and has to be set if a new calendar item is created.
-	 *
-	 * @param string $requestid id of the object containing the request
-	 * @param string $folderid  id of the parent folder of $requestid
-	 * @param string $response
-	 *
-	 * @throws StatusException
-	 *
-	 * @return string id of the created/updated calendar obj
-	 */
-	public function MeetingResponse($requestid, $folderid, $response) {
-		// Use standard meeting response code to process meeting request
-		list($fid, $requestid) = Utils::SplitMessageId($requestid);
-		$reqentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid), hex2bin($requestid));
-		if (!$reqentryid) {
-			throw new StatusException(sprintf("Grommunio->MeetingResponse('%s', '%s', '%s'): Error, unable to entryid of the message 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
-		}
-
-		$mapimessage = mapi_msgstore_openentry($this->store, $reqentryid);
-		if (!$mapimessage) {
-			throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, unable to open request message for response 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
-		}
-
-		// ios sends calendar item in MeetingResponse
-		// @see https://jira.z-hub.io/browse/ZP-1524
-		$folderClass = GSync::GetDeviceManager()->GetFolderClassFromCacheByID($fid);
-		// find the corresponding meeting request
-		if ($folderClass != 'Email') {
-			$props = MAPIMapping::GetMeetingRequestProperties();
-			$props = getPropIdsFromStrings($this->store, $props);
-
-			$messageprops = mapi_getprops($mapimessage, [$props["goidtag"]]);
-			$goid = $messageprops[$props["goidtag"]];
-
-			$mapiprovider = new MAPIProvider($this->session, $this->store);
-			$inboxprops = $mapiprovider->GetInboxProps();
-			$folder = mapi_msgstore_openentry($this->store, $inboxprops[PR_ENTRYID]);
-
-			// Find the item by restricting all items to the correct ID
-			$restrict = [RES_AND, [
-				[RES_PROPERTY,
-					[
-						RELOP => RELOP_EQ,
-						ULPROPTAG => $props["goidtag"],
-						VALUE => $goid,
-					],
-				],
-			]];
-
-			$inboxcontents = mapi_folder_getcontentstable($folder);
-
-			$rows = mapi_table_queryallrows($inboxcontents, [PR_ENTRYID], $restrict);
-			if (empty($rows)) {
-				throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, meeting request not found in the inbox", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
-			}
-			SLog::Write(LOGLEVEL_DEBUG, "Grommunio->MeetingResponse found meeting request in the inbox");
-			$mapimessage = mapi_msgstore_openentry($this->store, $rows[0][PR_ENTRYID]);
-			$reqentryid = $rows[0][PR_ENTRYID];
-		}
-
-		$meetingrequest = new Meetingrequest($this->store, $mapimessage, $this->session);
-
-		if (!$meetingrequest->isMeetingRequest()) {
-			throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to respond to non-meeting request", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
-		}
-
-		if ($meetingrequest->isLocalOrganiser()) {
-			throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to response to meeting request that we organized", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
-		}
-
-		// Process the meeting response. We don't have to send the actual meeting response
-		// e-mail, because the device will send it itself. This seems not to be the case
-		// anymore for the ios devices since at least version 12.4. grommunio-sync will send the
-		// accepted email in such a case.
-		// @see https://jira.z-hub.io/browse/ZP-1524
-		$sendresponse = false;
-		$deviceType = strtolower(Request::GetDeviceType());
-		if ($deviceType == 'iphone' || $deviceType == 'ipad' || $deviceType == 'ipod') {
-			$matches = [];
-			if (preg_match("/^Apple-.*?\\/(\\d{4})\\./", Request::GetUserAgent(), $matches) && isset($matches[1]) && $matches[1] >= 1607) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse: iOS device %s->%s", Request::GetDeviceType(), Request::GetUserAgent()));
-				$sendresponse = true;
-			}
-		}
-
-		switch ($response) {
-			case 1:     // accept
-			default:
-				$entryid = $meetingrequest->doAccept(false, $sendresponse, false, false, false, false, true); // last true is the $userAction
-				break;
-
-			case 2:        // tentative
-				$entryid = $meetingrequest->doAccept(true, $sendresponse, false, false, false, false, true); // last true is the $userAction
-				break;
-
-			case 3:        // decline
-				$meetingrequest->doDecline(false);
-				break;
-		}
-
-		// F/B will be updated on logoff
-
-		// We have to return the ID of the new calendar item, so do that here
-		$calendarid = "";
-		$calFolderId = "";
-		if (isset($entryid)) {
-			$newitem = mapi_msgstore_openentry($this->store, $entryid);
-			// new item might be in a delegator's store. ActiveSync does not support accepting them.
-			if (!$newitem) {
-				throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Object with entryid '%s' was not found in user's store (0x%X). It might be in a delegator's store.", $requestid, $folderid, $response, bin2hex($entryid), mapi_last_hresult()), SYNC_MEETRESPSTATUS_SERVERERROR, null, LOGLEVEL_WARN);
-			}
-
-			$newprops = mapi_getprops($newitem, [PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY]);
-			$calendarid = bin2hex($newprops[PR_SOURCE_KEY]);
-			$calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]);
-		}
-
-		// on recurring items, the MeetingRequest class responds with a wrong entryid
-		if ($requestid == $calendarid) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): returned calendar id is the same as the requestid - re-searching", $requestid, $folderid, $response));
-
-			if (empty($props)) {
-				$props = MAPIMapping::GetMeetingRequestProperties();
-				$props = getPropIdsFromStrings($this->store, $props);
-
-				$messageprops = mapi_getprops($mapimessage, [$props["goidtag"]]);
-				$goid = $messageprops[$props["goidtag"]];
-			}
-
-			$items = $meetingrequest->findCalendarItems($goid);
-
-			if (is_array($items)) {
-				$newitem = mapi_msgstore_openentry($this->store, $items[0]);
-				$newprops = mapi_getprops($newitem, [PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY]);
-				$calendarid = bin2hex($newprops[PR_SOURCE_KEY]);
-				$calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]);
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response));
-			}
-
-			if ($requestid == $calendarid) {
-				throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error finding the accepted meeting response in the calendar", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
-			}
-		}
-
-		// delete meeting request from Inbox
-		if ($folderClass == 'Email') {
-			$folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
-			$folder = mapi_msgstore_openentry($this->store, $folderentryid);
-		}
-		mapi_folder_deletemessages($folder, [$reqentryid], 0);
-
-		$prefix = '';
-		// prepend the short folderid of the target calendar: if available and short ids are used
-		if ($calFolderId) {
-			$shortFolderId = GSync::GetDeviceManager()->GetFolderIdForBackendId($calFolderId);
-			if ($calFolderId != $shortFolderId) {
-				$prefix = $shortFolderId . ':';
-			}
-		}
-
-		return $prefix . $calendarid;
-	}
-
-	/**
-	 * Indicates if the backend has a ChangesSink.
-	 * A sink is an active notification mechanism which does not need polling.
-	 * Since Zarafa 7.0.5 such a sink is available.
-	 * The grommunio backend uses this method to initialize the sink with mapi.
-	 *
-	 * @return bool
-	 */
-	public function HasChangesSink() {
-		if (!$this->notifications) {
-			SLog::Write(LOGLEVEL_DEBUG, "Grommunio->HasChangesSink(): sink is not available");
-
-			return false;
-		}
-
-		$this->changesSink = @mapi_sink_create();
-
-		if (!$this->changesSink || mapi_last_hresult()) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->HasChangesSink(): sink could not be created with  0x%X", mapi_last_hresult()));
-
-			return false;
-		}
-
-		$this->changesSinkHierarchyHash = $this->getHierarchyHash();
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->HasChangesSink(): created - HierarchyHash: %s", $this->changesSinkHierarchyHash));
-
-		// advise the main store and also to check if the connection supports it
-		return $this->adviseStoreToSink($this->defaultstore);
-	}
-
-	/**
-	 * The folder should be considered by the sink.
-	 * Folders which were not initialized should not result in a notification
-	 * of IBackend->ChangesSink().
-	 *
-	 * @param string $folderid
-	 *
-	 * @return bool false if entryid can not be found for that folder
-	 */
-	public function ChangesSinkInitialize($folderid) {
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->ChangesSinkInitialize(): folderid '%s'", $folderid));
-
-		$entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
-		if (!$entryid) {
-			return false;
-		}
-
-		// add entryid to the monitored folders
-		$this->changesSinkFolders[$entryid] = $folderid;
-
-		// advise the current store to the sink
-		return $this->adviseStoreToSink($this->store);
-	}
-
-	/**
-	 * The actual ChangesSink.
-	 * For max. the $timeout value this method should block and if no changes
-	 * are available return an empty array.
-	 * If changes are available a list of folderids is expected.
-	 *
-	 * @param int $timeout max. amount of seconds to block
-	 *
-	 * @return array
-	 */
-	public function ChangesSink($timeout = 30) {
-		// clear the folder stats cache
-		unset($this->folderStatCache);
-
-		$notifications = [];
-		$hierarchyNotifications = [];
-		$sinkresult = @mapi_sink_timedwait($this->changesSink, $timeout * 1000);
-
-		if (!is_array($sinkresult)) {
-			throw new StatusException("Grommunio->ChangesSink(): Sink returned invalid notification, aborting", SyncCollections::OBSOLETE_CONNECTION);
-		}
-
-		// reverse array so that the changes on folders are before changes on messages and
-		// it's possible to filter such notifications
-		$sinkresult = array_reverse($sinkresult, true);
-		foreach ($sinkresult as $sinknotif) {
-			// add a notification on a folder
-			if ($sinknotif['objtype'] == MAPI_FOLDER) {
-				$hierarchyNotifications[$sinknotif['entryid']] = IBackend::HIERARCHYNOTIFICATION;
-			}
-			// change on a message, remove hierarchy notification
-			if (isset($sinknotif['parentid']) && $sinknotif['objtype'] == MAPI_MESSAGE && isset($notifications[$sinknotif['parentid']])) {
-				unset($hierarchyNotifications[$sinknotif['parentid']]);
-			}
-
-			// TODO check if adding $sinknotif['objtype'] = MAPI_MESSAGE wouldn't break anything
-			// check if something in the monitored folders changed
-			if (isset($sinknotif['parentid']) && array_key_exists($sinknotif['parentid'], $this->changesSinkFolders)) {
-				$notifications[] = $this->changesSinkFolders[$sinknotif['parentid']];
-			}
-			// deletes and moves
-			if (isset($sinknotif['oldparentid']) && array_key_exists($sinknotif['oldparentid'], $this->changesSinkFolders)) {
-				$notifications[] = $this->changesSinkFolders[$sinknotif['oldparentid']];
-			}
-		}
-
-		// validate hierarchy notifications by comparing the hierarchy hashes (too many false positives otherwise)
-		if (!empty($hierarchyNotifications)) {
-			$hash = $this->getHierarchyHash();
-			if ($hash !== $this->changesSinkHierarchyHash) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->ChangesSink() Hierarchy notification, pending validation. New hierarchyHash: %s", $hash));
-				$notifications[] = IBackend::HIERARCHYNOTIFICATION;
-				$this->changesSinkHierarchyHash = $hash;
-			}
-		}
-
-		return $notifications;
-	}
-
-	/**
-	 * Applies settings to and gets information from the device.
-	 *
-	 * @param SyncObject $settings (SyncOOF, SyncUserInformation, SyncRightsManagementTemplates possible)
-	 *
-	 * @return SyncObject $settings
-	 */
-	public function Settings($settings) {
-		if ($settings instanceof SyncOOF) {
-			$this->settingsOOF($settings);
-		}
-
-		if ($settings instanceof SyncUserInformation) {
-			$this->settingsUserInformation($settings);
-		}
-
-		if ($settings instanceof SyncRightsManagementTemplates) {
-			$this->settingsRightsManagementTemplates($settings);
-		}
-
-		return $settings;
-	}
-
-	/**
-	 * Resolves recipients.
-	 *
-	 * @param SyncObject $resolveRecipients
-	 *
-	 * @return SyncObject $resolveRecipients
-	 */
-	public function ResolveRecipients($resolveRecipients) {
-		if ($resolveRecipients instanceof SyncResolveRecipients) {
-			$resolveRecipients->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
-			$resolveRecipients->response = [];
-			$resolveRecipientsOptions = new SyncResolveRecipientsOptions();
-			$maxAmbiguousRecipients = self::MAXAMBIGUOUSRECIPIENTS;
-
-			if (isset($resolveRecipients->options)) {
-				$resolveRecipientsOptions = $resolveRecipients->options;
-				// only limit ambiguous recipients if the client requests it.
-
-				if (isset($resolveRecipientsOptions->maxambiguousrecipients) &&
-						$resolveRecipientsOptions->maxambiguousrecipients >= 0 &&
-						$resolveRecipientsOptions->maxambiguousrecipients <= self::MAXAMBIGUOUSRECIPIENTS) {
-					$maxAmbiguousRecipients = $resolveRecipientsOptions->maxambiguousrecipients;
-					SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->ResolveRecipients(): The client requested %d max ambiguous recipients to resolve.", $maxAmbiguousRecipients));
-				}
-			}
-
-			foreach ($resolveRecipients->to as $i => $to) {
-				$response = new SyncResolveRecipientsResponse();
-				$response->to = $to;
-				$response->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
-
-				// do not expand distlists here
-				$recipient = $this->resolveRecipient($to, $maxAmbiguousRecipients, false);
-				if (is_array($recipient) && !empty($recipient)) {
-					$response->recipientcount = 0;
-					foreach ($recipient as $entry) {
-						if ($entry instanceof SyncResolveRecipient) {
-							// certificates are already set. Unset them if they weren't required.
-							if (!isset($resolveRecipientsOptions->certificateretrieval)) {
-								unset($entry->certificates);
-							}
-							if (isset($resolveRecipientsOptions->availability)) {
-								if (!isset($resolveRecipientsOptions->starttime)) {
-									// TODO error, the request must include a valid StartTime element value
-								}
-								$entry->availability = $this->getAvailability($to, $entry, $resolveRecipientsOptions);
-							}
-							if (isset($resolveRecipientsOptions->picture)) {
-								// TODO implement picture retrieval of the recipient
-							}
-							++$response->recipientcount;
-							$response->recipient[] = $entry;
-						}
-						elseif (is_int($recipient)) {
-							$response->status = $recipient;
-						}
-					}
-				}
-
-				$resolveRecipients->response[$i] = $response;
-			}
-
-			return $resolveRecipients;
-		}
-
-		SLog::Write(LOGLEVEL_WARN, "Grommunio->ResolveRecipients(): Not a valid SyncResolveRecipients object.");
-		// return a SyncResolveRecipients object so that sync doesn't fail
-		$r = new SyncResolveRecipients();
-		$r->status = SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR;
-
-		return $r;
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+    private $mainUser;
+    private $session;
+    private $defaultstore;
+    private $store;
+    private $storeName;
+    private $storeCache;
+    private $notifications;
+    private $changesSink;
+    private $changesSinkFolders;
+    private $changesSinkHierarchyHash;
+    private $changesSinkStores;
+    private $wastebasket;
+    private $addressbook;
+    private $folderStatCache;
+    private $impersonateUser;
+    private $stateFolder;
+    private $userDeviceData;
+
+    // KC 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
+    public const HALFHOURSECONDS = 1800;
+
+    /**
+     * Constructor of the grommunio Backend.
+     */
+    public function __construct() {
+        $this->session = false;
+        $this->store = false;
+        $this->storeName = false;
+        $this->storeCache = [];
+        $this->notifications = false;
+        $this->changesSink = false;
+        $this->changesSinkFolders = [];
+        $this->changesSinkStores = [];
+        $this->changesSinkHierarchyHash = false;
+        $this->wastebasket = false;
+        $this->session = false;
+        $this->folderStatCache = [];
+        $this->impersonateUser = false;
+        $this->stateFolder = null;
+
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio using PHP-MAPI version: %s - PHP version: %s", phpversion("mapi"), phpversion()));
+
+        # Interprocessdata
+        $this->allocate = 0;
+        $this->type = "grommunio-sync:userdevices";
+        $this->userDeviceData = "grommunio-sync:statefoldercache";
+        parent::__construct();
+    }
+
+    /**
+     * Indicates which StateMachine should be used.
+     *
+     * @return bool Grommunio uses own state machine
+     */
+    public function GetStateMachine() {
+        return $this;
+    }
+
+    /**
+     * Returns the Grommunio as it implements the ISearchProvider interface
+     * This could be overwritten by the global configuration.
+     *
+     * @return object Implementation of ISearchProvider
+     */
+    public function GetSearchProvider() {
+        return $this;
+    }
+
+    /**
+     * Indicates which AS version is supported by the backend.
+     *
+     * @return string AS version constant
+     */
+    public function GetSupportedASVersion() {
+        return GSync::ASV_141;
+    }
+
+    /**
+     * Authenticates the user with the configured grommunio server.
+     *
+     * @param string $username
+     * @param string $domain
+     * @param string $password
+     * @param mixed  $user
+     * @param mixed  $pass
+     *
+     * @throws AuthenticationRequiredException
+     *
+     * @return bool
+     */
+    public function Logon($user, $domain, $pass) {
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Trying to authenticate user '%s'..", $user));
+
+        $this->mainUser = strtolower($user);
+        // TODO the impersonated user should be passed directly to IBackend->Logon() - ZP-1351
+        if (Request::GetImpersonatedUser()) {
+            $this->impersonateUser = strtolower(Request::GetImpersonatedUser());
+        }
+
+        // check if we are impersonating someone
+        // $defaultUser will be used for $this->defaultStore
+        if ($this->impersonateUser !== false) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Impersonation active - authenticating: '%s' - impersonating '%s'", $this->mainUser, $this->impersonateUser));
+            $defaultUser = $this->impersonateUser;
+        }
+        else {
+            $defaultUser = $this->mainUser;
+        }
+
+        $deviceId = Request::GetDeviceID();
+
+        try {
+            // check if notifications are available in php-mapi
+            if (function_exists('mapi_feature') && mapi_feature('LOGONFLAGS')) {
+                // send grommunio-sync version and user agent to ZCP - ZP-589
+                if (Utils::CheckMapiExtVersion('7.2.0')) {
+                    $gsync_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
+                    $user_agent = ($deviceId) ? GSync::GetDeviceManager()->GetUserAgent() : "unknown";
+                    $this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0, $gsync_version, $user_agent);
+                }
+                else {
+                    $this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0);
+                }
+                $this->notifications = true;
+            }
+            // old fashioned session
+            else {
+                $this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER);
+                $this->notifications = false;
+            }
+
+            if (mapi_last_hresult()) {
+                SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->Logon(): login failed with error code: 0x%X", mapi_last_hresult()));
+                if (mapi_last_hresult() == MAPI_E_NETWORK_ERROR) {
+                    throw new ServiceUnavailableException("Error connecting to KC (login)");
+                }
+            }
+        }
+        catch (MAPIException $ex) {
+            throw new AuthenticationRequiredException($ex->getDisplayMessage());
+        }
+
+        if (!$this->session) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): logon failed for user '%s'", $this->mainUser));
+            $this->defaultstore = false;
+
+            return false;
+        }
+
+        // Get/open default store
+        $this->defaultstore = $this->openMessageStore($this->mainUser);
+
+        // To impersonate, we overwrite the defaultstore. We still need to open it before we can do that.
+        if ($this->impersonateUser) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Impersonating user '%s'", $defaultUser));
+            $this->defaultstore = $this->openMessageStore($defaultUser);
+        }
+
+        if (mapi_last_hresult() == MAPI_E_FAILONEPROVIDER) {
+            throw new ServiceUnavailableException("Error connecting to KC (open store)");
+        }
+
+        if ($this->defaultstore === false) {
+            throw new AuthenticationRequiredException(sprintf("Grommunio->Logon(): User '%s' has no default store", $defaultUser));
+        }
+
+        $this->store = $this->defaultstore;
+        $this->storeName = $defaultUser;
+
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): User '%s' is authenticated%s", $this->mainUser, ($this->impersonateUser ? " impersonating '" . $this->impersonateUser . "'" : '')));
+
+        $this->isGSyncEnabled();
+
+        // check if this is a Zarafa 7 store with unicode support
+        MAPIUtils::IsUnicodeStore($this->store);
+
+        // open the state folder
+        $this->getStateFolder($deviceId);
+
+        return true;
+    }
+
+    /**
+     * Setup the backend to work on a specific store or checks ACLs there.
+     * If only the $store is submitted, all Import/Export/Fetch/Etc operations should be
+     * performed on this store (switch operations store).
+     * If the ACL check is enabled, this operation should just indicate the ACL status on
+     * the submitted store, without changing the store for operations.
+     * For the ACL status, the currently logged on user MUST have access rights on
+     *  - the entire store - admin access if no folderid is sent, or
+     *  - on a specific folderid in the store (secretary/full access rights).
+     *
+     * The ACLcheck MUST fail if a folder of the authenticated user is checked!
+     *
+     * @param string $store        target store, could contain a "domain\user" value
+     * @param bool   $checkACLonly if set to true, Setup() should just check ACLs
+     * @param string $folderid     if set, only ACLs on this folderid are relevant
+     *
+     * @return bool
+     */
+    public function Setup($store, $checkACLonly = false, $folderid = false) {
+        list($user, $domain) = Utils::SplitDomainUser($store);
+
+        if (!isset($this->mainUser)) {
+            return false;
+        }
+
+        $mainUser = $this->mainUser;
+        // when impersonating we need to check against the impersonated user
+        if ($this->impersonateUser) {
+            $mainUser = $this->impersonateUser;
+        }
+
+        if ($user === false) {
+            $user = $mainUser;
+        }
+
+        // This is a special case. A user will get his entire folder structure by the foldersync by default.
+        // The ACL check is executed when an additional folder is going to be sent to the mobile.
+        // Configured that way the user could receive the same folderid twice, with two different names.
+        if ($mainUser == $user && $checkACLonly && $folderid && !$this->impersonateUser) {
+            SLog::Write(LOGLEVEL_DEBUG, "Grommunio->Setup(): Checking ACLs for folder of the users defaultstore. Fail is forced to avoid folder duplications on mobile.");
+
+            return false;
+        }
+
+        // get the users store
+        $userstore = $this->openMessageStore($user);
+
+        // only proceed if a store was found, else return false
+        if ($userstore) {
+            // only check permissions
+            if ($checkACLonly == true) {
+                // check for admin rights
+                if (!$folderid) {
+                    if ($user != $this->mainUser) {
+                        if ($this->impersonateUser) {
+                            $storeProps = mapi_getprops($userstore, [PR_IPM_SUBTREE_ENTRYID]);
+                            $rights = $this->HasSecretaryACLs($userstore, '', $storeProps[PR_IPM_SUBTREE_ENTRYID]);
+                            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for secretary ACLs on root folder of impersonated store '%s': '%s'", $user, Utils::PrintAsString($rights)));
+                        }
+                        else {
+                            $zarafauserinfo = @nsp_getuserinfo($this->mainUser);
+                            $rights = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin']) ? true : false;
+                            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for admin ACLs on store '%s': '%s'", $user, Utils::PrintAsString($rights)));
+                        }
+                    }
+                    // the user has always full access to his own store
+                    else {
+                        $rights = true;
+                        SLog::Write(LOGLEVEL_DEBUG, "Grommunio->Setup(): the user has always full access to his own store");
+                    }
+
+                    return $rights;
+                }
+                // check permissions on this folder
+
+                $rights = $this->HasSecretaryACLs($userstore, $folderid);
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for secretary ACLs on '%s' of store '%s': '%s'", $folderid, $user, Utils::PrintAsString($rights)));
+
+                return $rights;
+            }
+
+            // switch operations store
+            // this should also be done if called with user = mainuser or user = false
+            // which means to switch back to the default store
+
+            // switch active store
+            $this->store = $userstore;
+            $this->storeName = $user;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Logs off
+     * Free/Busy information is updated for modified calendars
+     * This is done after the synchronization process is completed.
+     *
+     * @return bool
+     */
+    public function Logoff() {
+        return true;
+    }
+
+    /**
+     * Returns an array of SyncFolder types with the entire folder hierarchy
+     * on the server (the array itself is flat, but refers to parents via the 'parent' property.
+     *
+     * provides AS 1.0 compatibility
+     *
+     * @return array SYNC_FOLDER
+     */
+    public function GetHierarchy() {
+        $folders = [];
+        $mapiprovider = new MAPIProvider($this->session, $this->store);
+        $storeProps = $mapiprovider->GetStoreProps();
+
+        // for SYSTEM user open the public folders
+        if (strtoupper($this->storeName) == "SYSTEM") {
+            $rootfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
+        }
+        else {
+            $rootfolder = mapi_msgstore_openentry($this->store);
+        }
+
+        $rootfolderprops = mapi_getprops($rootfolder, [PR_SOURCE_KEY]);
+
+        $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+        $rows = mapi_table_queryallrows($hierarchy, [PR_DISPLAY_NAME, PR_PARENT_ENTRYID, PR_ENTRYID, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_CONTAINER_CLASS, PR_ATTR_HIDDEN, PR_EXTENDED_FOLDER_FLAGS, PR_FOLDER_TYPE]);
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): fetched %d folders from MAPI", count($rows)));
+
+        foreach ($rows as $row) {
+            // do not display hidden and search folders
+            if ((isset($row[PR_ATTR_HIDDEN]) && $row[PR_ATTR_HIDDEN]) ||
+                (isset($row[PR_FOLDER_TYPE]) && $row[PR_FOLDER_TYPE] == FOLDER_SEARCH) ||
+                // for SYSTEM user $row[PR_PARENT_SOURCE_KEY] == $rootfolderprops[PR_SOURCE_KEY] is true, but we need those folders
+                (isset($row[PR_PARENT_SOURCE_KEY]) && $row[PR_PARENT_SOURCE_KEY] == $rootfolderprops[PR_SOURCE_KEY] && strtoupper($this->storeName) != "SYSTEM")) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): ignoring folder '%s' as it's a hidden/search/root folder", (isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "unknown")));
+
+                continue;
+            }
+            $folder = $mapiprovider->GetFolder($row);
+            if ($folder) {
+                $folders[] = $folder;
+            }
+            else {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): ignoring folder '%s' as MAPIProvider->GetFolder() did not return a SyncFolder object", (isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "unknown")));
+            }
+        }
+
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): processed %d folders, starting parent remap", count($folders)));
+        // reloop the folders to make sure all parentids are mapped correctly
+        $dm = GSync::GetDeviceManager();
+        foreach ($folders as $folder) {
+            if ($folder->parentid !== "0") {
+                // SYSTEM user's parentid points to $rootfolderprops[PR_SOURCE_KEY], but they need to be on the top level
+                $folder->parentid = (strtoupper($this->storeName) == "SYSTEM" && $folder->parentid == bin2hex($rootfolderprops[PR_SOURCE_KEY])) ? '0' : $dm->GetFolderIdForBackendId($folder->parentid);
+            }
+        }
+
+        return $folders;
+    }
+
+    /**
+     * Returns the importer to process changes from the mobile
+     * If no $folderid is given, hierarchy importer is expected.
+     *
+     * @param string $folderid (opt)
+     *
+     * @return object(ImportChanges)
+     */
+    public function GetImporter($folderid = false) {
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetImporter() folderid: '%s'", Utils::PrintAsString($folderid)));
+        if ($folderid !== false) {
+            // check if the user of the current store has permissions to import to this folderid
+            if ($this->storeName != $this->mainUser && !$this->hasSecretaryACLs($this->store, $folderid)) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetImporter(): missing permissions on folderid: '%s'.", Utils::PrintAsString($folderid)));
+
+                return false;
+            }
+
+            return new ImportChangesICS($this->session, $this->store, hex2bin($folderid));
+        }
+
+        return new ImportChangesICS($this->session, $this->store);
+    }
+
+    /**
+     * Returns the exporter to send changes to the mobile
+     * If no $folderid is given, hierarchy exporter is expected.
+     *
+     * @param string $folderid (opt)
+     *
+     * @throws StatusException
+     *
+     * @return object(ExportChanges)
+     */
+    public function GetExporter($folderid = false) {
+        if ($folderid !== false) {
+            // check if the user of the current store has permissions to export from this folderid
+            if ($this->storeName != $this->mainUser && !$this->hasSecretaryACLs($this->store, $folderid)) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetExporter(): missing permissions on folderid: '%s'.", Utils::PrintAsString($folderid)));
+
+                return false;
+            }
+
+            return new ExportChangesICS($this->session, $this->store, hex2bin($folderid));
+        }
+
+        return new ExportChangesICS($this->session, $this->store);
+    }
+
+    /**
+     * Sends an e-mail
+     * This messages needs to be saved into the 'sent items' folder.
+     *
+     * @param SyncSendMail $sm SyncSendMail object
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function SendMail($sm) {
+        // Check if imtomapi function is available and use it to send the mime message.
+        // It is available since ZCP 7.0.6
+        // @see http://jira.zarafa.com/browse/ZCP-9508
+        if (!(function_exists('mapi_feature') && mapi_feature('INETMAPI_IMTOMAPI'))) {
+            throw new StatusException("Grommunio->SendMail(): ZCP/KC version is too old, INETMAPI_IMTOMAPI is not available. Install at least ZCP version 7.0.6 or later.", SYNC_COMMONSTATUS_MAILSUBMISSIONFAILED, null, LOGLEVEL_FATAL);
+
+            return false;
+        }
+        $mimeLength = strlen($sm->mime);
+        SLog::Write(LOGLEVEL_DEBUG, sprintf(
+            "Grommunio->SendMail(): RFC822: %d bytes  forward-id: '%s' reply-id: '%s' parent-id: '%s' SaveInSent: '%s' ReplaceMIME: '%s'",
+            $mimeLength,
+            Utils::PrintAsString($sm->forwardflag),
+            Utils::PrintAsString($sm->replyflag),
+            Utils::PrintAsString((isset($sm->source->folderid) ? $sm->source->folderid : false)),
+            Utils::PrintAsString(($sm->saveinsent)),
+            Utils::PrintAsString(isset($sm->replacemime))
+        ));
+        if ($mimeLength == 0) {
+            throw new StatusException("Grommunio->SendMail(): empty mail data", SYNC_COMMONSTATUS_MAILSUBMISSIONFAILED);
+        }
+
+        $sendMailProps = MAPIMapping::GetSendMailProperties();
+        $sendMailProps = getPropIdsFromStrings($this->defaultstore, $sendMailProps);
+
+        // Open the outbox and create the message there
+        $storeprops = mapi_getprops($this->defaultstore, [$sendMailProps["outboxentryid"], $sendMailProps["ipmsentmailentryid"]]);
+        if (isset($storeprops[$sendMailProps["outboxentryid"]])) {
+            $outbox = mapi_msgstore_openentry($this->defaultstore, $storeprops[$sendMailProps["outboxentryid"]]);
+        }
+
+        if (!$outbox) {
+            throw new StatusException(sprintf("Grommunio->SendMail(): No Outbox found or unable to create message: 0x%X", mapi_last_hresult()), SYNC_COMMONSTATUS_SERVERERROR);
+        }
+
+        $mapimessage = mapi_folder_createmessage($outbox);
+
+        // message properties to be set
+        $mapiprops = [];
+        // only save the outgoing in sent items folder if the mobile requests it
+        $mapiprops[$sendMailProps["sentmailentryid"]] = $storeprops[$sendMailProps["ipmsentmailentryid"]];
+
+        SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): Use the mapi_inetmapi_imtomapi function");
+        $ab = mapi_openaddressbook($this->session);
+        mapi_inetmapi_imtomapi($this->session, $this->defaultstore, $ab, $mapimessage, $sm->mime, []);
+
+        // Set the appSeqNr so that tracking tab can be updated for meeting request updates
+        // @see http://jira.zarafa.com/browse/ZP-68
+        $meetingRequestProps = MAPIMapping::GetMeetingRequestProperties();
+        $meetingRequestProps = getPropIdsFromStrings($this->defaultstore, $meetingRequestProps);
+        $props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS, $meetingRequestProps["goidtag"], $sendMailProps["internetcpid"], $sendMailProps["body"], $sendMailProps["html"], $sendMailProps["rtf"], $sendMailProps["rtfinsync"]]);
+
+        // Convert sent message's body to UTF-8 if it was a HTML message.
+        // @see http://jira.zarafa.com/browse/ZP-505 and http://jira.zarafa.com/browse/ZP-555
+        if (isset($props[$sendMailProps["internetcpid"]]) && $props[$sendMailProps["internetcpid"]] != INTERNET_CPID_UTF8 && MAPIUtils::GetNativeBodyType($props) == SYNC_BODYPREFERENCE_HTML) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): Sent email cpid is not unicode (%d). Set it to unicode and convert email html body.", $props[$sendMailProps["internetcpid"]]));
+            $mapiprops[$sendMailProps["internetcpid"]] = INTERNET_CPID_UTF8;
+
+            $bodyHtml = MAPIUtils::readPropStream($mapimessage, PR_HTML);
+            $bodyHtml = Utils::ConvertCodepageStringToUtf8($props[$sendMailProps["internetcpid"]], $bodyHtml);
+            $mapiprops[$sendMailProps["html"]] = $bodyHtml;
+
+            mapi_setprops($mapimessage, $mapiprops);
+        }
+        if (stripos($props[PR_MESSAGE_CLASS], "IPM.Schedule.Meeting.Resp.") === 0) {
+            // search for calendar items using goid
+            $mr = new Meetingrequest($this->defaultstore, $mapimessage);
+            $appointments = $mr->findCalendarItems($props[$meetingRequestProps["goidtag"]]);
+            if (is_array($appointments) && !empty($appointments)) {
+                $app = mapi_msgstore_openentry($this->defaultstore, $appointments[0]);
+                $appprops = mapi_getprops($app, [$meetingRequestProps["appSeqNr"]]);
+                if (isset($appprops[$meetingRequestProps["appSeqNr"]]) && $appprops[$meetingRequestProps["appSeqNr"]]) {
+                    $mapiprops[$meetingRequestProps["appSeqNr"]] = $appprops[$meetingRequestProps["appSeqNr"]];
+                    SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): Set sequence number to:%d", $appprops[$meetingRequestProps["appSeqNr"]]));
+                }
+            }
+        }
+
+        // Delete the PR_SENT_REPRESENTING_* properties because some android devices
+        // do not send neither From nor Sender header causing empty PR_SENT_REPRESENTING_NAME and
+        // PR_SENT_REPRESENTING_EMAIL_ADDRESS properties and "broken" PR_SENT_REPRESENTING_ENTRYID
+        // which results in spooler not being able to send the message.
+        // @see http://jira.zarafa.com/browse/ZP-85
+        mapi_deleteprops(
+            $mapimessage,
+            [
+                $sendMailProps["sentrepresentingname"],
+                $sendMailProps["sentrepresentingemail"],
+                $sendMailProps["representingentryid"],
+                $sendMailProps["sentrepresentingaddt"],
+                $sendMailProps["sentrepresentinsrchk"],
+            ]
+        );
+
+        if (isset($sm->source->itemid) && $sm->source->itemid) {
+            // answering an email in a public/shared folder
+            // TODO as the store is setup, we should actually user $this->store instead of $this->defaultstore - nevertheless we need to make sure this store is able to send mail (has an outbox)
+            if (!$this->Setup(GSync::GetAdditionalSyncFolderStore($sm->source->folderid))) {
+                throw new StatusException(sprintf("Grommunio->SendMail() could not Setup() the backend for folder id '%s'", $sm->source->folderid), SYNC_COMMONSTATUS_SERVERERROR);
+            }
+
+            $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($sm->source->folderid), hex2bin($sm->source->itemid));
+            if ($entryid) {
+                $fwmessage = mapi_msgstore_openentry($this->store, $entryid);
+            }
+
+            if (isset($fwmessage) && $fwmessage) {
+                // update icon and last_verb when forwarding or replying message
+                // reply-all (verb 103) is not supported, as we cannot really detect this case
+                if ($sm->forwardflag) {
+                    $updateProps = [
+                        PR_ICON_INDEX => 262,
+                        PR_LAST_VERB_EXECUTED => 104,
+                    ];
+                }
+                elseif ($sm->replyflag) {
+                    $updateProps = [
+                        PR_ICON_INDEX => 261,
+                        PR_LAST_VERB_EXECUTED => 102,
+                    ];
+                }
+                if (isset($updateProps)) {
+                    $updateProps[PR_LAST_VERB_EXECUTION_TIME] = time();
+                    mapi_setprops($fwmessage, $updateProps);
+                    mapi_savechanges($fwmessage);
+                }
+
+                // only attach the original message if the mobile does not send it itself
+                if (!isset($sm->replacemime)) {
+                    // get message's body in order to append forward or reply text
+                    if (!isset($body)) {
+                        $body = MAPIUtils::readPropStream($mapimessage, PR_BODY);
+                    }
+                    if (!isset($bodyHtml)) {
+                        $bodyHtml = MAPIUtils::readPropStream($mapimessage, PR_HTML);
+                    }
+                    $cpid = mapi_getprops($fwmessage, [$sendMailProps["internetcpid"]]);
+                    if ($sm->forwardflag) {
+                        // attach the original attachments to the outgoing message
+                        $this->copyAttachments($mapimessage, $fwmessage);
+                    }
+
+                    // regarding the conversion @see ZP-470
+                    if (strlen($body) > 0) {
+                        $fwbody = MAPIUtils::readPropStream($fwmessage, PR_BODY);
+                        // if only the old message's cpid is set, convert from old charset to utf-8
+                        if (isset($cpid[$sendMailProps["internetcpid"]]) && $cpid[$sendMailProps["internetcpid"]] != INTERNET_CPID_UTF8) {
+                            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): convert plain forwarded message charset (only fw set) from '%s' to '65001'", $cpid[$sendMailProps["internetcpid"]]));
+                            $fwbody = Utils::ConvertCodepageStringToUtf8($cpid[$sendMailProps["internetcpid"]], $fwbody);
+                        }
+                        // otherwise to the general conversion
+                        else {
+                            SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): no charset conversion done for plain forwarded message");
+                            $fwbody = w2u($fwbody);
+                        }
+
+                        $mapiprops[$sendMailProps["body"]] = $body . "\r\n\r\n" . $fwbody;
+                    }
+
+                    if (strlen($bodyHtml) > 0) {
+                        $fwbodyHtml = MAPIUtils::readPropStream($fwmessage, PR_HTML);
+                        // if only new message's cpid is set, convert to UTF-8
+                        if (isset($cpid[$sendMailProps["internetcpid"]]) && $cpid[$sendMailProps["internetcpid"]] != INTERNET_CPID_UTF8) {
+                            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): convert html forwarded message charset (only fw set) from '%s' to '65001'", $cpid[$sendMailProps["internetcpid"]]));
+                            $fwbodyHtml = Utils::ConvertCodepageStringToUtf8($cpid[$sendMailProps["internetcpid"]], $fwbodyHtml);
+                        }
+                        // otherwise to the general conversion
+                        else {
+                            SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): no charset conversion done for html forwarded message");
+                            $fwbodyHtml = w2u($fwbodyHtml);
+                        }
+
+                        $mapiprops[$sendMailProps["html"]] = $bodyHtml . "<br><br>" . $fwbodyHtml;
+                    }
+                }
+            }
+            else {
+                // no fwmessage could be opened and we need it because we do not replace mime
+                if (!isset($sm->replacemime) || $sm->replacemime == false) {
+                    throw new StatusException(sprintf("Grommunio->SendMail(): Could not open message id '%s' in folder id '%s' to be replied/forwarded: 0x%X", $sm->source->itemid, $sm->source->folderid, mapi_last_hresult()), SYNC_COMMONSTATUS_ITEMNOTFOUND);
+                }
+            }
+        }
+
+        mapi_setprops($mapimessage, $mapiprops);
+        mapi_savechanges($mapimessage);
+        mapi_message_submitmessage($mapimessage);
+        $hr = mapi_last_hresult();
+
+        if ($hr) {
+            switch ($hr) {
+                case MAPI_E_STORE_FULL:
+                    $code = SYNC_COMMONSTATUS_MAILBOXQUOTAEXCEEDED;
+                    break;
+
+                default:
+                    $code = SYNC_COMMONSTATUS_MAILSUBMISSIONFAILED;
+                    break;
+            }
+
+            throw new StatusException(sprintf("Grommunio->SendMail(): Error saving/submitting the message to the Outbox: 0x%X", $hr), $code);
+        }
+
+        SLog::Write(LOGLEVEL_DEBUG, "Grommunio->SendMail(): email submitted");
+
+        return true;
+    }
+
+    /**
+     * Returns all available data of a single message.
+     *
+     * @param string            $folderid
+     * @param string            $id
+     * @param ContentParameters $contentparameters flag
+     *
+     * @throws StatusException
+     *
+     * @return object(SyncObject)
+     */
+    public function Fetch($folderid, $id, $contentparameters) {
+        // SEARCH fetches with folderid == false and PR_ENTRYID as ID
+        if (!$folderid) {
+            $entryid = hex2bin($id);
+            $sk = $id;
+        }
+        else {
+            // id might be in the new longid format, so we have to split it here
+            list($fsk, $sk) = Utils::SplitMessageId($id);
+            // get the entry id of the message
+            $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid), hex2bin($sk));
+        }
+        if (!$entryid) {
+            throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error getting entryid: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        }
+
+        // open the message
+        $message = mapi_msgstore_openentry($this->store, $entryid);
+        if (!$message) {
+            throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error, unable to open message: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        }
+
+        // convert the mapi message into a SyncObject and return it
+        $mapiprovider = new MAPIProvider($this->session, $this->store);
+
+        // override truncation
+        $contentparameters->SetTruncation(SYNC_TRUNCATION_ALL);
+        // TODO check for body preferences
+        return $mapiprovider->GetMessage($message, $contentparameters);
+    }
+
+    /**
+     * Returns the waste basket.
+     *
+     * @return string
+     */
+    public function GetWasteBasket() {
+        if ($this->wastebasket) {
+            return $this->wastebasket;
+        }
+
+        $storeprops = mapi_getprops($this->defaultstore, [PR_IPM_WASTEBASKET_ENTRYID]);
+        if (isset($storeprops[PR_IPM_WASTEBASKET_ENTRYID])) {
+            $wastebasket = mapi_msgstore_openentry($this->defaultstore, $storeprops[PR_IPM_WASTEBASKET_ENTRYID]);
+            $wastebasketprops = mapi_getprops($wastebasket, [PR_SOURCE_KEY]);
+            if (isset($wastebasketprops[PR_SOURCE_KEY])) {
+                $this->wastebasket = bin2hex($wastebasketprops[PR_SOURCE_KEY]);
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetWasteBasket(): Got waste basket with id '%s'", $this->wastebasket));
+
+                return $this->wastebasket;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the content of the named attachment as stream.
+     *
+     * @param string $attname
+     *
+     * @throws StatusException
+     *
+     * @return SyncItemOperationsAttachment
+     */
+    public function GetAttachmentData($attname) {
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetAttachmentData('%s')", $attname));
+
+        if (!strpos($attname, ":")) {
+            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, attachment requested for non-existing item", $attname), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
+
+        list($id, $attachnum, $parentEntryid) = explode(":", $attname);
+        if (isset($parentEntryid)) {
+            $this->Setup(GSync::GetAdditionalSyncFolderStore($parentEntryid));
+        }
+
+        $entryid = hex2bin($id);
+        $message = mapi_msgstore_openentry($this->store, $entryid);
+        if (!$message) {
+            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open item for attachment data for id '%s' with: 0x%X", $attname, $id, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
+
+        MAPIUtils::ParseSmime($this->session, $this->defaultstore, $this->getAddressbook(), $message);
+        $attach = mapi_message_openattach($message, $attachnum);
+        if (!$attach) {
+            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment number '%s' with: 0x%X", $attname, $attachnum, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
+
+        // get necessary attachment props
+        $attprops = mapi_getprops($attach, [PR_ATTACH_MIME_TAG, PR_ATTACH_MIME_TAG_W, PR_ATTACH_METHOD]);
+        $attachment = new SyncItemOperationsAttachment();
+        // check if it's an embedded message and open it in such a case
+        if (isset($attprops[PR_ATTACH_METHOD]) && $attprops[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG) {
+            $embMessage = mapi_attach_openobj($attach);
+            $addrbook = $this->getAddressbook();
+            $stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $embMessage, ['use_tnef' => -1]);
+            // set the default contenttype for this kind of messages
+            $attachment->contenttype = "message/rfc822";
+        }
+        else {
+            $stream = mapi_openproperty($attach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
+        }
+
+        if (!$stream) {
+            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment data stream: 0x%X", $attname, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
+
+        // put the mapi stream into a wrapper to get a standard stream
+        $attachment->data = MAPIStreamWrapper::Open($stream);
+        if (isset($attprops[PR_ATTACH_MIME_TAG])) {
+            $attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG];
+        }
+        elseif (isset($attprops[PR_ATTACH_MIME_TAG_W])) {
+            $attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG_W];
+        }
+        // TODO default contenttype
+        return $attachment;
+    }
+
+    /**
+     * Deletes all contents of the specified folder.
+     * This is generally used to empty the trash (wastebasked), but could also be used on any
+     * other folder.
+     *
+     * @param string $folderid
+     * @param bool   $includeSubfolders (opt) also delete sub folders, default true
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function EmptyFolder($folderid, $includeSubfolders = true) {
+        $folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
+        if (!$folderentryid) {
+            throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open folder (no entry id)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        }
+        $folder = mapi_msgstore_openentry($this->store, $folderentryid);
+
+        if (!$folder) {
+            throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open parent folder (open entry)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        }
+
+        $flags = 0;
+        if ($includeSubfolders) {
+            $flags = DEL_ASSOCIATED;
+        }
+
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->EmptyFolder('%s','%s'): emptying folder", $folderid, Utils::PrintAsString($includeSubfolders)));
+
+        // empty folder!
+        mapi_folder_emptyfolder($folder, $flags);
+        if (mapi_last_hresult()) {
+            throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, mapi_folder_emptyfolder() failed: 0x%X", $folderid, Utils::PrintAsString($includeSubfolders), mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        }
+
+        return true;
+    }
+
+    /**
+     * Processes a response to a meeting request.
+     * CalendarID is a reference and has to be set if a new calendar item is created.
+     *
+     * @param string $requestid id of the object containing the request
+     * @param string $folderid  id of the parent folder of $requestid
+     * @param string $response
+     *
+     * @throws StatusException
+     *
+     * @return string id of the created/updated calendar obj
+     */
+    public function MeetingResponse($requestid, $folderid, $response) {
+        // Use standard meeting response code to process meeting request
+        list($fid, $requestid) = Utils::SplitMessageId($requestid);
+        $reqentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid), hex2bin($requestid));
+        if (!$reqentryid) {
+            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s', '%s', '%s'): Error, unable to entryid of the message 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
+
+        $mapimessage = mapi_msgstore_openentry($this->store, $reqentryid);
+        if (!$mapimessage) {
+            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, unable to open request message for response 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
+
+        // ios sends calendar item in MeetingResponse
+        // @see https://jira.z-hub.io/browse/ZP-1524
+        $folderClass = GSync::GetDeviceManager()->GetFolderClassFromCacheByID($fid);
+        // find the corresponding meeting request
+        if ($folderClass != 'Email') {
+            $props = MAPIMapping::GetMeetingRequestProperties();
+            $props = getPropIdsFromStrings($this->store, $props);
+
+            $messageprops = mapi_getprops($mapimessage, [$props["goidtag"]]);
+            $goid = $messageprops[$props["goidtag"]];
+
+            $mapiprovider = new MAPIProvider($this->session, $this->store);
+            $inboxprops = $mapiprovider->GetInboxProps();
+            $folder = mapi_msgstore_openentry($this->store, $inboxprops[PR_ENTRYID]);
+
+            // Find the item by restricting all items to the correct ID
+            $restrict = [RES_AND, [
+                [RES_PROPERTY,
+                    [
+                        RELOP => RELOP_EQ,
+                        ULPROPTAG => $props["goidtag"],
+                        VALUE => $goid,
+                    ],
+                ],
+            ]];
+
+            $inboxcontents = mapi_folder_getcontentstable($folder);
+
+            $rows = mapi_table_queryallrows($inboxcontents, [PR_ENTRYID], $restrict);
+            if (empty($rows)) {
+                throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, meeting request not found in the inbox", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+            }
+            SLog::Write(LOGLEVEL_DEBUG, "Grommunio->MeetingResponse found meeting request in the inbox");
+            $mapimessage = mapi_msgstore_openentry($this->store, $rows[0][PR_ENTRYID]);
+            $reqentryid = $rows[0][PR_ENTRYID];
+        }
+
+        $meetingrequest = new Meetingrequest($this->store, $mapimessage, $this->session);
+
+        if (!$meetingrequest->isMeetingRequest()) {
+            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to respond to non-meeting request", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
+
+        if ($meetingrequest->isLocalOrganiser()) {
+            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to response to meeting request that we organized", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
+
+        // Process the meeting response. We don't have to send the actual meeting response
+        // e-mail, because the device will send it itself. This seems not to be the case
+        // anymore for the ios devices since at least version 12.4. grommunio-sync will send the
+        // accepted email in such a case.
+        // @see https://jira.z-hub.io/browse/ZP-1524
+        $sendresponse = false;
+        $deviceType = strtolower(Request::GetDeviceType());
+        if ($deviceType == 'iphone' || $deviceType == 'ipad' || $deviceType == 'ipod') {
+            $matches = [];
+            if (preg_match("/^Apple-.*?\\/(\\d{4})\\./", Request::GetUserAgent(), $matches) && isset($matches[1]) && $matches[1] >= 1607) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse: iOS device %s->%s", Request::GetDeviceType(), Request::GetUserAgent()));
+                $sendresponse = true;
+            }
+        }
+
+        switch ($response) {
+            case 1:     // accept
+            default:
+                $entryid = $meetingrequest->doAccept(false, $sendresponse, false, false, false, false, true); // last true is the $userAction
+                break;
+
+            case 2:        // tentative
+                $entryid = $meetingrequest->doAccept(true, $sendresponse, false, false, false, false, true); // last true is the $userAction
+                break;
+
+            case 3:        // decline
+                $meetingrequest->doDecline(false);
+                break;
+        }
+
+        // F/B will be updated on logoff
+
+        // We have to return the ID of the new calendar item, so do that here
+        $calendarid = "";
+        $calFolderId = "";
+        if (isset($entryid)) {
+            $newitem = mapi_msgstore_openentry($this->store, $entryid);
+            // new item might be in a delegator's store. ActiveSync does not support accepting them.
+            if (!$newitem) {
+                throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Object with entryid '%s' was not found in user's store (0x%X). It might be in a delegator's store.", $requestid, $folderid, $response, bin2hex($entryid), mapi_last_hresult()), SYNC_MEETRESPSTATUS_SERVERERROR, null, LOGLEVEL_WARN);
+            }
+
+            $newprops = mapi_getprops($newitem, [PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY]);
+            $calendarid = bin2hex($newprops[PR_SOURCE_KEY]);
+            $calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]);
+        }
+
+        // on recurring items, the MeetingRequest class responds with a wrong entryid
+        if ($requestid == $calendarid) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): returned calendar id is the same as the requestid - re-searching", $requestid, $folderid, $response));
+
+            if (empty($props)) {
+                $props = MAPIMapping::GetMeetingRequestProperties();
+                $props = getPropIdsFromStrings($this->store, $props);
+
+                $messageprops = mapi_getprops($mapimessage, [$props["goidtag"]]);
+                $goid = $messageprops[$props["goidtag"]];
+            }
+
+            $items = $meetingrequest->findCalendarItems($goid);
+
+            if (is_array($items)) {
+                $newitem = mapi_msgstore_openentry($this->store, $items[0]);
+                $newprops = mapi_getprops($newitem, [PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY]);
+                $calendarid = bin2hex($newprops[PR_SOURCE_KEY]);
+                $calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]);
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response));
+            }
+
+            if ($requestid == $calendarid) {
+                throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error finding the accepted meeting response in the calendar", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+            }
+        }
+
+        // delete meeting request from Inbox
+        if ($folderClass == 'Email') {
+            $folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
+            $folder = mapi_msgstore_openentry($this->store, $folderentryid);
+        }
+        mapi_folder_deletemessages($folder, [$reqentryid], 0);
+
+        $prefix = '';
+        // prepend the short folderid of the target calendar: if available and short ids are used
+        if ($calFolderId) {
+            $shortFolderId = GSync::GetDeviceManager()->GetFolderIdForBackendId($calFolderId);
+            if ($calFolderId != $shortFolderId) {
+                $prefix = $shortFolderId . ':';
+            }
+        }
+
+        return $prefix . $calendarid;
+    }
+
+    /**
+     * Indicates if the backend has a ChangesSink.
+     * A sink is an active notification mechanism which does not need polling.
+     * Since Zarafa 7.0.5 such a sink is available.
+     * The grommunio backend uses this method to initialize the sink with mapi.
+     *
+     * @return bool
+     */
+    public function HasChangesSink() {
+        if (!$this->notifications) {
+            SLog::Write(LOGLEVEL_DEBUG, "Grommunio->HasChangesSink(): sink is not available");
+
+            return false;
+        }
+
+        $this->changesSink = @mapi_sink_create();
+
+        if (!$this->changesSink || mapi_last_hresult()) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->HasChangesSink(): sink could not be created with  0x%X", mapi_last_hresult()));
+
+            return false;
+        }
+
+        $this->changesSinkHierarchyHash = $this->getHierarchyHash();
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->HasChangesSink(): created - HierarchyHash: %s", $this->changesSinkHierarchyHash));
+
+        // advise the main store and also to check if the connection supports it
+        return $this->adviseStoreToSink($this->defaultstore);
+    }
+
+    /**
+     * The folder should be considered by the sink.
+     * Folders which were not initialized should not result in a notification
+     * of IBackend->ChangesSink().
+     *
+     * @param string $folderid
+     *
+     * @return bool false if entryid can not be found for that folder
+     */
+    public function ChangesSinkInitialize($folderid) {
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->ChangesSinkInitialize(): folderid '%s'", $folderid));
+
+        $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
+        if (!$entryid) {
+            return false;
+        }
+
+        // add entryid to the monitored folders
+        $this->changesSinkFolders[$entryid] = $folderid;
+
+        // advise the current store to the sink
+        return $this->adviseStoreToSink($this->store);
+    }
+
+    /**
+     * The actual ChangesSink.
+     * For max. the $timeout value this method should block and if no changes
+     * are available return an empty array.
+     * If changes are available a list of folderids is expected.
+     *
+     * @param int $timeout max. amount of seconds to block
+     *
+     * @return array
+     */
+    public function ChangesSink($timeout = 30) {
+        // clear the folder stats cache
+        unset($this->folderStatCache);
+
+        $notifications = [];
+        $hierarchyNotifications = [];
+        $sinkresult = @mapi_sink_timedwait($this->changesSink, $timeout * 1000);
+
+        if (!is_array($sinkresult)) {
+            throw new StatusException("Grommunio->ChangesSink(): Sink returned invalid notification, aborting", SyncCollections::OBSOLETE_CONNECTION);
+        }
+
+        // reverse array so that the changes on folders are before changes on messages and
+        // it's possible to filter such notifications
+        $sinkresult = array_reverse($sinkresult, true);
+        foreach ($sinkresult as $sinknotif) {
+            // add a notification on a folder
+            if ($sinknotif['objtype'] == MAPI_FOLDER) {
+                $hierarchyNotifications[$sinknotif['entryid']] = IBackend::HIERARCHYNOTIFICATION;
+            }
+            // change on a message, remove hierarchy notification
+            if (isset($sinknotif['parentid']) && $sinknotif['objtype'] == MAPI_MESSAGE && isset($notifications[$sinknotif['parentid']])) {
+                unset($hierarchyNotifications[$sinknotif['parentid']]);
+            }
+
+            // TODO check if adding $sinknotif['objtype'] = MAPI_MESSAGE wouldn't break anything
+            // check if something in the monitored folders changed
+            if (isset($sinknotif['parentid']) && array_key_exists($sinknotif['parentid'], $this->changesSinkFolders)) {
+                $notifications[] = $this->changesSinkFolders[$sinknotif['parentid']];
+            }
+            // deletes and moves
+            if (isset($sinknotif['oldparentid']) && array_key_exists($sinknotif['oldparentid'], $this->changesSinkFolders)) {
+                $notifications[] = $this->changesSinkFolders[$sinknotif['oldparentid']];
+            }
+        }
+
+        // validate hierarchy notifications by comparing the hierarchy hashes (too many false positives otherwise)
+        if (!empty($hierarchyNotifications)) {
+            $hash = $this->getHierarchyHash();
+            if ($hash !== $this->changesSinkHierarchyHash) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->ChangesSink() Hierarchy notification, pending validation. New hierarchyHash: %s", $hash));
+                $notifications[] = IBackend::HIERARCHYNOTIFICATION;
+                $this->changesSinkHierarchyHash = $hash;
+            }
+        }
+
+        return $notifications;
+    }
+
+    /**
+     * Applies settings to and gets information from the device.
+     *
+     * @param SyncObject $settings (SyncOOF, SyncUserInformation, SyncRightsManagementTemplates possible)
+     *
+     * @return SyncObject $settings
+     */
+    public function Settings($settings) {
+        if ($settings instanceof SyncOOF) {
+            $this->settingsOOF($settings);
+        }
+
+        if ($settings instanceof SyncUserInformation) {
+            $this->settingsUserInformation($settings);
+        }
+
+        if ($settings instanceof SyncRightsManagementTemplates) {
+            $this->settingsRightsManagementTemplates($settings);
+        }
+
+        return $settings;
+    }
+
+    /**
+     * Resolves recipients.
+     *
+     * @param SyncObject $resolveRecipients
+     *
+     * @return SyncObject $resolveRecipients
+     */
+    public function ResolveRecipients($resolveRecipients) {
+        if ($resolveRecipients instanceof SyncResolveRecipients) {
+            $resolveRecipients->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
+            $resolveRecipients->response = [];
+            $resolveRecipientsOptions = new SyncResolveRecipientsOptions();
+            $maxAmbiguousRecipients = self::MAXAMBIGUOUSRECIPIENTS;
+
+            if (isset($resolveRecipients->options)) {
+                $resolveRecipientsOptions = $resolveRecipients->options;
+                // only limit ambiguous recipients if the client requests it.
+
+                if (isset($resolveRecipientsOptions->maxambiguousrecipients) &&
+                        $resolveRecipientsOptions->maxambiguousrecipients >= 0 &&
+                        $resolveRecipientsOptions->maxambiguousrecipients <= self::MAXAMBIGUOUSRECIPIENTS) {
+                    $maxAmbiguousRecipients = $resolveRecipientsOptions->maxambiguousrecipients;
+                    SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->ResolveRecipients(): The client requested %d max ambiguous recipients to resolve.", $maxAmbiguousRecipients));
+                }
+            }
+
+            foreach ($resolveRecipients->to as $i => $to) {
+                $response = new SyncResolveRecipientsResponse();
+                $response->to = $to;
+                $response->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
+
+                // do not expand distlists here
+                $recipient = $this->resolveRecipient($to, $maxAmbiguousRecipients, false);
+                if (is_array($recipient) && !empty($recipient)) {
+                    $response->recipientcount = 0;
+                    foreach ($recipient as $entry) {
+                        if ($entry instanceof SyncResolveRecipient) {
+                            // certificates are already set. Unset them if they weren't required.
+                            if (!isset($resolveRecipientsOptions->certificateretrieval)) {
+                                unset($entry->certificates);
+                            }
+                            if (isset($resolveRecipientsOptions->availability)) {
+                                if (!isset($resolveRecipientsOptions->starttime)) {
+                                    // TODO error, the request must include a valid StartTime element value
+                                }
+                                $entry->availability = $this->getAvailability($to, $entry, $resolveRecipientsOptions);
+                            }
+                            if (isset($resolveRecipientsOptions->picture)) {
+                                // TODO implement picture retrieval of the recipient
+                            }
+                            ++$response->recipientcount;
+                            $response->recipient[] = $entry;
+                        }
+                        elseif (is_int($recipient)) {
+                            $response->status = $recipient;
+                        }
+                    }
+                }
+
+                $resolveRecipients->response[$i] = $response;
+            }
+
+            return $resolveRecipients;
+        }
+
+        SLog::Write(LOGLEVEL_WARN, "Grommunio->ResolveRecipients(): Not a valid SyncResolveRecipients object.");
+        // return a SyncResolveRecipients object so that sync doesn't fail
+        $r = new SyncResolveRecipients();
+        $r->status = SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR;
+
+        return $r;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * Implementation of the ISearchProvider interface
 	 */
 
-	/**
-	 * Indicates if a search type is supported by this SearchProvider
-	 * Currently only the type ISearchProvider::SEARCH_GAL (Global Address List) is implemented.
-	 *
-	 * @param string $searchtype
-	 *
-	 * @return bool
-	 */
-	public function SupportsType($searchtype) {
-		return ($searchtype == ISearchProvider::SEARCH_GAL) || ($searchtype == ISearchProvider::SEARCH_MAILBOX);
-	}
-
-	/**
-	 * Searches the GAB of Grommunio
-	 * Can be overwritten globally by configuring a SearchBackend.
-	 *
-	 * @param string                       $searchquery   string to be searched for
-	 * @param string                       $searchrange   specified searchrange
-	 * @param SyncResolveRecipientsPicture $searchpicture limitations for picture
-	 *
-	 * @throws StatusException
-	 *
-	 * @return array search results
-	 */
-	public function GetGALSearchResults($searchquery, $searchrange, $searchpicture) {
-		// only return users whose displayName or the username starts with $name
-		// TODO: use PR_ANR for this restriction instead of PR_DISPLAY_NAME and PR_ACCOUNT
-		$addrbook = $this->getAddressbook();
-		// FIXME: create a function to get the adressbook contentstable
-		if ($addrbook) {
-			$ab_entryid = mapi_ab_getdefaultdir($addrbook);
-		}
-		if ($ab_entryid) {
-			$ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
-		}
-		if ($ab_dir) {
-			$table = mapi_folder_getcontentstable($ab_dir);
-		}
-
-		if (!$table) {
-			throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not open addressbook: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_CONNECTIONFAILED);
-		}
-
-		$restriction = MAPIUtils::GetSearchRestriction(u2w($searchquery));
-		mapi_table_restrict($table, $restriction);
-		mapi_table_sort($table, [PR_DISPLAY_NAME => TABLE_SORT_ASCEND]);
-
-		if (mapi_last_hresult()) {
-			throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not apply restriction: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_TOOCOMPLEX);
-		}
-
-		// range for the search results, default symbian range end is 50, wm 99,
-		// so we'll use that of nokia
-		$rangestart = 0;
-		$rangeend = 50;
-
-		if ($searchrange != '0') {
-			$pos = strpos($searchrange, '-');
-			$rangestart = substr($searchrange, 0, $pos);
-			$rangeend = substr($searchrange, ($pos + 1));
-		}
-		$items = [];
-
-		$querycnt = mapi_table_getrowcount($table);
-		// do not return more results as requested in range
-		$querylimit = (($rangeend + 1) < $querycnt) ? ($rangeend + 1) : $querycnt;
-
-		if ($querycnt > 0) {
-			$abentries = mapi_table_queryrows($table, [PR_ENTRYID, PR_ACCOUNT, PR_DISPLAY_NAME, PR_SMTP_ADDRESS, PR_BUSINESS_TELEPHONE_NUMBER, PR_GIVEN_NAME, PR_SURNAME, PR_MOBILE_TELEPHONE_NUMBER, PR_HOME_TELEPHONE_NUMBER, PR_TITLE, PR_COMPANY_NAME, PR_OFFICE_LOCATION, PR_EMS_AB_THUMBNAIL_PHOTO], $rangestart, $querylimit);
-		}
-
-		for ($i = 0; $i < $querylimit; ++$i) {
-			if (!isset($abentries[$i][PR_SMTP_ADDRESS])) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->GetGALSearchResults(): The GAL entry '%s' does not have an email address and will be ignored.", w2u($abentries[$i][PR_DISPLAY_NAME])));
-
-				continue;
-			}
-
-			$items[$i][SYNC_GAL_DISPLAYNAME] = w2u($abentries[$i][PR_DISPLAY_NAME]);
-
-			if (strlen(trim($items[$i][SYNC_GAL_DISPLAYNAME])) == 0) {
-				$items[$i][SYNC_GAL_DISPLAYNAME] = w2u($abentries[$i][PR_ACCOUNT]);
-			}
-
-			$items[$i][SYNC_GAL_ALIAS] = w2u($abentries[$i][PR_ACCOUNT]);
-			// it's not possible not get first and last name of an user
-			// from the gab and user functions, so we just set lastname
-			// to displayname and leave firstname unset
-			// this was changed in Zarafa 6.40, so we try to get first and
-			// last name and fall back to the old behaviour if these values are not set
-			if (isset($abentries[$i][PR_GIVEN_NAME])) {
-				$items[$i][SYNC_GAL_FIRSTNAME] = w2u($abentries[$i][PR_GIVEN_NAME]);
-			}
-			if (isset($abentries[$i][PR_SURNAME])) {
-				$items[$i][SYNC_GAL_LASTNAME] = w2u($abentries[$i][PR_SURNAME]);
-			}
-
-			if (!isset($items[$i][SYNC_GAL_LASTNAME])) {
-				$items[$i][SYNC_GAL_LASTNAME] = $items[$i][SYNC_GAL_DISPLAYNAME];
-			}
-
-			$items[$i][SYNC_GAL_EMAILADDRESS] = w2u($abentries[$i][PR_SMTP_ADDRESS]);
-			// check if an user has an office number or it might produce warnings in the log
-			if (isset($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER])) {
-				$items[$i][SYNC_GAL_PHONE] = w2u($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER]);
-			}
-			// check if an user has a mobile number or it might produce warnings in the log
-			if (isset($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER])) {
-				$items[$i][SYNC_GAL_MOBILEPHONE] = w2u($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER]);
-			}
-			// check if an user has a home number or it might produce warnings in the log
-			if (isset($abentries[$i][PR_HOME_TELEPHONE_NUMBER])) {
-				$items[$i][SYNC_GAL_HOMEPHONE] = w2u($abentries[$i][PR_HOME_TELEPHONE_NUMBER]);
-			}
-
-			if (isset($abentries[$i][PR_COMPANY_NAME])) {
-				$items[$i][SYNC_GAL_COMPANY] = w2u($abentries[$i][PR_COMPANY_NAME]);
-			}
-
-			if (isset($abentries[$i][PR_TITLE])) {
-				$items[$i][SYNC_GAL_TITLE] = w2u($abentries[$i][PR_TITLE]);
-			}
-
-			if (isset($abentries[$i][PR_OFFICE_LOCATION])) {
-				$items[$i][SYNC_GAL_OFFICE] = w2u($abentries[$i][PR_OFFICE_LOCATION]);
-			}
-
-			if ($searchpicture !== false && isset($abentries[$i][PR_EMS_AB_THUMBNAIL_PHOTO])) {
-				$items[$i][SYNC_GAL_PICTURE] = StringStreamWrapper::Open($abentries[$i][PR_EMS_AB_THUMBNAIL_PHOTO]);
-			}
-		}
-		$nrResults = count($items);
-		$items['range'] = ($nrResults > 0) ? $rangestart . '-' . ($nrResults - 1) : '0-0';
-		$items['searchtotal'] = $nrResults;
-
-		return $items;
-	}
-
-	/**
-	 * Searches for the emails on the server.
-	 *
-	 * @param ContentParameter $cpo
-	 *
-	 * @return array
-	 */
-	public function GetMailboxSearchResults($cpo) {
-		$searchFolder = $this->getSearchFolder();
-		$searchRestriction = $this->getSearchRestriction($cpo);
-		$searchRange = explode('-', $cpo->GetSearchRange());
-		$searchFolderId = $cpo->GetSearchFolderid();
-		$searchFolders = [];
-		// search only in required folders
-		if (!empty($searchFolderId)) {
-			$searchFolderEntryId = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($searchFolderId));
-			$searchFolders[] = $searchFolderEntryId;
-		}
-		// if no folder was required then search in the entire store
-		else {
-			$tmp = mapi_getprops($this->store, [PR_ENTRYID, PR_DISPLAY_NAME, PR_IPM_SUBTREE_ENTRYID]);
-			$searchFolders[] = $tmp[PR_IPM_SUBTREE_ENTRYID];
-		}
-		$items = [];
-		$flags = 0;
-		// if subfolders are required, do a recursive search
-		if ($cpo->GetSearchDeepTraversal()) {
-			$flags |= SEARCH_RECURSIVE;
-		}
-
-		mapi_folder_setsearchcriteria($searchFolder, $searchRestriction, $searchFolders, $flags);
-
-		$table = mapi_folder_getcontentstable($searchFolder);
-		$searchStart = time();
-		// do the search and wait for all the results available
-		while (time() - $searchStart < SEARCH_WAIT) {
-			$searchcriteria = mapi_folder_getsearchcriteria($searchFolder);
-			if (($searchcriteria["searchstate"] & SEARCH_REBUILD) == 0) {
-				break;
-			} // Search is done
-			sleep(1);
-		}
-
-		// if the search range is set limit the result to it, otherwise return all found messages
-		$rows = (is_array($searchRange) && isset($searchRange[0], $searchRange[1])) ?
-			mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) :
-			mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
-
-		$cnt = count($rows);
-		$items['searchtotal'] = $cnt;
-		$items["range"] = $cpo->GetSearchRange();
-		for ($i = 0; $i < $cnt; ++$i) {
-			$items[$i]['class'] = 'Email';
-			$items[$i]['longid'] = bin2hex($rows[$i][PR_ENTRYID]);
-			// $items[$i]['folderid'] = bin2hex($rows[$i][PR_PARENT_SOURCE_KEY]);
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Terminates a search for a given PID.
-	 *
-	 * @param int $pid
-	 *
-	 * @return bool
-	 */
-	public function TerminateSearch($pid) {
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->TerminateSearch(): terminating search for pid %d", $pid));
-		if (!isset($this->store) || $this->store === false) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->TerminateSearch(): The store is not available. It is not possible to remove search folder with pid %d", $pid));
-
-			return false;
-		}
-
-		$storeProps = mapi_getprops($this->store, [PR_STORE_SUPPORT_MASK, PR_FINDER_ENTRYID]);
-		if (($storeProps[PR_STORE_SUPPORT_MASK] & STORE_SEARCH_OK) != STORE_SEARCH_OK) {
-			SLog::Write(LOGLEVEL_WARN, "Grommunio->TerminateSearch(): Store doesn't support search folders. Public store doesn't have FINDER_ROOT folder");
-
-			return false;
-		}
-
-		$finderfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_FINDER_ENTRYID]);
-		if (mapi_last_hresult() != NOERROR) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->TerminateSearch(): Unable to open search folder (0x%X)", mapi_last_hresult()));
-
-			return false;
-		}
-
-		$hierarchytable = mapi_folder_gethierarchytable($finderfolder);
-		mapi_table_restrict(
-			$hierarchytable,
-			[RES_CONTENT,
-				[
-					FUZZYLEVEL => FL_PREFIX,
-					ULPROPTAG => PR_DISPLAY_NAME,
-					VALUE => [PR_DISPLAY_NAME => "grommunio-sync Search Folder " . $pid],
-				],
-			],
-			TBL_BATCH
-		);
-
-		$folders = mapi_table_queryallrows($hierarchytable, [PR_ENTRYID, PR_DISPLAY_NAME, PR_LAST_MODIFICATION_TIME]);
-		foreach ($folders as $folder) {
-			mapi_folder_deletefolder($finderfolder, $folder[PR_ENTRYID]);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Disconnects from the current search provider.
-	 *
-	 * @return bool
-	 */
-	public function Disconnect() {
-		return true;
-	}
-
-	/**
-	 * Returns the MAPI store resource for a folderid
-	 * This is not part of IBackend but necessary for the ImportChangesICS->MoveMessage() operation if
-	 * the destination folder is not in the default store
-	 * Note: The current backend store might be changed as IBackend->Setup() is executed.
-	 *
-	 * @param string $store    target store, could contain a "domain\user" value - if empty default store is returned
-	 * @param string $folderid
-	 *
-	 * @return Resource/boolean
-	 */
-	public function GetMAPIStoreForFolderId($store, $folderid) {
-		if ($store == false) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetMAPIStoreForFolderId('%s', '%s'): no store specified, returning default store", $store, $folderid));
-
-			return $this->defaultstore;
-		}
-
-		// setup the correct store
-		if ($this->Setup($store, false, $folderid)) {
-			return $this->store;
-		}
-
-		SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->GetMAPIStoreForFolderId('%s', '%s'): store is not available", $store, $folderid));
-
-		return false;
-	}
-
-	/**
-	 * Returns the email address and the display name of the user. Used by autodiscover.
-	 *
-	 * @param string $username The username
-	 *
-	 * @return array
-	 */
-	public function GetUserDetails($username) {
-		SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->GetUserDetails for '%s'.", $username));
-		$zarafauserinfo = @nsp_getuserinfo($username);
-		$userDetails['emailaddress'] = (isset($zarafauserinfo['primary_email']) && $zarafauserinfo['primary_email']) ? $zarafauserinfo['primary_email'] : false;
-		$userDetails['fullname'] = (isset($zarafauserinfo['fullname']) && $zarafauserinfo['fullname']) ? $zarafauserinfo['fullname'] : false;
-
-		return $userDetails;
-	}
-
-	/**
-	 * Returns the username of the currently active user.
-	 *
-	 * @return string
-	 */
-	public function GetCurrentUsername() {
-		return $this->storeName;
-	}
-
-	/**
-	 * Returns the impersonated user name.
-	 *
-	 * @return string or false if no user is impersonated
-	 */
-	public function GetImpersonatedUser() {
-		return $this->impersonateUser;
-	}
-
-	/**
-	 * Returns the authenticated user name.
-	 *
-	 * @return string
-	 */
-	public function GetMainUser() {
-		return $this->mainUser;
-	}
-
-	/**
-	 * Indicates if the Backend supports folder statistics.
-	 *
-	 * @return bool
-	 */
-	public function HasFolderStats() {
-		return true;
-	}
-
-	/**
-	 * Returns a status indication of the folder.
-	 * If there are changes in the folder, the returned value must change.
-	 * The returned values are compared with '===' to determine if a folder needs synchronization or not.
-	 *
-	 * @param string $store    the store where the folder resides
-	 * @param string $folderid the folder id
-	 *
-	 * @return string
-	 */
-	public function GetFolderStat($store, $folderid) {
-		list($user, $domain) = Utils::SplitDomainUser($store);
-		if ($user === false) {
-			$user = $this->mainUser;
-			if ($this->impersonateUser) {
-				$user = $this->impersonateUser;
-			}
-		}
-
-		if (!isset($this->folderStatCache[$user])) {
-			$this->folderStatCache[$user] = [];
-		}
-
-		// if there is nothing in the cache for a store, load the data for all folders of it
-		if (empty($this->folderStatCache[$user])) {
-			// get the store
-			$userstore = $this->openMessageStore($user);
-			$rootfolder = mapi_msgstore_openentry($userstore);
-			$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
-			$rows = mapi_table_queryallrows($hierarchy, [PR_SOURCE_KEY, PR_LOCAL_COMMIT_TIME_MAX, PR_CONTENT_COUNT, PR_CONTENT_UNREAD, PR_DELETED_MSG_COUNT]);
-
-			if (count($rows) == 0) {
-				SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->GetFolderStat(): could not access folder statistics for user '%s'. Probably missing 'read' permissions on the root folder! Folders of this store will be synchronized ONCE per hour only!", $user));
-			}
-
-			foreach ($rows as $folder) {
-				$commit_time = isset($folder[PR_LOCAL_COMMIT_TIME_MAX]) ? $folder[PR_LOCAL_COMMIT_TIME_MAX] : "0000000000";
-				$content_count = isset($folder[PR_CONTENT_COUNT]) ? $folder[PR_CONTENT_COUNT] : -1;
-				$content_unread = isset($folder[PR_CONTENT_UNREAD]) ? $folder[PR_CONTENT_UNREAD] : -1;
-				$content_deleted = isset($folder[PR_DELETED_MSG_COUNT]) ? $folder[PR_DELETED_MSG_COUNT] : -1;
-
-				$this->folderStatCache[$user][bin2hex($folder[PR_SOURCE_KEY])] = $commit_time . "/" . $content_count . "/" . $content_unread . "/" . $content_deleted;
-			}
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetFolderStat() fetched status information of %d folders for store '%s'", count($this->folderStatCache[$user]), $user));
-		}
-
-		if (isset($this->folderStatCache[$user][$folderid])) {
-			return $this->folderStatCache[$user][$folderid];
-		}
-
-		// a timestamp that changes once per hour is returned in case there is no data found for this folder. It will be synchronized only once per hour.
-		return gmdate("Y-m-d-H");
-	}
-
-	/**
-	 * Returns information about the user's store:
-	 * number of folders, store size, full name, email address.
-	 *
-	 * @return UserStoreInfo
-	 */
-	public function GetUserStoreInfo() {
-		$userStoreInfo = new UserStoreInfo();
-
-		$rootfolder = mapi_msgstore_openentry($this->store);
-		$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
-		// Do not take hidden and system folders into account
-		// TODO make this restriction generic and use for hierarchy?
-		$restrict = [
-			RES_AND,
-			[
-				[
-					RES_PROPERTY,
-					[
-						RELOP => RELOP_NE,
-						ULPROPTAG => PR_ATTR_HIDDEN,
-						VALUE => true, ],
-				],
-				[
-					RES_PROPERTY,
-					[
-						RELOP => RELOP_EQ,
-						ULPROPTAG => PR_FOLDER_TYPE,
-						VALUE => FOLDER_GENERIC, ],
-				],
-				[
-					RES_EXIST,
-					[ULPROPTAG => PR_CONTAINER_CLASS],
-				],
-			], ];
-		mapi_table_restrict($hierarchy, $restrict);
-		$foldercount = mapi_table_getrowcount($hierarchy);
-
-		$storeProps = mapi_getprops($this->store, [PR_MESSAGE_SIZE_EXTENDED]);
-		$storesize = isset($storeProps[PR_MESSAGE_SIZE_EXTENDED]) ? $storeProps[PR_MESSAGE_SIZE_EXTENDED] : 0;
-
-		$userDetails = $this->GetUserDetails($this->impersonateUser ?: $this->mainUser);
-		$userStoreInfo->SetData($foldercount, $storesize, $userDetails['fullname'], $userDetails['emailaddress']);
-		SLog::Write(LOGLEVEL_DEBUG, sprintf(
-			"Grommunio->GetUserStoreInfo(): user %s (%s) store size is %d bytes and contains %d folders",
-			Utils::PrintAsString($userDetails['fullname']),
-			Utils::PrintAsString($userDetails['emailaddress']),
-			$storesize,
-			$foldercount
-		));
-
-		return $userStoreInfo;
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+    /**
+     * Indicates if a search type is supported by this SearchProvider
+     * Currently only the type ISearchProvider::SEARCH_GAL (Global Address List) is implemented.
+     *
+     * @param string $searchtype
+     *
+     * @return bool
+     */
+    public function SupportsType($searchtype) {
+        return ($searchtype == ISearchProvider::SEARCH_GAL) || ($searchtype == ISearchProvider::SEARCH_MAILBOX);
+    }
+
+    /**
+     * Searches the GAB of Grommunio
+     * Can be overwritten globally by configuring a SearchBackend.
+     *
+     * @param string                       $searchquery   string to be searched for
+     * @param string                       $searchrange   specified searchrange
+     * @param SyncResolveRecipientsPicture $searchpicture limitations for picture
+     *
+     * @throws StatusException
+     *
+     * @return array search results
+     */
+    public function GetGALSearchResults($searchquery, $searchrange, $searchpicture) {
+        // only return users whose displayName or the username starts with $name
+        // TODO: use PR_ANR for this restriction instead of PR_DISPLAY_NAME and PR_ACCOUNT
+        $addrbook = $this->getAddressbook();
+        // FIXME: create a function to get the adressbook contentstable
+        if ($addrbook) {
+            $ab_entryid = mapi_ab_getdefaultdir($addrbook);
+        }
+        if ($ab_entryid) {
+            $ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
+        }
+        if ($ab_dir) {
+            $table = mapi_folder_getcontentstable($ab_dir);
+        }
+
+        if (!$table) {
+            throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not open addressbook: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_CONNECTIONFAILED);
+        }
+
+        $restriction = MAPIUtils::GetSearchRestriction(u2w($searchquery));
+        mapi_table_restrict($table, $restriction);
+        mapi_table_sort($table, [PR_DISPLAY_NAME => TABLE_SORT_ASCEND]);
+
+        if (mapi_last_hresult()) {
+            throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not apply restriction: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_TOOCOMPLEX);
+        }
+
+        // range for the search results, default symbian range end is 50, wm 99,
+        // so we'll use that of nokia
+        $rangestart = 0;
+        $rangeend = 50;
+
+        if ($searchrange != '0') {
+            $pos = strpos($searchrange, '-');
+            $rangestart = substr($searchrange, 0, $pos);
+            $rangeend = substr($searchrange, ($pos + 1));
+        }
+        $items = [];
+
+        $querycnt = mapi_table_getrowcount($table);
+        // do not return more results as requested in range
+        $querylimit = (($rangeend + 1) < $querycnt) ? ($rangeend + 1) : $querycnt;
+
+        if ($querycnt > 0) {
+            $abentries = mapi_table_queryrows($table, [PR_ENTRYID, PR_ACCOUNT, PR_DISPLAY_NAME, PR_SMTP_ADDRESS, PR_BUSINESS_TELEPHONE_NUMBER, PR_GIVEN_NAME, PR_SURNAME, PR_MOBILE_TELEPHONE_NUMBER, PR_HOME_TELEPHONE_NUMBER, PR_TITLE, PR_COMPANY_NAME, PR_OFFICE_LOCATION, PR_EMS_AB_THUMBNAIL_PHOTO], $rangestart, $querylimit);
+        }
+
+        for ($i = 0; $i < $querylimit; ++$i) {
+            if (!isset($abentries[$i][PR_SMTP_ADDRESS])) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->GetGALSearchResults(): The GAL entry '%s' does not have an email address and will be ignored.", w2u($abentries[$i][PR_DISPLAY_NAME])));
+
+                continue;
+            }
+
+            $items[$i][SYNC_GAL_DISPLAYNAME] = w2u($abentries[$i][PR_DISPLAY_NAME]);
+
+            if (strlen(trim($items[$i][SYNC_GAL_DISPLAYNAME])) == 0) {
+                $items[$i][SYNC_GAL_DISPLAYNAME] = w2u($abentries[$i][PR_ACCOUNT]);
+            }
+
+            $items[$i][SYNC_GAL_ALIAS] = w2u($abentries[$i][PR_ACCOUNT]);
+            // it's not possible not get first and last name of an user
+            // from the gab and user functions, so we just set lastname
+            // to displayname and leave firstname unset
+            // this was changed in Zarafa 6.40, so we try to get first and
+            // last name and fall back to the old behaviour if these values are not set
+            if (isset($abentries[$i][PR_GIVEN_NAME])) {
+                $items[$i][SYNC_GAL_FIRSTNAME] = w2u($abentries[$i][PR_GIVEN_NAME]);
+            }
+            if (isset($abentries[$i][PR_SURNAME])) {
+                $items[$i][SYNC_GAL_LASTNAME] = w2u($abentries[$i][PR_SURNAME]);
+            }
+
+            if (!isset($items[$i][SYNC_GAL_LASTNAME])) {
+                $items[$i][SYNC_GAL_LASTNAME] = $items[$i][SYNC_GAL_DISPLAYNAME];
+            }
+
+            $items[$i][SYNC_GAL_EMAILADDRESS] = w2u($abentries[$i][PR_SMTP_ADDRESS]);
+            // check if an user has an office number or it might produce warnings in the log
+            if (isset($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER])) {
+                $items[$i][SYNC_GAL_PHONE] = w2u($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER]);
+            }
+            // check if an user has a mobile number or it might produce warnings in the log
+            if (isset($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER])) {
+                $items[$i][SYNC_GAL_MOBILEPHONE] = w2u($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER]);
+            }
+            // check if an user has a home number or it might produce warnings in the log
+            if (isset($abentries[$i][PR_HOME_TELEPHONE_NUMBER])) {
+                $items[$i][SYNC_GAL_HOMEPHONE] = w2u($abentries[$i][PR_HOME_TELEPHONE_NUMBER]);
+            }
+
+            if (isset($abentries[$i][PR_COMPANY_NAME])) {
+                $items[$i][SYNC_GAL_COMPANY] = w2u($abentries[$i][PR_COMPANY_NAME]);
+            }
+
+            if (isset($abentries[$i][PR_TITLE])) {
+                $items[$i][SYNC_GAL_TITLE] = w2u($abentries[$i][PR_TITLE]);
+            }
+
+            if (isset($abentries[$i][PR_OFFICE_LOCATION])) {
+                $items[$i][SYNC_GAL_OFFICE] = w2u($abentries[$i][PR_OFFICE_LOCATION]);
+            }
+
+            if ($searchpicture !== false && isset($abentries[$i][PR_EMS_AB_THUMBNAIL_PHOTO])) {
+                $items[$i][SYNC_GAL_PICTURE] = StringStreamWrapper::Open($abentries[$i][PR_EMS_AB_THUMBNAIL_PHOTO]);
+            }
+        }
+        $nrResults = count($items);
+        $items['range'] = ($nrResults > 0) ? $rangestart . '-' . ($nrResults - 1) : '0-0';
+        $items['searchtotal'] = $nrResults;
+
+        return $items;
+    }
+
+    /**
+     * Searches for the emails on the server.
+     *
+     * @param ContentParameter $cpo
+     *
+     * @return array
+     */
+    public function GetMailboxSearchResults($cpo) {
+        $searchFolder = $this->getSearchFolder();
+        $searchRestriction = $this->getSearchRestriction($cpo);
+        $searchRange = explode('-', $cpo->GetSearchRange());
+        $searchFolderId = $cpo->GetSearchFolderid();
+        $searchFolders = [];
+        // search only in required folders
+        if (!empty($searchFolderId)) {
+            $searchFolderEntryId = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($searchFolderId));
+            $searchFolders[] = $searchFolderEntryId;
+        }
+        // if no folder was required then search in the entire store
+        else {
+            $tmp = mapi_getprops($this->store, [PR_ENTRYID, PR_DISPLAY_NAME, PR_IPM_SUBTREE_ENTRYID]);
+            $searchFolders[] = $tmp[PR_IPM_SUBTREE_ENTRYID];
+        }
+        $items = [];
+        $flags = 0;
+        // if subfolders are required, do a recursive search
+        if ($cpo->GetSearchDeepTraversal()) {
+            $flags |= SEARCH_RECURSIVE;
+        }
+
+        mapi_folder_setsearchcriteria($searchFolder, $searchRestriction, $searchFolders, $flags);
+
+        $table = mapi_folder_getcontentstable($searchFolder);
+        $searchStart = time();
+        // do the search and wait for all the results available
+        while (time() - $searchStart < SEARCH_WAIT) {
+            $searchcriteria = mapi_folder_getsearchcriteria($searchFolder);
+            if (($searchcriteria["searchstate"] & SEARCH_REBUILD) == 0) {
+                break;
+            } // Search is done
+            sleep(1);
+        }
+
+        // if the search range is set limit the result to it, otherwise return all found messages
+        $rows = (is_array($searchRange) && isset($searchRange[0], $searchRange[1])) ?
+            mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) :
+            mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
+
+        $cnt = count($rows);
+        $items['searchtotal'] = $cnt;
+        $items["range"] = $cpo->GetSearchRange();
+        for ($i = 0; $i < $cnt; ++$i) {
+            $items[$i]['class'] = 'Email';
+            $items[$i]['longid'] = bin2hex($rows[$i][PR_ENTRYID]);
+            // $items[$i]['folderid'] = bin2hex($rows[$i][PR_PARENT_SOURCE_KEY]);
+        }
+
+        return $items;
+    }
+
+    /**
+     * Terminates a search for a given PID.
+     *
+     * @param int $pid
+     *
+     * @return bool
+     */
+    public function TerminateSearch($pid) {
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->TerminateSearch(): terminating search for pid %d", $pid));
+        if (!isset($this->store) || $this->store === false) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->TerminateSearch(): The store is not available. It is not possible to remove search folder with pid %d", $pid));
+
+            return false;
+        }
+
+        $storeProps = mapi_getprops($this->store, [PR_STORE_SUPPORT_MASK, PR_FINDER_ENTRYID]);
+        if (($storeProps[PR_STORE_SUPPORT_MASK] & STORE_SEARCH_OK) != STORE_SEARCH_OK) {
+            SLog::Write(LOGLEVEL_WARN, "Grommunio->TerminateSearch(): Store doesn't support search folders. Public store doesn't have FINDER_ROOT folder");
+
+            return false;
+        }
+
+        $finderfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_FINDER_ENTRYID]);
+        if (mapi_last_hresult() != NOERROR) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->TerminateSearch(): Unable to open search folder (0x%X)", mapi_last_hresult()));
+
+            return false;
+        }
+
+        $hierarchytable = mapi_folder_gethierarchytable($finderfolder);
+        mapi_table_restrict(
+            $hierarchytable,
+            [RES_CONTENT,
+                [
+                    FUZZYLEVEL => FL_PREFIX,
+                    ULPROPTAG => PR_DISPLAY_NAME,
+                    VALUE => [PR_DISPLAY_NAME => "grommunio-sync Search Folder " . $pid],
+                ],
+            ],
+            TBL_BATCH
+        );
+
+        $folders = mapi_table_queryallrows($hierarchytable, [PR_ENTRYID, PR_DISPLAY_NAME, PR_LAST_MODIFICATION_TIME]);
+        foreach ($folders as $folder) {
+            mapi_folder_deletefolder($finderfolder, $folder[PR_ENTRYID]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Disconnects from the current search provider.
+     *
+     * @return bool
+     */
+    public function Disconnect() {
+        return true;
+    }
+
+    /**
+     * Returns the MAPI store resource for a folderid
+     * This is not part of IBackend but necessary for the ImportChangesICS->MoveMessage() operation if
+     * the destination folder is not in the default store
+     * Note: The current backend store might be changed as IBackend->Setup() is executed.
+     *
+     * @param string $store    target store, could contain a "domain\user" value - if empty default store is returned
+     * @param string $folderid
+     *
+     * @return Resource/boolean
+     */
+    public function GetMAPIStoreForFolderId($store, $folderid) {
+        if ($store == false) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetMAPIStoreForFolderId('%s', '%s'): no store specified, returning default store", $store, $folderid));
+
+            return $this->defaultstore;
+        }
+
+        // setup the correct store
+        if ($this->Setup($store, false, $folderid)) {
+            return $this->store;
+        }
+
+        SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->GetMAPIStoreForFolderId('%s', '%s'): store is not available", $store, $folderid));
+
+        return false;
+    }
+
+    /**
+     * Returns the email address and the display name of the user. Used by autodiscover.
+     *
+     * @param string $username The username
+     *
+     * @return array
+     */
+    public function GetUserDetails($username) {
+        SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->GetUserDetails for '%s'.", $username));
+        $zarafauserinfo = @nsp_getuserinfo($username);
+        $userDetails['emailaddress'] = (isset($zarafauserinfo['primary_email']) && $zarafauserinfo['primary_email']) ? $zarafauserinfo['primary_email'] : false;
+        $userDetails['fullname'] = (isset($zarafauserinfo['fullname']) && $zarafauserinfo['fullname']) ? $zarafauserinfo['fullname'] : false;
+
+        return $userDetails;
+    }
+
+    /**
+     * Returns the username of the currently active user.
+     *
+     * @return string
+     */
+    public function GetCurrentUsername() {
+        return $this->storeName;
+    }
+
+    /**
+     * Returns the impersonated user name.
+     *
+     * @return string or false if no user is impersonated
+     */
+    public function GetImpersonatedUser() {
+        return $this->impersonateUser;
+    }
+
+    /**
+     * Returns the authenticated user name.
+     *
+     * @return string
+     */
+    public function GetMainUser() {
+        return $this->mainUser;
+    }
+
+    /**
+     * Indicates if the Backend supports folder statistics.
+     *
+     * @return bool
+     */
+    public function HasFolderStats() {
+        return true;
+    }
+
+    /**
+     * Returns a status indication of the folder.
+     * If there are changes in the folder, the returned value must change.
+     * The returned values are compared with '===' to determine if a folder needs synchronization or not.
+     *
+     * @param string $store    the store where the folder resides
+     * @param string $folderid the folder id
+     *
+     * @return string
+     */
+    public function GetFolderStat($store, $folderid) {
+        list($user, $domain) = Utils::SplitDomainUser($store);
+        if ($user === false) {
+            $user = $this->mainUser;
+            if ($this->impersonateUser) {
+                $user = $this->impersonateUser;
+            }
+        }
+
+        if (!isset($this->folderStatCache[$user])) {
+            $this->folderStatCache[$user] = [];
+        }
+
+        // if there is nothing in the cache for a store, load the data for all folders of it
+        if (empty($this->folderStatCache[$user])) {
+            // get the store
+            $userstore = $this->openMessageStore($user);
+            $rootfolder = mapi_msgstore_openentry($userstore);
+            $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+            $rows = mapi_table_queryallrows($hierarchy, [PR_SOURCE_KEY, PR_LOCAL_COMMIT_TIME_MAX, PR_CONTENT_COUNT, PR_CONTENT_UNREAD, PR_DELETED_MSG_COUNT]);
+
+            if (count($rows) == 0) {
+                SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->GetFolderStat(): could not access folder statistics for user '%s'. Probably missing 'read' permissions on the root folder! Folders of this store will be synchronized ONCE per hour only!", $user));
+            }
+
+            foreach ($rows as $folder) {
+                $commit_time = isset($folder[PR_LOCAL_COMMIT_TIME_MAX]) ? $folder[PR_LOCAL_COMMIT_TIME_MAX] : "0000000000";
+                $content_count = isset($folder[PR_CONTENT_COUNT]) ? $folder[PR_CONTENT_COUNT] : -1;
+                $content_unread = isset($folder[PR_CONTENT_UNREAD]) ? $folder[PR_CONTENT_UNREAD] : -1;
+                $content_deleted = isset($folder[PR_DELETED_MSG_COUNT]) ? $folder[PR_DELETED_MSG_COUNT] : -1;
+
+                $this->folderStatCache[$user][bin2hex($folder[PR_SOURCE_KEY])] = $commit_time . "/" . $content_count . "/" . $content_unread . "/" . $content_deleted;
+            }
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetFolderStat() fetched status information of %d folders for store '%s'", count($this->folderStatCache[$user]), $user));
+        }
+
+        if (isset($this->folderStatCache[$user][$folderid])) {
+            return $this->folderStatCache[$user][$folderid];
+        }
+
+        // a timestamp that changes once per hour is returned in case there is no data found for this folder. It will be synchronized only once per hour.
+        return gmdate("Y-m-d-H");
+    }
+
+    /**
+     * Returns information about the user's store:
+     * number of folders, store size, full name, email address.
+     *
+     * @return UserStoreInfo
+     */
+    public function GetUserStoreInfo() {
+        $userStoreInfo = new UserStoreInfo();
+
+        $rootfolder = mapi_msgstore_openentry($this->store);
+        $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+        // Do not take hidden and system folders into account
+        // TODO make this restriction generic and use for hierarchy?
+        $restrict = [
+            RES_AND,
+            [
+                [
+                    RES_PROPERTY,
+                    [
+                        RELOP => RELOP_NE,
+                        ULPROPTAG => PR_ATTR_HIDDEN,
+                        VALUE => true, ],
+                ],
+                [
+                    RES_PROPERTY,
+                    [
+                        RELOP => RELOP_EQ,
+                        ULPROPTAG => PR_FOLDER_TYPE,
+                        VALUE => FOLDER_GENERIC, ],
+                ],
+                [
+                    RES_EXIST,
+                    [ULPROPTAG => PR_CONTAINER_CLASS],
+                ],
+            ], ];
+        mapi_table_restrict($hierarchy, $restrict);
+        $foldercount = mapi_table_getrowcount($hierarchy);
+
+        $storeProps = mapi_getprops($this->store, [PR_MESSAGE_SIZE_EXTENDED]);
+        $storesize = isset($storeProps[PR_MESSAGE_SIZE_EXTENDED]) ? $storeProps[PR_MESSAGE_SIZE_EXTENDED] : 0;
+
+        $userDetails = $this->GetUserDetails($this->impersonateUser ?: $this->mainUser);
+        $userStoreInfo->SetData($foldercount, $storesize, $userDetails['fullname'], $userDetails['emailaddress']);
+        SLog::Write(LOGLEVEL_DEBUG, sprintf(
+            "Grommunio->GetUserStoreInfo(): user %s (%s) store size is %d bytes and contains %d folders",
+            Utils::PrintAsString($userDetails['fullname']),
+            Utils::PrintAsString($userDetails['emailaddress']),
+            $storesize,
+            $foldercount
+        ));
+
+        return $userStoreInfo;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * Implementation of the IStateMachine interface
 	 */
 
-	/**
-	 * Gets a hash value indicating the latest dataset of the named
-	 * state with a specified key and counter.
-	 * If the state is changed between two calls of this method
-	 * the returned hash should be different.
-	 *
-	 * @param string $devid   the device id
-	 * @param string $type    the state type
-	 * @param string $key     (opt)
-	 * @param string $counter (opt)
-	 *
-	 * @throws StateNotFoundException
-	 *
-	 * @return string
-	 */
-	public function GetStateHash($devid, $type, $key = false, $counter = false) {
-		try {
-			$stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
-			$stateMessageProps = mapi_getprops($stateMessage, [PR_LAST_MODIFICATION_TIME]);
-			if (isset($stateMessageProps[PR_LAST_MODIFICATION_TIME])) {
-				return $stateMessageProps[PR_LAST_MODIFICATION_TIME];
-			}
-		}
-		catch (StateNotFoundException $e) {
-		}
-
-		return "0";
-	}
-
-	/**
-	 * Gets a state for a specified key and counter.
-	 * This method should call IStateMachine->CleanStates()
-	 * to remove older states (same key, previous counters).
-	 *
-	 * @param string $devid       the device id
-	 * @param string $type        the state type
-	 * @param string $key         (opt)
-	 * @param string $counter     (opt)
-	 * @param string $cleanstates (opt)
-	 *
-	 * @throws StateNotFoundException, StateInvalidException, UnavailableException
-	 *
-	 * @return mixed
-	 */
-	public function GetState($devid, $type, $key = false, $counter = false, $cleanstates = true) {
-		if ($counter && $cleanstates) {
-			$this->CleanStates($devid, $type, $key, $counter);
-			// also clean Failsave state for previous counter
-			if ($key == false) {
-				$this->CleanStates($devid, $type, IStateMachine::FAILSAVE, $counter);
-			}
-		}
-		$stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
-		$state = base64_decode(MAPIUtils::readPropStream($stateMessage, PR_BODY));
-
-		if ($state && $state[0] === '{') {
-			$jsonDec = json_decode($state);
-			if (isset($jsonDec->gsSyncStateClass)) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetState(): top class '%s'", $jsonDec->gsSyncStateClass));
-				$gsObj = new $jsonDec->gsSyncStateClass();
-				$gsObj->jsonDeserialize($jsonDec);
-				$gsObj->postUnserialize();
-			}
-		}
-
-		return isset($gsObj) && is_object($gsObj) ? $gsObj : $state;
-	}
-
-	/**
-	 * Writes ta state to for a key and counter.
-	 *
-	 * @param mixed  $state
-	 * @param string $devid   the device id
-	 * @param string $type    the state type
-	 * @param string $key     (opt)
-	 * @param int    $counter (opt)
-	 *
-	 * @throws StateInvalidException, UnavailableException
-	 *
-	 * @return bool
-	 */
-	public function SetState($state, $devid, $type, $key = false, $counter = false) {
-		return $this->setStateMessage($state, $devid, $type, $key, $counter);
-	}
-
-	/**
-	 * Cleans up all older states.
-	 * If called with a $counter, all states previous state counter can be removed.
-	 * If additionally the $thisCounterOnly flag is true, only that specific counter will be removed.
-	 * If called without $counter, all keys (independently from the counter) can be removed.
-	 *
-	 * @param string $devid           the device id
-	 * @param string $type            the state type
-	 * @param string $key
-	 * @param string $counter         (opt)
-	 * @param string $thisCounterOnly (opt) if provided, the exact counter only will be removed
-	 *
-	 * @throws StateInvalidException
-	 *
-	 * @return
-	 */
-	public function CleanStates($devid, $type, $key, $counter = false, $thisCounterOnly = false) {
-		if (!$this->stateFolder) {
-			$this->getStateFolder($devid);
-			if (!$this->stateFolder) {
-				throw new StateNotFoundException(sprintf(
-					"Grommunio->getStateMessage(): Could not locate the state folder for device '%s'",
-					$devid
-				));
-			}
-		}
-		$messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
-		$restriction = $this->getStateMessageRestriction($messageName, $counter, $thisCounterOnly);
-		$stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
-		if ($stateFolderContents) {
-			mapi_table_restrict($stateFolderContents, $restriction);
-			$rowCnt = mapi_table_getrowcount($stateFolderContents);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->CleanStates(): Found %d states to clean (%s)", $rowCnt, $messageName));
-			if ($rowCnt > 0) {
-				$rows = mapi_table_queryallrows($stateFolderContents, [PR_ENTRYID]);
-				$entryids = [];
-				foreach ($rows as $row) {
-					$entryids[] = $row[PR_ENTRYID];
-				}
-				mapi_folder_deletemessages($this->stateFolder, $entryids, DELETE_HARD_DELETE);
-			}
-		}
-	}
-
-	/**
-	 * Links a user to a device.
-	 *
-	 * @param string $username
-	 * @param string $devid
-	 *
-	 * @return bool indicating if the user was added or not (existed already)
-	 */
-	public function LinkUserDevice($username, $devid) {
-		$device = [$devid => time()];
-		$this->setDeviceUserData($this->type, $device, $username, -1, $subkey = -1, $doCas = "merge");
-
-		return false;
-	}
-
-	/**
-	 * Unlinks a device from a user.
-	 *
-	 * @param string $username
-	 * @param string $devid
-	 *
-	 * @return bool
-	 */
-	public function UnLinkUserDevice($username, $devid) {
-		// TODO: Implement
-		return false;
-	}
-
-	/**
-	 * Returns the current version of the state files
-	 * grommunio:  This is not relevant atm. IStateMachine::STATEVERSION_02 will match GSync::GetLatestStateVersion().
-	 *          If it might be required to update states in the future, this could be implemented on a store level,
-	 *          where states are then migrated "on-the-fly"
-	 *          or
-	 *          in a global settings where all states in all stores are migrated once.
-	 *
-	 * @return int
-	 */
-	public function GetStateVersion() {
-		return IStateMachine::STATEVERSION_02;
-	}
-
-	/**
-	 * Sets the current version of the state files.
-	 *
-	 * @param int $version the new supported version
-	 *
-	 * @return bool
-	 */
-	public function SetStateVersion($version) {
-		return true;
-	}
-
-	/**
-	 * Returns MAPIFolder object which contains the state information.
-	 * Creates this folder if it is not available yet.
-	 *
-	 * @param string $devid the device id
-	 *
-	 * @return MAPIFolder
-	 */
-	private function getStateFolder($devid) {
-		// Options request doesn't send device id
-		if (strlen($devid) == 0) {
-			return false;
-		}
-		// Try to get the state folder id from redis
-		if (!$this->stateFolder) {
-			$folderentryid = $this->getDeviceUserData($this->userDeviceData, $devid, $this->mainUser, "statefolder");
-			if ($folderentryid) {
-				$this->stateFolder = mapi_msgstore_openentry($this->store, hex2bin($folderentryid));
-			}
-		}
-
-		// fallback code
-		if (!$this->stateFolder) {
-			SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->getStateFolder(): state folder not set. Use fallback"));
-			$rootfolder = mapi_msgstore_openentry($this->store);
-			$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
-			$restriction = $this->getStateFolderRestriction($devid);
-			// restrict the hierarchy to the grommunio-sync search folder only
-			mapi_table_restrict($hierarchy, $restriction);
-			$rowCnt = mapi_table_getrowcount($hierarchy);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->getStateFolder(): found %d device state folders", $rowCnt));
-			if ($rowCnt == 1) {
-				$hierarchyRows = mapi_table_queryrows($hierarchy, [PR_ENTRYID], 0, 1);
-				$this->stateFolder = mapi_msgstore_openentry($this->store, $hierarchyRows[0][PR_ENTRYID]);
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->getStateFolder(): %s", bin2hex($hierarchyRows[0][PR_ENTRYID])));
-				// put found id in redis
-				if ($devid) {
-					$this->setDeviceUserData($this->userDeviceData, bin2hex($hierarchyRows[0][PR_ENTRYID]), $devid, $this->mainUser, "statefolder");
-				}
-			}
-			elseif ($rowCnt == 0) {
-				// legacy code: create the hidden state folder and the device subfolder
-				// this should happen when the user configures the device (autodiscover or first sync if no autodiscover)
-
-				$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
-				$restriction = $this->getStateFolderRestriction(STORE_STATE_FOLDER);
-				mapi_table_restrict($hierarchy, $restriction);
-				$rowCnt = mapi_table_getrowcount($hierarchy);
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->getStateFolder(): found %d store state folders", $rowCnt));
-				if ($rowCnt == 1) {
-					$hierarchyRows = mapi_table_queryrows($hierarchy, [PR_ENTRYID], 0, 1);
-					$stateFolder = mapi_msgstore_openentry($this->store, $hierarchyRows[0][PR_ENTRYID]);
-				}
-				elseif ($rowCnt == 0) {
-					$stateFolder = mapi_folder_createfolder($rootfolder, STORE_STATE_FOLDER, "");
-					mapi_setprops($stateFolder, [PR_ATTR_HIDDEN => true]);
-				}
-
-				// TODO: handle this
-
-				if (isset($stateFolder) && $stateFolder) {
-					$devStateFolder = mapi_folder_createfolder($stateFolder, $devid, "");
-					$devStateFolderProps = mapi_getprops($devStateFolder);
-					$this->stateFolder = mapi_msgstore_openentry($this->store, $devStateFolderProps[PR_ENTRYID]);
-					mapi_setprops($this->stateFolder, [PR_ATTR_HIDDEN => true]);
-					// we don't cache the entryid in redis, because this will happen on the next request anyway
-				}
-
-				// TODO: unable to create state folder - throw exception
-			}
-
-			// This case is rather unlikely that there would be several
-				// hidden folders having PR_DISPLAY_NAME the same as device id.
-
-				// TODO: get the hierarchy table again, get entry id of STORE_STATE_FOLDER
-				// and compare it to the parent id of those folders.
-		}
-
-		return $this->stateFolder;
-	}
-
-	/**
-	 * Returns the associated MAPIMessage which contains the state information.
-	 *
-	 * @param string $devid   the device id
-	 * @param string $type    the state type
-	 * @param string $key     (opt)
-	 * @param string $counter state counter
-	 *
-	 * @throws StateNotFoundException
-	 *
-	 * @return MAPIMessage
-	 */
-	private function getStateMessage($devid, $type, $key, $counter) {
-		if (!$this->stateFolder) {
-			$this->getStateFolder(Request::GetDeviceID());
-			if (!$this->stateFolder) {
-				throw new StateNotFoundException(sprintf(
-					"Grommunio->getStateMessage(): Could not locate the state folder for device '%s'",
-					$devid
-				));
-			}
-		}
-		$messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
-		$restriction = $this->getStateMessageRestriction($messageName, $counter, true);
-		$stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
-		if ($stateFolderContents) {
-			mapi_table_restrict($stateFolderContents, $restriction);
-			$rowCnt = mapi_table_getrowcount($stateFolderContents);
-			if ($rowCnt == 1) {
-				$stateFolderRows = mapi_table_queryrows($stateFolderContents, [PR_ENTRYID], 0, 1);
-
-				return mapi_msgstore_openentry($this->store, $stateFolderRows[0][PR_ENTRYID]);
-			}
-			if ($rowCnt > 1) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getStateMessage(): Found several (%d) states for '%s'", $rowCnt, $messageName));
-			}
-		}
-
-		throw new StateNotFoundException(sprintf(
-			"Grommunio->getStateMessage(): Could not locate the state message '%s-%s'",
-			$messageName,
-			Utils::PrintAsString($counter)
-		));
-	}
-
-	/**
-	 * Writes ta state to for a key and counter.
-	 *
-	 * @param mixed  $state
-	 * @param string $devid   the device id
-	 * @param string $type    the state type
-	 * @param string $key     (opt)
-	 * @param int    $counter (opt)
-	 *
-	 * @throws StateInvalidException, UnavailableException
-	 *
-	 * @return bool
-	 */
-	private function setStateMessage($state, $devid, $type, $key = false, $counter = false) {
-		if (!$this->stateFolder) {
-			throw new StateNotFoundException(sprintf("Grommunio->setStateMessage(): Could not locate the state folder for device '%s'", $devid));
-		}
-
-		try {
-			$stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
-		}
-		catch (StateNotFoundException $e) {
-			// if message is not available, try to create a new one
-			$stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));
-
-			$messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): creating new state message '%s-%d'", $messageName, is_int($counter) ? $counter : 0));
-			mapi_setprops($stateMessage, [PR_DISPLAY_NAME => $messageName, PR_MESSAGE_CLASS => 'IPM.Note.GrommunioState']);
-		}
-		if (isset($stateMessage)) {
-			$jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_UNICODE) : $state;
-
-			$encodedState = base64_encode($jsonEncodedState);
-			$encodedStateLength = strlen($encodedState);
-			mapi_setprops($stateMessage, [PR_LAST_VERB_EXECUTED => is_int($counter) ? $counter : 0]);
-			$stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE | MAPI_MODIFY);
-			mapi_stream_setsize($stream, $encodedStateLength);
-			mapi_stream_write($stream, $encodedState);
-			mapi_stream_commit($stream);
-			mapi_savechanges($stateMessage);
-
-			return $encodedStateLength;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the restriction for the state folder name.
-	 *
-	 * @param string $folderName the state folder name
-	 *
-	 * @return array
-	 */
-	private function getStateFolderRestriction($folderName) {
-		return [RES_AND, [
-			[RES_PROPERTY,
-				[RELOP => RELOP_EQ,
-					ULPROPTAG => PR_DISPLAY_NAME,
-					VALUE => $folderName,
-				],
-			],
-			[RES_PROPERTY,
-				[RELOP => RELOP_EQ,
-					ULPROPTAG => PR_ATTR_HIDDEN,
-					VALUE => true,
-				],
-			],
-		]];
-	}
-
-	/**
-	 * Returns the restriction for the associated message in the state folder.
-	 *
-	 * @param string $messageName     the message name
-	 * @param string $counter         counter
-	 * @param string $thisCounterOnly (opt) if provided, restrict to the exact counter
-	 *
-	 * @return array
-	 */
-	private function getStateMessageRestriction($messageName, $counter, $thisCounterOnly = false) {
-		return [RES_AND, [
-			[RES_PROPERTY,
-				[RELOP => RELOP_EQ,
-					ULPROPTAG => PR_DISPLAY_NAME,
-					VALUE => $messageName,
-				],
-			],
-			[RES_PROPERTY,
-				[RELOP => RELOP_EQ,
-					ULPROPTAG => PR_MESSAGE_CLASS,
-					VALUE => 'IPM.Note.GrommunioState',
-				],
-			],
-			[RES_PROPERTY,
-				[RELOP => $thisCounterOnly ? RELOP_EQ : RELOP_LT,
-					ULPROPTAG => PR_LAST_VERB_EXECUTED,
-					VALUE => $counter,
-				],
-			],
-		]];
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+    /**
+     * Gets a hash value indicating the latest dataset of the named
+     * state with a specified key and counter.
+     * If the state is changed between two calls of this method
+     * the returned hash should be different.
+     *
+     * @param string $devid   the device id
+     * @param string $type    the state type
+     * @param string $key     (opt)
+     * @param string $counter (opt)
+     *
+     * @throws StateNotFoundException
+     *
+     * @return string
+     */
+    public function GetStateHash($devid, $type, $key = false, $counter = false) {
+        try {
+            $stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
+            $stateMessageProps = mapi_getprops($stateMessage, [PR_LAST_MODIFICATION_TIME]);
+            if (isset($stateMessageProps[PR_LAST_MODIFICATION_TIME])) {
+                return $stateMessageProps[PR_LAST_MODIFICATION_TIME];
+            }
+        }
+        catch (StateNotFoundException $e) {
+        }
+
+        return "0";
+    }
+
+    /**
+     * Gets a state for a specified key and counter.
+     * This method should call IStateMachine->CleanStates()
+     * to remove older states (same key, previous counters).
+     *
+     * @param string $devid       the device id
+     * @param string $type        the state type
+     * @param string $key         (opt)
+     * @param string $counter     (opt)
+     * @param string $cleanstates (opt)
+     *
+     * @throws StateNotFoundException, StateInvalidException, UnavailableException
+     *
+     * @return mixed
+     */
+    public function GetState($devid, $type, $key = false, $counter = false, $cleanstates = true) {
+        if ($counter && $cleanstates) {
+            $this->CleanStates($devid, $type, $key, $counter);
+            // also clean Failsave state for previous counter
+            if ($key == false) {
+                $this->CleanStates($devid, $type, IStateMachine::FAILSAVE, $counter);
+            }
+        }
+        $stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
+        $state = base64_decode(MAPIUtils::readPropStream($stateMessage, PR_BODY));
+
+        if ($state && $state[0] === '{') {
+            $jsonDec = json_decode($state);
+            if (isset($jsonDec->gsSyncStateClass)) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetState(): top class '%s'", $jsonDec->gsSyncStateClass));
+                $gsObj = new $jsonDec->gsSyncStateClass();
+                $gsObj->jsonDeserialize($jsonDec);
+                $gsObj->postUnserialize();
+            }
+        }
+
+        return isset($gsObj) && is_object($gsObj) ? $gsObj : $state;
+    }
+
+    /**
+     * Writes ta state to for a key and counter.
+     *
+     * @param mixed  $state
+     * @param string $devid   the device id
+     * @param string $type    the state type
+     * @param string $key     (opt)
+     * @param int    $counter (opt)
+     *
+     * @throws StateInvalidException, UnavailableException
+     *
+     * @return bool
+     */
+    public function SetState($state, $devid, $type, $key = false, $counter = false) {
+        return $this->setStateMessage($state, $devid, $type, $key, $counter);
+    }
+
+    /**
+     * Cleans up all older states.
+     * If called with a $counter, all states previous state counter can be removed.
+     * If additionally the $thisCounterOnly flag is true, only that specific counter will be removed.
+     * If called without $counter, all keys (independently from the counter) can be removed.
+     *
+     * @param string $devid           the device id
+     * @param string $type            the state type
+     * @param string $key
+     * @param string $counter         (opt)
+     * @param string $thisCounterOnly (opt) if provided, the exact counter only will be removed
+     *
+     * @throws StateInvalidException
+     *
+     * @return
+     */
+    public function CleanStates($devid, $type, $key, $counter = false, $thisCounterOnly = false) {
+        if (!$this->stateFolder) {
+            $this->getStateFolder($devid);
+            if (!$this->stateFolder) {
+                throw new StateNotFoundException(sprintf(
+                    "Grommunio->getStateMessage(): Could not locate the state folder for device '%s'",
+                    $devid
+                ));
+            }
+        }
+        $messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
+        $restriction = $this->getStateMessageRestriction($messageName, $counter, $thisCounterOnly);
+        $stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
+        if ($stateFolderContents) {
+            mapi_table_restrict($stateFolderContents, $restriction);
+            $rowCnt = mapi_table_getrowcount($stateFolderContents);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->CleanStates(): Found %d states to clean (%s)", $rowCnt, $messageName));
+            if ($rowCnt > 0) {
+                $rows = mapi_table_queryallrows($stateFolderContents, [PR_ENTRYID]);
+                $entryids = [];
+                foreach ($rows as $row) {
+                    $entryids[] = $row[PR_ENTRYID];
+                }
+                mapi_folder_deletemessages($this->stateFolder, $entryids, DELETE_HARD_DELETE);
+            }
+        }
+    }
+
+    /**
+     * Links a user to a device.
+     *
+     * @param string $username
+     * @param string $devid
+     *
+     * @return bool indicating if the user was added or not (existed already)
+     */
+    public function LinkUserDevice($username, $devid) {
+        $device = [$devid => time()];
+        $this->setDeviceUserData($this->type, $device, $username, -1, $subkey = -1, $doCas = "merge");
+
+        return false;
+    }
+
+    /**
+     * Unlinks a device from a user.
+     *
+     * @param string $username
+     * @param string $devid
+     *
+     * @return bool
+     */
+    public function UnLinkUserDevice($username, $devid) {
+        // TODO: Implement
+        return false;
+    }
+
+    /**
+     * Returns the current version of the state files
+     * grommunio:  This is not relevant atm. IStateMachine::STATEVERSION_02 will match GSync::GetLatestStateVersion().
+     *          If it might be required to update states in the future, this could be implemented on a store level,
+     *          where states are then migrated "on-the-fly"
+     *          or
+     *          in a global settings where all states in all stores are migrated once.
+     *
+     * @return int
+     */
+    public function GetStateVersion() {
+        return IStateMachine::STATEVERSION_02;
+    }
+
+    /**
+     * Sets the current version of the state files.
+     *
+     * @param int $version the new supported version
+     *
+     * @return bool
+     */
+    public function SetStateVersion($version) {
+        return true;
+    }
+
+    /**
+     * Returns MAPIFolder object which contains the state information.
+     * Creates this folder if it is not available yet.
+     *
+     * @param string $devid the device id
+     *
+     * @return MAPIFolder
+     */
+    private function getStateFolder($devid) {
+        // Options request doesn't send device id
+        if (strlen($devid) == 0) {
+            return false;
+        }
+        // Try to get the state folder id from redis
+        if (!$this->stateFolder) {
+            $folderentryid = $this->getDeviceUserData($this->userDeviceData, $devid, $this->mainUser, "statefolder");
+            if ($folderentryid) {
+                $this->stateFolder = mapi_msgstore_openentry($this->store, hex2bin($folderentryid));
+            }
+        }
+
+        // fallback code
+        if (!$this->stateFolder) {
+            SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->getStateFolder(): state folder not set. Use fallback"));
+            $rootfolder = mapi_msgstore_openentry($this->store);
+            $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+            $restriction = $this->getStateFolderRestriction($devid);
+            // restrict the hierarchy to the grommunio-sync search folder only
+            mapi_table_restrict($hierarchy, $restriction);
+            $rowCnt = mapi_table_getrowcount($hierarchy);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->getStateFolder(): found %d device state folders", $rowCnt));
+            if ($rowCnt == 1) {
+                $hierarchyRows = mapi_table_queryrows($hierarchy, [PR_ENTRYID], 0, 1);
+                $this->stateFolder = mapi_msgstore_openentry($this->store, $hierarchyRows[0][PR_ENTRYID]);
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->getStateFolder(): %s", bin2hex($hierarchyRows[0][PR_ENTRYID])));
+                // put found id in redis
+                if ($devid) {
+                    $this->setDeviceUserData($this->userDeviceData, bin2hex($hierarchyRows[0][PR_ENTRYID]), $devid, $this->mainUser, "statefolder");
+                }
+            }
+            elseif ($rowCnt == 0) {
+                // legacy code: create the hidden state folder and the device subfolder
+                // this should happen when the user configures the device (autodiscover or first sync if no autodiscover)
+
+                $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+                $restriction = $this->getStateFolderRestriction(STORE_STATE_FOLDER);
+                mapi_table_restrict($hierarchy, $restriction);
+                $rowCnt = mapi_table_getrowcount($hierarchy);
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->getStateFolder(): found %d store state folders", $rowCnt));
+                if ($rowCnt == 1) {
+                    $hierarchyRows = mapi_table_queryrows($hierarchy, [PR_ENTRYID], 0, 1);
+                    $stateFolder = mapi_msgstore_openentry($this->store, $hierarchyRows[0][PR_ENTRYID]);
+                }
+                elseif ($rowCnt == 0) {
+                    $stateFolder = mapi_folder_createfolder($rootfolder, STORE_STATE_FOLDER, "");
+                    mapi_setprops($stateFolder, [PR_ATTR_HIDDEN => true]);
+                }
+
+                // TODO: handle this
+
+                if (isset($stateFolder) && $stateFolder) {
+                    $devStateFolder = mapi_folder_createfolder($stateFolder, $devid, "");
+                    $devStateFolderProps = mapi_getprops($devStateFolder);
+                    $this->stateFolder = mapi_msgstore_openentry($this->store, $devStateFolderProps[PR_ENTRYID]);
+                    mapi_setprops($this->stateFolder, [PR_ATTR_HIDDEN => true]);
+                    // we don't cache the entryid in redis, because this will happen on the next request anyway
+                }
+
+                // TODO: unable to create state folder - throw exception
+            }
+
+            // This case is rather unlikely that there would be several
+                // hidden folders having PR_DISPLAY_NAME the same as device id.
+
+                // TODO: get the hierarchy table again, get entry id of STORE_STATE_FOLDER
+                // and compare it to the parent id of those folders.
+        }
+
+        return $this->stateFolder;
+    }
+
+    /**
+     * Returns the associated MAPIMessage which contains the state information.
+     *
+     * @param string $devid   the device id
+     * @param string $type    the state type
+     * @param string $key     (opt)
+     * @param string $counter state counter
+     *
+     * @throws StateNotFoundException
+     *
+     * @return MAPIMessage
+     */
+    private function getStateMessage($devid, $type, $key, $counter) {
+        if (!$this->stateFolder) {
+            $this->getStateFolder(Request::GetDeviceID());
+            if (!$this->stateFolder) {
+                throw new StateNotFoundException(sprintf(
+                    "Grommunio->getStateMessage(): Could not locate the state folder for device '%s'",
+                    $devid
+                ));
+            }
+        }
+        $messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
+        $restriction = $this->getStateMessageRestriction($messageName, $counter, true);
+        $stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
+        if ($stateFolderContents) {
+            mapi_table_restrict($stateFolderContents, $restriction);
+            $rowCnt = mapi_table_getrowcount($stateFolderContents);
+            if ($rowCnt == 1) {
+                $stateFolderRows = mapi_table_queryrows($stateFolderContents, [PR_ENTRYID], 0, 1);
+
+                return mapi_msgstore_openentry($this->store, $stateFolderRows[0][PR_ENTRYID]);
+            }
+            if ($rowCnt > 1) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getStateMessage(): Found several (%d) states for '%s'", $rowCnt, $messageName));
+            }
+        }
+
+        throw new StateNotFoundException(sprintf(
+            "Grommunio->getStateMessage(): Could not locate the state message '%s-%s'",
+            $messageName,
+            Utils::PrintAsString($counter)
+        ));
+    }
+
+    /**
+     * Writes ta state to for a key and counter.
+     *
+     * @param mixed  $state
+     * @param string $devid   the device id
+     * @param string $type    the state type
+     * @param string $key     (opt)
+     * @param int    $counter (opt)
+     *
+     * @throws StateInvalidException, UnavailableException
+     *
+     * @return bool
+     */
+    private function setStateMessage($state, $devid, $type, $key = false, $counter = false) {
+        if (!$this->stateFolder) {
+            throw new StateNotFoundException(sprintf("Grommunio->setStateMessage(): Could not locate the state folder for device '%s'", $devid));
+        }
+
+        try {
+            $stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
+        }
+        catch (StateNotFoundException $e) {
+            // if message is not available, try to create a new one
+            $stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));
+
+            $messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): creating new state message '%s-%d'", $messageName, is_int($counter) ? $counter : 0));
+            mapi_setprops($stateMessage, [PR_DISPLAY_NAME => $messageName, PR_MESSAGE_CLASS => 'IPM.Note.GrommunioState']);
+        }
+        if (isset($stateMessage)) {
+            $jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_UNICODE) : $state;
+
+            $encodedState = base64_encode($jsonEncodedState);
+            $encodedStateLength = strlen($encodedState);
+            mapi_setprops($stateMessage, [PR_LAST_VERB_EXECUTED => is_int($counter) ? $counter : 0]);
+            $stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE | MAPI_MODIFY);
+            mapi_stream_setsize($stream, $encodedStateLength);
+            mapi_stream_write($stream, $encodedState);
+            mapi_stream_commit($stream);
+            mapi_savechanges($stateMessage);
+
+            return $encodedStateLength;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the restriction for the state folder name.
+     *
+     * @param string $folderName the state folder name
+     *
+     * @return array
+     */
+    private function getStateFolderRestriction($folderName) {
+        return [RES_AND, [
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
+                    ULPROPTAG => PR_DISPLAY_NAME,
+                    VALUE => $folderName,
+                ],
+            ],
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
+                    ULPROPTAG => PR_ATTR_HIDDEN,
+                    VALUE => true,
+                ],
+            ],
+        ]];
+    }
+
+    /**
+     * Returns the restriction for the associated message in the state folder.
+     *
+     * @param string $messageName     the message name
+     * @param string $counter         counter
+     * @param string $thisCounterOnly (opt) if provided, restrict to the exact counter
+     *
+     * @return array
+     */
+    private function getStateMessageRestriction($messageName, $counter, $thisCounterOnly = false) {
+        return [RES_AND, [
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
+                    ULPROPTAG => PR_DISPLAY_NAME,
+                    VALUE => $messageName,
+                ],
+            ],
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
+                    ULPROPTAG => PR_MESSAGE_CLASS,
+                    VALUE => 'IPM.Note.GrommunioState',
+                ],
+            ],
+            [RES_PROPERTY,
+                [RELOP => $thisCounterOnly ? RELOP_EQ : RELOP_LT,
+                    ULPROPTAG => PR_LAST_VERB_EXECUTED,
+                    VALUE => $counter,
+                ],
+            ],
+        ]];
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * Private methods
 	 */
 
-	/**
-	 * Returns a hash representing changes in the hierarchy of the main user.
-	 * It changes if a folder is added, renamed or deleted.
-	 *
-	 * @return string
-	 */
-	private function getHierarchyHash() {
-		$rootfolder = mapi_msgstore_openentry($this->defaultstore);
-		$hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
-
-		return md5(serialize(mapi_table_queryallrows($hierarchy, [PR_DISPLAY_NAME, PR_PARENT_ENTRYID])));
-	}
-
-	/**
-	 * Advises a store to the changes sink.
-	 *
-	 * @param mapistore $store store to be advised
-	 *
-	 * @return bool
-	 */
-	private function adviseStoreToSink($store) {
-		// check if we already advised the store
-		if (!in_array($store, $this->changesSinkStores)) {
-			mapi_msgstore_advise($store, null, fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink);
-
-			if (mapi_last_hresult()) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->adviseStoreToSink(): failed to advised store '%s' with code 0x%X. Polling will be performed.", $store, mapi_last_hresult()));
-
-				return false;
-			}
-
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->adviseStoreToSink(): advised store '%s'", $store));
-			$this->changesSinkStores[] = $store;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Open the store marked with PR_DEFAULT_STORE = TRUE
-	 * if $return_public is set, the public store is opened.
-	 *
-	 * @param string $user User which store should be opened
-	 *
-	 * @return bool
-	 */
-	private function openMessageStore($user) {
-		// During PING requests the operations store has to be switched constantly
-		// the cache prevents the same store opened several times
-		if (isset($this->storeCache[$user])) {
-			return $this->storeCache[$user];
-		}
-
-		$entryid = false;
-		$return_public = false;
-
-		if (strtoupper($user) == 'SYSTEM') {
-			$return_public = true;
-		}
-
-		// loop through the storestable if authenticated user of public folder
-		if ($user == $this->mainUser || $return_public === true) {
-			// Find the default store
-			$storestables = mapi_getmsgstorestable($this->session);
-			$result = mapi_last_hresult();
-
-			if ($result == NOERROR) {
-				$rows = mapi_table_queryallrows($storestables, [PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER]);
-
-				foreach ($rows as $row) {
-					if (!$return_public && isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE] == true) {
-						$entryid = $row[PR_ENTRYID];
-
-						break;
-					}
-					if ($return_public && isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
-						$entryid = $row[PR_ENTRYID];
-
-						break;
-					}
-				}
-			}
-		}
-		else {
-			$entryid = @mapi_msgstore_createentryid($this->defaultstore, $user);
-		}
-
-		if ($entryid) {
-			$store = @mapi_openmsgstore($this->session, $entryid);
-
-			if (!$store) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->openMessageStore('%s'): Could not open store", $user));
-
-				return false;
-			}
-
-			// add this store to the cache
-			if (!isset($this->storeCache[$user])) {
-				$this->storeCache[$user] = $store;
-			}
-
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->openMessageStore('%s'): Found '%s' store: '%s'", $user, (($return_public) ? 'PUBLIC' : 'DEFAULT'), $store));
-
-			return $store;
-		}
-
-		SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->openMessageStore('%s'): No store found for this user", $user));
-
-		return false;
-	}
-
-	/**
-	 * Checks if the logged in user has secretary permissions on a folder.
-	 *
-	 * @param resource $store
-	 * @param string   $folderid
-	 * @param mixed    $entryid
-	 *
-	 * @return bool
-	 */
-	public function HasSecretaryACLs($store, $folderid, $entryid = false) {
-		if (!$entryid) {
-			$entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($folderid));
-			if (!$entryid) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->HasSecretaryACLs(): error, no entryid resolved for %s on store %s", $folderid, $store));
-
-				return false;
-			}
-		}
-
-		$folder = mapi_msgstore_openentry($store, $entryid);
-		if (!$folder) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->HasSecretaryACLs(): error, could not open folder with entryid %s on store %s", bin2hex($entryid), $store));
-
-			return false;
-		}
-
-		$props = mapi_getprops($folder, [PR_RIGHTS]);
-		if (isset($props[PR_RIGHTS]) &&
-			($props[PR_RIGHTS] & ecRightsReadAny) &&
-			($props[PR_RIGHTS] & ecRightsCreate) &&
-			($props[PR_RIGHTS] & ecRightsEditOwned) &&
-			($props[PR_RIGHTS] & ecRightsDeleteOwned) &&
-			($props[PR_RIGHTS] & ecRightsEditAny) &&
-			($props[PR_RIGHTS] & ecRightsDeleteAny) &&
-			($props[PR_RIGHTS] & ecRightsFolderVisible)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * The meta function for out of office settings.
-	 *
-	 * @param SyncObject $oof
-	 */
-	private function settingsOOF(&$oof) {
-		// if oof state is set it must be set of oof and get otherwise
-		if (isset($oof->oofstate)) {
-			$this->settingsOofSet($oof);
-		}
-		else {
-			$this->settingsOofGet($oof);
-		}
-	}
-
-	/**
-	 * Gets the out of office settings.
-	 *
-	 * @param SyncObject $oof
-	 */
-	private function settingsOofGet(&$oof) {
-		$oofprops = mapi_getprops($this->defaultstore, [PR_EC_OUTOFOFFICE, PR_EC_OUTOFOFFICE_MSG, PR_EC_OUTOFOFFICE_SUBJECT, PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL]);
-		$oof->oofstate = SYNC_SETTINGSOOF_DISABLED;
-		$oof->Status = SYNC_SETTINGSSTATUS_SUCCESS;
-		if ($oofprops != false) {
-			$oof->oofstate = isset($oofprops[PR_EC_OUTOFOFFICE]) ? ($oofprops[PR_EC_OUTOFOFFICE] ? SYNC_SETTINGSOOF_GLOBAL : SYNC_SETTINGSOOF_DISABLED) : SYNC_SETTINGSOOF_DISABLED;
-			// TODO external and external unknown
-			$oofmessage = new SyncOOFMessage();
-			$oofmessage->appliesToInternal = "";
-			$oofmessage->enabled = $oof->oofstate;
-			$oofmessage->replymessage = (isset($oofprops[PR_EC_OUTOFOFFICE_MSG])) ? w2u($oofprops[PR_EC_OUTOFOFFICE_MSG]) : "";
-			$oofmessage->bodytype = $oof->bodytype;
-			unset($oofmessage->appliesToExternal, $oofmessage->appliesToExternalUnknown);
-			$oof->oofmessage[] = $oofmessage;
-
-			// check whether time based out of office is set
-			if ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && isset($oofprops[PR_EC_OUTOFOFFICE_FROM], $oofprops[PR_EC_OUTOFOFFICE_UNTIL])) {
-				$now = time();
-				if ($now > $oofprops[PR_EC_OUTOFOFFICE_FROM] && $now > $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
-					// Out of office is set but the date is in the past. Set the state to disabled.
-					// @see https://jira.z-hub.io/browse/ZP-1188 for details
-					$oof->oofstate = SYNC_SETTINGSOOF_DISABLED;
-					@mapi_setprops($this->defaultstore, [PR_EC_OUTOFOFFICE => false]);
-					@mapi_deleteprops($this->defaultstore, [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL]);
-					SLog::Write(LOGLEVEL_INFO, "Grommunio->settingsOofGet(): Out of office is set but the from and until are in the past. Disabling out of office.");
-				}
-				elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
-					$oof->oofstate = SYNC_SETTINGSOOF_TIMEBASED;
-					$oof->starttime = $oofprops[PR_EC_OUTOFOFFICE_FROM];
-					$oof->endtime = $oofprops[PR_EC_OUTOFOFFICE_UNTIL];
-				}
-				else {
-					SLog::Write(LOGLEVEL_WARN, sprintf(
-						"Grommunio->settingsOofGet(): Time based out of office set but end time ('%s') is before startime ('%s').",
-						date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]),
-						date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_UNTIL])
-					));
-					$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
-				}
-			}
-			elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
-				SLog::Write(LOGLEVEL_WARN, sprintf(
-					"Grommunio->settingsOofGet(): Time based out of office set but either start time ('%s') or end time ('%s') is missing.",
-					(isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]) : 'empty'),
-					(isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) : 'empty')
-				));
-				$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
-			}
-		}
-		else {
-			SLog::Write(LOGLEVEL_WARN, "Grommunio->Unable to get out of office information");
-		}
-
-		// unset body type for oof in order not to stream it
-		unset($oof->bodytype);
-	}
-
-	/**
-	 * Sets the out of office settings.
-	 *
-	 * @param SyncObject $oof
-	 */
-	private function settingsOofSet(&$oof) {
-		$oof->Status = SYNC_SETTINGSSTATUS_SUCCESS;
-		$props = [];
-		if ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL || $oof->oofstate == SYNC_SETTINGSOOF_TIMEBASED) {
-			$props[PR_EC_OUTOFOFFICE] = true;
-			foreach ($oof->oofmessage as $oofmessage) {
-				if (isset($oofmessage->appliesToInternal)) {
-					$props[PR_EC_OUTOFOFFICE_MSG] = isset($oofmessage->replymessage) ? u2w($oofmessage->replymessage) : "";
-					$props[PR_EC_OUTOFOFFICE_SUBJECT] = "Out of office";
-				}
-			}
-			if ($oof->oofstate == SYNC_SETTINGSOOF_TIMEBASED) {
-				if (isset($oof->starttime, $oof->endtime)) {
-					$props[PR_EC_OUTOFOFFICE_FROM] = $oof->starttime;
-					$props[PR_EC_OUTOFOFFICE_UNTIL] = $oof->endtime;
-				}
-				elseif (isset($oof->starttime) || isset($oof->endtime)) {
-					$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
-				}
-			}
-			else {
-				$deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
-			}
-		}
-		elseif ($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
-			$props[PR_EC_OUTOFOFFICE] = false;
-			$deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
-		}
-
-		if (!empty($props)) {
-			@mapi_setprops($this->defaultstore, $props);
-			$result = mapi_last_hresult();
-			if ($result != NOERROR) {
-				SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->settingsOofSet(): Setting oof information failed (%X)", $result));
-
-				return false;
-			}
-		}
-
-		if (!empty($deleteProps)) {
-			@mapi_deleteprops($this->defaultstore, $deleteProps);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Gets the user's email address from server.
-	 *
-	 * @param SyncObject $userinformation
-	 */
-	private function settingsUserInformation(&$userinformation) {
-		if (!isset($this->defaultstore) || !isset($this->mainUser)) {
-			SLog::Write(LOGLEVEL_ERROR, "Grommunio->settingsUserInformation(): The store or user are not available for getting user information");
-
-			return false;
-		}
-		$user = nsp_getuserinfo($this->mainUser);
-		if ($user != false) {
-			$userinformation->Status = SYNC_SETTINGSSTATUS_USERINFO_SUCCESS;
-			if (Request::GetProtocolVersion() >= 14.1) {
-				$account = new SyncAccount();
-				$emailaddresses = new SyncEmailAddresses();
-				$emailaddresses->smtpaddress[] = $user["primary_email"];
-				$emailaddresses->primarysmtpaddress = $user["primary_email"];
-				$account->emailaddresses = $emailaddresses;
-				$userinformation->accounts[] = $account;
-			}
-			else {
-				$userinformation->emailaddresses[] = $user["primary_email"];
-			}
-
-			return true;
-		}
-		SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->settingsUserInformation(): Getting user information failed: nsp_getuserinfo(%X)", mapi_last_hresult()));
-
-		return false;
-	}
-
-	/**
-	 * Gets the rights management templates from the server.
-	 *
-	 * @param SyncObject $rmTemplates
-	 */
-	private function settingsRightsManagementTemplates(&$rmTemplates) {
-		/* Currently there is no information rights management feature in
+    /**
+     * Returns a hash representing changes in the hierarchy of the main user.
+     * It changes if a folder is added, renamed or deleted.
+     *
+     * @return string
+     */
+    private function getHierarchyHash() {
+        $rootfolder = mapi_msgstore_openentry($this->defaultstore);
+        $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+
+        return md5(serialize(mapi_table_queryallrows($hierarchy, [PR_DISPLAY_NAME, PR_PARENT_ENTRYID])));
+    }
+
+    /**
+     * Advises a store to the changes sink.
+     *
+     * @param mapistore $store store to be advised
+     *
+     * @return bool
+     */
+    private function adviseStoreToSink($store) {
+        // check if we already advised the store
+        if (!in_array($store, $this->changesSinkStores)) {
+            mapi_msgstore_advise($store, null, fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink);
+
+            if (mapi_last_hresult()) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->adviseStoreToSink(): failed to advised store '%s' with code 0x%X. Polling will be performed.", $store, mapi_last_hresult()));
+
+                return false;
+            }
+
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->adviseStoreToSink(): advised store '%s'", $store));
+            $this->changesSinkStores[] = $store;
+        }
+
+        return true;
+    }
+
+    /**
+     * Open the store marked with PR_DEFAULT_STORE = TRUE
+     * if $return_public is set, the public store is opened.
+     *
+     * @param string $user User which store should be opened
+     *
+     * @return bool
+     */
+    private function openMessageStore($user) {
+        // During PING requests the operations store has to be switched constantly
+        // the cache prevents the same store opened several times
+        if (isset($this->storeCache[$user])) {
+            return $this->storeCache[$user];
+        }
+
+        $entryid = false;
+        $return_public = false;
+
+        if (strtoupper($user) == 'SYSTEM') {
+            $return_public = true;
+        }
+
+        // loop through the storestable if authenticated user of public folder
+        if ($user == $this->mainUser || $return_public === true) {
+            // Find the default store
+            $storestables = mapi_getmsgstorestable($this->session);
+            $result = mapi_last_hresult();
+
+            if ($result == NOERROR) {
+                $rows = mapi_table_queryallrows($storestables, [PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER]);
+
+                foreach ($rows as $row) {
+                    if (!$return_public && isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE] == true) {
+                        $entryid = $row[PR_ENTRYID];
+
+                        break;
+                    }
+                    if ($return_public && isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
+                        $entryid = $row[PR_ENTRYID];
+
+                        break;
+                    }
+                }
+            }
+        }
+        else {
+            $entryid = @mapi_msgstore_createentryid($this->defaultstore, $user);
+        }
+
+        if ($entryid) {
+            $store = @mapi_openmsgstore($this->session, $entryid);
+
+            if (!$store) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->openMessageStore('%s'): Could not open store", $user));
+
+                return false;
+            }
+
+            // add this store to the cache
+            if (!isset($this->storeCache[$user])) {
+                $this->storeCache[$user] = $store;
+            }
+
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->openMessageStore('%s'): Found '%s' store: '%s'", $user, (($return_public) ? 'PUBLIC' : 'DEFAULT'), $store));
+
+            return $store;
+        }
+
+        SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->openMessageStore('%s'): No store found for this user", $user));
+
+        return false;
+    }
+
+    /**
+     * Checks if the logged in user has secretary permissions on a folder.
+     *
+     * @param resource $store
+     * @param string   $folderid
+     * @param mixed    $entryid
+     *
+     * @return bool
+     */
+    public function HasSecretaryACLs($store, $folderid, $entryid = false) {
+        if (!$entryid) {
+            $entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($folderid));
+            if (!$entryid) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->HasSecretaryACLs(): error, no entryid resolved for %s on store %s", $folderid, $store));
+
+                return false;
+            }
+        }
+
+        $folder = mapi_msgstore_openentry($store, $entryid);
+        if (!$folder) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->HasSecretaryACLs(): error, could not open folder with entryid %s on store %s", bin2hex($entryid), $store));
+
+            return false;
+        }
+
+        $props = mapi_getprops($folder, [PR_RIGHTS]);
+        if (isset($props[PR_RIGHTS]) &&
+            ($props[PR_RIGHTS] & ecRightsReadAny) &&
+            ($props[PR_RIGHTS] & ecRightsCreate) &&
+            ($props[PR_RIGHTS] & ecRightsEditOwned) &&
+            ($props[PR_RIGHTS] & ecRightsDeleteOwned) &&
+            ($props[PR_RIGHTS] & ecRightsEditAny) &&
+            ($props[PR_RIGHTS] & ecRightsDeleteAny) &&
+            ($props[PR_RIGHTS] & ecRightsFolderVisible)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * The meta function for out of office settings.
+     *
+     * @param SyncObject $oof
+     */
+    private function settingsOOF(&$oof) {
+        // if oof state is set it must be set of oof and get otherwise
+        if (isset($oof->oofstate)) {
+            $this->settingsOofSet($oof);
+        }
+        else {
+            $this->settingsOofGet($oof);
+        }
+    }
+
+    /**
+     * Gets the out of office settings.
+     *
+     * @param SyncObject $oof
+     */
+    private function settingsOofGet(&$oof) {
+        $oofprops = mapi_getprops($this->defaultstore, [PR_EC_OUTOFOFFICE, PR_EC_OUTOFOFFICE_MSG, PR_EC_OUTOFOFFICE_SUBJECT, PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL]);
+        $oof->oofstate = SYNC_SETTINGSOOF_DISABLED;
+        $oof->Status = SYNC_SETTINGSSTATUS_SUCCESS;
+        if ($oofprops != false) {
+            $oof->oofstate = isset($oofprops[PR_EC_OUTOFOFFICE]) ? ($oofprops[PR_EC_OUTOFOFFICE] ? SYNC_SETTINGSOOF_GLOBAL : SYNC_SETTINGSOOF_DISABLED) : SYNC_SETTINGSOOF_DISABLED;
+            // TODO external and external unknown
+            $oofmessage = new SyncOOFMessage();
+            $oofmessage->appliesToInternal = "";
+            $oofmessage->enabled = $oof->oofstate;
+            $oofmessage->replymessage = (isset($oofprops[PR_EC_OUTOFOFFICE_MSG])) ? w2u($oofprops[PR_EC_OUTOFOFFICE_MSG]) : "";
+            $oofmessage->bodytype = $oof->bodytype;
+            unset($oofmessage->appliesToExternal, $oofmessage->appliesToExternalUnknown);
+            $oof->oofmessage[] = $oofmessage;
+
+            // check whether time based out of office is set
+            if ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && isset($oofprops[PR_EC_OUTOFOFFICE_FROM], $oofprops[PR_EC_OUTOFOFFICE_UNTIL])) {
+                $now = time();
+                if ($now > $oofprops[PR_EC_OUTOFOFFICE_FROM] && $now > $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
+                    // Out of office is set but the date is in the past. Set the state to disabled.
+                    // @see https://jira.z-hub.io/browse/ZP-1188 for details
+                    $oof->oofstate = SYNC_SETTINGSOOF_DISABLED;
+                    @mapi_setprops($this->defaultstore, [PR_EC_OUTOFOFFICE => false]);
+                    @mapi_deleteprops($this->defaultstore, [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL]);
+                    SLog::Write(LOGLEVEL_INFO, "Grommunio->settingsOofGet(): Out of office is set but the from and until are in the past. Disabling out of office.");
+                }
+                elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
+                    $oof->oofstate = SYNC_SETTINGSOOF_TIMEBASED;
+                    $oof->starttime = $oofprops[PR_EC_OUTOFOFFICE_FROM];
+                    $oof->endtime = $oofprops[PR_EC_OUTOFOFFICE_UNTIL];
+                }
+                else {
+                    SLog::Write(LOGLEVEL_WARN, sprintf(
+                        "Grommunio->settingsOofGet(): Time based out of office set but end time ('%s') is before startime ('%s').",
+                        date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]),
+                        date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_UNTIL])
+                    ));
+                    $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
+                }
+            }
+            elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
+                SLog::Write(LOGLEVEL_WARN, sprintf(
+                    "Grommunio->settingsOofGet(): Time based out of office set but either start time ('%s') or end time ('%s') is missing.",
+                    (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]) : 'empty'),
+                    (isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) : 'empty')
+                ));
+                $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
+            }
+        }
+        else {
+            SLog::Write(LOGLEVEL_WARN, "Grommunio->Unable to get out of office information");
+        }
+
+        // unset body type for oof in order not to stream it
+        unset($oof->bodytype);
+    }
+
+    /**
+     * Sets the out of office settings.
+     *
+     * @param SyncObject $oof
+     */
+    private function settingsOofSet(&$oof) {
+        $oof->Status = SYNC_SETTINGSSTATUS_SUCCESS;
+        $props = [];
+        if ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL || $oof->oofstate == SYNC_SETTINGSOOF_TIMEBASED) {
+            $props[PR_EC_OUTOFOFFICE] = true;
+            foreach ($oof->oofmessage as $oofmessage) {
+                if (isset($oofmessage->appliesToInternal)) {
+                    $props[PR_EC_OUTOFOFFICE_MSG] = isset($oofmessage->replymessage) ? u2w($oofmessage->replymessage) : "";
+                    $props[PR_EC_OUTOFOFFICE_SUBJECT] = "Out of office";
+                }
+            }
+            if ($oof->oofstate == SYNC_SETTINGSOOF_TIMEBASED) {
+                if (isset($oof->starttime, $oof->endtime)) {
+                    $props[PR_EC_OUTOFOFFICE_FROM] = $oof->starttime;
+                    $props[PR_EC_OUTOFOFFICE_UNTIL] = $oof->endtime;
+                }
+                elseif (isset($oof->starttime) || isset($oof->endtime)) {
+                    $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
+                }
+            }
+            else {
+                $deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
+            }
+        }
+        elseif ($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
+            $props[PR_EC_OUTOFOFFICE] = false;
+            $deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
+        }
+
+        if (!empty($props)) {
+            @mapi_setprops($this->defaultstore, $props);
+            $result = mapi_last_hresult();
+            if ($result != NOERROR) {
+                SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->settingsOofSet(): Setting oof information failed (%X)", $result));
+
+                return false;
+            }
+        }
+
+        if (!empty($deleteProps)) {
+            @mapi_deleteprops($this->defaultstore, $deleteProps);
+        }
+
+        return true;
+    }
+
+    /**
+     * Gets the user's email address from server.
+     *
+     * @param SyncObject $userinformation
+     */
+    private function settingsUserInformation(&$userinformation) {
+        if (!isset($this->defaultstore) || !isset($this->mainUser)) {
+            SLog::Write(LOGLEVEL_ERROR, "Grommunio->settingsUserInformation(): The store or user are not available for getting user information");
+
+            return false;
+        }
+        $user = nsp_getuserinfo($this->mainUser);
+        if ($user != false) {
+            $userinformation->Status = SYNC_SETTINGSSTATUS_USERINFO_SUCCESS;
+            if (Request::GetProtocolVersion() >= 14.1) {
+                $account = new SyncAccount();
+                $emailaddresses = new SyncEmailAddresses();
+                $emailaddresses->smtpaddress[] = $user["primary_email"];
+                $emailaddresses->primarysmtpaddress = $user["primary_email"];
+                $account->emailaddresses = $emailaddresses;
+                $userinformation->accounts[] = $account;
+            }
+            else {
+                $userinformation->emailaddresses[] = $user["primary_email"];
+            }
+
+            return true;
+        }
+        SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->settingsUserInformation(): Getting user information failed: nsp_getuserinfo(%X)", mapi_last_hresult()));
+
+        return false;
+    }
+
+    /**
+     * Gets the rights management templates from the server.
+     *
+     * @param SyncObject $rmTemplates
+     */
+    private function settingsRightsManagementTemplates(&$rmTemplates) {
+        /* Currently there is no information rights management feature in
 		 * the grommunio backend, so just return the status and empty
 		 * SyncRightsManagementTemplates tag.
 		 * Once it's available, it would be something like:
@@ -2384,588 +2384,588 @@ 
 		$rmTemplate->description = "What does the template do. E.g. it disables forward and reply.";
 		$rmTemplates->rmtemplates[] = $rmTemplate;
 		 */
-		$rmTemplates->Status = SYNC_COMMONSTATUS_IRMFEATUREDISABLED;
-		$rmTemplates->rmtemplates = [];
-	}
-
-	/**
-	 * Sets the importance and priority of a message from a RFC822 message headers.
-	 *
-	 * @param int   $xPriority
-	 * @param array $mapiprops
-	 * @param mixed $sendMailProps
-	 */
-	private function getImportanceAndPriority($xPriority, &$mapiprops, $sendMailProps) {
-		switch ($xPriority) {
-			case 1:
-			case 2:
-				$priority = PRIO_URGENT;
-				$importance = IMPORTANCE_HIGH;
-				break;
-
-			case 4:
-			case 5:
-				$priority = PRIO_NONURGENT;
-				$importance = IMPORTANCE_LOW;
-				break;
-
-			case 3:
-			default:
-				$priority = PRIO_NORMAL;
-				$importance = IMPORTANCE_NORMAL;
-				break;
-		}
-		$mapiprops[$sendMailProps["importance"]] = $importance;
-		$mapiprops[$sendMailProps["priority"]] = $priority;
-	}
-
-	/**
-	 * Copies attachments from one message to another.
-	 *
-	 * @param MAPIMessage $toMessage
-	 * @param MAPIMessage $fromMessage
-	 */
-	private function copyAttachments(&$toMessage, $fromMessage) {
-		$attachtable = mapi_message_getattachmenttable($fromMessage);
-		$rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM]);
-
-		foreach ($rows as $row) {
-			if (isset($row[PR_ATTACH_NUM])) {
-				$attach = mapi_message_openattach($fromMessage, $row[PR_ATTACH_NUM]);
-				$newattach = mapi_message_createattach($toMessage);
-				mapi_copyto($attach, [], [], $newattach, 0);
-				mapi_savechanges($newattach);
-			}
-		}
-	}
-
-	/**
-	 * Function will create a search folder in FINDER_ROOT folder
-	 * if folder exists then it will open it.
-	 *
-	 * @see createSearchFolder($store, $openIfExists = true) function in the webaccess
-	 *
-	 * @return mapiFolderObject $folder created search folder
-	 */
-	private function getSearchFolder() {
-		// create new or open existing search folder
-		$searchFolderRoot = $this->getSearchFoldersRoot($this->store);
-		if ($searchFolderRoot === false) {
-			// error in finding search root folder
-			// or store doesn't support search folders
-			return false;
-		}
-
-		$searchFolder = $this->createSearchFolder($searchFolderRoot);
-
-		if ($searchFolder !== false && mapi_last_hresult() == NOERROR) {
-			return $searchFolder;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Function will open FINDER_ROOT folder in root container
-	 * public folder's don't have FINDER_ROOT folder.
-	 *
-	 * @see getSearchFoldersRoot($store) function in the webaccess
-	 *
-	 * @return mapiFolderObject root folder for search folders
-	 */
-	private function getSearchFoldersRoot() {
-		// check if we can create search folders
-		$storeProps = mapi_getprops($this->store, [PR_STORE_SUPPORT_MASK, PR_FINDER_ENTRYID]);
-		if (($storeProps[PR_STORE_SUPPORT_MASK] & STORE_SEARCH_OK) != STORE_SEARCH_OK) {
-			SLog::Write(LOGLEVEL_WARN, "Grommunio->getSearchFoldersRoot(): Store doesn't support search folders. Public store doesn't have FINDER_ROOT folder");
-
-			return false;
-		}
-
-		// open search folders root
-		$searchRootFolder = mapi_msgstore_openentry($this->store, $storeProps[PR_FINDER_ENTRYID]);
-		if (mapi_last_hresult() != NOERROR) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getSearchFoldersRoot(): Unable to open search folder (0x%X)", mapi_last_hresult()));
-
-			return false;
-		}
-
-		return $searchRootFolder;
-	}
-
-	/**
-	 * Creates a search folder if it not exists or opens an existing one
-	 * and returns it.
-	 *
-	 * @param mapiFolderObject $searchFolderRoot
-	 *
-	 * @return mapiFolderObject
-	 */
-	private function createSearchFolder($searchFolderRoot) {
-		$folderName = "grommunio-sync Search Folder " . @getmypid();
-		$searchFolders = mapi_folder_gethierarchytable($searchFolderRoot);
-		$restriction = [
-			RES_CONTENT,
-			[
-				FUZZYLEVEL => FL_PREFIX,
-				ULPROPTAG => PR_DISPLAY_NAME,
-				VALUE => [PR_DISPLAY_NAME => $folderName],
-			],
-		];
-		// restrict the hierarchy to the grommunio-sync search folder only
-		mapi_table_restrict($searchFolders, $restriction);
-		if (mapi_table_getrowcount($searchFolders)) {
-			$searchFolder = mapi_table_queryrows($searchFolders, [PR_ENTRYID], 0, 1);
-
-			return mapi_msgstore_openentry($this->store, $searchFolder[0][PR_ENTRYID]);
-		}
-
-		return mapi_folder_createfolder($searchFolderRoot, $folderName, null, 0, FOLDER_SEARCH);
-	}
-
-	/**
-	 * Creates a search restriction.
-	 *
-	 * @param ContentParameter $cpo
-	 *
-	 * @return array
-	 */
-	private function getSearchRestriction($cpo) {
-		$searchText = $cpo->GetSearchFreeText();
-
-		$searchGreater = strtotime($cpo->GetSearchValueGreater());
-		$searchLess = strtotime($cpo->GetSearchValueLess());
-
-		if (version_compare(phpversion(), '5.3.4') < 0) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getSearchRestriction(): Your system's PHP version (%s) might not correctly process unicode strings. Search containing such characters might not return correct results. It is recommended to update to at least PHP 5.3.4. See ZP-541 for more information.", phpversion()));
-		}
-		// split the search on whitespache and look for every word
-		$searchText = preg_split("/\\W+/u", $searchText);
-		$searchProps = [PR_BODY, PR_SUBJECT, PR_DISPLAY_TO, PR_DISPLAY_CC, PR_SENDER_NAME, PR_SENDER_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS];
-		$resAnd = [];
-		foreach ($searchText as $term) {
-			$resOr = [];
-
-			foreach ($searchProps as $property) {
-				array_push(
-					$resOr,
-					[RES_CONTENT,
-						[
-							FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
-							ULPROPTAG => $property,
-							VALUE => u2w($term),
-						],
-					]
-				);
-			}
-			array_push($resAnd, [RES_OR, $resOr]);
-		}
-
-		// add time range restrictions
-		if ($searchGreater) {
-			array_push($resAnd, [RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => PR_MESSAGE_DELIVERY_TIME, VALUE => [PR_MESSAGE_DELIVERY_TIME => $searchGreater]]]); // RES_AND;
-		}
-		if ($searchLess) {
-			array_push($resAnd, [RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => PR_MESSAGE_DELIVERY_TIME, VALUE => [PR_MESSAGE_DELIVERY_TIME => $searchLess]]]);
-		}
-
-		return [RES_AND, $resAnd];
-	}
-
-	/**
-	 * Resolve recipient based on his email address.
-	 *
-	 * @param string $to
-	 * @param int    $maxAmbiguousRecipients
-	 * @param bool   $expandDistlist
-	 *
-	 * @return bool|SyncResolveRecipient
-	 */
-	private function resolveRecipient($to, $maxAmbiguousRecipients, $expandDistlist = true) {
-		$recipient = $this->resolveRecipientGAL($to, $maxAmbiguousRecipients, $expandDistlist);
-
-		if ($recipient !== false) {
-			return $recipient;
-		}
-
-		$recipient = $this->resolveRecipientContact($to, $maxAmbiguousRecipients);
-
-		if ($recipient !== false) {
-			return $recipient;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Resolves recipient from the GAL and gets his certificates.
-	 *
-	 * @param string $to
-	 * @param int    $maxAmbiguousRecipients
-	 * @param bool   $expandDistlist
-	 *
-	 * @return array|bool
-	 */
-	private function resolveRecipientGAL($to, $maxAmbiguousRecipients, $expandDistlist = true) {
-		SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientGAL(): Resolving recipient '%s' in GAL", $to));
-		$addrbook = $this->getAddressbook();
-		// FIXME: create a function to get the adressbook contentstable
-		$ab_entryid = mapi_ab_getdefaultdir($addrbook);
-		if ($ab_entryid) {
-			$ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
-		}
-		if ($ab_dir) {
-			$table = mapi_folder_getcontentstable($ab_dir);
-		}
-
-		if (!$table) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientGAL(): Unable to open addressbook:0x%X", mapi_last_hresult()));
-
-			return false;
-		}
-
-		$restriction = MAPIUtils::GetSearchRestriction(u2w($to));
-		mapi_table_restrict($table, $restriction);
-
-		$querycnt = mapi_table_getrowcount($table);
-		if ($querycnt > 0) {
-			$recipientGal = [];
-			$rowsToQuery = $maxAmbiguousRecipients;
-			// some devices request 0 ambiguous recipients
-			if ($querycnt == 1 && $maxAmbiguousRecipients == 0) {
-				$rowsToQuery = 1;
-			}
-			elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
-				SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->resolveRecipientGAL(): GAL search found %d recipients but the device hasn't requested ambiguous recipients", $querycnt));
-
-				return $recipientGal;
-			}
-			elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
-				$rowsToQuery = $querycnt;
-			}
-			// get the certificate every time because caching the certificate is less expensive than opening addressbook entry again
-			$abentries = mapi_table_queryrows($table, [PR_ENTRYID, PR_DISPLAY_NAME, PR_EMS_AB_TAGGED_X509_CERT, PR_OBJECT_TYPE, PR_SMTP_ADDRESS], 0, $rowsToQuery);
-			for ($i = 0, $nrEntries = count($abentries); $i < $nrEntries; ++$i) {
-				if (strcasecmp($abentries[$i][PR_SMTP_ADDRESS], $to) !== 0 && $maxAmbiguousRecipients == 1) {
-					SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->resolveRecipientGAL(): maxAmbiguousRecipients is 1 and found non-matching user (to '%s' found: '%s')", $to, $abentries[$i][PR_SMTP_ADDRESS]));
-
-					continue;
-				}
-				if ($abentries[$i][PR_OBJECT_TYPE] == MAPI_DISTLIST) {
-					// check whether to expand dist list
-					if ($expandDistlist) {
-						SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->resolveRecipientGAL(): '%s' is a dist list. Expand it to members.", $to));
-						$distList = mapi_ab_openentry($addrbook, $abentries[$i][PR_ENTRYID]);
-						$distListContent = mapi_folder_getcontentstable($distList);
-						$distListMembers = mapi_table_queryallrows($distListContent, [PR_ENTRYID, PR_DISPLAY_NAME, PR_EMS_AB_TAGGED_X509_CERT]);
-						for ($j = 0, $nrDistListMembers = mapi_table_getrowcount($distListContent); $j < $nrDistListMembers; ++$j) {
-							SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientGAL(): distlist's '%s' member: '%s'", $to, $distListMembers[$j][PR_DISPLAY_NAME]));
-							$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $to, $distListMembers[$j], $nrDistListMembers);
-						}
-					}
-					else {
-						SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->resolveRecipientGAL(): '%s' is a dist list, but return it as is.", $to));
-						$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
-					}
-				}
-				elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
-					$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
-				}
-			}
-
-			SLog::Write(LOGLEVEL_WBXML, "Grommunio->resolveRecipientGAL(): Found a recipient in GAL");
-
-			return $recipientGal;
-		}
-
-		SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientGAL(): No recipient found for: '%s' in GAL", $to));
-
-		return SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP;
-
-		return false;
-	}
-
-	/**
-	 * Resolves recipient from the contact list and gets his certificates.
-	 *
-	 * @param string $to
-	 * @param int    $maxAmbiguousRecipients
-	 *
-	 * @return array|bool
-	 */
-	private function resolveRecipientContact($to, $maxAmbiguousRecipients) {
-		SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Resolving recipient '%s' in user's contacts", $to));
-		// go through all contact folders of the user and
-		// check if there's a contact with the given email address
-		$root = mapi_msgstore_openentry($this->defaultstore);
-		if (!$root) {
-			SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->resolveRecipientContact(): Unable to open default store: 0x%X", mapi_last_hresult()));
-		}
-		$rootprops = mapi_getprops($root, [PR_IPM_CONTACT_ENTRYID]);
-		$contacts = $this->getContactsFromFolder($this->defaultstore, $rootprops[PR_IPM_CONTACT_ENTRYID], $to);
-		$recipients = [];
-
-		if ($contacts !== false) {
-			SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in main contacts folder.", count($contacts)));
-			// create resolve recipient object
-			foreach ($contacts as $contact) {
-				$recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
-			}
-		}
-
-		$contactfolder = mapi_msgstore_openentry($this->defaultstore, $rootprops[PR_IPM_CONTACT_ENTRYID]);
-		$subfolders = MAPIUtils::GetSubfoldersForType($contactfolder, "IPF.Contact");
-		if ($subfolders !== false) {
-			foreach ($subfolders as $folder) {
-				$contacts = $this->getContactsFromFolder($this->defaultstore, $folder[PR_ENTRYID], $to);
-				if ($contacts !== false) {
-					SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in contacts' subfolder.", count($contacts)));
-					foreach ($contacts as $contact) {
-						$recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
-					}
-				}
-			}
-		}
-
-		// search contacts in public folders
-		$storestables = mapi_getmsgstorestable($this->session);
-		$result = mapi_last_hresult();
-
-		if ($result == NOERROR) {
-			$rows = mapi_table_queryallrows($storestables, [PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER]);
-			foreach ($rows as $row) {
-				if (isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
-					// TODO refactor public store
-					$publicstore = mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
-					$publicfolder = mapi_msgstore_openentry($publicstore);
-
-					$subfolders = MAPIUtils::GetSubfoldersForType($publicfolder, "IPF.Contact");
-					if ($subfolders !== false) {
-						foreach ($subfolders as $folder) {
-							$contacts = $this->getContactsFromFolder($publicstore, $folder[PR_ENTRYID], $to);
-							if ($contacts !== false) {
-								SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in public contacts folder.", count($contacts)));
-								foreach ($contacts as $contact) {
-									$recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
-								}
-							}
-						}
-					}
-
-					break;
-				}
-			}
-		}
-		else {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientContact(): Unable to open public store: 0x%X", $result));
-		}
-
-		if (empty($recipients)) {
-			$contactProperties = [];
-			$contactProperties[PR_DISPLAY_NAME] = $to;
-			$contactProperties[PR_USER_X509_CERTIFICATE] = false;
-
-			$recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contactProperties);
-		}
-
-		return $recipients;
-	}
-
-	/**
-	 * Creates SyncResolveRecipientsCertificates object for ResolveRecipients.
-	 *
-	 * @param binary $certificates
-	 * @param int    $recipientCount
-	 *
-	 * @return SyncResolveRecipientsCertificates
-	 */
-	private function getCertificates($certificates, $recipientCount = 0) {
-		$cert = new SyncResolveRecipientsCertificates();
-		if ($certificates === false) {
-			$cert->status = SYNC_RESOLVERECIPSSTATUS_CERTIFICATES_NOVALIDCERT;
-
-			return $cert;
-		}
-		$cert->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
-		$cert->certificatecount = count($certificates);
-		$cert->recipientcount = $recipientCount;
-		$cert->certificate = [];
-		foreach ($certificates as $certificate) {
-			$cert->certificate[] = base64_encode($certificate);
-		}
-
-		return $cert;
-	}
-
-	/**
-	 * Creates SyncResolveRecipient object for ResolveRecipientsResponse.
-	 *
-	 * @param int    $type
-	 * @param string $email
-	 * @param array  $recipientProperties
-	 * @param int    $recipientCount
-	 *
-	 * @return SyncResolveRecipient
-	 */
-	private function createResolveRecipient($type, $email, $recipientProperties, $recipientCount = 0) {
-		$recipient = new SyncResolveRecipient();
-		$recipient->type = $type;
-		$recipient->displayname = u2w($recipientProperties[PR_DISPLAY_NAME]);
-		$recipient->emailaddress = $email;
-
-		if ($type == SYNC_RESOLVERECIPIENTS_TYPE_GAL) {
-			$certificateProp = PR_EMS_AB_TAGGED_X509_CERT;
-		}
-		elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
-			$certificateProp = PR_USER_X509_CERTIFICATE;
-		}
-		else {
-			$certificateProp = null;
-		}
-
-		if (isset($recipientProperties[$certificateProp]) && is_array($recipientProperties[$certificateProp]) && !empty($recipientProperties[$certificateProp])) {
-			$certificates = $this->getCertificates($recipientProperties[$certificateProp], $recipientCount);
-		}
-		else {
-			$certificates = $this->getCertificates(false);
-			SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->createResolveRecipient(): No certificate found for '%s' (requested email address: '%s')", $recipientProperties[PR_DISPLAY_NAME], $email));
-		}
-		$recipient->certificates = $certificates;
-
-		if (isset($recipientProperties[PR_ENTRYID])) {
-			$recipient->id = $recipientProperties[PR_ENTRYID];
-		}
-
-		return $recipient;
-	}
-
-	/**
-	 * Gets the availability of a user for the given time window.
-	 *
-	 * @param string                       $to
-	 * @param SyncResolveRecipient         $resolveRecipient
-	 * @param SyncResolveRecipientsOptions $resolveRecipientsOptions
-	 *
-	 * @return SyncResolveRecipientsAvailability
-	 */
-	private function getAvailability($to, $resolveRecipient, $resolveRecipientsOptions) {
-		$availability = new SyncResolveRecipientsAvailability();
-		$availability->status = SYNC_RESOLVERECIPSSTATUS_AVAILABILITY_SUCCESS;
-
-		if (!isset($resolveRecipient->id)) {
-			// TODO this shouldn't happen but try to get the recipient in such a case
-		}
-
-		$start = strtotime($resolveRecipientsOptions->availability->starttime);
-		$end = strtotime($resolveRecipientsOptions->availability->endtime);
-		// Each digit in the MergedFreeBusy indicates the free/busy status for the user for every 30 minute interval.
-		$timeslots = intval(ceil(($end - $start) / self::HALFHOURSECONDS));
-
-		if ($timeslots > self::MAXFREEBUSYSLOTS) {
-			throw new StatusException("Grommunio->getAvailability(): the requested free busy range is too large.", SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR);
-		}
-
-		$mergedFreeBusy = str_pad(fbNoData, $timeslots, fbNoData);
-
-		$retval = mapi_getuseravailability($this->session, $resolveRecipient->id, $start, $end);
-		SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->getAvailability(): free busy '%s'", print_r($retval, 1)));
-
-		if (!empty($retval)) {
-			$freebusy = json_decode($retval, true);
-			// freebusy is available, assume that the user is free
-			$mergedFreeBusy = str_pad(fbFree, $timeslots, fbFree);
-			foreach ($freebusy['events'] as $event) {
-				// calculate which timeslot of mergedFreeBusy should be replaced.
-				$startSlot = intval(floor(($event['StartTime'] - $start) / self::HALFHOURSECONDS));
-				$endSlot = intval(floor(($event['EndTime'] - $start) / self::HALFHOURSECONDS));
-				// if event started at a multiple of half an hour from requested freebusy time and
-				// its duration is also a multiple of half an hour
-				// then it's necessary to reduce endSlot by one
-				if ((($event['StartTime'] - $start) % self::HALFHOURSECONDS == 0) && (($event['EndTime'] - $event['StartTime']) % self::HALFHOURSECONDS == 0)) {
-					--$endSlot;
-				}
-				$fbType = Utils::GetFbStatusFromType($event['BusyType']);
-				for ($i = $startSlot; $i <= $endSlot && $i < $timeslots; ++$i) {
-					// only set the new slot's free busy status if it's higher than the current one
-					if ($fbType > $mergedFreeBusy[$i]) {
-						$mergedFreeBusy[$i] = $fbType;
-					}
-				}
-			}
-		}
-		$availability->mergedfreebusy = $mergedFreeBusy;
-
-		return $availability;
-	}
-
-	/**
-	 * Returns contacts matching given email address from a folder.
-	 *
-	 * @param MAPIStore $store
-	 * @param binary    $folderEntryid
-	 * @param string    $email
-	 *
-	 * @return array|bool
-	 */
-	private function getContactsFromFolder($store, $folderEntryid, $email) {
-		$folder = mapi_msgstore_openentry($store, $folderEntryid);
-		$folderContent = mapi_folder_getcontentstable($folder);
-		mapi_table_restrict($folderContent, MAPIUtils::GetEmailAddressRestriction($store, $email));
-		// TODO max limit
-		if (mapi_table_getrowcount($folderContent) > 0) {
-			return mapi_table_queryallrows($folderContent, [PR_DISPLAY_NAME, PR_USER_X509_CERTIFICATE, PR_ENTRYID]);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get MAPI addressbook object.
-	 *
-	 * @return MAPIAddressbook object to be used with mapi_ab_* or false on failure
-	 */
-	private function getAddressbook() {
-		if (isset($this->addressbook) && $this->addressbook) {
-			return $this->addressbook;
-		}
-		$this->addressbook = mapi_openaddressbook($this->session);
-		$result = mapi_last_hresult();
-		if ($result && $this->addressbook === false) {
-			SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->getAddressbook error opening addressbook 0x%X", $result));
-
-			return false;
-		}
-
-		return $this->addressbook;
-	}
-
-	/**
-	 * Checks if the user is not disabled for grommunio-sync.
-	 *
-	 * @throws FatalException if user is disabled for grommunio-sync
-	 *
-	 * @return bool
-	 */
-	private function isGSyncEnabled() {
-		$addressbook = $this->getAddressbook();
-		// this check needs to be performed on the store of the main (authenticated) user
-		$store = $this->storeCache[$this->mainUser];
-		$userEntryid = mapi_getprops($store, [PR_MAILBOX_OWNER_ENTRYID]);
-		$mailuser = mapi_ab_openentry($addressbook, $userEntryid[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 ($mobileDisabled) {
-				throw new FatalException("User is disabled for grommunio-sync.");
-			}
-			if ($deviceIdDisabled) {
-				throw new FatalException(sprintf("User has deviceId %s disabled for usage with grommunio-sync.", $deviceId));
-			}
-		}
-
-		return true;
-	}
+        $rmTemplates->Status = SYNC_COMMONSTATUS_IRMFEATUREDISABLED;
+        $rmTemplates->rmtemplates = [];
+    }
+
+    /**
+     * Sets the importance and priority of a message from a RFC822 message headers.
+     *
+     * @param int   $xPriority
+     * @param array $mapiprops
+     * @param mixed $sendMailProps
+     */
+    private function getImportanceAndPriority($xPriority, &$mapiprops, $sendMailProps) {
+        switch ($xPriority) {
+            case 1:
+            case 2:
+                $priority = PRIO_URGENT;
+                $importance = IMPORTANCE_HIGH;
+                break;
+
+            case 4:
+            case 5:
+                $priority = PRIO_NONURGENT;
+                $importance = IMPORTANCE_LOW;
+                break;
+
+            case 3:
+            default:
+                $priority = PRIO_NORMAL;
+                $importance = IMPORTANCE_NORMAL;
+                break;
+        }
+        $mapiprops[$sendMailProps["importance"]] = $importance;
+        $mapiprops[$sendMailProps["priority"]] = $priority;
+    }
+
+    /**
+     * Copies attachments from one message to another.
+     *
+     * @param MAPIMessage $toMessage
+     * @param MAPIMessage $fromMessage
+     */
+    private function copyAttachments(&$toMessage, $fromMessage) {
+        $attachtable = mapi_message_getattachmenttable($fromMessage);
+        $rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM]);
+
+        foreach ($rows as $row) {
+            if (isset($row[PR_ATTACH_NUM])) {
+                $attach = mapi_message_openattach($fromMessage, $row[PR_ATTACH_NUM]);
+                $newattach = mapi_message_createattach($toMessage);
+                mapi_copyto($attach, [], [], $newattach, 0);
+                mapi_savechanges($newattach);
+            }
+        }
+    }
+
+    /**
+     * Function will create a search folder in FINDER_ROOT folder
+     * if folder exists then it will open it.
+     *
+     * @see createSearchFolder($store, $openIfExists = true) function in the webaccess
+     *
+     * @return mapiFolderObject $folder created search folder
+     */
+    private function getSearchFolder() {
+        // create new or open existing search folder
+        $searchFolderRoot = $this->getSearchFoldersRoot($this->store);
+        if ($searchFolderRoot === false) {
+            // error in finding search root folder
+            // or store doesn't support search folders
+            return false;
+        }
+
+        $searchFolder = $this->createSearchFolder($searchFolderRoot);
+
+        if ($searchFolder !== false && mapi_last_hresult() == NOERROR) {
+            return $searchFolder;
+        }
+
+        return false;
+    }
+
+    /**
+     * Function will open FINDER_ROOT folder in root container
+     * public folder's don't have FINDER_ROOT folder.
+     *
+     * @see getSearchFoldersRoot($store) function in the webaccess
+     *
+     * @return mapiFolderObject root folder for search folders
+     */
+    private function getSearchFoldersRoot() {
+        // check if we can create search folders
+        $storeProps = mapi_getprops($this->store, [PR_STORE_SUPPORT_MASK, PR_FINDER_ENTRYID]);
+        if (($storeProps[PR_STORE_SUPPORT_MASK] & STORE_SEARCH_OK) != STORE_SEARCH_OK) {
+            SLog::Write(LOGLEVEL_WARN, "Grommunio->getSearchFoldersRoot(): Store doesn't support search folders. Public store doesn't have FINDER_ROOT folder");
+
+            return false;
+        }
+
+        // open search folders root
+        $searchRootFolder = mapi_msgstore_openentry($this->store, $storeProps[PR_FINDER_ENTRYID]);
+        if (mapi_last_hresult() != NOERROR) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getSearchFoldersRoot(): Unable to open search folder (0x%X)", mapi_last_hresult()));
+
+            return false;
+        }
+
+        return $searchRootFolder;
+    }
+
+    /**
+     * Creates a search folder if it not exists or opens an existing one
+     * and returns it.
+     *
+     * @param mapiFolderObject $searchFolderRoot
+     *
+     * @return mapiFolderObject
+     */
+    private function createSearchFolder($searchFolderRoot) {
+        $folderName = "grommunio-sync Search Folder " . @getmypid();
+        $searchFolders = mapi_folder_gethierarchytable($searchFolderRoot);
+        $restriction = [
+            RES_CONTENT,
+            [
+                FUZZYLEVEL => FL_PREFIX,
+                ULPROPTAG => PR_DISPLAY_NAME,
+                VALUE => [PR_DISPLAY_NAME => $folderName],
+            ],
+        ];
+        // restrict the hierarchy to the grommunio-sync search folder only
+        mapi_table_restrict($searchFolders, $restriction);
+        if (mapi_table_getrowcount($searchFolders)) {
+            $searchFolder = mapi_table_queryrows($searchFolders, [PR_ENTRYID], 0, 1);
+
+            return mapi_msgstore_openentry($this->store, $searchFolder[0][PR_ENTRYID]);
+        }
+
+        return mapi_folder_createfolder($searchFolderRoot, $folderName, null, 0, FOLDER_SEARCH);
+    }
+
+    /**
+     * Creates a search restriction.
+     *
+     * @param ContentParameter $cpo
+     *
+     * @return array
+     */
+    private function getSearchRestriction($cpo) {
+        $searchText = $cpo->GetSearchFreeText();
+
+        $searchGreater = strtotime($cpo->GetSearchValueGreater());
+        $searchLess = strtotime($cpo->GetSearchValueLess());
+
+        if (version_compare(phpversion(), '5.3.4') < 0) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getSearchRestriction(): Your system's PHP version (%s) might not correctly process unicode strings. Search containing such characters might not return correct results. It is recommended to update to at least PHP 5.3.4. See ZP-541 for more information.", phpversion()));
+        }
+        // split the search on whitespache and look for every word
+        $searchText = preg_split("/\\W+/u", $searchText);
+        $searchProps = [PR_BODY, PR_SUBJECT, PR_DISPLAY_TO, PR_DISPLAY_CC, PR_SENDER_NAME, PR_SENDER_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS];
+        $resAnd = [];
+        foreach ($searchText as $term) {
+            $resOr = [];
+
+            foreach ($searchProps as $property) {
+                array_push(
+                    $resOr,
+                    [RES_CONTENT,
+                        [
+                            FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+                            ULPROPTAG => $property,
+                            VALUE => u2w($term),
+                        ],
+                    ]
+                );
+            }
+            array_push($resAnd, [RES_OR, $resOr]);
+        }
+
+        // add time range restrictions
+        if ($searchGreater) {
+            array_push($resAnd, [RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => PR_MESSAGE_DELIVERY_TIME, VALUE => [PR_MESSAGE_DELIVERY_TIME => $searchGreater]]]); // RES_AND;
+        }
+        if ($searchLess) {
+            array_push($resAnd, [RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => PR_MESSAGE_DELIVERY_TIME, VALUE => [PR_MESSAGE_DELIVERY_TIME => $searchLess]]]);
+        }
+
+        return [RES_AND, $resAnd];
+    }
+
+    /**
+     * Resolve recipient based on his email address.
+     *
+     * @param string $to
+     * @param int    $maxAmbiguousRecipients
+     * @param bool   $expandDistlist
+     *
+     * @return bool|SyncResolveRecipient
+     */
+    private function resolveRecipient($to, $maxAmbiguousRecipients, $expandDistlist = true) {
+        $recipient = $this->resolveRecipientGAL($to, $maxAmbiguousRecipients, $expandDistlist);
+
+        if ($recipient !== false) {
+            return $recipient;
+        }
+
+        $recipient = $this->resolveRecipientContact($to, $maxAmbiguousRecipients);
+
+        if ($recipient !== false) {
+            return $recipient;
+        }
+
+        return false;
+    }
+
+    /**
+     * Resolves recipient from the GAL and gets his certificates.
+     *
+     * @param string $to
+     * @param int    $maxAmbiguousRecipients
+     * @param bool   $expandDistlist
+     *
+     * @return array|bool
+     */
+    private function resolveRecipientGAL($to, $maxAmbiguousRecipients, $expandDistlist = true) {
+        SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientGAL(): Resolving recipient '%s' in GAL", $to));
+        $addrbook = $this->getAddressbook();
+        // FIXME: create a function to get the adressbook contentstable
+        $ab_entryid = mapi_ab_getdefaultdir($addrbook);
+        if ($ab_entryid) {
+            $ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
+        }
+        if ($ab_dir) {
+            $table = mapi_folder_getcontentstable($ab_dir);
+        }
+
+        if (!$table) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientGAL(): Unable to open addressbook:0x%X", mapi_last_hresult()));
+
+            return false;
+        }
+
+        $restriction = MAPIUtils::GetSearchRestriction(u2w($to));
+        mapi_table_restrict($table, $restriction);
+
+        $querycnt = mapi_table_getrowcount($table);
+        if ($querycnt > 0) {
+            $recipientGal = [];
+            $rowsToQuery = $maxAmbiguousRecipients;
+            // some devices request 0 ambiguous recipients
+            if ($querycnt == 1 && $maxAmbiguousRecipients == 0) {
+                $rowsToQuery = 1;
+            }
+            elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
+                SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->resolveRecipientGAL(): GAL search found %d recipients but the device hasn't requested ambiguous recipients", $querycnt));
+
+                return $recipientGal;
+            }
+            elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
+                $rowsToQuery = $querycnt;
+            }
+            // get the certificate every time because caching the certificate is less expensive than opening addressbook entry again
+            $abentries = mapi_table_queryrows($table, [PR_ENTRYID, PR_DISPLAY_NAME, PR_EMS_AB_TAGGED_X509_CERT, PR_OBJECT_TYPE, PR_SMTP_ADDRESS], 0, $rowsToQuery);
+            for ($i = 0, $nrEntries = count($abentries); $i < $nrEntries; ++$i) {
+                if (strcasecmp($abentries[$i][PR_SMTP_ADDRESS], $to) !== 0 && $maxAmbiguousRecipients == 1) {
+                    SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->resolveRecipientGAL(): maxAmbiguousRecipients is 1 and found non-matching user (to '%s' found: '%s')", $to, $abentries[$i][PR_SMTP_ADDRESS]));
+
+                    continue;
+                }
+                if ($abentries[$i][PR_OBJECT_TYPE] == MAPI_DISTLIST) {
+                    // check whether to expand dist list
+                    if ($expandDistlist) {
+                        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->resolveRecipientGAL(): '%s' is a dist list. Expand it to members.", $to));
+                        $distList = mapi_ab_openentry($addrbook, $abentries[$i][PR_ENTRYID]);
+                        $distListContent = mapi_folder_getcontentstable($distList);
+                        $distListMembers = mapi_table_queryallrows($distListContent, [PR_ENTRYID, PR_DISPLAY_NAME, PR_EMS_AB_TAGGED_X509_CERT]);
+                        for ($j = 0, $nrDistListMembers = mapi_table_getrowcount($distListContent); $j < $nrDistListMembers; ++$j) {
+                            SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientGAL(): distlist's '%s' member: '%s'", $to, $distListMembers[$j][PR_DISPLAY_NAME]));
+                            $recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $to, $distListMembers[$j], $nrDistListMembers);
+                        }
+                    }
+                    else {
+                        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->resolveRecipientGAL(): '%s' is a dist list, but return it as is.", $to));
+                        $recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
+                    }
+                }
+                elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
+                    $recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
+                }
+            }
+
+            SLog::Write(LOGLEVEL_WBXML, "Grommunio->resolveRecipientGAL(): Found a recipient in GAL");
+
+            return $recipientGal;
+        }
+
+        SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientGAL(): No recipient found for: '%s' in GAL", $to));
+
+        return SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP;
+
+        return false;
+    }
+
+    /**
+     * Resolves recipient from the contact list and gets his certificates.
+     *
+     * @param string $to
+     * @param int    $maxAmbiguousRecipients
+     *
+     * @return array|bool
+     */
+    private function resolveRecipientContact($to, $maxAmbiguousRecipients) {
+        SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Resolving recipient '%s' in user's contacts", $to));
+        // go through all contact folders of the user and
+        // check if there's a contact with the given email address
+        $root = mapi_msgstore_openentry($this->defaultstore);
+        if (!$root) {
+            SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->resolveRecipientContact(): Unable to open default store: 0x%X", mapi_last_hresult()));
+        }
+        $rootprops = mapi_getprops($root, [PR_IPM_CONTACT_ENTRYID]);
+        $contacts = $this->getContactsFromFolder($this->defaultstore, $rootprops[PR_IPM_CONTACT_ENTRYID], $to);
+        $recipients = [];
+
+        if ($contacts !== false) {
+            SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in main contacts folder.", count($contacts)));
+            // create resolve recipient object
+            foreach ($contacts as $contact) {
+                $recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
+            }
+        }
+
+        $contactfolder = mapi_msgstore_openentry($this->defaultstore, $rootprops[PR_IPM_CONTACT_ENTRYID]);
+        $subfolders = MAPIUtils::GetSubfoldersForType($contactfolder, "IPF.Contact");
+        if ($subfolders !== false) {
+            foreach ($subfolders as $folder) {
+                $contacts = $this->getContactsFromFolder($this->defaultstore, $folder[PR_ENTRYID], $to);
+                if ($contacts !== false) {
+                    SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in contacts' subfolder.", count($contacts)));
+                    foreach ($contacts as $contact) {
+                        $recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
+                    }
+                }
+            }
+        }
+
+        // search contacts in public folders
+        $storestables = mapi_getmsgstorestable($this->session);
+        $result = mapi_last_hresult();
+
+        if ($result == NOERROR) {
+            $rows = mapi_table_queryallrows($storestables, [PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER]);
+            foreach ($rows as $row) {
+                if (isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
+                    // TODO refactor public store
+                    $publicstore = mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
+                    $publicfolder = mapi_msgstore_openentry($publicstore);
+
+                    $subfolders = MAPIUtils::GetSubfoldersForType($publicfolder, "IPF.Contact");
+                    if ($subfolders !== false) {
+                        foreach ($subfolders as $folder) {
+                            $contacts = $this->getContactsFromFolder($publicstore, $folder[PR_ENTRYID], $to);
+                            if ($contacts !== false) {
+                                SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in public contacts folder.", count($contacts)));
+                                foreach ($contacts as $contact) {
+                                    $recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contact);
+                                }
+                            }
+                        }
+                    }
+
+                    break;
+                }
+            }
+        }
+        else {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientContact(): Unable to open public store: 0x%X", $result));
+        }
+
+        if (empty($recipients)) {
+            $contactProperties = [];
+            $contactProperties[PR_DISPLAY_NAME] = $to;
+            $contactProperties[PR_USER_X509_CERTIFICATE] = false;
+
+            $recipients[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_CONTACT, $to, $contactProperties);
+        }
+
+        return $recipients;
+    }
+
+    /**
+     * Creates SyncResolveRecipientsCertificates object for ResolveRecipients.
+     *
+     * @param binary $certificates
+     * @param int    $recipientCount
+     *
+     * @return SyncResolveRecipientsCertificates
+     */
+    private function getCertificates($certificates, $recipientCount = 0) {
+        $cert = new SyncResolveRecipientsCertificates();
+        if ($certificates === false) {
+            $cert->status = SYNC_RESOLVERECIPSSTATUS_CERTIFICATES_NOVALIDCERT;
+
+            return $cert;
+        }
+        $cert->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
+        $cert->certificatecount = count($certificates);
+        $cert->recipientcount = $recipientCount;
+        $cert->certificate = [];
+        foreach ($certificates as $certificate) {
+            $cert->certificate[] = base64_encode($certificate);
+        }
+
+        return $cert;
+    }
+
+    /**
+     * Creates SyncResolveRecipient object for ResolveRecipientsResponse.
+     *
+     * @param int    $type
+     * @param string $email
+     * @param array  $recipientProperties
+     * @param int    $recipientCount
+     *
+     * @return SyncResolveRecipient
+     */
+    private function createResolveRecipient($type, $email, $recipientProperties, $recipientCount = 0) {
+        $recipient = new SyncResolveRecipient();
+        $recipient->type = $type;
+        $recipient->displayname = u2w($recipientProperties[PR_DISPLAY_NAME]);
+        $recipient->emailaddress = $email;
+
+        if ($type == SYNC_RESOLVERECIPIENTS_TYPE_GAL) {
+            $certificateProp = PR_EMS_AB_TAGGED_X509_CERT;
+        }
+        elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
+            $certificateProp = PR_USER_X509_CERTIFICATE;
+        }
+        else {
+            $certificateProp = null;
+        }
+
+        if (isset($recipientProperties[$certificateProp]) && is_array($recipientProperties[$certificateProp]) && !empty($recipientProperties[$certificateProp])) {
+            $certificates = $this->getCertificates($recipientProperties[$certificateProp], $recipientCount);
+        }
+        else {
+            $certificates = $this->getCertificates(false);
+            SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->createResolveRecipient(): No certificate found for '%s' (requested email address: '%s')", $recipientProperties[PR_DISPLAY_NAME], $email));
+        }
+        $recipient->certificates = $certificates;
+
+        if (isset($recipientProperties[PR_ENTRYID])) {
+            $recipient->id = $recipientProperties[PR_ENTRYID];
+        }
+
+        return $recipient;
+    }
+
+    /**
+     * Gets the availability of a user for the given time window.
+     *
+     * @param string                       $to
+     * @param SyncResolveRecipient         $resolveRecipient
+     * @param SyncResolveRecipientsOptions $resolveRecipientsOptions
+     *
+     * @return SyncResolveRecipientsAvailability
+     */
+    private function getAvailability($to, $resolveRecipient, $resolveRecipientsOptions) {
+        $availability = new SyncResolveRecipientsAvailability();
+        $availability->status = SYNC_RESOLVERECIPSSTATUS_AVAILABILITY_SUCCESS;
+
+        if (!isset($resolveRecipient->id)) {
+            // TODO this shouldn't happen but try to get the recipient in such a case
+        }
+
+        $start = strtotime($resolveRecipientsOptions->availability->starttime);
+        $end = strtotime($resolveRecipientsOptions->availability->endtime);
+        // Each digit in the MergedFreeBusy indicates the free/busy status for the user for every 30 minute interval.
+        $timeslots = intval(ceil(($end - $start) / self::HALFHOURSECONDS));
+
+        if ($timeslots > self::MAXFREEBUSYSLOTS) {
+            throw new StatusException("Grommunio->getAvailability(): the requested free busy range is too large.", SYNC_RESOLVERECIPSSTATUS_PROTOCOLERROR);
+        }
+
+        $mergedFreeBusy = str_pad(fbNoData, $timeslots, fbNoData);
+
+        $retval = mapi_getuseravailability($this->session, $resolveRecipient->id, $start, $end);
+        SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->getAvailability(): free busy '%s'", print_r($retval, 1)));
+
+        if (!empty($retval)) {
+            $freebusy = json_decode($retval, true);
+            // freebusy is available, assume that the user is free
+            $mergedFreeBusy = str_pad(fbFree, $timeslots, fbFree);
+            foreach ($freebusy['events'] as $event) {
+                // calculate which timeslot of mergedFreeBusy should be replaced.
+                $startSlot = intval(floor(($event['StartTime'] - $start) / self::HALFHOURSECONDS));
+                $endSlot = intval(floor(($event['EndTime'] - $start) / self::HALFHOURSECONDS));
+                // if event started at a multiple of half an hour from requested freebusy time and
+                // its duration is also a multiple of half an hour
+                // then it's necessary to reduce endSlot by one
+                if ((($event['StartTime'] - $start) % self::HALFHOURSECONDS == 0) && (($event['EndTime'] - $event['StartTime']) % self::HALFHOURSECONDS == 0)) {
+                    --$endSlot;
+                }
+                $fbType = Utils::GetFbStatusFromType($event['BusyType']);
+                for ($i = $startSlot; $i <= $endSlot && $i < $timeslots; ++$i) {
+                    // only set the new slot's free busy status if it's higher than the current one
+                    if ($fbType > $mergedFreeBusy[$i]) {
+                        $mergedFreeBusy[$i] = $fbType;
+                    }
+                }
+            }
+        }
+        $availability->mergedfreebusy = $mergedFreeBusy;
+
+        return $availability;
+    }
+
+    /**
+     * Returns contacts matching given email address from a folder.
+     *
+     * @param MAPIStore $store
+     * @param binary    $folderEntryid
+     * @param string    $email
+     *
+     * @return array|bool
+     */
+    private function getContactsFromFolder($store, $folderEntryid, $email) {
+        $folder = mapi_msgstore_openentry($store, $folderEntryid);
+        $folderContent = mapi_folder_getcontentstable($folder);
+        mapi_table_restrict($folderContent, MAPIUtils::GetEmailAddressRestriction($store, $email));
+        // TODO max limit
+        if (mapi_table_getrowcount($folderContent) > 0) {
+            return mapi_table_queryallrows($folderContent, [PR_DISPLAY_NAME, PR_USER_X509_CERTIFICATE, PR_ENTRYID]);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get MAPI addressbook object.
+     *
+     * @return MAPIAddressbook object to be used with mapi_ab_* or false on failure
+     */
+    private function getAddressbook() {
+        if (isset($this->addressbook) && $this->addressbook) {
+            return $this->addressbook;
+        }
+        $this->addressbook = mapi_openaddressbook($this->session);
+        $result = mapi_last_hresult();
+        if ($result && $this->addressbook === false) {
+            SLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->getAddressbook error opening addressbook 0x%X", $result));
+
+            return false;
+        }
+
+        return $this->addressbook;
+    }
+
+    /**
+     * Checks if the user is not disabled for grommunio-sync.
+     *
+     * @throws FatalException if user is disabled for grommunio-sync
+     *
+     * @return bool
+     */
+    private function isGSyncEnabled() {
+        $addressbook = $this->getAddressbook();
+        // this check needs to be performed on the store of the main (authenticated) user
+        $store = $this->storeCache[$this->mainUser];
+        $userEntryid = mapi_getprops($store, [PR_MAILBOX_OWNER_ENTRYID]);
+        $mailuser = mapi_ab_openentry($addressbook, $userEntryid[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 ($mobileDisabled) {
+                throw new FatalException("User is disabled for grommunio-sync.");
+            }
+            if ($deviceIdDisabled) {
+                throw new FatalException(sprintf("User has deviceId %s disabled for usage with grommunio-sync.", $deviceId));
+            }
+        }
+
+        return true;
+    }
 }

Spacing +18 added lines, -19 removed lines

@@ -142,7 +142,7 @@ 
 			if (function_exists('mapi_feature') && mapi_feature('LOGONFLAGS')) {
 				// send grommunio-sync version and user agent to ZCP - ZP-589
 				if (Utils::CheckMapiExtVersion('7.2.0')) {
-					$gsync_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
+					$gsync_version = 'Grommunio-Sync_'.@constant('GROMMUNIOSYNC_VERSION');
 					$user_agent = ($deviceId) ? GSync::GetDeviceManager()->GetUserAgent() : "unknown";
 					$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0, $gsync_version, $user_agent);
 				}
@@ -195,7 +195,7 @@ 
 		$this->store = $this->defaultstore;
 		$this->storeName = $defaultUser;
 
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): User '%s' is authenticated%s", $this->mainUser, ($this->impersonateUser ? " impersonating '" . $this->impersonateUser . "'" : '')));
+		SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): User '%s' is authenticated%s", $this->mainUser, ($this->impersonateUser ? " impersonating '".$this->impersonateUser."'" : '')));
 
 		$this->isGSyncEnabled();
 
@@ -589,7 +589,7 @@ 
 							$fwbody = w2u($fwbody);
 						}
 
-						$mapiprops[$sendMailProps["body"]] = $body . "\r\n\r\n" . $fwbody;
+						$mapiprops[$sendMailProps["body"]] = $body."\r\n\r\n".$fwbody;
 					}
 
 					if (strlen($bodyHtml) > 0) {
@@ -605,7 +605,7 @@ 
 							$fwbodyHtml = w2u($fwbodyHtml);
 						}
 
-						$mapiprops[$sendMailProps["html"]] = $bodyHtml . "<br><br>" . $fwbodyHtml;
+						$mapiprops[$sendMailProps["html"]] = $bodyHtml."<br><br>".$fwbodyHtml;
 					}
 				}
 			}
@@ -969,11 +969,11 @@ 
 		if ($calFolderId) {
 			$shortFolderId = GSync::GetDeviceManager()->GetFolderIdForBackendId($calFolderId);
 			if ($calFolderId != $shortFolderId) {
-				$prefix = $shortFolderId . ':';
+				$prefix = $shortFolderId.':';
 			}
 		}
 
-		return $prefix . $calendarid;
+		return $prefix.$calendarid;
 	}
 
 	/**
@@ -1321,7 +1321,7 @@ 
 			}
 		}
 		$nrResults = count($items);
-		$items['range'] = ($nrResults > 0) ? $rangestart . '-' . ($nrResults - 1) : '0-0';
+		$items['range'] = ($nrResults > 0) ? $rangestart.'-'.($nrResults - 1) : '0-0';
 		$items['searchtotal'] = $nrResults;
 
 		return $items;
@@ -1372,8 +1372,7 @@ 
 
 		// if the search range is set limit the result to it, otherwise return all found messages
 		$rows = (is_array($searchRange) && isset($searchRange[0], $searchRange[1])) ?
-			mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) :
-			mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
+			mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) : mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
 
 		$cnt = count($rows);
 		$items['searchtotal'] = $cnt;
@@ -1423,7 +1422,7 @@ 
 				[
 					FUZZYLEVEL => FL_PREFIX,
 					ULPROPTAG => PR_DISPLAY_NAME,
-					VALUE => [PR_DISPLAY_NAME => "grommunio-sync Search Folder " . $pid],
+					VALUE => [PR_DISPLAY_NAME => "grommunio-sync Search Folder ".$pid],
 				],
 			],
 			TBL_BATCH
@@ -1567,7 +1566,7 @@ 
 				$content_unread = isset($folder[PR_CONTENT_UNREAD]) ? $folder[PR_CONTENT_UNREAD] : -1;
 				$content_deleted = isset($folder[PR_DELETED_MSG_COUNT]) ? $folder[PR_DELETED_MSG_COUNT] : -1;
 
-				$this->folderStatCache[$user][bin2hex($folder[PR_SOURCE_KEY])] = $commit_time . "/" . $content_count . "/" . $content_unread . "/" . $content_deleted;
+				$this->folderStatCache[$user][bin2hex($folder[PR_SOURCE_KEY])] = $commit_time."/".$content_count."/".$content_unread."/".$content_deleted;
 			}
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetFolderStat() fetched status information of %d folders for store '%s'", count($this->folderStatCache[$user]), $user));
 		}
@@ -1749,7 +1748,7 @@ 
 				));
 			}
 		}
-		$messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
+		$messageName = rtrim((($key !== false) ? $key."-" : "").(($type !== "") ? $type : ""), "-");
 		$restriction = $this->getStateMessageRestriction($messageName, $counter, $thisCounterOnly);
 		$stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
 		if ($stateFolderContents) {
@@ -1923,7 +1922,7 @@ 
 				));
 			}
 		}
-		$messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
+		$messageName = rtrim((($key !== false) ? $key."-" : "").(($type !== "") ? $type : ""), "-");
 		$restriction = $this->getStateMessageRestriction($messageName, $counter, true);
 		$stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
 		if ($stateFolderContents) {
@@ -1972,17 +1971,17 @@ 
 			$stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));
 
-			$messageName = rtrim((($key !== false) ? $key . "-" : "") . (($type !== "") ? $type : ""), "-");
+			$messageName = rtrim((($key !== false) ? $key."-" : "").(($type !== "") ? $type : ""), "-");
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): creating new state message '%s-%d'", $messageName, is_int($counter) ? $counter : 0));
 			mapi_setprops($stateMessage, [PR_DISPLAY_NAME => $messageName, PR_MESSAGE_CLASS => 'IPM.Note.GrommunioState']);
 		}
 		if (isset($stateMessage)) {
-			$jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_UNICODE) : $state;
+			$jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE|JSON_UNESCAPED_UNICODE) : $state;
 
 			$encodedState = base64_encode($jsonEncodedState);
 			$encodedStateLength = strlen($encodedState);
 			mapi_setprops($stateMessage, [PR_LAST_VERB_EXECUTED => is_int($counter) ? $counter : 0]);
-			$stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE|MAPI_MODIFY);
 			mapi_stream_setsize($stream, $encodedStateLength);
 			mapi_stream_write($stream, $encodedState);
 			mapi_stream_commit($stream);
@@ -2077,7 +2076,7 @@ 
 	private function adviseStoreToSink($store) {
 		// check if we already advised the store
 		if (!in_array($store, $this->changesSinkStores)) {
-			mapi_msgstore_advise($store, null, fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink);
+			mapi_msgstore_advise($store, null, fnevObjectModified|fnevObjectCreated|fnevObjectMoved|fnevObjectDeleted, $this->changesSink);
 
 			if (mapi_last_hresult()) {
 				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->adviseStoreToSink(): failed to advised store '%s' with code 0x%X. Polling will be performed.", $store, mapi_last_hresult()));
@@ -2502,7 +2501,7 @@ 
 	 * @return mapiFolderObject
 	 */
 	private function createSearchFolder($searchFolderRoot) {
-		$folderName = "grommunio-sync Search Folder " . @getmypid();
+		$folderName = "grommunio-sync Search Folder ".@getmypid();
 		$searchFolders = mapi_folder_gethierarchytable($searchFolderRoot);
 		$restriction = [
 			RES_CONTENT,
@@ -2551,7 +2550,7 @@ 
 					$resOr,
 					[RES_CONTENT,
 						[
-							FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+							FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 							ULPROPTAG => $property,
 							VALUE => u2w($term),
 						],

Braces +34 added lines, -68 removed lines

@@ -130,8 +130,7 @@ 
 		if ($this->impersonateUser !== false) {
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Impersonation active - authenticating: '%s' - impersonating '%s'", $this->mainUser, $this->impersonateUser));
 			$defaultUser = $this->impersonateUser;
-		}
-		else {
+		} else {
 			$defaultUser = $this->mainUser;
 		}
 
@@ -145,8 +144,7 @@ 
 					$gsync_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
 					$user_agent = ($deviceId) ? GSync::GetDeviceManager()->GetUserAgent() : "unknown";
 					$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0, $gsync_version, $user_agent);
-				}
-				else {
+				} else {
 					$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0);
 				}
 				$this->notifications = true;
@@ -163,8 +161,7 @@ 
 					throw new ServiceUnavailableException("Error connecting to KC (login)");
 				}
 			}
-		}
-		catch (MAPIException $ex) {
+		} catch (MAPIException $ex) {
 			throw new AuthenticationRequiredException($ex->getDisplayMessage());
 		}
 
@@ -266,8 +263,7 @@ 
 							$storeProps = mapi_getprops($userstore, [PR_IPM_SUBTREE_ENTRYID]);
 							$rights = $this->HasSecretaryACLs($userstore, '', $storeProps[PR_IPM_SUBTREE_ENTRYID]);
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for secretary ACLs on root folder of impersonated store '%s': '%s'", $user, Utils::PrintAsString($rights)));
-						}
-						else {
+						} else {
 							$zarafauserinfo = @nsp_getuserinfo($this->mainUser);
 							$rights = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin']) ? true : false;
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for admin ACLs on store '%s': '%s'", $user, Utils::PrintAsString($rights)));
@@ -330,8 +326,7 @@ 
 		// for SYSTEM user open the public folders
 		if (strtoupper($this->storeName) == "SYSTEM") {
 			$rootfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-		}
-		else {
+		} else {
 			$rootfolder = mapi_msgstore_openentry($this->store);
 		}
 
@@ -354,8 +349,7 @@ 
 			$folder = $mapiprovider->GetFolder($row);
 			if ($folder) {
 				$folders[] = $folder;
-			}
-			else {
+			} else {
 				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): ignoring folder '%s' as MAPIProvider->GetFolder() did not return a SyncFolder object", (isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "unknown")));
 			}
 		}
@@ -547,8 +541,7 @@ 
 						PR_ICON_INDEX => 262,
 						PR_LAST_VERB_EXECUTED => 104,
 					];
-				}
-				elseif ($sm->replyflag) {
+				} elseif ($sm->replyflag) {
 					$updateProps = [
 						PR_ICON_INDEX => 261,
 						PR_LAST_VERB_EXECUTED => 102,
@@ -608,8 +601,7 @@ 
 						$mapiprops[$sendMailProps["html"]] = $bodyHtml . "<br><br>" . $fwbodyHtml;
 					}
 				}
-			}
-			else {
+			} else {
 				// no fwmessage could be opened and we need it because we do not replace mime
 				if (!isset($sm->replacemime) || $sm->replacemime == false) {
 					throw new StatusException(sprintf("Grommunio->SendMail(): Could not open message id '%s' in folder id '%s' to be replied/forwarded: 0x%X", $sm->source->itemid, $sm->source->folderid, mapi_last_hresult()), SYNC_COMMONSTATUS_ITEMNOTFOUND);
@@ -657,8 +649,7 @@ 
 		if (!$folderid) {
 			$entryid = hex2bin($id);
 			$sk = $id;
-		}
-		else {
+		} else {
 			// id might be in the new longid format, so we have to split it here
 			list($fsk, $sk) = Utils::SplitMessageId($id);
 			// get the entry id of the message
@@ -751,8 +742,7 @@ 
 			$stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $embMessage, ['use_tnef' => -1]);
 			// set the default contenttype for this kind of messages
 			$attachment->contenttype = "message/rfc822";
-		}
-		else {
+		} else {
 			$stream = mapi_openproperty($attach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
 		}
 
@@ -764,8 +754,7 @@ 
 		$attachment->data = MAPIStreamWrapper::Open($stream);
 		if (isset($attprops[PR_ATTACH_MIME_TAG])) {
 			$attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG];
-		}
-		elseif (isset($attprops[PR_ATTACH_MIME_TAG_W])) {
+		} elseif (isset($attprops[PR_ATTACH_MIME_TAG_W])) {
 			$attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG_W];
 		}
 		// TODO default contenttype
@@ -1164,8 +1153,7 @@ 
 							}
 							++$response->recipientcount;
 							$response->recipient[] = $entry;
-						}
-						elseif (is_int($recipient)) {
+						} elseif (is_int($recipient)) {
 							$response->status = $recipient;
 						}
 					}
@@ -1660,8 +1648,7 @@ 
 			if (isset($stateMessageProps[PR_LAST_MODIFICATION_TIME])) {
 				return $stateMessageProps[PR_LAST_MODIFICATION_TIME];
 			}
-		}
-		catch (StateNotFoundException $e) {
+		} catch (StateNotFoundException $e) {
 		}
 
 		return "0";
@@ -1859,8 +1846,7 @@ 
 				if ($devid) {
 					$this->setDeviceUserData($this->userDeviceData, bin2hex($hierarchyRows[0][PR_ENTRYID]), $devid, $this->mainUser, "statefolder");
 				}
-			}
-			elseif ($rowCnt == 0) {
+			} elseif ($rowCnt == 0) {
 				// legacy code: create the hidden state folder and the device subfolder
 				// this should happen when the user configures the device (autodiscover or first sync if no autodiscover)
 
@@ -1872,8 +1858,7 @@ 
 				if ($rowCnt == 1) {
 					$hierarchyRows = mapi_table_queryrows($hierarchy, [PR_ENTRYID], 0, 1);
 					$stateFolder = mapi_msgstore_openentry($this->store, $hierarchyRows[0][PR_ENTRYID]);
-				}
-				elseif ($rowCnt == 0) {
+				} elseif ($rowCnt == 0) {
 					$stateFolder = mapi_folder_createfolder($rootfolder, STORE_STATE_FOLDER, "");
 					mapi_setprops($stateFolder, [PR_ATTR_HIDDEN => true]);
 				}
@@ -1966,8 +1951,7 @@ 
 
 		try {
 			$stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
-		}
-		catch (StateNotFoundException $e) {
+		} catch (StateNotFoundException $e) {
 			// if message is not available, try to create a new one
 			$stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));
@@ -2136,8 +2120,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			$entryid = @mapi_msgstore_createentryid($this->defaultstore, $user);
 		}
 
@@ -2215,8 +2198,7 @@ 
 		// if oof state is set it must be set of oof and get otherwise
 		if (isset($oof->oofstate)) {
 			$this->settingsOofSet($oof);
-		}
-		else {
+		} else {
 			$this->settingsOofGet($oof);
 		}
 	}
@@ -2251,13 +2233,11 @@ 
 					@mapi_setprops($this->defaultstore, [PR_EC_OUTOFOFFICE => false]);
 					@mapi_deleteprops($this->defaultstore, [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL]);
 					SLog::Write(LOGLEVEL_INFO, "Grommunio->settingsOofGet(): Out of office is set but the from and until are in the past. Disabling out of office.");
-				}
-				elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
+				} elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
 					$oof->oofstate = SYNC_SETTINGSOOF_TIMEBASED;
 					$oof->starttime = $oofprops[PR_EC_OUTOFOFFICE_FROM];
 					$oof->endtime = $oofprops[PR_EC_OUTOFOFFICE_UNTIL];
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_WARN, sprintf(
 						"Grommunio->settingsOofGet(): Time based out of office set but end time ('%s') is before startime ('%s').",
 						date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]),
@@ -2265,8 +2245,7 @@ 
 					));
 					$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
 				}
-			}
-			elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
+			} elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
 				SLog::Write(LOGLEVEL_WARN, sprintf(
 					"Grommunio->settingsOofGet(): Time based out of office set but either start time ('%s') or end time ('%s') is missing.",
 					(isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]) : 'empty'),
@@ -2274,8 +2253,7 @@ 
 				));
 				$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
 			}
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_WARN, "Grommunio->Unable to get out of office information");
 		}
 
@@ -2303,16 +2281,13 @@ 
 				if (isset($oof->starttime, $oof->endtime)) {
 					$props[PR_EC_OUTOFOFFICE_FROM] = $oof->starttime;
 					$props[PR_EC_OUTOFOFFICE_UNTIL] = $oof->endtime;
-				}
-				elseif (isset($oof->starttime) || isset($oof->endtime)) {
+				} elseif (isset($oof->starttime) || isset($oof->endtime)) {
 					$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
 				}
-			}
-			else {
+			} else {
 				$deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
 			}
-		}
-		elseif ($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
+		} elseif ($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
 			$props[PR_EC_OUTOFOFFICE] = false;
 			$deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
 		}
@@ -2355,8 +2330,7 @@ 
 				$emailaddresses->primarysmtpaddress = $user["primary_email"];
 				$account->emailaddresses = $emailaddresses;
 				$userinformation->accounts[] = $account;
-			}
-			else {
+			} else {
 				$userinformation->emailaddresses[] = $user["primary_email"];
 			}
 
@@ -2634,13 +2608,11 @@ 
 			// some devices request 0 ambiguous recipients
 			if ($querycnt == 1 && $maxAmbiguousRecipients == 0) {
 				$rowsToQuery = 1;
-			}
-			elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
+			} elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
 				SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->resolveRecipientGAL(): GAL search found %d recipients but the device hasn't requested ambiguous recipients", $querycnt));
 
 				return $recipientGal;
-			}
-			elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
+			} elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
 				$rowsToQuery = $querycnt;
 			}
 			// get the certificate every time because caching the certificate is less expensive than opening addressbook entry again
@@ -2662,13 +2634,11 @@ 
 							SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientGAL(): distlist's '%s' member: '%s'", $to, $distListMembers[$j][PR_DISPLAY_NAME]));
 							$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $to, $distListMembers[$j], $nrDistListMembers);
 						}
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->resolveRecipientGAL(): '%s' is a dist list, but return it as is.", $to));
 						$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
 					}
-				}
-				elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
+				} elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
 					$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
 				}
 			}
@@ -2755,8 +2725,7 @@ 
 					break;
 				}
 			}
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientContact(): Unable to open public store: 0x%X", $result));
 		}
 
@@ -2815,18 +2784,15 @@ 
 
 		if ($type == SYNC_RESOLVERECIPIENTS_TYPE_GAL) {
 			$certificateProp = PR_EMS_AB_TAGGED_X509_CERT;
-		}
-		elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
+		} elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
 			$certificateProp = PR_USER_X509_CERTIFICATE;
-		}
-		else {
+		} else {
 			$certificateProp = null;
 		}
 
 		if (isset($recipientProperties[$certificateProp]) && is_array($recipientProperties[$certificateProp]) && !empty($recipientProperties[$certificateProp])) {
 			$certificates = $this->getCertificates($recipientProperties[$certificateProp], $recipientCount);
-		}
-		else {
+		} else {
 			$certificates = $this->getCertificates(false);
 			SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->createResolveRecipient(): No certificate found for '%s' (requested email address: '%s')", $recipientProperties[PR_DISPLAY_NAME], $email));
 		}

lib/grommunio/mapistreamwrapper.php

Indentation +165 added lines, -165 removed lines

@@ -9,171 +9,171 @@
  */
 
 class MAPIStreamWrapper {
-	public const PROTOCOL = "mapistream";
-
-	private $mapistream;
-	private $position;
-	private $streamlength;
-	private $toTruncate;
-	private $truncateHtmlSafe;
-	private $context;
-
-	/**
-	 * Opens the stream
-	 * The mapistream reference is passed over the context.
-	 *
-	 * @param string $path        Specifies the URL that was passed to the original function
-	 * @param string $mode        The mode used to open the file, as detailed for fopen()
-	 * @param int    $options     Holds additional flags set by the streams API
-	 * @param string $opened_path if the path is opened successfully, and STREAM_USE_PATH is set in options,
-	 *                            opened_path should be set to the full path of the file/resource that was actually opened
-	 *
-	 * @return bool
-	 */
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$contextOptions = stream_context_get_options($this->context);
-		if (!isset($contextOptions[self::PROTOCOL]['stream'])) {
-			return false;
-		}
-
-		$this->position = 0;
-		$this->toTruncate = false;
-		$this->truncateHtmlSafe = (isset($contextOptions[self::PROTOCOL]['truncatehtmlsafe'])) ? $contextOptions[self::PROTOCOL]['truncatehtmlsafe'] : false;
-
-		// this is our stream!
-		$this->mapistream = $contextOptions[self::PROTOCOL]['stream'];
-
-		// get the data length from mapi
-		if ($this->mapistream) {
-			$stat = mapi_stream_stat($this->mapistream);
-			$this->streamlength = $stat["cb"];
-		}
-		else {
-			$this->streamlength = 0;
-		}
-
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIStreamWrapper::stream_open(): initialized mapistream: %s - streamlength: %d - HTML-safe-truncate: %s", $this->mapistream, $this->streamlength, Utils::PrintAsString($this->truncateHtmlSafe)));
-
-		return true;
-	}
-
-	/**
-	 * Reads from stream.
-	 *
-	 * @param int $len amount of bytes to be read
-	 *
-	 * @return string
-	 */
-	public function stream_read($len) {
-		$len = ($this->position + $len > $this->streamlength) ? ($this->streamlength - $this->position) : $len;
-
-		// read 4 additional bytes from the stream so we can always truncate correctly
-		if ($this->toTruncate && $this->position + $len >= $this->streamlength) {
-			$len += 4;
-		}
-		if ($this->mapistream) {
-			$data = mapi_stream_read($this->mapistream, $len);
-		}
-		else {
-			$data = "";
-		}
-		$this->position += strlen($data);
-
-		// we need to truncate UTF8 compatible if ftruncate() was called
-		if ($this->toTruncate && $this->position >= $this->streamlength) {
-			$data = Utils::Utf8_truncate($data, $this->streamlength, $this->truncateHtmlSafe);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Stream "seek" functionality.
-	 *
-	 * @param int $offset
-	 * @param int $whence
-	 *
-	 * @return bool
-	 */
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		switch ($whence) {
-			case SEEK_SET:
-				$mapiWhence = STREAM_SEEK_SET;
-				break;
-
-			case SEEK_END:
-				$mapiWhence = STREAM_SEEK_END;
-				break;
-
-			default:
-				$mapiWhence = STREAM_SEEK_CUR;
-		}
-
-		return mapi_stream_seek($this->mapistream, $offset, $mapiWhence);
-	}
-
-	/**
-	 * Returns the current position on stream.
-	 *
-	 * @return int
-	 */
-	public function stream_tell() {
-		return $this->position;
-	}
-
-	/**
-	 * Indicates if 'end of file' is reached.
-	 *
-	 * @return bool
-	 */
-	public function stream_eof() {
-		return $this->position >= $this->streamlength;
-	}
-
-	/**
-	 * Truncates the stream to the new size.
-	 *
-	 * @param int $new_size
-	 *
-	 * @return bool
-	 */
-	public function stream_truncate($new_size) {
-		$this->streamlength = $new_size;
-		$this->toTruncate = true;
-
-		if ($this->position > $this->streamlength) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("MAPIStreamWrapper->stream_truncate(): stream position (%d) ahead of new size of %d. Repositioning pointer to end of stream.", $this->position, $this->streamlength));
-			$this->position = $this->streamlength;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Retrieves information about a stream.
-	 *
-	 * @return array
-	 */
-	public function stream_stat() {
-		return [
-			7 => $this->streamlength,
-			'size' => $this->streamlength,
-		];
-	}
-
-	/**
-	 * Instantiates a MAPIStreamWrapper.
-	 *
-	 * @param mapistream $mapistream       The stream to be wrapped
-	 * @param bool       $truncatehtmlsafe Indicates if a truncation should be done html-safe - default: false
-	 *
-	 * @return MAPIStreamWrapper
-	 */
-	public static function Open($mapistream, $truncatehtmlsafe = false) {
-		$context = stream_context_create([self::PROTOCOL => ['stream' => &$mapistream, 'truncatehtmlsafe' => $truncatehtmlsafe]]);
-
-		return fopen(self::PROTOCOL . "://", 'r', false, $context);
-	}
+    public const PROTOCOL = "mapistream";
+
+    private $mapistream;
+    private $position;
+    private $streamlength;
+    private $toTruncate;
+    private $truncateHtmlSafe;
+    private $context;
+
+    /**
+     * Opens the stream
+     * The mapistream reference is passed over the context.
+     *
+     * @param string $path        Specifies the URL that was passed to the original function
+     * @param string $mode        The mode used to open the file, as detailed for fopen()
+     * @param int    $options     Holds additional flags set by the streams API
+     * @param string $opened_path if the path is opened successfully, and STREAM_USE_PATH is set in options,
+     *                            opened_path should be set to the full path of the file/resource that was actually opened
+     *
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $contextOptions = stream_context_get_options($this->context);
+        if (!isset($contextOptions[self::PROTOCOL]['stream'])) {
+            return false;
+        }
+
+        $this->position = 0;
+        $this->toTruncate = false;
+        $this->truncateHtmlSafe = (isset($contextOptions[self::PROTOCOL]['truncatehtmlsafe'])) ? $contextOptions[self::PROTOCOL]['truncatehtmlsafe'] : false;
+
+        // this is our stream!
+        $this->mapistream = $contextOptions[self::PROTOCOL]['stream'];
+
+        // get the data length from mapi
+        if ($this->mapistream) {
+            $stat = mapi_stream_stat($this->mapistream);
+            $this->streamlength = $stat["cb"];
+        }
+        else {
+            $this->streamlength = 0;
+        }
+
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIStreamWrapper::stream_open(): initialized mapistream: %s - streamlength: %d - HTML-safe-truncate: %s", $this->mapistream, $this->streamlength, Utils::PrintAsString($this->truncateHtmlSafe)));
+
+        return true;
+    }
+
+    /**
+     * Reads from stream.
+     *
+     * @param int $len amount of bytes to be read
+     *
+     * @return string
+     */
+    public function stream_read($len) {
+        $len = ($this->position + $len > $this->streamlength) ? ($this->streamlength - $this->position) : $len;
+
+        // read 4 additional bytes from the stream so we can always truncate correctly
+        if ($this->toTruncate && $this->position + $len >= $this->streamlength) {
+            $len += 4;
+        }
+        if ($this->mapistream) {
+            $data = mapi_stream_read($this->mapistream, $len);
+        }
+        else {
+            $data = "";
+        }
+        $this->position += strlen($data);
+
+        // we need to truncate UTF8 compatible if ftruncate() was called
+        if ($this->toTruncate && $this->position >= $this->streamlength) {
+            $data = Utils::Utf8_truncate($data, $this->streamlength, $this->truncateHtmlSafe);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Stream "seek" functionality.
+     *
+     * @param int $offset
+     * @param int $whence
+     *
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        switch ($whence) {
+            case SEEK_SET:
+                $mapiWhence = STREAM_SEEK_SET;
+                break;
+
+            case SEEK_END:
+                $mapiWhence = STREAM_SEEK_END;
+                break;
+
+            default:
+                $mapiWhence = STREAM_SEEK_CUR;
+        }
+
+        return mapi_stream_seek($this->mapistream, $offset, $mapiWhence);
+    }
+
+    /**
+     * Returns the current position on stream.
+     *
+     * @return int
+     */
+    public function stream_tell() {
+        return $this->position;
+    }
+
+    /**
+     * Indicates if 'end of file' is reached.
+     *
+     * @return bool
+     */
+    public function stream_eof() {
+        return $this->position >= $this->streamlength;
+    }
+
+    /**
+     * Truncates the stream to the new size.
+     *
+     * @param int $new_size
+     *
+     * @return bool
+     */
+    public function stream_truncate($new_size) {
+        $this->streamlength = $new_size;
+        $this->toTruncate = true;
+
+        if ($this->position > $this->streamlength) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("MAPIStreamWrapper->stream_truncate(): stream position (%d) ahead of new size of %d. Repositioning pointer to end of stream.", $this->position, $this->streamlength));
+            $this->position = $this->streamlength;
+        }
+
+        return true;
+    }
+
+    /**
+     * Retrieves information about a stream.
+     *
+     * @return array
+     */
+    public function stream_stat() {
+        return [
+            7 => $this->streamlength,
+            'size' => $this->streamlength,
+        ];
+    }
+
+    /**
+     * Instantiates a MAPIStreamWrapper.
+     *
+     * @param mapistream $mapistream       The stream to be wrapped
+     * @param bool       $truncatehtmlsafe Indicates if a truncation should be done html-safe - default: false
+     *
+     * @return MAPIStreamWrapper
+     */
+    public static function Open($mapistream, $truncatehtmlsafe = false) {
+        $context = stream_context_create([self::PROTOCOL => ['stream' => &$mapistream, 'truncatehtmlsafe' => $truncatehtmlsafe]]);
+
+        return fopen(self::PROTOCOL . "://", 'r', false, $context);
+    }
 }
 
 stream_wrapper_register(MAPIStreamWrapper::PROTOCOL, "MAPIStreamWrapper");

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
 	public static function Open($mapistream, $truncatehtmlsafe = false) {
 		$context = stream_context_create([self::PROTOCOL => ['stream' => &$mapistream, 'truncatehtmlsafe' => $truncatehtmlsafe]]);
 
-		return fopen(self::PROTOCOL . "://", 'r', false, $context);
+		return fopen(self::PROTOCOL."://", 'r', false, $context);
 	}
 }
 

Braces +2 added lines, -4 removed lines

@@ -47,8 +47,7 @@ 
 		if ($this->mapistream) {
 			$stat = mapi_stream_stat($this->mapistream);
 			$this->streamlength = $stat["cb"];
-		}
-		else {
+		} else {
 			$this->streamlength = 0;
 		}
 
@@ -73,8 +72,7 @@ 
 		}
 		if ($this->mapistream) {
 			$data = mapi_stream_read($this->mapistream, $len);
-		}
-		else {
+		} else {
 			$data = "";
 		}
 		$this->position += strlen($data);

lib/grommunio/exporter.php

Indentation +286 added lines, -286 removed lines

@@ -15,290 +15,290 @@
  * that the ImportProxies are used.
  */
 class ExportChangesICS implements IExportChanges {
-	private $folderid;
-	private $store;
-	private $session;
-	private $restriction;
-	private $contentparameters;
-	private $flags;
-	private $exporterflags;
-	private $exporter;
-	private $moveSrcState;
-	private $moveDstState;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param mapisession $session
-	 * @param mapistore   $store
-	 * @param mixed       $folderid
-	 *
-	 * @throws StatusException
-	 */
-	public function __construct($session, $store, $folderid = false) {
-		// Open a hierarchy or a contents exporter depending on whether a folderid was specified
-		$this->session = $session;
-		$this->folderid = $folderid;
-		$this->store = $store;
-		$this->restriction = false;
-
-		try {
-			if ($folderid) {
-				$entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
-			}
-			else {
-				$storeprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-				if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
-					$entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-				}
-				else {
-					$entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
-				}
-			}
-
-			$folder = false;
-			if ($entryid) {
-				$folder = mapi_msgstore_openentry($this->store, $entryid);
-				if (!$folder) {
-					SLog::Write(LOGLEVEL_WARN, sprintf("ExportChangesICS(): Error, mapi_msgstore_openentry() failed: 0x%08X", mapi_last_hresult()));
-				}
-			}
-
-			// Get the actual ICS exporter
-			if ($folder) {
-				if ($folderid) {
-					$this->exporter = mapi_openproperty($folder, PR_CONTENTS_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
-				}
-				else {
-					$this->exporter = mapi_openproperty($folder, PR_HIERARCHY_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
-				}
-			}
-			else {
-				$this->exporter = false;
-			}
-		}
-		catch (MAPIException $me) {
-			$this->exporter = false;
-			// We return the general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
-			// if this happened while doing content sync, the mobile will try to resync the folderhierarchy
-			throw new StatusException(sprintf("ExportChangesICS('%s','%s','%s'): Error, unable to open folder: 0x%X", $session, $store, Utils::PrintAsString($folderid), mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN);
-		}
-	}
-
-	/**
-	 * Configures the exporter.
-	 *
-	 * @param string $state
-	 * @param int    $flags
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function Config($state, $flags = 0) {
-		$this->exporterflags = 0;
-		$this->flags = $flags;
-
-		// this should never happen
-		if ($this->exporter === false || is_array($state)) {
-			throw new StatusException("ExportChangesICS->Config(): Error, exporter not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
-		}
-
-		// change exporterflags if we are doing a ContentExport
-		if ($this->folderid) {
-			$this->exporterflags |= SYNC_NORMAL | SYNC_READ_STATE;
-
-			// Initial sync, we don't want deleted items. If the initial sync is chunked
-			// we check the change ID of the syncstate (0 at initial sync)
-			// On subsequent syncs, we do want to receive delete events.
-			if (strlen($state) == 0 || bin2hex(substr($state, 4, 4)) == "00000000") {
-				if (!($this->flags & BACKEND_DISCARD_DATA)) {
-					SLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
-				}
-				$this->exporterflags |= SYNC_NO_SOFT_DELETIONS | SYNC_NO_DELETIONS;
-			}
-		}
-
-		if ($this->flags & BACKEND_DISCARD_DATA) {
-			$this->exporterflags |= SYNC_CATCHUP;
-			$this->exporterflags |= SYNC_STATE_READONLY;
-		}
-
-		// Put the state information in a stream that can be used by ICS
-		$stream = mapi_stream_create();
-		if (strlen($state) == 0) {
-			$state = hex2bin("0000000000000000");
-		}
-
-		if (!($this->flags & BACKEND_DISCARD_DATA)) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->Config() initialized with state: 0x%s", bin2hex($state)));
-		}
-
-		mapi_stream_write($stream, $state);
-		$this->statestream = $stream;
-	}
-
-	/**
-	 * Configures additional parameters used for content synchronization.
-	 *
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function ConfigContentParameters($contentparameters) {
-		$filtertype = $contentparameters->GetFilterType();
-
-		switch ($contentparameters->GetContentClass()) {
-			case "Email":
-				$this->restriction = ($filtertype || !Utils::CheckMapiExtVersion('7')) ? MAPIUtils::GetEmailRestriction(Utils::GetCutOffDate($filtertype)) : false;
-				break;
-
-			case "Calendar":
-				$this->restriction = ($filtertype || !Utils::CheckMapiExtVersion('7')) ? MAPIUtils::GetCalendarRestriction($this->store, Utils::GetCutOffDate($filtertype)) : false;
-				break;
-
-			default:
-			case "Contacts":
-			case "Tasks":
-				$this->restriction = false;
-				break;
-		}
-
-		$this->contentParameters = $contentparameters;
-	}
-
-	/**
-	 * Sets the importer the exporter will sent it's changes to
-	 * and initializes the Exporter.
-	 *
-	 * @param object &$importer Implementation of IImportChanges
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function InitializeExporter(&$importer) {
-		// Because we're using ICS, we need to wrap the given importer to make it suitable to pass
-		// to ICS. We do this in two steps: first, wrap the importer with our own PHP importer class
-		// which removes all MAPI dependency, and then wrap that class with a C++ wrapper so we can
-		// pass it to ICS
-
-		// this should never happen!
-		if ($this->exporter === false || !isset($this->statestream) || !isset($this->flags) || !isset($this->exporterflags) ||
-			($this->folderid && !isset($this->contentParameters))) {
-			throw new StatusException("ExportChangesICS->InitializeExporter(): Error, exporter or essential data not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
-		}
-
-		// PHP wrapper
-		$phpwrapper = new PHPWrapper($this->session, $this->store, $importer, $this->folderid);
-
-		// with a folderid we are going to get content
-		if ($this->folderid) {
-			$phpwrapper->ConfigContentParameters($this->contentParameters);
-
-			// ICS c++ wrapper
-			$mapiimporter = mapi_wrap_importcontentschanges($phpwrapper);
-			$includeprops = false;
-		}
-		else {
-			$mapiimporter = mapi_wrap_importhierarchychanges($phpwrapper);
-			$includeprops = [PR_SOURCE_KEY, PR_DISPLAY_NAME];
-		}
-
-		if (!$mapiimporter) {
-			throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_wrap_import_*_changes() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
-		}
-
-		$ret = mapi_exportchanges_config($this->exporter, $this->statestream, $this->exporterflags, $mapiimporter, $this->restriction, $includeprops, false, 1);
-		if (!$ret) {
-			throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_exportchanges_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
-		}
-
-		$changes = mapi_exportchanges_getchangecount($this->exporter);
-		if ($changes || !($this->flags & BACKEND_DISCARD_DATA)) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->InitializeExporter() successfully. %d changes ready to sync for '%s'.", $changes, ($this->folderid) ? bin2hex($this->folderid) : 'hierarchy'));
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Indicates if the exporter was configured with the BACKEND_DISCARD_DATA flag.
-	 *
-	 * @return bool
-	 */
-	public function HasDiscardDataFlag() {
-		if (isset($this->flags) && $this->flags & BACKEND_DISCARD_DATA) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Reads the current state from the Exporter.
-	 *
-	 * @throws StatusException
-	 *
-	 * @return string
-	 */
-	public function GetState() {
-		$error = false;
-		if (!isset($this->statestream) || $this->exporter === false) {
-			$error = true;
-		}
-
-		if ($error === true || mapi_exportchanges_updatestate($this->exporter, $this->statestream) != true) {
-			throw new StatusException(sprintf("ExportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid) ? SYNC_STATUS_FOLDERHIERARCHYCHANGED : SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
-		}
-
-		mapi_stream_seek($this->statestream, 0, STREAM_SEEK_SET);
-
-		$state = "";
-		while (true) {
-			$data = mapi_stream_read($this->statestream, 4096);
-			if (strlen($data)) {
-				$state .= $data;
-			}
-			else {
-				break;
-			}
-		}
-
-		return $state;
-	}
-
-	/**
-	 * Returns the amount of changes to be exported.
-	 *
-	 * @return int
-	 */
-	public function GetChangeCount() {
-		if ($this->exporter) {
-			return mapi_exportchanges_getchangecount($this->exporter);
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Synchronizes a change.
-	 *
-	 * @return array
-	 */
-	public function Synchronize() {
-		if ($this->flags & BACKEND_DISCARD_DATA) {
-			SLog::Write(LOGLEVEL_WARN, 'ExportChangesICS->Synchronize(): not supported in combination with the BACKEND_DISCARD_DATA flag.');
-
-			return false;
-		}
-
-		if ($this->exporter) {
-			return mapi_exportchanges_synchronize($this->exporter);
-		}
-
-		return false;
-	}
+    private $folderid;
+    private $store;
+    private $session;
+    private $restriction;
+    private $contentparameters;
+    private $flags;
+    private $exporterflags;
+    private $exporter;
+    private $moveSrcState;
+    private $moveDstState;
+
+    /**
+     * Constructor.
+     *
+     * @param mapisession $session
+     * @param mapistore   $store
+     * @param mixed       $folderid
+     *
+     * @throws StatusException
+     */
+    public function __construct($session, $store, $folderid = false) {
+        // Open a hierarchy or a contents exporter depending on whether a folderid was specified
+        $this->session = $session;
+        $this->folderid = $folderid;
+        $this->store = $store;
+        $this->restriction = false;
+
+        try {
+            if ($folderid) {
+                $entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
+            }
+            else {
+                $storeprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
+                if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
+                    $entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
+                }
+                else {
+                    $entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
+                }
+            }
+
+            $folder = false;
+            if ($entryid) {
+                $folder = mapi_msgstore_openentry($this->store, $entryid);
+                if (!$folder) {
+                    SLog::Write(LOGLEVEL_WARN, sprintf("ExportChangesICS(): Error, mapi_msgstore_openentry() failed: 0x%08X", mapi_last_hresult()));
+                }
+            }
+
+            // Get the actual ICS exporter
+            if ($folder) {
+                if ($folderid) {
+                    $this->exporter = mapi_openproperty($folder, PR_CONTENTS_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
+                }
+                else {
+                    $this->exporter = mapi_openproperty($folder, PR_HIERARCHY_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
+                }
+            }
+            else {
+                $this->exporter = false;
+            }
+        }
+        catch (MAPIException $me) {
+            $this->exporter = false;
+            // We return the general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
+            // if this happened while doing content sync, the mobile will try to resync the folderhierarchy
+            throw new StatusException(sprintf("ExportChangesICS('%s','%s','%s'): Error, unable to open folder: 0x%X", $session, $store, Utils::PrintAsString($folderid), mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN);
+        }
+    }
+
+    /**
+     * Configures the exporter.
+     *
+     * @param string $state
+     * @param int    $flags
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function Config($state, $flags = 0) {
+        $this->exporterflags = 0;
+        $this->flags = $flags;
+
+        // this should never happen
+        if ($this->exporter === false || is_array($state)) {
+            throw new StatusException("ExportChangesICS->Config(): Error, exporter not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        }
+
+        // change exporterflags if we are doing a ContentExport
+        if ($this->folderid) {
+            $this->exporterflags |= SYNC_NORMAL | SYNC_READ_STATE;
+
+            // Initial sync, we don't want deleted items. If the initial sync is chunked
+            // we check the change ID of the syncstate (0 at initial sync)
+            // On subsequent syncs, we do want to receive delete events.
+            if (strlen($state) == 0 || bin2hex(substr($state, 4, 4)) == "00000000") {
+                if (!($this->flags & BACKEND_DISCARD_DATA)) {
+                    SLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
+                }
+                $this->exporterflags |= SYNC_NO_SOFT_DELETIONS | SYNC_NO_DELETIONS;
+            }
+        }
+
+        if ($this->flags & BACKEND_DISCARD_DATA) {
+            $this->exporterflags |= SYNC_CATCHUP;
+            $this->exporterflags |= SYNC_STATE_READONLY;
+        }
+
+        // Put the state information in a stream that can be used by ICS
+        $stream = mapi_stream_create();
+        if (strlen($state) == 0) {
+            $state = hex2bin("0000000000000000");
+        }
+
+        if (!($this->flags & BACKEND_DISCARD_DATA)) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->Config() initialized with state: 0x%s", bin2hex($state)));
+        }
+
+        mapi_stream_write($stream, $state);
+        $this->statestream = $stream;
+    }
+
+    /**
+     * Configures additional parameters used for content synchronization.
+     *
+     * @param ContentParameters $contentparameters
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function ConfigContentParameters($contentparameters) {
+        $filtertype = $contentparameters->GetFilterType();
+
+        switch ($contentparameters->GetContentClass()) {
+            case "Email":
+                $this->restriction = ($filtertype || !Utils::CheckMapiExtVersion('7')) ? MAPIUtils::GetEmailRestriction(Utils::GetCutOffDate($filtertype)) : false;
+                break;
+
+            case "Calendar":
+                $this->restriction = ($filtertype || !Utils::CheckMapiExtVersion('7')) ? MAPIUtils::GetCalendarRestriction($this->store, Utils::GetCutOffDate($filtertype)) : false;
+                break;
+
+            default:
+            case "Contacts":
+            case "Tasks":
+                $this->restriction = false;
+                break;
+        }
+
+        $this->contentParameters = $contentparameters;
+    }
+
+    /**
+     * Sets the importer the exporter will sent it's changes to
+     * and initializes the Exporter.
+     *
+     * @param object &$importer Implementation of IImportChanges
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function InitializeExporter(&$importer) {
+        // Because we're using ICS, we need to wrap the given importer to make it suitable to pass
+        // to ICS. We do this in two steps: first, wrap the importer with our own PHP importer class
+        // which removes all MAPI dependency, and then wrap that class with a C++ wrapper so we can
+        // pass it to ICS
+
+        // this should never happen!
+        if ($this->exporter === false || !isset($this->statestream) || !isset($this->flags) || !isset($this->exporterflags) ||
+            ($this->folderid && !isset($this->contentParameters))) {
+            throw new StatusException("ExportChangesICS->InitializeExporter(): Error, exporter or essential data not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        }
+
+        // PHP wrapper
+        $phpwrapper = new PHPWrapper($this->session, $this->store, $importer, $this->folderid);
+
+        // with a folderid we are going to get content
+        if ($this->folderid) {
+            $phpwrapper->ConfigContentParameters($this->contentParameters);
+
+            // ICS c++ wrapper
+            $mapiimporter = mapi_wrap_importcontentschanges($phpwrapper);
+            $includeprops = false;
+        }
+        else {
+            $mapiimporter = mapi_wrap_importhierarchychanges($phpwrapper);
+            $includeprops = [PR_SOURCE_KEY, PR_DISPLAY_NAME];
+        }
+
+        if (!$mapiimporter) {
+            throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_wrap_import_*_changes() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        }
+
+        $ret = mapi_exportchanges_config($this->exporter, $this->statestream, $this->exporterflags, $mapiimporter, $this->restriction, $includeprops, false, 1);
+        if (!$ret) {
+            throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_exportchanges_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        }
+
+        $changes = mapi_exportchanges_getchangecount($this->exporter);
+        if ($changes || !($this->flags & BACKEND_DISCARD_DATA)) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->InitializeExporter() successfully. %d changes ready to sync for '%s'.", $changes, ($this->folderid) ? bin2hex($this->folderid) : 'hierarchy'));
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Indicates if the exporter was configured with the BACKEND_DISCARD_DATA flag.
+     *
+     * @return bool
+     */
+    public function HasDiscardDataFlag() {
+        if (isset($this->flags) && $this->flags & BACKEND_DISCARD_DATA) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Reads the current state from the Exporter.
+     *
+     * @throws StatusException
+     *
+     * @return string
+     */
+    public function GetState() {
+        $error = false;
+        if (!isset($this->statestream) || $this->exporter === false) {
+            $error = true;
+        }
+
+        if ($error === true || mapi_exportchanges_updatestate($this->exporter, $this->statestream) != true) {
+            throw new StatusException(sprintf("ExportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid) ? SYNC_STATUS_FOLDERHIERARCHYCHANGED : SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
+        }
+
+        mapi_stream_seek($this->statestream, 0, STREAM_SEEK_SET);
+
+        $state = "";
+        while (true) {
+            $data = mapi_stream_read($this->statestream, 4096);
+            if (strlen($data)) {
+                $state .= $data;
+            }
+            else {
+                break;
+            }
+        }
+
+        return $state;
+    }
+
+    /**
+     * Returns the amount of changes to be exported.
+     *
+     * @return int
+     */
+    public function GetChangeCount() {
+        if ($this->exporter) {
+            return mapi_exportchanges_getchangecount($this->exporter);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Synchronizes a change.
+     *
+     * @return array
+     */
+    public function Synchronize() {
+        if ($this->flags & BACKEND_DISCARD_DATA) {
+            SLog::Write(LOGLEVEL_WARN, 'ExportChangesICS->Synchronize(): not supported in combination with the BACKEND_DISCARD_DATA flag.');
+
+            return false;
+        }
+
+        if ($this->exporter) {
+            return mapi_exportchanges_synchronize($this->exporter);
+        }
+
+        return false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
 
 		// change exporterflags if we are doing a ContentExport
 		if ($this->folderid) {
-			$this->exporterflags |= SYNC_NORMAL | SYNC_READ_STATE;
+			$this->exporterflags |= SYNC_NORMAL|SYNC_READ_STATE;
 
 			// Initial sync, we don't want deleted items. If the initial sync is chunked
 			// we check the change ID of the syncstate (0 at initial sync)
@@ -115,7 +115,7 @@ 
 				if (!($this->flags & BACKEND_DISCARD_DATA)) {
 					SLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
 				}
-				$this->exporterflags |= SYNC_NO_SOFT_DELETIONS | SYNC_NO_DELETIONS;
+				$this->exporterflags |= SYNC_NO_SOFT_DELETIONS|SYNC_NO_DELETIONS;
 			}
 		}
 

Braces +7 added lines, -14 removed lines

@@ -45,13 +45,11 @@ 
 		try {
 			if ($folderid) {
 				$entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
-			}
-			else {
+			} else {
 				$storeprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
 				if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
 					$entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-				}
-				else {
+				} else {
 					$entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
 				}
 			}
@@ -68,16 +66,13 @@ 
 			if ($folder) {
 				if ($folderid) {
 					$this->exporter = mapi_openproperty($folder, PR_CONTENTS_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
-				}
-				else {
+				} else {
 					$this->exporter = mapi_openproperty($folder, PR_HIERARCHY_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
 				}
-			}
-			else {
+			} else {
 				$this->exporter = false;
 			}
-		}
-		catch (MAPIException $me) {
+		} catch (MAPIException $me) {
 			$this->exporter = false;
 			// We return the general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
 			// if this happened while doing content sync, the mobile will try to resync the folderhierarchy
@@ -201,8 +196,7 @@ 
 			// ICS c++ wrapper
 			$mapiimporter = mapi_wrap_importcontentschanges($phpwrapper);
 			$includeprops = false;
-		}
-		else {
+		} else {
 			$mapiimporter = mapi_wrap_importhierarchychanges($phpwrapper);
 			$includeprops = [PR_SOURCE_KEY, PR_DISPLAY_NAME];
 		}
@@ -261,8 +255,7 @@ 
 			$data = mapi_stream_read($this->statestream, 4096);
 			if (strlen($data)) {
 				$state .= $data;
-			}
-			else {
+			} else {
 				break;
 			}
 		}

lib/grommunio/mapiprovider.php

Indentation +3146 added lines, -3146 removed lines

@@ -6,3159 +6,3159 @@
  */
 
 class MAPIProvider {
-	private $session;
-	private $store;
-	private $zRFC822;
-	private $addressbook;
-	private $storeProps;
-	private $inboxProps;
-	private $rootProps;
-	private $specialFoldersData;
-
-	/**
-	 * Constructor of the MAPI Provider
-	 * Almost all methods of this class require a MAPI session and/or store.
-	 *
-	 * @param resource $session
-	 * @param resource $store
-	 */
-	public function __construct($session, $store) {
-		$this->session = $session;
-		$this->store = $store;
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+    private $session;
+    private $store;
+    private $zRFC822;
+    private $addressbook;
+    private $storeProps;
+    private $inboxProps;
+    private $rootProps;
+    private $specialFoldersData;
+
+    /**
+     * Constructor of the MAPI Provider
+     * Almost all methods of this class require a MAPI session and/or store.
+     *
+     * @param resource $session
+     * @param resource $store
+     */
+    public function __construct($session, $store) {
+        $this->session = $session;
+        $this->store = $store;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * GETTER
 	 */
 
-	/**
-	 * Reads a message from MAPI
-	 * Depending on the message class, a contact, appointment, task or email is read.
-	 *
-	 * @param mixed             $mapimessage
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @return SyncObject
-	 */
-	public function GetMessage($mapimessage, $contentparameters) {
-		// Gets the Sync object from a MAPI object according to its message class
-
-		$props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS]);
-		if (isset($props[PR_MESSAGE_CLASS])) {
-			$messageclass = $props[PR_MESSAGE_CLASS];
-		}
-		else {
-			$messageclass = "IPM";
-		}
-
-		if (strpos($messageclass, "IPM.Contact") === 0) {
-			return $this->getContact($mapimessage, $contentparameters);
-		}
-		if (strpos($messageclass, "IPM.Appointment") === 0) {
-			return $this->getAppointment($mapimessage, $contentparameters);
-		}
-		if (strpos($messageclass, "IPM.Task") === 0 && strpos($messageclass, "IPM.TaskRequest") === false) {
-			return $this->getTask($mapimessage, $contentparameters);
-		}
-		if (strpos($messageclass, "IPM.StickyNote") === 0) {
-			return $this->getNote($mapimessage, $contentparameters);
-		}
-
-		return $this->getEmail($mapimessage, $contentparameters);
-	}
-
-	/**
-	 * Reads a contact object from MAPI.
-	 *
-	 * @param mixed             $mapimessage
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @return SyncContact
-	 */
-	private function getContact($mapimessage, $contentparameters) {
-		$message = new SyncContact();
-
-		// Standard one-to-one mappings first
-		$this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetContactMapping());
-
-		// Contact specific props
-		$contactproperties = MAPIMapping::GetContactProperties();
-		$messageprops = $this->getProps($mapimessage, $contactproperties);
-
-		// set the body according to contentparameters and supported AS version
-		$this->setMessageBody($mapimessage, $contentparameters, $message);
-
-		// check the picture
-		if (isset($messageprops[$contactproperties["haspic"]]) && $messageprops[$contactproperties["haspic"]]) {
-			// Add attachments
-			$attachtable = mapi_message_getattachmenttable($mapimessage);
-			mapi_table_restrict($attachtable, MAPIUtils::GetContactPicRestriction());
-			$rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM, PR_ATTACH_SIZE]);
-
-			foreach ($rows as $row) {
-				if (isset($row[PR_ATTACH_NUM])) {
-					$mapiattach = mapi_message_openattach($mapimessage, $row[PR_ATTACH_NUM]);
-					$message->picture = base64_encode(mapi_attach_openbin($mapiattach, PR_ATTACH_DATA_BIN));
-				}
-			}
-		}
-
-		return $message;
-	}
-
-	/**
-	 * Reads a task object from MAPI.
-	 *
-	 * @param mixed             $mapimessage
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @return SyncTask
-	 */
-	private function getTask($mapimessage, $contentparameters) {
-		$message = new SyncTask();
-
-		// Standard one-to-one mappings first
-		$this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetTaskMapping());
-
-		// Task specific props
-		$taskproperties = MAPIMapping::GetTaskProperties();
-		$messageprops = $this->getProps($mapimessage, $taskproperties);
-
-		// set the body according to contentparameters and supported AS version
-		$this->setMessageBody($mapimessage, $contentparameters, $message);
-
-		// task with deadoccur is an occurrence of a recurring task and does not need to be handled as recurring
-		// webaccess does not set deadoccur for the initial recurring task
-		if (isset($messageprops[$taskproperties["isrecurringtag"]]) &&
-			$messageprops[$taskproperties["isrecurringtag"]] &&
-			(!isset($messageprops[$taskproperties["deadoccur"]]) ||
-			(isset($messageprops[$taskproperties["deadoccur"]]) &&
-			!$messageprops[$taskproperties["deadoccur"]]))) {
-			// Process recurrence
-			$message->recurrence = new SyncTaskRecurrence();
-			$this->getRecurrence($mapimessage, $messageprops, $message, $message->recurrence, false);
-		}
-
-		// when set the task to complete using the WebAccess, the dateComplete property is not set correctly
-		if ($message->complete == 1 && !isset($message->datecompleted)) {
-			$message->datecompleted = time();
-		}
-
-		// if no reminder is set, announce that to the mobile
-		if (!isset($message->reminderset)) {
-			$message->reminderset = 0;
-		}
-
-		return $message;
-	}
-
-	/**
-	 * Reads an appointment object from MAPI.
-	 *
-	 * @param mixed             $mapimessage
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @return SyncAppointment
-	 */
-	private function getAppointment($mapimessage, $contentparameters) {
-		$message = new SyncAppointment();
-
-		// Standard one-to-one mappings first
-		$this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetAppointmentMapping());
-
-		// Appointment specific props
-		$appointmentprops = MAPIMapping::GetAppointmentProperties();
-		$messageprops = $this->getProps($mapimessage, $appointmentprops);
-
-		// set the body according to contentparameters and supported AS version
-		$this->setMessageBody($mapimessage, $contentparameters, $message);
-
-		// Set reminder time if reminderset is true
-		if (isset($messageprops[$appointmentprops["reminderset"]]) && $messageprops[$appointmentprops["reminderset"]] == true) {
-			if ($messageprops[$appointmentprops["remindertime"]] == 0x5AE980E1) {
-				$message->reminder = 15;
-			}
-			else {
-				$message->reminder = $messageprops[$appointmentprops["remindertime"]];
-			}
-		}
-
-		if (!isset($message->uid)) {
-			$message->uid = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
-		}
-		else {
-			$message->uid = Utils::GetICalUidFromOLUid($message->uid);
-		}
-
-		// Always set organizer information because some devices do not work properly without it
-		if (isset($messageprops[$appointmentprops["representingentryid"]], $messageprops[$appointmentprops["representingname"]])
-			) {
-			$message->organizeremail = w2u($this->getSMTPAddressFromEntryID($messageprops[$appointmentprops["representingentryid"]]));
-			// if the email address can't be resolved, fall back to PR_SENT_REPRESENTING_SEARCH_KEY
-			if ($message->organizeremail == "" && isset($messageprops[$appointmentprops["sentrepresentinsrchk"]])) {
-				$message->organizeremail = $this->getEmailAddressFromSearchKey($messageprops[$appointmentprops["sentrepresentinsrchk"]]);
-			}
-			$message->organizername = w2u($messageprops[$appointmentprops["representingname"]]);
-		}
-
-		$appTz = false; // if the appointment has some timezone information saved on the server
-		if (!empty($messageprops[$appointmentprops["timezonetag"]])) {
-			$tz = $this->getTZFromMAPIBlob($messageprops[$appointmentprops["timezonetag"]]);
-			$appTz = true;
-		}
-		elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
-			// Windows uses UTC in timezone description in opposite to mstzones in TimezoneUtil which uses GMT
-			$wintz = str_replace("UTC", "GMT", $messageprops[$appointmentprops["timezonedesc"]]);
-			$tz = TimezoneUtil::GetFullTZFromTZName(TimezoneUtil::GetTZNameFromWinTZ($wintz));
-			$appTz = true;
-		}
-		else {
-			// set server default timezone (correct timezone should be configured!)
-			$tz = TimezoneUtil::GetFullTZ();
-		}
-
-		if (isset($messageprops[$appointmentprops["isrecurring"]]) && $messageprops[$appointmentprops["isrecurring"]]) {
-			// Process recurrence
-			$message->recurrence = new SyncRecurrence();
-			$this->getRecurrence($mapimessage, $messageprops, $message, $message->recurrence, $tz);
-
-			if (empty($message->alldayevent)) {
-				$message->timezone = base64_encode(TimezoneUtil::GetSyncBlobFromTZ($tz));
-			}
-		}
-
-		// Do attendees
-		$reciptable = mapi_message_getrecipienttable($mapimessage);
-		// Only get first 256 recipients, to prevent possible load issues.
-		$rows = mapi_table_queryrows($reciptable, [PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_SMTP_ADDRESS, PR_ADDRTYPE, PR_RECIPIENT_TRACKSTATUS, PR_RECIPIENT_TYPE, PR_SEARCH_KEY], 0, 256);
-
-		// Exception: we do not synchronize appointments with more than 250 attendees
-		if (count($rows) > 250) {
-			$message->id = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
-			$mbe = new SyncObjectBrokenException("Appointment has too many attendees");
-			$mbe->SetSyncObject($message);
-
-			throw $mbe;
-		}
-
-		if (count($rows) > 0) {
-			$message->attendees = [];
-		}
-
-		foreach ($rows as $row) {
-			$attendee = new SyncAttendee();
-
-			$attendee->name = w2u($row[PR_DISPLAY_NAME]);
-			// smtp address is always a proper email address
-			if (isset($row[PR_SMTP_ADDRESS])) {
-				$attendee->email = w2u($row[PR_SMTP_ADDRESS]);
-			}
-			elseif (isset($row[PR_ADDRTYPE], $row[PR_EMAIL_ADDRESS])) {
-				// if address type is SMTP, it's also a proper email address
-				if ($row[PR_ADDRTYPE] == "SMTP") {
-					$attendee->email = w2u($row[PR_EMAIL_ADDRESS]);
-				}
-				// if address type is ZARAFA, the PR_EMAIL_ADDRESS contains username
-				elseif ($row[PR_ADDRTYPE] == "ZARAFA") {
-					$userinfo = @nsp_getuserinfo($row[PR_EMAIL_ADDRESS]);
-					if (is_array($userinfo) && isset($userinfo["primary_email"])) {
-						$attendee->email = w2u($userinfo["primary_email"]);
-					}
-					// if the user was not found, do a fallback to PR_SEARCH_KEY
-					// @see https://jira.z-hub.io/browse/ZP-1178
-					elseif (isset($row[PR_SEARCH_KEY])) {
-						$attendee->email = w2u($this->getEmailAddressFromSearchKey($row[PR_SEARCH_KEY]));
-					}
-					else {
-						SLog::Write(LOGLEVEL_WARN, sprintf("MAPIProvider->getAppointment: The attendee '%s' of type ZARAFA can not be resolved. Code: 0x%X", $row[PR_EMAIL_ADDRESS], mapi_last_hresult()));
-					}
-				}
-			}
-
-			// set attendee's status and type if they're available and if we are the organizer
-			$storeprops = $this->GetStoreProps();
-			if (isset($row[PR_RECIPIENT_TRACKSTATUS], $messageprops[$appointmentprops["representingentryid"]], $storeprops[PR_MAILBOX_OWNER_ENTRYID]) &&
-					$messageprops[$appointmentprops["representingentryid"]] == $storeprops[PR_MAILBOX_OWNER_ENTRYID]) {
-				$attendee->attendeestatus = $row[PR_RECIPIENT_TRACKSTATUS];
-			}
-			if (isset($row[PR_RECIPIENT_TYPE])) {
-				$attendee->attendeetype = $row[PR_RECIPIENT_TYPE];
-			}
-			// Some attendees have no email or name (eg resources), and if you
-			// don't send one of those fields, the phone will give an error ... so
-			// we don't send it in that case.
-			// also ignore the "attendee" if the email is equal to the organizers' email
-			if (isset($attendee->name, $attendee->email) && $attendee->email != "" && (!isset($message->organizeremail) || (isset($message->organizeremail) && $attendee->email != $message->organizeremail))) {
-				array_push($message->attendees, $attendee);
-			}
-		}
-
-		// Status 0 = no meeting, status 1 = organizer, status 2/3/4/5 = tentative/accepted/declined/notresponded
-		if (isset($messageprops[$appointmentprops["meetingstatus"]]) && $messageprops[$appointmentprops["meetingstatus"]] > 1) {
-			if (!isset($message->attendees) || !is_array($message->attendees)) {
-				$message->attendees = [];
-			}
-			// Work around iOS6 cancellation issue when there are no attendees for this meeting. Just add ourselves as the sole attendee.
-			if (count($message->attendees) == 0) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->getAppointment: adding ourself as an attendee for iOS6 workaround"));
-				$attendee = new SyncAttendee();
-
-				$meinfo = nsp_getuserinfo(Request::GetUser());
-
-				if (is_array($meinfo)) {
-					$attendee->email = w2u($meinfo["primary_email"]);
-					$attendee->name = w2u($meinfo["fullname"]);
-					$attendee->attendeetype = MAPI_TO;
-
-					array_push($message->attendees, $attendee);
-				}
-			}
-			$message->responsetype = $messageprops[$appointmentprops["responsestatus"]];
-		}
-
-		// If it's an appointment which doesn't have any attendees, we have to make sure that
-		// the user is the owner or it will not work properly with android devices
-		// @see https://jira.z-hub.io/browse/ZP-1020
-		if (isset($messageprops[$appointmentprops["meetingstatus"]]) && $messageprops[$appointmentprops["meetingstatus"]] == olNonMeeting && empty($message->attendees)) {
-			$meinfo = nsp_getuserinfo(Request::GetUser());
-
-			if (is_array($meinfo)) {
-				$message->organizeremail = w2u($meinfo["primary_email"]);
-				$message->organizername = w2u($meinfo["fullname"]);
-				SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->getAppointment(): setting ourself as the organizer for an appointment without attendees.");
-			}
-		}
-
-		if (!isset($message->nativebodytype)) {
-			$message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-		}
-		elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
-			$nbt = MAPIUtils::GetNativeBodyType($messageprops);
-			SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getAppointment(): native body type is undefined. Set it to %d.", $nbt));
-			$message->nativebodytype = $nbt;
-		}
-
-		// If the user is working from a location other than the office the busystatus should be interpreted as free.
-		if (isset($message->busystatus) && $message->busystatus == fbWorkingElsewhere) {
-			$message->busystatus = fbFree;
-		}
-
-		// If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
-		if (isset($message->busystatus) && $message->busystatus == -1) {
-			$message->busystatus = fbTentative;
-		}
-
-		// All-day events might appear as 24h (or multiple of it) long when they start not exactly at midnight (+/- bias of the timezone)
-		if (isset($message->alldayevent) && $message->alldayevent) {
-			$localStartTime = localtime($message->starttime, 1);
-
-			// The appointment is all-day but doesn't start at midnight.
-			// If it was created in another timezone and we have that information,
-			// set the startime to the midnight of the current timezone.
-			if ($appTz && ($localStartTime['tm_hour'] || $localStartTime['tm_min'])) {
-				SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->getAppointment(): all-day event starting not midnight.");
-				$duration = $message->endtime - $message->starttime;
-				$serverTz = TimezoneUtil::GetFullTZ();
-				$message->starttime = $this->getGMTTimeByTZ($this->getLocaltimeByTZ($message->starttime, $tz), $serverTz);
-				$message->endtime = $message->starttime + $duration;
-			}
-		}
-
-		return $message;
-	}
-
-	/**
-	 * Reads recurrence information from MAPI.
-	 *
-	 * @param mixed      $mapimessage
-	 * @param array      $recurprops
-	 * @param SyncObject &$syncMessage    the message
-	 * @param SyncObject &$syncRecurrence the  recurrence message
-	 * @param array      $tz              timezone information
-	 *
-	 * @return
-	 */
-	private function getRecurrence($mapimessage, $recurprops, &$syncMessage, &$syncRecurrence, $tz) {
-		if ($syncRecurrence instanceof SyncTaskRecurrence) {
-			$recurrence = new TaskRecurrence($this->store, $mapimessage);
-		}
-		else {
-			$recurrence = new Recurrence($this->store, $mapimessage);
-		}
-
-		switch ($recurrence->recur["type"]) {
-			case 10: // daily
-				switch ($recurrence->recur["subtype"]) {
-					default:
-						$syncRecurrence->type = 0;
-						break;
-
-					case 1:
-						$syncRecurrence->type = 0;
-						$syncRecurrence->dayofweek = 62; // mon-fri
-						$syncRecurrence->interval = 1;
-						break;
-				}
-				break;
-
-			case 11: // weekly
-				$syncRecurrence->type = 1;
-				break;
-
-			case 12: // monthly
-				switch ($recurrence->recur["subtype"]) {
-					default:
-						$syncRecurrence->type = 2;
-						break;
-
-					case 3:
-						$syncRecurrence->type = 3;
-						break;
-				}
-				break;
-
-			case 13: // yearly
-				switch ($recurrence->recur["subtype"]) {
-					default:
-						$syncRecurrence->type = 4;
-						break;
-
-					case 2:
-						$syncRecurrence->type = 5;
-						break;
-
-					case 3:
-						$syncRecurrence->type = 6;
-						break;
-				}
-		}
-		// Termination
-		switch ($recurrence->recur["term"]) {
-			case 0x21:
-				$syncRecurrence->until = $recurrence->recur["end"];
-				// fixes Mantis #350 : recur-end does not consider timezones - use ClipEnd if available
-				if (isset($recurprops[$recurrence->proptags["enddate_recurring"]])) {
-					$syncRecurrence->until = $recurprops[$recurrence->proptags["enddate_recurring"]];
-				}
-				// add one day (minus 1 sec) to the end time to make sure the last occurrence is covered
-				$syncRecurrence->until += 86399;
-				break;
-
-			case 0x22:
-				$syncRecurrence->occurrences = $recurrence->recur["numoccur"];
-				break;
-
-			case 0x23:
-				// never ends
-				break;
-		}
-
-		// Correct 'alldayevent' because outlook fails to set it on recurring items of 24 hours or longer
-		if (isset($recurrence->recur["endocc"], $recurrence->recur["startocc"]) && ($recurrence->recur["endocc"] - $recurrence->recur["startocc"] >= 1440)) {
-			$syncMessage->alldayevent = true;
-		}
-
-		// Interval is different according to the type/subtype
-		switch ($recurrence->recur["type"]) {
-			case 10:
-				if ($recurrence->recur["subtype"] == 0) {
-					$syncRecurrence->interval = (int) ($recurrence->recur["everyn"] / 1440);
-				}  // minutes
-				break;
-
-			case 11:
-			case 12:
-				$syncRecurrence->interval = $recurrence->recur["everyn"];
-				break; // months / weeks
-
-			case 13:
-				$syncRecurrence->interval = (int) ($recurrence->recur["everyn"] / 12);
-				break; // months
-		}
-
-		if (isset($recurrence->recur["weekdays"])) {
-			$syncRecurrence->dayofweek = $recurrence->recur["weekdays"];
-		} // bitmask of days (1 == sunday, 128 == saturday
-		if (isset($recurrence->recur["nday"])) {
-			$syncRecurrence->weekofmonth = $recurrence->recur["nday"];
-		} // N'th {DAY} of {X} (0-5)
-		if (isset($recurrence->recur["month"])) {
-			$syncRecurrence->monthofyear = (int) ($recurrence->recur["month"] / (60 * 24 * 29)) + 1;
-		} // works ok due to rounding. see also $monthminutes below (1-12)
-		if (isset($recurrence->recur["monthday"])) {
-			$syncRecurrence->dayofmonth = $recurrence->recur["monthday"];
-		} // day of month (1-31)
-
-		// All changed exceptions are appointments within the 'exceptions' array. They contain the same items as a normal appointment
-		foreach ($recurrence->recur["changed_occurrences"] as $change) {
-			$exception = new SyncAppointmentException();
-
-			// start, end, basedate, subject, remind_before, reminderset, location, busystatus, alldayevent, label
-			if (isset($change["start"])) {
-				$exception->starttime = $this->getGMTTimeByTZ($change["start"], $tz);
-			}
-			if (isset($change["end"])) {
-				$exception->endtime = $this->getGMTTimeByTZ($change["end"], $tz);
-			}
-			if (isset($change["basedate"])) {
-				$exception->exceptionstarttime = $this->getGMTTimeByTZ($this->getDayStartOfTimestamp($change["basedate"]) + $recurrence->recur["startocc"] * 60, $tz);
-
-				// open body because getting only property might not work because of memory limit
-				$exceptionatt = $recurrence->getExceptionAttachment($change["basedate"]);
-				if ($exceptionatt) {
-					$exceptionobj = mapi_attach_openobj($exceptionatt, 0);
-					$this->setMessageBodyForType($exceptionobj, SYNC_BODYPREFERENCE_PLAIN, $exception);
-				}
-			}
-			if (isset($change["subject"])) {
-				$exception->subject = w2u($change["subject"]);
-			}
-			if (isset($change["reminder_before"]) && $change["reminder_before"]) {
-				$exception->reminder = $change["remind_before"];
-			}
-			if (isset($change["location"])) {
-				$exception->location = w2u($change["location"]);
-			}
-			if (isset($change["busystatus"])) {
-				$exception->busystatus = $change["busystatus"];
-			}
-			if (isset($change["alldayevent"])) {
-				$exception->alldayevent = $change["alldayevent"];
-			}
-
-			// set some data from the original appointment
-			if (isset($syncMessage->uid)) {
-				$exception->uid = $syncMessage->uid;
-			}
-			if (isset($syncMessage->organizername)) {
-				$exception->organizername = $syncMessage->organizername;
-			}
-			if (isset($syncMessage->organizeremail)) {
-				$exception->organizeremail = $syncMessage->organizeremail;
-			}
-
-			if (!isset($syncMessage->exceptions)) {
-				$syncMessage->exceptions = [];
-			}
-
-			// If the user is working from a location other than the office the busystatus should be interpreted as free.
-			if (isset($exception->busystatus) && $exception->busystatus == fbWorkingElsewhere) {
-				$exception->busystatus = fbFree;
-			}
-
-			// If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
-			if (isset($exception->busystatus) && $exception->busystatus == -1) {
-				$exception->busystatus = fbTentative;
-			}
-
-			// if an exception lasts 24 hours and the series are an allday events, set also the exception to allday event,
-			// otherwise it will be a 24 hour long event on some mobiles.
-			// @see https://jira.z-hub.io/browse/ZP-980
-			if (isset($exception->starttime, $exception->endtime) && ($exception->endtime - $exception->starttime == 86400) && $syncMessage->alldayevent) {
-				$exception->alldayevent = 1;
-			}
-			array_push($syncMessage->exceptions, $exception);
-		}
-
-		// Deleted appointments contain only the original date (basedate) and a 'deleted' tag
-		foreach ($recurrence->recur["deleted_occurrences"] as $deleted) {
-			$exception = new SyncAppointmentException();
-
-			$exception->exceptionstarttime = $this->getGMTTimeByTZ($this->getDayStartOfTimestamp($deleted) + $recurrence->recur["startocc"] * 60, $tz);
-			$exception->deleted = "1";
-
-			if (!isset($syncMessage->exceptions)) {
-				$syncMessage->exceptions = [];
-			}
-
-			array_push($syncMessage->exceptions, $exception);
-		}
-
-		if (isset($syncMessage->complete) && $syncMessage->complete) {
-			$syncRecurrence->complete = $syncMessage->complete;
-		}
-	}
-
-	/**
-	 * Reads an email object from MAPI.
-	 *
-	 * @param mixed             $mapimessage
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @return SyncEmail
-	 */
-	private function getEmail($mapimessage, $contentparameters) {
-		// This workaround fixes ZP-729 and still works with Outlook.
-		// FIXME: It should be properly fixed when refactoring.
-		$bpReturnType = Utils::GetBodyPreferenceBestMatch($contentparameters->GetBodyPreference());
-		if (($contentparameters->GetMimeSupport() == SYNC_MIMESUPPORT_NEVER) ||
-				($key = array_search(SYNC_BODYPREFERENCE_MIME, $contentparameters->GetBodyPreference()) === false) ||
-				$bpReturnType != SYNC_BODYPREFERENCE_MIME) {
-			MAPIUtils::ParseSmime($this->session, $this->store, $this->getAddressbook(), $mapimessage);
-		}
-
-		$message = new SyncMail();
-
-		$this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetEmailMapping());
-
-		$emailproperties = MAPIMapping::GetEmailProperties();
-		$messageprops = $this->getProps($mapimessage, $emailproperties);
-
-		if (isset($messageprops[PR_SOURCE_KEY])) {
-			$sourcekey = $messageprops[PR_SOURCE_KEY];
-		}
-		else {
-			$mbe = new SyncObjectBrokenException("The message doesn't have a sourcekey");
-			$mbe->SetSyncObject($message);
-
-			throw $mbe;
-		}
-
-		// set the body according to contentparameters and supported AS version
-		$this->setMessageBody($mapimessage, $contentparameters, $message);
-
-		$fromname = $fromaddr = "";
-
-		if (isset($messageprops[$emailproperties["representingname"]])) {
-			// remove encapsulating double quotes from the representingname
-			$fromname = preg_replace('/^\"(.*)\"$/', "\${1}", $messageprops[$emailproperties["representingname"]]);
-		}
-		if (isset($messageprops[$emailproperties["representingentryid"]])) {
-			$fromaddr = $this->getSMTPAddressFromEntryID($messageprops[$emailproperties["representingentryid"]]);
-		}
-
-		// if the email address can't be resolved, fall back to PR_SENT_REPRESENTING_SEARCH_KEY
-		if ($fromaddr == "" && isset($messageprops[$emailproperties["representingsearchkey"]])) {
-			$fromaddr = $this->getEmailAddressFromSearchKey($messageprops[$emailproperties["representingsearchkey"]]);
-		}
-
-		if ($fromname == $fromaddr) {
-			$fromname = "";
-		}
-
-		if ($fromname) {
-			$from = "\"" . w2u($fromname) . "\" <" . w2u($fromaddr) . ">";
-		}
-		else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
-			$from = "\"" . w2u($fromaddr) . "\" <" . w2u($fromaddr) . ">";
-		}
-		// END CHANGED dw2412 HTC shows "error" if sender name is unknown
-
-		$message->from = $from;
-
-		// process Meeting Requests
-		if (isset($message->messageclass) && strpos($message->messageclass, "IPM.Schedule.Meeting") === 0) {
-			$message->meetingrequest = new SyncMeetingRequest();
-			$this->getPropsFromMAPI($message->meetingrequest, $mapimessage, MAPIMapping::GetMeetingRequestMapping());
-
-			$meetingrequestproperties = MAPIMapping::GetMeetingRequestProperties();
-			$props = $this->getProps($mapimessage, $meetingrequestproperties);
-
-			// Get the GOID
-			if (isset($props[$meetingrequestproperties["goidtag"]])) {
-				$message->meetingrequest->globalobjid = base64_encode($props[$meetingrequestproperties["goidtag"]]);
-			}
-
-			// Set Timezone
-			if (isset($props[$meetingrequestproperties["timezonetag"]])) {
-				$tz = $this->getTZFromMAPIBlob($props[$meetingrequestproperties["timezonetag"]]);
-			}
-			else {
-				$tz = TimezoneUtil::GetFullTZ();
-			}
-
-			$message->meetingrequest->timezone = base64_encode(TimezoneUtil::GetSyncBlobFromTZ($tz));
-
-			// send basedate if exception
-			if (isset($props[$meetingrequestproperties["recReplTime"]]) ||
-				(isset($props[$meetingrequestproperties["lidIsException"]]) && $props[$meetingrequestproperties["lidIsException"]] == true)) {
-				if (isset($props[$meetingrequestproperties["recReplTime"]])) {
-					$basedate = $props[$meetingrequestproperties["recReplTime"]];
-					$message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $this->getGMTTZ());
-				}
-				else {
-					if (!isset($props[$meetingrequestproperties["goidtag"]]) || !isset($props[$meetingrequestproperties["recurStartTime"]]) || !isset($props[$meetingrequestproperties["timezonetag"]])) {
-						SLog::Write(LOGLEVEL_WARN, "Missing property to set correct basedate for exception");
-					}
-					else {
-						$basedate = Utils::ExtractBaseDate($props[$meetingrequestproperties["goidtag"]], $props[$meetingrequestproperties["recurStartTime"]]);
-						$message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $tz);
-					}
-				}
-			}
-
-			// Organizer is the sender
-			if (strpos($message->messageclass, "IPM.Schedule.Meeting.Resp") === 0) {
-				$message->meetingrequest->organizer = $message->to;
-			}
-			else {
-				$message->meetingrequest->organizer = $message->from;
-			}
-
-			// Process recurrence
-			if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]]) {
-				$myrec = new SyncMeetingRequestRecurrence();
-				// get recurrence -> put $message->meetingrequest as message so the 'alldayevent' is set correctly
-				$this->getRecurrence($mapimessage, $props, $message->meetingrequest, $myrec, $tz);
-				$message->meetingrequest->recurrences = [$myrec];
-			}
-
-			// Force the 'alldayevent' in the object at all times. (non-existent == 0)
-			if (!isset($message->meetingrequest->alldayevent) || $message->meetingrequest->alldayevent == "") {
-				$message->meetingrequest->alldayevent = 0;
-			}
-
-			// Instancetype
-			// 0 = single appointment
-			// 1 = master recurring appointment
-			// 2 = single instance of recurring appointment
-			// 3 = exception of recurring appointment
-			$message->meetingrequest->instancetype = 0;
-			if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]] == 1) {
-				$message->meetingrequest->instancetype = 1;
-			}
-			elseif ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0) && isset($message->meetingrequest->recurrenceid)) {
-				if (isset($props[$meetingrequestproperties["appSeqNr"]]) && $props[$meetingrequestproperties["appSeqNr"]] == 0) {
-					$message->meetingrequest->instancetype = 2;
-				}
-				else {
-					$message->meetingrequest->instancetype = 3;
-				}
-			}
-
-			// Disable reminder if it is off
-			if (!isset($props[$meetingrequestproperties["reminderset"]]) || $props[$meetingrequestproperties["reminderset"]] == false) {
-				$message->meetingrequest->reminder = "";
-			}
-			// the property saves reminder in minutes, but we need it in secs
-			else {
-				// /set the default reminder time to seconds
-				if ($props[$meetingrequestproperties["remindertime"]] == 0x5AE980E1) {
-					$message->meetingrequest->reminder = 900;
-				}
-				else {
-					$message->meetingrequest->reminder = $props[$meetingrequestproperties["remindertime"]] * 60;
-				}
-			}
-
-			// Set sensitivity to 0 if missing
-			if (!isset($message->meetingrequest->sensitivity)) {
-				$message->meetingrequest->sensitivity = 0;
-			}
-
-			// If the user is working from a location other than the office the busystatus should be interpreted as free.
-			if (isset($message->meetingrequest->busystatus) && $message->meetingrequest->busystatus == fbWorkingElsewhere) {
-				$message->meetingrequest->busystatus = fbFree;
-			}
-
-			// If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
-			if (isset($message->meetingrequest->busystatus) && $message->meetingrequest->busystatus == -1) {
-				$message->meetingrequest->busystatus = fbTentative;
-			}
-
-			// if a meeting request response hasn't been processed yet,
-			// do it so that the attendee status is updated on the mobile
-			if (!isset($messageprops[$emailproperties["processed"]])) {
-				// check if we are not sending the MR so we can process it - ZP-581
-				$cuser = GSync::GetBackend()->GetUserDetails(GSync::GetBackend()->GetCurrentUsername());
-				if (isset($cuser["emailaddress"]) && $cuser["emailaddress"] != $fromaddr) {
-					if (!isset($req)) {
-						$req = new Meetingrequest($this->store, $mapimessage, $this->session);
-					}
-					if ($req->isMeetingRequestResponse()) {
-						$req->processMeetingRequestResponse();
-					}
-					if ($req->isMeetingCancellation()) {
-						$req->processMeetingCancellation();
-					}
-				}
-			}
-			$message->contentclass = DEFAULT_CALENDAR_CONTENTCLASS;
-
-			// MeetingMessageType values
-			// 0 = A silent update was performed, or the message type is unspecified.
-			// 1 = Initial meeting request.
-			// 2 = Full update.
-			// 3 = Informational update.
-			// 4 = Outdated. A newer meeting request or meeting update was received after this message.
-			// 5 = Identifies the delegator's copy of the meeting request.
-			// 6 = Identifies that the meeting request has been delegated and the meeting request cannot be responded to.
-			$message->meetingrequest->meetingmessagetype = mtgEmpty;
-
-			if (isset($props[$meetingrequestproperties["meetingType"]])) {
-				switch ($props[$meetingrequestproperties["meetingType"]]) {
-					case mtgRequest:
-						$message->meetingrequest->meetingmessagetype = 1;
-						break;
-
-					case mtgFull:
-						$message->meetingrequest->meetingmessagetype = 2;
-						break;
-
-					case mtgInfo:
-						$message->meetingrequest->meetingmessagetype = 3;
-						break;
-
-					case mtgOutOfDate:
-						$message->meetingrequest->meetingmessagetype = 4;
-						break;
-
-					case mtgDelegatorCopy:
-						$message->meetingrequest->meetingmessagetype = 5;
-						break;
-				}
-			}
-		}
-
-		// Add attachments
-		$attachtable = mapi_message_getattachmenttable($mapimessage);
-		$rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM]);
-		$entryid = bin2hex($messageprops[$emailproperties["entryid"]]);
-		$parentSourcekey = bin2hex($messageprops[$emailproperties["parentsourcekey"]]);
-
-		foreach ($rows as $row) {
-			if (isset($row[PR_ATTACH_NUM])) {
-				if (Request::GetProtocolVersion() >= 12.0) {
-					$attach = new SyncBaseAttachment();
-				}
-				else {
-					$attach = new SyncAttachment();
-				}
-
-				$mapiattach = mapi_message_openattach($mapimessage, $row[PR_ATTACH_NUM]);
-				$attachprops = mapi_getprops($mapiattach, [PR_ATTACH_LONG_FILENAME, PR_ATTACH_FILENAME, PR_ATTACHMENT_HIDDEN, PR_ATTACH_CONTENT_ID, PR_ATTACH_CONTENT_ID_W, PR_ATTACH_MIME_TAG, PR_ATTACH_MIME_TAG_W, PR_ATTACH_METHOD, PR_DISPLAY_NAME, PR_DISPLAY_NAME_W, PR_ATTACH_SIZE, PR_ATTACH_FLAGS]);
-				if ((isset($attachprops[PR_ATTACH_MIME_TAG]) && strpos(strtolower($attachprops[PR_ATTACH_MIME_TAG]), 'signed') !== false) ||
-					(isset($attachprops[PR_ATTACH_MIME_TAG_W]) && strpos(strtolower($attachprops[PR_ATTACH_MIME_TAG_W]), 'signed') !== false)) {
-					continue;
-				}
-
-				// the displayname is handled equally for all AS versions
-				$attach->displayname = w2u((isset($attachprops[PR_ATTACH_LONG_FILENAME])) ? $attachprops[PR_ATTACH_LONG_FILENAME] : ((isset($attachprops[PR_ATTACH_FILENAME])) ? $attachprops[PR_ATTACH_FILENAME] : ((isset($attachprops[PR_DISPLAY_NAME])) ? $attachprops[PR_DISPLAY_NAME] : "attachment.bin")));
-				// fix attachment name in case of inline images
-				if (($attach->displayname == "inline.txt" && (isset($attachprops[PR_ATTACH_MIME_TAG]) || $attachprops[PR_ATTACH_MIME_TAG_W])) ||
-				(substr_compare($attach->displayname, "attachment", 0, 10, true) === 0 && substr_compare($attach->displayname, ".dat", -4, 4, true) === 0)) {
-					$mimetype = (isset($attachprops[PR_ATTACH_MIME_TAG])) ? $attachprops[PR_ATTACH_MIME_TAG] : $attachprops[PR_ATTACH_MIME_TAG_W];
-					$mime = explode("/", $mimetype);
-
-					if (count($mime) == 2 && $mime[0] == "image") {
-						$attach->displayname = "inline." . $mime[1];
-					}
-				}
-
-				// set AS version specific parameters
-				if (Request::GetProtocolVersion() >= 12.0) {
-					$attach->filereference = sprintf("%s:%s:%s", $entryid, $row[PR_ATTACH_NUM], $parentSourcekey);
-					$attach->method = (isset($attachprops[PR_ATTACH_METHOD])) ? $attachprops[PR_ATTACH_METHOD] : ATTACH_BY_VALUE;
-
-					// if displayname does not have the eml extension for embedde messages, android and WP devices won't open it
-					if ($attach->method == ATTACH_EMBEDDED_MSG) {
-						if (strtolower(substr($attach->displayname, -4)) != '.eml') {
-							$attach->displayname .= '.eml';
-						}
-					}
-					// android devices require attachment size in order to display an attachment properly
-					if (!isset($attachprops[PR_ATTACH_SIZE])) {
-						$stream = mapi_openproperty($mapiattach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
-						// It's not possible to open some (embedded only?) messages, so we need to open the attachment object itself to get the data
-						if (mapi_last_hresult()) {
-							$embMessage = mapi_attach_openobj($mapiattach);
-							$addrbook = $this->getAddressbook();
-							$stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $embMessage, ['use_tnef' => -1]);
-						}
-						$stat = mapi_stream_stat($stream);
-						$attach->estimatedDataSize = $stat['cb'];
-					}
-					else {
-						$attach->estimatedDataSize = $attachprops[PR_ATTACH_SIZE];
-					}
-
-					if (isset($attachprops[PR_ATTACH_CONTENT_ID]) && $attachprops[PR_ATTACH_CONTENT_ID]) {
-						$attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID];
-					}
-
-					if (!isset($attach->contentid) && isset($attachprops[PR_ATTACH_CONTENT_ID_W]) && $attachprops[PR_ATTACH_CONTENT_ID_W]) {
-						$attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID_W];
-					}
-
-					if (isset($attachprops[PR_ATTACHMENT_HIDDEN]) && $attachprops[PR_ATTACHMENT_HIDDEN]) {
-						$attach->isinline = 1;
-					}
-
-					if (isset($attach->contentid, $attachprops[PR_ATTACH_FLAGS]) && $attachprops[PR_ATTACH_FLAGS] & 4) {
-						$attach->isinline = 1;
-					}
-
-					if (!isset($message->asattachments)) {
-						$message->asattachments = [];
-					}
-
-					array_push($message->asattachments, $attach);
-				}
-				else {
-					$attach->attsize = $attachprops[PR_ATTACH_SIZE];
-					$attach->attname = sprintf("%s:%s:%s", $entryid, $row[PR_ATTACH_NUM], $parentSourcekey);
-					if (!isset($message->attachments)) {
-						$message->attachments = [];
-					}
-
-					array_push($message->attachments, $attach);
-				}
-			}
-		}
-
-		// Get To/Cc as SMTP addresses (this is different from displayto and displaycc because we are putting
-		// in the SMTP addresses as well, while displayto and displaycc could just contain the display names
-		$message->to = [];
-		$message->cc = [];
-
-		$reciptable = mapi_message_getrecipienttable($mapimessage);
-		$rows = mapi_table_queryallrows($reciptable, [PR_RECIPIENT_TYPE, PR_DISPLAY_NAME, PR_ADDRTYPE, PR_EMAIL_ADDRESS, PR_SMTP_ADDRESS, PR_ENTRYID, PR_SEARCH_KEY]);
-
-		foreach ($rows as $row) {
-			$address = "";
-			$fulladdr = "";
-
-			$addrtype = isset($row[PR_ADDRTYPE]) ? $row[PR_ADDRTYPE] : "";
-
-			if (isset($row[PR_SMTP_ADDRESS])) {
-				$address = $row[PR_SMTP_ADDRESS];
-			}
-			elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS])) {
-				$address = $row[PR_EMAIL_ADDRESS];
-			}
-			elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID])) {
-				$address = $this->getSMTPAddressFromEntryID($row[PR_ENTRYID]);
-			}
-
-			// if the user was not found, do a fallback to PR_SEARCH_KEY
-			// @see https://jira.z-hub.io/browse/ZP-1178
-			if (empty($address) && isset($row[PR_SEARCH_KEY])) {
-				$address = $this->getEmailAddressFromSearchKey($row[PR_SEARCH_KEY]);
-			}
-
-			$name = isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "";
-
-			if ($name == "" || $name == $address) {
-				$fulladdr = w2u($address);
-			}
-			else {
-				if (substr($name, 0, 1) != '"' && substr($name, -1) != '"') {
-					$fulladdr = "\"" . w2u($name) . "\" <" . w2u($address) . ">";
-				}
-				else {
-					$fulladdr = w2u($name) . "<" . w2u($address) . ">";
-				}
-			}
-
-			if ($row[PR_RECIPIENT_TYPE] == MAPI_TO) {
-				array_push($message->to, $fulladdr);
-			}
-			elseif ($row[PR_RECIPIENT_TYPE] == MAPI_CC) {
-				array_push($message->cc, $fulladdr);
-			}
-		}
-
-		if (is_array($message->to) && !empty($message->to)) {
-			$message->to = implode(", ", $message->to);
-		}
-		if (is_array($message->cc) && !empty($message->cc)) {
-			$message->cc = implode(", ", $message->cc);
-		}
-
-		// without importance some mobiles assume "0" (low) - Mantis #439
-		if (!isset($message->importance)) {
-			$message->importance = IMPORTANCE_NORMAL;
-		}
-
-		if (!isset($message->internetcpid)) {
-			$message->internetcpid = (defined('STORE_INTERNET_CPID')) ? constant('STORE_INTERNET_CPID') : INTERNET_CPID_WINDOWS1252;
-		}
-		$this->setFlag($mapimessage, $message);
-		// TODO checkcontentclass
-		if (!isset($message->contentclass)) {
-			$message->contentclass = DEFAULT_EMAIL_CONTENTCLASS;
-		}
-
-		if (!isset($message->nativebodytype)) {
-			$message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-		}
-		elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
-			$nbt = MAPIUtils::GetNativeBodyType($messageprops);
-			SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getEmail(): native body type is undefined. Set it to %d.", $nbt));
-			$message->nativebodytype = $nbt;
-		}
-
-		// reply, reply to all, forward flags
-		if (isset($message->lastverbexecuted) && $message->lastverbexecuted) {
-			$message->lastverbexecuted = Utils::GetLastVerbExecuted($message->lastverbexecuted);
-		}
-
-		return $message;
-	}
-
-	/**
-	 * Reads a note object from MAPI.
-	 *
-	 * @param mixed             $mapimessage
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @return SyncNote
-	 */
-	private function getNote($mapimessage, $contentparameters) {
-		$message = new SyncNote();
-
-		// Standard one-to-one mappings first
-		$this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetNoteMapping());
-
-		// set the body according to contentparameters and supported AS version
-		$this->setMessageBody($mapimessage, $contentparameters, $message);
-
-		return $message;
-	}
-
-	/**
-	 * Creates a SyncFolder from MAPI properties.
-	 *
-	 * @param mixed $folderprops
-	 *
-	 * @return SyncFolder
-	 */
-	public function GetFolder($folderprops) {
-		$folder = new SyncFolder();
-
-		$storeprops = $this->GetStoreProps();
-
-		// For ZCP 7.0.x we need to retrieve more properties explicitly, see ZP-780
-		if (isset($folderprops[PR_SOURCE_KEY]) && !isset($folderprops[PR_ENTRYID]) && !isset($folderprops[PR_CONTAINER_CLASS])) {
-			$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $folderprops[PR_SOURCE_KEY]);
-			$mapifolder = mapi_msgstore_openentry($this->store, $entryid);
-			$folderprops = mapi_getprops($mapifolder, [PR_DISPLAY_NAME, PR_PARENT_ENTRYID, PR_ENTRYID, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_CONTAINER_CLASS, PR_ATTR_HIDDEN, PR_EXTENDED_FOLDER_FLAGS]);
-			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->GetFolder(): received insufficient of data from ICS. Fetching required data.");
-		}
-
-		if (!isset(
-				$folderprops[PR_DISPLAY_NAME],
-				$folderprops[PR_PARENT_ENTRYID],
-				$folderprops[PR_SOURCE_KEY],
-				$folderprops[PR_ENTRYID],
-				$folderprops[PR_PARENT_SOURCE_KEY],
-				$storeprops[PR_IPM_SUBTREE_ENTRYID])) {
-			SLog::Write(LOGLEVEL_ERROR, "MAPIProvider->GetFolder(): invalid folder. Missing properties");
-
-			return false;
-		}
-
-		// ignore hidden folders
-		if (isset($folderprops[PR_ATTR_HIDDEN]) && $folderprops[PR_ATTR_HIDDEN] != false) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->GetFolder(): invalid folder '%s' as it is a hidden folder (PR_ATTR_HIDDEN)", $folderprops[PR_DISPLAY_NAME]));
-
-			return false;
-		}
-
-		// ignore certain undesired folders, like "RSS Feeds" and "Suggested contacts"
-		if ((isset($folderprops[PR_CONTAINER_CLASS]) && $folderprops[PR_CONTAINER_CLASS] == "IPF.Note.OutlookHomepage") ||
-				in_array($folderprops[PR_ENTRYID], $this->getSpecialFoldersData())) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->GetFolder(): folder '%s' should not be synchronized", $folderprops[PR_DISPLAY_NAME]));
-
-			return false;
-		}
-
-		$folder->BackendId = bin2hex($folderprops[PR_SOURCE_KEY]);
-		$folderOrigin = DeviceManager::FLD_ORIGIN_USER;
-		if (GSync::GetBackend()->GetImpersonatedUser()) {
-			$folderOrigin = DeviceManager::FLD_ORIGIN_IMPERSONATED;
-		}
-		$folder->serverid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folderprops[PR_DISPLAY_NAME]);
-		if ($folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_SUBTREE_ENTRYID] || $folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID]) {
-			$folder->parentid = "0";
-		}
-		else {
-			$folder->parentid = GSync::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($folderprops[PR_PARENT_SOURCE_KEY]));
-		}
-		$folder->displayname = w2u($folderprops[PR_DISPLAY_NAME]);
-		$folder->type = $this->GetFolderType($folderprops[PR_ENTRYID], isset($folderprops[PR_CONTAINER_CLASS]) ? $folderprops[PR_CONTAINER_CLASS] : false);
-
-		return $folder;
-	}
-
-	/**
-	 * Returns the foldertype for an entryid
-	 * Gets the folder type by checking the default folders in MAPI.
-	 *
-	 * @param string $entryid
-	 * @param string $class   (opt)
-	 *
-	 * @return long
-	 */
-	public function GetFolderType($entryid, $class = false) {
-		$storeprops = $this->GetStoreProps();
-		$inboxprops = $this->GetInboxProps();
-
-		if ($entryid == $storeprops[PR_IPM_WASTEBASKET_ENTRYID]) {
-			return SYNC_FOLDER_TYPE_WASTEBASKET;
-		}
-		if ($entryid == $storeprops[PR_IPM_SENTMAIL_ENTRYID]) {
-			return SYNC_FOLDER_TYPE_SENTMAIL;
-		}
-		if ($entryid == $storeprops[PR_IPM_OUTBOX_ENTRYID]) {
-			return SYNC_FOLDER_TYPE_OUTBOX;
-		}
-
-		// Public folders do not have inboxprops
-		// @see https://jira.z-hub.io/browse/ZP-995
-		if (!empty($inboxprops)) {
-			if ($entryid == $inboxprops[PR_ENTRYID]) {
-				return SYNC_FOLDER_TYPE_INBOX;
-			}
-			if ($entryid == $inboxprops[PR_IPM_DRAFTS_ENTRYID]) {
-				return SYNC_FOLDER_TYPE_DRAFTS;
-			}
-			if ($entryid == $inboxprops[PR_IPM_TASK_ENTRYID]) {
-				return SYNC_FOLDER_TYPE_TASK;
-			}
-			if ($entryid == $inboxprops[PR_IPM_APPOINTMENT_ENTRYID]) {
-				return SYNC_FOLDER_TYPE_APPOINTMENT;
-			}
-			if ($entryid == $inboxprops[PR_IPM_CONTACT_ENTRYID]) {
-				return SYNC_FOLDER_TYPE_CONTACT;
-			}
-			if ($entryid == $inboxprops[PR_IPM_NOTE_ENTRYID]) {
-				return SYNC_FOLDER_TYPE_NOTE;
-			}
-			if ($entryid == $inboxprops[PR_IPM_JOURNAL_ENTRYID]) {
-				return SYNC_FOLDER_TYPE_JOURNAL;
-			}
-		}
-
-		// user created folders
-		if ($class == "IPF.Note") {
-			return SYNC_FOLDER_TYPE_USER_MAIL;
-		}
-		if ($class == "IPF.Task") {
-			return SYNC_FOLDER_TYPE_USER_TASK;
-		}
-		if ($class == "IPF.Appointment") {
-			return SYNC_FOLDER_TYPE_USER_APPOINTMENT;
-		}
-		if ($class == "IPF.Contact") {
-			return SYNC_FOLDER_TYPE_USER_CONTACT;
-		}
-		if ($class == "IPF.StickyNote") {
-			return SYNC_FOLDER_TYPE_USER_NOTE;
-		}
-		if ($class == "IPF.Journal") {
-			return SYNC_FOLDER_TYPE_USER_JOURNAL;
-		}
-
-		return SYNC_FOLDER_TYPE_OTHER;
-	}
-
-	/**
-	 * Indicates if the entry id is a default MAPI folder.
-	 *
-	 * @param string $entryid
-	 *
-	 * @return bool
-	 */
-	public function IsMAPIDefaultFolder($entryid) {
-		$msgstore_props = mapi_getprops($this->store, [PR_ENTRYID, PR_DISPLAY_NAME, PR_IPM_SUBTREE_ENTRYID, PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID, PR_MDB_PROVIDER, PR_IPM_PUBLIC_FOLDERS_ENTRYID, PR_IPM_FAVORITES_ENTRYID, PR_MAILBOX_OWNER_ENTRYID]);
-
-		$inboxProps = [];
-		$inbox = mapi_msgstore_getreceivefolder($this->store);
-		if (!mapi_last_hresult()) {
-			$inboxProps = mapi_getprops($inbox, [PR_ENTRYID]);
-		}
-
-		$root = mapi_msgstore_openentry($this->store, null); // TODO use getRootProps()
-		$rootProps = mapi_getprops($root, [PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_JOURNAL_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_TASK_ENTRYID, PR_ADDITIONAL_REN_ENTRYIDS]);
-
-		$additional_ren_entryids = [];
-		if (isset($rootProps[PR_ADDITIONAL_REN_ENTRYIDS])) {
-			$additional_ren_entryids = $rootProps[PR_ADDITIONAL_REN_ENTRYIDS];
-		}
-
-		$defaultfolders = [
-			"inbox" => ["inbox" => PR_ENTRYID],
-			"outbox" => ["store" => PR_IPM_OUTBOX_ENTRYID],
-			"sent" => ["store" => PR_IPM_SENTMAIL_ENTRYID],
-			"wastebasket" => ["store" => PR_IPM_WASTEBASKET_ENTRYID],
-			"favorites" => ["store" => PR_IPM_FAVORITES_ENTRYID],
-			"publicfolders" => ["store" => PR_IPM_PUBLIC_FOLDERS_ENTRYID],
-			"calendar" => ["root" => PR_IPM_APPOINTMENT_ENTRYID],
-			"contact" => ["root" => PR_IPM_CONTACT_ENTRYID],
-			"drafts" => ["root" => PR_IPM_DRAFTS_ENTRYID],
-			"journal" => ["root" => PR_IPM_JOURNAL_ENTRYID],
-			"note" => ["root" => PR_IPM_NOTE_ENTRYID],
-			"task" => ["root" => PR_IPM_TASK_ENTRYID],
-			"junk" => ["additional" => 4],
-			"syncissues" => ["additional" => 1],
-			"conflicts" => ["additional" => 0],
-			"localfailures" => ["additional" => 2],
-			"serverfailures" => ["additional" => 3],
-		];
-
-		foreach ($defaultfolders as $key => $prop) {
-			$tag = reset($prop);
-			$from = key($prop);
-
-			switch ($from) {
-				case "inbox":
-					if (isset($inboxProps[$tag]) && $entryid == $inboxProps[$tag]) {
-						SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Inbox found, key '%s'", $key));
-
-						return true;
-					}
-					break;
-
-				case "store":
-					if (isset($msgstore_props[$tag]) && $entryid == $msgstore_props[$tag]) {
-						SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Store folder found, key '%s'", $key));
-
-						return true;
-					}
-					break;
-
-				case "root":
-					if (isset($rootProps[$tag]) && $entryid == $rootProps[$tag]) {
-						SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Root folder found, key '%s'", $key));
-
-						return true;
-					}
-					break;
-
-				case "additional":
-					if (isset($additional_ren_entryids[$tag]) && $entryid == $additional_ren_entryids[$tag]) {
-						SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Additional folder found, key '%s'", $key));
-
-						return true;
-					}
-					break;
-			}
-		}
-
-		return false;
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+    /**
+     * Reads a message from MAPI
+     * Depending on the message class, a contact, appointment, task or email is read.
+     *
+     * @param mixed             $mapimessage
+     * @param ContentParameters $contentparameters
+     *
+     * @return SyncObject
+     */
+    public function GetMessage($mapimessage, $contentparameters) {
+        // Gets the Sync object from a MAPI object according to its message class
+
+        $props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS]);
+        if (isset($props[PR_MESSAGE_CLASS])) {
+            $messageclass = $props[PR_MESSAGE_CLASS];
+        }
+        else {
+            $messageclass = "IPM";
+        }
+
+        if (strpos($messageclass, "IPM.Contact") === 0) {
+            return $this->getContact($mapimessage, $contentparameters);
+        }
+        if (strpos($messageclass, "IPM.Appointment") === 0) {
+            return $this->getAppointment($mapimessage, $contentparameters);
+        }
+        if (strpos($messageclass, "IPM.Task") === 0 && strpos($messageclass, "IPM.TaskRequest") === false) {
+            return $this->getTask($mapimessage, $contentparameters);
+        }
+        if (strpos($messageclass, "IPM.StickyNote") === 0) {
+            return $this->getNote($mapimessage, $contentparameters);
+        }
+
+        return $this->getEmail($mapimessage, $contentparameters);
+    }
+
+    /**
+     * Reads a contact object from MAPI.
+     *
+     * @param mixed             $mapimessage
+     * @param ContentParameters $contentparameters
+     *
+     * @return SyncContact
+     */
+    private function getContact($mapimessage, $contentparameters) {
+        $message = new SyncContact();
+
+        // Standard one-to-one mappings first
+        $this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetContactMapping());
+
+        // Contact specific props
+        $contactproperties = MAPIMapping::GetContactProperties();
+        $messageprops = $this->getProps($mapimessage, $contactproperties);
+
+        // set the body according to contentparameters and supported AS version
+        $this->setMessageBody($mapimessage, $contentparameters, $message);
+
+        // check the picture
+        if (isset($messageprops[$contactproperties["haspic"]]) && $messageprops[$contactproperties["haspic"]]) {
+            // Add attachments
+            $attachtable = mapi_message_getattachmenttable($mapimessage);
+            mapi_table_restrict($attachtable, MAPIUtils::GetContactPicRestriction());
+            $rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM, PR_ATTACH_SIZE]);
+
+            foreach ($rows as $row) {
+                if (isset($row[PR_ATTACH_NUM])) {
+                    $mapiattach = mapi_message_openattach($mapimessage, $row[PR_ATTACH_NUM]);
+                    $message->picture = base64_encode(mapi_attach_openbin($mapiattach, PR_ATTACH_DATA_BIN));
+                }
+            }
+        }
+
+        return $message;
+    }
+
+    /**
+     * Reads a task object from MAPI.
+     *
+     * @param mixed             $mapimessage
+     * @param ContentParameters $contentparameters
+     *
+     * @return SyncTask
+     */
+    private function getTask($mapimessage, $contentparameters) {
+        $message = new SyncTask();
+
+        // Standard one-to-one mappings first
+        $this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetTaskMapping());
+
+        // Task specific props
+        $taskproperties = MAPIMapping::GetTaskProperties();
+        $messageprops = $this->getProps($mapimessage, $taskproperties);
+
+        // set the body according to contentparameters and supported AS version
+        $this->setMessageBody($mapimessage, $contentparameters, $message);
+
+        // task with deadoccur is an occurrence of a recurring task and does not need to be handled as recurring
+        // webaccess does not set deadoccur for the initial recurring task
+        if (isset($messageprops[$taskproperties["isrecurringtag"]]) &&
+            $messageprops[$taskproperties["isrecurringtag"]] &&
+            (!isset($messageprops[$taskproperties["deadoccur"]]) ||
+            (isset($messageprops[$taskproperties["deadoccur"]]) &&
+            !$messageprops[$taskproperties["deadoccur"]]))) {
+            // Process recurrence
+            $message->recurrence = new SyncTaskRecurrence();
+            $this->getRecurrence($mapimessage, $messageprops, $message, $message->recurrence, false);
+        }
+
+        // when set the task to complete using the WebAccess, the dateComplete property is not set correctly
+        if ($message->complete == 1 && !isset($message->datecompleted)) {
+            $message->datecompleted = time();
+        }
+
+        // if no reminder is set, announce that to the mobile
+        if (!isset($message->reminderset)) {
+            $message->reminderset = 0;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Reads an appointment object from MAPI.
+     *
+     * @param mixed             $mapimessage
+     * @param ContentParameters $contentparameters
+     *
+     * @return SyncAppointment
+     */
+    private function getAppointment($mapimessage, $contentparameters) {
+        $message = new SyncAppointment();
+
+        // Standard one-to-one mappings first
+        $this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetAppointmentMapping());
+
+        // Appointment specific props
+        $appointmentprops = MAPIMapping::GetAppointmentProperties();
+        $messageprops = $this->getProps($mapimessage, $appointmentprops);
+
+        // set the body according to contentparameters and supported AS version
+        $this->setMessageBody($mapimessage, $contentparameters, $message);
+
+        // Set reminder time if reminderset is true
+        if (isset($messageprops[$appointmentprops["reminderset"]]) && $messageprops[$appointmentprops["reminderset"]] == true) {
+            if ($messageprops[$appointmentprops["remindertime"]] == 0x5AE980E1) {
+                $message->reminder = 15;
+            }
+            else {
+                $message->reminder = $messageprops[$appointmentprops["remindertime"]];
+            }
+        }
+
+        if (!isset($message->uid)) {
+            $message->uid = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
+        }
+        else {
+            $message->uid = Utils::GetICalUidFromOLUid($message->uid);
+        }
+
+        // Always set organizer information because some devices do not work properly without it
+        if (isset($messageprops[$appointmentprops["representingentryid"]], $messageprops[$appointmentprops["representingname"]])
+            ) {
+            $message->organizeremail = w2u($this->getSMTPAddressFromEntryID($messageprops[$appointmentprops["representingentryid"]]));
+            // if the email address can't be resolved, fall back to PR_SENT_REPRESENTING_SEARCH_KEY
+            if ($message->organizeremail == "" && isset($messageprops[$appointmentprops["sentrepresentinsrchk"]])) {
+                $message->organizeremail = $this->getEmailAddressFromSearchKey($messageprops[$appointmentprops["sentrepresentinsrchk"]]);
+            }
+            $message->organizername = w2u($messageprops[$appointmentprops["representingname"]]);
+        }
+
+        $appTz = false; // if the appointment has some timezone information saved on the server
+        if (!empty($messageprops[$appointmentprops["timezonetag"]])) {
+            $tz = $this->getTZFromMAPIBlob($messageprops[$appointmentprops["timezonetag"]]);
+            $appTz = true;
+        }
+        elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
+            // Windows uses UTC in timezone description in opposite to mstzones in TimezoneUtil which uses GMT
+            $wintz = str_replace("UTC", "GMT", $messageprops[$appointmentprops["timezonedesc"]]);
+            $tz = TimezoneUtil::GetFullTZFromTZName(TimezoneUtil::GetTZNameFromWinTZ($wintz));
+            $appTz = true;
+        }
+        else {
+            // set server default timezone (correct timezone should be configured!)
+            $tz = TimezoneUtil::GetFullTZ();
+        }
+
+        if (isset($messageprops[$appointmentprops["isrecurring"]]) && $messageprops[$appointmentprops["isrecurring"]]) {
+            // Process recurrence
+            $message->recurrence = new SyncRecurrence();
+            $this->getRecurrence($mapimessage, $messageprops, $message, $message->recurrence, $tz);
+
+            if (empty($message->alldayevent)) {
+                $message->timezone = base64_encode(TimezoneUtil::GetSyncBlobFromTZ($tz));
+            }
+        }
+
+        // Do attendees
+        $reciptable = mapi_message_getrecipienttable($mapimessage);
+        // Only get first 256 recipients, to prevent possible load issues.
+        $rows = mapi_table_queryrows($reciptable, [PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_SMTP_ADDRESS, PR_ADDRTYPE, PR_RECIPIENT_TRACKSTATUS, PR_RECIPIENT_TYPE, PR_SEARCH_KEY], 0, 256);
+
+        // Exception: we do not synchronize appointments with more than 250 attendees
+        if (count($rows) > 250) {
+            $message->id = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
+            $mbe = new SyncObjectBrokenException("Appointment has too many attendees");
+            $mbe->SetSyncObject($message);
+
+            throw $mbe;
+        }
+
+        if (count($rows) > 0) {
+            $message->attendees = [];
+        }
+
+        foreach ($rows as $row) {
+            $attendee = new SyncAttendee();
+
+            $attendee->name = w2u($row[PR_DISPLAY_NAME]);
+            // smtp address is always a proper email address
+            if (isset($row[PR_SMTP_ADDRESS])) {
+                $attendee->email = w2u($row[PR_SMTP_ADDRESS]);
+            }
+            elseif (isset($row[PR_ADDRTYPE], $row[PR_EMAIL_ADDRESS])) {
+                // if address type is SMTP, it's also a proper email address
+                if ($row[PR_ADDRTYPE] == "SMTP") {
+                    $attendee->email = w2u($row[PR_EMAIL_ADDRESS]);
+                }
+                // if address type is ZARAFA, the PR_EMAIL_ADDRESS contains username
+                elseif ($row[PR_ADDRTYPE] == "ZARAFA") {
+                    $userinfo = @nsp_getuserinfo($row[PR_EMAIL_ADDRESS]);
+                    if (is_array($userinfo) && isset($userinfo["primary_email"])) {
+                        $attendee->email = w2u($userinfo["primary_email"]);
+                    }
+                    // if the user was not found, do a fallback to PR_SEARCH_KEY
+                    // @see https://jira.z-hub.io/browse/ZP-1178
+                    elseif (isset($row[PR_SEARCH_KEY])) {
+                        $attendee->email = w2u($this->getEmailAddressFromSearchKey($row[PR_SEARCH_KEY]));
+                    }
+                    else {
+                        SLog::Write(LOGLEVEL_WARN, sprintf("MAPIProvider->getAppointment: The attendee '%s' of type ZARAFA can not be resolved. Code: 0x%X", $row[PR_EMAIL_ADDRESS], mapi_last_hresult()));
+                    }
+                }
+            }
+
+            // set attendee's status and type if they're available and if we are the organizer
+            $storeprops = $this->GetStoreProps();
+            if (isset($row[PR_RECIPIENT_TRACKSTATUS], $messageprops[$appointmentprops["representingentryid"]], $storeprops[PR_MAILBOX_OWNER_ENTRYID]) &&
+                    $messageprops[$appointmentprops["representingentryid"]] == $storeprops[PR_MAILBOX_OWNER_ENTRYID]) {
+                $attendee->attendeestatus = $row[PR_RECIPIENT_TRACKSTATUS];
+            }
+            if (isset($row[PR_RECIPIENT_TYPE])) {
+                $attendee->attendeetype = $row[PR_RECIPIENT_TYPE];
+            }
+            // Some attendees have no email or name (eg resources), and if you
+            // don't send one of those fields, the phone will give an error ... so
+            // we don't send it in that case.
+            // also ignore the "attendee" if the email is equal to the organizers' email
+            if (isset($attendee->name, $attendee->email) && $attendee->email != "" && (!isset($message->organizeremail) || (isset($message->organizeremail) && $attendee->email != $message->organizeremail))) {
+                array_push($message->attendees, $attendee);
+            }
+        }
+
+        // Status 0 = no meeting, status 1 = organizer, status 2/3/4/5 = tentative/accepted/declined/notresponded
+        if (isset($messageprops[$appointmentprops["meetingstatus"]]) && $messageprops[$appointmentprops["meetingstatus"]] > 1) {
+            if (!isset($message->attendees) || !is_array($message->attendees)) {
+                $message->attendees = [];
+            }
+            // Work around iOS6 cancellation issue when there are no attendees for this meeting. Just add ourselves as the sole attendee.
+            if (count($message->attendees) == 0) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->getAppointment: adding ourself as an attendee for iOS6 workaround"));
+                $attendee = new SyncAttendee();
+
+                $meinfo = nsp_getuserinfo(Request::GetUser());
+
+                if (is_array($meinfo)) {
+                    $attendee->email = w2u($meinfo["primary_email"]);
+                    $attendee->name = w2u($meinfo["fullname"]);
+                    $attendee->attendeetype = MAPI_TO;
+
+                    array_push($message->attendees, $attendee);
+                }
+            }
+            $message->responsetype = $messageprops[$appointmentprops["responsestatus"]];
+        }
+
+        // If it's an appointment which doesn't have any attendees, we have to make sure that
+        // the user is the owner or it will not work properly with android devices
+        // @see https://jira.z-hub.io/browse/ZP-1020
+        if (isset($messageprops[$appointmentprops["meetingstatus"]]) && $messageprops[$appointmentprops["meetingstatus"]] == olNonMeeting && empty($message->attendees)) {
+            $meinfo = nsp_getuserinfo(Request::GetUser());
+
+            if (is_array($meinfo)) {
+                $message->organizeremail = w2u($meinfo["primary_email"]);
+                $message->organizername = w2u($meinfo["fullname"]);
+                SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->getAppointment(): setting ourself as the organizer for an appointment without attendees.");
+            }
+        }
+
+        if (!isset($message->nativebodytype)) {
+            $message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
+        }
+        elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+            $nbt = MAPIUtils::GetNativeBodyType($messageprops);
+            SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getAppointment(): native body type is undefined. Set it to %d.", $nbt));
+            $message->nativebodytype = $nbt;
+        }
+
+        // If the user is working from a location other than the office the busystatus should be interpreted as free.
+        if (isset($message->busystatus) && $message->busystatus == fbWorkingElsewhere) {
+            $message->busystatus = fbFree;
+        }
+
+        // If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
+        if (isset($message->busystatus) && $message->busystatus == -1) {
+            $message->busystatus = fbTentative;
+        }
+
+        // All-day events might appear as 24h (or multiple of it) long when they start not exactly at midnight (+/- bias of the timezone)
+        if (isset($message->alldayevent) && $message->alldayevent) {
+            $localStartTime = localtime($message->starttime, 1);
+
+            // The appointment is all-day but doesn't start at midnight.
+            // If it was created in another timezone and we have that information,
+            // set the startime to the midnight of the current timezone.
+            if ($appTz && ($localStartTime['tm_hour'] || $localStartTime['tm_min'])) {
+                SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->getAppointment(): all-day event starting not midnight.");
+                $duration = $message->endtime - $message->starttime;
+                $serverTz = TimezoneUtil::GetFullTZ();
+                $message->starttime = $this->getGMTTimeByTZ($this->getLocaltimeByTZ($message->starttime, $tz), $serverTz);
+                $message->endtime = $message->starttime + $duration;
+            }
+        }
+
+        return $message;
+    }
+
+    /**
+     * Reads recurrence information from MAPI.
+     *
+     * @param mixed      $mapimessage
+     * @param array      $recurprops
+     * @param SyncObject &$syncMessage    the message
+     * @param SyncObject &$syncRecurrence the  recurrence message
+     * @param array      $tz              timezone information
+     *
+     * @return
+     */
+    private function getRecurrence($mapimessage, $recurprops, &$syncMessage, &$syncRecurrence, $tz) {
+        if ($syncRecurrence instanceof SyncTaskRecurrence) {
+            $recurrence = new TaskRecurrence($this->store, $mapimessage);
+        }
+        else {
+            $recurrence = new Recurrence($this->store, $mapimessage);
+        }
+
+        switch ($recurrence->recur["type"]) {
+            case 10: // daily
+                switch ($recurrence->recur["subtype"]) {
+                    default:
+                        $syncRecurrence->type = 0;
+                        break;
+
+                    case 1:
+                        $syncRecurrence->type = 0;
+                        $syncRecurrence->dayofweek = 62; // mon-fri
+                        $syncRecurrence->interval = 1;
+                        break;
+                }
+                break;
+
+            case 11: // weekly
+                $syncRecurrence->type = 1;
+                break;
+
+            case 12: // monthly
+                switch ($recurrence->recur["subtype"]) {
+                    default:
+                        $syncRecurrence->type = 2;
+                        break;
+
+                    case 3:
+                        $syncRecurrence->type = 3;
+                        break;
+                }
+                break;
+
+            case 13: // yearly
+                switch ($recurrence->recur["subtype"]) {
+                    default:
+                        $syncRecurrence->type = 4;
+                        break;
+
+                    case 2:
+                        $syncRecurrence->type = 5;
+                        break;
+
+                    case 3:
+                        $syncRecurrence->type = 6;
+                        break;
+                }
+        }
+        // Termination
+        switch ($recurrence->recur["term"]) {
+            case 0x21:
+                $syncRecurrence->until = $recurrence->recur["end"];
+                // fixes Mantis #350 : recur-end does not consider timezones - use ClipEnd if available
+                if (isset($recurprops[$recurrence->proptags["enddate_recurring"]])) {
+                    $syncRecurrence->until = $recurprops[$recurrence->proptags["enddate_recurring"]];
+                }
+                // add one day (minus 1 sec) to the end time to make sure the last occurrence is covered
+                $syncRecurrence->until += 86399;
+                break;
+
+            case 0x22:
+                $syncRecurrence->occurrences = $recurrence->recur["numoccur"];
+                break;
+
+            case 0x23:
+                // never ends
+                break;
+        }
+
+        // Correct 'alldayevent' because outlook fails to set it on recurring items of 24 hours or longer
+        if (isset($recurrence->recur["endocc"], $recurrence->recur["startocc"]) && ($recurrence->recur["endocc"] - $recurrence->recur["startocc"] >= 1440)) {
+            $syncMessage->alldayevent = true;
+        }
+
+        // Interval is different according to the type/subtype
+        switch ($recurrence->recur["type"]) {
+            case 10:
+                if ($recurrence->recur["subtype"] == 0) {
+                    $syncRecurrence->interval = (int) ($recurrence->recur["everyn"] / 1440);
+                }  // minutes
+                break;
+
+            case 11:
+            case 12:
+                $syncRecurrence->interval = $recurrence->recur["everyn"];
+                break; // months / weeks
+
+            case 13:
+                $syncRecurrence->interval = (int) ($recurrence->recur["everyn"] / 12);
+                break; // months
+        }
+
+        if (isset($recurrence->recur["weekdays"])) {
+            $syncRecurrence->dayofweek = $recurrence->recur["weekdays"];
+        } // bitmask of days (1 == sunday, 128 == saturday
+        if (isset($recurrence->recur["nday"])) {
+            $syncRecurrence->weekofmonth = $recurrence->recur["nday"];
+        } // N'th {DAY} of {X} (0-5)
+        if (isset($recurrence->recur["month"])) {
+            $syncRecurrence->monthofyear = (int) ($recurrence->recur["month"] / (60 * 24 * 29)) + 1;
+        } // works ok due to rounding. see also $monthminutes below (1-12)
+        if (isset($recurrence->recur["monthday"])) {
+            $syncRecurrence->dayofmonth = $recurrence->recur["monthday"];
+        } // day of month (1-31)
+
+        // All changed exceptions are appointments within the 'exceptions' array. They contain the same items as a normal appointment
+        foreach ($recurrence->recur["changed_occurrences"] as $change) {
+            $exception = new SyncAppointmentException();
+
+            // start, end, basedate, subject, remind_before, reminderset, location, busystatus, alldayevent, label
+            if (isset($change["start"])) {
+                $exception->starttime = $this->getGMTTimeByTZ($change["start"], $tz);
+            }
+            if (isset($change["end"])) {
+                $exception->endtime = $this->getGMTTimeByTZ($change["end"], $tz);
+            }
+            if (isset($change["basedate"])) {
+                $exception->exceptionstarttime = $this->getGMTTimeByTZ($this->getDayStartOfTimestamp($change["basedate"]) + $recurrence->recur["startocc"] * 60, $tz);
+
+                // open body because getting only property might not work because of memory limit
+                $exceptionatt = $recurrence->getExceptionAttachment($change["basedate"]);
+                if ($exceptionatt) {
+                    $exceptionobj = mapi_attach_openobj($exceptionatt, 0);
+                    $this->setMessageBodyForType($exceptionobj, SYNC_BODYPREFERENCE_PLAIN, $exception);
+                }
+            }
+            if (isset($change["subject"])) {
+                $exception->subject = w2u($change["subject"]);
+            }
+            if (isset($change["reminder_before"]) && $change["reminder_before"]) {
+                $exception->reminder = $change["remind_before"];
+            }
+            if (isset($change["location"])) {
+                $exception->location = w2u($change["location"]);
+            }
+            if (isset($change["busystatus"])) {
+                $exception->busystatus = $change["busystatus"];
+            }
+            if (isset($change["alldayevent"])) {
+                $exception->alldayevent = $change["alldayevent"];
+            }
+
+            // set some data from the original appointment
+            if (isset($syncMessage->uid)) {
+                $exception->uid = $syncMessage->uid;
+            }
+            if (isset($syncMessage->organizername)) {
+                $exception->organizername = $syncMessage->organizername;
+            }
+            if (isset($syncMessage->organizeremail)) {
+                $exception->organizeremail = $syncMessage->organizeremail;
+            }
+
+            if (!isset($syncMessage->exceptions)) {
+                $syncMessage->exceptions = [];
+            }
+
+            // If the user is working from a location other than the office the busystatus should be interpreted as free.
+            if (isset($exception->busystatus) && $exception->busystatus == fbWorkingElsewhere) {
+                $exception->busystatus = fbFree;
+            }
+
+            // If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
+            if (isset($exception->busystatus) && $exception->busystatus == -1) {
+                $exception->busystatus = fbTentative;
+            }
+
+            // if an exception lasts 24 hours and the series are an allday events, set also the exception to allday event,
+            // otherwise it will be a 24 hour long event on some mobiles.
+            // @see https://jira.z-hub.io/browse/ZP-980
+            if (isset($exception->starttime, $exception->endtime) && ($exception->endtime - $exception->starttime == 86400) && $syncMessage->alldayevent) {
+                $exception->alldayevent = 1;
+            }
+            array_push($syncMessage->exceptions, $exception);
+        }
+
+        // Deleted appointments contain only the original date (basedate) and a 'deleted' tag
+        foreach ($recurrence->recur["deleted_occurrences"] as $deleted) {
+            $exception = new SyncAppointmentException();
+
+            $exception->exceptionstarttime = $this->getGMTTimeByTZ($this->getDayStartOfTimestamp($deleted) + $recurrence->recur["startocc"] * 60, $tz);
+            $exception->deleted = "1";
+
+            if (!isset($syncMessage->exceptions)) {
+                $syncMessage->exceptions = [];
+            }
+
+            array_push($syncMessage->exceptions, $exception);
+        }
+
+        if (isset($syncMessage->complete) && $syncMessage->complete) {
+            $syncRecurrence->complete = $syncMessage->complete;
+        }
+    }
+
+    /**
+     * Reads an email object from MAPI.
+     *
+     * @param mixed             $mapimessage
+     * @param ContentParameters $contentparameters
+     *
+     * @return SyncEmail
+     */
+    private function getEmail($mapimessage, $contentparameters) {
+        // This workaround fixes ZP-729 and still works with Outlook.
+        // FIXME: It should be properly fixed when refactoring.
+        $bpReturnType = Utils::GetBodyPreferenceBestMatch($contentparameters->GetBodyPreference());
+        if (($contentparameters->GetMimeSupport() == SYNC_MIMESUPPORT_NEVER) ||
+                ($key = array_search(SYNC_BODYPREFERENCE_MIME, $contentparameters->GetBodyPreference()) === false) ||
+                $bpReturnType != SYNC_BODYPREFERENCE_MIME) {
+            MAPIUtils::ParseSmime($this->session, $this->store, $this->getAddressbook(), $mapimessage);
+        }
+
+        $message = new SyncMail();
+
+        $this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetEmailMapping());
+
+        $emailproperties = MAPIMapping::GetEmailProperties();
+        $messageprops = $this->getProps($mapimessage, $emailproperties);
+
+        if (isset($messageprops[PR_SOURCE_KEY])) {
+            $sourcekey = $messageprops[PR_SOURCE_KEY];
+        }
+        else {
+            $mbe = new SyncObjectBrokenException("The message doesn't have a sourcekey");
+            $mbe->SetSyncObject($message);
+
+            throw $mbe;
+        }
+
+        // set the body according to contentparameters and supported AS version
+        $this->setMessageBody($mapimessage, $contentparameters, $message);
+
+        $fromname = $fromaddr = "";
+
+        if (isset($messageprops[$emailproperties["representingname"]])) {
+            // remove encapsulating double quotes from the representingname
+            $fromname = preg_replace('/^\"(.*)\"$/', "\${1}", $messageprops[$emailproperties["representingname"]]);
+        }
+        if (isset($messageprops[$emailproperties["representingentryid"]])) {
+            $fromaddr = $this->getSMTPAddressFromEntryID($messageprops[$emailproperties["representingentryid"]]);
+        }
+
+        // if the email address can't be resolved, fall back to PR_SENT_REPRESENTING_SEARCH_KEY
+        if ($fromaddr == "" && isset($messageprops[$emailproperties["representingsearchkey"]])) {
+            $fromaddr = $this->getEmailAddressFromSearchKey($messageprops[$emailproperties["representingsearchkey"]]);
+        }
+
+        if ($fromname == $fromaddr) {
+            $fromname = "";
+        }
+
+        if ($fromname) {
+            $from = "\"" . w2u($fromname) . "\" <" . w2u($fromaddr) . ">";
+        }
+        else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
+            $from = "\"" . w2u($fromaddr) . "\" <" . w2u($fromaddr) . ">";
+        }
+        // END CHANGED dw2412 HTC shows "error" if sender name is unknown
+
+        $message->from = $from;
+
+        // process Meeting Requests
+        if (isset($message->messageclass) && strpos($message->messageclass, "IPM.Schedule.Meeting") === 0) {
+            $message->meetingrequest = new SyncMeetingRequest();
+            $this->getPropsFromMAPI($message->meetingrequest, $mapimessage, MAPIMapping::GetMeetingRequestMapping());
+
+            $meetingrequestproperties = MAPIMapping::GetMeetingRequestProperties();
+            $props = $this->getProps($mapimessage, $meetingrequestproperties);
+
+            // Get the GOID
+            if (isset($props[$meetingrequestproperties["goidtag"]])) {
+                $message->meetingrequest->globalobjid = base64_encode($props[$meetingrequestproperties["goidtag"]]);
+            }
+
+            // Set Timezone
+            if (isset($props[$meetingrequestproperties["timezonetag"]])) {
+                $tz = $this->getTZFromMAPIBlob($props[$meetingrequestproperties["timezonetag"]]);
+            }
+            else {
+                $tz = TimezoneUtil::GetFullTZ();
+            }
+
+            $message->meetingrequest->timezone = base64_encode(TimezoneUtil::GetSyncBlobFromTZ($tz));
+
+            // send basedate if exception
+            if (isset($props[$meetingrequestproperties["recReplTime"]]) ||
+                (isset($props[$meetingrequestproperties["lidIsException"]]) && $props[$meetingrequestproperties["lidIsException"]] == true)) {
+                if (isset($props[$meetingrequestproperties["recReplTime"]])) {
+                    $basedate = $props[$meetingrequestproperties["recReplTime"]];
+                    $message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $this->getGMTTZ());
+                }
+                else {
+                    if (!isset($props[$meetingrequestproperties["goidtag"]]) || !isset($props[$meetingrequestproperties["recurStartTime"]]) || !isset($props[$meetingrequestproperties["timezonetag"]])) {
+                        SLog::Write(LOGLEVEL_WARN, "Missing property to set correct basedate for exception");
+                    }
+                    else {
+                        $basedate = Utils::ExtractBaseDate($props[$meetingrequestproperties["goidtag"]], $props[$meetingrequestproperties["recurStartTime"]]);
+                        $message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $tz);
+                    }
+                }
+            }
+
+            // Organizer is the sender
+            if (strpos($message->messageclass, "IPM.Schedule.Meeting.Resp") === 0) {
+                $message->meetingrequest->organizer = $message->to;
+            }
+            else {
+                $message->meetingrequest->organizer = $message->from;
+            }
+
+            // Process recurrence
+            if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]]) {
+                $myrec = new SyncMeetingRequestRecurrence();
+                // get recurrence -> put $message->meetingrequest as message so the 'alldayevent' is set correctly
+                $this->getRecurrence($mapimessage, $props, $message->meetingrequest, $myrec, $tz);
+                $message->meetingrequest->recurrences = [$myrec];
+            }
+
+            // Force the 'alldayevent' in the object at all times. (non-existent == 0)
+            if (!isset($message->meetingrequest->alldayevent) || $message->meetingrequest->alldayevent == "") {
+                $message->meetingrequest->alldayevent = 0;
+            }
+
+            // Instancetype
+            // 0 = single appointment
+            // 1 = master recurring appointment
+            // 2 = single instance of recurring appointment
+            // 3 = exception of recurring appointment
+            $message->meetingrequest->instancetype = 0;
+            if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]] == 1) {
+                $message->meetingrequest->instancetype = 1;
+            }
+            elseif ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0) && isset($message->meetingrequest->recurrenceid)) {
+                if (isset($props[$meetingrequestproperties["appSeqNr"]]) && $props[$meetingrequestproperties["appSeqNr"]] == 0) {
+                    $message->meetingrequest->instancetype = 2;
+                }
+                else {
+                    $message->meetingrequest->instancetype = 3;
+                }
+            }
+
+            // Disable reminder if it is off
+            if (!isset($props[$meetingrequestproperties["reminderset"]]) || $props[$meetingrequestproperties["reminderset"]] == false) {
+                $message->meetingrequest->reminder = "";
+            }
+            // the property saves reminder in minutes, but we need it in secs
+            else {
+                // /set the default reminder time to seconds
+                if ($props[$meetingrequestproperties["remindertime"]] == 0x5AE980E1) {
+                    $message->meetingrequest->reminder = 900;
+                }
+                else {
+                    $message->meetingrequest->reminder = $props[$meetingrequestproperties["remindertime"]] * 60;
+                }
+            }
+
+            // Set sensitivity to 0 if missing
+            if (!isset($message->meetingrequest->sensitivity)) {
+                $message->meetingrequest->sensitivity = 0;
+            }
+
+            // If the user is working from a location other than the office the busystatus should be interpreted as free.
+            if (isset($message->meetingrequest->busystatus) && $message->meetingrequest->busystatus == fbWorkingElsewhere) {
+                $message->meetingrequest->busystatus = fbFree;
+            }
+
+            // If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
+            if (isset($message->meetingrequest->busystatus) && $message->meetingrequest->busystatus == -1) {
+                $message->meetingrequest->busystatus = fbTentative;
+            }
+
+            // if a meeting request response hasn't been processed yet,
+            // do it so that the attendee status is updated on the mobile
+            if (!isset($messageprops[$emailproperties["processed"]])) {
+                // check if we are not sending the MR so we can process it - ZP-581
+                $cuser = GSync::GetBackend()->GetUserDetails(GSync::GetBackend()->GetCurrentUsername());
+                if (isset($cuser["emailaddress"]) && $cuser["emailaddress"] != $fromaddr) {
+                    if (!isset($req)) {
+                        $req = new Meetingrequest($this->store, $mapimessage, $this->session);
+                    }
+                    if ($req->isMeetingRequestResponse()) {
+                        $req->processMeetingRequestResponse();
+                    }
+                    if ($req->isMeetingCancellation()) {
+                        $req->processMeetingCancellation();
+                    }
+                }
+            }
+            $message->contentclass = DEFAULT_CALENDAR_CONTENTCLASS;
+
+            // MeetingMessageType values
+            // 0 = A silent update was performed, or the message type is unspecified.
+            // 1 = Initial meeting request.
+            // 2 = Full update.
+            // 3 = Informational update.
+            // 4 = Outdated. A newer meeting request or meeting update was received after this message.
+            // 5 = Identifies the delegator's copy of the meeting request.
+            // 6 = Identifies that the meeting request has been delegated and the meeting request cannot be responded to.
+            $message->meetingrequest->meetingmessagetype = mtgEmpty;
+
+            if (isset($props[$meetingrequestproperties["meetingType"]])) {
+                switch ($props[$meetingrequestproperties["meetingType"]]) {
+                    case mtgRequest:
+                        $message->meetingrequest->meetingmessagetype = 1;
+                        break;
+
+                    case mtgFull:
+                        $message->meetingrequest->meetingmessagetype = 2;
+                        break;
+
+                    case mtgInfo:
+                        $message->meetingrequest->meetingmessagetype = 3;
+                        break;
+
+                    case mtgOutOfDate:
+                        $message->meetingrequest->meetingmessagetype = 4;
+                        break;
+
+                    case mtgDelegatorCopy:
+                        $message->meetingrequest->meetingmessagetype = 5;
+                        break;
+                }
+            }
+        }
+
+        // Add attachments
+        $attachtable = mapi_message_getattachmenttable($mapimessage);
+        $rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM]);
+        $entryid = bin2hex($messageprops[$emailproperties["entryid"]]);
+        $parentSourcekey = bin2hex($messageprops[$emailproperties["parentsourcekey"]]);
+
+        foreach ($rows as $row) {
+            if (isset($row[PR_ATTACH_NUM])) {
+                if (Request::GetProtocolVersion() >= 12.0) {
+                    $attach = new SyncBaseAttachment();
+                }
+                else {
+                    $attach = new SyncAttachment();
+                }
+
+                $mapiattach = mapi_message_openattach($mapimessage, $row[PR_ATTACH_NUM]);
+                $attachprops = mapi_getprops($mapiattach, [PR_ATTACH_LONG_FILENAME, PR_ATTACH_FILENAME, PR_ATTACHMENT_HIDDEN, PR_ATTACH_CONTENT_ID, PR_ATTACH_CONTENT_ID_W, PR_ATTACH_MIME_TAG, PR_ATTACH_MIME_TAG_W, PR_ATTACH_METHOD, PR_DISPLAY_NAME, PR_DISPLAY_NAME_W, PR_ATTACH_SIZE, PR_ATTACH_FLAGS]);
+                if ((isset($attachprops[PR_ATTACH_MIME_TAG]) && strpos(strtolower($attachprops[PR_ATTACH_MIME_TAG]), 'signed') !== false) ||
+                    (isset($attachprops[PR_ATTACH_MIME_TAG_W]) && strpos(strtolower($attachprops[PR_ATTACH_MIME_TAG_W]), 'signed') !== false)) {
+                    continue;
+                }
+
+                // the displayname is handled equally for all AS versions
+                $attach->displayname = w2u((isset($attachprops[PR_ATTACH_LONG_FILENAME])) ? $attachprops[PR_ATTACH_LONG_FILENAME] : ((isset($attachprops[PR_ATTACH_FILENAME])) ? $attachprops[PR_ATTACH_FILENAME] : ((isset($attachprops[PR_DISPLAY_NAME])) ? $attachprops[PR_DISPLAY_NAME] : "attachment.bin")));
+                // fix attachment name in case of inline images
+                if (($attach->displayname == "inline.txt" && (isset($attachprops[PR_ATTACH_MIME_TAG]) || $attachprops[PR_ATTACH_MIME_TAG_W])) ||
+                (substr_compare($attach->displayname, "attachment", 0, 10, true) === 0 && substr_compare($attach->displayname, ".dat", -4, 4, true) === 0)) {
+                    $mimetype = (isset($attachprops[PR_ATTACH_MIME_TAG])) ? $attachprops[PR_ATTACH_MIME_TAG] : $attachprops[PR_ATTACH_MIME_TAG_W];
+                    $mime = explode("/", $mimetype);
+
+                    if (count($mime) == 2 && $mime[0] == "image") {
+                        $attach->displayname = "inline." . $mime[1];
+                    }
+                }
+
+                // set AS version specific parameters
+                if (Request::GetProtocolVersion() >= 12.0) {
+                    $attach->filereference = sprintf("%s:%s:%s", $entryid, $row[PR_ATTACH_NUM], $parentSourcekey);
+                    $attach->method = (isset($attachprops[PR_ATTACH_METHOD])) ? $attachprops[PR_ATTACH_METHOD] : ATTACH_BY_VALUE;
+
+                    // if displayname does not have the eml extension for embedde messages, android and WP devices won't open it
+                    if ($attach->method == ATTACH_EMBEDDED_MSG) {
+                        if (strtolower(substr($attach->displayname, -4)) != '.eml') {
+                            $attach->displayname .= '.eml';
+                        }
+                    }
+                    // android devices require attachment size in order to display an attachment properly
+                    if (!isset($attachprops[PR_ATTACH_SIZE])) {
+                        $stream = mapi_openproperty($mapiattach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
+                        // It's not possible to open some (embedded only?) messages, so we need to open the attachment object itself to get the data
+                        if (mapi_last_hresult()) {
+                            $embMessage = mapi_attach_openobj($mapiattach);
+                            $addrbook = $this->getAddressbook();
+                            $stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $embMessage, ['use_tnef' => -1]);
+                        }
+                        $stat = mapi_stream_stat($stream);
+                        $attach->estimatedDataSize = $stat['cb'];
+                    }
+                    else {
+                        $attach->estimatedDataSize = $attachprops[PR_ATTACH_SIZE];
+                    }
+
+                    if (isset($attachprops[PR_ATTACH_CONTENT_ID]) && $attachprops[PR_ATTACH_CONTENT_ID]) {
+                        $attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID];
+                    }
+
+                    if (!isset($attach->contentid) && isset($attachprops[PR_ATTACH_CONTENT_ID_W]) && $attachprops[PR_ATTACH_CONTENT_ID_W]) {
+                        $attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID_W];
+                    }
+
+                    if (isset($attachprops[PR_ATTACHMENT_HIDDEN]) && $attachprops[PR_ATTACHMENT_HIDDEN]) {
+                        $attach->isinline = 1;
+                    }
+
+                    if (isset($attach->contentid, $attachprops[PR_ATTACH_FLAGS]) && $attachprops[PR_ATTACH_FLAGS] & 4) {
+                        $attach->isinline = 1;
+                    }
+
+                    if (!isset($message->asattachments)) {
+                        $message->asattachments = [];
+                    }
+
+                    array_push($message->asattachments, $attach);
+                }
+                else {
+                    $attach->attsize = $attachprops[PR_ATTACH_SIZE];
+                    $attach->attname = sprintf("%s:%s:%s", $entryid, $row[PR_ATTACH_NUM], $parentSourcekey);
+                    if (!isset($message->attachments)) {
+                        $message->attachments = [];
+                    }
+
+                    array_push($message->attachments, $attach);
+                }
+            }
+        }
+
+        // Get To/Cc as SMTP addresses (this is different from displayto and displaycc because we are putting
+        // in the SMTP addresses as well, while displayto and displaycc could just contain the display names
+        $message->to = [];
+        $message->cc = [];
+
+        $reciptable = mapi_message_getrecipienttable($mapimessage);
+        $rows = mapi_table_queryallrows($reciptable, [PR_RECIPIENT_TYPE, PR_DISPLAY_NAME, PR_ADDRTYPE, PR_EMAIL_ADDRESS, PR_SMTP_ADDRESS, PR_ENTRYID, PR_SEARCH_KEY]);
+
+        foreach ($rows as $row) {
+            $address = "";
+            $fulladdr = "";
+
+            $addrtype = isset($row[PR_ADDRTYPE]) ? $row[PR_ADDRTYPE] : "";
+
+            if (isset($row[PR_SMTP_ADDRESS])) {
+                $address = $row[PR_SMTP_ADDRESS];
+            }
+            elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS])) {
+                $address = $row[PR_EMAIL_ADDRESS];
+            }
+            elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID])) {
+                $address = $this->getSMTPAddressFromEntryID($row[PR_ENTRYID]);
+            }
+
+            // if the user was not found, do a fallback to PR_SEARCH_KEY
+            // @see https://jira.z-hub.io/browse/ZP-1178
+            if (empty($address) && isset($row[PR_SEARCH_KEY])) {
+                $address = $this->getEmailAddressFromSearchKey($row[PR_SEARCH_KEY]);
+            }
+
+            $name = isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "";
+
+            if ($name == "" || $name == $address) {
+                $fulladdr = w2u($address);
+            }
+            else {
+                if (substr($name, 0, 1) != '"' && substr($name, -1) != '"') {
+                    $fulladdr = "\"" . w2u($name) . "\" <" . w2u($address) . ">";
+                }
+                else {
+                    $fulladdr = w2u($name) . "<" . w2u($address) . ">";
+                }
+            }
+
+            if ($row[PR_RECIPIENT_TYPE] == MAPI_TO) {
+                array_push($message->to, $fulladdr);
+            }
+            elseif ($row[PR_RECIPIENT_TYPE] == MAPI_CC) {
+                array_push($message->cc, $fulladdr);
+            }
+        }
+
+        if (is_array($message->to) && !empty($message->to)) {
+            $message->to = implode(", ", $message->to);
+        }
+        if (is_array($message->cc) && !empty($message->cc)) {
+            $message->cc = implode(", ", $message->cc);
+        }
+
+        // without importance some mobiles assume "0" (low) - Mantis #439
+        if (!isset($message->importance)) {
+            $message->importance = IMPORTANCE_NORMAL;
+        }
+
+        if (!isset($message->internetcpid)) {
+            $message->internetcpid = (defined('STORE_INTERNET_CPID')) ? constant('STORE_INTERNET_CPID') : INTERNET_CPID_WINDOWS1252;
+        }
+        $this->setFlag($mapimessage, $message);
+        // TODO checkcontentclass
+        if (!isset($message->contentclass)) {
+            $message->contentclass = DEFAULT_EMAIL_CONTENTCLASS;
+        }
+
+        if (!isset($message->nativebodytype)) {
+            $message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
+        }
+        elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+            $nbt = MAPIUtils::GetNativeBodyType($messageprops);
+            SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getEmail(): native body type is undefined. Set it to %d.", $nbt));
+            $message->nativebodytype = $nbt;
+        }
+
+        // reply, reply to all, forward flags
+        if (isset($message->lastverbexecuted) && $message->lastverbexecuted) {
+            $message->lastverbexecuted = Utils::GetLastVerbExecuted($message->lastverbexecuted);
+        }
+
+        return $message;
+    }
+
+    /**
+     * Reads a note object from MAPI.
+     *
+     * @param mixed             $mapimessage
+     * @param ContentParameters $contentparameters
+     *
+     * @return SyncNote
+     */
+    private function getNote($mapimessage, $contentparameters) {
+        $message = new SyncNote();
+
+        // Standard one-to-one mappings first
+        $this->getPropsFromMAPI($message, $mapimessage, MAPIMapping::GetNoteMapping());
+
+        // set the body according to contentparameters and supported AS version
+        $this->setMessageBody($mapimessage, $contentparameters, $message);
+
+        return $message;
+    }
+
+    /**
+     * Creates a SyncFolder from MAPI properties.
+     *
+     * @param mixed $folderprops
+     *
+     * @return SyncFolder
+     */
+    public function GetFolder($folderprops) {
+        $folder = new SyncFolder();
+
+        $storeprops = $this->GetStoreProps();
+
+        // For ZCP 7.0.x we need to retrieve more properties explicitly, see ZP-780
+        if (isset($folderprops[PR_SOURCE_KEY]) && !isset($folderprops[PR_ENTRYID]) && !isset($folderprops[PR_CONTAINER_CLASS])) {
+            $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $folderprops[PR_SOURCE_KEY]);
+            $mapifolder = mapi_msgstore_openentry($this->store, $entryid);
+            $folderprops = mapi_getprops($mapifolder, [PR_DISPLAY_NAME, PR_PARENT_ENTRYID, PR_ENTRYID, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_CONTAINER_CLASS, PR_ATTR_HIDDEN, PR_EXTENDED_FOLDER_FLAGS]);
+            SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->GetFolder(): received insufficient of data from ICS. Fetching required data.");
+        }
+
+        if (!isset(
+                $folderprops[PR_DISPLAY_NAME],
+                $folderprops[PR_PARENT_ENTRYID],
+                $folderprops[PR_SOURCE_KEY],
+                $folderprops[PR_ENTRYID],
+                $folderprops[PR_PARENT_SOURCE_KEY],
+                $storeprops[PR_IPM_SUBTREE_ENTRYID])) {
+            SLog::Write(LOGLEVEL_ERROR, "MAPIProvider->GetFolder(): invalid folder. Missing properties");
+
+            return false;
+        }
+
+        // ignore hidden folders
+        if (isset($folderprops[PR_ATTR_HIDDEN]) && $folderprops[PR_ATTR_HIDDEN] != false) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->GetFolder(): invalid folder '%s' as it is a hidden folder (PR_ATTR_HIDDEN)", $folderprops[PR_DISPLAY_NAME]));
+
+            return false;
+        }
+
+        // ignore certain undesired folders, like "RSS Feeds" and "Suggested contacts"
+        if ((isset($folderprops[PR_CONTAINER_CLASS]) && $folderprops[PR_CONTAINER_CLASS] == "IPF.Note.OutlookHomepage") ||
+                in_array($folderprops[PR_ENTRYID], $this->getSpecialFoldersData())) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->GetFolder(): folder '%s' should not be synchronized", $folderprops[PR_DISPLAY_NAME]));
+
+            return false;
+        }
+
+        $folder->BackendId = bin2hex($folderprops[PR_SOURCE_KEY]);
+        $folderOrigin = DeviceManager::FLD_ORIGIN_USER;
+        if (GSync::GetBackend()->GetImpersonatedUser()) {
+            $folderOrigin = DeviceManager::FLD_ORIGIN_IMPERSONATED;
+        }
+        $folder->serverid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folderprops[PR_DISPLAY_NAME]);
+        if ($folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_SUBTREE_ENTRYID] || $folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID]) {
+            $folder->parentid = "0";
+        }
+        else {
+            $folder->parentid = GSync::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($folderprops[PR_PARENT_SOURCE_KEY]));
+        }
+        $folder->displayname = w2u($folderprops[PR_DISPLAY_NAME]);
+        $folder->type = $this->GetFolderType($folderprops[PR_ENTRYID], isset($folderprops[PR_CONTAINER_CLASS]) ? $folderprops[PR_CONTAINER_CLASS] : false);
+
+        return $folder;
+    }
+
+    /**
+     * Returns the foldertype for an entryid
+     * Gets the folder type by checking the default folders in MAPI.
+     *
+     * @param string $entryid
+     * @param string $class   (opt)
+     *
+     * @return long
+     */
+    public function GetFolderType($entryid, $class = false) {
+        $storeprops = $this->GetStoreProps();
+        $inboxprops = $this->GetInboxProps();
+
+        if ($entryid == $storeprops[PR_IPM_WASTEBASKET_ENTRYID]) {
+            return SYNC_FOLDER_TYPE_WASTEBASKET;
+        }
+        if ($entryid == $storeprops[PR_IPM_SENTMAIL_ENTRYID]) {
+            return SYNC_FOLDER_TYPE_SENTMAIL;
+        }
+        if ($entryid == $storeprops[PR_IPM_OUTBOX_ENTRYID]) {
+            return SYNC_FOLDER_TYPE_OUTBOX;
+        }
+
+        // Public folders do not have inboxprops
+        // @see https://jira.z-hub.io/browse/ZP-995
+        if (!empty($inboxprops)) {
+            if ($entryid == $inboxprops[PR_ENTRYID]) {
+                return SYNC_FOLDER_TYPE_INBOX;
+            }
+            if ($entryid == $inboxprops[PR_IPM_DRAFTS_ENTRYID]) {
+                return SYNC_FOLDER_TYPE_DRAFTS;
+            }
+            if ($entryid == $inboxprops[PR_IPM_TASK_ENTRYID]) {
+                return SYNC_FOLDER_TYPE_TASK;
+            }
+            if ($entryid == $inboxprops[PR_IPM_APPOINTMENT_ENTRYID]) {
+                return SYNC_FOLDER_TYPE_APPOINTMENT;
+            }
+            if ($entryid == $inboxprops[PR_IPM_CONTACT_ENTRYID]) {
+                return SYNC_FOLDER_TYPE_CONTACT;
+            }
+            if ($entryid == $inboxprops[PR_IPM_NOTE_ENTRYID]) {
+                return SYNC_FOLDER_TYPE_NOTE;
+            }
+            if ($entryid == $inboxprops[PR_IPM_JOURNAL_ENTRYID]) {
+                return SYNC_FOLDER_TYPE_JOURNAL;
+            }
+        }
+
+        // user created folders
+        if ($class == "IPF.Note") {
+            return SYNC_FOLDER_TYPE_USER_MAIL;
+        }
+        if ($class == "IPF.Task") {
+            return SYNC_FOLDER_TYPE_USER_TASK;
+        }
+        if ($class == "IPF.Appointment") {
+            return SYNC_FOLDER_TYPE_USER_APPOINTMENT;
+        }
+        if ($class == "IPF.Contact") {
+            return SYNC_FOLDER_TYPE_USER_CONTACT;
+        }
+        if ($class == "IPF.StickyNote") {
+            return SYNC_FOLDER_TYPE_USER_NOTE;
+        }
+        if ($class == "IPF.Journal") {
+            return SYNC_FOLDER_TYPE_USER_JOURNAL;
+        }
+
+        return SYNC_FOLDER_TYPE_OTHER;
+    }
+
+    /**
+     * Indicates if the entry id is a default MAPI folder.
+     *
+     * @param string $entryid
+     *
+     * @return bool
+     */
+    public function IsMAPIDefaultFolder($entryid) {
+        $msgstore_props = mapi_getprops($this->store, [PR_ENTRYID, PR_DISPLAY_NAME, PR_IPM_SUBTREE_ENTRYID, PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID, PR_MDB_PROVIDER, PR_IPM_PUBLIC_FOLDERS_ENTRYID, PR_IPM_FAVORITES_ENTRYID, PR_MAILBOX_OWNER_ENTRYID]);
+
+        $inboxProps = [];
+        $inbox = mapi_msgstore_getreceivefolder($this->store);
+        if (!mapi_last_hresult()) {
+            $inboxProps = mapi_getprops($inbox, [PR_ENTRYID]);
+        }
+
+        $root = mapi_msgstore_openentry($this->store, null); // TODO use getRootProps()
+        $rootProps = mapi_getprops($root, [PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_JOURNAL_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_TASK_ENTRYID, PR_ADDITIONAL_REN_ENTRYIDS]);
+
+        $additional_ren_entryids = [];
+        if (isset($rootProps[PR_ADDITIONAL_REN_ENTRYIDS])) {
+            $additional_ren_entryids = $rootProps[PR_ADDITIONAL_REN_ENTRYIDS];
+        }
+
+        $defaultfolders = [
+            "inbox" => ["inbox" => PR_ENTRYID],
+            "outbox" => ["store" => PR_IPM_OUTBOX_ENTRYID],
+            "sent" => ["store" => PR_IPM_SENTMAIL_ENTRYID],
+            "wastebasket" => ["store" => PR_IPM_WASTEBASKET_ENTRYID],
+            "favorites" => ["store" => PR_IPM_FAVORITES_ENTRYID],
+            "publicfolders" => ["store" => PR_IPM_PUBLIC_FOLDERS_ENTRYID],
+            "calendar" => ["root" => PR_IPM_APPOINTMENT_ENTRYID],
+            "contact" => ["root" => PR_IPM_CONTACT_ENTRYID],
+            "drafts" => ["root" => PR_IPM_DRAFTS_ENTRYID],
+            "journal" => ["root" => PR_IPM_JOURNAL_ENTRYID],
+            "note" => ["root" => PR_IPM_NOTE_ENTRYID],
+            "task" => ["root" => PR_IPM_TASK_ENTRYID],
+            "junk" => ["additional" => 4],
+            "syncissues" => ["additional" => 1],
+            "conflicts" => ["additional" => 0],
+            "localfailures" => ["additional" => 2],
+            "serverfailures" => ["additional" => 3],
+        ];
+
+        foreach ($defaultfolders as $key => $prop) {
+            $tag = reset($prop);
+            $from = key($prop);
+
+            switch ($from) {
+                case "inbox":
+                    if (isset($inboxProps[$tag]) && $entryid == $inboxProps[$tag]) {
+                        SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Inbox found, key '%s'", $key));
+
+                        return true;
+                    }
+                    break;
+
+                case "store":
+                    if (isset($msgstore_props[$tag]) && $entryid == $msgstore_props[$tag]) {
+                        SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Store folder found, key '%s'", $key));
+
+                        return true;
+                    }
+                    break;
+
+                case "root":
+                    if (isset($rootProps[$tag]) && $entryid == $rootProps[$tag]) {
+                        SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Root folder found, key '%s'", $key));
+
+                        return true;
+                    }
+                    break;
+
+                case "additional":
+                    if (isset($additional_ren_entryids[$tag]) && $entryid == $additional_ren_entryids[$tag]) {
+                        SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->IsMAPIFolder(): Additional folder found, key '%s'", $key));
+
+                        return true;
+                    }
+                    break;
+            }
+        }
+
+        return false;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * SETTER
 	 */
 
-	/**
-	 * Writes a SyncObject to MAPI
-	 * Depending on the message class, a contact, appointment, task or email is written.
-	 *
-	 * @param mixed      $mapimessage
-	 * @param SyncObject $message
-	 *
-	 * @return bool
-	 */
-	public function SetMessage($mapimessage, $message) {
-		// TODO check with instanceof
-		switch (strtolower(get_class($message))) {
-			case "synccontact":
-				return $this->setContact($mapimessage, $message);
-
-			case "syncappointment":
-				return $this->setAppointment($mapimessage, $message);
-
-			case "synctask":
-				return $this->setTask($mapimessage, $message);
-
-			case "syncnote":
-				return $this->setNote($mapimessage, $message);
-
-			default:
-				// for emails only flag (read and todo) changes are possible
-				return $this->setEmail($mapimessage, $message);
-		}
-	}
-
-	/**
-	 * Writes SyncMail to MAPI (actually flags only).
-	 *
-	 * @param mixed    $mapimessage
-	 * @param SyncMail $message
-	 */
-	private function setEmail($mapimessage, $message) {
-		// update categories
-		if (!isset($message->categories)) {
-			$message->categories = [];
-		}
-		$emailmap = MAPIMapping::GetEmailMapping();
-		$this->setPropsInMAPI($mapimessage, $message, ["categories" => $emailmap["categories"]]);
-
-		$flagmapping = MAPIMapping::GetMailFlagsMapping();
-		$flagprops = MAPIMapping::GetMailFlagsProperties();
-		$flagprops = array_merge($this->getPropIdsFromStrings($flagmapping), $this->getPropIdsFromStrings($flagprops));
-		// flag specific properties to be set
-		$props = $delprops = [];
-		// unset message flags if:
-		// flag is not set
-		if (empty($message->flag) ||
-			// flag status is not set
-			!isset($message->flag->flagstatus) ||
-			// flag status is 0 or empty
-			(isset($message->flag->flagstatus) && ($message->flag->flagstatus == 0 || $message->flag->flagstatus == ""))) {
-			// if message flag is empty, some properties need to be deleted
-			// and some set to 0 or false
-
-			$props[$flagprops["todoitemsflags"]] = 0;
-			$props[$flagprops["status"]] = 0;
-			$props[$flagprops["completion"]] = 0.0;
-			$props[$flagprops["flagtype"]] = "";
-			$props[$flagprops["ordinaldate"]] = 0x7FFFFFFF; // ordinal date is 12am 1.1.4501, set it to max possible value
-			$props[$flagprops["subordinaldate"]] = "";
-			$props[$flagprops["replyrequested"]] = false;
-			$props[$flagprops["responserequested"]] = false;
-			$props[$flagprops["reminderset"]] = false;
-			$props[$flagprops["complete"]] = false;
-
-			$delprops[] = $flagprops["todotitle"];
-			$delprops[] = $flagprops["duedate"];
-			$delprops[] = $flagprops["startdate"];
-			$delprops[] = $flagprops["datecompleted"];
-			$delprops[] = $flagprops["utcstartdate"];
-			$delprops[] = $flagprops["utcduedate"];
-			$delprops[] = $flagprops["completetime"];
-			$delprops[] = $flagprops["flagstatus"];
-			$delprops[] = $flagprops["flagicon"];
-		}
-		else {
-			$this->setPropsInMAPI($mapimessage, $message->flag, $flagmapping);
-			$props[$flagprops["todoitemsflags"]] = 1;
-			if (isset($message->subject) && strlen($message->subject) > 0) {
-				$props[$flagprops["todotitle"]] = $message->subject;
-			}
-			// ordinal date is utc current time
-			if (!isset($message->flag->ordinaldate) || empty($message->flag->ordinaldate)) {
-				$props[$flagprops["ordinaldate"]] = time();
-			}
-			// the default value
-			if (!isset($message->flag->subordinaldate) || empty($message->flag->subordinaldate)) {
-				$props[$flagprops["subordinaldate"]] = "5555555";
-			}
-			$props[$flagprops["flagicon"]] = 6; // red flag icon
-			$props[$flagprops["replyrequested"]] = true;
-			$props[$flagprops["responserequested"]] = true;
-
-			if ($message->flag->flagstatus == SYNC_FLAGSTATUS_COMPLETE) {
-				$props[$flagprops["status"]] = olTaskComplete;
-				$props[$flagprops["completion"]] = 1.0;
-				$props[$flagprops["complete"]] = true;
-				$props[$flagprops["replyrequested"]] = false;
-				$props[$flagprops["responserequested"]] = false;
-				unset($props[$flagprops["flagicon"]]);
-				$delprops[] = $flagprops["flagicon"];
-			}
-		}
-
-		if (!empty($props)) {
-			mapi_setprops($mapimessage, $props);
-		}
-		if (!empty($delprops)) {
-			mapi_deleteprops($mapimessage, $delprops);
-		}
-	}
-
-	/**
-	 * Writes a SyncAppointment to MAPI.
-	 *
-	 * @param mixed           $mapimessage
-	 * @param SyncAppointment $message
-	 * @param mixed           $appointment
-	 *
-	 * @return bool
-	 */
-	private function setAppointment($mapimessage, $appointment) {
-		// Get timezone info
-		if (isset($appointment->timezone)) {
-			$tz = $this->getTZFromSyncBlob(base64_decode($appointment->timezone));
-		}
-		else {
-			$tz = false;
-		}
-
-		// start and end time may not be set - try to get them from the existing appointment for further calculation - see https://jira.z-hub.io/browse/ZP-983
-		if (!isset($appointment->starttime) || !isset($appointment->endtime)) {
-			$amapping = MAPIMapping::GetAppointmentMapping();
-			$amapping = $this->getPropIdsFromStrings($amapping);
-			$existingstartendpropsmap = [$amapping["starttime"], $amapping["endtime"]];
-			$existingstartendprops = $this->getProps($mapimessage, $existingstartendpropsmap);
-
-			if (isset($existingstartendprops[$amapping["starttime"]]) && !isset($appointment->starttime)) {
-				$appointment->starttime = $existingstartendprops[$amapping["starttime"]];
-				SLog::Write(LOGLEVEL_WBXML, sprintf("MAPIProvider->setAppointment(): Parameter 'starttime' was not set, using value from MAPI %d (%s).", $appointment->starttime, gmstrftime("%Y%m%dT%H%M%SZ", $appointment->starttime)));
-			}
-			if (isset($existingstartendprops[$amapping["endtime"]]) && !isset($appointment->endtime)) {
-				$appointment->endtime = $existingstartendprops[$amapping["endtime"]];
-				SLog::Write(LOGLEVEL_WBXML, sprintf("MAPIProvider->setAppointment(): Parameter 'endtime' was not set, using value from MAPI %d (%s).", $appointment->endtime, gmstrftime("%Y%m%dT%H%M%SZ", $appointment->endtime)));
-			}
-		}
-		if (!isset($appointment->starttime) || !isset($appointment->endtime)) {
-			throw new StatusException("MAPIProvider->setAppointment(): Error, start and/or end time not set and can not be retrieved from MAPI.", SYNC_STATUS_SYNCCANNOTBECOMPLETED);
-		}
-
-		// calculate duration because without it some webaccess views are broken. duration is in min
-		$localstart = $this->getLocaltimeByTZ($appointment->starttime, $tz);
-		$localend = $this->getLocaltimeByTZ($appointment->endtime, $tz);
-		$duration = ($localend - $localstart) / 60;
-
-		// nokia sends an yearly event with 0 mins duration but as all day event,
-		// so make it end next day
-		if ($appointment->starttime == $appointment->endtime && isset($appointment->alldayevent) && $appointment->alldayevent) {
-			$duration = 1440;
-			$appointment->endtime = $appointment->starttime + 24 * 60 * 60;
-			$localend = $localstart + 24 * 60 * 60;
-		}
-
-		// is the transmitted UID OL compatible?
-		// if not, encapsulate the transmitted uid
-		$appointment->uid = Utils::GetOLUidFromICalUid($appointment->uid);
-
-		mapi_setprops($mapimessage, [PR_MESSAGE_CLASS => "IPM.Appointment"]);
-
-		$appointmentmapping = MAPIMapping::GetAppointmentMapping();
-		$this->setPropsInMAPI($mapimessage, $appointment, $appointmentmapping);
-		$appointmentprops = MAPIMapping::GetAppointmentProperties();
-		$appointmentprops = array_merge($this->getPropIdsFromStrings($appointmentmapping), $this->getPropIdsFromStrings($appointmentprops));
-		// appointment specific properties to be set
-		$props = [];
-
-		// sensitivity is not enough to mark an appointment as private, so we use another mapi tag
-		$private = (isset($appointment->sensitivity) && $appointment->sensitivity >= SENSITIVITY_PRIVATE) ? true : false;
-
-		// Set commonstart/commonend to start/end and remindertime to start, duration, private and cleanGlobalObjectId
-		$props[$appointmentprops["commonstart"]] = $appointment->starttime;
-		$props[$appointmentprops["commonend"]] = $appointment->endtime;
-		$props[$appointmentprops["reminderstart"]] = $appointment->starttime;
-		// Set reminder boolean to 'true' if reminder is set
-		$props[$appointmentprops["reminderset"]] = isset($appointment->reminder) ? true : false;
-		$props[$appointmentprops["duration"]] = $duration;
-		$props[$appointmentprops["private"]] = $private;
-		$props[$appointmentprops["uid"]] = $appointment->uid;
-		// Set named prop 8510, unknown property, but enables deleting a single occurrence of a recurring
-		// type in OLK2003.
-		$props[$appointmentprops["sideeffects"]] = 369;
-
-		if (isset($appointment->reminder) && $appointment->reminder >= 0) {
-			// Set 'flagdueby' to correct value (start - reminderminutes)
-			$props[$appointmentprops["flagdueby"]] = $appointment->starttime - $appointment->reminder * 60;
-			$props[$appointmentprops["remindertime"]] = $appointment->reminder;
-		}
-		// unset the reminder
-		else {
-			$props[$appointmentprops["reminderset"]] = false;
-		}
-
-		if (isset($appointment->asbody)) {
-			$this->setASbody($appointment->asbody, $props, $appointmentprops);
-		}
-
-		if ($tz !== false) {
-			$props[$appointmentprops["timezonetag"]] = $this->getMAPIBlobFromTZ($tz);
-		}
-
-		if (isset($appointment->recurrence)) {
-			// Set PR_ICON_INDEX to 1025 to show correct icon in category view
-			$props[$appointmentprops["icon"]] = 1025;
-
-			// if there aren't any exceptions, use the 'old style' set recurrence
-			$noexceptions = true;
-
-			$recurrence = new Recurrence($this->store, $mapimessage);
-			$recur = [];
-			$this->setRecurrence($appointment, $recur);
-
-			// set the recurrence type to that of the MAPI
-			$props[$appointmentprops["recurrencetype"]] = $recur["recurrencetype"];
-
-			$starttime = $this->gmtime($localstart);
-			$endtime = $this->gmtime($localend);
-
-			// set recurrence start here because it's calculated differently for tasks and appointments
-			$recur["start"] = $this->getDayStartOfTimestamp($this->getGMTTimeByTZ($localstart, $tz));
-
-			$recur["startocc"] = $starttime["tm_hour"] * 60 + $starttime["tm_min"];
-			$recur["endocc"] = $recur["startocc"] + $duration; // Note that this may be > 24*60 if multi-day
-
-			// only tasks can regenerate
-			$recur["regen"] = false;
-
-			// Process exceptions. The PDA will send all exceptions for this recurring item.
-			if (isset($appointment->exceptions)) {
-				foreach ($appointment->exceptions as $exception) {
-					// we always need the base date
-					if (!isset($exception->exceptionstarttime)) {
-						continue;
-					}
-
-					$basedate = $this->getDayStartOfTimestamp($exception->exceptionstarttime);
-					if (isset($exception->deleted) && $exception->deleted) {
-						$noexceptions = false;
-						// Delete exception
-						$recurrence->createException([], $basedate, true);
-					}
-					else {
-						// Change exception
-						$mapiexception = ["basedate" => $basedate];
-						// other exception properties which are not handled in recurrence
-						$exceptionprops = [];
-
-						if (isset($exception->starttime)) {
-							$mapiexception["start"] = $this->getLocaltimeByTZ($exception->starttime, $tz);
-							$exceptionprops[$appointmentprops["starttime"]] = $exception->starttime;
-						}
-						if (isset($exception->endtime)) {
-							$mapiexception["end"] = $this->getLocaltimeByTZ($exception->endtime, $tz);
-							$exceptionprops[$appointmentprops["endtime"]] = $exception->endtime;
-						}
-						if (isset($exception->subject)) {
-							$exceptionprops[$appointmentprops["subject"]] = $mapiexception["subject"] = u2w($exception->subject);
-						}
-						if (isset($exception->location)) {
-							$exceptionprops[$appointmentprops["location"]] = $mapiexception["location"] = u2w($exception->location);
-						}
-						if (isset($exception->busystatus)) {
-							$exceptionprops[$appointmentprops["busystatus"]] = $mapiexception["busystatus"] = $exception->busystatus;
-						}
-						if (isset($exception->reminder)) {
-							$exceptionprops[$appointmentprops["reminderset"]] = $mapiexception["reminder_set"] = 1;
-							$exceptionprops[$appointmentprops["remindertime"]] = $mapiexception["remind_before"] = $exception->reminder;
-						}
-						if (isset($exception->alldayevent)) {
-							$exceptionprops[$appointmentprops["alldayevent"]] = $mapiexception["alldayevent"] = $exception->alldayevent;
-						}
-
-						if (!isset($recur["changed_occurrences"])) {
-							$recur["changed_occurrences"] = [];
-						}
-
-						if (isset($exception->body)) {
-							$exceptionprops[$appointmentprops["body"]] = u2w($exception->body);
-						}
-
-						if (isset($exception->asbody)) {
-							$this->setASbody($exception->asbody, $exceptionprops, $appointmentprops);
-							$mapiexception["body"] = $exceptionprops[$appointmentprops["body"]] =
-								(isset($exceptionprops[$appointmentprops["body"]])) ? $exceptionprops[$appointmentprops["body"]] :
-								((isset($exceptionprops[$appointmentprops["html"]])) ? $exceptionprops[$appointmentprops["html"]] : "");
-						}
-
-						array_push($recur["changed_occurrences"], $mapiexception);
-
-						if (!empty($exceptionprops)) {
-							$noexceptions = false;
-							if ($recurrence->isException($basedate)) {
-								$recurrence->modifyException($exceptionprops, $basedate);
-							}
-							else {
-								$recurrence->createException($exceptionprops, $basedate);
-							}
-						}
-					}
-				}
-			}
-
-			// setRecurrence deletes the attachments from an appointment
-			if ($noexceptions) {
-				$recurrence->setRecurrence($tz, $recur);
-			}
-		}
-		else {
-			$props[$appointmentprops["isrecurring"]] = false;
-		}
-
-		// always set the PR_SENT_REPRESENTING_* props so that the attendee status update also works with the webaccess
-		$p = [$appointmentprops["representingentryid"], $appointmentprops["representingname"], $appointmentprops["sentrepresentingaddt"],
-			$appointmentprops["sentrepresentingemail"], $appointmentprops["sentrepresentinsrchk"], $appointmentprops["responsestatus"], ];
-		$representingprops = $this->getProps($mapimessage, $p);
-
-		if (!isset($representingprops[$appointmentprops["representingentryid"]])) {
-			// TODO use GetStoreProps
-			$storeProps = mapi_getprops($this->store, [PR_MAILBOX_OWNER_ENTRYID]);
-			$props[$appointmentprops["representingentryid"]] = $storeProps[PR_MAILBOX_OWNER_ENTRYID];
-			$displayname = $this->getFullnameFromEntryID($storeProps[PR_MAILBOX_OWNER_ENTRYID]);
-
-			$props[$appointmentprops["representingname"]] = ($displayname !== false) ? $displayname : Request::GetUser();
-			$props[$appointmentprops["sentrepresentingemail"]] = Request::GetUser();
-			$props[$appointmentprops["sentrepresentingaddt"]] = "ZARAFA";
-			$props[$appointmentprops["sentrepresentinsrchk"]] = $props[$appointmentprops["sentrepresentingaddt"]] . ":" . $props[$appointmentprops["sentrepresentingemail"]];
-
-			if (isset($appointment->attendees) && is_array($appointment->attendees) && !empty($appointment->attendees)) {
-				$props[$appointmentprops["icon"]] = 1026;
-				// the user is the organizer
-				// set these properties to show tracking tab in webapp
-
-				$props[$appointmentprops["mrwassent"]] = true;
-				$props[$appointmentprops["responsestatus"]] = olResponseOrganized;
-				$props[$appointmentprops["meetingstatus"]] = olMeeting;
-			}
-		}
-		// we also have to set the responsestatus and not only meetingstatus, so we use another mapi tag
-		if (!isset($props[$appointmentprops["responsestatus"]])) {
-			if (isset($appointment->responsetype)) {
-				$props[$appointmentprops["responsestatus"]] = $appointment->responsetype;
-			}
-			// only set responsestatus to none if it is not set on the server
-			elseif (!isset($representingprops[$appointmentprops["responsestatus"]])) {
-				$props[$appointmentprops["responsestatus"]] = olResponseNone;
-			}
-		}
-
-		// Do attendees
-		if (isset($appointment->attendees) && is_array($appointment->attendees)) {
-			$recips = [];
-
-			// Outlook XP requires organizer in the attendee list as well
-			$org = [];
-			$org[PR_ENTRYID] = isset($representingprops[$appointmentprops["representingentryid"]]) ? $representingprops[$appointmentprops["representingentryid"]] : $props[$appointmentprops["representingentryid"]];
-			$org[PR_DISPLAY_NAME] = isset($representingprops[$appointmentprops["representingname"]]) ? $representingprops[$appointmentprops["representingname"]] : $props[$appointmentprops["representingname"]];
-			$org[PR_ADDRTYPE] = isset($representingprops[$appointmentprops["sentrepresentingaddt"]]) ? $representingprops[$appointmentprops["sentrepresentingaddt"]] : $props[$appointmentprops["sentrepresentingaddt"]];
-			$org[PR_SMTP_ADDRESS] = $org[PR_EMAIL_ADDRESS] = isset($representingprops[$appointmentprops["sentrepresentingemail"]]) ? $representingprops[$appointmentprops["sentrepresentingemail"]] : $props[$appointmentprops["sentrepresentingemail"]];
-			$org[PR_SEARCH_KEY] = isset($representingprops[$appointmentprops["sentrepresentinsrchk"]]) ? $representingprops[$appointmentprops["sentrepresentinsrchk"]] : $props[$appointmentprops["sentrepresentinsrchk"]];
-			$org[PR_RECIPIENT_FLAGS] = recipOrganizer | recipSendable;
-			$org[PR_RECIPIENT_TYPE] = MAPI_ORIG;
-
-			array_push($recips, $org);
-
-			// Open address book for user resolve
-			$addrbook = $this->getAddressbook();
-			foreach ($appointment->attendees as $attendee) {
-				$recip = [];
-				$recip[PR_EMAIL_ADDRESS] = u2w($attendee->email);
-				$recip[PR_SMTP_ADDRESS] = u2w($attendee->email);
-
-				// lookup information in GAB if possible so we have up-to-date name for given address
-				$userinfo = [[PR_DISPLAY_NAME => $recip[PR_EMAIL_ADDRESS]]];
-				$userinfo = mapi_ab_resolvename($addrbook, $userinfo, EMS_AB_ADDRESS_LOOKUP);
-				if (mapi_last_hresult() == NOERROR) {
-					$recip[PR_DISPLAY_NAME] = $userinfo[0][PR_DISPLAY_NAME];
-					$recip[PR_EMAIL_ADDRESS] = $userinfo[0][PR_EMAIL_ADDRESS];
-					$recip[PR_SEARCH_KEY] = $userinfo[0][PR_SEARCH_KEY];
-					$recip[PR_ADDRTYPE] = $userinfo[0][PR_ADDRTYPE];
-					$recip[PR_ENTRYID] = $userinfo[0][PR_ENTRYID];
-					$recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
-					$recip[PR_RECIPIENT_FLAGS] = recipSendable;
-					$recip[PR_RECIPIENT_TRACKSTATUS] = isset($attendee->attendeestatus) ? $attendee->attendeestatus : olResponseNone;
-				}
-				else {
-					$recip[PR_DISPLAY_NAME] = u2w($attendee->name);
-					$recip[PR_SEARCH_KEY] = "SMTP:" . $recip[PR_EMAIL_ADDRESS] . "\0";
-					$recip[PR_ADDRTYPE] = "SMTP";
-					$recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
-					$recip[PR_ENTRYID] = mapi_createoneoff($recip[PR_DISPLAY_NAME], $recip[PR_ADDRTYPE], $recip[PR_EMAIL_ADDRESS]);
-				}
-
-				array_push($recips, $recip);
-			}
-
-			mapi_message_modifyrecipients($mapimessage, 0, $recips);
-		}
-		mapi_setprops($mapimessage, $props);
-
-		return true;
-	}
-
-	/**
-	 * Writes a SyncContact to MAPI.
-	 *
-	 * @param mixed       $mapimessage
-	 * @param SyncContact $contact
-	 *
-	 * @return bool
-	 */
-	private function setContact($mapimessage, $contact) {
-		mapi_setprops($mapimessage, [PR_MESSAGE_CLASS => "IPM.Contact"]);
-
-		// normalize email addresses
-		if (isset($contact->email1address) && (($contact->email1address = $this->extractEmailAddress($contact->email1address)) === false)) {
-			unset($contact->email1address);
-		}
-
-		if (isset($contact->email2address) && (($contact->email2address = $this->extractEmailAddress($contact->email2address)) === false)) {
-			unset($contact->email2address);
-		}
-
-		if (isset($contact->email3address) && (($contact->email3address = $this->extractEmailAddress($contact->email3address)) === false)) {
-			unset($contact->email3address);
-		}
-
-		$contactmapping = MAPIMapping::GetContactMapping();
-		$contactprops = MAPIMapping::GetContactProperties();
-		$this->setPropsInMAPI($mapimessage, $contact, $contactmapping);
-
-		// /set display name from contact's properties
-		$cname = $this->composeDisplayName($contact);
-
-		// get contact specific mapi properties and merge them with the AS properties
-		$contactprops = array_merge($this->getPropIdsFromStrings($contactmapping), $this->getPropIdsFromStrings($contactprops));
-
-		// contact specific properties to be set
-		$props = [];
-
-		// need to be set in order to show contacts properly in outlook and wa
-		$nremails = [];
-		$abprovidertype = 0;
-
-		if (isset($contact->email1address)) {
-			$this->setEmailAddress($contact->email1address, $cname, 1, $props, $contactprops, $nremails, $abprovidertype);
-		}
-		if (isset($contact->email2address)) {
-			$this->setEmailAddress($contact->email2address, $cname, 2, $props, $contactprops, $nremails, $abprovidertype);
-		}
-		if (isset($contact->email3address)) {
-			$this->setEmailAddress($contact->email3address, $cname, 3, $props, $contactprops, $nremails, $abprovidertype);
-		}
-
-		$props[$contactprops["addressbooklong"]] = $abprovidertype;
-		$props[$contactprops["displayname"]] = $props[$contactprops["subject"]] = $cname;
-
-		// pda multiple e-mail addresses bug fix for the contact
-		if (!empty($nremails)) {
-			$props[$contactprops["addressbookmv"]] = $nremails;
-		}
-
-		// set addresses
-		$this->setAddress("home", $contact->homecity, $contact->homecountry, $contact->homepostalcode, $contact->homestate, $contact->homestreet, $props, $contactprops);
-		$this->setAddress("business", $contact->businesscity, $contact->businesscountry, $contact->businesspostalcode, $contact->businessstate, $contact->businessstreet, $props, $contactprops);
-		$this->setAddress("other", $contact->othercity, $contact->othercountry, $contact->otherpostalcode, $contact->otherstate, $contact->otherstreet, $props, $contactprops);
-
-		// set the mailing address and its type
-		if (isset($props[$contactprops["businessaddress"]])) {
-			$props[$contactprops["mailingaddress"]] = 2;
-			$this->setMailingAddress($contact->businesscity, $contact->businesscountry, $contact->businesspostalcode, $contact->businessstate, $contact->businessstreet, $props[$contactprops["businessaddress"]], $props, $contactprops);
-		}
-		elseif (isset($props[$contactprops["homeaddress"]])) {
-			$props[$contactprops["mailingaddress"]] = 1;
-			$this->setMailingAddress($contact->homecity, $contact->homecountry, $contact->homepostalcode, $contact->homestate, $contact->homestreet, $props[$contactprops["homeaddress"]], $props, $contactprops);
-		}
-		elseif (isset($props[$contactprops["otheraddress"]])) {
-			$props[$contactprops["mailingaddress"]] = 3;
-			$this->setMailingAddress($contact->othercity, $contact->othercountry, $contact->otherpostalcode, $contact->otherstate, $contact->otherstreet, $props[$contactprops["otheraddress"]], $props, $contactprops);
-		}
-
-		if (isset($contact->picture)) {
-			$picbinary = base64_decode($contact->picture);
-			$picsize = strlen($picbinary);
-			$props[$contactprops["haspic"]] = false;
-
-			// TODO contact picture handling
-			// check if contact has already got a picture. delete it first in that case
-			// delete it also if it was removed on a mobile
-			$picprops = mapi_getprops($mapimessage, [$contactprops["haspic"]]);
-			if (isset($picprops[$contactprops["haspic"]]) && $picprops[$contactprops["haspic"]]) {
-				SLog::Write(LOGLEVEL_DEBUG, "Contact already has a picture. Delete it");
-
-				$attachtable = mapi_message_getattachmenttable($mapimessage);
-				mapi_table_restrict($attachtable, MAPIUtils::GetContactPicRestriction());
-				$rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM]);
-				if (isset($rows) && is_array($rows)) {
-					foreach ($rows as $row) {
-						mapi_message_deleteattach($mapimessage, $row[PR_ATTACH_NUM]);
-					}
-				}
-			}
-
-			// only set picture if there's data in the request
-			if ($picbinary !== false && $picsize > 0) {
-				$props[$contactprops["haspic"]] = true;
-				$pic = mapi_message_createattach($mapimessage);
-				// Set properties of the attachment
-				$picprops = [
-					PR_ATTACH_LONG_FILENAME => "ContactPicture.jpg",
-					PR_DISPLAY_NAME => "ContactPicture.jpg",
-					0x7FFF000B => true,
-					PR_ATTACHMENT_HIDDEN => false,
-					PR_ATTACHMENT_FLAGS => 1,
-					PR_ATTACH_METHOD => ATTACH_BY_VALUE,
-					PR_ATTACH_EXTENSION => ".jpg",
-					PR_ATTACH_NUM => 1,
-					PR_ATTACH_SIZE => $picsize,
-					PR_ATTACH_DATA_BIN => $picbinary,
-				];
-
-				mapi_setprops($pic, $picprops);
-				mapi_savechanges($pic);
-			}
-		}
-
-		if (isset($contact->asbody)) {
-			$this->setASbody($contact->asbody, $props, $contactprops);
-		}
-
-		// set fileas
-		if (defined('FILEAS_ORDER')) {
-			$lastname = (isset($contact->lastname)) ? $contact->lastname : "";
-			$firstname = (isset($contact->firstname)) ? $contact->firstname : "";
-			$middlename = (isset($contact->middlename)) ? $contact->middlename : "";
-			$company = (isset($contact->companyname)) ? $contact->companyname : "";
-			$props[$contactprops["fileas"]] = Utils::BuildFileAs($lastname, $firstname, $middlename, $company);
-		}
-		else {
-			SLog::Write(LOGLEVEL_DEBUG, "FILEAS_ORDER not defined");
-		}
-
-		mapi_setprops($mapimessage, $props);
-
-		return true;
-	}
-
-	/**
-	 * Writes a SyncTask to MAPI.
-	 *
-	 * @param mixed    $mapimessage
-	 * @param SyncTask $task
-	 *
-	 * @return bool
-	 */
-	private function setTask($mapimessage, $task) {
-		mapi_setprops($mapimessage, [PR_MESSAGE_CLASS => "IPM.Task"]);
-
-		$taskmapping = MAPIMapping::GetTaskMapping();
-		$taskprops = MAPIMapping::GetTaskProperties();
-		$this->setPropsInMAPI($mapimessage, $task, $taskmapping);
-		$taskprops = array_merge($this->getPropIdsFromStrings($taskmapping), $this->getPropIdsFromStrings($taskprops));
-
-		// task specific properties to be set
-		$props = [];
-
-		if (isset($task->asbody)) {
-			$this->setASbody($task->asbody, $props, $taskprops);
-		}
-
-		if (isset($task->complete)) {
-			if ($task->complete) {
-				// Set completion to 100%
-				// Set status to 'complete'
-				$props[$taskprops["completion"]] = 1.0;
-				$props[$taskprops["status"]] = 2;
-				$props[$taskprops["reminderset"]] = false;
-			}
-			else {
-				// Set completion to 0%
-				// Set status to 'not started'
-				$props[$taskprops["completion"]] = 0.0;
-				$props[$taskprops["status"]] = 0;
-			}
-		}
-		if (isset($task->recurrence) && class_exists('TaskRecurrence')) {
-			$deadoccur = false;
-			if ((isset($task->recurrence->occurrences) && $task->recurrence->occurrences == 1) ||
-				(isset($task->recurrence->deadoccur) && $task->recurrence->deadoccur == 1)) { // ios5 sends deadoccur inside the recurrence
-				$deadoccur = true;
-			}
-
-			// Set PR_ICON_INDEX to 1281 to show correct icon in category view
-			$props[$taskprops["icon"]] = 1281;
-			// dead occur - false if new occurrences should be generated from the task
-			// true - if it is the last occurrence of the task
-			$props[$taskprops["deadoccur"]] = $deadoccur;
-			$props[$taskprops["isrecurringtag"]] = true;
-
-			$recurrence = new TaskRecurrence($this->store, $mapimessage);
-			$recur = [];
-			$this->setRecurrence($task, $recur);
-
-			// task specific recurrence properties which we need to set here
-			// "start" and "end" are in GMT when passing to class.recurrence
-			// set recurrence start here because it's calculated differently for tasks and appointments
-			$recur["start"] = $task->recurrence->start;
-			$recur["regen"] = (isset($task->recurrence->regenerate) && $task->recurrence->regenerate) ? 1 : 0;
-			// OL regenerates recurring task itself, but setting deleteOccurrence is required so that PHP-MAPI doesn't regenerate
-			// completed occurrence of a task.
-			if ($recur["regen"] == 0) {
-				$recur["deleteOccurrence"] = 0;
-			}
-			// Also add dates to $recur
-			$recur["duedate"] = $task->duedate;
-			$recur["complete"] = (isset($task->complete) && $task->complete) ? 1 : 0;
-			if (isset($task->datecompleted)) {
-				$recur["datecompleted"] = $task->datecompleted;
-			}
-			$recurrence->setRecurrence($recur);
-		}
-
-		$props[$taskprops["private"]] = (isset($task->sensitivity) && $task->sensitivity >= SENSITIVITY_PRIVATE) ? true : false;
-
-		// Open address book for user resolve to set the owner
-		$addrbook = $this->getAddressbook();
-
-		// check if there is already an owner for the task, set current user if not
-		$p = [$taskprops["owner"]];
-		$owner = $this->getProps($mapimessage, $p);
-		if (!isset($owner[$taskprops["owner"]])) {
-			$userinfo = nsp_getuserinfo(Request::GetUser());
-			if (mapi_last_hresult() == NOERROR && isset($userinfo["fullname"])) {
-				$props[$taskprops["owner"]] = $userinfo["fullname"];
-			}
-		}
-		mapi_setprops($mapimessage, $props);
-
-		return true;
-	}
-
-	/**
-	 * Writes a SyncNote to MAPI.
-	 *
-	 * @param mixed    $mapimessage
-	 * @param SyncNote $note
-	 *
-	 * @return bool
-	 */
-	private function setNote($mapimessage, $note) {
-		// Touchdown does not send categories if all are unset or there is none.
-		// Setting it to an empty array will unset the property in KC as well
-		if (!isset($note->categories)) {
-			$note->categories = [];
-		}
-
-		// update icon index to correspond to the color
-		if (isset($note->Color) && $note->Color > -1 && $note->Color < 5) {
-			$note->Iconindex = 768 + $note->Color;
-		}
-
-		$this->setPropsInMAPI($mapimessage, $note, MAPIMapping::GetNoteMapping());
-
-		$noteprops = MAPIMapping::GetNoteProperties();
-		$noteprops = $this->getPropIdsFromStrings($noteprops);
-
-		// note specific properties to be set
-		$props = [];
-		$props[$noteprops["messageclass"]] = "IPM.StickyNote";
-		// set body otherwise the note will be "broken" when editing it in outlook
-		if (isset($note->asbody)) {
-			$this->setASbody($note->asbody, $props, $noteprops);
-		}
-
-		$props[$noteprops["internetcpid"]] = INTERNET_CPID_UTF8;
-		mapi_setprops($mapimessage, $props);
-
-		return true;
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+    /**
+     * Writes a SyncObject to MAPI
+     * Depending on the message class, a contact, appointment, task or email is written.
+     *
+     * @param mixed      $mapimessage
+     * @param SyncObject $message
+     *
+     * @return bool
+     */
+    public function SetMessage($mapimessage, $message) {
+        // TODO check with instanceof
+        switch (strtolower(get_class($message))) {
+            case "synccontact":
+                return $this->setContact($mapimessage, $message);
+
+            case "syncappointment":
+                return $this->setAppointment($mapimessage, $message);
+
+            case "synctask":
+                return $this->setTask($mapimessage, $message);
+
+            case "syncnote":
+                return $this->setNote($mapimessage, $message);
+
+            default:
+                // for emails only flag (read and todo) changes are possible
+                return $this->setEmail($mapimessage, $message);
+        }
+    }
+
+    /**
+     * Writes SyncMail to MAPI (actually flags only).
+     *
+     * @param mixed    $mapimessage
+     * @param SyncMail $message
+     */
+    private function setEmail($mapimessage, $message) {
+        // update categories
+        if (!isset($message->categories)) {
+            $message->categories = [];
+        }
+        $emailmap = MAPIMapping::GetEmailMapping();
+        $this->setPropsInMAPI($mapimessage, $message, ["categories" => $emailmap["categories"]]);
+
+        $flagmapping = MAPIMapping::GetMailFlagsMapping();
+        $flagprops = MAPIMapping::GetMailFlagsProperties();
+        $flagprops = array_merge($this->getPropIdsFromStrings($flagmapping), $this->getPropIdsFromStrings($flagprops));
+        // flag specific properties to be set
+        $props = $delprops = [];
+        // unset message flags if:
+        // flag is not set
+        if (empty($message->flag) ||
+            // flag status is not set
+            !isset($message->flag->flagstatus) ||
+            // flag status is 0 or empty
+            (isset($message->flag->flagstatus) && ($message->flag->flagstatus == 0 || $message->flag->flagstatus == ""))) {
+            // if message flag is empty, some properties need to be deleted
+            // and some set to 0 or false
+
+            $props[$flagprops["todoitemsflags"]] = 0;
+            $props[$flagprops["status"]] = 0;
+            $props[$flagprops["completion"]] = 0.0;
+            $props[$flagprops["flagtype"]] = "";
+            $props[$flagprops["ordinaldate"]] = 0x7FFFFFFF; // ordinal date is 12am 1.1.4501, set it to max possible value
+            $props[$flagprops["subordinaldate"]] = "";
+            $props[$flagprops["replyrequested"]] = false;
+            $props[$flagprops["responserequested"]] = false;
+            $props[$flagprops["reminderset"]] = false;
+            $props[$flagprops["complete"]] = false;
+
+            $delprops[] = $flagprops["todotitle"];
+            $delprops[] = $flagprops["duedate"];
+            $delprops[] = $flagprops["startdate"];
+            $delprops[] = $flagprops["datecompleted"];
+            $delprops[] = $flagprops["utcstartdate"];
+            $delprops[] = $flagprops["utcduedate"];
+            $delprops[] = $flagprops["completetime"];
+            $delprops[] = $flagprops["flagstatus"];
+            $delprops[] = $flagprops["flagicon"];
+        }
+        else {
+            $this->setPropsInMAPI($mapimessage, $message->flag, $flagmapping);
+            $props[$flagprops["todoitemsflags"]] = 1;
+            if (isset($message->subject) && strlen($message->subject) > 0) {
+                $props[$flagprops["todotitle"]] = $message->subject;
+            }
+            // ordinal date is utc current time
+            if (!isset($message->flag->ordinaldate) || empty($message->flag->ordinaldate)) {
+                $props[$flagprops["ordinaldate"]] = time();
+            }
+            // the default value
+            if (!isset($message->flag->subordinaldate) || empty($message->flag->subordinaldate)) {
+                $props[$flagprops["subordinaldate"]] = "5555555";
+            }
+            $props[$flagprops["flagicon"]] = 6; // red flag icon
+            $props[$flagprops["replyrequested"]] = true;
+            $props[$flagprops["responserequested"]] = true;
+
+            if ($message->flag->flagstatus == SYNC_FLAGSTATUS_COMPLETE) {
+                $props[$flagprops["status"]] = olTaskComplete;
+                $props[$flagprops["completion"]] = 1.0;
+                $props[$flagprops["complete"]] = true;
+                $props[$flagprops["replyrequested"]] = false;
+                $props[$flagprops["responserequested"]] = false;
+                unset($props[$flagprops["flagicon"]]);
+                $delprops[] = $flagprops["flagicon"];
+            }
+        }
+
+        if (!empty($props)) {
+            mapi_setprops($mapimessage, $props);
+        }
+        if (!empty($delprops)) {
+            mapi_deleteprops($mapimessage, $delprops);
+        }
+    }
+
+    /**
+     * Writes a SyncAppointment to MAPI.
+     *
+     * @param mixed           $mapimessage
+     * @param SyncAppointment $message
+     * @param mixed           $appointment
+     *
+     * @return bool
+     */
+    private function setAppointment($mapimessage, $appointment) {
+        // Get timezone info
+        if (isset($appointment->timezone)) {
+            $tz = $this->getTZFromSyncBlob(base64_decode($appointment->timezone));
+        }
+        else {
+            $tz = false;
+        }
+
+        // start and end time may not be set - try to get them from the existing appointment for further calculation - see https://jira.z-hub.io/browse/ZP-983
+        if (!isset($appointment->starttime) || !isset($appointment->endtime)) {
+            $amapping = MAPIMapping::GetAppointmentMapping();
+            $amapping = $this->getPropIdsFromStrings($amapping);
+            $existingstartendpropsmap = [$amapping["starttime"], $amapping["endtime"]];
+            $existingstartendprops = $this->getProps($mapimessage, $existingstartendpropsmap);
+
+            if (isset($existingstartendprops[$amapping["starttime"]]) && !isset($appointment->starttime)) {
+                $appointment->starttime = $existingstartendprops[$amapping["starttime"]];
+                SLog::Write(LOGLEVEL_WBXML, sprintf("MAPIProvider->setAppointment(): Parameter 'starttime' was not set, using value from MAPI %d (%s).", $appointment->starttime, gmstrftime("%Y%m%dT%H%M%SZ", $appointment->starttime)));
+            }
+            if (isset($existingstartendprops[$amapping["endtime"]]) && !isset($appointment->endtime)) {
+                $appointment->endtime = $existingstartendprops[$amapping["endtime"]];
+                SLog::Write(LOGLEVEL_WBXML, sprintf("MAPIProvider->setAppointment(): Parameter 'endtime' was not set, using value from MAPI %d (%s).", $appointment->endtime, gmstrftime("%Y%m%dT%H%M%SZ", $appointment->endtime)));
+            }
+        }
+        if (!isset($appointment->starttime) || !isset($appointment->endtime)) {
+            throw new StatusException("MAPIProvider->setAppointment(): Error, start and/or end time not set and can not be retrieved from MAPI.", SYNC_STATUS_SYNCCANNOTBECOMPLETED);
+        }
+
+        // calculate duration because without it some webaccess views are broken. duration is in min
+        $localstart = $this->getLocaltimeByTZ($appointment->starttime, $tz);
+        $localend = $this->getLocaltimeByTZ($appointment->endtime, $tz);
+        $duration = ($localend - $localstart) / 60;
+
+        // nokia sends an yearly event with 0 mins duration but as all day event,
+        // so make it end next day
+        if ($appointment->starttime == $appointment->endtime && isset($appointment->alldayevent) && $appointment->alldayevent) {
+            $duration = 1440;
+            $appointment->endtime = $appointment->starttime + 24 * 60 * 60;
+            $localend = $localstart + 24 * 60 * 60;
+        }
+
+        // is the transmitted UID OL compatible?
+        // if not, encapsulate the transmitted uid
+        $appointment->uid = Utils::GetOLUidFromICalUid($appointment->uid);
+
+        mapi_setprops($mapimessage, [PR_MESSAGE_CLASS => "IPM.Appointment"]);
+
+        $appointmentmapping = MAPIMapping::GetAppointmentMapping();
+        $this->setPropsInMAPI($mapimessage, $appointment, $appointmentmapping);
+        $appointmentprops = MAPIMapping::GetAppointmentProperties();
+        $appointmentprops = array_merge($this->getPropIdsFromStrings($appointmentmapping), $this->getPropIdsFromStrings($appointmentprops));
+        // appointment specific properties to be set
+        $props = [];
+
+        // sensitivity is not enough to mark an appointment as private, so we use another mapi tag
+        $private = (isset($appointment->sensitivity) && $appointment->sensitivity >= SENSITIVITY_PRIVATE) ? true : false;
+
+        // Set commonstart/commonend to start/end and remindertime to start, duration, private and cleanGlobalObjectId
+        $props[$appointmentprops["commonstart"]] = $appointment->starttime;
+        $props[$appointmentprops["commonend"]] = $appointment->endtime;
+        $props[$appointmentprops["reminderstart"]] = $appointment->starttime;
+        // Set reminder boolean to 'true' if reminder is set
+        $props[$appointmentprops["reminderset"]] = isset($appointment->reminder) ? true : false;
+        $props[$appointmentprops["duration"]] = $duration;
+        $props[$appointmentprops["private"]] = $private;
+        $props[$appointmentprops["uid"]] = $appointment->uid;
+        // Set named prop 8510, unknown property, but enables deleting a single occurrence of a recurring
+        // type in OLK2003.
+        $props[$appointmentprops["sideeffects"]] = 369;
+
+        if (isset($appointment->reminder) && $appointment->reminder >= 0) {
+            // Set 'flagdueby' to correct value (start - reminderminutes)
+            $props[$appointmentprops["flagdueby"]] = $appointment->starttime - $appointment->reminder * 60;
+            $props[$appointmentprops["remindertime"]] = $appointment->reminder;
+        }
+        // unset the reminder
+        else {
+            $props[$appointmentprops["reminderset"]] = false;
+        }
+
+        if (isset($appointment->asbody)) {
+            $this->setASbody($appointment->asbody, $props, $appointmentprops);
+        }
+
+        if ($tz !== false) {
+            $props[$appointmentprops["timezonetag"]] = $this->getMAPIBlobFromTZ($tz);
+        }
+
+        if (isset($appointment->recurrence)) {
+            // Set PR_ICON_INDEX to 1025 to show correct icon in category view
+            $props[$appointmentprops["icon"]] = 1025;
+
+            // if there aren't any exceptions, use the 'old style' set recurrence
+            $noexceptions = true;
+
+            $recurrence = new Recurrence($this->store, $mapimessage);
+            $recur = [];
+            $this->setRecurrence($appointment, $recur);
+
+            // set the recurrence type to that of the MAPI
+            $props[$appointmentprops["recurrencetype"]] = $recur["recurrencetype"];
+
+            $starttime = $this->gmtime($localstart);
+            $endtime = $this->gmtime($localend);
+
+            // set recurrence start here because it's calculated differently for tasks and appointments
+            $recur["start"] = $this->getDayStartOfTimestamp($this->getGMTTimeByTZ($localstart, $tz));
+
+            $recur["startocc"] = $starttime["tm_hour"] * 60 + $starttime["tm_min"];
+            $recur["endocc"] = $recur["startocc"] + $duration; // Note that this may be > 24*60 if multi-day
+
+            // only tasks can regenerate
+            $recur["regen"] = false;
+
+            // Process exceptions. The PDA will send all exceptions for this recurring item.
+            if (isset($appointment->exceptions)) {
+                foreach ($appointment->exceptions as $exception) {
+                    // we always need the base date
+                    if (!isset($exception->exceptionstarttime)) {
+                        continue;
+                    }
+
+                    $basedate = $this->getDayStartOfTimestamp($exception->exceptionstarttime);
+                    if (isset($exception->deleted) && $exception->deleted) {
+                        $noexceptions = false;
+                        // Delete exception
+                        $recurrence->createException([], $basedate, true);
+                    }
+                    else {
+                        // Change exception
+                        $mapiexception = ["basedate" => $basedate];
+                        // other exception properties which are not handled in recurrence
+                        $exceptionprops = [];
+
+                        if (isset($exception->starttime)) {
+                            $mapiexception["start"] = $this->getLocaltimeByTZ($exception->starttime, $tz);
+                            $exceptionprops[$appointmentprops["starttime"]] = $exception->starttime;
+                        }
+                        if (isset($exception->endtime)) {
+                            $mapiexception["end"] = $this->getLocaltimeByTZ($exception->endtime, $tz);
+                            $exceptionprops[$appointmentprops["endtime"]] = $exception->endtime;
+                        }
+                        if (isset($exception->subject)) {
+                            $exceptionprops[$appointmentprops["subject"]] = $mapiexception["subject"] = u2w($exception->subject);
+                        }
+                        if (isset($exception->location)) {
+                            $exceptionprops[$appointmentprops["location"]] = $mapiexception["location"] = u2w($exception->location);
+                        }
+                        if (isset($exception->busystatus)) {
+                            $exceptionprops[$appointmentprops["busystatus"]] = $mapiexception["busystatus"] = $exception->busystatus;
+                        }
+                        if (isset($exception->reminder)) {
+                            $exceptionprops[$appointmentprops["reminderset"]] = $mapiexception["reminder_set"] = 1;
+                            $exceptionprops[$appointmentprops["remindertime"]] = $mapiexception["remind_before"] = $exception->reminder;
+                        }
+                        if (isset($exception->alldayevent)) {
+                            $exceptionprops[$appointmentprops["alldayevent"]] = $mapiexception["alldayevent"] = $exception->alldayevent;
+                        }
+
+                        if (!isset($recur["changed_occurrences"])) {
+                            $recur["changed_occurrences"] = [];
+                        }
+
+                        if (isset($exception->body)) {
+                            $exceptionprops[$appointmentprops["body"]] = u2w($exception->body);
+                        }
+
+                        if (isset($exception->asbody)) {
+                            $this->setASbody($exception->asbody, $exceptionprops, $appointmentprops);
+                            $mapiexception["body"] = $exceptionprops[$appointmentprops["body"]] =
+                                (isset($exceptionprops[$appointmentprops["body"]])) ? $exceptionprops[$appointmentprops["body"]] :
+                                ((isset($exceptionprops[$appointmentprops["html"]])) ? $exceptionprops[$appointmentprops["html"]] : "");
+                        }
+
+                        array_push($recur["changed_occurrences"], $mapiexception);
+
+                        if (!empty($exceptionprops)) {
+                            $noexceptions = false;
+                            if ($recurrence->isException($basedate)) {
+                                $recurrence->modifyException($exceptionprops, $basedate);
+                            }
+                            else {
+                                $recurrence->createException($exceptionprops, $basedate);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // setRecurrence deletes the attachments from an appointment
+            if ($noexceptions) {
+                $recurrence->setRecurrence($tz, $recur);
+            }
+        }
+        else {
+            $props[$appointmentprops["isrecurring"]] = false;
+        }
+
+        // always set the PR_SENT_REPRESENTING_* props so that the attendee status update also works with the webaccess
+        $p = [$appointmentprops["representingentryid"], $appointmentprops["representingname"], $appointmentprops["sentrepresentingaddt"],
+            $appointmentprops["sentrepresentingemail"], $appointmentprops["sentrepresentinsrchk"], $appointmentprops["responsestatus"], ];
+        $representingprops = $this->getProps($mapimessage, $p);
+
+        if (!isset($representingprops[$appointmentprops["representingentryid"]])) {
+            // TODO use GetStoreProps
+            $storeProps = mapi_getprops($this->store, [PR_MAILBOX_OWNER_ENTRYID]);
+            $props[$appointmentprops["representingentryid"]] = $storeProps[PR_MAILBOX_OWNER_ENTRYID];
+            $displayname = $this->getFullnameFromEntryID($storeProps[PR_MAILBOX_OWNER_ENTRYID]);
+
+            $props[$appointmentprops["representingname"]] = ($displayname !== false) ? $displayname : Request::GetUser();
+            $props[$appointmentprops["sentrepresentingemail"]] = Request::GetUser();
+            $props[$appointmentprops["sentrepresentingaddt"]] = "ZARAFA";
+            $props[$appointmentprops["sentrepresentinsrchk"]] = $props[$appointmentprops["sentrepresentingaddt"]] . ":" . $props[$appointmentprops["sentrepresentingemail"]];
+
+            if (isset($appointment->attendees) && is_array($appointment->attendees) && !empty($appointment->attendees)) {
+                $props[$appointmentprops["icon"]] = 1026;
+                // the user is the organizer
+                // set these properties to show tracking tab in webapp
+
+                $props[$appointmentprops["mrwassent"]] = true;
+                $props[$appointmentprops["responsestatus"]] = olResponseOrganized;
+                $props[$appointmentprops["meetingstatus"]] = olMeeting;
+            }
+        }
+        // we also have to set the responsestatus and not only meetingstatus, so we use another mapi tag
+        if (!isset($props[$appointmentprops["responsestatus"]])) {
+            if (isset($appointment->responsetype)) {
+                $props[$appointmentprops["responsestatus"]] = $appointment->responsetype;
+            }
+            // only set responsestatus to none if it is not set on the server
+            elseif (!isset($representingprops[$appointmentprops["responsestatus"]])) {
+                $props[$appointmentprops["responsestatus"]] = olResponseNone;
+            }
+        }
+
+        // Do attendees
+        if (isset($appointment->attendees) && is_array($appointment->attendees)) {
+            $recips = [];
+
+            // Outlook XP requires organizer in the attendee list as well
+            $org = [];
+            $org[PR_ENTRYID] = isset($representingprops[$appointmentprops["representingentryid"]]) ? $representingprops[$appointmentprops["representingentryid"]] : $props[$appointmentprops["representingentryid"]];
+            $org[PR_DISPLAY_NAME] = isset($representingprops[$appointmentprops["representingname"]]) ? $representingprops[$appointmentprops["representingname"]] : $props[$appointmentprops["representingname"]];
+            $org[PR_ADDRTYPE] = isset($representingprops[$appointmentprops["sentrepresentingaddt"]]) ? $representingprops[$appointmentprops["sentrepresentingaddt"]] : $props[$appointmentprops["sentrepresentingaddt"]];
+            $org[PR_SMTP_ADDRESS] = $org[PR_EMAIL_ADDRESS] = isset($representingprops[$appointmentprops["sentrepresentingemail"]]) ? $representingprops[$appointmentprops["sentrepresentingemail"]] : $props[$appointmentprops["sentrepresentingemail"]];
+            $org[PR_SEARCH_KEY] = isset($representingprops[$appointmentprops["sentrepresentinsrchk"]]) ? $representingprops[$appointmentprops["sentrepresentinsrchk"]] : $props[$appointmentprops["sentrepresentinsrchk"]];
+            $org[PR_RECIPIENT_FLAGS] = recipOrganizer | recipSendable;
+            $org[PR_RECIPIENT_TYPE] = MAPI_ORIG;
+
+            array_push($recips, $org);
+
+            // Open address book for user resolve
+            $addrbook = $this->getAddressbook();
+            foreach ($appointment->attendees as $attendee) {
+                $recip = [];
+                $recip[PR_EMAIL_ADDRESS] = u2w($attendee->email);
+                $recip[PR_SMTP_ADDRESS] = u2w($attendee->email);
+
+                // lookup information in GAB if possible so we have up-to-date name for given address
+                $userinfo = [[PR_DISPLAY_NAME => $recip[PR_EMAIL_ADDRESS]]];
+                $userinfo = mapi_ab_resolvename($addrbook, $userinfo, EMS_AB_ADDRESS_LOOKUP);
+                if (mapi_last_hresult() == NOERROR) {
+                    $recip[PR_DISPLAY_NAME] = $userinfo[0][PR_DISPLAY_NAME];
+                    $recip[PR_EMAIL_ADDRESS] = $userinfo[0][PR_EMAIL_ADDRESS];
+                    $recip[PR_SEARCH_KEY] = $userinfo[0][PR_SEARCH_KEY];
+                    $recip[PR_ADDRTYPE] = $userinfo[0][PR_ADDRTYPE];
+                    $recip[PR_ENTRYID] = $userinfo[0][PR_ENTRYID];
+                    $recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
+                    $recip[PR_RECIPIENT_FLAGS] = recipSendable;
+                    $recip[PR_RECIPIENT_TRACKSTATUS] = isset($attendee->attendeestatus) ? $attendee->attendeestatus : olResponseNone;
+                }
+                else {
+                    $recip[PR_DISPLAY_NAME] = u2w($attendee->name);
+                    $recip[PR_SEARCH_KEY] = "SMTP:" . $recip[PR_EMAIL_ADDRESS] . "\0";
+                    $recip[PR_ADDRTYPE] = "SMTP";
+                    $recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
+                    $recip[PR_ENTRYID] = mapi_createoneoff($recip[PR_DISPLAY_NAME], $recip[PR_ADDRTYPE], $recip[PR_EMAIL_ADDRESS]);
+                }
+
+                array_push($recips, $recip);
+            }
+
+            mapi_message_modifyrecipients($mapimessage, 0, $recips);
+        }
+        mapi_setprops($mapimessage, $props);
+
+        return true;
+    }
+
+    /**
+     * Writes a SyncContact to MAPI.
+     *
+     * @param mixed       $mapimessage
+     * @param SyncContact $contact
+     *
+     * @return bool
+     */
+    private function setContact($mapimessage, $contact) {
+        mapi_setprops($mapimessage, [PR_MESSAGE_CLASS => "IPM.Contact"]);
+
+        // normalize email addresses
+        if (isset($contact->email1address) && (($contact->email1address = $this->extractEmailAddress($contact->email1address)) === false)) {
+            unset($contact->email1address);
+        }
+
+        if (isset($contact->email2address) && (($contact->email2address = $this->extractEmailAddress($contact->email2address)) === false)) {
+            unset($contact->email2address);
+        }
+
+        if (isset($contact->email3address) && (($contact->email3address = $this->extractEmailAddress($contact->email3address)) === false)) {
+            unset($contact->email3address);
+        }
+
+        $contactmapping = MAPIMapping::GetContactMapping();
+        $contactprops = MAPIMapping::GetContactProperties();
+        $this->setPropsInMAPI($mapimessage, $contact, $contactmapping);
+
+        // /set display name from contact's properties
+        $cname = $this->composeDisplayName($contact);
+
+        // get contact specific mapi properties and merge them with the AS properties
+        $contactprops = array_merge($this->getPropIdsFromStrings($contactmapping), $this->getPropIdsFromStrings($contactprops));
+
+        // contact specific properties to be set
+        $props = [];
+
+        // need to be set in order to show contacts properly in outlook and wa
+        $nremails = [];
+        $abprovidertype = 0;
+
+        if (isset($contact->email1address)) {
+            $this->setEmailAddress($contact->email1address, $cname, 1, $props, $contactprops, $nremails, $abprovidertype);
+        }
+        if (isset($contact->email2address)) {
+            $this->setEmailAddress($contact->email2address, $cname, 2, $props, $contactprops, $nremails, $abprovidertype);
+        }
+        if (isset($contact->email3address)) {
+            $this->setEmailAddress($contact->email3address, $cname, 3, $props, $contactprops, $nremails, $abprovidertype);
+        }
+
+        $props[$contactprops["addressbooklong"]] = $abprovidertype;
+        $props[$contactprops["displayname"]] = $props[$contactprops["subject"]] = $cname;
+
+        // pda multiple e-mail addresses bug fix for the contact
+        if (!empty($nremails)) {
+            $props[$contactprops["addressbookmv"]] = $nremails;
+        }
+
+        // set addresses
+        $this->setAddress("home", $contact->homecity, $contact->homecountry, $contact->homepostalcode, $contact->homestate, $contact->homestreet, $props, $contactprops);
+        $this->setAddress("business", $contact->businesscity, $contact->businesscountry, $contact->businesspostalcode, $contact->businessstate, $contact->businessstreet, $props, $contactprops);
+        $this->setAddress("other", $contact->othercity, $contact->othercountry, $contact->otherpostalcode, $contact->otherstate, $contact->otherstreet, $props, $contactprops);
+
+        // set the mailing address and its type
+        if (isset($props[$contactprops["businessaddress"]])) {
+            $props[$contactprops["mailingaddress"]] = 2;
+            $this->setMailingAddress($contact->businesscity, $contact->businesscountry, $contact->businesspostalcode, $contact->businessstate, $contact->businessstreet, $props[$contactprops["businessaddress"]], $props, $contactprops);
+        }
+        elseif (isset($props[$contactprops["homeaddress"]])) {
+            $props[$contactprops["mailingaddress"]] = 1;
+            $this->setMailingAddress($contact->homecity, $contact->homecountry, $contact->homepostalcode, $contact->homestate, $contact->homestreet, $props[$contactprops["homeaddress"]], $props, $contactprops);
+        }
+        elseif (isset($props[$contactprops["otheraddress"]])) {
+            $props[$contactprops["mailingaddress"]] = 3;
+            $this->setMailingAddress($contact->othercity, $contact->othercountry, $contact->otherpostalcode, $contact->otherstate, $contact->otherstreet, $props[$contactprops["otheraddress"]], $props, $contactprops);
+        }
+
+        if (isset($contact->picture)) {
+            $picbinary = base64_decode($contact->picture);
+            $picsize = strlen($picbinary);
+            $props[$contactprops["haspic"]] = false;
+
+            // TODO contact picture handling
+            // check if contact has already got a picture. delete it first in that case
+            // delete it also if it was removed on a mobile
+            $picprops = mapi_getprops($mapimessage, [$contactprops["haspic"]]);
+            if (isset($picprops[$contactprops["haspic"]]) && $picprops[$contactprops["haspic"]]) {
+                SLog::Write(LOGLEVEL_DEBUG, "Contact already has a picture. Delete it");
+
+                $attachtable = mapi_message_getattachmenttable($mapimessage);
+                mapi_table_restrict($attachtable, MAPIUtils::GetContactPicRestriction());
+                $rows = mapi_table_queryallrows($attachtable, [PR_ATTACH_NUM]);
+                if (isset($rows) && is_array($rows)) {
+                    foreach ($rows as $row) {
+                        mapi_message_deleteattach($mapimessage, $row[PR_ATTACH_NUM]);
+                    }
+                }
+            }
+
+            // only set picture if there's data in the request
+            if ($picbinary !== false && $picsize > 0) {
+                $props[$contactprops["haspic"]] = true;
+                $pic = mapi_message_createattach($mapimessage);
+                // Set properties of the attachment
+                $picprops = [
+                    PR_ATTACH_LONG_FILENAME => "ContactPicture.jpg",
+                    PR_DISPLAY_NAME => "ContactPicture.jpg",
+                    0x7FFF000B => true,
+                    PR_ATTACHMENT_HIDDEN => false,
+                    PR_ATTACHMENT_FLAGS => 1,
+                    PR_ATTACH_METHOD => ATTACH_BY_VALUE,
+                    PR_ATTACH_EXTENSION => ".jpg",
+                    PR_ATTACH_NUM => 1,
+                    PR_ATTACH_SIZE => $picsize,
+                    PR_ATTACH_DATA_BIN => $picbinary,
+                ];
+
+                mapi_setprops($pic, $picprops);
+                mapi_savechanges($pic);
+            }
+        }
+
+        if (isset($contact->asbody)) {
+            $this->setASbody($contact->asbody, $props, $contactprops);
+        }
+
+        // set fileas
+        if (defined('FILEAS_ORDER')) {
+            $lastname = (isset($contact->lastname)) ? $contact->lastname : "";
+            $firstname = (isset($contact->firstname)) ? $contact->firstname : "";
+            $middlename = (isset($contact->middlename)) ? $contact->middlename : "";
+            $company = (isset($contact->companyname)) ? $contact->companyname : "";
+            $props[$contactprops["fileas"]] = Utils::BuildFileAs($lastname, $firstname, $middlename, $company);
+        }
+        else {
+            SLog::Write(LOGLEVEL_DEBUG, "FILEAS_ORDER not defined");
+        }
+
+        mapi_setprops($mapimessage, $props);
+
+        return true;
+    }
+
+    /**
+     * Writes a SyncTask to MAPI.
+     *
+     * @param mixed    $mapimessage
+     * @param SyncTask $task
+     *
+     * @return bool
+     */
+    private function setTask($mapimessage, $task) {
+        mapi_setprops($mapimessage, [PR_MESSAGE_CLASS => "IPM.Task"]);
+
+        $taskmapping = MAPIMapping::GetTaskMapping();
+        $taskprops = MAPIMapping::GetTaskProperties();
+        $this->setPropsInMAPI($mapimessage, $task, $taskmapping);
+        $taskprops = array_merge($this->getPropIdsFromStrings($taskmapping), $this->getPropIdsFromStrings($taskprops));
+
+        // task specific properties to be set
+        $props = [];
+
+        if (isset($task->asbody)) {
+            $this->setASbody($task->asbody, $props, $taskprops);
+        }
+
+        if (isset($task->complete)) {
+            if ($task->complete) {
+                // Set completion to 100%
+                // Set status to 'complete'
+                $props[$taskprops["completion"]] = 1.0;
+                $props[$taskprops["status"]] = 2;
+                $props[$taskprops["reminderset"]] = false;
+            }
+            else {
+                // Set completion to 0%
+                // Set status to 'not started'
+                $props[$taskprops["completion"]] = 0.0;
+                $props[$taskprops["status"]] = 0;
+            }
+        }
+        if (isset($task->recurrence) && class_exists('TaskRecurrence')) {
+            $deadoccur = false;
+            if ((isset($task->recurrence->occurrences) && $task->recurrence->occurrences == 1) ||
+                (isset($task->recurrence->deadoccur) && $task->recurrence->deadoccur == 1)) { // ios5 sends deadoccur inside the recurrence
+                $deadoccur = true;
+            }
+
+            // Set PR_ICON_INDEX to 1281 to show correct icon in category view
+            $props[$taskprops["icon"]] = 1281;
+            // dead occur - false if new occurrences should be generated from the task
+            // true - if it is the last occurrence of the task
+            $props[$taskprops["deadoccur"]] = $deadoccur;
+            $props[$taskprops["isrecurringtag"]] = true;
+
+            $recurrence = new TaskRecurrence($this->store, $mapimessage);
+            $recur = [];
+            $this->setRecurrence($task, $recur);
+
+            // task specific recurrence properties which we need to set here
+            // "start" and "end" are in GMT when passing to class.recurrence
+            // set recurrence start here because it's calculated differently for tasks and appointments
+            $recur["start"] = $task->recurrence->start;
+            $recur["regen"] = (isset($task->recurrence->regenerate) && $task->recurrence->regenerate) ? 1 : 0;
+            // OL regenerates recurring task itself, but setting deleteOccurrence is required so that PHP-MAPI doesn't regenerate
+            // completed occurrence of a task.
+            if ($recur["regen"] == 0) {
+                $recur["deleteOccurrence"] = 0;
+            }
+            // Also add dates to $recur
+            $recur["duedate"] = $task->duedate;
+            $recur["complete"] = (isset($task->complete) && $task->complete) ? 1 : 0;
+            if (isset($task->datecompleted)) {
+                $recur["datecompleted"] = $task->datecompleted;
+            }
+            $recurrence->setRecurrence($recur);
+        }
+
+        $props[$taskprops["private"]] = (isset($task->sensitivity) && $task->sensitivity >= SENSITIVITY_PRIVATE) ? true : false;
+
+        // Open address book for user resolve to set the owner
+        $addrbook = $this->getAddressbook();
+
+        // check if there is already an owner for the task, set current user if not
+        $p = [$taskprops["owner"]];
+        $owner = $this->getProps($mapimessage, $p);
+        if (!isset($owner[$taskprops["owner"]])) {
+            $userinfo = nsp_getuserinfo(Request::GetUser());
+            if (mapi_last_hresult() == NOERROR && isset($userinfo["fullname"])) {
+                $props[$taskprops["owner"]] = $userinfo["fullname"];
+            }
+        }
+        mapi_setprops($mapimessage, $props);
+
+        return true;
+    }
+
+    /**
+     * Writes a SyncNote to MAPI.
+     *
+     * @param mixed    $mapimessage
+     * @param SyncNote $note
+     *
+     * @return bool
+     */
+    private function setNote($mapimessage, $note) {
+        // Touchdown does not send categories if all are unset or there is none.
+        // Setting it to an empty array will unset the property in KC as well
+        if (!isset($note->categories)) {
+            $note->categories = [];
+        }
+
+        // update icon index to correspond to the color
+        if (isset($note->Color) && $note->Color > -1 && $note->Color < 5) {
+            $note->Iconindex = 768 + $note->Color;
+        }
+
+        $this->setPropsInMAPI($mapimessage, $note, MAPIMapping::GetNoteMapping());
+
+        $noteprops = MAPIMapping::GetNoteProperties();
+        $noteprops = $this->getPropIdsFromStrings($noteprops);
+
+        // note specific properties to be set
+        $props = [];
+        $props[$noteprops["messageclass"]] = "IPM.StickyNote";
+        // set body otherwise the note will be "broken" when editing it in outlook
+        if (isset($note->asbody)) {
+            $this->setASbody($note->asbody, $props, $noteprops);
+        }
+
+        $props[$noteprops["internetcpid"]] = INTERNET_CPID_UTF8;
+        mapi_setprops($mapimessage, $props);
+
+        return true;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * HELPER
 	 */
 
-	/**
-	 * Returns the timestamp offset.
-	 *
-	 * @param string $ts
-	 *
-	 * @return long
-	 */
-	private function GetTZOffset($ts) {
-		$Offset = date("O", $ts);
-
-		$Parity = $Offset < 0 ? -1 : 1;
-		$Offset = $Parity * $Offset;
-		$Offset = ($Offset - ($Offset % 100)) / 100 * 60 + $Offset % 100;
-
-		return $Parity * $Offset;
-	}
-
-	/**
-	 * Localtime of the timestamp.
-	 *
-	 * @param long $time
-	 *
-	 * @return array
-	 */
-	private function gmtime($time) {
-		$TZOffset = $this->GetTZOffset($time);
-
-		$t_time = $time - $TZOffset * 60; # Counter adjust for localtime()
-
-		return localtime($t_time, 1);
-	}
-
-	/**
-	 * Sets the properties in a MAPI object according to an Sync object and a property mapping.
-	 *
-	 * @param mixed      $mapimessage
-	 * @param SyncObject $message
-	 * @param array      $mapping
-	 *
-	 * @return
-	 */
-	private function setPropsInMAPI($mapimessage, $message, $mapping) {
-		$mapiprops = $this->getPropIdsFromStrings($mapping);
-		$unsetVars = $message->getUnsetVars();
-		$propsToDelete = [];
-		$propsToSet = [];
-
-		foreach ($mapiprops as $asprop => $mapiprop) {
-			if (isset($message->{$asprop})) {
-				// UTF8->windows1252.. this is ok for all numerical values
-				if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
-					if (is_array($message->{$asprop})) {
-						$value = array_map("u2wi", $message->{$asprop});
-					}
-					else {
-						$value = u2wi($message->{$asprop});
-					}
-				}
-				else {
-					$value = $message->{$asprop};
-				}
-
-				// Make sure the php values are the correct type
-				switch (mapi_prop_type($mapiprop)) {
-					case PT_BINARY:
-					case PT_STRING8:
-						settype($value, "string");
-						break;
-
-					case PT_BOOLEAN:
-						settype($value, "boolean");
-						break;
-
-					case PT_SYSTIME:
-					case PT_LONG:
-						settype($value, "integer");
-						break;
-				}
-
-				// decode base64 value
-				if ($mapiprop == PR_RTF_COMPRESSED) {
-					$value = base64_decode($value);
-					if (strlen($value) == 0) {
-						continue;
-					} // PDA will sometimes give us an empty RTF, which we'll ignore.
-
-					// Note that you can still remove notes because when you remove notes it gives
-					// a valid compressed RTF with nothing in it.
-				}
-				// if an "empty array" is to be saved, it the mvprop should be deleted - fixes Mantis #468
-				if (is_array($value) && empty($value)) {
-					$propsToDelete[] = $mapiprop;
-					SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->setPropsInMAPI(): Property '%s' to be deleted as it is an empty array", $asprop));
-				}
-				else {
-					// all properties will be set at once
-					$propsToSet[$mapiprop] = $value;
-				}
-			}
-			elseif (in_array($asprop, $unsetVars)) {
-				$propsToDelete[] = $mapiprop;
-			}
-		}
-
-		mapi_setprops($mapimessage, $propsToSet);
-		if (mapi_last_hresult()) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("Failed to set properties, trying to set them separately. Error code was:%x", mapi_last_hresult()));
-			$this->setPropsIndividually($mapimessage, $propsToSet, $mapiprops);
-		}
-
-		mapi_deleteprops($mapimessage, $propsToDelete);
-
-		// clean up
-		unset($unsetVars, $propsToDelete);
-	}
-
-	/**
-	 * Sets the properties one by one in a MAPI object.
-	 *
-	 * @param mixed &$mapimessage
-	 * @param array &$propsToSet
-	 * @param array &$mapiprops
-	 *
-	 * @return
-	 */
-	private function setPropsIndividually(&$mapimessage, &$propsToSet, &$mapiprops) {
-		foreach ($propsToSet as $prop => $value) {
-			mapi_setprops($mapimessage, [$prop => $value]);
-			if (mapi_last_hresult()) {
-				SLog::Write(LOGLEVEL_ERROR, sprintf("Failed setting property [%s] with value [%s], error code was:%x", array_search($prop, $mapiprops), $value, mapi_last_hresult()));
-			}
-		}
-	}
-
-	/**
-	 * Gets the properties from a MAPI object and sets them in the Sync object according to mapping.
-	 *
-	 * @param SyncObject &$message
-	 * @param mixed      $mapimessage
-	 * @param array      $mapping
-	 *
-	 * @return
-	 */
-	private function getPropsFromMAPI(&$message, $mapimessage, $mapping) {
-		$messageprops = $this->getProps($mapimessage, $mapping);
-		foreach ($mapping as $asprop => $mapiprop) {
-			// Get long strings via openproperty
-			if (isset($messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))])) {
-				if ($messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))] == MAPI_E_NOT_ENOUGH_MEMORY_32BIT ||
-					$messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))] == MAPI_E_NOT_ENOUGH_MEMORY_64BIT) {
-					$messageprops[$mapiprop] = MAPIUtils::readPropStream($mapimessage, $mapiprop);
-				}
-			}
-
-			if (isset($messageprops[$mapiprop])) {
-				if (mapi_prop_type($mapiprop) == PT_BOOLEAN) {
-					// Force to actual '0' or '1'
-					if ($messageprops[$mapiprop]) {
-						$message->{$asprop} = 1;
-					}
-					else {
-						$message->{$asprop} = 0;
-					}
-				}
-				else {
-					// Special handling for PR_MESSAGE_FLAGS
-					if ($mapiprop == PR_MESSAGE_FLAGS) {
-						$message->{$asprop} = $messageprops[$mapiprop] & 1;
-					} // only look at 'read' flag
-					elseif ($mapiprop == PR_RTF_COMPRESSED) {
-						// do not send rtf to the mobile
-						continue;
-					}
-					elseif (is_array($messageprops[$mapiprop])) {
-						$message->{$asprop} = array_map("w2u", $messageprops[$mapiprop]);
-					}
-					else {
-						if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
-							$message->{$asprop} = w2u($messageprops[$mapiprop]);
-						}
-						else {
-							$message->{$asprop} = $messageprops[$mapiprop];
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Wraps getPropIdsFromStrings() calls.
-	 *
-	 * @param mixed &$mapiprops
-	 *
-	 * @return
-	 */
-	private function getPropIdsFromStrings(&$mapiprops) {
-		return getPropIdsFromStrings($this->store, $mapiprops);
-	}
-
-	/**
-	 * Wraps mapi_getprops() calls.
-	 *
-	 * @param mixed &$mapiprops
-	 * @param mixed $mapimessage
-	 * @param mixed $mapiproperties
-	 *
-	 * @return
-	 */
-	protected function getProps($mapimessage, &$mapiproperties) {
-		$mapiproperties = $this->getPropIdsFromStrings($mapiproperties);
-
-		return mapi_getprops($mapimessage, $mapiproperties);
-	}
-
-	/**
-	 * Returns an GMT timezone array.
-	 *
-	 * @return array
-	 */
-	private function getGMTTZ() {
-		return [
-			"bias" => 0,
-			"tzname" => "",
-			"dstendyear" => 0,
-			"dstendmonth" => 10,
-			"dstendday" => 0,
-			"dstendweek" => 5,
-			"dstendhour" => 2,
-			"dstendminute" => 0,
-			"dstendsecond" => 0,
-			"dstendmillis" => 0,
-			"stdbias" => 0,
-			"tznamedst" => "",
-			"dststartyear" => 0,
-			"dststartmonth" => 3,
-			"dststartday" => 0,
-			"dststartweek" => 5,
-			"dststarthour" => 1,
-			"dststartminute" => 0,
-			"dststartsecond" => 0,
-			"dststartmillis" => 0,
-			"dstbias" => -60,
-		];
-	}
-
-	/**
-	 * Unpack timezone info from MAPI.
-	 *
-	 * @param string $data
-	 *
-	 * @return array
-	 */
-	private function getTZFromMAPIBlob($data) {
-		return unpack("lbias/lstdbias/ldstbias/" .
-						   "vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
-						   "vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis", $data);
-	}
-
-	/**
-	 * Unpack timezone info from Sync.
-	 *
-	 * @param string $data
-	 *
-	 * @return array
-	 */
-	private function getTZFromSyncBlob($data) {
-		$tz = unpack("lbias/a64tzname/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
-						"lstdbias/a64tznamedst/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/" .
-						"ldstbias", $data);
-
-		// Make the structure compatible with class.recurrence.php
-		$tz["timezone"] = $tz["bias"];
-		$tz["timezonedst"] = $tz["dstbias"];
-
-		return $tz;
-	}
-
-	/**
-	 * Pack timezone info for MAPI.
-	 *
-	 * @param array $tz
-	 *
-	 * @return string
-	 */
-	private function getMAPIBlobFromTZ($tz) {
-		return pack(
-			"lll" . "vvvvvvvvv" . "vvvvvvvvv",
-			$tz["bias"],
-			$tz["stdbias"],
-			$tz["dstbias"],
-			0,
-			0,
-			$tz["dstendmonth"],
-			$tz["dstendday"],
-			$tz["dstendweek"],
-			$tz["dstendhour"],
-			$tz["dstendminute"],
-			$tz["dstendsecond"],
-			$tz["dstendmillis"],
-			0,
-			0,
-			$tz["dststartmonth"],
-			$tz["dststartday"],
-			$tz["dststartweek"],
-			$tz["dststarthour"],
-			$tz["dststartminute"],
-			$tz["dststartsecond"],
-			$tz["dststartmillis"]
-		);
-	}
-
-	/**
-	 * Checks the date to see if it is in DST, and returns correct GMT date accordingly.
-	 *
-	 * @param long  $localtime
-	 * @param array $tz
-	 *
-	 * @return long
-	 */
-	private function getGMTTimeByTZ($localtime, $tz) {
-		if (!isset($tz) || !is_array($tz)) {
-			return $localtime;
-		}
-
-		if ($this->isDST($localtime, $tz)) {
-			return $localtime + $tz["bias"] * 60 + $tz["dstbias"] * 60;
-		}
-
-		return $localtime + $tz["bias"] * 60;
-	}
-
-	/**
-	 * Returns the local time for the given GMT time, taking account of the given timezone.
-	 *
-	 * @param long  $gmttime
-	 * @param array $tz
-	 *
-	 * @return long
-	 */
-	private function getLocaltimeByTZ($gmttime, $tz) {
-		if (!isset($tz) || !is_array($tz)) {
-			return $gmttime;
-		}
-
-		if ($this->isDST($gmttime - $tz["bias"] * 60, $tz)) { // may bug around the switch time because it may have to be 'gmttime - bias - dstbias'
-			return $gmttime - $tz["bias"] * 60 - $tz["dstbias"] * 60;
-		}
-
-		return $gmttime - $tz["bias"] * 60;
-	}
-
-	/**
-	 * Returns TRUE if it is the summer and therefore DST is in effect.
-	 *
-	 * @param long  $localtime
-	 * @param array $tz
-	 *
-	 * @return bool
-	 */
-	private function isDST($localtime, $tz) {
-		if (!isset($tz) || !is_array($tz) ||
-			!isset($tz["dstbias"]) || $tz["dstbias"] == 0 ||
-			!isset($tz["dststartmonth"]) || $tz["dststartmonth"] == 0 ||
-			!isset($tz["dstendmonth"]) || $tz["dstendmonth"] == 0) {
-			return false;
-		}
-
-		$year = gmdate("Y", $localtime);
-		$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)
-			if ($localtime >= $start && $localtime < $end) {
-				$dst = true;
-			}
-			else {
-				$dst = false;
-			}
-		}
-		else {
-			// southern hemisphere (january = dst)
-			if ($localtime >= $end && $localtime < $start) {
-				$dst = false;
-			}
-			else {
-				$dst = true;
-			}
-		}
-
-		return $dst;
-	}
-
-	/**
-	 * Returns the local timestamp for the $week'th $wday of $month in $year at $hour:$minute:$second.
-	 *
-	 * @param int $year
-	 * @param int $month
-	 * @param int $week
-	 * @param int $wday
-	 * @param int $hour
-	 * @param int $minute
-	 * @param int $second
-	 *
-	 * @return long
-	 */
-	private function getTimestampOfWeek($year, $month, $week, $wday, $hour, $minute, $second) {
-		if ($month == 0) {
-			return;
-		}
-
-		$date = gmmktime($hour, $minute, $second, $month, 1, $year);
-
-		// Find first day in month which matches day of the week
-		while (1) {
-			$wdaynow = gmdate("w", $date);
-			if ($wdaynow == $wday) {
-				break;
-			}
-			$date += 24 * 60 * 60;
-		}
-
-		// Forward $week weeks (may 'overflow' into the next month)
-		$date = $date + $week * (24 * 60 * 60 * 7);
-
-		// Reverse 'overflow'. Eg week '10' will always be the last week of the month in which the
-		// specified weekday exists
-		while (1) {
-			$monthnow = gmdate("n", $date); // gmdate returns 1-12
-			if ($monthnow > $month) {
-				$date = $date - (24 * 7 * 60 * 60);
-			}
-			else {
-				break;
-			}
-		}
-
-		return $date;
-	}
-
-	/**
-	 * Normalize the given timestamp to the start of the day.
-	 *
-	 * @param long $timestamp
-	 *
-	 * @return long
-	 */
-	private function getDayStartOfTimestamp($timestamp) {
-		return $timestamp - ($timestamp % (60 * 60 * 24));
-	}
-
-	/**
-	 * Returns an SMTP address from an entry id.
-	 *
-	 * @param string $entryid
-	 *
-	 * @return string
-	 */
-	private function getSMTPAddressFromEntryID($entryid) {
-		$addrbook = $this->getAddressbook();
-
-		$mailuser = mapi_ab_openentry($addrbook, $entryid);
-		if (!$mailuser) {
-			return "";
-		}
-
-		$props = mapi_getprops($mailuser, [PR_ADDRTYPE, PR_SMTP_ADDRESS, PR_EMAIL_ADDRESS]);
-
-		$addrtype = isset($props[PR_ADDRTYPE]) ? $props[PR_ADDRTYPE] : "";
-
-		if (isset($props[PR_SMTP_ADDRESS])) {
-			return $props[PR_SMTP_ADDRESS];
-		}
-
-		if ($addrtype == "SMTP" && isset($props[PR_EMAIL_ADDRESS])) {
-			return $props[PR_EMAIL_ADDRESS];
-		}
-		if ($addrtype == "ZARAFA" && isset($props[PR_EMAIL_ADDRESS])) {
-			$userinfo = nsp_getuserinfo($props[PR_EMAIL_ADDRESS]);
-			if (is_array($userinfo) && isset($userinfo["primary_email"])) {
-				return $userinfo["primary_email"];
-			}
-		}
-
-		return "";
-	}
-
-	/**
-	 * Returns fullname from an entryid.
-	 *
-	 * @param binary $entryid
-	 *
-	 * @return string fullname or false on error
-	 */
-	private function getFullnameFromEntryID($entryid) {
-		$addrbook = $this->getAddressbook();
-		$mailuser = mapi_ab_openentry($addrbook, $entryid);
-		if (!$mailuser) {
-			SLog::Write(LOGLEVEL_ERROR, sprintf("Unable to get mailuser for getFullnameFromEntryID (0x%X)", mapi_last_hresult()));
-
-			return false;
-		}
-
-		$props = mapi_getprops($mailuser, [PR_DISPLAY_NAME]);
-		if (isset($props[PR_DISPLAY_NAME])) {
-			return $props[PR_DISPLAY_NAME];
-		}
-		SLog::Write(LOGLEVEL_ERROR, sprintf("Unable to get fullname for getFullnameFromEntryID (0x%X)", mapi_last_hresult()));
-
-		return false;
-	}
-
-	/**
-	 * Builds a displayname from several separated values.
-	 *
-	 * @param SyncContact $contact
-	 *
-	 * @return string
-	 */
-	private function composeDisplayName(&$contact) {
-		// Set display name and subject to a combined value of firstname and lastname
-		$cname = (isset($contact->prefix)) ? u2w($contact->prefix) . " " : "";
-		$cname .= u2w($contact->firstname);
-		$cname .= (isset($contact->middlename)) ? " " . u2w($contact->middlename) : "";
-		$cname .= " " . u2w($contact->lastname);
-		$cname .= (isset($contact->suffix)) ? " " . u2w($contact->suffix) : "";
-
-		return trim($cname);
-	}
-
-	/**
-	 * Sets all dependent properties for an email address.
-	 *
-	 * @param string $emailAddress
-	 * @param string $displayName
-	 * @param int    $cnt
-	 * @param array  &$props
-	 * @param array  &$properties
-	 * @param array  &$nremails
-	 * @param int    &$abprovidertype
-	 *
-	 * @return
-	 */
-	private function setEmailAddress($emailAddress, $displayName, $cnt, &$props, &$properties, &$nremails, &$abprovidertype) {
-		if (isset($emailAddress)) {
-			$name = (isset($displayName)) ? $displayName : $emailAddress;
-
-			$props[$properties["emailaddress{$cnt}"]] = $emailAddress;
-			$props[$properties["emailaddressdemail{$cnt}"]] = $emailAddress;
-			$props[$properties["emailaddressdname{$cnt}"]] = $name;
-			$props[$properties["emailaddresstype{$cnt}"]] = "SMTP";
-			$props[$properties["emailaddressentryid{$cnt}"]] = mapi_createoneoff($name, "SMTP", $emailAddress);
-			$nremails[] = $cnt - 1;
-			$abprovidertype |= 2 ^ ($cnt - 1);
-		}
-	}
-
-	/**
-	 * Sets the properties for an address string.
-	 *
-	 * @param string $type        which address is being set
-	 * @param string $city
-	 * @param string $country
-	 * @param string $postalcode
-	 * @param string $state
-	 * @param string $street
-	 * @param array  &$props
-	 * @param array  &$properties
-	 *
-	 * @return
-	 */
-	private function setAddress($type, &$city, &$country, &$postalcode, &$state, &$street, &$props, &$properties) {
-		if (isset($city)) {
-			$props[$properties[$type . "city"]] = $city = u2w($city);
-		}
-
-		if (isset($country)) {
-			$props[$properties[$type . "country"]] = $country = u2w($country);
-		}
-
-		if (isset($postalcode)) {
-			$props[$properties[$type . "postalcode"]] = $postalcode = u2w($postalcode);
-		}
-
-		if (isset($state)) {
-			$props[$properties[$type . "state"]] = $state = u2w($state);
-		}
-
-		if (isset($street)) {
-			$props[$properties[$type . "street"]] = $street = u2w($street);
-		}
-
-		// set composed address
-		$address = Utils::BuildAddressString($street, $postalcode, $city, $state, $country);
-		if ($address) {
-			$props[$properties[$type . "address"]] = $address;
-		}
-	}
-
-	/**
-	 * Sets the properties for a mailing address.
-	 *
-	 * @param string $city
-	 * @param string $country
-	 * @param string $postalcode
-	 * @param string $state
-	 * @param string $street
-	 * @param string $address
-	 * @param array  &$props
-	 * @param array  &$properties
-	 *
-	 * @return
-	 */
-	private function setMailingAddress($city, $country, $postalcode, $state, $street, $address, &$props, &$properties) {
-		if (isset($city)) {
-			$props[$properties["city"]] = $city;
-		}
-		if (isset($country)) {
-			$props[$properties["country"]] = $country;
-		}
-		if (isset($postalcode)) {
-			$props[$properties["postalcode"]] = $postalcode;
-		}
-		if (isset($state)) {
-			$props[$properties["state"]] = $state;
-		}
-		if (isset($street)) {
-			$props[$properties["street"]] = $street;
-		}
-		if (isset($address)) {
-			$props[$properties["postaladdress"]] = $address;
-		}
-	}
-
-	/**
-	 * Sets data in a recurrence array.
-	 *
-	 * @param SyncObject $message
-	 * @param array      &$recur
-	 *
-	 * @return
-	 */
-	private function setRecurrence($message, &$recur) {
-		if (isset($message->complete)) {
-			$recur["complete"] = $message->complete;
-		}
-
-		if (!isset($message->recurrence->interval)) {
-			$message->recurrence->interval = 1;
-		}
-
-		// set the default value of numoccur
-		$recur["numoccur"] = 0;
-		// a place holder for recurrencetype property
-		$recur["recurrencetype"] = 0;
-
-		switch ($message->recurrence->type) {
-			case 0:
-				$recur["type"] = 10;
-				if (isset($message->recurrence->dayofweek)) {
-					$recur["subtype"] = 1;
-				}
-				else {
-					$recur["subtype"] = 0;
-				}
-
-				$recur["everyn"] = $message->recurrence->interval * (60 * 24);
-				$recur["recurrencetype"] = 1;
-				break;
-
-			case 1:
-				$recur["type"] = 11;
-				$recur["subtype"] = 1;
-				$recur["everyn"] = $message->recurrence->interval;
-				$recur["recurrencetype"] = 2;
-				break;
-
-			case 2:
-				$recur["type"] = 12;
-				$recur["subtype"] = 2;
-				$recur["everyn"] = $message->recurrence->interval;
-				$recur["recurrencetype"] = 3;
-				break;
-
-			case 3:
-				$recur["type"] = 12;
-				$recur["subtype"] = 3;
-				$recur["everyn"] = $message->recurrence->interval;
-				$recur["recurrencetype"] = 3;
-				break;
-
-			case 4:
-				$recur["type"] = 13;
-				$recur["subtype"] = 1;
-				$recur["everyn"] = $message->recurrence->interval * 12;
-				$recur["recurrencetype"] = 4;
-				break;
-
-			case 5:
-				$recur["type"] = 13;
-				$recur["subtype"] = 2;
-				$recur["everyn"] = $message->recurrence->interval * 12;
-				$recur["recurrencetype"] = 4;
-				break;
-
-			case 6:
-				$recur["type"] = 13;
-				$recur["subtype"] = 3;
-				$recur["everyn"] = $message->recurrence->interval * 12;
-				$recur["recurrencetype"] = 4;
-				break;
-		}
-
-		// "start" and "end" are in GMT when passing to class.recurrence
-		$recur["end"] = $this->getDayStartOfTimestamp(0x7FFFFFFF); // Maximum GMT value for end by default
-
-		if (isset($message->recurrence->until)) {
-			$recur["term"] = 0x21;
-			$recur["end"] = $message->recurrence->until;
-		}
-		elseif (isset($message->recurrence->occurrences)) {
-			$recur["term"] = 0x22;
-			$recur["numoccur"] = $message->recurrence->occurrences;
-		}
-		else {
-			$recur["term"] = 0x23;
-		}
-
-		if (isset($message->recurrence->dayofweek)) {
-			$recur["weekdays"] = $message->recurrence->dayofweek;
-		}
-		if (isset($message->recurrence->weekofmonth)) {
-			$recur["nday"] = $message->recurrence->weekofmonth;
-		}
-		if (isset($message->recurrence->monthofyear)) {
-			// MAPI stores months as the amount of minutes until the beginning of the month in a
-			// non-leapyear. Why this is, is totally unclear.
-			$monthminutes = [0, 44640, 84960, 129600, 172800, 217440, 260640, 305280, 348480, 393120, 437760, 480960];
-			$recur["month"] = $monthminutes[$message->recurrence->monthofyear - 1];
-		}
-		if (isset($message->recurrence->dayofmonth)) {
-			$recur["monthday"] = $message->recurrence->dayofmonth;
-		}
-	}
-
-	/**
-	 * Extracts the email address (mailbox@host) from an email address because
-	 * some devices send email address as "Firstname Lastname" <email@me.com>.
-	 *
-	 *  @see http://developer.berlios.de/mantis/view.php?id=486
-	 *
-	 *  @param string           $email
-	 *
-	 *  @return string or false on error
-	 */
-	private function extractEmailAddress($email) {
-		if (!isset($this->zRFC822)) {
-			$this->zRFC822 = new Mail_RFC822();
-		}
-		$parsedAddress = $this->zRFC822->parseAddressList($email);
-		if (!isset($parsedAddress[0]->mailbox) || !isset($parsedAddress[0]->host)) {
-			return false;
-		}
-
-		return $parsedAddress[0]->mailbox . '@' . $parsedAddress[0]->host;
-	}
-
-	/**
-	 * Returns the message body for a required format.
-	 *
-	 * @param MAPIMessage $mapimessage
-	 * @param int         $bpReturnType
-	 * @param SyncObject  $message
-	 *
-	 * @return bool
-	 */
-	private function setMessageBodyForType($mapimessage, $bpReturnType, &$message) {
-		$truncateHtmlSafe = false;
-		// default value is PR_BODY
-		$property = PR_BODY;
-
-		switch ($bpReturnType) {
-			case SYNC_BODYPREFERENCE_HTML:
-				$property = PR_HTML;
-				$truncateHtmlSafe = true;
-				break;
-
-			case SYNC_BODYPREFERENCE_RTF:
-				$property = PR_RTF_COMPRESSED;
-				break;
-
-			case SYNC_BODYPREFERENCE_MIME:
-				$stat = $this->imtoinet($mapimessage, $message);
-				if (isset($message->asbody)) {
-					$message->asbody->type = $bpReturnType;
-				}
-
-				return $stat;
-		}
-
-		$stream = mapi_openproperty($mapimessage, $property, IID_IStream, 0, 0);
-		if ($stream) {
-			$stat = mapi_stream_stat($stream);
-			$streamsize = $stat['cb'];
-		}
-		else {
-			$streamsize = 0;
-		}
-
-		// set the properties according to supported AS version
-		if (Request::GetProtocolVersion() >= 12.0) {
-			$message->asbody = new SyncBaseBody();
-			$message->asbody->type = $bpReturnType;
-			if ($bpReturnType == SYNC_BODYPREFERENCE_RTF) {
-				$body = $this->mapiReadStream($stream, $streamsize);
-				$message->asbody->data = StringStreamWrapper::Open(base64_encode($body));
-			}
-			elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
-				// if PR_HTML is UTF-8 we can stream it directly, else we have to convert to UTF-8 & wrap it
-				if ($message->internetcpid == INTERNET_CPID_UTF8) {
-					$message->asbody->data = MAPIStreamWrapper::Open($stream, $truncateHtmlSafe);
-				}
-				else {
-					$body = $this->mapiReadStream($stream, $streamsize);
-					$message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body), $truncateHtmlSafe);
-					$message->internetcpid = INTERNET_CPID_UTF8;
-				}
-			}
-			else {
-				$message->asbody->data = MAPIStreamWrapper::Open($stream);
-			}
-			$message->asbody->estimatedDataSize = $streamsize;
-		}
-		else {
-			$body = $this->mapiReadStream($stream, $streamsize);
-			$message->body = str_replace("\n", "\r\n", w2u(str_replace("\r", "", $body)));
-			$message->bodysize = $streamsize;
-			$message->bodytruncated = 0;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Reads from a mapi stream, if it's set. If not, returns an empty string.
-	 *
-	 * @param resource $stream
-	 * @param int      $size
-	 *
-	 * @return string
-	 */
-	private function mapiReadStream($stream, $size) {
-		if (!$stream || $size == 0) {
-			return "";
-		}
-
-		return mapi_stream_read($stream, $size);
-	}
-
-	/**
-	 * A wrapper for mapi_inetmapi_imtoinet function.
-	 *
-	 * @param MAPIMessage $mapimessage
-	 * @param SyncObject  $message
-	 *
-	 * @return bool
-	 */
-	private function imtoinet($mapimessage, &$message) {
-		$mapiEmail = mapi_getprops($mapimessage, [PR_EC_IMAP_EMAIL]);
-		$stream = false;
-		if (isset($mapiEmail[PR_EC_IMAP_EMAIL]) || MAPIUtils::GetError(PR_EC_IMAP_EMAIL, $mapiEmail) == MAPI_E_NOT_ENOUGH_MEMORY) {
-			$stream = mapi_openproperty($mapimessage, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
-			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->imtoinet(): using PR_EC_IMAP_EMAIL as full RFC822 message");
-		}
-		else {
-			$addrbook = $this->getAddressbook();
-			$stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $mapimessage, ['use_tnef' => -1, 'ignore_missing_attachments' => 1]);
-		}
-		if (is_resource($stream)) {
-			$mstreamstat = mapi_stream_stat($stream);
-			$streamsize = $mstreamstat["cb"];
-			if (isset($streamsize)) {
-				if (Request::GetProtocolVersion() >= 12.0) {
-					if (!isset($message->asbody)) {
-						$message->asbody = new SyncBaseBody();
-					}
-					$message->asbody->data = MAPIStreamWrapper::Open($stream);
-					$message->asbody->estimatedDataSize = $streamsize;
-					$message->asbody->truncated = 0;
-				}
-				else {
-					$message->mimedata = MAPIStreamWrapper::Open($stream);
-					$message->mimesize = $streamsize;
-					$message->mimetruncated = 0;
-				}
-				unset($message->body, $message->bodytruncated);
-
-				return true;
-			}
-		}
-		SLog::Write(LOGLEVEL_ERROR, "MAPIProvider->imtoinet(): got no stream or content from mapi_inetmapi_imtoinet()");
-
-		return false;
-	}
-
-	/**
-	 * Sets the message body.
-	 *
-	 * @param MAPIMessage       $mapimessage
-	 * @param ContentParameters $contentparameters
-	 * @param SyncObject        $message
-	 */
-	private function setMessageBody($mapimessage, $contentparameters, &$message) {
-		// get the available body preference types
-		$bpTypes = $contentparameters->GetBodyPreference();
-		if ($bpTypes !== false) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("BodyPreference types: %s", implode(', ', $bpTypes)));
-			// do not send mime data if the client requests it
-			if (($contentparameters->GetMimeSupport() == SYNC_MIMESUPPORT_NEVER) && ($key = array_search(SYNC_BODYPREFERENCE_MIME, $bpTypes) !== false)) {
-				unset($bpTypes[$key]);
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("Remove mime body preference type because the device required no mime support. BodyPreference types: %s", implode(', ', $bpTypes)));
-			}
-			// get the best fitting preference type
-			$bpReturnType = Utils::GetBodyPreferenceBestMatch($bpTypes);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("GetBodyPreferenceBestMatch: %d", $bpReturnType));
-			$bpo = $contentparameters->BodyPreference($bpReturnType);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("bpo: truncation size:'%d', allornone:'%d', preview:'%d'", $bpo->GetTruncationSize(), $bpo->GetAllOrNone(), $bpo->GetPreview()));
-
-			// Android Blackberry expects a full mime message for signed emails
-			// @see https://jira.z-hub.io/projects/ZP/issues/ZP-1154
-			// @TODO change this when refactoring
-			$props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS]);
-			if (isset($props[PR_MESSAGE_CLASS]) &&
-					stripos($props[PR_MESSAGE_CLASS], 'IPM.Note.SMIME.MultipartSigned') !== false &&
-					($key = array_search(SYNC_BODYPREFERENCE_MIME, $bpTypes) !== false)) {
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->setMessageBody(): enforcing SYNC_BODYPREFERENCE_MIME type for a signed message"));
-				$bpReturnType = SYNC_BODYPREFERENCE_MIME;
-			}
-
-			$this->setMessageBodyForType($mapimessage, $bpReturnType, $message);
-			// only set the truncation size data if device set it in request
-			if ($bpo->GetTruncationSize() != false &&
-					$bpReturnType != SYNC_BODYPREFERENCE_MIME &&
-					$message->asbody->estimatedDataSize > $bpo->GetTruncationSize()
-				) {
-				// Truncated plaintext requests are used on iOS for the preview in the email list. All images and links should be removed - see https://jira.z-hub.io/browse/ZP-1025
-				if ($bpReturnType == SYNC_BODYPREFERENCE_PLAIN) {
-					SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->setMessageBody(): truncated plain-text body requested, stripping all links and images");
-					// Get more data because of the filtering it's most probably going down in size. It's going to be truncated to the correct size below.
-					$plainbody = stream_get_contents($message->asbody->data, $bpo->GetTruncationSize() * 5);
-					$message->asbody->data = StringStreamWrapper::Open(preg_replace('/<http(s){0,1}:\/\/.*?>/i', '', $plainbody));
-				}
-
-				// truncate data stream
-				ftruncate($message->asbody->data, $bpo->GetTruncationSize());
-				$message->asbody->truncated = 1;
-			}
-			// set the preview or windows phones won't show the preview of an email
-			if (Request::GetProtocolVersion() >= 14.0 && $bpo->GetPreview()) {
-				$message->asbody->preview = Utils::Utf8_truncate(MAPIUtils::readPropStream($mapimessage, PR_BODY), $bpo->GetPreview());
-			}
-		}
-		else {
-			// Override 'body' for truncation
-			$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
-			$this->setMessageBodyForType($mapimessage, SYNC_BODYPREFERENCE_PLAIN, $message);
-
-			if ($message->bodysize > $truncsize) {
-				$message->body = Utils::Utf8_truncate($message->body, $truncsize);
-				$message->bodytruncated = 1;
-			}
-
-			if (!isset($message->body) || strlen($message->body) == 0) {
-				$message->body = " ";
-			}
-
-			if ($contentparameters->GetMimeSupport() == SYNC_MIMESUPPORT_ALWAYS) {
-				// set the html body for iphone in AS 2.5 version
-				$this->imtoinet($mapimessage, $message);
-			}
-		}
-	}
-
-	/**
-	 * Sets properties for an email message.
-	 *
-	 * @param mixed    $mapimessage
-	 * @param SyncMail $message
-	 */
-	private function setFlag($mapimessage, &$message) {
-		// do nothing if protocol version is lower than 12.0 as flags haven't been defined before
-		if (Request::GetProtocolVersion() < 12.0) {
-			return;
-		}
-
-		$message->flag = new SyncMailFlags();
-
-		$this->getPropsFromMAPI($message->flag, $mapimessage, MAPIMapping::GetMailFlagsMapping());
-	}
-
-	/**
-	 * Sets information from SyncBaseBody type for a MAPI message.
-	 *
-	 * @param SyncBaseBody $asbody
-	 * @param array        $props
-	 * @param array        $appointmentprops
-	 */
-	private function setASbody($asbody, &$props, $appointmentprops) {
-		// TODO: fix checking for the length
-		if (isset($asbody->type, $asbody->data)   /* && strlen($asbody->data) > 0 */) {
-			switch ($asbody->type) {
-				case SYNC_BODYPREFERENCE_PLAIN:
-				default:
-				// set plain body if the type is not in valid range
-					$props[$appointmentprops["body"]] = stream_get_contents($asbody->data);
-					break;
-
-				case SYNC_BODYPREFERENCE_HTML:
-					$props[$appointmentprops["html"]] = stream_get_contents($asbody->data);
-					break;
-
-				case SYNC_BODYPREFERENCE_RTF:
-					break;
-
-				case SYNC_BODYPREFERENCE_MIME:
-					break;
-			}
-		}
-		else {
-			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->setASbody either type or data are not set. Setting to empty body");
-			$props[$appointmentprops["body"]] = "";
-		}
-	}
-
-	/**
-	 * Get MAPI addressbook object.
-	 *
-	 * @return MAPIAddressbook object to be used with mapi_ab_* or false on failure
-	 */
-	private function getAddressbook() {
-		if (isset($this->addressbook) && $this->addressbook) {
-			return $this->addressbook;
-		}
-		$this->addressbook = mapi_openaddressbook($this->session);
-		$result = mapi_last_hresult();
-		if ($result && $this->addressbook === false) {
-			SLog::Write(LOGLEVEL_ERROR, sprintf("MAPIProvider->getAddressbook error opening addressbook 0x%X", $result));
-
-			return false;
-		}
-
-		return $this->addressbook;
-	}
-
-	/**
-	 * Gets the required store properties.
-	 *
-	 * @return array
-	 */
-	public function GetStoreProps() {
-		if (!isset($this->storeProps) || empty($this->storeProps)) {
-			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->GetStoreProps(): Getting store properties.");
-			$this->storeProps = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_OUTBOX_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID, PR_IPM_FAVORITES_ENTRYID, PR_MAILBOX_OWNER_ENTRYID]);
-			// make sure all properties are set
-			if (!isset($this->storeProps[PR_IPM_WASTEBASKET_ENTRYID])) {
-				$this->storeProps[PR_IPM_WASTEBASKET_ENTRYID] = false;
-			}
-			if (!isset($this->storeProps[PR_IPM_SENTMAIL_ENTRYID])) {
-				$this->storeProps[PR_IPM_SENTMAIL_ENTRYID] = false;
-			}
-			if (!isset($this->storeProps[PR_IPM_OUTBOX_ENTRYID])) {
-				$this->storeProps[PR_IPM_OUTBOX_ENTRYID] = false;
-			}
-			if (!isset($this->storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID])) {
-				$this->storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID] = false;
-			}
-		}
-
-		return $this->storeProps;
-	}
-
-	/**
-	 * Gets the required inbox properties.
-	 *
-	 * @return array
-	 */
-	public function GetInboxProps() {
-		if (!isset($this->inboxProps) || empty($this->inboxProps)) {
-			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->GetInboxProps(): Getting inbox properties.");
-			$this->inboxProps = [];
-			$inbox = mapi_msgstore_getreceivefolder($this->store);
-			if ($inbox) {
-				$this->inboxProps = mapi_getprops($inbox, [PR_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_TASK_ENTRYID, PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_JOURNAL_ENTRYID]);
-				// make sure all properties are set
-				if (!isset($this->inboxProps[PR_ENTRYID])) {
-					$this->inboxProps[PR_ENTRYID] = false;
-				}
-				if (!isset($this->inboxProps[PR_IPM_DRAFTS_ENTRYID])) {
-					$this->inboxProps[PR_IPM_DRAFTS_ENTRYID] = false;
-				}
-				if (!isset($this->inboxProps[PR_IPM_TASK_ENTRYID])) {
-					$this->inboxProps[PR_IPM_TASK_ENTRYID] = false;
-				}
-				if (!isset($this->inboxProps[PR_IPM_APPOINTMENT_ENTRYID])) {
-					$this->inboxProps[PR_IPM_APPOINTMENT_ENTRYID] = false;
-				}
-				if (!isset($this->inboxProps[PR_IPM_CONTACT_ENTRYID])) {
-					$this->inboxProps[PR_IPM_CONTACT_ENTRYID] = false;
-				}
-				if (!isset($this->inboxProps[PR_IPM_NOTE_ENTRYID])) {
-					$this->inboxProps[PR_IPM_NOTE_ENTRYID] = false;
-				}
-				if (!isset($this->inboxProps[PR_IPM_JOURNAL_ENTRYID])) {
-					$this->inboxProps[PR_IPM_JOURNAL_ENTRYID] = false;
-				}
-			}
-		}
-
-		return $this->inboxProps;
-	}
-
-	/**
-	 * Gets the required store root properties.
-	 *
-	 * @return array
-	 */
-	private function getRootProps() {
-		if (!isset($this->rootProps)) {
-			$root = mapi_msgstore_openentry($this->store, null);
-			$this->rootProps = mapi_getprops($root, [PR_IPM_OL2007_ENTRYIDS]);
-		}
-
-		return $this->rootProps;
-	}
-
-	/**
-	 * Returns an array with entryids of some special folders.
-	 *
-	 * @return array
-	 */
-	private function getSpecialFoldersData() {
-		// The persist data of an entry in PR_IPM_OL2007_ENTRYIDS consists of:
-		//      PersistId - e.g. RSF_PID_SUGGESTED_CONTACTS (2 bytes)
-		//      DataElementsSize - size of DataElements field (2 bytes)
-		//      DataElements - array of PersistElement structures (variable size)
-		//          PersistElement Structure consists of
-		//              ElementID - e.g. RSF_ELID_ENTRYID (2 bytes)
-		//              ElementDataSize - size of ElementData (2 bytes)
-		//              ElementData - The data for the special folder identified by the PersistID (variable size)
-		if (empty($this->specialFoldersData)) {
-			$this->specialFoldersData = [];
-			$rootProps = $this->getRootProps();
-			if (isset($rootProps[PR_IPM_OL2007_ENTRYIDS])) {
-				$persistData = $rootProps[PR_IPM_OL2007_ENTRYIDS];
-				while (strlen($persistData) > 0) {
-					// PERSIST_SENTINEL marks the end of the persist data
-					if (strlen($persistData) == 4 && $persistData == PERSIST_SENTINEL) {
-						break;
-					}
-					$unpackedData = unpack("vdataSize/velementID/velDataSize", substr($persistData, 2, 6));
-					if (isset($unpackedData['dataSize'], $unpackedData['elementID']) && $unpackedData['elementID'] == RSF_ELID_ENTRYID && isset($unpackedData['elDataSize'])) {
-						$this->specialFoldersData[] = substr($persistData, 8, $unpackedData['elDataSize']);
-						// Add PersistId and DataElementsSize lengths to the data size as they're not part of it
-						$persistData = substr($persistData, $unpackedData['dataSize'] + 4);
-					}
-					else {
-						SLog::Write(LOGLEVEL_INFO, "MAPIProvider->getSpecialFoldersData(): persistent data is not valid");
-						break;
-					}
-				}
-			}
-		}
-
-		return $this->specialFoldersData;
-	}
-
-	/**
-	 * Extracts email address from PR_SEARCH_KEY property if possible.
-	 *
-	 * @param string $searchKey
-	 *
-	 * @see https://jira.z-hub.io/browse/ZP-1178
-	 *
-	 * @return string
-	 */
-	private function getEmailAddressFromSearchKey($searchKey) {
-		if (strpos($searchKey, ':') !== false && strpos($searchKey, '@') !== false) {
-			SLog::Write(LOGLEVEL_INFO, "MAPIProvider->getEmailAddressFromSearchKey(): fall back to PR_SEARCH_KEY or PR_SENT_REPRESENTING_SEARCH_KEY to resolve user and get email address");
-
-			return trim(strtolower(explode(':', $searchKey)[1]));
-		}
-
-		return "";
-	}
-
-	/**
-	 * Returns categories for a message.
-	 *
-	 * @param binary $parentsourcekey
-	 * @param binary $sourcekey
-	 *
-	 * @return array or false on failure
-	 */
-	public function GetMessageCategories($parentsourcekey, $sourcekey) {
-		$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $parentsourcekey, $sourcekey);
-		if (!$entryid) {
-			SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->GetMessageCategories(): Couldn't retrieve message, sourcekey: '%s', parentsourcekey: '%s'", bin2hex($sourcekey), bin2hex($parentsourcekey)));
-
-			return false;
-		}
-		$mapimessage = mapi_msgstore_openentry($this->store, $entryid);
-		$emailMapping = MAPIMapping::GetEmailMapping();
-		$emailMapping = ["categories" => $emailMapping["categories"]];
-		$messageCategories = $this->getProps($mapimessage, $emailMapping);
-		if (isset($messageCategories[$emailMapping["categories"]]) && is_array($messageCategories[$emailMapping["categories"]])) {
-			return $messageCategories[$emailMapping["categories"]];
-		}
-
-		return false;
-	}
+    /**
+     * Returns the timestamp offset.
+     *
+     * @param string $ts
+     *
+     * @return long
+     */
+    private function GetTZOffset($ts) {
+        $Offset = date("O", $ts);
+
+        $Parity = $Offset < 0 ? -1 : 1;
+        $Offset = $Parity * $Offset;
+        $Offset = ($Offset - ($Offset % 100)) / 100 * 60 + $Offset % 100;
+
+        return $Parity * $Offset;
+    }
+
+    /**
+     * Localtime of the timestamp.
+     *
+     * @param long $time
+     *
+     * @return array
+     */
+    private function gmtime($time) {
+        $TZOffset = $this->GetTZOffset($time);
+
+        $t_time = $time - $TZOffset * 60; # Counter adjust for localtime()
+
+        return localtime($t_time, 1);
+    }
+
+    /**
+     * Sets the properties in a MAPI object according to an Sync object and a property mapping.
+     *
+     * @param mixed      $mapimessage
+     * @param SyncObject $message
+     * @param array      $mapping
+     *
+     * @return
+     */
+    private function setPropsInMAPI($mapimessage, $message, $mapping) {
+        $mapiprops = $this->getPropIdsFromStrings($mapping);
+        $unsetVars = $message->getUnsetVars();
+        $propsToDelete = [];
+        $propsToSet = [];
+
+        foreach ($mapiprops as $asprop => $mapiprop) {
+            if (isset($message->{$asprop})) {
+                // UTF8->windows1252.. this is ok for all numerical values
+                if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
+                    if (is_array($message->{$asprop})) {
+                        $value = array_map("u2wi", $message->{$asprop});
+                    }
+                    else {
+                        $value = u2wi($message->{$asprop});
+                    }
+                }
+                else {
+                    $value = $message->{$asprop};
+                }
+
+                // Make sure the php values are the correct type
+                switch (mapi_prop_type($mapiprop)) {
+                    case PT_BINARY:
+                    case PT_STRING8:
+                        settype($value, "string");
+                        break;
+
+                    case PT_BOOLEAN:
+                        settype($value, "boolean");
+                        break;
+
+                    case PT_SYSTIME:
+                    case PT_LONG:
+                        settype($value, "integer");
+                        break;
+                }
+
+                // decode base64 value
+                if ($mapiprop == PR_RTF_COMPRESSED) {
+                    $value = base64_decode($value);
+                    if (strlen($value) == 0) {
+                        continue;
+                    } // PDA will sometimes give us an empty RTF, which we'll ignore.
+
+                    // Note that you can still remove notes because when you remove notes it gives
+                    // a valid compressed RTF with nothing in it.
+                }
+                // if an "empty array" is to be saved, it the mvprop should be deleted - fixes Mantis #468
+                if (is_array($value) && empty($value)) {
+                    $propsToDelete[] = $mapiprop;
+                    SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->setPropsInMAPI(): Property '%s' to be deleted as it is an empty array", $asprop));
+                }
+                else {
+                    // all properties will be set at once
+                    $propsToSet[$mapiprop] = $value;
+                }
+            }
+            elseif (in_array($asprop, $unsetVars)) {
+                $propsToDelete[] = $mapiprop;
+            }
+        }
+
+        mapi_setprops($mapimessage, $propsToSet);
+        if (mapi_last_hresult()) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("Failed to set properties, trying to set them separately. Error code was:%x", mapi_last_hresult()));
+            $this->setPropsIndividually($mapimessage, $propsToSet, $mapiprops);
+        }
+
+        mapi_deleteprops($mapimessage, $propsToDelete);
+
+        // clean up
+        unset($unsetVars, $propsToDelete);
+    }
+
+    /**
+     * Sets the properties one by one in a MAPI object.
+     *
+     * @param mixed &$mapimessage
+     * @param array &$propsToSet
+     * @param array &$mapiprops
+     *
+     * @return
+     */
+    private function setPropsIndividually(&$mapimessage, &$propsToSet, &$mapiprops) {
+        foreach ($propsToSet as $prop => $value) {
+            mapi_setprops($mapimessage, [$prop => $value]);
+            if (mapi_last_hresult()) {
+                SLog::Write(LOGLEVEL_ERROR, sprintf("Failed setting property [%s] with value [%s], error code was:%x", array_search($prop, $mapiprops), $value, mapi_last_hresult()));
+            }
+        }
+    }
+
+    /**
+     * Gets the properties from a MAPI object and sets them in the Sync object according to mapping.
+     *
+     * @param SyncObject &$message
+     * @param mixed      $mapimessage
+     * @param array      $mapping
+     *
+     * @return
+     */
+    private function getPropsFromMAPI(&$message, $mapimessage, $mapping) {
+        $messageprops = $this->getProps($mapimessage, $mapping);
+        foreach ($mapping as $asprop => $mapiprop) {
+            // Get long strings via openproperty
+            if (isset($messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))])) {
+                if ($messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))] == MAPI_E_NOT_ENOUGH_MEMORY_32BIT ||
+                    $messageprops[mapi_prop_tag(PT_ERROR, mapi_prop_id($mapiprop))] == MAPI_E_NOT_ENOUGH_MEMORY_64BIT) {
+                    $messageprops[$mapiprop] = MAPIUtils::readPropStream($mapimessage, $mapiprop);
+                }
+            }
+
+            if (isset($messageprops[$mapiprop])) {
+                if (mapi_prop_type($mapiprop) == PT_BOOLEAN) {
+                    // Force to actual '0' or '1'
+                    if ($messageprops[$mapiprop]) {
+                        $message->{$asprop} = 1;
+                    }
+                    else {
+                        $message->{$asprop} = 0;
+                    }
+                }
+                else {
+                    // Special handling for PR_MESSAGE_FLAGS
+                    if ($mapiprop == PR_MESSAGE_FLAGS) {
+                        $message->{$asprop} = $messageprops[$mapiprop] & 1;
+                    } // only look at 'read' flag
+                    elseif ($mapiprop == PR_RTF_COMPRESSED) {
+                        // do not send rtf to the mobile
+                        continue;
+                    }
+                    elseif (is_array($messageprops[$mapiprop])) {
+                        $message->{$asprop} = array_map("w2u", $messageprops[$mapiprop]);
+                    }
+                    else {
+                        if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
+                            $message->{$asprop} = w2u($messageprops[$mapiprop]);
+                        }
+                        else {
+                            $message->{$asprop} = $messageprops[$mapiprop];
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Wraps getPropIdsFromStrings() calls.
+     *
+     * @param mixed &$mapiprops
+     *
+     * @return
+     */
+    private function getPropIdsFromStrings(&$mapiprops) {
+        return getPropIdsFromStrings($this->store, $mapiprops);
+    }
+
+    /**
+     * Wraps mapi_getprops() calls.
+     *
+     * @param mixed &$mapiprops
+     * @param mixed $mapimessage
+     * @param mixed $mapiproperties
+     *
+     * @return
+     */
+    protected function getProps($mapimessage, &$mapiproperties) {
+        $mapiproperties = $this->getPropIdsFromStrings($mapiproperties);
+
+        return mapi_getprops($mapimessage, $mapiproperties);
+    }
+
+    /**
+     * Returns an GMT timezone array.
+     *
+     * @return array
+     */
+    private function getGMTTZ() {
+        return [
+            "bias" => 0,
+            "tzname" => "",
+            "dstendyear" => 0,
+            "dstendmonth" => 10,
+            "dstendday" => 0,
+            "dstendweek" => 5,
+            "dstendhour" => 2,
+            "dstendminute" => 0,
+            "dstendsecond" => 0,
+            "dstendmillis" => 0,
+            "stdbias" => 0,
+            "tznamedst" => "",
+            "dststartyear" => 0,
+            "dststartmonth" => 3,
+            "dststartday" => 0,
+            "dststartweek" => 5,
+            "dststarthour" => 1,
+            "dststartminute" => 0,
+            "dststartsecond" => 0,
+            "dststartmillis" => 0,
+            "dstbias" => -60,
+        ];
+    }
+
+    /**
+     * Unpack timezone info from MAPI.
+     *
+     * @param string $data
+     *
+     * @return array
+     */
+    private function getTZFromMAPIBlob($data) {
+        return unpack("lbias/lstdbias/ldstbias/" .
+                            "vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
+                            "vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis", $data);
+    }
+
+    /**
+     * Unpack timezone info from Sync.
+     *
+     * @param string $data
+     *
+     * @return array
+     */
+    private function getTZFromSyncBlob($data) {
+        $tz = unpack("lbias/a64tzname/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
+                        "lstdbias/a64tznamedst/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/" .
+                        "ldstbias", $data);
+
+        // Make the structure compatible with class.recurrence.php
+        $tz["timezone"] = $tz["bias"];
+        $tz["timezonedst"] = $tz["dstbias"];
+
+        return $tz;
+    }
+
+    /**
+     * Pack timezone info for MAPI.
+     *
+     * @param array $tz
+     *
+     * @return string
+     */
+    private function getMAPIBlobFromTZ($tz) {
+        return pack(
+            "lll" . "vvvvvvvvv" . "vvvvvvvvv",
+            $tz["bias"],
+            $tz["stdbias"],
+            $tz["dstbias"],
+            0,
+            0,
+            $tz["dstendmonth"],
+            $tz["dstendday"],
+            $tz["dstendweek"],
+            $tz["dstendhour"],
+            $tz["dstendminute"],
+            $tz["dstendsecond"],
+            $tz["dstendmillis"],
+            0,
+            0,
+            $tz["dststartmonth"],
+            $tz["dststartday"],
+            $tz["dststartweek"],
+            $tz["dststarthour"],
+            $tz["dststartminute"],
+            $tz["dststartsecond"],
+            $tz["dststartmillis"]
+        );
+    }
+
+    /**
+     * Checks the date to see if it is in DST, and returns correct GMT date accordingly.
+     *
+     * @param long  $localtime
+     * @param array $tz
+     *
+     * @return long
+     */
+    private function getGMTTimeByTZ($localtime, $tz) {
+        if (!isset($tz) || !is_array($tz)) {
+            return $localtime;
+        }
+
+        if ($this->isDST($localtime, $tz)) {
+            return $localtime + $tz["bias"] * 60 + $tz["dstbias"] * 60;
+        }
+
+        return $localtime + $tz["bias"] * 60;
+    }
+
+    /**
+     * Returns the local time for the given GMT time, taking account of the given timezone.
+     *
+     * @param long  $gmttime
+     * @param array $tz
+     *
+     * @return long
+     */
+    private function getLocaltimeByTZ($gmttime, $tz) {
+        if (!isset($tz) || !is_array($tz)) {
+            return $gmttime;
+        }
+
+        if ($this->isDST($gmttime - $tz["bias"] * 60, $tz)) { // may bug around the switch time because it may have to be 'gmttime - bias - dstbias'
+            return $gmttime - $tz["bias"] * 60 - $tz["dstbias"] * 60;
+        }
+
+        return $gmttime - $tz["bias"] * 60;
+    }
+
+    /**
+     * Returns TRUE if it is the summer and therefore DST is in effect.
+     *
+     * @param long  $localtime
+     * @param array $tz
+     *
+     * @return bool
+     */
+    private function isDST($localtime, $tz) {
+        if (!isset($tz) || !is_array($tz) ||
+            !isset($tz["dstbias"]) || $tz["dstbias"] == 0 ||
+            !isset($tz["dststartmonth"]) || $tz["dststartmonth"] == 0 ||
+            !isset($tz["dstendmonth"]) || $tz["dstendmonth"] == 0) {
+            return false;
+        }
+
+        $year = gmdate("Y", $localtime);
+        $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)
+            if ($localtime >= $start && $localtime < $end) {
+                $dst = true;
+            }
+            else {
+                $dst = false;
+            }
+        }
+        else {
+            // southern hemisphere (january = dst)
+            if ($localtime >= $end && $localtime < $start) {
+                $dst = false;
+            }
+            else {
+                $dst = true;
+            }
+        }
+
+        return $dst;
+    }
+
+    /**
+     * Returns the local timestamp for the $week'th $wday of $month in $year at $hour:$minute:$second.
+     *
+     * @param int $year
+     * @param int $month
+     * @param int $week
+     * @param int $wday
+     * @param int $hour
+     * @param int $minute
+     * @param int $second
+     *
+     * @return long
+     */
+    private function getTimestampOfWeek($year, $month, $week, $wday, $hour, $minute, $second) {
+        if ($month == 0) {
+            return;
+        }
+
+        $date = gmmktime($hour, $minute, $second, $month, 1, $year);
+
+        // Find first day in month which matches day of the week
+        while (1) {
+            $wdaynow = gmdate("w", $date);
+            if ($wdaynow == $wday) {
+                break;
+            }
+            $date += 24 * 60 * 60;
+        }
+
+        // Forward $week weeks (may 'overflow' into the next month)
+        $date = $date + $week * (24 * 60 * 60 * 7);
+
+        // Reverse 'overflow'. Eg week '10' will always be the last week of the month in which the
+        // specified weekday exists
+        while (1) {
+            $monthnow = gmdate("n", $date); // gmdate returns 1-12
+            if ($monthnow > $month) {
+                $date = $date - (24 * 7 * 60 * 60);
+            }
+            else {
+                break;
+            }
+        }
+
+        return $date;
+    }
+
+    /**
+     * Normalize the given timestamp to the start of the day.
+     *
+     * @param long $timestamp
+     *
+     * @return long
+     */
+    private function getDayStartOfTimestamp($timestamp) {
+        return $timestamp - ($timestamp % (60 * 60 * 24));
+    }
+
+    /**
+     * Returns an SMTP address from an entry id.
+     *
+     * @param string $entryid
+     *
+     * @return string
+     */
+    private function getSMTPAddressFromEntryID($entryid) {
+        $addrbook = $this->getAddressbook();
+
+        $mailuser = mapi_ab_openentry($addrbook, $entryid);
+        if (!$mailuser) {
+            return "";
+        }
+
+        $props = mapi_getprops($mailuser, [PR_ADDRTYPE, PR_SMTP_ADDRESS, PR_EMAIL_ADDRESS]);
+
+        $addrtype = isset($props[PR_ADDRTYPE]) ? $props[PR_ADDRTYPE] : "";
+
+        if (isset($props[PR_SMTP_ADDRESS])) {
+            return $props[PR_SMTP_ADDRESS];
+        }
+
+        if ($addrtype == "SMTP" && isset($props[PR_EMAIL_ADDRESS])) {
+            return $props[PR_EMAIL_ADDRESS];
+        }
+        if ($addrtype == "ZARAFA" && isset($props[PR_EMAIL_ADDRESS])) {
+            $userinfo = nsp_getuserinfo($props[PR_EMAIL_ADDRESS]);
+            if (is_array($userinfo) && isset($userinfo["primary_email"])) {
+                return $userinfo["primary_email"];
+            }
+        }
+
+        return "";
+    }
+
+    /**
+     * Returns fullname from an entryid.
+     *
+     * @param binary $entryid
+     *
+     * @return string fullname or false on error
+     */
+    private function getFullnameFromEntryID($entryid) {
+        $addrbook = $this->getAddressbook();
+        $mailuser = mapi_ab_openentry($addrbook, $entryid);
+        if (!$mailuser) {
+            SLog::Write(LOGLEVEL_ERROR, sprintf("Unable to get mailuser for getFullnameFromEntryID (0x%X)", mapi_last_hresult()));
+
+            return false;
+        }
+
+        $props = mapi_getprops($mailuser, [PR_DISPLAY_NAME]);
+        if (isset($props[PR_DISPLAY_NAME])) {
+            return $props[PR_DISPLAY_NAME];
+        }
+        SLog::Write(LOGLEVEL_ERROR, sprintf("Unable to get fullname for getFullnameFromEntryID (0x%X)", mapi_last_hresult()));
+
+        return false;
+    }
+
+    /**
+     * Builds a displayname from several separated values.
+     *
+     * @param SyncContact $contact
+     *
+     * @return string
+     */
+    private function composeDisplayName(&$contact) {
+        // Set display name and subject to a combined value of firstname and lastname
+        $cname = (isset($contact->prefix)) ? u2w($contact->prefix) . " " : "";
+        $cname .= u2w($contact->firstname);
+        $cname .= (isset($contact->middlename)) ? " " . u2w($contact->middlename) : "";
+        $cname .= " " . u2w($contact->lastname);
+        $cname .= (isset($contact->suffix)) ? " " . u2w($contact->suffix) : "";
+
+        return trim($cname);
+    }
+
+    /**
+     * Sets all dependent properties for an email address.
+     *
+     * @param string $emailAddress
+     * @param string $displayName
+     * @param int    $cnt
+     * @param array  &$props
+     * @param array  &$properties
+     * @param array  &$nremails
+     * @param int    &$abprovidertype
+     *
+     * @return
+     */
+    private function setEmailAddress($emailAddress, $displayName, $cnt, &$props, &$properties, &$nremails, &$abprovidertype) {
+        if (isset($emailAddress)) {
+            $name = (isset($displayName)) ? $displayName : $emailAddress;
+
+            $props[$properties["emailaddress{$cnt}"]] = $emailAddress;
+            $props[$properties["emailaddressdemail{$cnt}"]] = $emailAddress;
+            $props[$properties["emailaddressdname{$cnt}"]] = $name;
+            $props[$properties["emailaddresstype{$cnt}"]] = "SMTP";
+            $props[$properties["emailaddressentryid{$cnt}"]] = mapi_createoneoff($name, "SMTP", $emailAddress);
+            $nremails[] = $cnt - 1;
+            $abprovidertype |= 2 ^ ($cnt - 1);
+        }
+    }
+
+    /**
+     * Sets the properties for an address string.
+     *
+     * @param string $type        which address is being set
+     * @param string $city
+     * @param string $country
+     * @param string $postalcode
+     * @param string $state
+     * @param string $street
+     * @param array  &$props
+     * @param array  &$properties
+     *
+     * @return
+     */
+    private function setAddress($type, &$city, &$country, &$postalcode, &$state, &$street, &$props, &$properties) {
+        if (isset($city)) {
+            $props[$properties[$type . "city"]] = $city = u2w($city);
+        }
+
+        if (isset($country)) {
+            $props[$properties[$type . "country"]] = $country = u2w($country);
+        }
+
+        if (isset($postalcode)) {
+            $props[$properties[$type . "postalcode"]] = $postalcode = u2w($postalcode);
+        }
+
+        if (isset($state)) {
+            $props[$properties[$type . "state"]] = $state = u2w($state);
+        }
+
+        if (isset($street)) {
+            $props[$properties[$type . "street"]] = $street = u2w($street);
+        }
+
+        // set composed address
+        $address = Utils::BuildAddressString($street, $postalcode, $city, $state, $country);
+        if ($address) {
+            $props[$properties[$type . "address"]] = $address;
+        }
+    }
+
+    /**
+     * Sets the properties for a mailing address.
+     *
+     * @param string $city
+     * @param string $country
+     * @param string $postalcode
+     * @param string $state
+     * @param string $street
+     * @param string $address
+     * @param array  &$props
+     * @param array  &$properties
+     *
+     * @return
+     */
+    private function setMailingAddress($city, $country, $postalcode, $state, $street, $address, &$props, &$properties) {
+        if (isset($city)) {
+            $props[$properties["city"]] = $city;
+        }
+        if (isset($country)) {
+            $props[$properties["country"]] = $country;
+        }
+        if (isset($postalcode)) {
+            $props[$properties["postalcode"]] = $postalcode;
+        }
+        if (isset($state)) {
+            $props[$properties["state"]] = $state;
+        }
+        if (isset($street)) {
+            $props[$properties["street"]] = $street;
+        }
+        if (isset($address)) {
+            $props[$properties["postaladdress"]] = $address;
+        }
+    }
+
+    /**
+     * Sets data in a recurrence array.
+     *
+     * @param SyncObject $message
+     * @param array      &$recur
+     *
+     * @return
+     */
+    private function setRecurrence($message, &$recur) {
+        if (isset($message->complete)) {
+            $recur["complete"] = $message->complete;
+        }
+
+        if (!isset($message->recurrence->interval)) {
+            $message->recurrence->interval = 1;
+        }
+
+        // set the default value of numoccur
+        $recur["numoccur"] = 0;
+        // a place holder for recurrencetype property
+        $recur["recurrencetype"] = 0;
+
+        switch ($message->recurrence->type) {
+            case 0:
+                $recur["type"] = 10;
+                if (isset($message->recurrence->dayofweek)) {
+                    $recur["subtype"] = 1;
+                }
+                else {
+                    $recur["subtype"] = 0;
+                }
+
+                $recur["everyn"] = $message->recurrence->interval * (60 * 24);
+                $recur["recurrencetype"] = 1;
+                break;
+
+            case 1:
+                $recur["type"] = 11;
+                $recur["subtype"] = 1;
+                $recur["everyn"] = $message->recurrence->interval;
+                $recur["recurrencetype"] = 2;
+                break;
+
+            case 2:
+                $recur["type"] = 12;
+                $recur["subtype"] = 2;
+                $recur["everyn"] = $message->recurrence->interval;
+                $recur["recurrencetype"] = 3;
+                break;
+
+            case 3:
+                $recur["type"] = 12;
+                $recur["subtype"] = 3;
+                $recur["everyn"] = $message->recurrence->interval;
+                $recur["recurrencetype"] = 3;
+                break;
+
+            case 4:
+                $recur["type"] = 13;
+                $recur["subtype"] = 1;
+                $recur["everyn"] = $message->recurrence->interval * 12;
+                $recur["recurrencetype"] = 4;
+                break;
+
+            case 5:
+                $recur["type"] = 13;
+                $recur["subtype"] = 2;
+                $recur["everyn"] = $message->recurrence->interval * 12;
+                $recur["recurrencetype"] = 4;
+                break;
+
+            case 6:
+                $recur["type"] = 13;
+                $recur["subtype"] = 3;
+                $recur["everyn"] = $message->recurrence->interval * 12;
+                $recur["recurrencetype"] = 4;
+                break;
+        }
+
+        // "start" and "end" are in GMT when passing to class.recurrence
+        $recur["end"] = $this->getDayStartOfTimestamp(0x7FFFFFFF); // Maximum GMT value for end by default
+
+        if (isset($message->recurrence->until)) {
+            $recur["term"] = 0x21;
+            $recur["end"] = $message->recurrence->until;
+        }
+        elseif (isset($message->recurrence->occurrences)) {
+            $recur["term"] = 0x22;
+            $recur["numoccur"] = $message->recurrence->occurrences;
+        }
+        else {
+            $recur["term"] = 0x23;
+        }
+
+        if (isset($message->recurrence->dayofweek)) {
+            $recur["weekdays"] = $message->recurrence->dayofweek;
+        }
+        if (isset($message->recurrence->weekofmonth)) {
+            $recur["nday"] = $message->recurrence->weekofmonth;
+        }
+        if (isset($message->recurrence->monthofyear)) {
+            // MAPI stores months as the amount of minutes until the beginning of the month in a
+            // non-leapyear. Why this is, is totally unclear.
+            $monthminutes = [0, 44640, 84960, 129600, 172800, 217440, 260640, 305280, 348480, 393120, 437760, 480960];
+            $recur["month"] = $monthminutes[$message->recurrence->monthofyear - 1];
+        }
+        if (isset($message->recurrence->dayofmonth)) {
+            $recur["monthday"] = $message->recurrence->dayofmonth;
+        }
+    }
+
+    /**
+     * Extracts the email address (mailbox@host) from an email address because
+     * some devices send email address as "Firstname Lastname" <email@me.com>.
+     *
+     *  @see http://developer.berlios.de/mantis/view.php?id=486
+     *
+     *  @param string           $email
+     *
+     *  @return string or false on error
+     */
+    private function extractEmailAddress($email) {
+        if (!isset($this->zRFC822)) {
+            $this->zRFC822 = new Mail_RFC822();
+        }
+        $parsedAddress = $this->zRFC822->parseAddressList($email);
+        if (!isset($parsedAddress[0]->mailbox) || !isset($parsedAddress[0]->host)) {
+            return false;
+        }
+
+        return $parsedAddress[0]->mailbox . '@' . $parsedAddress[0]->host;
+    }
+
+    /**
+     * Returns the message body for a required format.
+     *
+     * @param MAPIMessage $mapimessage
+     * @param int         $bpReturnType
+     * @param SyncObject  $message
+     *
+     * @return bool
+     */
+    private function setMessageBodyForType($mapimessage, $bpReturnType, &$message) {
+        $truncateHtmlSafe = false;
+        // default value is PR_BODY
+        $property = PR_BODY;
+
+        switch ($bpReturnType) {
+            case SYNC_BODYPREFERENCE_HTML:
+                $property = PR_HTML;
+                $truncateHtmlSafe = true;
+                break;
+
+            case SYNC_BODYPREFERENCE_RTF:
+                $property = PR_RTF_COMPRESSED;
+                break;
+
+            case SYNC_BODYPREFERENCE_MIME:
+                $stat = $this->imtoinet($mapimessage, $message);
+                if (isset($message->asbody)) {
+                    $message->asbody->type = $bpReturnType;
+                }
+
+                return $stat;
+        }
+
+        $stream = mapi_openproperty($mapimessage, $property, IID_IStream, 0, 0);
+        if ($stream) {
+            $stat = mapi_stream_stat($stream);
+            $streamsize = $stat['cb'];
+        }
+        else {
+            $streamsize = 0;
+        }
+
+        // set the properties according to supported AS version
+        if (Request::GetProtocolVersion() >= 12.0) {
+            $message->asbody = new SyncBaseBody();
+            $message->asbody->type = $bpReturnType;
+            if ($bpReturnType == SYNC_BODYPREFERENCE_RTF) {
+                $body = $this->mapiReadStream($stream, $streamsize);
+                $message->asbody->data = StringStreamWrapper::Open(base64_encode($body));
+            }
+            elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
+                // if PR_HTML is UTF-8 we can stream it directly, else we have to convert to UTF-8 & wrap it
+                if ($message->internetcpid == INTERNET_CPID_UTF8) {
+                    $message->asbody->data = MAPIStreamWrapper::Open($stream, $truncateHtmlSafe);
+                }
+                else {
+                    $body = $this->mapiReadStream($stream, $streamsize);
+                    $message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body), $truncateHtmlSafe);
+                    $message->internetcpid = INTERNET_CPID_UTF8;
+                }
+            }
+            else {
+                $message->asbody->data = MAPIStreamWrapper::Open($stream);
+            }
+            $message->asbody->estimatedDataSize = $streamsize;
+        }
+        else {
+            $body = $this->mapiReadStream($stream, $streamsize);
+            $message->body = str_replace("\n", "\r\n", w2u(str_replace("\r", "", $body)));
+            $message->bodysize = $streamsize;
+            $message->bodytruncated = 0;
+        }
+
+        return true;
+    }
+
+    /**
+     * Reads from a mapi stream, if it's set. If not, returns an empty string.
+     *
+     * @param resource $stream
+     * @param int      $size
+     *
+     * @return string
+     */
+    private function mapiReadStream($stream, $size) {
+        if (!$stream || $size == 0) {
+            return "";
+        }
+
+        return mapi_stream_read($stream, $size);
+    }
+
+    /**
+     * A wrapper for mapi_inetmapi_imtoinet function.
+     *
+     * @param MAPIMessage $mapimessage
+     * @param SyncObject  $message
+     *
+     * @return bool
+     */
+    private function imtoinet($mapimessage, &$message) {
+        $mapiEmail = mapi_getprops($mapimessage, [PR_EC_IMAP_EMAIL]);
+        $stream = false;
+        if (isset($mapiEmail[PR_EC_IMAP_EMAIL]) || MAPIUtils::GetError(PR_EC_IMAP_EMAIL, $mapiEmail) == MAPI_E_NOT_ENOUGH_MEMORY) {
+            $stream = mapi_openproperty($mapimessage, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
+            SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->imtoinet(): using PR_EC_IMAP_EMAIL as full RFC822 message");
+        }
+        else {
+            $addrbook = $this->getAddressbook();
+            $stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $mapimessage, ['use_tnef' => -1, 'ignore_missing_attachments' => 1]);
+        }
+        if (is_resource($stream)) {
+            $mstreamstat = mapi_stream_stat($stream);
+            $streamsize = $mstreamstat["cb"];
+            if (isset($streamsize)) {
+                if (Request::GetProtocolVersion() >= 12.0) {
+                    if (!isset($message->asbody)) {
+                        $message->asbody = new SyncBaseBody();
+                    }
+                    $message->asbody->data = MAPIStreamWrapper::Open($stream);
+                    $message->asbody->estimatedDataSize = $streamsize;
+                    $message->asbody->truncated = 0;
+                }
+                else {
+                    $message->mimedata = MAPIStreamWrapper::Open($stream);
+                    $message->mimesize = $streamsize;
+                    $message->mimetruncated = 0;
+                }
+                unset($message->body, $message->bodytruncated);
+
+                return true;
+            }
+        }
+        SLog::Write(LOGLEVEL_ERROR, "MAPIProvider->imtoinet(): got no stream or content from mapi_inetmapi_imtoinet()");
+
+        return false;
+    }
+
+    /**
+     * Sets the message body.
+     *
+     * @param MAPIMessage       $mapimessage
+     * @param ContentParameters $contentparameters
+     * @param SyncObject        $message
+     */
+    private function setMessageBody($mapimessage, $contentparameters, &$message) {
+        // get the available body preference types
+        $bpTypes = $contentparameters->GetBodyPreference();
+        if ($bpTypes !== false) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("BodyPreference types: %s", implode(', ', $bpTypes)));
+            // do not send mime data if the client requests it
+            if (($contentparameters->GetMimeSupport() == SYNC_MIMESUPPORT_NEVER) && ($key = array_search(SYNC_BODYPREFERENCE_MIME, $bpTypes) !== false)) {
+                unset($bpTypes[$key]);
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("Remove mime body preference type because the device required no mime support. BodyPreference types: %s", implode(', ', $bpTypes)));
+            }
+            // get the best fitting preference type
+            $bpReturnType = Utils::GetBodyPreferenceBestMatch($bpTypes);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("GetBodyPreferenceBestMatch: %d", $bpReturnType));
+            $bpo = $contentparameters->BodyPreference($bpReturnType);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("bpo: truncation size:'%d', allornone:'%d', preview:'%d'", $bpo->GetTruncationSize(), $bpo->GetAllOrNone(), $bpo->GetPreview()));
+
+            // Android Blackberry expects a full mime message for signed emails
+            // @see https://jira.z-hub.io/projects/ZP/issues/ZP-1154
+            // @TODO change this when refactoring
+            $props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS]);
+            if (isset($props[PR_MESSAGE_CLASS]) &&
+                    stripos($props[PR_MESSAGE_CLASS], 'IPM.Note.SMIME.MultipartSigned') !== false &&
+                    ($key = array_search(SYNC_BODYPREFERENCE_MIME, $bpTypes) !== false)) {
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->setMessageBody(): enforcing SYNC_BODYPREFERENCE_MIME type for a signed message"));
+                $bpReturnType = SYNC_BODYPREFERENCE_MIME;
+            }
+
+            $this->setMessageBodyForType($mapimessage, $bpReturnType, $message);
+            // only set the truncation size data if device set it in request
+            if ($bpo->GetTruncationSize() != false &&
+                    $bpReturnType != SYNC_BODYPREFERENCE_MIME &&
+                    $message->asbody->estimatedDataSize > $bpo->GetTruncationSize()
+                ) {
+                // Truncated plaintext requests are used on iOS for the preview in the email list. All images and links should be removed - see https://jira.z-hub.io/browse/ZP-1025
+                if ($bpReturnType == SYNC_BODYPREFERENCE_PLAIN) {
+                    SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->setMessageBody(): truncated plain-text body requested, stripping all links and images");
+                    // Get more data because of the filtering it's most probably going down in size. It's going to be truncated to the correct size below.
+                    $plainbody = stream_get_contents($message->asbody->data, $bpo->GetTruncationSize() * 5);
+                    $message->asbody->data = StringStreamWrapper::Open(preg_replace('/<http(s){0,1}:\/\/.*?>/i', '', $plainbody));
+                }
+
+                // truncate data stream
+                ftruncate($message->asbody->data, $bpo->GetTruncationSize());
+                $message->asbody->truncated = 1;
+            }
+            // set the preview or windows phones won't show the preview of an email
+            if (Request::GetProtocolVersion() >= 14.0 && $bpo->GetPreview()) {
+                $message->asbody->preview = Utils::Utf8_truncate(MAPIUtils::readPropStream($mapimessage, PR_BODY), $bpo->GetPreview());
+            }
+        }
+        else {
+            // Override 'body' for truncation
+            $truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
+            $this->setMessageBodyForType($mapimessage, SYNC_BODYPREFERENCE_PLAIN, $message);
+
+            if ($message->bodysize > $truncsize) {
+                $message->body = Utils::Utf8_truncate($message->body, $truncsize);
+                $message->bodytruncated = 1;
+            }
+
+            if (!isset($message->body) || strlen($message->body) == 0) {
+                $message->body = " ";
+            }
+
+            if ($contentparameters->GetMimeSupport() == SYNC_MIMESUPPORT_ALWAYS) {
+                // set the html body for iphone in AS 2.5 version
+                $this->imtoinet($mapimessage, $message);
+            }
+        }
+    }
+
+    /**
+     * Sets properties for an email message.
+     *
+     * @param mixed    $mapimessage
+     * @param SyncMail $message
+     */
+    private function setFlag($mapimessage, &$message) {
+        // do nothing if protocol version is lower than 12.0 as flags haven't been defined before
+        if (Request::GetProtocolVersion() < 12.0) {
+            return;
+        }
+
+        $message->flag = new SyncMailFlags();
+
+        $this->getPropsFromMAPI($message->flag, $mapimessage, MAPIMapping::GetMailFlagsMapping());
+    }
+
+    /**
+     * Sets information from SyncBaseBody type for a MAPI message.
+     *
+     * @param SyncBaseBody $asbody
+     * @param array        $props
+     * @param array        $appointmentprops
+     */
+    private function setASbody($asbody, &$props, $appointmentprops) {
+        // TODO: fix checking for the length
+        if (isset($asbody->type, $asbody->data)   /* && strlen($asbody->data) > 0 */) {
+            switch ($asbody->type) {
+                case SYNC_BODYPREFERENCE_PLAIN:
+                default:
+                // set plain body if the type is not in valid range
+                    $props[$appointmentprops["body"]] = stream_get_contents($asbody->data);
+                    break;
+
+                case SYNC_BODYPREFERENCE_HTML:
+                    $props[$appointmentprops["html"]] = stream_get_contents($asbody->data);
+                    break;
+
+                case SYNC_BODYPREFERENCE_RTF:
+                    break;
+
+                case SYNC_BODYPREFERENCE_MIME:
+                    break;
+            }
+        }
+        else {
+            SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->setASbody either type or data are not set. Setting to empty body");
+            $props[$appointmentprops["body"]] = "";
+        }
+    }
+
+    /**
+     * Get MAPI addressbook object.
+     *
+     * @return MAPIAddressbook object to be used with mapi_ab_* or false on failure
+     */
+    private function getAddressbook() {
+        if (isset($this->addressbook) && $this->addressbook) {
+            return $this->addressbook;
+        }
+        $this->addressbook = mapi_openaddressbook($this->session);
+        $result = mapi_last_hresult();
+        if ($result && $this->addressbook === false) {
+            SLog::Write(LOGLEVEL_ERROR, sprintf("MAPIProvider->getAddressbook error opening addressbook 0x%X", $result));
+
+            return false;
+        }
+
+        return $this->addressbook;
+    }
+
+    /**
+     * Gets the required store properties.
+     *
+     * @return array
+     */
+    public function GetStoreProps() {
+        if (!isset($this->storeProps) || empty($this->storeProps)) {
+            SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->GetStoreProps(): Getting store properties.");
+            $this->storeProps = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_OUTBOX_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID, PR_IPM_FAVORITES_ENTRYID, PR_MAILBOX_OWNER_ENTRYID]);
+            // make sure all properties are set
+            if (!isset($this->storeProps[PR_IPM_WASTEBASKET_ENTRYID])) {
+                $this->storeProps[PR_IPM_WASTEBASKET_ENTRYID] = false;
+            }
+            if (!isset($this->storeProps[PR_IPM_SENTMAIL_ENTRYID])) {
+                $this->storeProps[PR_IPM_SENTMAIL_ENTRYID] = false;
+            }
+            if (!isset($this->storeProps[PR_IPM_OUTBOX_ENTRYID])) {
+                $this->storeProps[PR_IPM_OUTBOX_ENTRYID] = false;
+            }
+            if (!isset($this->storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID])) {
+                $this->storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID] = false;
+            }
+        }
+
+        return $this->storeProps;
+    }
+
+    /**
+     * Gets the required inbox properties.
+     *
+     * @return array
+     */
+    public function GetInboxProps() {
+        if (!isset($this->inboxProps) || empty($this->inboxProps)) {
+            SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->GetInboxProps(): Getting inbox properties.");
+            $this->inboxProps = [];
+            $inbox = mapi_msgstore_getreceivefolder($this->store);
+            if ($inbox) {
+                $this->inboxProps = mapi_getprops($inbox, [PR_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_TASK_ENTRYID, PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_JOURNAL_ENTRYID]);
+                // make sure all properties are set
+                if (!isset($this->inboxProps[PR_ENTRYID])) {
+                    $this->inboxProps[PR_ENTRYID] = false;
+                }
+                if (!isset($this->inboxProps[PR_IPM_DRAFTS_ENTRYID])) {
+                    $this->inboxProps[PR_IPM_DRAFTS_ENTRYID] = false;
+                }
+                if (!isset($this->inboxProps[PR_IPM_TASK_ENTRYID])) {
+                    $this->inboxProps[PR_IPM_TASK_ENTRYID] = false;
+                }
+                if (!isset($this->inboxProps[PR_IPM_APPOINTMENT_ENTRYID])) {
+                    $this->inboxProps[PR_IPM_APPOINTMENT_ENTRYID] = false;
+                }
+                if (!isset($this->inboxProps[PR_IPM_CONTACT_ENTRYID])) {
+                    $this->inboxProps[PR_IPM_CONTACT_ENTRYID] = false;
+                }
+                if (!isset($this->inboxProps[PR_IPM_NOTE_ENTRYID])) {
+                    $this->inboxProps[PR_IPM_NOTE_ENTRYID] = false;
+                }
+                if (!isset($this->inboxProps[PR_IPM_JOURNAL_ENTRYID])) {
+                    $this->inboxProps[PR_IPM_JOURNAL_ENTRYID] = false;
+                }
+            }
+        }
+
+        return $this->inboxProps;
+    }
+
+    /**
+     * Gets the required store root properties.
+     *
+     * @return array
+     */
+    private function getRootProps() {
+        if (!isset($this->rootProps)) {
+            $root = mapi_msgstore_openentry($this->store, null);
+            $this->rootProps = mapi_getprops($root, [PR_IPM_OL2007_ENTRYIDS]);
+        }
+
+        return $this->rootProps;
+    }
+
+    /**
+     * Returns an array with entryids of some special folders.
+     *
+     * @return array
+     */
+    private function getSpecialFoldersData() {
+        // The persist data of an entry in PR_IPM_OL2007_ENTRYIDS consists of:
+        //      PersistId - e.g. RSF_PID_SUGGESTED_CONTACTS (2 bytes)
+        //      DataElementsSize - size of DataElements field (2 bytes)
+        //      DataElements - array of PersistElement structures (variable size)
+        //          PersistElement Structure consists of
+        //              ElementID - e.g. RSF_ELID_ENTRYID (2 bytes)
+        //              ElementDataSize - size of ElementData (2 bytes)
+        //              ElementData - The data for the special folder identified by the PersistID (variable size)
+        if (empty($this->specialFoldersData)) {
+            $this->specialFoldersData = [];
+            $rootProps = $this->getRootProps();
+            if (isset($rootProps[PR_IPM_OL2007_ENTRYIDS])) {
+                $persistData = $rootProps[PR_IPM_OL2007_ENTRYIDS];
+                while (strlen($persistData) > 0) {
+                    // PERSIST_SENTINEL marks the end of the persist data
+                    if (strlen($persistData) == 4 && $persistData == PERSIST_SENTINEL) {
+                        break;
+                    }
+                    $unpackedData = unpack("vdataSize/velementID/velDataSize", substr($persistData, 2, 6));
+                    if (isset($unpackedData['dataSize'], $unpackedData['elementID']) && $unpackedData['elementID'] == RSF_ELID_ENTRYID && isset($unpackedData['elDataSize'])) {
+                        $this->specialFoldersData[] = substr($persistData, 8, $unpackedData['elDataSize']);
+                        // Add PersistId and DataElementsSize lengths to the data size as they're not part of it
+                        $persistData = substr($persistData, $unpackedData['dataSize'] + 4);
+                    }
+                    else {
+                        SLog::Write(LOGLEVEL_INFO, "MAPIProvider->getSpecialFoldersData(): persistent data is not valid");
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $this->specialFoldersData;
+    }
+
+    /**
+     * Extracts email address from PR_SEARCH_KEY property if possible.
+     *
+     * @param string $searchKey
+     *
+     * @see https://jira.z-hub.io/browse/ZP-1178
+     *
+     * @return string
+     */
+    private function getEmailAddressFromSearchKey($searchKey) {
+        if (strpos($searchKey, ':') !== false && strpos($searchKey, '@') !== false) {
+            SLog::Write(LOGLEVEL_INFO, "MAPIProvider->getEmailAddressFromSearchKey(): fall back to PR_SEARCH_KEY or PR_SENT_REPRESENTING_SEARCH_KEY to resolve user and get email address");
+
+            return trim(strtolower(explode(':', $searchKey)[1]));
+        }
+
+        return "";
+    }
+
+    /**
+     * Returns categories for a message.
+     *
+     * @param binary $parentsourcekey
+     * @param binary $sourcekey
+     *
+     * @return array or false on failure
+     */
+    public function GetMessageCategories($parentsourcekey, $sourcekey) {
+        $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $parentsourcekey, $sourcekey);
+        if (!$entryid) {
+            SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->GetMessageCategories(): Couldn't retrieve message, sourcekey: '%s', parentsourcekey: '%s'", bin2hex($sourcekey), bin2hex($parentsourcekey)));
+
+            return false;
+        }
+        $mapimessage = mapi_msgstore_openentry($this->store, $entryid);
+        $emailMapping = MAPIMapping::GetEmailMapping();
+        $emailMapping = ["categories" => $emailMapping["categories"]];
+        $messageCategories = $this->getProps($mapimessage, $emailMapping);
+        if (isset($messageCategories[$emailMapping["categories"]]) && is_array($messageCategories[$emailMapping["categories"]])) {
+            return $messageCategories[$emailMapping["categories"]];
+        }
+
+        return false;
+    }
 }

Spacing +29 added lines, -30 removed lines

@@ -462,7 +462,7 @@ 
 		switch ($recurrence->recur["type"]) {
 			case 10:
 				if ($recurrence->recur["subtype"] == 0) {
-					$syncRecurrence->interval = (int) ($recurrence->recur["everyn"] / 1440);
+					$syncRecurrence->interval = (int)($recurrence->recur["everyn"] / 1440);
 				}  // minutes
 				break;
 
@@ -472,7 +472,7 @@ 
 				break; // months / weeks
 
 			case 13:
-				$syncRecurrence->interval = (int) ($recurrence->recur["everyn"] / 12);
+				$syncRecurrence->interval = (int)($recurrence->recur["everyn"] / 12);
 				break; // months
 		}
 
@@ -483,7 +483,7 @@ 
 			$syncRecurrence->weekofmonth = $recurrence->recur["nday"];
 		} // N'th {DAY} of {X} (0-5)
 		if (isset($recurrence->recur["month"])) {
-			$syncRecurrence->monthofyear = (int) ($recurrence->recur["month"] / (60 * 24 * 29)) + 1;
+			$syncRecurrence->monthofyear = (int)($recurrence->recur["month"] / (60 * 24 * 29)) + 1;
 		} // works ok due to rounding. see also $monthminutes below (1-12)
 		if (isset($recurrence->recur["monthday"])) {
 			$syncRecurrence->dayofmonth = $recurrence->recur["monthday"];
@@ -637,10 +637,10 @@ 
 		}
 
 		if ($fromname) {
-			$from = "\"" . w2u($fromname) . "\" <" . w2u($fromaddr) . ">";
+			$from = "\"".w2u($fromname)."\" <".w2u($fromaddr).">";
 		}
 		else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
-			$from = "\"" . w2u($fromaddr) . "\" <" . w2u($fromaddr) . ">";
+			$from = "\"".w2u($fromaddr)."\" <".w2u($fromaddr).">";
 		}
 		// END CHANGED dw2412 HTC shows "error" if sender name is unknown
 
@@ -841,7 +841,7 @@ 
 					$mime = explode("/", $mimetype);
 
 					if (count($mime) == 2 && $mime[0] == "image") {
-						$attach->displayname = "inline." . $mime[1];
+						$attach->displayname = "inline.".$mime[1];
 					}
 				}
 
@@ -943,10 +943,10 @@ 
 			}
 			else {
 				if (substr($name, 0, 1) != '"' && substr($name, -1) != '"') {
-					$fulladdr = "\"" . w2u($name) . "\" <" . w2u($address) . ">";
+					$fulladdr = "\"".w2u($name)."\" <".w2u($address).">";
 				}
 				else {
-					$fulladdr = w2u($name) . "<" . w2u($address) . ">";
+					$fulladdr = w2u($name)."<".w2u($address).">";
 				}
 			}
 
@@ -1540,8 +1540,7 @@ 
 						if (isset($exception->asbody)) {
 							$this->setASbody($exception->asbody, $exceptionprops, $appointmentprops);
 							$mapiexception["body"] = $exceptionprops[$appointmentprops["body"]] =
-								(isset($exceptionprops[$appointmentprops["body"]])) ? $exceptionprops[$appointmentprops["body"]] :
-								((isset($exceptionprops[$appointmentprops["html"]])) ? $exceptionprops[$appointmentprops["html"]] : "");
+								(isset($exceptionprops[$appointmentprops["body"]])) ? $exceptionprops[$appointmentprops["body"]] : ((isset($exceptionprops[$appointmentprops["html"]])) ? $exceptionprops[$appointmentprops["html"]] : "");
 						}
 
 						array_push($recur["changed_occurrences"], $mapiexception);
@@ -1582,7 +1581,7 @@ 
 			$props[$appointmentprops["representingname"]] = ($displayname !== false) ? $displayname : Request::GetUser();
 			$props[$appointmentprops["sentrepresentingemail"]] = Request::GetUser();
 			$props[$appointmentprops["sentrepresentingaddt"]] = "ZARAFA";
-			$props[$appointmentprops["sentrepresentinsrchk"]] = $props[$appointmentprops["sentrepresentingaddt"]] . ":" . $props[$appointmentprops["sentrepresentingemail"]];
+			$props[$appointmentprops["sentrepresentinsrchk"]] = $props[$appointmentprops["sentrepresentingaddt"]].":".$props[$appointmentprops["sentrepresentingemail"]];
 
 			if (isset($appointment->attendees) && is_array($appointment->attendees) && !empty($appointment->attendees)) {
 				$props[$appointmentprops["icon"]] = 1026;
@@ -1616,7 +1615,7 @@ 
 			$org[PR_ADDRTYPE] = isset($representingprops[$appointmentprops["sentrepresentingaddt"]]) ? $representingprops[$appointmentprops["sentrepresentingaddt"]] : $props[$appointmentprops["sentrepresentingaddt"]];
 			$org[PR_SMTP_ADDRESS] = $org[PR_EMAIL_ADDRESS] = isset($representingprops[$appointmentprops["sentrepresentingemail"]]) ? $representingprops[$appointmentprops["sentrepresentingemail"]] : $props[$appointmentprops["sentrepresentingemail"]];
 			$org[PR_SEARCH_KEY] = isset($representingprops[$appointmentprops["sentrepresentinsrchk"]]) ? $representingprops[$appointmentprops["sentrepresentinsrchk"]] : $props[$appointmentprops["sentrepresentinsrchk"]];
-			$org[PR_RECIPIENT_FLAGS] = recipOrganizer | recipSendable;
+			$org[PR_RECIPIENT_FLAGS] = recipOrganizer|recipSendable;
 			$org[PR_RECIPIENT_TYPE] = MAPI_ORIG;
 
 			array_push($recips, $org);
@@ -1643,7 +1642,7 @@ 
 				}
 				else {
 					$recip[PR_DISPLAY_NAME] = u2w($attendee->name);
-					$recip[PR_SEARCH_KEY] = "SMTP:" . $recip[PR_EMAIL_ADDRESS] . "\0";
+					$recip[PR_SEARCH_KEY] = "SMTP:".$recip[PR_EMAIL_ADDRESS]."\0";
 					$recip[PR_ADDRTYPE] = "SMTP";
 					$recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
 					$recip[PR_ENTRYID] = mapi_createoneoff($recip[PR_DISPLAY_NAME], $recip[PR_ADDRTYPE], $recip[PR_EMAIL_ADDRESS]);
@@ -2194,8 +2193,8 @@ 
 	 * @return array
 	 */
 	private function getTZFromMAPIBlob($data) {
-		return unpack("lbias/lstdbias/ldstbias/" .
-						   "vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
+		return unpack("lbias/lstdbias/ldstbias/".
+						   "vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/".
 						   "vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis", $data);
 	}
 
@@ -2207,8 +2206,8 @@ 
 	 * @return array
 	 */
 	private function getTZFromSyncBlob($data) {
-		$tz = unpack("lbias/a64tzname/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
-						"lstdbias/a64tznamedst/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/" .
+		$tz = unpack("lbias/a64tzname/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/".
+						"lstdbias/a64tznamedst/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/".
 						"ldstbias", $data);
 
 		// Make the structure compatible with class.recurrence.php
@@ -2227,7 +2226,7 @@ 
 	 */
 	private function getMAPIBlobFromTZ($tz) {
 		return pack(
-			"lll" . "vvvvvvvvv" . "vvvvvvvvv",
+			"lll"."vvvvvvvvv"."vvvvvvvvv",
 			$tz["bias"],
 			$tz["stdbias"],
 			$tz["dstbias"],
@@ -2462,11 +2461,11 @@ 
 	 */
 	private function composeDisplayName(&$contact) {
 		// Set display name and subject to a combined value of firstname and lastname
-		$cname = (isset($contact->prefix)) ? u2w($contact->prefix) . " " : "";
+		$cname = (isset($contact->prefix)) ? u2w($contact->prefix)." " : "";
 		$cname .= u2w($contact->firstname);
-		$cname .= (isset($contact->middlename)) ? " " . u2w($contact->middlename) : "";
-		$cname .= " " . u2w($contact->lastname);
-		$cname .= (isset($contact->suffix)) ? " " . u2w($contact->suffix) : "";
+		$cname .= (isset($contact->middlename)) ? " ".u2w($contact->middlename) : "";
+		$cname .= " ".u2w($contact->lastname);
+		$cname .= (isset($contact->suffix)) ? " ".u2w($contact->suffix) : "";
 
 		return trim($cname);
 	}
@@ -2494,7 +2493,7 @@ 
 			$props[$properties["emailaddresstype{$cnt}"]] = "SMTP";
 			$props[$properties["emailaddressentryid{$cnt}"]] = mapi_createoneoff($name, "SMTP", $emailAddress);
 			$nremails[] = $cnt - 1;
-			$abprovidertype |= 2 ^ ($cnt - 1);
+			$abprovidertype |= 2^($cnt - 1);
 		}
 	}
 
@@ -2514,29 +2513,29 @@ 
 	 */
 	private function setAddress($type, &$city, &$country, &$postalcode, &$state, &$street, &$props, &$properties) {
 		if (isset($city)) {
-			$props[$properties[$type . "city"]] = $city = u2w($city);
+			$props[$properties[$type."city"]] = $city = u2w($city);
 		}
 
 		if (isset($country)) {
-			$props[$properties[$type . "country"]] = $country = u2w($country);
+			$props[$properties[$type."country"]] = $country = u2w($country);
 		}
 
 		if (isset($postalcode)) {
-			$props[$properties[$type . "postalcode"]] = $postalcode = u2w($postalcode);
+			$props[$properties[$type."postalcode"]] = $postalcode = u2w($postalcode);
 		}
 
 		if (isset($state)) {
-			$props[$properties[$type . "state"]] = $state = u2w($state);
+			$props[$properties[$type."state"]] = $state = u2w($state);
 		}
 
 		if (isset($street)) {
-			$props[$properties[$type . "street"]] = $street = u2w($street);
+			$props[$properties[$type."street"]] = $street = u2w($street);
 		}
 
 		// set composed address
 		$address = Utils::BuildAddressString($street, $postalcode, $city, $state, $country);
 		if ($address) {
-			$props[$properties[$type . "address"]] = $address;
+			$props[$properties[$type."address"]] = $address;
 		}
 	}
 
@@ -2705,7 +2704,7 @@ 
 			return false;
 		}
 
-		return $parsedAddress[0]->mailbox . '@' . $parsedAddress[0]->host;
+		return $parsedAddress[0]->mailbox.'@'.$parsedAddress[0]->host;
 	}
 
 	/**

Braces +64 added lines, -128 removed lines

@@ -46,8 +46,7 @@ 
 		$props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS]);
 		if (isset($props[PR_MESSAGE_CLASS])) {
 			$messageclass = $props[PR_MESSAGE_CLASS];
-		}
-		else {
+		} else {
 			$messageclass = "IPM";
 		}
 
@@ -177,16 +176,14 @@ 
 		if (isset($messageprops[$appointmentprops["reminderset"]]) && $messageprops[$appointmentprops["reminderset"]] == true) {
 			if ($messageprops[$appointmentprops["remindertime"]] == 0x5AE980E1) {
 				$message->reminder = 15;
-			}
-			else {
+			} else {
 				$message->reminder = $messageprops[$appointmentprops["remindertime"]];
 			}
 		}
 
 		if (!isset($message->uid)) {
 			$message->uid = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
-		}
-		else {
+		} else {
 			$message->uid = Utils::GetICalUidFromOLUid($message->uid);
 		}
 
@@ -205,14 +202,12 @@ 
 		if (!empty($messageprops[$appointmentprops["timezonetag"]])) {
 			$tz = $this->getTZFromMAPIBlob($messageprops[$appointmentprops["timezonetag"]]);
 			$appTz = true;
-		}
-		elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
+		} elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
 			// Windows uses UTC in timezone description in opposite to mstzones in TimezoneUtil which uses GMT
 			$wintz = str_replace("UTC", "GMT", $messageprops[$appointmentprops["timezonedesc"]]);
 			$tz = TimezoneUtil::GetFullTZFromTZName(TimezoneUtil::GetTZNameFromWinTZ($wintz));
 			$appTz = true;
-		}
-		else {
+		} else {
 			// set server default timezone (correct timezone should be configured!)
 			$tz = TimezoneUtil::GetFullTZ();
 		}
@@ -252,8 +247,7 @@ 
 			// smtp address is always a proper email address
 			if (isset($row[PR_SMTP_ADDRESS])) {
 				$attendee->email = w2u($row[PR_SMTP_ADDRESS]);
-			}
-			elseif (isset($row[PR_ADDRTYPE], $row[PR_EMAIL_ADDRESS])) {
+			} elseif (isset($row[PR_ADDRTYPE], $row[PR_EMAIL_ADDRESS])) {
 				// if address type is SMTP, it's also a proper email address
 				if ($row[PR_ADDRTYPE] == "SMTP") {
 					$attendee->email = w2u($row[PR_EMAIL_ADDRESS]);
@@ -268,8 +262,7 @@ 
 					// @see https://jira.z-hub.io/browse/ZP-1178
 					elseif (isset($row[PR_SEARCH_KEY])) {
 						$attendee->email = w2u($this->getEmailAddressFromSearchKey($row[PR_SEARCH_KEY]));
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_WARN, sprintf("MAPIProvider->getAppointment: The attendee '%s' of type ZARAFA can not be resolved. Code: 0x%X", $row[PR_EMAIL_ADDRESS], mapi_last_hresult()));
 					}
 				}
@@ -331,8 +324,7 @@ 
 
 		if (!isset($message->nativebodytype)) {
 			$message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-		}
-		elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+		} elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
 			$nbt = MAPIUtils::GetNativeBodyType($messageprops);
 			SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getAppointment(): native body type is undefined. Set it to %d.", $nbt));
 			$message->nativebodytype = $nbt;
@@ -381,8 +373,7 @@ 
 	private function getRecurrence($mapimessage, $recurprops, &$syncMessage, &$syncRecurrence, $tz) {
 		if ($syncRecurrence instanceof SyncTaskRecurrence) {
 			$recurrence = new TaskRecurrence($this->store, $mapimessage);
-		}
-		else {
+		} else {
 			$recurrence = new Recurrence($this->store, $mapimessage);
 		}
 
@@ -606,8 +597,7 @@ 
 
 		if (isset($messageprops[PR_SOURCE_KEY])) {
 			$sourcekey = $messageprops[PR_SOURCE_KEY];
-		}
-		else {
+		} else {
 			$mbe = new SyncObjectBrokenException("The message doesn't have a sourcekey");
 			$mbe->SetSyncObject($message);
 
@@ -638,8 +628,7 @@ 
 
 		if ($fromname) {
 			$from = "\"" . w2u($fromname) . "\" <" . w2u($fromaddr) . ">";
-		}
-		else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
+		} else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
 			$from = "\"" . w2u($fromaddr) . "\" <" . w2u($fromaddr) . ">";
 		}
 		// END CHANGED dw2412 HTC shows "error" if sender name is unknown
@@ -662,8 +651,7 @@ 
 			// Set Timezone
 			if (isset($props[$meetingrequestproperties["timezonetag"]])) {
 				$tz = $this->getTZFromMAPIBlob($props[$meetingrequestproperties["timezonetag"]]);
-			}
-			else {
+			} else {
 				$tz = TimezoneUtil::GetFullTZ();
 			}
 
@@ -675,12 +663,10 @@ 
 				if (isset($props[$meetingrequestproperties["recReplTime"]])) {
 					$basedate = $props[$meetingrequestproperties["recReplTime"]];
 					$message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $this->getGMTTZ());
-				}
-				else {
+				} else {
 					if (!isset($props[$meetingrequestproperties["goidtag"]]) || !isset($props[$meetingrequestproperties["recurStartTime"]]) || !isset($props[$meetingrequestproperties["timezonetag"]])) {
 						SLog::Write(LOGLEVEL_WARN, "Missing property to set correct basedate for exception");
-					}
-					else {
+					} else {
 						$basedate = Utils::ExtractBaseDate($props[$meetingrequestproperties["goidtag"]], $props[$meetingrequestproperties["recurStartTime"]]);
 						$message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $tz);
 					}
@@ -690,8 +676,7 @@ 
 			// Organizer is the sender
 			if (strpos($message->messageclass, "IPM.Schedule.Meeting.Resp") === 0) {
 				$message->meetingrequest->organizer = $message->to;
-			}
-			else {
+			} else {
 				$message->meetingrequest->organizer = $message->from;
 			}
 
@@ -716,12 +701,10 @@ 
 			$message->meetingrequest->instancetype = 0;
 			if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]] == 1) {
 				$message->meetingrequest->instancetype = 1;
-			}
-			elseif ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0) && isset($message->meetingrequest->recurrenceid)) {
+			} elseif ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0) && isset($message->meetingrequest->recurrenceid)) {
 				if (isset($props[$meetingrequestproperties["appSeqNr"]]) && $props[$meetingrequestproperties["appSeqNr"]] == 0) {
 					$message->meetingrequest->instancetype = 2;
-				}
-				else {
+				} else {
 					$message->meetingrequest->instancetype = 3;
 				}
 			}
@@ -735,8 +718,7 @@ 
 				// /set the default reminder time to seconds
 				if ($props[$meetingrequestproperties["remindertime"]] == 0x5AE980E1) {
 					$message->meetingrequest->reminder = 900;
-				}
-				else {
+				} else {
 					$message->meetingrequest->reminder = $props[$meetingrequestproperties["remindertime"]] * 60;
 				}
 			}
@@ -820,8 +802,7 @@ 
 			if (isset($row[PR_ATTACH_NUM])) {
 				if (Request::GetProtocolVersion() >= 12.0) {
 					$attach = new SyncBaseAttachment();
-				}
-				else {
+				} else {
 					$attach = new SyncAttachment();
 				}
 
@@ -867,8 +848,7 @@ 
 						}
 						$stat = mapi_stream_stat($stream);
 						$attach->estimatedDataSize = $stat['cb'];
-					}
-					else {
+					} else {
 						$attach->estimatedDataSize = $attachprops[PR_ATTACH_SIZE];
 					}
 
@@ -893,8 +873,7 @@ 
 					}
 
 					array_push($message->asattachments, $attach);
-				}
-				else {
+				} else {
 					$attach->attsize = $attachprops[PR_ATTACH_SIZE];
 					$attach->attname = sprintf("%s:%s:%s", $entryid, $row[PR_ATTACH_NUM], $parentSourcekey);
 					if (!isset($message->attachments)) {
@@ -922,11 +901,9 @@ 
 
 			if (isset($row[PR_SMTP_ADDRESS])) {
 				$address = $row[PR_SMTP_ADDRESS];
-			}
-			elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS])) {
+			} elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS])) {
 				$address = $row[PR_EMAIL_ADDRESS];
-			}
-			elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID])) {
+			} elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID])) {
 				$address = $this->getSMTPAddressFromEntryID($row[PR_ENTRYID]);
 			}
 
@@ -940,20 +917,17 @@ 
 
 			if ($name == "" || $name == $address) {
 				$fulladdr = w2u($address);
-			}
-			else {
+			} else {
 				if (substr($name, 0, 1) != '"' && substr($name, -1) != '"') {
 					$fulladdr = "\"" . w2u($name) . "\" <" . w2u($address) . ">";
-				}
-				else {
+				} else {
 					$fulladdr = w2u($name) . "<" . w2u($address) . ">";
 				}
 			}
 
 			if ($row[PR_RECIPIENT_TYPE] == MAPI_TO) {
 				array_push($message->to, $fulladdr);
-			}
-			elseif ($row[PR_RECIPIENT_TYPE] == MAPI_CC) {
+			} elseif ($row[PR_RECIPIENT_TYPE] == MAPI_CC) {
 				array_push($message->cc, $fulladdr);
 			}
 		}
@@ -981,8 +955,7 @@ 
 
 		if (!isset($message->nativebodytype)) {
 			$message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-		}
-		elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+		} elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
 			$nbt = MAPIUtils::GetNativeBodyType($messageprops);
 			SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getEmail(): native body type is undefined. Set it to %d.", $nbt));
 			$message->nativebodytype = $nbt;
@@ -1071,8 +1044,7 @@ 
 		$folder->serverid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folderprops[PR_DISPLAY_NAME]);
 		if ($folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_SUBTREE_ENTRYID] || $folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID]) {
 			$folder->parentid = "0";
-		}
-		else {
+		} else {
 			$folder->parentid = GSync::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($folderprops[PR_PARENT_SOURCE_KEY]));
 		}
 		$folder->displayname = w2u($folderprops[PR_DISPLAY_NAME]);
@@ -1322,8 +1294,7 @@ 
 			$delprops[] = $flagprops["completetime"];
 			$delprops[] = $flagprops["flagstatus"];
 			$delprops[] = $flagprops["flagicon"];
-		}
-		else {
+		} else {
 			$this->setPropsInMAPI($mapimessage, $message->flag, $flagmapping);
 			$props[$flagprops["todoitemsflags"]] = 1;
 			if (isset($message->subject) && strlen($message->subject) > 0) {
@@ -1373,8 +1344,7 @@ 
 		// Get timezone info
 		if (isset($appointment->timezone)) {
 			$tz = $this->getTZFromSyncBlob(base64_decode($appointment->timezone));
-		}
-		else {
+		} else {
 			$tz = false;
 		}
 
@@ -1497,8 +1467,7 @@ 
 						$noexceptions = false;
 						// Delete exception
 						$recurrence->createException([], $basedate, true);
-					}
-					else {
+					} else {
 						// Change exception
 						$mapiexception = ["basedate" => $basedate];
 						// other exception properties which are not handled in recurrence
@@ -1550,8 +1519,7 @@ 
 							$noexceptions = false;
 							if ($recurrence->isException($basedate)) {
 								$recurrence->modifyException($exceptionprops, $basedate);
-							}
-							else {
+							} else {
 								$recurrence->createException($exceptionprops, $basedate);
 							}
 						}
@@ -1563,8 +1531,7 @@ 
 			if ($noexceptions) {
 				$recurrence->setRecurrence($tz, $recur);
 			}
-		}
-		else {
+		} else {
 			$props[$appointmentprops["isrecurring"]] = false;
 		}
 
@@ -1640,8 +1607,7 @@ 
 					$recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
 					$recip[PR_RECIPIENT_FLAGS] = recipSendable;
 					$recip[PR_RECIPIENT_TRACKSTATUS] = isset($attendee->attendeestatus) ? $attendee->attendeestatus : olResponseNone;
-				}
-				else {
+				} else {
 					$recip[PR_DISPLAY_NAME] = u2w($attendee->name);
 					$recip[PR_SEARCH_KEY] = "SMTP:" . $recip[PR_EMAIL_ADDRESS] . "\0";
 					$recip[PR_ADDRTYPE] = "SMTP";
@@ -1727,12 +1693,10 @@ 
 		if (isset($props[$contactprops["businessaddress"]])) {
 			$props[$contactprops["mailingaddress"]] = 2;
 			$this->setMailingAddress($contact->businesscity, $contact->businesscountry, $contact->businesspostalcode, $contact->businessstate, $contact->businessstreet, $props[$contactprops["businessaddress"]], $props, $contactprops);
-		}
-		elseif (isset($props[$contactprops["homeaddress"]])) {
+		} elseif (isset($props[$contactprops["homeaddress"]])) {
 			$props[$contactprops["mailingaddress"]] = 1;
 			$this->setMailingAddress($contact->homecity, $contact->homecountry, $contact->homepostalcode, $contact->homestate, $contact->homestreet, $props[$contactprops["homeaddress"]], $props, $contactprops);
-		}
-		elseif (isset($props[$contactprops["otheraddress"]])) {
+		} elseif (isset($props[$contactprops["otheraddress"]])) {
 			$props[$contactprops["mailingaddress"]] = 3;
 			$this->setMailingAddress($contact->othercity, $contact->othercountry, $contact->otherpostalcode, $contact->otherstate, $contact->otherstreet, $props[$contactprops["otheraddress"]], $props, $contactprops);
 		}
@@ -1793,8 +1757,7 @@ 
 			$middlename = (isset($contact->middlename)) ? $contact->middlename : "";
 			$company = (isset($contact->companyname)) ? $contact->companyname : "";
 			$props[$contactprops["fileas"]] = Utils::BuildFileAs($lastname, $firstname, $middlename, $company);
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_DEBUG, "FILEAS_ORDER not defined");
 		}
 
@@ -1833,8 +1796,7 @@ 
 				$props[$taskprops["completion"]] = 1.0;
 				$props[$taskprops["status"]] = 2;
 				$props[$taskprops["reminderset"]] = false;
-			}
-			else {
+			} else {
 				// Set completion to 0%
 				// Set status to 'not started'
 				$props[$taskprops["completion"]] = 0.0;
@@ -1993,12 +1955,10 @@ 
 				if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
 					if (is_array($message->{$asprop})) {
 						$value = array_map("u2wi", $message->{$asprop});
-					}
-					else {
+					} else {
 						$value = u2wi($message->{$asprop});
 					}
-				}
-				else {
+				} else {
 					$value = $message->{$asprop};
 				}
 
@@ -2033,13 +1993,11 @@ 
 				if (is_array($value) && empty($value)) {
 					$propsToDelete[] = $mapiprop;
 					SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->setPropsInMAPI(): Property '%s' to be deleted as it is an empty array", $asprop));
-				}
-				else {
+				} else {
 					// all properties will be set at once
 					$propsToSet[$mapiprop] = $value;
 				}
-			}
-			elseif (in_array($asprop, $unsetVars)) {
+			} elseif (in_array($asprop, $unsetVars)) {
 				$propsToDelete[] = $mapiprop;
 			}
 		}
@@ -2099,12 +2057,10 @@ 
 					// Force to actual '0' or '1'
 					if ($messageprops[$mapiprop]) {
 						$message->{$asprop} = 1;
-					}
-					else {
+					} else {
 						$message->{$asprop} = 0;
 					}
-				}
-				else {
+				} else {
 					// Special handling for PR_MESSAGE_FLAGS
 					if ($mapiprop == PR_MESSAGE_FLAGS) {
 						$message->{$asprop} = $messageprops[$mapiprop] & 1;
@@ -2112,15 +2068,12 @@ 
 					elseif ($mapiprop == PR_RTF_COMPRESSED) {
 						// do not send rtf to the mobile
 						continue;
-					}
-					elseif (is_array($messageprops[$mapiprop])) {
+					} elseif (is_array($messageprops[$mapiprop])) {
 						$message->{$asprop} = array_map("w2u", $messageprops[$mapiprop]);
-					}
-					else {
+					} else {
 						if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
 							$message->{$asprop} = w2u($messageprops[$mapiprop]);
-						}
-						else {
+						} else {
 							$message->{$asprop} = $messageprops[$mapiprop];
 						}
 					}
@@ -2316,17 +2269,14 @@ 
 			// northern hemisphere (july = dst)
 			if ($localtime >= $start && $localtime < $end) {
 				$dst = true;
-			}
-			else {
+			} else {
 				$dst = false;
 			}
-		}
-		else {
+		} else {
 			// southern hemisphere (january = dst)
 			if ($localtime >= $end && $localtime < $start) {
 				$dst = false;
-			}
-			else {
+			} else {
 				$dst = true;
 			}
 		}
@@ -2372,8 +2322,7 @@ 
 			$monthnow = gmdate("n", $date); // gmdate returns 1-12
 			if ($monthnow > $month) {
 				$date = $date - (24 * 7 * 60 * 60);
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -2602,8 +2551,7 @@ 
 				$recur["type"] = 10;
 				if (isset($message->recurrence->dayofweek)) {
 					$recur["subtype"] = 1;
-				}
-				else {
+				} else {
 					$recur["subtype"] = 0;
 				}
 
@@ -2660,12 +2608,10 @@ 
 		if (isset($message->recurrence->until)) {
 			$recur["term"] = 0x21;
 			$recur["end"] = $message->recurrence->until;
-		}
-		elseif (isset($message->recurrence->occurrences)) {
+		} elseif (isset($message->recurrence->occurrences)) {
 			$recur["term"] = 0x22;
 			$recur["numoccur"] = $message->recurrence->occurrences;
-		}
-		else {
+		} else {
 			$recur["term"] = 0x23;
 		}
 
@@ -2745,8 +2691,7 @@ 
 		if ($stream) {
 			$stat = mapi_stream_stat($stream);
 			$streamsize = $stat['cb'];
-		}
-		else {
+		} else {
 			$streamsize = 0;
 		}
 
@@ -2757,24 +2702,20 @@ 
 			if ($bpReturnType == SYNC_BODYPREFERENCE_RTF) {
 				$body = $this->mapiReadStream($stream, $streamsize);
 				$message->asbody->data = StringStreamWrapper::Open(base64_encode($body));
-			}
-			elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
+			} elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
 				// if PR_HTML is UTF-8 we can stream it directly, else we have to convert to UTF-8 & wrap it
 				if ($message->internetcpid == INTERNET_CPID_UTF8) {
 					$message->asbody->data = MAPIStreamWrapper::Open($stream, $truncateHtmlSafe);
-				}
-				else {
+				} else {
 					$body = $this->mapiReadStream($stream, $streamsize);
 					$message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body), $truncateHtmlSafe);
 					$message->internetcpid = INTERNET_CPID_UTF8;
 				}
-			}
-			else {
+			} else {
 				$message->asbody->data = MAPIStreamWrapper::Open($stream);
 			}
 			$message->asbody->estimatedDataSize = $streamsize;
-		}
-		else {
+		} else {
 			$body = $this->mapiReadStream($stream, $streamsize);
 			$message->body = str_replace("\n", "\r\n", w2u(str_replace("\r", "", $body)));
 			$message->bodysize = $streamsize;
@@ -2814,8 +2755,7 @@ 
 		if (isset($mapiEmail[PR_EC_IMAP_EMAIL]) || MAPIUtils::GetError(PR_EC_IMAP_EMAIL, $mapiEmail) == MAPI_E_NOT_ENOUGH_MEMORY) {
 			$stream = mapi_openproperty($mapimessage, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
 			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->imtoinet(): using PR_EC_IMAP_EMAIL as full RFC822 message");
-		}
-		else {
+		} else {
 			$addrbook = $this->getAddressbook();
 			$stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $mapimessage, ['use_tnef' => -1, 'ignore_missing_attachments' => 1]);
 		}
@@ -2830,8 +2770,7 @@ 
 					$message->asbody->data = MAPIStreamWrapper::Open($stream);
 					$message->asbody->estimatedDataSize = $streamsize;
 					$message->asbody->truncated = 0;
-				}
-				else {
+				} else {
 					$message->mimedata = MAPIStreamWrapper::Open($stream);
 					$message->mimesize = $streamsize;
 					$message->mimetruncated = 0;
@@ -2902,8 +2841,7 @@ 
 			if (Request::GetProtocolVersion() >= 14.0 && $bpo->GetPreview()) {
 				$message->asbody->preview = Utils::Utf8_truncate(MAPIUtils::readPropStream($mapimessage, PR_BODY), $bpo->GetPreview());
 			}
-		}
-		else {
+		} else {
 			// Override 'body' for truncation
 			$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 			$this->setMessageBodyForType($mapimessage, SYNC_BODYPREFERENCE_PLAIN, $message);
@@ -2968,8 +2906,7 @@ 
 				case SYNC_BODYPREFERENCE_MIME:
 					break;
 			}
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->setASbody either type or data are not set. Setting to empty body");
 			$props[$appointmentprops["body"]] = "";
 		}
@@ -3105,8 +3042,7 @@ 
 						$this->specialFoldersData[] = substr($persistData, 8, $unpackedData['elDataSize']);
 						// Add PersistId and DataElementsSize lengths to the data size as they're not part of it
 						$persistData = substr($persistData, $unpackedData['dataSize'] + 4);
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_INFO, "MAPIProvider->getSpecialFoldersData(): persistent data is not valid");
 						break;
 					}

lib/grommunio/importer.php

Indentation +785 added lines, -785 removed lines

@@ -18,468 +18,468 @@ 
  * the PDA are always e-mail folders.
  */
 class ImportChangesICS implements IImportChanges {
-	private $folderid;
-	private $folderidHex;
-	private $store;
-	private $session;
-	private $flags;
-	private $statestream;
-	private $importer;
-	private $memChanges;
-	private $mapiprovider;
-	private $conflictsLoaded;
-	private $conflictsContentParameters;
-	private $conflictsState;
-	private $cutoffdate;
-	private $contentClass;
-	private $prefix;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param mapisession $session
-	 * @param mapistore   $store
-	 * @param string      $folderid (opt)
-	 *
-	 * @throws StatusException
-	 */
-	public function __construct($session, $store, $folderid = false) {
-		$this->session = $session;
-		$this->store = $store;
-		$this->folderid = $folderid;
-		$this->folderidHex = bin2hex($folderid);
-		$this->conflictsLoaded = false;
-		$this->cutoffdate = false;
-		$this->contentClass = false;
-		$this->prefix = '';
-
-		if ($folderid) {
-			$entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
-			$folderidForBackendId = GSync::GetDeviceManager()->GetFolderIdForBackendId($this->folderidHex);
-			// Only append backend id if the mapping backendid<->folderid is available.
-			if ($folderidForBackendId != $this->folderidHex) {
-				$this->prefix = $folderidForBackendId . ':';
-			}
-		}
-		else {
-			$storeprops = mapi_getprops($store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-			if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
-				$entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-			}
-			else {
-				$entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
-			}
-		}
-
-		$folder = false;
-		if ($entryid) {
-			$folder = mapi_msgstore_openentry($store, $entryid);
-		}
-
-		if (!$folder) {
-			$this->importer = false;
-
-			// We throw an general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
-			// if this happened while doing content sync, the mobile will try to resync the folderhierarchy
-			throw new StatusException(sprintf("ImportChangesICS('%s','%s'): Error, unable to open folder: 0x%X", $session, bin2hex($folderid), mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN);
-		}
-
-		$this->mapiprovider = new MAPIProvider($this->session, $this->store);
-
-		if ($folderid) {
-			$this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportContentsChanges, 0, 0);
-		}
-		else {
-			$this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportHierarchyChanges, 0, 0);
-		}
-	}
-
-	/**
-	 * Initializes the importer.
-	 *
-	 * @param string $state
-	 * @param int    $flags
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function Config($state, $flags = 0) {
-		$this->flags = $flags;
-
-		// this should never happen
-		if ($this->importer === false) {
-			throw new StatusException("ImportChangesICS->Config(): Error, importer not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
-		}
-
-		// Put the state information in a stream that can be used by ICS
-		$stream = mapi_stream_create();
-		if (strlen($state) == 0) {
-			$state = hex2bin("0000000000000000");
-		}
-
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->Config(): initializing importer with state: 0x%s", bin2hex($state)));
-
-		mapi_stream_write($stream, $state);
-		$this->statestream = $stream;
-
-		if ($this->folderid !== false) {
-			// possible conflicting messages will be cached here
-			$this->memChanges = new ChangesMemoryWrapper();
-			$stat = mapi_importcontentschanges_config($this->importer, $stream, $flags);
-		}
-		else {
-			$stat = mapi_importhierarchychanges_config($this->importer, $stream, $flags);
-		}
-
-		if (!$stat) {
-			throw new StatusException(sprintf("ImportChangesICS->Config(): Error, mapi_import_*_changes_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
-		}
-
-		return $stat;
-	}
-
-	/**
-	 * Configures additional parameters for content selection.
-	 *
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function ConfigContentParameters($contentparameters) {
-		$filtertype = $contentparameters->GetFilterType();
-
-		switch ($contentparameters->GetContentClass()) {
-			case "Email":
-				$this->cutoffdate = ($filtertype) ? Utils::GetCutOffDate($filtertype) : false;
-				break;
-
-			case "Calendar":
-				$this->cutoffdate = ($filtertype) ? Utils::GetCutOffDate($filtertype) : false;
-				break;
-
-			default:
-			case "Contacts":
-			case "Tasks":
-				$this->cutoffdate = false;
-				break;
-		}
-		$this->contentClass = $contentparameters->GetContentClass();
-
-		return true;
-	}
-
-	/**
-	 * Reads state from the Importer.
-	 *
-	 * @throws StatusException
-	 *
-	 * @return string
-	 */
-	public function GetState() {
-		$error = false;
-		if (!isset($this->statestream) || $this->importer === false) {
-			$error = true;
-		}
-
-		if ($error === false && $this->folderid !== false && function_exists("mapi_importcontentschanges_updatestate")) {
-			if (mapi_importcontentschanges_updatestate($this->importer, $this->statestream) != true) {
-				$error = true;
-			}
-		}
-
-		if ($error == true) {
-			throw new StatusException(sprintf("ImportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid) ? SYNC_STATUS_FOLDERHIERARCHYCHANGED : SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
-		}
-
-		mapi_stream_seek($this->statestream, 0, STREAM_SEEK_SET);
-
-		$state = "";
-		while (true) {
-			$data = mapi_stream_read($this->statestream, 4096);
-			if (strlen($data)) {
-				$state .= $data;
-			}
-			else {
-				break;
-			}
-		}
-
-		return $state;
-	}
-
-	/**
-	 * Checks if a message may be modified. This involves checking:
-	 * - if there is a synchronization interval and if so, if the message is in it (sync window).
-	 *   These checks only apply to Emails and Appointments only, Contacts, Tasks and Notes do not have time restrictions.
-	 * - if the message is not marked as private in a shared folder.
-	 *
-	 * @param string $messageid the message id to be checked
-	 *
-	 * @return bool
-	 */
-	private function isModificationAllowed($messageid) {
-		$sharedUser = GSync::GetAdditionalSyncFolderStore(bin2hex($this->folderid));
-		// if this is either a user folder or SYSTEM and no restriction is set, we don't need to check
-		if (($sharedUser == false || $sharedUser == 'SYSTEM') && $this->cutoffdate === false && !GSync::GetBackend()->GetImpersonatedUser()) {
-			return true;
-		}
-
-		// open the existing object
-		$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid, hex2bin($messageid));
-		if (!$entryid) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Error, unable to resolve message id: 0x%X", $messageid, mapi_last_hresult()));
-
-			return false;
-		}
-
-		$mapimessage = mapi_msgstore_openentry($this->store, $entryid);
-		if (!$mapimessage) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Error, unable to open entry id: 0x%X", $messageid, mapi_last_hresult()));
-
-			return false;
-		}
-
-		// check the sync interval
-		if ($this->cutoffdate !== false) {
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->isModificationAllowed('%s'): cut off date is: %s", $messageid, $this->cutoffdate));
-			if (($this->contentClass == "Email" && !MAPIUtils::IsInEmailSyncInterval($this->store, $mapimessage, $this->cutoffdate)) ||
-				  ($this->contentClass == "Calendar" && !MAPIUtils::IsInCalendarSyncInterval($this->store, $mapimessage, $this->cutoffdate))) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Message in %s is outside the sync interval. Data not saved.", $messageid, $this->contentClass));
-
-				return false;
-			}
-		}
-
-		// check if not private
-		if (MAPIUtils::IsMessageSharedAndPrivate($this->folderid, $mapimessage)) {
-			SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Message is shared and marked as private. Data not saved.", $messageid));
-
-			return false;
-		}
-
-		// yes, modification allowed
-		return true;
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+    private $folderid;
+    private $folderidHex;
+    private $store;
+    private $session;
+    private $flags;
+    private $statestream;
+    private $importer;
+    private $memChanges;
+    private $mapiprovider;
+    private $conflictsLoaded;
+    private $conflictsContentParameters;
+    private $conflictsState;
+    private $cutoffdate;
+    private $contentClass;
+    private $prefix;
+
+    /**
+     * Constructor.
+     *
+     * @param mapisession $session
+     * @param mapistore   $store
+     * @param string      $folderid (opt)
+     *
+     * @throws StatusException
+     */
+    public function __construct($session, $store, $folderid = false) {
+        $this->session = $session;
+        $this->store = $store;
+        $this->folderid = $folderid;
+        $this->folderidHex = bin2hex($folderid);
+        $this->conflictsLoaded = false;
+        $this->cutoffdate = false;
+        $this->contentClass = false;
+        $this->prefix = '';
+
+        if ($folderid) {
+            $entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
+            $folderidForBackendId = GSync::GetDeviceManager()->GetFolderIdForBackendId($this->folderidHex);
+            // Only append backend id if the mapping backendid<->folderid is available.
+            if ($folderidForBackendId != $this->folderidHex) {
+                $this->prefix = $folderidForBackendId . ':';
+            }
+        }
+        else {
+            $storeprops = mapi_getprops($store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
+            if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
+                $entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
+            }
+            else {
+                $entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
+            }
+        }
+
+        $folder = false;
+        if ($entryid) {
+            $folder = mapi_msgstore_openentry($store, $entryid);
+        }
+
+        if (!$folder) {
+            $this->importer = false;
+
+            // We throw an general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
+            // if this happened while doing content sync, the mobile will try to resync the folderhierarchy
+            throw new StatusException(sprintf("ImportChangesICS('%s','%s'): Error, unable to open folder: 0x%X", $session, bin2hex($folderid), mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN);
+        }
+
+        $this->mapiprovider = new MAPIProvider($this->session, $this->store);
+
+        if ($folderid) {
+            $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportContentsChanges, 0, 0);
+        }
+        else {
+            $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportHierarchyChanges, 0, 0);
+        }
+    }
+
+    /**
+     * Initializes the importer.
+     *
+     * @param string $state
+     * @param int    $flags
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function Config($state, $flags = 0) {
+        $this->flags = $flags;
+
+        // this should never happen
+        if ($this->importer === false) {
+            throw new StatusException("ImportChangesICS->Config(): Error, importer not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        }
+
+        // Put the state information in a stream that can be used by ICS
+        $stream = mapi_stream_create();
+        if (strlen($state) == 0) {
+            $state = hex2bin("0000000000000000");
+        }
+
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->Config(): initializing importer with state: 0x%s", bin2hex($state)));
+
+        mapi_stream_write($stream, $state);
+        $this->statestream = $stream;
+
+        if ($this->folderid !== false) {
+            // possible conflicting messages will be cached here
+            $this->memChanges = new ChangesMemoryWrapper();
+            $stat = mapi_importcontentschanges_config($this->importer, $stream, $flags);
+        }
+        else {
+            $stat = mapi_importhierarchychanges_config($this->importer, $stream, $flags);
+        }
+
+        if (!$stat) {
+            throw new StatusException(sprintf("ImportChangesICS->Config(): Error, mapi_import_*_changes_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        }
+
+        return $stat;
+    }
+
+    /**
+     * Configures additional parameters for content selection.
+     *
+     * @param ContentParameters $contentparameters
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function ConfigContentParameters($contentparameters) {
+        $filtertype = $contentparameters->GetFilterType();
+
+        switch ($contentparameters->GetContentClass()) {
+            case "Email":
+                $this->cutoffdate = ($filtertype) ? Utils::GetCutOffDate($filtertype) : false;
+                break;
+
+            case "Calendar":
+                $this->cutoffdate = ($filtertype) ? Utils::GetCutOffDate($filtertype) : false;
+                break;
+
+            default:
+            case "Contacts":
+            case "Tasks":
+                $this->cutoffdate = false;
+                break;
+        }
+        $this->contentClass = $contentparameters->GetContentClass();
+
+        return true;
+    }
+
+    /**
+     * Reads state from the Importer.
+     *
+     * @throws StatusException
+     *
+     * @return string
+     */
+    public function GetState() {
+        $error = false;
+        if (!isset($this->statestream) || $this->importer === false) {
+            $error = true;
+        }
+
+        if ($error === false && $this->folderid !== false && function_exists("mapi_importcontentschanges_updatestate")) {
+            if (mapi_importcontentschanges_updatestate($this->importer, $this->statestream) != true) {
+                $error = true;
+            }
+        }
+
+        if ($error == true) {
+            throw new StatusException(sprintf("ImportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid) ? SYNC_STATUS_FOLDERHIERARCHYCHANGED : SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
+        }
+
+        mapi_stream_seek($this->statestream, 0, STREAM_SEEK_SET);
+
+        $state = "";
+        while (true) {
+            $data = mapi_stream_read($this->statestream, 4096);
+            if (strlen($data)) {
+                $state .= $data;
+            }
+            else {
+                break;
+            }
+        }
+
+        return $state;
+    }
+
+    /**
+     * Checks if a message may be modified. This involves checking:
+     * - if there is a synchronization interval and if so, if the message is in it (sync window).
+     *   These checks only apply to Emails and Appointments only, Contacts, Tasks and Notes do not have time restrictions.
+     * - if the message is not marked as private in a shared folder.
+     *
+     * @param string $messageid the message id to be checked
+     *
+     * @return bool
+     */
+    private function isModificationAllowed($messageid) {
+        $sharedUser = GSync::GetAdditionalSyncFolderStore(bin2hex($this->folderid));
+        // if this is either a user folder or SYSTEM and no restriction is set, we don't need to check
+        if (($sharedUser == false || $sharedUser == 'SYSTEM') && $this->cutoffdate === false && !GSync::GetBackend()->GetImpersonatedUser()) {
+            return true;
+        }
+
+        // open the existing object
+        $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid, hex2bin($messageid));
+        if (!$entryid) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Error, unable to resolve message id: 0x%X", $messageid, mapi_last_hresult()));
+
+            return false;
+        }
+
+        $mapimessage = mapi_msgstore_openentry($this->store, $entryid);
+        if (!$mapimessage) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Error, unable to open entry id: 0x%X", $messageid, mapi_last_hresult()));
+
+            return false;
+        }
+
+        // check the sync interval
+        if ($this->cutoffdate !== false) {
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->isModificationAllowed('%s'): cut off date is: %s", $messageid, $this->cutoffdate));
+            if (($this->contentClass == "Email" && !MAPIUtils::IsInEmailSyncInterval($this->store, $mapimessage, $this->cutoffdate)) ||
+                  ($this->contentClass == "Calendar" && !MAPIUtils::IsInCalendarSyncInterval($this->store, $mapimessage, $this->cutoffdate))) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Message in %s is outside the sync interval. Data not saved.", $messageid, $this->contentClass));
+
+                return false;
+            }
+        }
+
+        // check if not private
+        if (MAPIUtils::IsMessageSharedAndPrivate($this->folderid, $mapimessage)) {
+            SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Message is shared and marked as private. Data not saved.", $messageid));
+
+            return false;
+        }
+
+        // yes, modification allowed
+        return true;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * Methods for ContentsExporter
 	 */
 
-	/**
-	 * Loads objects which are expected to be exported with the state
-	 * Before importing/saving the actual message from the mobile, a conflict detection should be done.
-	 *
-	 * @param ContentParameters $contentparameters class of objects
-	 * @param string            $state
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function LoadConflicts($contentparameters, $state) {
-		if (!isset($this->session) || !isset($this->store) || !isset($this->folderid)) {
-			throw new StatusException("ImportChangesICS->LoadConflicts(): Error, can not load changes for conflict detection. Session, store or folder information not available", SYNC_STATUS_SERVERERROR);
-		}
-
-		// save data to load changes later if necessary
-		$this->conflictsLoaded = false;
-		$this->conflictsContentParameters = $contentparameters;
-		$this->conflictsState = $state;
-
-		SLog::Write(LOGLEVEL_DEBUG, "ImportChangesICS->LoadConflicts(): will be loaded later if necessary");
-
-		return true;
-	}
-
-	/**
-	 * Potential conflicts are only loaded when really necessary,
-	 * e.g. on ADD or MODIFY.
-	 *
-	 * @return bool
-	 */
-	private function lazyLoadConflicts() {
-		if (!isset($this->session) || !isset($this->store) || !isset($this->folderid) ||
-			!isset($this->conflictsContentParameters) || $this->conflictsState === false) {
-			SLog::Write(LOGLEVEL_WARN, "ImportChangesICS->lazyLoadConflicts(): can not load potential conflicting changes in lazymode for conflict detection. Missing information");
-
-			return false;
-		}
-
-		if (!$this->conflictsLoaded) {
-			SLog::Write(LOGLEVEL_DEBUG, "ImportChangesICS->lazyLoadConflicts(): loading..");
-
-			// configure an exporter so we can detect conflicts
-			$exporter = new ExportChangesICS($this->session, $this->store, $this->folderid);
-			$exporter->Config($this->conflictsState);
-			$exporter->ConfigContentParameters($this->conflictsContentParameters);
-			$exporter->InitializeExporter($this->memChanges);
-
-			// monitor how long it takes to export potential conflicts
-			// if this takes "too long" we cancel this operation!
-			$potConflicts = $exporter->GetChangeCount();
-			if ($potConflicts > 100) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): conflict detection abandoned as there are too many (%d) changes to be exported.", $potConflicts));
-				$this->conflictsLoaded = true;
-
-				return false;
-			}
-			$started = time();
-			$exported = 0;
-
-			try {
-				while (is_array($exporter->Synchronize())) {
-					++$exported;
-
-					// stop if this takes more than 15 seconds and there are more than 5 changes still to be exported
-					// within 20 seconds this should be finished or it will not be performed
-					if ((time() - $started) > 15 && ($potConflicts - $exported) > 5) {
-						SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): conflict detection cancelled as operation is too slow. In %d seconds only %d from %d changes were processed.", (time() - $started), $exported, $potConflicts));
-						$this->conflictsLoaded = true;
-
-						return false;
-					}
-				}
-			}
-			// something really bad happened while exporting changes
-			catch (StatusException $stex) {
-				SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): got StatusException code %d while exporting changes. Ignore and mark conflicts as loaded.", $stex->getCode()));
-			}
-			$this->conflictsLoaded = true;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Imports a single message.
-	 *
-	 * @param string     $id
-	 * @param SyncObject $message
-	 *
-	 * @throws StatusException
-	 *
-	 * @return boolean/string - failure / id of message
-	 */
-	public function ImportMessageChange($id, $message) {
-		$flags = 0;
-		$props = [];
-		$props[PR_PARENT_SOURCE_KEY] = $this->folderid;
-
-		// set the PR_SOURCE_KEY if available or mark it as new message
-		if ($id) {
-			list(, $sk) = Utils::SplitMessageId($id);
-			$props[PR_SOURCE_KEY] = hex2bin($sk);
-
-			// check if message is in the synchronization interval and/or shared+private
-			if (!$this->isModificationAllowed($sk)) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Message modification is not allowed. Data not saved.", $id, get_class($message)), SYNC_STATUS_SYNCCANNOTBECOMPLETED);
-			}
-
-			// check for conflicts
-			$this->lazyLoadConflicts();
-			if ($this->memChanges->IsChanged($id)) {
-				if ($this->flags & SYNC_CONFLICT_OVERWRITE_PIM) {
-					// in these cases the status SYNC_STATUS_CONFLICTCLIENTSERVEROBJECT should be returned, so the mobile client can inform the end user
-					throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from PIM will be dropped! Server overwrites PIM. User is informed.", $id, get_class($message)), SYNC_STATUS_CONFLICTCLIENTSERVEROBJECT, null, LOGLEVEL_INFO);
-
-					return false;
-				}
-
-				SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from Server will be dropped! PIM overwrites server.", $id, get_class($message)));
-			}
-			if ($this->memChanges->IsDeleted($id)) {
-				SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from PIM will be dropped! Object was deleted on server.", $id, get_class($message)));
-
-				return false;
-			}
-		}
-		else {
-			$flags = SYNC_NEW_MESSAGE;
-		}
-
-		if (mapi_importcontentschanges_importmessagechange($this->importer, $props, $flags, $mapimessage)) {
-			$this->mapiprovider->SetMessage($mapimessage, $message);
-			mapi_savechanges($mapimessage);
-
-			if (mapi_last_hresult()) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error, mapi_savechanges() failed: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_SYNCCANNOTBECOMPLETED);
-			}
-
-			$sourcekeyprops = mapi_getprops($mapimessage, [PR_SOURCE_KEY]);
-
-			return $this->prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
-		}
-
-		throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error updating object: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
-	}
-
-	/**
-	 * Imports a deletion. This may conflict if the local object has been modified.
-	 *
-	 * @param string $id
-	 * @param bool   $asSoftDelete (opt) if true, the deletion is exported as "SoftDelete", else as "Remove" - default: false
-	 *
-	 * @return bool
-	 */
-	public function ImportMessageDeletion($id, $asSoftDelete = false) {
-		list(, $sk) = Utils::SplitMessageId($id);
-
-		// check if message is in the synchronization interval and/or shared+private
-		if (!$this->isModificationAllowed($sk)) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Message deletion is not allowed. Deletion not executed.", $id), SYNC_STATUS_OBJECTNOTFOUND);
-		}
-
-		// check for conflicts
-		$this->lazyLoadConflicts();
-		if ($this->memChanges->IsChanged($id)) {
-			SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data from Server will be dropped! PIM deleted object.", $id));
-		}
-		elseif ($this->memChanges->IsDeleted($id)) {
-			SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data is already deleted. Request will be ignored.", $id));
-
-			return true;
-		}
-
-		// do a 'soft' delete so people can un-delete if necessary
-		if (mapi_importcontentschanges_importmessagedeletion($this->importer, 1, [hex2bin($sk)])) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Error updating object: 0x%X", $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Imports a change in 'read' flag
-	 * This can never conflict.
-	 *
-	 * @param string $id
-	 * @param int    $flags      - read/unread
-	 * @param array  $categories
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function ImportMessageReadFlag($id, $flags, $categories = []) {
-		list($fsk, $sk) = Utils::SplitMessageId($id);
-
-		// if $fsk is set, we convert it into a backend id.
-		if ($fsk) {
-			$fsk = GSync::GetDeviceManager()->GetBackendIdForFolderId($fsk);
-		}
-
-		// read flag change for our current folder
-		if ($this->folderidHex == $fsk || empty($fsk)) {
-			// check if it is in the synchronization interval and/or shared+private
-			if (!$this->isModificationAllowed($sk)) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Flag update is not allowed. Flags not updated.", $id, $flags), SYNC_STATUS_OBJECTNOTFOUND);
-			}
-
-			// check for conflicts
-			/*
+    /**
+     * Loads objects which are expected to be exported with the state
+     * Before importing/saving the actual message from the mobile, a conflict detection should be done.
+     *
+     * @param ContentParameters $contentparameters class of objects
+     * @param string            $state
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function LoadConflicts($contentparameters, $state) {
+        if (!isset($this->session) || !isset($this->store) || !isset($this->folderid)) {
+            throw new StatusException("ImportChangesICS->LoadConflicts(): Error, can not load changes for conflict detection. Session, store or folder information not available", SYNC_STATUS_SERVERERROR);
+        }
+
+        // save data to load changes later if necessary
+        $this->conflictsLoaded = false;
+        $this->conflictsContentParameters = $contentparameters;
+        $this->conflictsState = $state;
+
+        SLog::Write(LOGLEVEL_DEBUG, "ImportChangesICS->LoadConflicts(): will be loaded later if necessary");
+
+        return true;
+    }
+
+    /**
+     * Potential conflicts are only loaded when really necessary,
+     * e.g. on ADD or MODIFY.
+     *
+     * @return bool
+     */
+    private function lazyLoadConflicts() {
+        if (!isset($this->session) || !isset($this->store) || !isset($this->folderid) ||
+            !isset($this->conflictsContentParameters) || $this->conflictsState === false) {
+            SLog::Write(LOGLEVEL_WARN, "ImportChangesICS->lazyLoadConflicts(): can not load potential conflicting changes in lazymode for conflict detection. Missing information");
+
+            return false;
+        }
+
+        if (!$this->conflictsLoaded) {
+            SLog::Write(LOGLEVEL_DEBUG, "ImportChangesICS->lazyLoadConflicts(): loading..");
+
+            // configure an exporter so we can detect conflicts
+            $exporter = new ExportChangesICS($this->session, $this->store, $this->folderid);
+            $exporter->Config($this->conflictsState);
+            $exporter->ConfigContentParameters($this->conflictsContentParameters);
+            $exporter->InitializeExporter($this->memChanges);
+
+            // monitor how long it takes to export potential conflicts
+            // if this takes "too long" we cancel this operation!
+            $potConflicts = $exporter->GetChangeCount();
+            if ($potConflicts > 100) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): conflict detection abandoned as there are too many (%d) changes to be exported.", $potConflicts));
+                $this->conflictsLoaded = true;
+
+                return false;
+            }
+            $started = time();
+            $exported = 0;
+
+            try {
+                while (is_array($exporter->Synchronize())) {
+                    ++$exported;
+
+                    // stop if this takes more than 15 seconds and there are more than 5 changes still to be exported
+                    // within 20 seconds this should be finished or it will not be performed
+                    if ((time() - $started) > 15 && ($potConflicts - $exported) > 5) {
+                        SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): conflict detection cancelled as operation is too slow. In %d seconds only %d from %d changes were processed.", (time() - $started), $exported, $potConflicts));
+                        $this->conflictsLoaded = true;
+
+                        return false;
+                    }
+                }
+            }
+            // something really bad happened while exporting changes
+            catch (StatusException $stex) {
+                SLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): got StatusException code %d while exporting changes. Ignore and mark conflicts as loaded.", $stex->getCode()));
+            }
+            $this->conflictsLoaded = true;
+        }
+
+        return true;
+    }
+
+    /**
+     * Imports a single message.
+     *
+     * @param string     $id
+     * @param SyncObject $message
+     *
+     * @throws StatusException
+     *
+     * @return boolean/string - failure / id of message
+     */
+    public function ImportMessageChange($id, $message) {
+        $flags = 0;
+        $props = [];
+        $props[PR_PARENT_SOURCE_KEY] = $this->folderid;
+
+        // set the PR_SOURCE_KEY if available or mark it as new message
+        if ($id) {
+            list(, $sk) = Utils::SplitMessageId($id);
+            $props[PR_SOURCE_KEY] = hex2bin($sk);
+
+            // check if message is in the synchronization interval and/or shared+private
+            if (!$this->isModificationAllowed($sk)) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Message modification is not allowed. Data not saved.", $id, get_class($message)), SYNC_STATUS_SYNCCANNOTBECOMPLETED);
+            }
+
+            // check for conflicts
+            $this->lazyLoadConflicts();
+            if ($this->memChanges->IsChanged($id)) {
+                if ($this->flags & SYNC_CONFLICT_OVERWRITE_PIM) {
+                    // in these cases the status SYNC_STATUS_CONFLICTCLIENTSERVEROBJECT should be returned, so the mobile client can inform the end user
+                    throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from PIM will be dropped! Server overwrites PIM. User is informed.", $id, get_class($message)), SYNC_STATUS_CONFLICTCLIENTSERVEROBJECT, null, LOGLEVEL_INFO);
+
+                    return false;
+                }
+
+                SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from Server will be dropped! PIM overwrites server.", $id, get_class($message)));
+            }
+            if ($this->memChanges->IsDeleted($id)) {
+                SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from PIM will be dropped! Object was deleted on server.", $id, get_class($message)));
+
+                return false;
+            }
+        }
+        else {
+            $flags = SYNC_NEW_MESSAGE;
+        }
+
+        if (mapi_importcontentschanges_importmessagechange($this->importer, $props, $flags, $mapimessage)) {
+            $this->mapiprovider->SetMessage($mapimessage, $message);
+            mapi_savechanges($mapimessage);
+
+            if (mapi_last_hresult()) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error, mapi_savechanges() failed: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_SYNCCANNOTBECOMPLETED);
+            }
+
+            $sourcekeyprops = mapi_getprops($mapimessage, [PR_SOURCE_KEY]);
+
+            return $this->prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+        }
+
+        throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error updating object: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+    }
+
+    /**
+     * Imports a deletion. This may conflict if the local object has been modified.
+     *
+     * @param string $id
+     * @param bool   $asSoftDelete (opt) if true, the deletion is exported as "SoftDelete", else as "Remove" - default: false
+     *
+     * @return bool
+     */
+    public function ImportMessageDeletion($id, $asSoftDelete = false) {
+        list(, $sk) = Utils::SplitMessageId($id);
+
+        // check if message is in the synchronization interval and/or shared+private
+        if (!$this->isModificationAllowed($sk)) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Message deletion is not allowed. Deletion not executed.", $id), SYNC_STATUS_OBJECTNOTFOUND);
+        }
+
+        // check for conflicts
+        $this->lazyLoadConflicts();
+        if ($this->memChanges->IsChanged($id)) {
+            SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data from Server will be dropped! PIM deleted object.", $id));
+        }
+        elseif ($this->memChanges->IsDeleted($id)) {
+            SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data is already deleted. Request will be ignored.", $id));
+
+            return true;
+        }
+
+        // do a 'soft' delete so people can un-delete if necessary
+        if (mapi_importcontentschanges_importmessagedeletion($this->importer, 1, [hex2bin($sk)])) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Error updating object: 0x%X", $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        }
+
+        return true;
+    }
+
+    /**
+     * Imports a change in 'read' flag
+     * This can never conflict.
+     *
+     * @param string $id
+     * @param int    $flags      - read/unread
+     * @param array  $categories
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function ImportMessageReadFlag($id, $flags, $categories = []) {
+        list($fsk, $sk) = Utils::SplitMessageId($id);
+
+        // if $fsk is set, we convert it into a backend id.
+        if ($fsk) {
+            $fsk = GSync::GetDeviceManager()->GetBackendIdForFolderId($fsk);
+        }
+
+        // read flag change for our current folder
+        if ($this->folderidHex == $fsk || empty($fsk)) {
+            // check if it is in the synchronization interval and/or shared+private
+            if (!$this->isModificationAllowed($sk)) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Flag update is not allowed. Flags not updated.", $id, $flags), SYNC_STATUS_OBJECTNOTFOUND);
+            }
+
+            // check for conflicts
+            /*
 			 * Checking for conflicts is correct at this point, but is a very expensive operation.
 			 * If the message was deleted, only an error will be shown.
 			 *
@@ -490,333 +490,333 @@ 
 			}
 			 */
 
-			$readstate = ["sourcekey" => hex2bin($sk), "flags" => $flags];
-
-			if (!mapi_importcontentschanges_importperuserreadstatechange($this->importer, [$readstate])) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Error setting read state: 0x%X", $id, $flags, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
-			}
-		}
-		// yeah OL sucks - ZP-779
-		else {
-			if (!$fsk) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Error setting read state. The message is in another folder but id is unknown as no short folder id is available. Please remove your device states to fully resync your device. Operation ignored.", $id, $flags), SYNC_STATUS_OBJECTNOTFOUND);
-			}
-			$store = GSync::GetBackend()->GetMAPIStoreForFolderId(GSync::GetAdditionalSyncFolderStore($fsk), $fsk);
-			$entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($fsk), hex2bin($sk));
-			$realMessage = mapi_msgstore_openentry($store, $entryid);
-			$flag = 0;
-			if ($flags == 0) {
-				$flag |= CLEAR_READ_FLAG;
-			}
-			$p = mapi_message_setreadflag($realMessage, $flag);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): setting readflag on message: 0x%X", $id, $flags, mapi_last_hresult()));
-		}
-
-		return true;
-	}
-
-	/**
-	 * Imports a move of a message. This occurs when a user moves an item to another folder.
-	 *
-	 * Normally, we would implement this via the 'offical' importmessagemove() function on the ICS importer,
-	 * but the grommunio importer does not support this. Therefore we currently implement it via a standard mapi
-	 * call. This causes a mirror 'add/delete' to be sent to the PDA at the next sync.
-	 * Manfred, 2010-10-21. For some mobiles import was causing duplicate messages in the destination folder
-	 * (Mantis #202). Therefore we will create a new message in the destination folder, copy properties
-	 * of the source message to the new one and then delete the source message.
-	 *
-	 * @param string $id
-	 * @param string $newfolder destination folder
-	 *
-	 * @throws StatusException
-	 *
-	 * @return boolean/string
-	 */
-	public function ImportMessageMove($id, $newfolder) {
-		list(, $sk) = Utils::SplitMessageId($id);
-		if (strtolower($newfolder) == strtolower(bin2hex($this->folderid))) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, source and destination are equal", $id, $newfolder), SYNC_MOVEITEMSSTATUS_SAMESOURCEANDDEST);
-		}
-
-		// Get the entryid of the message we're moving
-		$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid, hex2bin($sk));
-		$srcmessage = false;
-
-		if ($entryid) {
-			// open the source message
-			$srcmessage = mapi_msgstore_openentry($this->store, $entryid);
-		}
-
-		if (!$entryid || !$srcmessage) {
-			$code = SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID;
-			$mapiLastHresult = mapi_last_hresult();
-			// if we move to the trash and the source message is not found, we can also just tell the mobile that we successfully moved to avoid errors (ZP-624)
-			if ($newfolder == GSync::GetBackend()->GetWasteBasket()) {
-				$code = SYNC_MOVEITEMSSTATUS_SUCCESS;
-			}
-			$errorCase = !$entryid ? "resolve source message id" : "open source message";
-
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to %s: 0x%X", $sk, $newfolder, $errorCase, $mapiLastHresult), $code);
-		}
-
-		// check if it is in the synchronization interval and/or shared+private
-		if (!$this->isModificationAllowed($sk)) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Source message move is not allowed. Move not performed.", $id, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
-		}
-
-		// get correct mapi store for the destination folder
-		$dststore = GSync::GetBackend()->GetMAPIStoreForFolderId(GSync::GetAdditionalSyncFolderStore($newfolder), $newfolder);
-		if ($dststore === false) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open store of destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
-		}
-
-		$dstentryid = mapi_msgstore_entryidfromsourcekey($dststore, hex2bin($newfolder));
-		if (!$dstentryid) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
-		}
-
-		$dstfolder = mapi_msgstore_openentry($dststore, $dstentryid);
-		if (!$dstfolder) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
-		}
-
-		$newmessage = mapi_folder_createmessage($dstfolder);
-		if (!$newmessage) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to create message in destination folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
-		}
-
-		// Copy message
-		mapi_copyto($srcmessage, [], [], $newmessage);
-		if (mapi_last_hresult()) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, copy to destination message failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
-		}
-
-		$srcfolderentryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid);
-		if (!$srcfolderentryid) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve source folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
-		}
-
-		$srcfolder = mapi_msgstore_openentry($this->store, $srcfolderentryid);
-		if (!$srcfolder) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open source folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
-		}
-
-		// Save changes
-		mapi_savechanges($newmessage);
-		if (mapi_last_hresult()) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, mapi_savechanges() failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
-		}
-
-		// Delete the old message
-		if (!mapi_folder_deletemessages($srcfolder, [$entryid])) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, delete of source message failed: 0x%X. Possible duplicates.", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_SOURCEORDESTLOCKED);
-		}
-
-		$sourcekeyprops = mapi_getprops($newmessage, [PR_SOURCE_KEY]);
-		if (isset($sourcekeyprops[PR_SOURCE_KEY]) && $sourcekeyprops[PR_SOURCE_KEY]) {
-			$prefix = "";
-			// prepend the destination short folderid, if it exists
-			$destShortId = GSync::GetDeviceManager()->GetFolderIdForBackendId($newfolder);
-			if ($destShortId !== $newfolder) {
-				$prefix = $destShortId . ":";
-			}
-
-			return $prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
-		}
-
-		return false;
-	}
-
-	/*----------------------------------------------------------------------------------------------------------
+            $readstate = ["sourcekey" => hex2bin($sk), "flags" => $flags];
+
+            if (!mapi_importcontentschanges_importperuserreadstatechange($this->importer, [$readstate])) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Error setting read state: 0x%X", $id, $flags, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+            }
+        }
+        // yeah OL sucks - ZP-779
+        else {
+            if (!$fsk) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Error setting read state. The message is in another folder but id is unknown as no short folder id is available. Please remove your device states to fully resync your device. Operation ignored.", $id, $flags), SYNC_STATUS_OBJECTNOTFOUND);
+            }
+            $store = GSync::GetBackend()->GetMAPIStoreForFolderId(GSync::GetAdditionalSyncFolderStore($fsk), $fsk);
+            $entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($fsk), hex2bin($sk));
+            $realMessage = mapi_msgstore_openentry($store, $entryid);
+            $flag = 0;
+            if ($flags == 0) {
+                $flag |= CLEAR_READ_FLAG;
+            }
+            $p = mapi_message_setreadflag($realMessage, $flag);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): setting readflag on message: 0x%X", $id, $flags, mapi_last_hresult()));
+        }
+
+        return true;
+    }
+
+    /**
+     * Imports a move of a message. This occurs when a user moves an item to another folder.
+     *
+     * Normally, we would implement this via the 'offical' importmessagemove() function on the ICS importer,
+     * but the grommunio importer does not support this. Therefore we currently implement it via a standard mapi
+     * call. This causes a mirror 'add/delete' to be sent to the PDA at the next sync.
+     * Manfred, 2010-10-21. For some mobiles import was causing duplicate messages in the destination folder
+     * (Mantis #202). Therefore we will create a new message in the destination folder, copy properties
+     * of the source message to the new one and then delete the source message.
+     *
+     * @param string $id
+     * @param string $newfolder destination folder
+     *
+     * @throws StatusException
+     *
+     * @return boolean/string
+     */
+    public function ImportMessageMove($id, $newfolder) {
+        list(, $sk) = Utils::SplitMessageId($id);
+        if (strtolower($newfolder) == strtolower(bin2hex($this->folderid))) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, source and destination are equal", $id, $newfolder), SYNC_MOVEITEMSSTATUS_SAMESOURCEANDDEST);
+        }
+
+        // Get the entryid of the message we're moving
+        $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid, hex2bin($sk));
+        $srcmessage = false;
+
+        if ($entryid) {
+            // open the source message
+            $srcmessage = mapi_msgstore_openentry($this->store, $entryid);
+        }
+
+        if (!$entryid || !$srcmessage) {
+            $code = SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID;
+            $mapiLastHresult = mapi_last_hresult();
+            // if we move to the trash and the source message is not found, we can also just tell the mobile that we successfully moved to avoid errors (ZP-624)
+            if ($newfolder == GSync::GetBackend()->GetWasteBasket()) {
+                $code = SYNC_MOVEITEMSSTATUS_SUCCESS;
+            }
+            $errorCase = !$entryid ? "resolve source message id" : "open source message";
+
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to %s: 0x%X", $sk, $newfolder, $errorCase, $mapiLastHresult), $code);
+        }
+
+        // check if it is in the synchronization interval and/or shared+private
+        if (!$this->isModificationAllowed($sk)) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Source message move is not allowed. Move not performed.", $id, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        }
+
+        // get correct mapi store for the destination folder
+        $dststore = GSync::GetBackend()->GetMAPIStoreForFolderId(GSync::GetAdditionalSyncFolderStore($newfolder), $newfolder);
+        if ($dststore === false) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open store of destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        }
+
+        $dstentryid = mapi_msgstore_entryidfromsourcekey($dststore, hex2bin($newfolder));
+        if (!$dstentryid) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        }
+
+        $dstfolder = mapi_msgstore_openentry($dststore, $dstentryid);
+        if (!$dstfolder) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        }
+
+        $newmessage = mapi_folder_createmessage($dstfolder);
+        if (!$newmessage) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to create message in destination folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        }
+
+        // Copy message
+        mapi_copyto($srcmessage, [], [], $newmessage);
+        if (mapi_last_hresult()) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, copy to destination message failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
+        }
+
+        $srcfolderentryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid);
+        if (!$srcfolderentryid) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve source folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        }
+
+        $srcfolder = mapi_msgstore_openentry($this->store, $srcfolderentryid);
+        if (!$srcfolder) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open source folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        }
+
+        // Save changes
+        mapi_savechanges($newmessage);
+        if (mapi_last_hresult()) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, mapi_savechanges() failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
+        }
+
+        // Delete the old message
+        if (!mapi_folder_deletemessages($srcfolder, [$entryid])) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, delete of source message failed: 0x%X. Possible duplicates.", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_SOURCEORDESTLOCKED);
+        }
+
+        $sourcekeyprops = mapi_getprops($newmessage, [PR_SOURCE_KEY]);
+        if (isset($sourcekeyprops[PR_SOURCE_KEY]) && $sourcekeyprops[PR_SOURCE_KEY]) {
+            $prefix = "";
+            // prepend the destination short folderid, if it exists
+            $destShortId = GSync::GetDeviceManager()->GetFolderIdForBackendId($newfolder);
+            if ($destShortId !== $newfolder) {
+                $prefix = $destShortId . ":";
+            }
+
+            return $prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+        }
+
+        return false;
+    }
+
+    /*----------------------------------------------------------------------------------------------------------
 	 * Methods for HierarchyExporter
 	 */
 
-	/**
-	 * Imports a change on a folder.
-	 *
-	 * @param object $folder SyncFolder
-	 *
-	 * @throws StatusException
-	 *
-	 * @return boolean/SyncFolder       false on error or a SyncFolder object with serverid and BackendId set (if available)
-	 */
-	public function ImportFolderChange($folder) {
-		$id = isset($folder->BackendId) ? $folder->BackendId : false;
-		$parent = $folder->parentid;
-		$parent_org = $folder->parentid;
-		$displayname = u2wi($folder->displayname);
-		$type = $folder->type;
-
-		if (Utils::IsSystemFolder($type)) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, system folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
-		}
-
-		// create a new folder if $id is not set
-		if (!$id) {
-			// the root folder is "0" - get IPM_SUBTREE
-			if ($parent == "0") {
-				$parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-				if (GSync::GetBackend()->GetImpersonatedUser() == 'system' && isset($parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID])) {
-					$parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-				}
-				elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
-					$parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
-				}
-			}
-			else {
-				$parentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
-			}
-
-			if (!$parentfentryid) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (no entry id)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
-			}
-
-			$parentfolder = mapi_msgstore_openentry($this->store, $parentfentryid);
-			if (!$parentfolder) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (open entry)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
-			}
-
-			//  mapi_folder_createfolder() fails if a folder with this name already exists -> MAPI_E_COLLISION
-			$newfolder = mapi_folder_createfolder($parentfolder, $displayname, "");
-			if (mapi_last_hresult()) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_folder_createfolder() failed: 0x%X", Utils::PrintAsString(false), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_FOLDEREXISTS);
-			}
-
-			mapi_setprops($newfolder, [PR_CONTAINER_CLASS => MAPIUtils::GetContainerClassFromFolderType($type)]);
-
-			$props = mapi_getprops($newfolder, [PR_SOURCE_KEY]);
-			if (isset($props[PR_SOURCE_KEY])) {
-				$folder->BackendId = bin2hex($props[PR_SOURCE_KEY]);
-				$folderOrigin = DeviceManager::FLD_ORIGIN_USER;
-				if (GSync::GetBackend()->GetImpersonatedUser()) {
-					$folderOrigin = DeviceManager::FLD_ORIGIN_IMPERSONATED;
-				}
-				$folder->serverid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folder->displayname);
-				SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): Created folder '%s' with id: '%s' backendid: '%s'", $displayname, $folder->serverid, $folder->BackendId));
-
-				return $folder;
-			}
-
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, folder created but PR_SOURCE_KEY not available: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
-		}
-
-		// open folder for update
-		$entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($id));
-		if (!$entryid) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
-		}
-
-		// check if this is a MAPI default folder
-		if ($this->mapiprovider->IsMAPIDefaultFolder($entryid)) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, MAPI default folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
-		}
-
-		$mfolder = mapi_msgstore_openentry($this->store, $entryid);
-		if (!$mfolder) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
-		}
-
-		$props = mapi_getprops($mfolder, [PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_DISPLAY_NAME, PR_CONTAINER_CLASS]);
-		if (!isset($props[PR_SOURCE_KEY]) || !isset($props[PR_PARENT_SOURCE_KEY]) || !isset($props[PR_DISPLAY_NAME]) || !isset($props[PR_CONTAINER_CLASS])) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, folder data not available: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
-		}
-
-		// get the real parent source key from mapi
-		if ($parent == "0") {
-			$parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-			if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
-				$parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-			}
-			else {
-				$parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
-			}
-			$mapifolder = mapi_msgstore_openentry($this->store, $parentfentryid);
-
-			$rootfolderprops = mapi_getprops($mapifolder, [PR_SOURCE_KEY]);
-			$parent = bin2hex($rootfolderprops[PR_SOURCE_KEY]);
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): resolved AS parent '0' to sourcekey '%s'", $parent));
-		}
-
-		// a changed parent id means that the folder should be moved
-		if (bin2hex($props[PR_PARENT_SOURCE_KEY]) !== $parent) {
-			$sourceparentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, $props[PR_PARENT_SOURCE_KEY]);
-			if (!$sourceparentfentryid) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent source folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
-			}
-
-			$sourceparentfolder = mapi_msgstore_openentry($this->store, $sourceparentfentryid);
-			if (!$sourceparentfolder) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent source folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
-			}
-
-			$destparentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
-			if (!$sourceparentfentryid) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open destination folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
-			}
-
-			$destfolder = mapi_msgstore_openentry($this->store, $destparentfentryid);
-			if (!$destfolder) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open destination folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
-			}
-
-			// mapi_folder_copyfolder() fails if a folder with this name already exists -> MAPI_E_COLLISION
-			if (!mapi_folder_copyfolder($sourceparentfolder, $entryid, $destfolder, $displayname, FOLDER_MOVE)) {
-				throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to move folder: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_FOLDEREXISTS);
-			}
-
-			// the parent changed, but we got a backendID as parent and have to return an AS folderid - the parent-backendId must be mapped at this point already
-			if ($folder->parentid != 0) {
-				$folder->parentid = GSync::GetDeviceManager()->GetFolderIdForBackendId($parent);
-			}
-			SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): Moved folder '%s' with id: %s/%s from: %s to: %s/%s", $displayname, $folder->serverid, $folder->BackendId, bin2hex($props[PR_PARENT_SOURCE_KEY]), $folder->parentid, $parent_org));
-
-			return $folder;
-		}
-
-		// update the display name
-		$props = [PR_DISPLAY_NAME => $displayname];
-		mapi_setprops($mfolder, $props);
-		mapi_savechanges($mfolder);
-		if (mapi_last_hresult()) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_savechanges() failed: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
-		}
-
-		SLog::Write(LOGLEVEL_DEBUG, "Imported changes for folder: {$id}");
-
-		return true;
-	}
-
-	/**
-	 * Imports a folder deletion.
-	 *
-	 * @param SyncFolder $folder at least "serverid" needs to be set
-	 *
-	 * @throws StatusException
-	 *
-	 * @return int SYNC_FOLDERHIERARCHY_STATUS
-	 */
-	public function ImportFolderDeletion($folder) {
-		$id = $folder->BackendId;
-		$parent = isset($folder->parentid) ? $folder->parentid : false;
-		SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): importing folder deletetion", $id, $parent));
-
-		$folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($id));
-		if (!$folderentryid) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error, unable to resolve folder", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_FOLDERDOESNOTEXIST);
-		}
-
-		// get the folder type from the MAPIProvider
-		$type = $this->mapiprovider->GetFolderType($folderentryid);
-
-		if (Utils::IsSystemFolder($type) || $this->mapiprovider->IsMAPIDefaultFolder($folderentryid)) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting system/default folder", $id, $parent), SYNC_FSSTATUS_SYSTEMFOLDER);
-		}
-
-		$ret = mapi_importhierarchychanges_importfolderdeletion($this->importer, 0, [PR_SOURCE_KEY => hex2bin($id)]);
-		if (!$ret) {
-			throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting folder: 0x%X", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
-		}
-
-		return $ret;
-	}
+    /**
+     * Imports a change on a folder.
+     *
+     * @param object $folder SyncFolder
+     *
+     * @throws StatusException
+     *
+     * @return boolean/SyncFolder       false on error or a SyncFolder object with serverid and BackendId set (if available)
+     */
+    public function ImportFolderChange($folder) {
+        $id = isset($folder->BackendId) ? $folder->BackendId : false;
+        $parent = $folder->parentid;
+        $parent_org = $folder->parentid;
+        $displayname = u2wi($folder->displayname);
+        $type = $folder->type;
+
+        if (Utils::IsSystemFolder($type)) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, system folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
+        }
+
+        // create a new folder if $id is not set
+        if (!$id) {
+            // the root folder is "0" - get IPM_SUBTREE
+            if ($parent == "0") {
+                $parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
+                if (GSync::GetBackend()->GetImpersonatedUser() == 'system' && isset($parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID])) {
+                    $parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
+                }
+                elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
+                    $parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
+                }
+            }
+            else {
+                $parentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
+            }
+
+            if (!$parentfentryid) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (no entry id)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
+            }
+
+            $parentfolder = mapi_msgstore_openentry($this->store, $parentfentryid);
+            if (!$parentfolder) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (open entry)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
+            }
+
+            //  mapi_folder_createfolder() fails if a folder with this name already exists -> MAPI_E_COLLISION
+            $newfolder = mapi_folder_createfolder($parentfolder, $displayname, "");
+            if (mapi_last_hresult()) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_folder_createfolder() failed: 0x%X", Utils::PrintAsString(false), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_FOLDEREXISTS);
+            }
+
+            mapi_setprops($newfolder, [PR_CONTAINER_CLASS => MAPIUtils::GetContainerClassFromFolderType($type)]);
+
+            $props = mapi_getprops($newfolder, [PR_SOURCE_KEY]);
+            if (isset($props[PR_SOURCE_KEY])) {
+                $folder->BackendId = bin2hex($props[PR_SOURCE_KEY]);
+                $folderOrigin = DeviceManager::FLD_ORIGIN_USER;
+                if (GSync::GetBackend()->GetImpersonatedUser()) {
+                    $folderOrigin = DeviceManager::FLD_ORIGIN_IMPERSONATED;
+                }
+                $folder->serverid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folder->displayname);
+                SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): Created folder '%s' with id: '%s' backendid: '%s'", $displayname, $folder->serverid, $folder->BackendId));
+
+                return $folder;
+            }
+
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, folder created but PR_SOURCE_KEY not available: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        }
+
+        // open folder for update
+        $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($id));
+        if (!$entryid) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
+        }
+
+        // check if this is a MAPI default folder
+        if ($this->mapiprovider->IsMAPIDefaultFolder($entryid)) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, MAPI default folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
+        }
+
+        $mfolder = mapi_msgstore_openentry($this->store, $entryid);
+        if (!$mfolder) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
+        }
+
+        $props = mapi_getprops($mfolder, [PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_DISPLAY_NAME, PR_CONTAINER_CLASS]);
+        if (!isset($props[PR_SOURCE_KEY]) || !isset($props[PR_PARENT_SOURCE_KEY]) || !isset($props[PR_DISPLAY_NAME]) || !isset($props[PR_CONTAINER_CLASS])) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, folder data not available: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        }
+
+        // get the real parent source key from mapi
+        if ($parent == "0") {
+            $parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
+            if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
+                $parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
+            }
+            else {
+                $parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
+            }
+            $mapifolder = mapi_msgstore_openentry($this->store, $parentfentryid);
+
+            $rootfolderprops = mapi_getprops($mapifolder, [PR_SOURCE_KEY]);
+            $parent = bin2hex($rootfolderprops[PR_SOURCE_KEY]);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): resolved AS parent '0' to sourcekey '%s'", $parent));
+        }
+
+        // a changed parent id means that the folder should be moved
+        if (bin2hex($props[PR_PARENT_SOURCE_KEY]) !== $parent) {
+            $sourceparentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, $props[PR_PARENT_SOURCE_KEY]);
+            if (!$sourceparentfentryid) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent source folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
+            }
+
+            $sourceparentfolder = mapi_msgstore_openentry($this->store, $sourceparentfentryid);
+            if (!$sourceparentfolder) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent source folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
+            }
+
+            $destparentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
+            if (!$sourceparentfentryid) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open destination folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+            }
+
+            $destfolder = mapi_msgstore_openentry($this->store, $destparentfentryid);
+            if (!$destfolder) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open destination folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+            }
+
+            // mapi_folder_copyfolder() fails if a folder with this name already exists -> MAPI_E_COLLISION
+            if (!mapi_folder_copyfolder($sourceparentfolder, $entryid, $destfolder, $displayname, FOLDER_MOVE)) {
+                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to move folder: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_FOLDEREXISTS);
+            }
+
+            // the parent changed, but we got a backendID as parent and have to return an AS folderid - the parent-backendId must be mapped at this point already
+            if ($folder->parentid != 0) {
+                $folder->parentid = GSync::GetDeviceManager()->GetFolderIdForBackendId($parent);
+            }
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): Moved folder '%s' with id: %s/%s from: %s to: %s/%s", $displayname, $folder->serverid, $folder->BackendId, bin2hex($props[PR_PARENT_SOURCE_KEY]), $folder->parentid, $parent_org));
+
+            return $folder;
+        }
+
+        // update the display name
+        $props = [PR_DISPLAY_NAME => $displayname];
+        mapi_setprops($mfolder, $props);
+        mapi_savechanges($mfolder);
+        if (mapi_last_hresult()) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_savechanges() failed: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        }
+
+        SLog::Write(LOGLEVEL_DEBUG, "Imported changes for folder: {$id}");
+
+        return true;
+    }
+
+    /**
+     * Imports a folder deletion.
+     *
+     * @param SyncFolder $folder at least "serverid" needs to be set
+     *
+     * @throws StatusException
+     *
+     * @return int SYNC_FOLDERHIERARCHY_STATUS
+     */
+    public function ImportFolderDeletion($folder) {
+        $id = $folder->BackendId;
+        $parent = isset($folder->parentid) ? $folder->parentid : false;
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): importing folder deletetion", $id, $parent));
+
+        $folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($id));
+        if (!$folderentryid) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error, unable to resolve folder", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_FOLDERDOESNOTEXIST);
+        }
+
+        // get the folder type from the MAPIProvider
+        $type = $this->mapiprovider->GetFolderType($folderentryid);
+
+        if (Utils::IsSystemFolder($type) || $this->mapiprovider->IsMAPIDefaultFolder($folderentryid)) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting system/default folder", $id, $parent), SYNC_FSSTATUS_SYSTEMFOLDER);
+        }
+
+        $ret = mapi_importhierarchychanges_importfolderdeletion($this->importer, 0, [PR_SOURCE_KEY => hex2bin($id)]);
+        if (!$ret) {
+            throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting folder: 0x%X", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        }
+
+        return $ret;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
 			$folderidForBackendId = GSync::GetDeviceManager()->GetFolderIdForBackendId($this->folderidHex);
 			// Only append backend id if the mapping backendid<->folderid is available.
 			if ($folderidForBackendId != $this->folderidHex) {
-				$this->prefix = $folderidForBackendId . ':';
+				$this->prefix = $folderidForBackendId.':';
 			}
 		}
 		else {
@@ -410,7 +410,7 @@ 
 
 			$sourcekeyprops = mapi_getprops($mapimessage, [PR_SOURCE_KEY]);
 
-			return $this->prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+			return $this->prefix.bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
 		}
 
 		throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error updating object: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
@@ -618,10 +618,10 @@ 
 			// prepend the destination short folderid, if it exists
 			$destShortId = GSync::GetDeviceManager()->GetFolderIdForBackendId($newfolder);
 			if ($destShortId !== $newfolder) {
-				$prefix = $destShortId . ":";
+				$prefix = $destShortId.":";
 			}
 
-			return $prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+			return $prefix.bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
 		}
 
 		return false;

Braces +10 added lines, -20 removed lines

@@ -60,13 +60,11 @@ 
 			if ($folderidForBackendId != $this->folderidHex) {
 				$this->prefix = $folderidForBackendId . ':';
 			}
-		}
-		else {
+		} else {
 			$storeprops = mapi_getprops($store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
 			if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
 				$entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-			}
-			else {
+			} else {
 				$entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
 			}
 		}
@@ -88,8 +86,7 @@ 
 
 		if ($folderid) {
 			$this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportContentsChanges, 0, 0);
-		}
-		else {
+		} else {
 			$this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportHierarchyChanges, 0, 0);
 		}
 	}
@@ -127,8 +124,7 @@ 
 			// possible conflicting messages will be cached here
 			$this->memChanges = new ChangesMemoryWrapper();
 			$stat = mapi_importcontentschanges_config($this->importer, $stream, $flags);
-		}
-		else {
+		} else {
 			$stat = mapi_importhierarchychanges_config($this->importer, $stream, $flags);
 		}
 
@@ -201,8 +197,7 @@ 
 			$data = mapi_stream_read($this->statestream, 4096);
 			if (strlen($data)) {
 				$state .= $data;
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -395,8 +390,7 @@ 
 
 				return false;
 			}
-		}
-		else {
+		} else {
 			$flags = SYNC_NEW_MESSAGE;
 		}
 
@@ -436,8 +430,7 @@ 
 		$this->lazyLoadConflicts();
 		if ($this->memChanges->IsChanged($id)) {
 			SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data from Server will be dropped! PIM deleted object.", $id));
-		}
-		elseif ($this->memChanges->IsDeleted($id)) {
+		} elseif ($this->memChanges->IsDeleted($id)) {
 			SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data is already deleted. Request will be ignored.", $id));
 
 			return true;
@@ -658,12 +651,10 @@ 
 				$parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
 				if (GSync::GetBackend()->GetImpersonatedUser() == 'system' && isset($parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID])) {
 					$parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-				}
-				elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
+				} elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
 					$parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
 				}
-			}
-			else {
+			} else {
 				$parentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
 			}
 
@@ -726,8 +717,7 @@ 
 			$parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
 			if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
 				$parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-			}
-			else {
+			} else {
 				$parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
 			}
 			$mapifolder = mapi_msgstore_openentry($this->store, $parentfentryid);

lib/interface/ichanges.php

Indentation +35 added lines, -35 removed lines

@@ -11,42 +11,42 @@
  */
 
 interface IChanges {
-	/**
-	 * Constructor.
-	 *
-	 * @param mixed $state
-	 * @param mixed $flags
-	 *
-	 * @throws StatusException
-	 */
+    /**
+     * Constructor.
+     *
+     * @param mixed $state
+     * @param mixed $flags
+     *
+     * @throws StatusException
+     */
 
-	/**
-	 * Initializes the state and flags.
-	 *
-	 * @param string $state
-	 * @param int    $flags
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool status flag
-	 */
-	public function Config($state, $flags = 0);
+    /**
+     * Initializes the state and flags.
+     *
+     * @param string $state
+     * @param int    $flags
+     *
+     * @throws StatusException
+     *
+     * @return bool status flag
+     */
+    public function Config($state, $flags = 0);
 
-	/**
-	 * Configures additional parameters used for content synchronization.
-	 *
-	 * @param ContentParameters $contentparameters
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function ConfigContentParameters($contentparameters);
+    /**
+     * Configures additional parameters used for content synchronization.
+     *
+     * @param ContentParameters $contentparameters
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function ConfigContentParameters($contentparameters);
 
-	/**
-	 * Reads and returns the current state.
-	 *
-	 * @return string
-	 */
-	public function GetState();
+    /**
+     * Reads and returns the current state.
+     *
+     * @return string
+     */
+    public function GetState();
 }

lib/interface/iimportchanges.php

Indentation +78 added lines, -78 removed lines

@@ -10,94 +10,94 @@
  */
 
 interface IImportChanges extends IChanges {
-	/*----------------------------------------------------------------------------------------------------------
+    /*----------------------------------------------------------------------------------------------------------
 	 * Methods for to import contents
 	 */
 
-	/**
-	 * Loads objects which are expected to be exported with the state
-	 * Before importing/saving the actual message from the mobile, a conflict detection should be done.
-	 *
-	 * @param ContentParameters $contentparameters
-	 * @param string            $state
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function LoadConflicts($contentparameters, $state);
+    /**
+     * Loads objects which are expected to be exported with the state
+     * Before importing/saving the actual message from the mobile, a conflict detection should be done.
+     *
+     * @param ContentParameters $contentparameters
+     * @param string            $state
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function LoadConflicts($contentparameters, $state);
 
-	/**
-	 * Imports a single message.
-	 *
-	 * @param string     $id
-	 * @param SyncObject $message
-	 *
-	 * @throws StatusException
-	 *
-	 * @return boolean/string               failure / id of message
-	 */
-	public function ImportMessageChange($id, $message);
+    /**
+     * Imports a single message.
+     *
+     * @param string     $id
+     * @param SyncObject $message
+     *
+     * @throws StatusException
+     *
+     * @return boolean/string               failure / id of message
+     */
+    public function ImportMessageChange($id, $message);
 
-	/**
-	 * Imports a deletion. This may conflict if the local object has been modified.
-	 *
-	 * @param string $id
-	 * @param bool   $asSoftDelete (opt) if true, the deletion is exported as "SoftDelete", else as "Remove" - default: false
-	 *
-	 * @return bool
-	 */
-	public function ImportMessageDeletion($id, $asSoftDelete = false);
+    /**
+     * Imports a deletion. This may conflict if the local object has been modified.
+     *
+     * @param string $id
+     * @param bool   $asSoftDelete (opt) if true, the deletion is exported as "SoftDelete", else as "Remove" - default: false
+     *
+     * @return bool
+     */
+    public function ImportMessageDeletion($id, $asSoftDelete = false);
 
-	/**
-	 * Imports a change in 'read' flag
-	 * This can never conflict.
-	 *
-	 * @param string $id
-	 * @param int    $flags
-	 * @param array  $categories
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function ImportMessageReadFlag($id, $flags, $categories = []);
+    /**
+     * Imports a change in 'read' flag
+     * This can never conflict.
+     *
+     * @param string $id
+     * @param int    $flags
+     * @param array  $categories
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function ImportMessageReadFlag($id, $flags, $categories = []);
 
-	/**
-	 * Imports a move of a message. This occurs when a user moves an item to another folder.
-	 *
-	 * @param string $id
-	 * @param string $newfolder destination folder
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function ImportMessageMove($id, $newfolder);
+    /**
+     * Imports a move of a message. This occurs when a user moves an item to another folder.
+     *
+     * @param string $id
+     * @param string $newfolder destination folder
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function ImportMessageMove($id, $newfolder);
 
-	/*----------------------------------------------------------------------------------------------------------
+    /*----------------------------------------------------------------------------------------------------------
 	 * Methods to import hierarchy
 	 */
 
-	/**
-	 * Imports a change on a folder.
-	 *
-	 * @param object $folder SyncFolder
-	 *
-	 * @throws StatusException
-	 *
-	 * @return boolean/SyncObject           status/object with the ath least the serverid of the folder set
-	 */
-	public function ImportFolderChange($folder);
+    /**
+     * Imports a change on a folder.
+     *
+     * @param object $folder SyncFolder
+     *
+     * @throws StatusException
+     *
+     * @return boolean/SyncObject           status/object with the ath least the serverid of the folder set
+     */
+    public function ImportFolderChange($folder);
 
-	/**
-	 * Imports a folder deletion.
-	 *
-	 * @param SyncFolder $folder at least "serverid" needs to be set
-	 *
-	 * @throws StatusException
-	 *
-	 * @return boolean/int  success/SYNC_FOLDERHIERARCHY_STATUS
-	 */
-	public function ImportFolderDeletion($folder);
+    /**
+     * Imports a folder deletion.
+     *
+     * @param SyncFolder $folder at least "serverid" needs to be set
+     *
+     * @throws StatusException
+     *
+     * @return boolean/int  success/SYNC_FOLDERHIERARCHY_STATUS
+     */
+    public function ImportFolderDeletion($folder);
 }

lib/interface/istatemachine.php

Indentation +113 added lines, -113 removed lines

@@ -15,127 +15,127 @@
  */
 
 interface IStateMachine {
-	public const DEFTYPE = "";
-	public const DEVICEDATA = "devicedata";
-	public const FOLDERDATA = "fd";
-	public const FAILSAVE = "fs";
-	public const HIERARCHY = "hc";
-	public const BACKENDSTORAGE = "bs";
+    public const DEFTYPE = "";
+    public const DEVICEDATA = "devicedata";
+    public const FOLDERDATA = "fd";
+    public const FAILSAVE = "fs";
+    public const HIERARCHY = "hc";
+    public const BACKENDSTORAGE = "bs";
 
-	public const STATEVERSION_01 = "1";
-	public const STATEVERSION_02 = "2";
+    public const STATEVERSION_01 = "1";
+    public const STATEVERSION_02 = "2";
 
-	/**
-	 * Constructor.
-	 *
-	 * @param mixed $devid
-	 * @param mixed $type
-	 * @param mixed $key
-	 * @param mixed $counter
-	 *
-	 * @throws FatalMisconfigurationException
-	 */
+    /**
+     * Constructor.
+     *
+     * @param mixed $devid
+     * @param mixed $type
+     * @param mixed $key
+     * @param mixed $counter
+     *
+     * @throws FatalMisconfigurationException
+     */
 
-	/**
-	 * Gets a hash value indicating the latest dataset of the named
-	 * state with a specified key and counter.
-	 * If the state is changed between two calls of this method
-	 * the returned hash should be different.
-	 *
-	 * @param string $devid   the device id
-	 * @param string $type    the state type
-	 * @param string $key     (opt)
-	 * @param string $counter (opt)
-	 *
-	 * @throws StateNotFoundException, StateInvalidException, UnavailableException
-	 *
-	 * @return string
-	 */
-	public function GetStateHash($devid, $type, $key = false, $counter = false);
+    /**
+     * Gets a hash value indicating the latest dataset of the named
+     * state with a specified key and counter.
+     * If the state is changed between two calls of this method
+     * the returned hash should be different.
+     *
+     * @param string $devid   the device id
+     * @param string $type    the state type
+     * @param string $key     (opt)
+     * @param string $counter (opt)
+     *
+     * @throws StateNotFoundException, StateInvalidException, UnavailableException
+     *
+     * @return string
+     */
+    public function GetStateHash($devid, $type, $key = false, $counter = false);
 
-	/**
-	 * Gets a state for a specified key and counter.
-	 * This method should call IStateMachine->CleanStates()
-	 * to remove older states (same key, previous counters).
-	 *
-	 * @param string $devid       the device id
-	 * @param string $type        the state type
-	 * @param string $key         (opt)
-	 * @param string $counter     (opt)
-	 * @param string $cleanstates (opt)
-	 *
-	 * @throws StateNotFoundException, StateInvalidException, UnavailableException
-	 *
-	 * @return mixed
-	 */
-	public function GetState($devid, $type, $key = false, $counter = false, $cleanstates = true);
+    /**
+     * Gets a state for a specified key and counter.
+     * This method should call IStateMachine->CleanStates()
+     * to remove older states (same key, previous counters).
+     *
+     * @param string $devid       the device id
+     * @param string $type        the state type
+     * @param string $key         (opt)
+     * @param string $counter     (opt)
+     * @param string $cleanstates (opt)
+     *
+     * @throws StateNotFoundException, StateInvalidException, UnavailableException
+     *
+     * @return mixed
+     */
+    public function GetState($devid, $type, $key = false, $counter = false, $cleanstates = true);
 
-	/**
-	 * Writes ta state to for a key and counter.
-	 *
-	 * @param mixed  $state
-	 * @param string $devid   the device id
-	 * @param string $type    the state type
-	 * @param string $key     (opt)
-	 * @param int    $counter (opt)
-	 *
-	 * @throws StateInvalidException, UnavailableException
-	 *
-	 * @return bool
-	 */
-	public function SetState($state, $devid, $type, $key = false, $counter = false);
+    /**
+     * Writes ta state to for a key and counter.
+     *
+     * @param mixed  $state
+     * @param string $devid   the device id
+     * @param string $type    the state type
+     * @param string $key     (opt)
+     * @param int    $counter (opt)
+     *
+     * @throws StateInvalidException, UnavailableException
+     *
+     * @return bool
+     */
+    public function SetState($state, $devid, $type, $key = false, $counter = false);
 
-	/**
-	 * Cleans up all older states.
-	 * If called with a $counter, all states previous state counter can be removed.
-	 * If additionally the $thisCounterOnly flag is true, only that specific counter will be removed.
-	 * If called without $counter, all keys (independently from the counter) can be removed.
-	 *
-	 * @param string $devid           the device id
-	 * @param string $type            the state type
-	 * @param string $key
-	 * @param string $counter         (opt)
-	 * @param string $thisCounterOnly (opt) if provided, the exact counter only will be removed
-	 *
-	 * @throws StateInvalidException
-	 *
-	 * @return
-	 */
-	public function CleanStates($devid, $type, $key, $counter = false, $thisCounterOnly = false);
+    /**
+     * Cleans up all older states.
+     * If called with a $counter, all states previous state counter can be removed.
+     * If additionally the $thisCounterOnly flag is true, only that specific counter will be removed.
+     * If called without $counter, all keys (independently from the counter) can be removed.
+     *
+     * @param string $devid           the device id
+     * @param string $type            the state type
+     * @param string $key
+     * @param string $counter         (opt)
+     * @param string $thisCounterOnly (opt) if provided, the exact counter only will be removed
+     *
+     * @throws StateInvalidException
+     *
+     * @return
+     */
+    public function CleanStates($devid, $type, $key, $counter = false, $thisCounterOnly = false);
 
-	/**
-	 * Links a user to a device.
-	 *
-	 * @param string $username
-	 * @param string $devid
-	 *
-	 * @return bool indicating if the user was added or not (existed already)
-	 */
-	public function LinkUserDevice($username, $devid);
+    /**
+     * Links a user to a device.
+     *
+     * @param string $username
+     * @param string $devid
+     *
+     * @return bool indicating if the user was added or not (existed already)
+     */
+    public function LinkUserDevice($username, $devid);
 
-	/**
-	 * Unlinks a device from a user.
-	 *
-	 * @param string $username
-	 * @param string $devid
-	 *
-	 * @return bool
-	 */
-	public function UnLinkUserDevice($username, $devid);
+    /**
+     * Unlinks a device from a user.
+     *
+     * @param string $username
+     * @param string $devid
+     *
+     * @return bool
+     */
+    public function UnLinkUserDevice($username, $devid);
 
-	/**
-	 * Returns the current version of the state files.
-	 *
-	 * @return int
-	 */
-	public function GetStateVersion();
+    /**
+     * Returns the current version of the state files.
+     *
+     * @return int
+     */
+    public function GetStateVersion();
 
-	/**
-	 * Sets the current version of the state files.
-	 *
-	 * @param int $version the new supported version
-	 *
-	 * @return bool
-	 */
-	public function SetStateVersion($version);
+    /**
+     * Sets the current version of the state files.
+     *
+     * @param int $version the new supported version
+     *
+     * @return bool
+     */
+    public function SetStateVersion($version);
 }

lib/interface/iexportchanges.php

Indentation +23 added lines, -23 removed lines

@@ -10,29 +10,29 @@
  */
 
 interface IExportChanges extends IChanges {
-	/**
-	 * Sets the importer where the exporter will sent its changes to
-	 * This exporter should also be ready to accept calls after this.
-	 *
-	 * @param object &$importer Implementation of IImportChanges
-	 *
-	 * @throws StatusException
-	 *
-	 * @return bool
-	 */
-	public function InitializeExporter(&$importer);
+    /**
+     * Sets the importer where the exporter will sent its changes to
+     * This exporter should also be ready to accept calls after this.
+     *
+     * @param object &$importer Implementation of IImportChanges
+     *
+     * @throws StatusException
+     *
+     * @return bool
+     */
+    public function InitializeExporter(&$importer);
 
-	/**
-	 * Returns the amount of changes to be exported.
-	 *
-	 * @return int
-	 */
-	public function GetChangeCount();
+    /**
+     * Returns the amount of changes to be exported.
+     *
+     * @return int
+     */
+    public function GetChangeCount();
 
-	/**
-	 * Synchronizes a change to the configured importer.
-	 *
-	 * @return array with status information
-	 */
-	public function Synchronize();
+    /**
+     * Synchronizes a change to the configured importer.
+     *
+     * @return array with status information
+     */
+    public function Synchronize();
 }