From 2e3ce3e76541aca33d42627bdb3b4e194410aae9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 28 Aug 2008 02:37:03 -0400
Subject: [PATCH] Add rcube name prefixes + codestyle
---
index.php | 498 +++++++++++++++++++-----------------------------------
1 files changed, 176 insertions(+), 322 deletions(-)
diff --git a/index.php b/index.php
index da92874..05ef875 100644
--- a/index.php
+++ b/index.php
@@ -1,387 +1,241 @@
<?php
/*
- +-----------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client |
- | Version 0.1-20061122 |
- | |
- | Copyright (C) 2005-2006, 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> |
- +-----------------------------------------------------------------------+
+ +-------------------------------------------------------------------------+
+ | RoundCube Webmail IMAP Client |
+ | Version 0.2-20080620 |
+ | |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
+ | |
+ | 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 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, write to the Free Software Foundation, Inc., |
+ | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
+ | |
+ +-------------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com> |
+ +-------------------------------------------------------------------------+
$Id$
*/
-define('RCMAIL_VERSION', '0.1-20061122');
+// 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 .= '/';
+// init application and start session with requested task
+$RCMAIL = rcmail::get_instance();
-
-// 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('lib/html2text.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';
-
-if (!empty($_GET['_remote']))
- $REMOTE_REQUEST = TRUE;
-
+// init output class
+$OUTPUT = !empty($_REQUEST['_remote']) ? $RCMAIL->init_json() : $RCMAIL->load_gui(!empty($_REQUEST['_framed']));
// set output buffering
-if ($_action != 'get' && $_action != 'viewsource')
- {
+if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') {
// use gzip compression if supported
- if (function_exists('ob_gzhandler') && !ini_get('zlib.output_compression'))
+ if (function_exists('ob_gzhandler')
+ && !ini_get('zlib.output_compression')
+ && ini_get('output_handler') != 'ob_gzhandler') {
ob_start('ob_gzhandler');
- else
+ }
+ else {
ob_start();
}
+}
-// 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
-load_gui();
-
+// check if config files had errors
+if ($err_str = $RCMAIL->config->get_error()) {
+ raise_error(array(
+ 'code' => 601,
+ 'type' => 'php',
+ 'message' => $err_str), false, true);
+}
// 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);
- }
-
-// handle HTML->text conversion
-if ($_action=='html2text')
- {
- $htmlText = $HTTP_RAW_POST_DATA;
- $converter = new html2text($htmlText);
-
- // TODO possibly replace with rcube_remote_response()
- send_nocacheing_headers();
- header('Content-Type: text/plain');
- $plaintext = $converter->get_text();
- print $plaintext;
-
- exit;
- }
-
+}
// try to log in
-if ($_action=='login' && $_task=='mail')
- {
- $host = rcmail_autoselect_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),
- get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $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']);
+ rcube_sess_regenerate_id();
+
+ // send auth cookie if necessary
+ $RCMAIL->authenticate_session();
+
+ // log successful login
+ if ($RCMAIL->config->get('log_logins') && $RCMAIL->config->get('debug_level') & 1)
+ console(sprintf('Successful login for %s (id %d) from %s',
+ trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
+ $_SESSION['user_id'],
+ $_SERVER['REMOTE_ADDR']));
+
+ // send redirect
+ $OUTPUT->redirect();
+ }
+ 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');
- rcmail_kill_session();
- }
+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() ||
- (!empty($CONFIG['session_lifetime']) && isset($SESS_CHANGED) && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))
- {
- $message = show_message('sessionerror', 'error');
- rcmail_kill_session();
- }
+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')
- {
- $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 (!empty($RCMAIL->user->ID) && $RCMAIL->task == 'mail') {
+ if (!$RCMAIL->imap_connect()) {
+ $RCMAIL->kill_session();
}
+}
-// 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);
- }
-
- $_task = 'login';
+// check client X-header to verify request origin
+if ($OUTPUT->ajax_call) {
+ if ($RCMAIL->config->get('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)) {
+
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->redirect(array(), 2000);
+
+ // 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.")
+ )
+ );
}
+
+ $OUTPUT->set_env('task', 'login');
+ $OUTPUT->send('login');
+}
// handle keep-alive signal
-if ($_action=='keep-alive')
- {
- rcube_remote_response('');
- exit;
- }
+if ($RCMAIL->action=='keep-alive') {
+ $OUTPUT->reset();
+ $OUTPUT->send();
+}
-// include task specific files
-if ($_task=='mail')
- {
- include_once('program/steps/mail/func.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' => 'compose.inc',
+ 'display-attachment' => 'compose.inc',
+ ),
- if ($_action=='show' || $_action=='print')
- include('program/steps/mail/show.inc');
+ 'addressbook' => array(
+ 'add' => 'edit.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',
+ 'add-identity' => 'edit_identity.inc',
+ )
+);
- if ($_action=='get')
- include('program/steps/mail/get.inc');
+// include task specific functions
+include_once 'program/steps/'.$RCMAIL->task.'/func.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');
+// 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';
- if ($_action=='list' && isset($_GET['_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=='quotaimg')
- include('program/steps/mail/quotaimg.inc');
-
-
- // make sure the message count is refreshed
- $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);
+ // try to include the step file
+ if (is_file(($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile))) {
+ include($incfile);
+ $redirects++;
}
-
-
-// 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' && $_GET['_remote'])
- include('program/steps/addressbook/list.inc');
-
- if ($_action=='ldappublicsearch')
- include('program/steps/addressbook/ldapsearchform.inc');
+ else {
+ break;
}
+}
-// include task specific files
-if ($_task=='settings')
- {
- include_once('program/steps/settings/func.inc');
+// make sure the message count is refreshed (for default view)
+if ($RCMAIL->task == 'mail') {
+ $IMAP->messagecount($_SESSION['mbox'], 'ALL', true);
+}
- 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
-parse_template($_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);
+raise_error(array(
+ 'code' => 404,
+ 'type' => 'php',
+ 'line' => __LINE__,
+ 'file' => __FILE__,
+ 'message' => "Invalid request"), true, true);
?>
--
Gitblit v1.9.1