githubFork/roundcubemail.git

			@@ -2,22 +2,33 @@
			/*
			+-------------------------------------------------------------------------+
			\| Roundcube Webmail IMAP Client \|
			\| Version 0.4-20100807 \|
			\| Version 0.8.6 \|
			\| \|
			\| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland \|
			\| Copyright (C) 2005-2012, 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 version 2 \|
			\| as published by the Free Software Foundation. \|
			\| 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 \|
			\| 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, write to the Free Software Foundation, Inc., \|
			\| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \|
			\| 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> \|
			@@ -33,6 +44,9 @@
			// init application, start session, init output class, etc.
			$RCMAIL = rcmail::get_instance();

			// Make the whole PHP output non-cacheable (#1487797)
			send_nocacheing_headers();

			// turn on output buffering
			ob_start();

			@@ -45,7 +59,7 @@
			}

			// check DB connections and exit on failure
			if ($err_str = $DB->is_error()) {
			if ($err_str = $RCMAIL->db->is_error()) {
			raise_error(array(
			'code' => 603,
			'type' => 'db',
			@@ -75,58 +89,87 @@

			// try to log in
			if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
			$request_valid = $_SESSION['temp'] && $RCMAIL->check_request(RCUBE_INPUT_POST, 'login');

			// purge the session in case of new login when a session already exists
			$RCMAIL->kill_session();


			$auth = $RCMAIL->plugins->exec_hook('authenticate', array(
			'host' => $RCMAIL->autoselect_host(),
			'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
			'pass' => get_input_value('_pass', RCUBE_INPUT_POST, true,
			$RCMAIL->config->get('password_charset', 'ISO-8859-1')),
			'cookiecheck' => true,
			'valid' => $request_valid,
			));

			if (!isset($auth['pass']))
			$auth['pass'] = get_input_value('_pass', RCUBE_INPUT_POST, true,
			$RCMAIL->config->get('password_charset', 'ISO-8859-1'));

			// check if client supports cookies
			if ($auth['cookiecheck'] && empty($_COOKIE)) {
			$OUTPUT->show_message("cookiesdisabled", 'warning');
			}
			else if ($_SESSION['temp'] && !$auth['abort'] &&
			!empty($auth['host']) && !empty($auth['user']) &&
			$RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
			// create new session ID
			// 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();
			$RCMAIL->session->regenerate_id(false);

			// send auth cookie if necessary
			$RCMAIL->authenticate_session();
			$RCMAIL->session->set_auth_cookie();

			// log successful login
			rcmail_log_login();

			// restore original request parameters
			$query = array();
			if ($url = get_input_value('_url', RCUBE_INPUT_POST))
			if ($url = get_input_value('_url', RCUBE_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();
			}

			// allow plugins to control the redirect url after login success
			$redir = $RCMAIL->plugins->exec_hook('login_after', $query);
			unset($redir['abort']);
			$redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('_task' => 'mail'));
			unset($redir['abort'], $redir['_err']);

			// send redirect
			$OUTPUT->redirect($redir);
			}
			else {
			$OUTPUT->show_message($IMAP->error_code < -1 ? 'imaperror' : 'loginfailed', 'warning');
			$RCMAIL->plugins->exec_hook('login_failed', array('code' => $IMAP->error_code, 'host' => $auth['host'], 'user' => $auth['user']));
			if (!$auth['valid']) {
			$error_code = RCMAIL::ERROR_INVALID_REQUEST;
			}
			else {
			$error_code = $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',
			);

			$error_message = $error_labels[$error_code] ? $error_labels[$error_code] : 'loginfailed';

			$OUTPUT->show_message($error_message, 'warning');
			$RCMAIL->plugins->exec_hook('login_failed', array(
			'code' => $error_code, 'host' => $auth['host'], 'user' => $auth['user']));
			$RCMAIL->kill_session();
			}
			}

			// end session
			else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])) {
			$userdata = array('user' => $_SESSION['username'], 'host' => $_SESSION['imap_host'], 'lang' => $RCMAIL->user->language);
			// end session (after optional referer check)
			else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id']) && (!$RCMAIL->config->get('referer_check') \|\| rcube_check_referer())) {
			$userdata = array(
			'user' => $_SESSION['username'],
			'host' => $_SESSION['storage_host'],
			'lang' => $RCMAIL->user->language,
			);
			$OUTPUT->show_message('loggedout');
			$RCMAIL->logout_actions();
			$RCMAIL->kill_session();
			@@ -135,19 +178,25 @@

			// check session and auth cookie
			else if ($RCMAIL->task != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
			if (!$RCMAIL->authenticate_session()) {
			$OUTPUT->show_message('sessionerror', 'error');
			if (!$RCMAIL->session->check_auth()) {
			$RCMAIL->kill_session();
			$session_error = true;
			}
			}

			// not logged in -> show login page
			if (empty($RCMAIL->user->ID)) {
			// log session failures
			if (($task = get_input_value('_task', RCUBE_INPUT_GPC)) && !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 ($OUTPUT->ajax_call)
			$OUTPUT->redirect(array(), 2000);
			$OUTPUT->redirect(array('_err' => 'session'), 2000);

			if (!empty($_REQUEST['_framed']))
			$OUTPUT->command('redirect', '?');
			$OUTPUT->command('redirect', $RCMAIL->url(array('_err' => 'session')));

			// check if installer is still active
			if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
			@@ -161,88 +210,68 @@
			);
			}

			$OUTPUT->set_env('task', 'login');
			$OUTPUT->send('login');
			if ($session_error \|\| $_REQUEST['_err'] == 'session')
			$OUTPUT->show_message('sessionerror', 'error', null, true, -1);

			$plugin = $RCMAIL->plugins->exec_hook('unauthenticated', array('task' => 'login', 'error' => $session_error));

			$RCMAIL->set_task($plugin['task']);
			$OUTPUT->send($plugin['task']);
			}
			// CSRF prevention
			else {
			// don't check for valid request tokens in these actions
			$request_check_whitelist = array('login'=>1, 'spell'=>1);
			$request_check_whitelist = array('login'=>1, 'spell'=>1, 'spell_html'=>1);

			// check client X-header to verify request origin
			if ($OUTPUT->ajax_call) {
			if (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token()) {
			header('HTTP/1.1 404 Not Found');
			die("Invalid Request");
			if (!$request_check_whitelist[$RCMAIL->action]) {
			// check client X-header to verify request origin
			if ($OUTPUT->ajax_call) {
			if (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token()) {
			header('HTTP/1.1 403 Forbidden');
			die("Invalid Request");
			}
			}
			// check request token in POST form submissions
			else if (!empty($_POST) && !$RCMAIL->check_request()) {
			$OUTPUT->show_message('invalidrequest', 'error');
			$OUTPUT->send($RCMAIL->task);
			}

			// check referer if configured
			if ($RCMAIL->config->get('referer_check') && !rcube_check_referer()) {
			raise_error(array(
			'code' => 403, 'type' => 'php',
			'message' => "Referer check failed"), true, true);
			}
			}
			// check request token in POST form submissions
			else if (!empty($_POST) && !$request_check_whitelist[$RCMAIL->action] && !$RCMAIL->check_request()) {
			$OUTPUT->show_message('invalidrequest', 'error');
			$OUTPUT->send($RCMAIL->task);
			}
			}

			// 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 'steps/utils/save_pref.inc';
			include INSTALL_PATH . 'program/steps/utils/save_pref.inc';
			}


			// map task/action to a certain include file
			$action_map = array(
			'mail' => array(
			'preview' => 'show.inc',
			'print' => 'show.inc',
			'moveto' => 'move_del.inc',
			'delete' => 'move_del.inc',
			'send' => 'sendmail.inc',
			'expunge' => 'folders.inc',
			'purge' => 'folders.inc',
			'remove-attachment' => 'attachments.inc',
			'display-attachment' => 'attachments.inc',
			'upload' => 'attachments.inc',
			'group-expand' => 'autocomplete.inc',
			),

			'addressbook' => array(
			'add' => 'edit.inc',
			'group-create' => 'groups.inc',
			'group-rename' => 'groups.inc',
			'group-delete' => 'groups.inc',
			'group-addmembers' => 'groups.inc',
			'group-delmembers' => 'groups.inc',
			),

			'settings' => array(
			'folders' => 'manage_folders.inc',
			'create-folder' => 'manage_folders.inc',
			'rename-folder' => 'manage_folders.inc',
			'delete-folder' => 'manage_folders.inc',
			'subscribe' => 'manage_folders.inc',
			'unsubscribe' => 'manage_folders.inc',
			'enable-threading' => 'manage_folders.inc',
			'disable-threading' => 'manage_folders.inc',
			'add-identity' => 'edit_identity.inc',
			)
			);

			// include task specific functions
			if (is_file($incfile = 'program/steps/'.$RCMAIL->task.'/func.inc'))
			include_once($incfile);
			if (is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/func.inc'))
			include_once $incfile;

			// allow 5 "redirects" to another action
			$redirects = 0; $incstep = null;
			while ($redirects < 5) {
			$stepfile = !empty($action_map[$RCMAIL->task][$RCMAIL->action]) ?
			$action_map[$RCMAIL->task][$RCMAIL->action] : strtr($RCMAIL->action, '-', '_') . '.inc';

			// execute a plugin action
			if ($RCMAIL->plugins->is_plugin_task($RCMAIL->task)) {
			if (!$RCMAIL->action) $RCMAIL->action = 'index';
			$RCMAIL->plugins->exec_action($RCMAIL->task.'.'.$RCMAIL->action);
			break;
			}
			@@ -251,8 +280,10 @@
			break;
			}
			// try to include the step file
			else if (is_file($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile)) {
			include($incfile);
			else if (($stepfile = $RCMAIL->get_action_file())
			&& is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/'.$stepfile)
			) {
			include $incfile;
			$redirects++;
			}
			else {