From b065ddd7ed6a888e3d34f138a766ffdfd55ecb4d Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 18 May 2010 10:25:29 +0000 Subject: - 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 --- roundcubemail/program/include/rcmail.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'roundcubemail/program/include/rcmail.php') 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'])) -- cgit v1.2.3