From a03233cebafc62ec7d88a24856b8a7b37fef4381 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 07 Oct 2015 03:14:18 -0400
Subject: [PATCH] CS fixes
---
program/lib/Roundcube/rcube_imap.php | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 489abd0..2940446 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -62,8 +62,6 @@
protected $sort_field = '';
protected $sort_order = 'DESC';
protected $struct_charset;
- protected $uid_id_map = array();
- protected $msg_headers = array();
protected $search_set;
protected $search_string = '';
protected $search_charset = '';
@@ -2682,7 +2680,6 @@
// really deleted from the folder
$this->expunge_message($uids, $folder, false);
$this->clear_messagecount($folder);
- unset($this->uid_id_map[$folder]);
// unset threads internal cache
unset($this->icache['threads']);
@@ -3963,8 +3960,6 @@
return $res;
}
-
- return null;
}
/**
@@ -3985,7 +3980,6 @@
}
// @TODO: log error
- return null;
}
@@ -4254,19 +4248,11 @@
$folder = $this->folder;
}
- if ($uid = array_search($id, (array)$this->uid_id_map[$folder])) {
- return $uid;
- }
-
if (!$this->check_connection()) {
return null;
}
- $uid = $this->conn->ID2UID($folder, $id);
-
- $this->uid_id_map[$folder][$uid] = $id;
-
- return $uid;
+ return $this->conn->ID2UID($folder, $id);
}
/**
@@ -4274,22 +4260,16 @@
*/
protected function change_subscription($folders, $mode)
{
- $updated = false;
+ $updated = 0;
+ $folders = (array) $folders;
if (!empty($folders)) {
if (!$this->check_connection()) {
return false;
}
- foreach ((array)$folders as $i => $folder) {
- $folders[$i] = $folder;
-
- if ($mode == 'subscribe') {
- $updated = $this->conn->subscribe($folder);
- }
- else if ($mode == 'unsubscribe') {
- $updated = $this->conn->unsubscribe($folder);
- }
+ foreach ($folders as $folder) {
+ $updated += (int) $this->conn->{$mode}($folder);
}
}
@@ -4298,7 +4278,7 @@
$this->clear_cache('mailboxes', true);
}
- return $updated;
+ return $updated == count($folders) ? true : false;
}
/**
@@ -4373,7 +4353,6 @@
/**
* This is our own debug handler for the IMAP connection
- * @access public
*/
public function debug_handler(&$imap, $message)
{
--
Gitblit v1.9.1