Skip to content

Commit 38d291f

Browse files
committed
fix(other): sieve capabilities list improper imploding, testing imap credentials using incorrect parameters, get_messages on a non-existing folder returning unexpcted result
1 parent 9b02f27 commit 38d291f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

modules/core/hm-mailbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public function get_special_use_mailboxes($folder = false) {
261261
*/
262262
public function get_messages($folder, $sort, $reverse, $flag_filter, $offset=0, $limit=50, $keyword=false, $trusted_senders=[], $include_preview = false) {
263263
if (! $this->select_folder($folder)) {
264-
return;
264+
return [0, []];
265265
}
266266
if ($this->is_imap()) {
267267
$messages = $this->connection->get_mailbox_page($folder, $sort, $reverse, $flag_filter, $offset, $limit, $keyword, $trusted_senders, $include_preview);

modules/imap/handler_modules.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,13 +1917,13 @@ public function process() {
19171917

19181918
$mailbox = false;
19191919
$cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
1920-
$mailbox = Hm_IMAP_List::connect($form['imap_server_id'], $cache, $form['imap_user'], $form['imap_pass']);
1920+
$mailbox = Hm_IMAP_List::connect($form['imap_server_id'], $cache);
19211921
if ($mailbox) {
19221922
if ($mailbox->authed()) {
1923-
Hm_Msgs::add(sprintf("Successfully authenticated to the %s server : %s", $mailbox->server_type(), $form['imap_user']));
1923+
Hm_Msgs::add(sprintf("Successfully authenticated to the %s server : %s", $mailbox->server_type(), $imap_details['user']));
19241924
}
19251925
else {
1926-
Hm_Msgs::add(sprintf("Failed to authenticate to the %s server : %s", $mailbox->server_type(), $form['imap_user']), "danger");
1926+
Hm_Msgs::add(sprintf("Failed to authenticate to the %s server : %s", $mailbox->server_type(), $imap_details['user']), "danger");
19271927
}
19281928
}
19291929
else {

modules/imap/output_modules.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,10 @@ protected function output() {
840840
$res = '';
841841
$capabilities = $this->get('sieve_server_capabilities', array());
842842
if ($capabilities) {
843-
$res .= '<span class="sieve_extensions">'.implode(', ', $capabilities).'</span>';
843+
foreach ($capabilities as $key => $val) {
844+
$capabilities[$key] = $key . ': ' . (is_array($val) ? implode(', ', $val) : $val);
845+
}
846+
$res .= '<span class="sieve_extensions">' . implode(', ', $capabilities) . '</span>';
844847
}
845848
$this->out('sieve_detail_display', $res);
846849
$res = '';

0 commit comments

Comments
 (0)