Applied several patches

thomascube

2006-02-19 f88d417c96119b8e50297b930b14fe6ff9a1c5ed

 index.php

@@ -2,7 +2,7 @@
/*
 +-----------------------------------------------------------------------+
 | RoundCube Webmail IMAP Client                                         |
 | Version 0.1-20060104                                                  |
 | Version 0.1b-20060219                                                 |
 |                                                                       |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
@@ -40,13 +40,14 @@

*/

define('RCMAIL_VERSION', '0.1-20060104');
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 (empty($INSTALL_PATH))
  $INSTALL_PATH = './';
@@ -62,6 +63,7 @@
ini_set('session.use_cookies', 1);
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
@@ -79,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
@@ -215,7 +234,7 @@
if ($_task=='mail')
  {
  include_once('program/steps/mail/func.inc');

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

@@ -243,7 +262,7 @@
  if ($_action=='addcontact')
    include('program/steps/mail/addcontact.inc');

  if ($_action=='expunge')
  if ($_action=='expunge' || $_action=='purge')
    include('program/steps/mail/folders.inc');

  if ($_action=='check-recent')
@@ -255,6 +274,9 @@
  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']))
    rcmail_compose_cleanup();