From 454b0b1ca983adfa2e40e47ccbd0dc384c141d9a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 5 Nov 2015 09:17:28 +0100
Subject: [PATCH] Remove deprecated rcmail and rcube_imap methods

---
 program/include/rcmail.php           |  20 ----
 program/lib/Roundcube/rcube_imap.php | 145 ---------------------------
 2 files changed, 165 deletions(-)

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index d64ba2d9302..21ba812ca7d 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2358,26 +2358,6 @@ public function html2text($html, $options = array())
         return $options['body'];
     }
 
-
-    /************************************************************************
-     *********          Deprecated methods (to be removed)          *********
-     ***********************************************************************/
-
-    public static function setcookie($name, $value, $exp = 0)
-    {
-        rcube_utils::setcookie($name, $value, $exp);
-    }
-
-    public function imap_connect()
-    {
-        return $this->storage_connect();
-    }
-
-    public function imap_init()
-    {
-        return $this->storage_init();
-    }
-
     /**
      * Connect to the mail storage server with stored session data
      *
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 294044654a1..575d13c14cc 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -4358,149 +4358,4 @@ public function debug_handler(&$imap, $message)
     {
         rcube::write_log('imap', $message);
     }
-
-
-    /**
-     * Deprecated methods (to be removed)
-     */
-
-    public function decode_address_list($input, $max = null, $decode = true, $fallback = null)
-    {
-        return rcube_mime::decode_address_list($input, $max, $decode, $fallback);
-    }
-
-    public function decode_header($input, $fallback = null)
-    {
-        return rcube_mime::decode_mime_string((string)$input, $fallback);
-    }
-
-    public static function decode_mime_string($input, $fallback = null)
-    {
-        return rcube_mime::decode_mime_string($input, $fallback);
-    }
-
-    public function mime_decode($input, $encoding = '7bit')
-    {
-        return rcube_mime::decode($input, $encoding);
-    }
-
-    public static function explode_header_string($separator, $str, $remove_comments = false)
-    {
-        return rcube_mime::explode_header_string($separator, $str, $remove_comments);
-    }
-
-    public function select_mailbox($mailbox)
-    {
-        // do nothing
-    }
-
-    public function set_mailbox($folder)
-    {
-        $this->set_folder($folder);
-    }
-
-    public function get_mailbox_name()
-    {
-        return $this->get_folder();
-    }
-
-    public function list_headers($folder='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
-    {
-        return $this->list_messages($folder, $page, $sort_field, $sort_order, $slice);
-    }
-
-    public function get_headers($uid, $folder = null, $force = false)
-    {
-        return $this->get_message_headers($uid, $folder, $force);
-    }
-
-    public function mailbox_status($folder = null)
-    {
-        return $this->folder_status($folder);
-    }
-
-    public function message_index($folder = '', $sort_field = NULL, $sort_order = NULL)
-    {
-        return $this->index($folder, $sort_field, $sort_order);
-    }
-
-    public function message_index_direct($folder, $sort_field = null, $sort_order = null)
-    {
-        return $this->index_direct($folder, $sort_field, $sort_order);
-    }
-
-    public function list_mailboxes($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
-    {
-        return $this->list_folders_subscribed($root, $name, $filter, $rights, $skip_sort);
-    }
-
-    public function list_unsubscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
-    {
-        return $this->list_folders($root, $name, $filter, $rights, $skip_sort);
-    }
-
-    public function get_mailbox_size($folder)
-    {
-        return $this->folder_size($folder);
-    }
-
-    public function create_mailbox($folder, $subscribe=false)
-    {
-        return $this->create_folder($folder, $subscribe);
-    }
-
-    public function rename_mailbox($folder, $new_name)
-    {
-        return $this->rename_folder($folder, $new_name);
-    }
-
-    function delete_mailbox($folder)
-    {
-        return $this->delete_folder($folder);
-    }
-
-    function clear_mailbox($folder = null)
-    {
-        return $this->clear_folder($folder);
-    }
-
-    public function mailbox_exists($folder, $subscription=false)
-    {
-        return $this->folder_exists($folder, $subscription);
-    }
-
-    public function mailbox_namespace($folder)
-    {
-        return $this->folder_namespace($folder);
-    }
-
-    public function mod_mailbox($folder, $mode = 'out')
-    {
-        return $this->mod_folder($folder, $mode);
-    }
-
-    public function mailbox_attributes($folder, $force = false)
-    {
-        return $this->folder_attributes($folder, $force);
-    }
-
-    public function mailbox_data($folder)
-    {
-        return $this->folder_data($folder);
-    }
-
-    public function mailbox_info($folder)
-    {
-        return $this->folder_info($folder);
-    }
-
-    public function mailbox_sync($folder)
-    {
-        return $this->folder_sync($folder);
-    }
-
-    public function expunge($folder = '', $clear_cache = true)
-    {
-        return $this->expunge_folder($folder, $clear_cache);
-    }
 }