Applied several patches

thomascube

2006-02-19 f88d417c96119b8e50297b930b14fe6ff9a1c5ed

 index.php

@@ -1,9 +1,8 @@
<?php

/*
 +-----------------------------------------------------------------------+
 | RoundCube Webmail IMAP Client                                         |
 | Version 0.1-20051018                                                  |
 | Version 0.1b-20060219                                                 |
 |                                                                       |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
@@ -41,12 +40,18 @@

*/

define('RCMAIL_VERSION', '0.1b-20060219');


// define global vars
$INSTALL_PATH = dirname($_SERVER['SCRIPT_FILENAME']);
$OUTPUT_TYPE = 'html';
$JS_OBJECT_NAME = 'rcmail';
$CHARSET = 'UTF-8';

if ($INSTALL_PATH!='')
if (empty($INSTALL_PATH))
  $INSTALL_PATH = './';
else
  $INSTALL_PATH .= '/';
   
// RC include folders MUST be included FIRST to avoid other
@@ -56,11 +61,14 @@

ini_set('session.name', 'sessid');
ini_set('session.use_cookies', 1);
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('session.gc_maxlifetime', 21600);
ini_set('session.gc_divisor', 500);
ini_set('magic_quotes_gpc', 0);
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');
@set_time_limit(120);

// include base files
require_once('include/rcube_shared.inc');
@@ -73,6 +81,23 @@

// set PEAR error handling
// PEAR::setErrorHandling(PEAR_ERROR_TRIGGER, E_USER_NOTICE);


// strip magic quotes from Superglobals...
if ((bool)get_magic_quotes_gpc())  // by "php Pest"
  {
  // Really EGPCSR - Environment $_ENV, GET $_GET , POST $_POST, Cookie $_COOKIE, Server $_SERVER
  // and their HTTP_*_VARS cousins (separate arrays, not references) and $_REQUEST
  $fnStripMagicQuotes = create_function(
        '&$mData, $fnSelf',
        'if (is_array($mData)) { foreach ($mData as $mKey=>$mValue) $fnSelf($mData[$mKey], $fnSelf); return; } '.
        '$mData = stripslashes($mData);'
  );
  
  // do each set of EGPCSR as you find necessary
  $fnStripMagicQuotes($_POST, $fnStripMagicQuotes);
  $fnStripMagicQuotes($_GET, $fnStripMagicQuotes);
  }


// catch some url/post parameters
@@ -96,7 +121,7 @@
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" />';
  }


@@ -141,10 +166,10 @@
  }

// check session cookie and auth string
else if ($_action!='login' && $sess_auth)
else if ($_action!='login' && $sess_auth && $_SESSION['user_id'])
  {
  if ($_auth !== $sess_auth || $_auth != rcmail_auth_hash($_SESSION['client_id'], $_SESSION['auth_time']) ||
      ($CONFIG['session_lifetime'] && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))
      ($CONFIG['session_lifetime'] && isset($SESS_CHANGED) && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))
    {
    $message = show_message('sessionerror', 'error');
    rcmail_kill_session();
@@ -197,12 +222,19 @@
  }


// handle keep-alive signal
if ($_action=='keep-alive')
  {
  rcube_remote_response('');
  exit;
  }


// include task specific files
if ($_task=='mail')
  {
  include_once('program/steps/mail/func.inc');

  
  if ($_action=='show' || $_action=='print')
    include('program/steps/mail/show.inc');

@@ -229,9 +261,21 @@

  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'])
    include('program/steps/mail/list.inc');

  if ($_action=='rss')
    include('program/steps/mail/rss.inc');

  // kill compose entry from session
  if (isset($_SESSION['compose']))
@@ -258,6 +302,9 @@

  if ($_action=='list' && $_GET['_remote'])
    include('program/steps/addressbook/list.inc');

  if ($_action=='ldappublicsearch')
    include('program/steps/addressbook/ldapsearchform.inc');
  }


@@ -302,4 +349,4 @@
                  'file' => __FILE__,
                  'message' => "Invalid request"), TRUE, TRUE);
                      
?>
?>