From bbf15d8115e19bf12b156e2a4d52221bcae40d6c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 02 May 2008 03:29:13 -0400
Subject: [PATCH] - fixed task setting on login
---
index.php | 359 +++++++++++++++++++++++++----------------------------------
1 files changed, 155 insertions(+), 204 deletions(-)
diff --git a/index.php b/index.php
index 313ca0b..ebf5193 100644
--- a/index.php
+++ b/index.php
@@ -2,9 +2,9 @@
/*
+-----------------------------------------------------------------------+
| RoundCube Webmail IMAP Client |
- | Version 0.1-beta2 |
+ | Version 0.1-20080430 |
| |
- | Copyright (C) 2005-2006, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| Redistribution and use in source and binary forms, with or without |
@@ -40,324 +40,275 @@
*/
-define('RCMAIL_VERSION', '0.1-beta2');
+// include environment
+require_once 'program/include/iniset.php';
// define global vars
-$CHARSET = 'UTF-8';
$OUTPUT_TYPE = 'html';
-$JS_OBJECT_NAME = 'rcmail';
-$INSTALL_PATH = dirname(__FILE__);
-$MAIN_TASKS = array('mail','settings','addressbook','logout');
-if (empty($INSTALL_PATH))
- $INSTALL_PATH = './';
-else
- $INSTALL_PATH .= '/';
-
-
-// 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)
-@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('include/cache.inc');
-require_once('PEAR.php');
-
-
-// set PEAR error handling
-// PEAR::setErrorHandling(PEAR_ERROR_TRIGGER, E_USER_NOTICE);
-
-// use gzip compression if supported
-if (function_exists('ob_gzhandler') && !ini_get('zlib.output_compression'))
- ob_start('ob_gzhandler');
-else
- ob_start();
-
-
-// catch some url/post parameters
-$_task = get_input_value('_task', RCUBE_INPUT_GPC);
-$_action = get_input_value('_action', RCUBE_INPUT_GPC);
-$_framed = (!empty($_GET['_framed']) || !empty($_POST['_framed']));
-
-if (empty($_task))
- $_task = 'mail';
-
-if (!empty($_GET['_remote']))
- $REMOTE_REQUEST = 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" />';
+// set output buffering
+if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') {
+ // use gzip compression if supported
+ if (function_exists('ob_gzhandler')
+ && !ini_get('zlib.output_compression')
+ && ini_get('output_handler') != 'ob_gzhandler') {
+ ob_start('ob_gzhandler');
}
+ else {
+ ob_start();
+ }
+}
-// init necessary objects for GUI
-load_gui();
+// init application and start session with requested task
+$RCMAIL = rcmail::get_instance();
+
+// init output class
+$OUTPUT = (!empty($_GET['_remote']) || !empty($_POST['_remote'])) ? $RCMAIL->init_json() : $RCMAIL->load_gui((!empty($_GET['_framed']) || !empty($_POST['_framed'])));
// check DB connections and exit on failure
-if ($err_str = $DB->is_error())
- {
- raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__,
- 'message' => $err_str), FALSE, TRUE);
- }
+if ($err_str = $DB->is_error()) {
+ raise_error(array(
+ 'code' => 603,
+ 'type' => 'db',
+ 'message' => $err_str), FALSE, TRUE);
+}
// error steps
-if ($_action=='error' && !empty($_GET['_code']))
- {
+if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
- }
-
+}
// try to log in
-if ($_action=='login' && $_task=='mail')
- {
- $host = $_POST['_host'] ? $_POST['_host'] : $CONFIG['default_host'];
+if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') {
+ $host = rcmail_autoselect_host();
// check if client supports cookies
- if (empty($_COOKIE))
- {
- show_message("cookiesdisabled", 'warning');
- }
- else if (isset($_POST['_user']) && isset($_POST['_pass']) &&
- rcmail_login(get_input_value('_user', RCUBE_INPUT_POST), $_POST['_pass'], $host))
- {
- // send redirect
- header("Location: $COMM_PATH");
- exit;
- }
- else
- {
- show_message("loginfailed", 'warning');
- $_SESSION['user_id'] = '';
- }
+ if (empty($_COOKIE)) {
+ $OUTPUT->show_message("cookiesdisabled", 'warning');
}
+ else if ($_SESSION['temp'] && !empty($_POST['_user']) && isset($_POST['_pass']) &&
+ $RCMAIL->login(trim(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();
+
+ // send auth cookie if necessary
+ rcmail_authenticate_session();
+
+ // send redirect
+ header("Location: {$RCMAIL->comm_path}");
+ exit;
+ }
+ else {
+ $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'loginfailed', 'warning');
+ rcmail_kill_session();
+ }
+}
// end session
-else if ($_action=='logout' && isset($_SESSION['user_id']))
- {
- show_message('loggedout');
+else if (($RCMAIL->task=='logout' || $RCMAIL->action=='logout') && isset($_SESSION['user_id'])) {
+ $OUTPUT->show_message('loggedout');
+ rcmail_logout_actions();
rcmail_kill_session();
- }
+}
// check session and auth cookie
-else if ($_action!='login' && $_SESSION['user_id'])
- {
- if (!rcmail_authenticate_session() ||
- ($CONFIG['session_lifetime'] && isset($SESS_CHANGED) && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))
- {
- $message = show_message('sessionerror', 'error');
+else if ($RCMAIL->action != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
+ if (!rcmail_authenticate_session()) {
+ $OUTPUT->show_message('sessionerror', 'error');
rcmail_kill_session();
- }
}
+}
// log in to imap server
-if (!empty($_SESSION['user_id']) && $_task=='mail')
- {
+if (!empty($RCMAIL->user->ID) && $RCMAIL->task == 'mail') {
$conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']);
- if (!$conn)
- {
- show_message('imaperror', 'error');
- $_SESSION['user_id'] = '';
- }
- else
- rcmail_set_imap_prop();
+ if (!$conn) {
+ $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'sessionerror', 'error');
+ rcmail_kill_session();
}
+ else {
+ $RCMAIL->set_imap_prop();
+ }
+}
// not logged in -> set task to 'login
-if (empty($_SESSION['user_id']))
- {
- if ($REMOTE_REQUEST)
- {
- $message .= "setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);";
- rcube_remote_response($message);
- }
+if (empty($RCMAIL->user->ID)) {
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);");
- $_task = 'login';
+ $RCMAIL->task = 'login';
+}
+
+
+// check client X-header to verify request origin
+if ($OUTPUT->ajax_call) {
+ if (empty($CONFIG['devel_mode']) && !rc_request_header('X-RoundCube-Referer')) {
+ header('HTTP/1.1 404 Not Found');
+ die("Invalid Request");
}
-
-
-
-// set task and action to client
-$script = sprintf("%s.set_env('task', '%s');", $JS_OBJECT_NAME, $_task);
-if (!empty($_action))
- $script .= sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action);
-
-$OUTPUT->add_script($script);
-
+}
// not logged in -> show login page
-if (!$_SESSION['user_id'])
- {
- parse_template('login');
- exit;
+if (empty($RCMAIL->user->ID)) {
+ // check if installer is still active
+ if ($CONFIG['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.")
+ )
+ );
}
+
+ $OUTPUT->set_env('task', 'login');
+ $OUTPUT->task = 'login';
+ $OUTPUT->send('login');
+ exit;
+}
// handle keep-alive signal
-if ($_action=='keep-alive')
- {
- rcube_remote_response('');
+if ($RCMAIL->action=='keep-alive') {
+ $OUTPUT->reset();
+ $OUTPUT->send('');
exit;
- }
-
+}
// include task specific files
-if ($_task=='mail')
- {
+if ($RCMAIL->task=='mail') {
include_once('program/steps/mail/func.inc');
- if ($_action=='show' || $_action=='print')
+ if ($RCMAIL->action=='show' || $RCMAIL->action=='preview' || $RCMAIL->action=='print')
include('program/steps/mail/show.inc');
- if ($_action=='get')
+ if ($RCMAIL->action=='get')
include('program/steps/mail/get.inc');
- if ($_action=='moveto' || $_action=='delete')
+ if ($RCMAIL->action=='moveto' || $RCMAIL->action=='delete')
include('program/steps/mail/move_del.inc');
- if ($_action=='mark')
+ if ($RCMAIL->action=='mark')
include('program/steps/mail/mark.inc');
- if ($_action=='viewsource')
+ if ($RCMAIL->action=='viewsource')
include('program/steps/mail/viewsource.inc');
- if ($_action=='send')
+ if ($RCMAIL->action=='sendmdn')
+ include('program/steps/mail/sendmdn.inc');
+
+ if ($RCMAIL->action=='send')
include('program/steps/mail/sendmail.inc');
- if ($_action=='upload')
+ if ($RCMAIL->action=='upload')
include('program/steps/mail/upload.inc');
- if ($_action=='compose' || $_action=='remove-attachment')
+ if ($RCMAIL->action=='compose' || $RCMAIL->action=='remove-attachment' || $RCMAIL->action=='display-attachment')
include('program/steps/mail/compose.inc');
- if ($_action=='addcontact')
+ if ($RCMAIL->action=='addcontact')
include('program/steps/mail/addcontact.inc');
- if ($_action=='expunge' || $_action=='purge')
+ if ($RCMAIL->action=='expunge' || $RCMAIL->action=='purge')
include('program/steps/mail/folders.inc');
- if ($_action=='check-recent')
+ if ($RCMAIL->action=='check-recent')
include('program/steps/mail/check_recent.inc');
- if ($_action=='getunread')
+ if ($RCMAIL->action=='getunread')
include('program/steps/mail/getunread.inc');
- if ($_action=='list' && isset($_GET['_remote']))
+ if ($RCMAIL->action=='list' && isset($_REQUEST['_remote']))
include('program/steps/mail/list.inc');
- if ($_action=='search')
+ if ($RCMAIL->action=='search')
include('program/steps/mail/search.inc');
- if ($_action=='spell')
+ if ($RCMAIL->action=='spell')
include('program/steps/mail/spell.inc');
- if ($_action=='rss')
+ if ($RCMAIL->action=='rss')
include('program/steps/mail/rss.inc');
-
-
+
// make sure the message count is refreshed
- $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);
- }
+ $IMAP->messagecount($_SESSION['mbox'], 'ALL', true);
+}
// include task specific files
-if ($_task=='addressbook')
- {
+if ($RCMAIL->task=='addressbook') {
include_once('program/steps/addressbook/func.inc');
- if ($_action=='save')
+ if ($RCMAIL->action=='save')
include('program/steps/addressbook/save.inc');
- if ($_action=='edit' || $_action=='add')
+ if ($RCMAIL->action=='edit' || $RCMAIL->action=='add')
include('program/steps/addressbook/edit.inc');
- if ($_action=='delete')
+ if ($RCMAIL->action=='delete')
include('program/steps/addressbook/delete.inc');
- if ($_action=='show')
+ if ($RCMAIL->action=='show')
include('program/steps/addressbook/show.inc');
- if ($_action=='list' && $_GET['_remote'])
+ if ($RCMAIL->action=='list' && $_REQUEST['_remote'])
include('program/steps/addressbook/list.inc');
- if ($_action=='ldappublicsearch')
- include('program/steps/addressbook/ldapsearchform.inc');
- }
+ if ($RCMAIL->action=='search')
+ include('program/steps/addressbook/search.inc');
+
+ if ($RCMAIL->action=='copy')
+ include('program/steps/addressbook/copy.inc');
+
+ if ($RCMAIL->action=='mailto')
+ include('program/steps/addressbook/mailto.inc');
+}
// include task specific files
-if ($_task=='settings')
- {
+if ($RCMAIL->task=='settings') {
include_once('program/steps/settings/func.inc');
- if ($_action=='save-identity')
+ if ($RCMAIL->action=='save-identity')
include('program/steps/settings/save_identity.inc');
- if ($_action=='add-identity' || $_action=='edit-identity')
+ if ($RCMAIL->action=='add-identity' || $RCMAIL->action=='edit-identity')
include('program/steps/settings/edit_identity.inc');
- if ($_action=='delete-identity')
+ if ($RCMAIL->action=='delete-identity')
include('program/steps/settings/delete_identity.inc');
- if ($_action=='identities')
+ if ($RCMAIL->action=='identities')
include('program/steps/settings/identities.inc');
- if ($_action=='save-prefs')
+ if ($RCMAIL->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')
+ if ($RCMAIL->action=='folders' || $RCMAIL->action=='subscribe' || $RCMAIL->action=='unsubscribe' ||
+ $RCMAIL->action=='create-folder' || $RCMAIL->action=='rename-folder' || $RCMAIL->action=='delete-folder')
include('program/steps/settings/manage_folders.inc');
-
- }
+}
// parse main template
-// only allow these templates to be included
-if (in_array($_task, $MAIN_TASKS))
- parse_template($_task);
+$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);
+raise_error(array(
+ 'code' => 404,
+ 'type' => 'php',
+ 'line' => __LINE__,
+ 'file' => __FILE__,
+ 'message' => "Invalid request"), true, true);
?>
--
Gitblit v1.9.1