From 2a34eb949210a43ab7fd0b2ba41d2b0006c81e48 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 07 Aug 2009 12:22:30 -0400
Subject: [PATCH] Add 'imap_connect' hook (#1485956)
---
program/include/rcube_imap.php | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index c823834..b271245 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -70,6 +70,8 @@
var $debug_level = 1;
var $error_code = 0;
var $options = array('imap' => 'check');
+
+ private $host, $user, $pass, $port, $ssl;
/**
@@ -101,19 +103,22 @@
// check for Open-SSL support in PHP build
if ($use_ssl && extension_loaded('openssl'))
$ICL_SSL = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
- else if ($use_ssl)
- {
+ else if ($use_ssl) {
raise_error(array('code' => 403, 'type' => 'imap', 'file' => __FILE__,
'message' => 'Open SSL not available;'), TRUE, FALSE);
$port = 143;
- }
+ }
$ICL_PORT = $port;
$IMAP_USE_INTERNAL_DATE = false;
+
+ $data = rcmail::get_instance()->plugins->exec_hook('imap_connect', array('host' => $host, 'user' => $user));
+ if (!empty($data['pass']))
+ $pass = $data['pass'];
- $this->conn = iil_Connect($host, $user, $pass, $this->options);
- $this->host = $host;
- $this->user = $user;
+ $this->conn = iil_Connect($data['host'], $data['user'], $pass, $this->options);
+ $this->host = $data['host'];
+ $this->user = $data['user'];
$this->pass = $pass;
$this->port = $port;
$this->ssl = $use_ssl;
@@ -1035,14 +1040,6 @@
}
else
$a_messages = iil_C_Search($this->conn, $mailbox, ($charset ? "CHARSET $charset " : '') . $criteria);
-
- // clean message list (there might be some empty entries)
- if (is_array($a_messages))
- {
- foreach ($a_messages as $i => $val)
- if (empty($val))
- unset($a_messages[$i]);
- }
// update messagecount cache ?
// $a_mailbox_cache = get_cache('messagecount');
@@ -1542,12 +1539,8 @@
if (!is_array($uids))
$uids = explode(',',$uids);
- if ($flag=='UNDELETED')
- $result = iil_C_Undelete($this->conn, $mailbox, join(',', $uids));
- else if ($flag=='UNSEEN')
- $result = iil_C_Unseen($this->conn, $mailbox, join(',', $uids));
- else if ($flag=='UNFLAGGED')
- $result = iil_C_UnFlag($this->conn, $mailbox, join(',', $uids), 'FLAGGED');
+ if (strpos($flag, 'UN') === 0)
+ $result = iil_C_UnFlag($this->conn, $mailbox, join(',', $uids), substr($flag, 2));
else
$result = iil_C_Flag($this->conn, $mailbox, join(',', $uids), $flag);
@@ -1574,6 +1567,21 @@
$this->_set_messagecount($mailbox, 'ALL', $count*(-1));
return $result;
+ }
+
+
+ /**
+ * Remove message flag for one or several messages
+ *
+ * @param mixed Message UIDs as array or as comma-separated string
+ * @param string Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
+ * @param string Folder name
+ * @return boolean True on success, False on failure
+ * @see set_flag
+ */
+ function unset_flag($uids, $flag, $mbox_name=NULL)
+ {
+ return $this->set_flag($uids, 'UN'.$flag, $mbox_name);
}
@@ -2405,10 +2413,10 @@
$key,
$index,
$headers->uid,
- (string)rc_substr($this->db->encode($this->decode_header($headers->subject, TRUE)), 0, 128),
- (string)rc_substr($this->db->encode($this->decode_header($headers->from, TRUE)), 0, 128),
- (string)rc_substr($this->db->encode($this->decode_header($headers->to, TRUE)), 0, 128),
- (string)rc_substr($this->db->encode($this->decode_header($headers->cc, TRUE)), 0, 128),
+ (string)mb_substr($this->db->encode($this->decode_header($headers->subject, TRUE)), 0, 128),
+ (string)mb_substr($this->db->encode($this->decode_header($headers->from, TRUE)), 0, 128),
+ (string)mb_substr($this->db->encode($this->decode_header($headers->to, TRUE)), 0, 128),
+ (string)mb_substr($this->db->encode($this->decode_header($headers->cc, TRUE)), 0, 128),
(int)$headers->size,
serialize($this->db->encode(clone $headers)),
is_object($struct) ? serialize($this->db->encode(clone $struct)) : NULL
@@ -2796,7 +2804,7 @@
if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p])
$a_defaults[$p] = $folder;
else
- $folders[$folder] = rc_strtolower(rcube_charset_convert($folder, 'UTF7-IMAP'));
+ $folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF7-IMAP'));
}
// sort folders and place defaults on the top
--
Gitblit v1.9.1