From 46f7b7096450939fe03c95aa81ce06ae4bfca89d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 28 Mar 2016 06:51:43 -0400
Subject: [PATCH] Enable reply/reply-all/forward buttons also in preview frame of message/rfc822

---
 index.php |  614 ++++++++++++++++++++++++------------------------------
 1 files changed, 274 insertions(+), 340 deletions(-)

diff --git a/index.php b/index.php
index 9908cf2..9dcf773 100644
--- a/index.php
+++ b/index.php
@@ -1,378 +1,312 @@
 <?php
-/*
- +-----------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client                                         |
- | Version 0.1-20070518                                                  |
- |                                                                       |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- | Redistribution and use in source and binary forms, with or without    |
- | modification, are permitted provided that the following conditions    |
- | are met:                                                              |
- |                                                                       |
- | o Redistributions of source code must retain the above copyright      |
- |   notice, this list of conditions and the following disclaimer.       |
- | o Redistributions in binary form must reproduce the above copyright   |
- |   notice, this list of conditions and the following disclaimer in the |
- |   documentation and/or other materials provided with the distribution.|
- | o The names of the authors may not be used to endorse or promote      |
- |   products derived from this software without specific prior written  |
- |   permission.                                                         |
- |                                                                       |
- | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
- | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
- | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
- | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
- | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
- | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
- | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
- | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
- | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
- | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
- | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-
- $Id$
-
+/**
+ +-------------------------------------------------------------------------+
+ | Roundcube Webmail IMAP Client                                           |
+ | Version 1.2-git                                                         |
+ |                                                                         |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team                         |
+ |                                                                         |
+ | This program is free software: you can redistribute it and/or modify    |
+ | it under the terms of the GNU General Public License (with exceptions   |
+ | for skins & plugins) as published by the Free Software Foundation,      |
+ | either version 3 of the License, or (at your option) any later version. |
+ |                                                                         |
+ | This file forms part of the Roundcube Webmail Software for which the    |
+ | following exception is added: Plugins and Skins which merely make       |
+ | function calls to the Roundcube Webmail Software, and for that purpose  |
+ | include it by reference shall not be considered modifications of        |
+ | the software.                                                           |
+ |                                                                         |
+ | If you wish to use this file in another project or create a modified    |
+ | version that will not be part of the Roundcube Webmail Software, you    |
+ | may remove the exception above and use this source code under the       |
+ | original version of the license.                                        |
+ |                                                                         |
+ | This program is distributed in the hope that it will be useful,         |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            |
+ | GNU General Public License for more details.                            |
+ |                                                                         |
+ | You should have received a copy of the GNU General Public License       |
+ | along with this program.  If not, see http://www.gnu.org/licenses/.     |
+ |                                                                         |
+ +-------------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                          |
+ | Author: Aleksander Machniak <alec@alec.pl>                              |
+ +-------------------------------------------------------------------------+
 */
 
-// application constants
-define('RCMAIL_VERSION', '0.1-20070517');
-define('RCMAIL_CHARSET', 'UTF-8');
-define('JS_OBJECT_NAME', 'rcmail');
+// include environment
+require_once 'program/include/iniset.php';
 
-// define global vars
-$OUTPUT_TYPE = 'html';
-$INSTALL_PATH = dirname(__FILE__);
-$MAIN_TASKS = array('mail','settings','addressbook','logout');
+// init application, start session, init output class, etc.
+$RCMAIL = rcmail::get_instance(0, $GLOBALS['env']);
 
-if (empty($INSTALL_PATH))
-  $INSTALL_PATH = './';
-else
-  $INSTALL_PATH .= '/';
+// Make the whole PHP output non-cacheable (#1487797)
+$RCMAIL->output->nocacheing_headers();
+$RCMAIL->output->common_headers();
 
+// turn on output buffering
+ob_start();
 
-// make sure path_separator is defined
-if (!defined('PATH_SEPARATOR'))
-  define('PATH_SEPARATOR', (eregi('win', PHP_OS) ? ';' : ':'));
-
-
-// RC include folders MUST be included FIRST to avoid other
-// possible not compatible libraries (i.e PEAR) to be included
-// instead the ones provided by RC
-ini_set('include_path', $INSTALL_PATH.PATH_SEPARATOR.$INSTALL_PATH.'program'.PATH_SEPARATOR.$INSTALL_PATH.'program/lib'.PATH_SEPARATOR.ini_get('include_path'));
-
-ini_set('session.name', 'sessid');
-ini_set('session.use_cookies', 1);
-ini_set('session.gc_maxlifetime', 21600);
-ini_set('session.gc_divisor', 500);
-ini_set('error_reporting', E_ALL&~E_NOTICE); 
-
-// increase maximum execution time for php scripts
-// (does not work in safe mode)
-if (!ini_get('safe_mode')) @set_time_limit(120);
-
-// include base files
-require_once('include/rcube_shared.inc');
-require_once('include/rcube_imap.inc');
-require_once('include/bugs.inc');
-require_once('include/main.inc');
-require_once('PEAR.php');
-
-
-// set PEAR error handling
-// PEAR::setErrorHandling(PEAR_ERROR_TRIGGER, E_USER_NOTICE);
-
-
-// catch some url/post parameters
-$_task = strip_quotes(get_input_value('_task', RCUBE_INPUT_GPC));
-$_action = strip_quotes(get_input_value('_action', RCUBE_INPUT_GPC));
-$_framed = (!empty($_GET['_framed']) || !empty($_POST['_framed']));
-
-// use main task if empty or invalid value
-if (empty($_task) || !in_array($_task, $MAIN_TASKS))
-  $_task = 'mail';
-
-
-// set output buffering
-if ($_action != 'get' && $_action != 'viewsource')
-{
-  // use gzip compression if supported
-  if (function_exists('ob_gzhandler') && ini_get('zlib.output_compression'))
-    ob_start('ob_gzhandler');
-  else
-    ob_start();
+// check if config files had errors
+if ($err_str = $RCMAIL->config->get_error()) {
+    rcmail::raise_error(array(
+        'code' => 601,
+        'type' => 'php',
+        'message' => $err_str), false, true);
 }
-
-
-// start session with requested task
-rcmail_startup($_task);
-
-// set session related variables
-$COMM_PATH = sprintf('./?_task=%s', $_task);
-$SESS_HIDDEN_FIELD = '';
-
-
-// add framed parameter
-if ($_framed)
-{
-  $COMM_PATH .= '&_framed=1';
-  $SESS_HIDDEN_FIELD .= "\n".'<input type="hidden" name="_framed" value="1" />';
-}
-
-
-// init necessary objects for GUI
-rcmail_load_gui();
-
 
 // check DB connections and exit on failure
-if ($err_str = $DB->is_error())
-{
-  raise_error(array(
-    'code' => 603,
-    'type' => 'db',
-    'message' => $err_str), FALSE, TRUE);
+if ($err_str = $RCMAIL->db->is_error()) {
+    rcmail::raise_error(array(
+        'code' => 603,
+        'type' => 'db',
+        'message' => $err_str), false, true);
 }
 
-
 // error steps
-if ($_action=='error' && !empty($_GET['_code']))
-  raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
+if ($RCMAIL->action == 'error' && !empty($_GET['_code'])) {
+    rcmail::raise_error(array('code' => hexdec($_GET['_code'])), false, true);
+}
 
+// check if https is required (for login) and redirect if necessary
+if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) {
+    $https_port = is_bool($force_https) ? 443 : $force_https;
+
+    if (!rcube_utils::https_check($https_port)) {
+        $host  = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
+        $host .= ($https_port != 443 ? ':' . $https_port : '');
+
+        header('Location: https://' . $host . $_SERVER['REQUEST_URI']);
+        exit;
+    }
+}
+
+// trigger startup plugin hook
+$startup = $RCMAIL->plugins->exec_hook('startup', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
+$RCMAIL->set_task($startup['task']);
+$RCMAIL->action = $startup['action'];
 
 // try to log in
-if ($_action=='login' && $_task=='mail')
-{
-  $host = rcmail_autoselect_host();
-  
-  // check if client supports cookies
-  if (empty($_COOKIE))
-  {
-    $OUTPUT->show_message("cookiesdisabled", 'warning');
-  }
-  else if ($_SESSION['temp'] && !empty($_POST['_user']) && isset($_POST['_pass']) &&
-           rcmail_login(get_input_value('_user', RCUBE_INPUT_POST),
-              get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $host))
-  {
-    // create new session ID
-    unset($_SESSION['temp']);
-    sess_regenerate_id();
+if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
+    $request_valid = $_SESSION['temp'] && $RCMAIL->check_request();
 
-    // send auth cookie if necessary
-    rcmail_authenticate_session();
+    // purge the session in case of new login when a session already exists
+    $RCMAIL->kill_session();
 
-    // send redirect
-    header("Location: $COMM_PATH");
-    exit;
-  }
-  else
-  {
-    $OUTPUT->show_message("loginfailed", 'warning');
-    $_SESSION['user_id'] = '';
-  }
+    $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
+        'host' => $RCMAIL->autoselect_host(),
+        'user' => trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST)),
+        'pass' => rcube_utils::get_input_value('_pass', rcube_utils::INPUT_POST, true,
+            $RCMAIL->config->get('password_charset', 'ISO-8859-1')),
+        'cookiecheck' => true,
+        'valid'       => $request_valid,
+    ));
+
+    // Login
+    if ($auth['valid'] && !$auth['abort']
+        && $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'], $auth['cookiecheck'])
+    ) {
+        // create new session ID, don't destroy the current session
+        // it was destroyed already by $RCMAIL->kill_session() above
+        $RCMAIL->session->remove('temp');
+        $RCMAIL->session->regenerate_id(false);
+
+        // send auth cookie if necessary
+        $RCMAIL->session->set_auth_cookie();
+
+        // log successful login
+        $RCMAIL->log_login();
+
+        // restore original request parameters
+        $query = array();
+        if ($url = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST)) {
+            parse_str($url, $query);
+
+            // prevent endless looping on login page
+            if ($query['_task'] == 'login') {
+                unset($query['_task']);
+            }
+
+            // prevent redirect to compose with specified ID (#1488226)
+            if ($query['_action'] == 'compose' && !empty($query['_id'])) {
+                $query = array('_action' => 'compose');
+            }
+        }
+
+        // allow plugins to control the redirect url after login success
+        $redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('_task' => 'mail'));
+        unset($redir['abort'], $redir['_err']);
+
+        // send redirect
+        $OUTPUT->redirect($redir, 0, true);
+    }
+    else {
+        if (!$auth['valid']) {
+            $error_code = RCMAIL::ERROR_INVALID_REQUEST;
+        }
+        else {
+            $error_code = is_numeric($auth['error']) ? $auth['error'] : $RCMAIL->login_error();
+        }
+
+        $error_labels = array(
+            RCMAIL::ERROR_STORAGE          => 'storageerror',
+            RCMAIL::ERROR_COOKIES_DISABLED => 'cookiesdisabled',
+            RCMAIL::ERROR_INVALID_REQUEST  => 'invalidrequest',
+            RCMAIL::ERROR_INVALID_HOST     => 'invalidhost',
+            RCMAIL::ERROR_RATE_LIMIT       => 'accountlocked',
+        );
+
+        $error_message = !empty($auth['error']) && !is_numeric($auth['error']) ? $auth['error'] : ($error_labels[$error_code] ?: 'loginfailed');
+
+        $OUTPUT->show_message($error_message, 'warning');
+
+        // log failed login
+        $RCMAIL->log_login($auth['user'], true, $error_code);
+
+        $RCMAIL->plugins->exec_hook('login_failed', array(
+            'code' => $error_code, 'host' => $auth['host'], 'user' => $auth['user']));
+
+        $RCMAIL->kill_session();
+    }
 }
 
 // end session
-else if (($_task=='logout' || $_action=='logout') && isset($_SESSION['user_id']))
-{
-  $OUTPUT->show_message('loggedout');
-  rcmail_kill_session();
+else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])) {
+    $RCMAIL->request_security_check($mode = rcube_utils::INPUT_GET);
+
+    $userdata = array(
+        'user' => $_SESSION['username'],
+        'host' => $_SESSION['storage_host'],
+        'lang' => $RCMAIL->user->language,
+    );
+
+    $OUTPUT->show_message('loggedout');
+
+    $RCMAIL->logout_actions();
+    $RCMAIL->kill_session();
+    $RCMAIL->plugins->exec_hook('logout_after', $userdata);
 }
 
 // check session and auth cookie
-else if ($_action != 'login' && $_SESSION['user_id'] && $_action != 'send')
-{
-  if (!rcmail_authenticate_session())
-  {
-    $OUTPUT->show_message('sessionerror', 'error');
-    rcmail_kill_session();
-  }
+else if ($RCMAIL->task != 'login' && $_SESSION['user_id']) {
+    if (!$RCMAIL->session->check_auth()) {
+        $RCMAIL->kill_session();
+        $session_error = true;
+    }
 }
-
-
-// log in to imap server
-if (!empty($_SESSION['user_id']) && $_task=='mail')
-{
-  $conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']);
-  if (!$conn)
-  {
-    $OUTPUT->show_message('imaperror', 'error');
-    $_SESSION['user_id'] = '';
-  }
-  else
-    rcmail_set_imap_prop();
-}
-
-
-// not logged in -> set task to 'login
-if (empty($_SESSION['user_id']))
-{
-  if ($OUTPUT->ajax_call)
-    $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);");
-  
-  $_task = 'login';
-}
-
-
-
-// set task and action to client
-$OUTPUT->set_env('task', $_task);
-if (!empty($_action))
-  $OUTPUT->set_env('action', $_action);
-
-
 
 // not logged in -> show login page
-if (!$_SESSION['user_id'])
-{
-  $OUTPUT->task = 'login';
-  $OUTPUT->send('login');
-  exit;
+if (empty($RCMAIL->user->ID)) {
+    // log session failures
+    $task = rcube_utils::get_input_value('_task', rcube_utils::INPUT_GPC);
+
+    if ($task && !in_array($task, array('login','logout'))
+        && !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])
+    ) {
+        $RCMAIL->session->log("Aborted session $sess_id; no valid session data found");
+        $session_error = true;
+    }
+
+    if ($session_error || $_REQUEST['_err'] == 'session') {
+        $OUTPUT->show_message('sessionerror', 'error', null, true, -1);
+    }
+
+    if ($OUTPUT->ajax_call || $OUTPUT->get_env('framed')) {
+        $OUTPUT->command('session_error', $RCMAIL->url(array('_err' => 'session')));
+        $OUTPUT->send('iframe');
+    }
+
+    // check if installer is still active
+    if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
+        $OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"),
+            html::tag('h2', array('style' => "margin-top:0.2em"), "Installer script is still accessible") .
+            html::p(null, "The install script of your Roundcube installation is still stored in its default location!") .
+            html::p(null, "Please <b>remove</b> the whole <tt>installer</tt> folder from the Roundcube directory because .
+                these files may expose sensitive configuration data like server passwords and encryption keys
+                to the public. Make sure you cannot access the <a href=\"./installer/\">installer script</a> from your browser.")
+        ));
+    }
+
+    $plugin = $RCMAIL->plugins->exec_hook('unauthenticated', array('task' => 'login', 'error' => $session_error));
+
+    $RCMAIL->set_task($plugin['task']);
+
+    $OUTPUT->send($plugin['task']);
+}
+else {
+    // CSRF prevention
+    $RCMAIL->request_security_check();
+
+    // check access to disabled actions
+    $disabled_actions = (array) $RCMAIL->config->get('disabled_actions');
+    if (in_array($RCMAIL->task . '.' . ($RCMAIL->action ?: 'index'), $disabled_actions)) {
+        rcube::raise_error(array(
+            'code' => 403, 'type' => 'php',
+            'message' => "Action disabled"), true, true);
+    }
+}
+
+// we're ready, user is authenticated and the request is safe
+$plugin = $RCMAIL->plugins->exec_hook('ready', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
+$RCMAIL->set_task($plugin['task']);
+$RCMAIL->action = $plugin['action'];
+
+// handle special actions
+if ($RCMAIL->action == 'keep-alive') {
+    $OUTPUT->reset();
+    $RCMAIL->plugins->exec_hook('keep_alive', array());
+    $OUTPUT->send();
+}
+else if ($RCMAIL->action == 'save-pref') {
+    include INSTALL_PATH . 'program/steps/utils/save_pref.inc';
 }
 
 
-// handle keep-alive signal
-if ($_action=='keep-alive')
-{
-  $OUTPUT->reset();
-  $OUTPUT->send('');
-  exit;
+// include task specific functions
+if (is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/func.inc')) {
+    include_once $incfile;
 }
 
-// include task specific files
-if ($_task=='mail')
-{
-  include_once('program/steps/mail/func.inc');
-  
-  if ($_action=='show' || $_action=='preview' || $_action=='print')
-    include('program/steps/mail/show.inc');
-
-  if ($_action=='get')
-    include('program/steps/mail/get.inc');
-
-  if ($_action=='moveto' || $_action=='delete')
-    include('program/steps/mail/move_del.inc');
-
-  if ($_action=='mark')
-    include('program/steps/mail/mark.inc');
-
-  if ($_action=='viewsource')
-    include('program/steps/mail/viewsource.inc');
-
-  if ($_action=='send')
-    include('program/steps/mail/sendmail.inc');
-
-  if ($_action=='upload')
-    include('program/steps/mail/upload.inc');
-
-  if ($_action=='compose' || $_action=='remove-attachment')
-    include('program/steps/mail/compose.inc');
-
-  if ($_action=='addcontact')
-    include('program/steps/mail/addcontact.inc');
-
-  if ($_action=='expunge' || $_action=='purge')
-    include('program/steps/mail/folders.inc');
-
-  if ($_action=='check-recent')
-    include('program/steps/mail/check_recent.inc');
-
-  if ($_action=='getunread')
-    include('program/steps/mail/getunread.inc');
-    
-  if ($_action=='list' && isset($_REQUEST['_remote']))
-    include('program/steps/mail/list.inc');
-
-   if ($_action=='search')
-     include('program/steps/mail/search.inc');
-     
-  if ($_action=='spell')
-    include('program/steps/mail/spell.inc');
-
-  if ($_action=='rss')
-    include('program/steps/mail/rss.inc');
-    
-  if ($_action=='quotadisplay')
-    include('program/steps/mail/quotadisplay.inc');
-
-
-  // make sure the message count is refreshed
-  $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);
+// allow 5 "redirects" to another action
+$redirects = 0; $incstep = null;
+while ($redirects < 5) {
+    // execute a plugin action
+    if (preg_match('/^plugin\./', $RCMAIL->action)) {
+        $RCMAIL->plugins->exec_action($RCMAIL->action);
+        break;
+    }
+    // execute action registered to a plugin task
+    else if ($RCMAIL->plugins->is_plugin_task($RCMAIL->task)) {
+        if (!$RCMAIL->action) $RCMAIL->action = 'index';
+        $RCMAIL->plugins->exec_action($RCMAIL->task.'.'.$RCMAIL->action);
+        break;
+    }
+    // try to include the step file
+    else if (($stepfile = $RCMAIL->get_action_file())
+        && is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/'.$stepfile)
+    ) {
+        // include action file only once (in case it don't exit)
+        include_once $incfile;
+        $redirects++;
+    }
+    else {
+        break;
+    }
 }
 
-
-// include task specific files
-if ($_task=='addressbook')
-{
-  include_once('program/steps/addressbook/func.inc');
-
-  if ($_action=='save')
-    include('program/steps/addressbook/save.inc');
-  
-  if ($_action=='edit' || $_action=='add')
-    include('program/steps/addressbook/edit.inc');
-  
-  if ($_action=='delete')
-    include('program/steps/addressbook/delete.inc');
-
-  if ($_action=='show')
-    include('program/steps/addressbook/show.inc');  
-
-  if ($_action=='list' && $_REQUEST['_remote'])
-    include('program/steps/addressbook/list.inc');
-
-  if ($_action=='search')
-    include('program/steps/addressbook/search.inc');
-
-  if ($_action=='copy')
-    include('program/steps/addressbook/copy.inc');
-
-  if ($_action=='mailto')
-    include('program/steps/addressbook/mailto.inc');
+if ($RCMAIL->action == 'refresh') {
+    $RCMAIL->plugins->exec_hook('refresh', array('last' => intval(rcube_utils::get_input_value('_last', rcube_utils::INPUT_GPC))));
 }
 
-
-// include task specific files
-if ($_task=='settings')
-{
-  include_once('program/steps/settings/func.inc');
-
-  if ($_action=='save-identity')
-    include('program/steps/settings/save_identity.inc');
-
-  if ($_action=='add-identity' || $_action=='edit-identity')
-    include('program/steps/settings/edit_identity.inc');
-
-  if ($_action=='delete-identity')
-    include('program/steps/settings/delete_identity.inc');
-  
-  if ($_action=='identities')
-    include('program/steps/settings/identities.inc');  
-
-  if ($_action=='save-prefs')
-    include('program/steps/settings/save_prefs.inc');  
-
-  if ($_action=='folders' || $_action=='subscribe' || $_action=='unsubscribe' ||
-      $_action=='create-folder' || $_action=='rename-folder' || $_action=='delete-folder')
-    include('program/steps/settings/manage_folders.inc');
-
-}
-
-
-// parse main template
-$OUTPUT->send($_task);
-
+// parse main template (default)
+$OUTPUT->send($RCMAIL->task);
 
 // if we arrive here, something went wrong
-raise_error(array(
-  'code' => 404,
-  'type' => 'php',
-  'line' => __LINE__,
-  'file' => __FILE__,
-  'message' => "Invalid request"), TRUE, TRUE);
-                      
-?>
+rcmail::raise_error(array(
+    'code' => 404,
+    'type' => 'php',
+    'line' => __LINE__,
+    'file' => __FILE__,
+    'message' => "Invalid request"), true, true);

--
Gitblit v1.9.1