From f8a846c58997da50cb1737569d4c0d01f83b17d5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 28 Aug 2009 04:31:41 -0400
Subject: [PATCH] - simplified iil_C_(Un)Subscribe() return value
---
program/include/rcube_imap.php | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 78d4486..d904edb 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2890,7 +2890,7 @@
private function _change_subscription($a_mboxes, $mode)
{
$updated = FALSE;
-
+
if (is_array($a_mboxes))
foreach ($a_mboxes as $i => $mbox_name)
{
@@ -2898,15 +2898,12 @@
$a_mboxes[$i] = $mailbox;
if ($mode=='subscribe')
- $result = iil_C_Subscribe($this->conn, $mailbox);
+ $updated = iil_C_Subscribe($this->conn, $mailbox);
else if ($mode=='unsubscribe')
- $result = iil_C_UnSubscribe($this->conn, $mailbox);
-
- if ($result>=0)
- $updated = TRUE;
+ $updated = iil_C_UnSubscribe($this->conn, $mailbox);
}
-
- // get cached mailbox list
+
+ // get cached mailbox list
if ($updated)
{
$a_mailbox_cache = $this->get_cache('mailboxes');
@@ -2918,7 +2915,7 @@
$a_mailbox_cache = array_merge($a_mailbox_cache, $a_mboxes);
else if ($mode=='unsubscribe')
$a_mailbox_cache = array_diff($a_mailbox_cache, $a_mboxes);
-
+
// write mailboxlist to cache
$this->update_cache('mailboxes', $this->_sort_mailbox_list($a_mailbox_cache));
}
--
Gitblit v1.9.1