thomascube
2007-03-23 6d09984ea83861adb225a985b924eecb948702df
index.php
@@ -2,9 +2,9 @@
/*
 +-----------------------------------------------------------------------+
 | RoundCube Webmail IMAP Client                                         |
 | Version 0.1-20061122                                                  |
 | Version 0.1-20070301                                                  |
 |                                                                       |
 | Copyright (C) 2005-2006, RoundCube Dev. - Switzerland                 |
 | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | Redistribution and use in source and binary forms, with or without    |
@@ -40,7 +40,7 @@
*/
define('RCMAIL_VERSION', '0.1-20061122');
define('RCMAIL_VERSION', '0.1-20070301');
// define global vars
$CHARSET = 'UTF-8';
@@ -73,7 +73,7 @@
// increase maximum execution time for php scripts
// (does not work in safe mode)
@set_time_limit(120);
if (!ini_get('safe_mode')) @set_time_limit(120);
// include base files
require_once('include/rcube_shared.inc');
@@ -106,7 +106,7 @@
if ($_action != 'get' && $_action != 'viewsource')
  {
  // use gzip compression if supported
  if (function_exists('ob_gzhandler') && !ini_get('zlib.output_compression'))
  if (function_exists('ob_gzhandler') && ini_get('zlib.output_compression'))
    ob_start('ob_gzhandler');
  else
    ob_start();
@@ -154,7 +154,6 @@
  $converter = new html2text($htmlText);
  // TODO possibly replace with rcube_remote_response()
  send_nocacheing_headers();
  header('Content-Type: text/plain');
  $plaintext = $converter->get_text();
  print $plaintext;
@@ -196,7 +195,7 @@
  }
// check session and auth cookie
else if ($_action!='login' && $_SESSION['user_id'])
else if ($_action != 'login' && $_SESSION['user_id'] && $_action != 'send')
  {
  if (!rcmail_authenticate_session() ||
      (!empty($CONFIG['session_lifetime']) && isset($SESS_CHANGED) && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))
@@ -264,7 +263,7 @@
  {
  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')
@@ -315,6 +314,9 @@
  if ($_action=='quotaimg')
    include('program/steps/mail/quotaimg.inc');
  if ($_action=='quotadisplay')
    include('program/steps/mail/quotadisplay.inc');
  // make sure the message count is refreshed
  $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);