From 8094288d237a2503de6f97956b5558b28c4db56b Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Fri, 08 Jun 2007 19:47:57 -0400
Subject: [PATCH] fixed html2text in editor
---
index.php | 274 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 190 insertions(+), 84 deletions(-)
diff --git a/index.php b/index.php
index 19623aa..6047499 100644
--- a/index.php
+++ b/index.php
@@ -1,12 +1,11 @@
<?php
-
/*
+-----------------------------------------------------------------------+
| RoundCube Webmail IMAP Client |
- | Version 0.1-20050811 |
+ | Version 0.1-20070518 |
| |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | 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 |
@@ -41,149 +40,216 @@
*/
+// application constants
+define('RCMAIL_VERSION', '0.1-20070517');
+define('RCMAIL_CHARSET', 'UTF-8');
+define('JS_OBJECT_NAME', 'rcmail');
+
// define global vars
-$INSTALL_PATH = './';
$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 .= '/';
-// set environment first
-ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.'program'.PATH_SEPARATOR.'program/lib');
+// 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.save_path', $INSTALL_PATH.'session');
-
+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
-set_time_limit('120');
-
+// (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/rcube_mysql.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);
// catch some url/post parameters
-$_auth = strlen($_POST['_auth']) ? $_POST['_auth'] : $_GET['_auth'];
-$_task = strlen($_POST['_task']) ? $_POST['_task'] : ($_GET['_task'] ? $_GET['_task'] : 'mail');
-$_action = strlen($_POST['_action']) ? $_POST['_action'] : $_GET['_action'];
-$_framed = ($_GET['_framed'] || $_POST['_framed']);
+$_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();
+}
+
// start session with requested task
rcmail_startup($_task);
-
// set session related variables
-$COMM_PATH = sprintf('./?_auth=%s&_task=%s', $sess_auth, $_task);
-$SESS_HIDDEN_FIELD = sprintf('<input type="hidden" name="_auth" value="%s" />', $sess_auth);
+$COMM_PATH = sprintf('./?_task=%s', $_task);
+$SESS_HIDDEN_FIELD = '';
// add framed parameter
-if ($_GET['_framed'] || $_POST['_framed'])
- {
+if ($_framed)
+{
$COMM_PATH .= '&_framed=1';
- $SESS_HIDDEN_FIELD = "\n".'<input type="hidden" name="_framed" value="1" />';
- }
+ $SESS_HIDDEN_FIELD .= "\n".'<input type="hidden" name="_framed" value="1" />';
+}
// init necessary objects for GUI
-load_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);
+}
// error steps
-if ($_action=='error' && strlen($_GET['_code']))
- {
+if ($_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'];
+{
+ $host = rcmail_autoselect_host();
// check if client supports cookies
- if (!$_COOKIE[session_name()])
- {
- show_message("cookiesdisabled", 'warning');
- }
- else if ($_POST['_user'] && $_POST['_pass'] && rcmail_login($_POST['_user'], $_POST['_pass'], $host))
- {
+ 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();
+
+ // send auth cookie if necessary
+ rcmail_authenticate_session();
+
// send redirect
header("Location: $COMM_PATH");
exit;
- }
- else
- {
- show_message("loginfailed", 'warning');
- $_SESSION['user_id'] = '';
- }
}
+ else
+ {
+ $OUTPUT->show_message("loginfailed", 'warning');
+ $_SESSION['user_id'] = '';
+ }
+}
// end session
-else if ($_action=='logout' && $_SESSION['user_id'])
- {
- show_message('loggedout');
+else if (($_task=='logout' || $_action=='logout') && isset($_SESSION['user_id']))
+{
+ $OUTPUT->show_message('loggedout');
rcmail_kill_session();
- }
+}
-// check session cookie and auth string
-else if ($_action!='login' && $_auth && $sess_auth)
+// check session and auth cookie
+else if ($_action != 'login' && $_SESSION['user_id'] && $_action != 'send')
+{
+ if (!rcmail_authenticate_session())
{
- if ($_auth !== $sess_auth || $_auth != rcmail_auth_hash($_SESSION['client_id'], $_SESSION['auth_time']))
- {
- show_message('sessionerror', 'error');
+ $OUTPUT->show_message('sessionerror', 'error');
rcmail_kill_session();
- }
}
+}
// log in to imap server
-if ($_SESSION['user_id'] && $_task=='mail')
- {
- $conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']));
+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');
+ {
+ $OUTPUT->show_message('imaperror', 'error');
$_SESSION['user_id'] = '';
- }
}
+ else
+ rcmail_set_imap_prop();
+}
// not logged in -> set task to 'login
-if (!$_SESSION['user_id'])
+if (empty($_SESSION['user_id']))
+{
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);");
+
$_task = 'login';
+}
-// set taask and action to client
-$script = sprintf("%s.set_env('task', '%s');", $JS_OBJECT_NAME, $_task);
+// set task and action to client
+$OUTPUT->set_env('task', $_task);
if (!empty($_action))
- $script .= sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action);
-
-$OUTPUT->add_script($script);
+ $OUTPUT->set_env('action', $_action);
// not logged in -> show login page
if (!$_SESSION['user_id'])
- {
- parse_template('login');
+{
+ $OUTPUT->task = 'login';
+ $OUTPUT->send('login');
exit;
- }
+}
+// handle keep-alive signal
+if ($_action=='keep-alive')
+{
+ $OUTPUT->reset();
+ $OUTPUT->send('');
+ exit;
+}
// include task specific files
if ($_task=='mail')
- {
+{
include_once('program/steps/mail/func.inc');
-
- if ($_action=='show' || $_action=='print')
+
+ if ($_action=='show' || $_action=='preview' || $_action=='print')
include('program/steps/mail/show.inc');
if ($_action=='get')
@@ -204,24 +270,45 @@
if ($_action=='upload')
include('program/steps/mail/upload.inc');
- if ($_action=='compose')
+ 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' && $_GET['_remote'])
+ if ($_action=='list' && isset($_REQUEST['_remote']))
include('program/steps/mail/list.inc');
- // kill compose entry from session
- if (isset($_SESSION['compose']))
- rcmail_compose_cleanup();
- }
+ 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);
+}
// include task specific files
if ($_task=='addressbook')
- {
+{
include_once('program/steps/addressbook/func.inc');
if ($_action=='save')
@@ -236,14 +323,23 @@
if ($_action=='show')
include('program/steps/addressbook/show.inc');
- if ($_action=='list' && $_GET['_remote'])
+ 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');
+}
// include task specific files
if ($_task=='settings')
- {
+{
include_once('program/steps/settings/func.inc');
if ($_action=='save-identity')
@@ -261,13 +357,23 @@
if ($_action=='save-prefs')
include('program/steps/settings/save_prefs.inc');
- if ($_action=='folders' || $_action=='subscribe' || $_action=='unsubscribe' || $_action=='create-folder' || $_action=='delete-folder')
+ 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);
+$OUTPUT->send($_task);
-?>
\ No newline at end of file
+
+// if we arrive here, something went wrong
+raise_error(array(
+ 'code' => 404,
+ 'type' => 'php',
+ 'line' => __LINE__,
+ 'file' => __FILE__,
+ 'message' => "Invalid request"), TRUE, TRUE);
+
+?>
--
Gitblit v1.9.1