thomascube
2006-09-01 3ea0e3202a73eb7efcbf0b825582a6d3504658aa
index.php
@@ -2,9 +2,9 @@
/*
 +-----------------------------------------------------------------------+
 | RoundCube Webmail IMAP Client                                         |
 | Version 0.1-20060505                                                  |
 | Version 0.1-20060901                                                  |
 |                                                                       |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
 | Copyright (C) 2005-2006, 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-20060707');
define('RCMAIL_VERSION', '0.1-20060901');
// define global vars
$CHARSET = 'UTF-8';
@@ -53,7 +53,13 @@
  $INSTALL_PATH = './';
else
  $INSTALL_PATH .= '/';
// 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
@@ -89,7 +95,6 @@
// catch some url/post parameters
$_auth = get_input_value('_auth', RCUBE_INPUT_GPC);
$_task = get_input_value('_task', RCUBE_INPUT_GPC);
$_action = get_input_value('_action', RCUBE_INPUT_GPC);
$_framed = (!empty($_GET['_framed']) || !empty($_POST['_framed']));
@@ -104,14 +109,14 @@
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 ($_framed)
  {
  $COMM_PATH .= '&_framed=1';
  $COMM_PATH .= '&amp;_framed=1';
  $SESS_HIDDEN_FIELD .= "\n".'<input type="hidden" name="_framed" value="1" />';
  }
@@ -146,9 +151,7 @@
    show_message("cookiesdisabled", 'warning');
    }
  else if (isset($_POST['_user']) && isset($_POST['_pass']) &&
           rcmail_login(get_input_value('_user', RCUBE_INPUT_POST),
                        get_input_value('_pass', RCUBE_INPUT_POST),
                        $host))
           rcmail_login(get_input_value('_user', RCUBE_INPUT_POST), $_POST['_pass'], $host))
    {
    // send redirect
    header("Location: $COMM_PATH");
@@ -168,10 +171,10 @@
  rcmail_kill_session();
  }
// check session cookie and auth string
else if ($_action!='login' && $sess_auth && $_SESSION['user_id'])
// check session and auth cookie
else if ($_action!='login' && $_SESSION['user_id'])
  {
  if ($_auth !== $sess_auth || $_auth != rcmail_auth_hash($_SESSION['client_id'], $_SESSION['auth_time']) ||
  if (!rcmail_authenticate_session() ||
      ($CONFIG['session_lifetime'] && isset($SESS_CHANGED) && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))
    {
    $message = show_message('sessionerror', 'error');
@@ -285,11 +288,11 @@
  if ($_action=='rss')
    include('program/steps/mail/rss.inc');
  // kill compose entry from session
  if (isset($_SESSION['compose']))
    rcmail_compose_cleanup();
    
  if ($_action=='quotaimg')
    include('program/steps/mail/quotaimg.inc');
  // make sure the message count is refreshed
  $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);
  }
@@ -340,7 +343,8 @@
  if ($_action=='save-prefs')
    include('program/steps/settings/save_prefs.inc');  
  if ($_action=='folders' || $_action=='subscribe' || $_action=='unsubscribe' || $_action=='create-folder' || $_action=='rename-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');
  }