Skip to content

Update Activesync driver #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ralflang merged 4 commits into from
Mar 16, 2026
Merged

Update Activesync driver #68

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
072e239
fix: Add deprecated dynamic properties $_cache and $_mailFolders (PHP…
amulet1 Mar 16, 2026
6c2c6b7
fix: explode() called on object instead of string in sendMail()
amulet1 Mar 16, 2026
3f9e876
refactor: Redesign constructor to extract injected objects before par…
amulet1 Mar 16, 2026
4497f01
refactor: Redesign _getMailFolders()
amulet1 Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 52 additions & 32 deletions lib/Horde/Core/ActiveSync/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
*/
protected $_modCache;

/**
* Local cache of mail folders polled from IMAP.
*
* @var array|null
*/
protected $_mailFolders = null;

/**
* Horde connector instance
*
Expand Down Expand Up @@ -94,6 +101,13 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
*/
protected $_verbs = [];

/**
* Cache object for storing search results etc.
*
* @var Horde_Cache
*/
protected $_cache;

/**
* Class => Id map
*
Expand Down Expand Up @@ -129,34 +143,45 @@ class Horde_Core_ActiveSync_Driver extends Horde_ActiveSync_Driver_Base
*/
public function __construct(array $params = [])
{
parent::__construct($params);
if (empty($this->_params['connector']) ||
!($this->_params['connector'] instanceof Horde_Core_ActiveSync_Connector)) {
$connector = self::extractArrayValue($params, 'connector');
if ($connector instanceof Horde_Core_ActiveSync_Connector) {
$this->_connector = $connector;
} else {
throw new InvalidArgumentException('Missing required connector object.');
}

if (empty($this->_params['auth']) ||
!($this->_params['auth'] instanceof Horde_Auth_Base)) {
$auth = self::extractArrayValue($params, 'auth');
if ($auth instanceof Horde_Auth_Base) {
$this->_auth = $auth;
} else {
throw new InvalidArgumentException('Missing required Auth object');
}

$this->_connector = $params['connector'];
$this->_auth = $params['auth'];
unset($this->_params['connector']);
unset($this->_params['auth']);
if (!empty($this->_params['imap'])) {
$this->_imap = $this->_params['imap'];
unset($this->_params['imap']);
}
$this->_cache = $this->_params['cache'] ?? null;
$this->_imap = self::extractArrayValue($params, 'imap');

// Build the displaymap
$this->_cache = self::extractArrayValue($params, 'cache');

// Build the displaymap (@todo: make it static)
$this->_displayMap = [
self::APPOINTMENTS_FOLDER_UID => Horde_ActiveSync_Translation::t('Calendar'),
self::CONTACTS_FOLDER_UID => Horde_ActiveSync_Translation::t('Contacts'),
self::TASKS_FOLDER_UID => Horde_ActiveSync_Translation::t('Tasks'),
self::NOTES_FOLDER_UID => Horde_ActiveSync_Translation::t('Notes'),
];

parent::__construct($params);
}

private static function extractArrayValue(array &$array, string $key)
{
if (isset($array[$key])) {
$value = $array[$key];
unset($array[$key]);
} else {
$value = null;
}

return $value;
}

/**
Expand Down Expand Up @@ -2324,7 +2349,7 @@ public function sendMail(
if ($forward || $reply) {
$source = $message->source;
if ($source->longid) {
[$folderid, $itemid] = explode(':', $source, 2);
[$folderid, $itemid] = explode(':', $source->longid, 2);
} elseif ($forward === true || $reply === true) {
$folderid = $source->folderid;
$itemid = $source->itemid;
Expand Down Expand Up @@ -3408,13 +3433,13 @@ protected function _smartStatMessage($folderid, $id, $hint)
*/
protected function _getMailFolders()
{
if (empty($this->_mailFolders)) {
if ($this->_mailFolders === null) {
if (empty($this->_imap)) {
$this->_mailFolders = [$this->_buildDummyFolder(self::SPECIAL_INBOX)];
$this->_mailFolders[] = $this->_buildDummyFolder(self::SPECIAL_TRASH);
$this->_mailFolders[] = $this->_buildDummyFolder(self::SPECIAL_SENT);
$this->_mailFolders[] = $this->_buildDummyFolder(self::SPECIAL_DRAFTS);
$this->_mailFolders[] = $this->_buildDummyFolder(self::SPECIAL_OUTBOX);
$folders = [];
$folders[] = $this->_buildDummyFolder(self::SPECIAL_INBOX);
$folders[] = $this->_buildDummyFolder(self::SPECIAL_TRASH);
$folders[] = $this->_buildDummyFolder(self::SPECIAL_SENT);
$folders[] = $this->_buildDummyFolder(self::SPECIAL_DRAFTS);
} else {
$this->_logger->meta('Polling Horde_Core_ActiveSync_Driver::_getMailFolders()');
$folders = [];
Expand All @@ -3441,23 +3466,18 @@ protected function _getMailFolders()
$folders[] = $this->_getMailFolder((string)$id, $imap_folders, $folder);
++$cnt;
} catch (Horde_ActiveSync_Exception $e) {
$this->_logger->err(
sprintf(
'Problem retrieving %s mail folder',
$id
)
);
$this->_logger->err(sprintf('Problem retrieving %s mail folder', $id));
}
}
}
++$level;
}
}

// Fake Outbox for broken clients.
$folders[] = $this->_buildDummyFolder(self::SPECIAL_OUTBOX);
// Fake Outbox for broken clients.
$folders[] = $this->_buildDummyFolder(self::SPECIAL_OUTBOX);

$this->_mailFolders = $folders;
}
$this->_mailFolders = $folders;
}

return $this->_mailFolders;
Expand Down
Loading