From f91f8533678c388b879d9e999a6bcc9e22ad7e19 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <root@paranoid>
Date: Tue, 5 Aug 2014 16:44:07 +0200
Subject: lot of stuff

---
 index.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 727c66163..72515203d 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 0.9.2                                                           |
+ | Version 0.9.5                                                           |
  |                                                                         |
  | Copyright (C) 2005-2013, The Roundcube Dev Team                         |
  |                                                                         |
@@ -39,7 +39,7 @@
 require_once 'program/include/iniset.php';
 
 // init application, start session, init output class, etc.
-$RCMAIL = rcmail::get_instance($GLOBALS['env']);
+$RCMAIL = rcmail::get_instance();
 
 // Make the whole PHP output non-cacheable (#1487797)
 $RCMAIL->output->nocacheing_headers();
@@ -138,7 +138,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
   }
   else {
     if (!$auth['valid']) {
-      $error_code = RCMAIL::ERROR_INVALID_REQUEST;
+      $error_code  = RCMAIL::ERROR_INVALID_REQUEST;
     }
     else {
       $error_code = $auth['error'] ? $auth['error'] : $RCMAIL->login_error();
@@ -153,9 +153,6 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
 
     $error_message = $error_labels[$error_code] ? $error_labels[$error_code] : 'loginfailed';
 
-    // log failed login
-    $RCMAIL->log_login($auth['user'], true, $error_code);
-
     $OUTPUT->show_message($error_message, 'warning');
     $RCMAIL->plugins->exec_hook('login_failed', array(
       'code' => $error_code, 'host' => $auth['host'], 'user' => $auth['user']));
@@ -294,7 +291,7 @@ while ($redirects < 5) {
 }
 
 if ($RCMAIL->action == 'refresh') {
-  $RCMAIL->plugins->exec_hook('refresh', array('last' => intval(rcube_utils::get_input_value('_last', rcube_utils::INPUT_GPC))));
+  $RCMAIL->plugins->exec_hook('refresh', array());
 }
 
 // parse main template (default)
-- 
cgit v1.2.3