Imported Debian patch 0.5.2+dfsg-1

[roundcube.git] / plugins / autologon / autologon.php

diff --git a/plugins/autologon/autologon.php b/plugins/autologon/autologon.php
index c40f2d4eb63d351c4ec1fece99b5cce032323ca9..9601d61a6e4f7b629dce6c54f21dd8c2f0bde13e 100644 (file)
--- a/plugins/autologon/autologon.php
+++ b/plugins/autologon/autologon.php
@@ -6,6 +6,7 @@
  */
 class autologon extends rcube_plugin
 {
+  public $task = 'login';
 
   function init()
   {
@@ -18,7 +19,7 @@ class autologon extends rcube_plugin
     $rcmail = rcmail::get_instance();
 
     // change action to login
-    if ($args['task'] == 'mail' && empty($args['action']) && empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
+    if (empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
       $args['action'] = 'login';
 
     return $args;
@@ -30,6 +31,8 @@ class autologon extends rcube_plugin
       $args['user'] = 'me';
       $args['pass'] = '******';
       $args['host'] = 'localhost';
+      $args['cookiecheck'] = false;
+      $args['valid'] = true;
     }
   
     return $args;