From c17dc6aa31aaa6e7f61bd25993be55354e428996 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 20 Sep 2008 13:21:15 -0400
Subject: [PATCH] #1485385: fix missing close form tag
---
index.php | 298 +++++++++++++++++++++++------------------------------------
1 files changed, 115 insertions(+), 183 deletions(-)
diff --git a/index.php b/index.php
index 3d4a160..adab411 100644
--- a/index.php
+++ b/index.php
@@ -1,40 +1,27 @@
<?php
/*
- +-----------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client |
- | Version 0.1-20080430 |
- | |
- | Copyright (C) 2005-2008, 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-20080829 |
+ | |
+ | 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$
@@ -43,8 +30,11 @@
// include environment
require_once 'program/include/iniset.php';
-// define global vars
-$OUTPUT_TYPE = 'html';
+// init application and start session with requested task
+$RCMAIL = rcmail::get_instance();
+
+// init output class
+$OUTPUT = !empty($_REQUEST['_remote']) ? $RCMAIL->init_json() : $RCMAIL->load_gui(!empty($_REQUEST['_framed']));
// set output buffering
if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') {
@@ -60,12 +50,13 @@
}
-// 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 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()) {
@@ -83,7 +74,7 @@
// try to log in
if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') {
- $host = rcmail_autoselect_host();
+ $host = $RCMAIL->autoselect_host();
// check if client supports cookies
if (empty($_COOKIE)) {
@@ -94,62 +85,55 @@
get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $host)) {
// create new session ID
unset($_SESSION['temp']);
- sess_regenerate_id();
+ rcube_sess_regenerate_id();
// send auth cookie if necessary
- rcmail_authenticate_session();
+ $RCMAIL->authenticate_session();
+
+ // log successful login
+ if ($RCMAIL->config->get('log_logins')) {
+ write_log('userlogins', sprintf('Successful login for %s (id %d) from %s',
+ $RCMAIL->user->get_username(),
+ $RCMAIL->user->ID,
+ $_SERVER['REMOTE_ADDR']));
+ }
// send redirect
- header("Location: {$RCMAIL->comm_path}");
- exit;
+ $OUTPUT->redirect();
}
else {
$OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'loginfailed', 'warning');
- rcmail_kill_session();
+ $RCMAIL->kill_session();
}
}
// end session
else if (($RCMAIL->task=='logout' || $RCMAIL->action=='logout') && isset($_SESSION['user_id'])) {
$OUTPUT->show_message('loggedout');
- rcmail_logout_actions();
- rcmail_kill_session();
+ $RCMAIL->logout_actions();
+ $RCMAIL->kill_session();
}
// check session and auth cookie
else if ($RCMAIL->action != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
- if (!rcmail_authenticate_session()) {
+ if (!$RCMAIL->authenticate_session()) {
$OUTPUT->show_message('sessionerror', 'error');
- rcmail_kill_session();
+ $RCMAIL->kill_session();
}
}
// log in to imap server
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) {
- $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'sessionerror', 'error');
- rcmail_kill_session();
+ if (!$RCMAIL->imap_connect()) {
+ $RCMAIL->kill_session();
}
- else {
- $RCMAIL->set_imap_prop();
- }
-}
-
-
-// not logged in -> set task to 'login
-if (empty($RCMAIL->user->ID)) {
- if ($OUTPUT->ajax_call)
- $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);");
-
- $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')) {
+ if (!$RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
header('HTTP/1.1 404 Not Found');
die("Invalid Request");
}
@@ -158,8 +142,12 @@
// not logged in -> show login page
if (empty($RCMAIL->user->ID)) {
+
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->redirect(array(), 2000);
+
// check if installer is still active
- if ($CONFIG['enable_installer'] && is_readable('./installer/index.php')) {
+ 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!") .
@@ -170,135 +158,79 @@
);
}
- $OUTPUT->task = 'login';
+ $OUTPUT->set_env('task', 'login');
$OUTPUT->send('login');
- exit;
}
// handle keep-alive signal
-if ($RCMAIL->action=='keep-alive') {
+if ($RCMAIL->action == 'keep-alive') {
$OUTPUT->reset();
- $OUTPUT->send('');
- exit;
+ $OUTPUT->send();
+}
+// save preference value
+else if ($RCMAIL->action == 'save-pref') {
+ $RCMAIL->user->save_prefs(array(get_input_value('_name', RCUBE_INPUT_POST) => get_input_value('_value', RCUBE_INPUT_POST)));
+ $OUTPUT->reset();
+ $OUTPUT->send();
}
-// include task specific files
-if ($RCMAIL->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 ($RCMAIL->action=='show' || $RCMAIL->action=='preview' || $RCMAIL->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 ($RCMAIL->action=='get')
- include('program/steps/mail/get.inc');
+// include task specific functions
+include_once 'program/steps/'.$RCMAIL->task.'/func.inc';
- if ($RCMAIL->action=='moveto' || $RCMAIL->action=='delete')
- include('program/steps/mail/move_del.inc');
-
- if ($RCMAIL->action=='mark')
- include('program/steps/mail/mark.inc');
-
- if ($RCMAIL->action=='viewsource')
- include('program/steps/mail/viewsource.inc');
-
- if ($RCMAIL->action=='sendmdn')
- include('program/steps/mail/sendmdn.inc');
-
- if ($RCMAIL->action=='send')
- include('program/steps/mail/sendmail.inc');
-
- if ($RCMAIL->action=='upload')
- include('program/steps/mail/upload.inc');
-
- if ($RCMAIL->action=='compose' || $RCMAIL->action=='remove-attachment' || $RCMAIL->action=='display-attachment')
- include('program/steps/mail/compose.inc');
-
- if ($RCMAIL->action=='addcontact')
- include('program/steps/mail/addcontact.inc');
-
- if ($RCMAIL->action=='expunge' || $RCMAIL->action=='purge')
- include('program/steps/mail/folders.inc');
-
- if ($RCMAIL->action=='check-recent')
- include('program/steps/mail/check_recent.inc');
-
- if ($RCMAIL->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 ($RCMAIL->action=='list' && isset($_REQUEST['_remote']))
- include('program/steps/mail/list.inc');
+ // try to include the step file
+ if (is_file(($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile))) {
+ include($incfile);
+ $redirects++;
+ }
+ else {
+ break;
+ }
+}
- if ($RCMAIL->action=='search')
- include('program/steps/mail/search.inc');
-
- if ($RCMAIL->action=='spell')
- include('program/steps/mail/spell.inc');
- if ($RCMAIL->action=='rss')
- include('program/steps/mail/rss.inc');
-
- // make sure the message count is refreshed
+// make sure the message count is refreshed (for default view)
+if ($RCMAIL->task == 'mail') {
$IMAP->messagecount($_SESSION['mbox'], 'ALL', true);
}
-
-// include task specific files
-if ($RCMAIL->task=='addressbook') {
- include_once('program/steps/addressbook/func.inc');
-
- if ($RCMAIL->action=='save')
- include('program/steps/addressbook/save.inc');
-
- if ($RCMAIL->action=='edit' || $RCMAIL->action=='add')
- include('program/steps/addressbook/edit.inc');
-
- if ($RCMAIL->action=='delete')
- include('program/steps/addressbook/delete.inc');
-
- if ($RCMAIL->action=='show')
- include('program/steps/addressbook/show.inc');
-
- if ($RCMAIL->action=='list' && $_REQUEST['_remote'])
- include('program/steps/addressbook/list.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 ($RCMAIL->task=='settings') {
- include_once('program/steps/settings/func.inc');
-
- if ($RCMAIL->action=='save-identity')
- include('program/steps/settings/save_identity.inc');
-
- if ($RCMAIL->action=='add-identity' || $RCMAIL->action=='edit-identity')
- include('program/steps/settings/edit_identity.inc');
-
- if ($RCMAIL->action=='delete-identity')
- include('program/steps/settings/delete_identity.inc');
-
- if ($RCMAIL->action=='identities')
- include('program/steps/settings/identities.inc');
-
- if ($RCMAIL->action=='save-prefs')
- include('program/steps/settings/save_prefs.inc');
-
- 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
+// parse main template (default)
$OUTPUT->send($RCMAIL->task);
--
Gitblit v1.9.1