From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports

---
 plugins/archive/archive.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 72f7a7f..ffa309a 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -111,12 +111,12 @@
     $delimiter      = $storage->get_hierarchy_delimiter();
     $archive_folder = $rcmail->config->get('archive_mbox');
     $archive_type   = $rcmail->config->get('archive_type', '');
-    $current_mbox   = rcube_utils::get_input_value('_mbox', RCUBE_INPUT_POST);
+    $current_mbox   = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
 
     $result  = array('reload' => false, 'update' => false, 'errors' => array());
     $folders = array();
-    $uids    = rcube_utils::get_input_value('_uid', RCUBE_INPUT_POST);
-    $search_request = get_input_value('_search', RCUBE_INPUT_GPC);
+    $uids    = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+    $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
 
     if ($uids == '*') {
       $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
@@ -220,7 +220,7 @@
     }
 
     if ($_POST['_from'] == 'show' && !empty($result['update'])) {
-      if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC)) {
+      if ($next = rcube_utils::get_input_value('_next_uid', rcube_utils::INPUT_GPC)) {
         $rcmail->output->command('show_message', $next);
       }
       else {
@@ -265,7 +265,7 @@
       $archive_type->add($this->gettext('archivetypefolder'), 'folder');
 
       $args['blocks']['archive'] = array(
-        'name' => Q($this->gettext('settingstitle')),
+        'name' => rcube::Q($this->gettext('settingstitle')),
         'options' => array('archive_type' => array(
             'title' => $this->gettext('archivetype'),
             'content' => $archive_type->show($rcmail->config->get('archive_type'))

--
Gitblit v1.9.1