From 6b2b2eca5fa48720c4e5b31b9aae200a185dfc0e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 Dec 2013 14:12:15 +0100
Subject: Remove deprecated functions (these listed in bc.php file) usage

---
 program/steps/mail/search.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'program/steps/mail/search.inc')

diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index fb1b48797..03d6de326 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -24,13 +24,13 @@ $_SESSION['page'] = 1;
 
 // using encodeURI with javascript "should" give us
 // a correctly encoded query string
-$imap_charset = RCMAIL_CHARSET;
+$imap_charset = RCUBE_CHARSET;
 
 // get search string
-$str     = get_input_value('_q', RCUBE_INPUT_GET, true);
-$mbox    = get_input_value('_mbox', RCUBE_INPUT_GET, true);
-$filter  = get_input_value('_filter', RCUBE_INPUT_GET);
-$headers = get_input_value('_headers', RCUBE_INPUT_GET);
+$str     = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GET, true);
+$mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET, true);
+$filter  = rcube_utils::get_input_value('_filter', rcube_utils::INPUT_GET);
+$headers = rcube_utils::get_input_value('_headers', rcube_utils::INPUT_GET);
 $subject = array();
 
 $search_request = md5($mbox.$filter.$str);
@@ -134,7 +134,7 @@ if (!empty($result_h)) {
 }
 // handle IMAP errors (e.g. #1486905)
 else  if ($err_code = $RCMAIL->storage->get_error_code()) {
-  rcmail_display_server_error();
+  $RCMAIL->display_server_error();
 }
 else {
   $OUTPUT->show_message('searchnomatch', 'notice');
-- 
cgit v1.2.3