fixed bug #1327833

thomascube

2005-10-16 8c67d5801ce2bb724baf324941b6cbf7ea388bfd

 index.php

@@ -3,7 +3,7 @@
/*
 +-----------------------------------------------------------------------+
 | RoundCube Webmail IMAP Client                                         |
 | Version 0.1-20050929                                                  |
 | Version 0.1-20051007                                                  |
 |                                                                       |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
@@ -45,17 +45,21 @@
$INSTALL_PATH = './';
$OUTPUT_TYPE = 'html';
$JS_OBJECT_NAME = 'rcmail';
$CURRENT_PATH=dirname($_SERVER['SCRIPT_FILENAME']);


if ($CURRENT_PATH!='')
   $CURRENT_PATH.='/';
	
// set environment first
ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.'program'.PATH_SEPARATOR.'program/lib');
ini_set('include_path', $INSTALL_PATH.PATH_SEPARATOR.$CURRENT_PATH.'program'.PATH_SEPARATOR.$CURRENT_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('error_reporting', E_ALL&~E_NOTICE);


// increase maximum execution time for php scripts
set_time_limit('120');
// (does not work in safe mode)
@set_time_limit('120');


// include base files
@@ -73,9 +77,11 @@
$_action = !empty($_POST['_action']) ? $_POST['_action'] : (!empty($_GET['_action']) ? $_GET['_action'] : '');
$_framed = (!empty($_GET['_framed']) || !empty($_POST['_framed']));

if (!empty($_GET['_remote']))
  $REMOTE_REQUEST = TRUE;

// start session with requested task
rcmail_startup($_task);


// set session related variables
$COMM_PATH = sprintf('./?_auth=%s&_task=%s', $sess_auth, $_task);
@@ -92,7 +98,6 @@

// init necessary objects for GUI
load_gui();


// error steps
if ($_action=='error' && !empty($_GET['_code']))
@@ -125,7 +130,7 @@
  }

// end session
else if ($_action=='logout' && $_SESSION['user_id'])
else if ($_action=='logout' && isset($_SESSION['user_id']))
  {
  show_message('loggedout');
  rcmail_kill_session();
@@ -136,7 +141,7 @@
  {
  if ($_auth !== $sess_auth || $_auth != rcmail_auth_hash($_SESSION['client_id'], $_SESSION['auth_time']))
    {
    show_message('sessionerror', 'error');
    $message = show_message('sessionerror', 'error');
    rcmail_kill_session();
    }
  }
@@ -156,7 +161,15 @@

// 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';
  }