- Some files from /bin + spellchecking actions moved to the new 'utils' task

git-svn-id: https://svn.roundcube.net/trunk@3627 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 14 insertions, 13 deletions

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index d9ee00a42..864ee8d41 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -28,10 +28,10 @@
  */
 class rcmail
 {
-  static public $main_tasks = array('mail','settings','addressbook','login','logout','dummy');
-  
+  static public $main_tasks = array('mail','settings','addressbook','login','logout','utils','dummy');
+
   static private $instance;
-  
+
   public $config;
   public $user;
   public $db;
@@ -43,10 +43,10 @@ class rcmail
   public $task;
   public $action = '';
   public $comm_path = './';
-  
+
   private $texts;
-  
-  
+
+
   /**
    * This implements the 'singleton' design pattern
    *
@@ -107,11 +107,12 @@ class rcmail
     $this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC));
 
     // reset some session parameters when changing task
-    if ($this->session && $_SESSION['task'] != $this->task)
-      $this->session->remove('page');
-
-    // set current task to session
-    $_SESSION['task'] = $this->task;
+    if ($this->task != 'utils') {
+      if ($this->session && $_SESSION['task'] != $this->task)
+        $this->session->remove('page');
+      // set current task to session
+      $_SESSION['task'] = $this->task;
+    }
 
     // init output class
     if (!empty($_REQUEST['_remote']))
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 1a665761a..7b7a3cf6a 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -2716,7 +2716,7 @@ class rcube_imap
 
         if ($result) {
             $delm = $this->get_hierarchy_delimiter();
-      
+
             // check if mailbox children are subscribed
             foreach ($a_subscribed as $c_subscribed)
                 if (preg_match('/^'.preg_quote($mailbox.$delm, '/').'/', $c_subscribed)) {
@@ -2727,7 +2727,7 @@ class rcube_imap
 
             // clear cache
             $this->clear_message_cache($mailbox.'.msg');
-            $this->clear_cache('mailboxes');      
+            $this->clear_cache('mailboxes');
         }
 
         // try to subscribe it