Merge pull request #12 from markatom/fix-encoding

Fix mailbox name encoding to support non-ASCII characters

Author: greeny

MailLibrary/Drivers/ImapDriver.php

@@ -381,7 +381,7 @@ public function setFlag($mailId, $flag, $value)
 	 * @throws DriverException
 	 */
 	public function copyMail($mailId, $toMailbox) {
-		if(!imap_mail_copy($this->resource, $mailId, $this->server . $toMailbox, CP_UID)) {
+		if(!imap_mail_copy($this->resource, $mailId, $this->server . $this->encodeMailboxName($toMailbox), CP_UID)) {
 			throw new DriverException("Cannot copy mail to mailbox '$toMailbox': ".imap_last_error());
 		}
 	}
@@ -393,7 +393,7 @@ public function copyMail($mailId, $toMailbox) {
 	 * @throws DriverException
 	 */
 	public function moveMail($mailId, $toMailbox) {
-		if(!imap_mail_move($this->resource, $mailId, $this->server . $toMailbox, CP_UID)) {
+		if(!imap_mail_move($this->resource, $mailId, $this->server . $this->encodeMailboxName($toMailbox), CP_UID)) {
 			throw new DriverException("Cannot copy mail to mailbox '$toMailbox': ".imap_last_error());
 		}
 	}
@@ -454,4 +454,16 @@ protected function buildIdList(array $ids)
 		sort($ids);
 		return implode(',', $ids);
 	}
+
+	/**
+	 * Converts mailbox name encoding as defined in IMAP RFC 2060.
+	 *
+	 * @param $name
+	 * @return string
+	 */
+	protected function encodeMailboxName($name)
+	{
+		return mb_convert_encoding($name, 'UTF7-IMAP', 'UTF-8');
+	}
+
 }