Fix incomplete backport from trunk

thomascube

2011-08-13 a02cfa9b085fc875fc55f57029a8e5846771ed5e

 index.php

@@ -2,7 +2,7 @@
/*
 +-------------------------------------------------------------------------+
 | Roundcube Webmail IMAP Client                                           |
 | Version 0.5.1                                                           |
 | Version 0.5.4                                                           |
 |                                                                         |
 | Copyright (C) 2005-2011, Roundcube Dev. - Switzerland                   |
 |                                                                         |
@@ -95,10 +95,12 @@
  }
  else if ($auth['valid'] && !$auth['abort'] &&
        !empty($auth['host']) && !empty($auth['user']) &&
        $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
    // create new session ID
        $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])
  ) {
    // create new session ID, don't destroy the current session
    // it was destroyed already by $RCMAIL->kill_session() above
    $RCMAIL->session->remove('temp');
    $RCMAIL->session->regenerate_id();
    $RCMAIL->session->regenerate_id(false);

    // send auth cookie if necessary
    $RCMAIL->authenticate_session();
@@ -110,7 +112,7 @@
    $query = array();
    if ($url = get_input_value('_url', RCUBE_INPUT_POST)) {
      parse_str($url, $query);
      

      // prevent endless looping on login page
      if ($query['_task'] == 'login')
        unset($query['_task']);
@@ -180,7 +182,7 @@

  // check client X-header to verify request origin
  if ($OUTPUT->ajax_call) {
    if (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token()) {
    if (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token() && !$RCMAIL->config->get('devel_mode')) {
      header('HTTP/1.1 404 Not Found');
      die("Invalid Request");
    }