Skip to content

Activesync fixes #45

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
TDannhauer merged 4 commits into from
Feb 17, 2026
Merged

Activesync fixes #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46b8825
fix: Correct maximum photo size check
amulet1 Feb 16, 2026
a9701dc
fix: Correct broken code to support photos in resolveRecipient()
amulet1 Feb 16, 2026
31ae918
fix: Add missing 'source' field (expected by Horde_Core_ActiveSync_Dr…
amulet1 Feb 16, 2026
06220d4
fix: Correct maximum photo size check in _searchGal()
amulet1 Feb 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
4 changes: 2 additions & 2 deletions lib/Horde/Core/ActiveSync/Connector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,9 @@ public function resolveRecipient($query, array $opts = [])
foreach ($sources as $source) {
$fields[$source] = ['email'];
}
$returnFields = ['name', 'email', 'alias', 'smimePublicKey'];
$returnFields = ['name', 'email', 'alias', 'smimePublicKey', 'source'];
if (!empty($opts['pictures'])) {
$returnFields[$source]['photo'];
$returnFields[] = 'photo';
}

$options = [
Expand Down
32 changes: 19 additions & 13 deletions lib/Horde/Core/ActiveSync/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2832,6 +2832,7 @@ public function resolveRecipient($type, $search, array $opts = [])
if (count($results) && isset($results[$search])) {
$gal = $this->_connector->contacts_getGal();
$picture_count = 0;
$picture = null;
foreach ($results[$search] as $result) {
if (!empty($opts['pictures'])) {
$picture = new Horde_ActiveSync_Message_ResolveRecipientsPicture(
Expand All @@ -2842,21 +2843,23 @@ public function resolveRecipient($type, $search, array $opts = [])
} elseif (!empty($opts['maxpictures']) &&
$picture_count > $opts['maxpictures']) {
$picture->status = Horde_ActiveSync_Status::PICTURE_LIMIT_REACHED;
} elseif (!empty($opts['maxsize']) &&
strlen($result['photo']) > $opts['maxsize']) {
$picture->status = Horde_ActiveSync_Status::PICTURE_TOO_LARGE;
} else {
$picture->data = $result['photo']['load']['data'];
$picture->status = Horde_ActiveSync_Status::PICTURE_SUCCESS;
++$picture_count;
$data = $result['photo']['load']['data'];
if (!empty($opts['maxsize']) && strlen($data) > $opts['maxsize']) {
$picture->status = Horde_ActiveSync_Status::PICTURE_TOO_LARGE;
} else {
$picture->data = $data;
$picture->status = Horde_ActiveSync_Status::PICTURE_SUCCESS;
++$picture_count;
}
}
}
$entry = [
'displayname' => $result['name'],
'emailaddress' => $result['email'],
'entries' => !empty($result['smimePublicKey']) ? [$this->_mungeCert($result['smimePublicKey'])] : [],
'type' => $result['source'] == $gal ? Horde_ActiveSync::RESOLVE_RESULT_GAL : Horde_ActiveSync::RESOLVE_RESULT_ADDRESSBOOK,
'picture' => !empty($picture) ? $picture : null,
'picture' => $picture,
];
$return[] = $entry;
}
Expand Down Expand Up @@ -3697,13 +3700,16 @@ protected function _searchGal(array $query)
} elseif (!empty($query[Horde_ActiveSync_Request_Search::SEARCH_MAXPICTURES]) &&
$picture_count > $query[Horde_ActiveSync_Request_Search::SEARCH_MAXPICTURES]) {
$picture->status = Horde_ActiveSync_Status::PICTURE_LIMIT_REACHED;
} elseif (!empty($query[Horde_ActiveSync_Request_Search::SEARCH_MAXSIZE]) &&
strlen($row['photo']) > $query[Horde_ActiveSync_Request_Search::SEARCH_MAXSIZE]) {
$picture->status = Horde_ActiveSync_Status::PICTURE_TOO_LARGE;
} else {
$picture->data = base64_encode($row['photo']['load']['data']);
$picture->status = Horde_ActiveSync_Status::PICTURE_SUCCESS;
++$picture_count;
$data = $row['photo']['load']['data'];
if (!empty($query[Horde_ActiveSync_Request_Search::SEARCH_MAXSIZE]) &&
strlen($data) > $query[Horde_ActiveSync_Request_Search::SEARCH_MAXSIZE]) {
$picture->status = Horde_ActiveSync_Status::PICTURE_TOO_LARGE;
} else {
$picture->data = base64_encode($data);
$picture->status = Horde_ActiveSync_Status::PICTURE_SUCCESS;
++$picture_count;
}
}
$entry[Horde_ActiveSync::GAL_PICTURE] = $picture;
}
Expand Down
Loading