[Svn] r2840 - trunk/roundcubemail

trac at roundcube.net trac at roundcube.net
Wed Aug 5 15:13:58 CEST 2009


Author: thomasb
Date: 2009-08-05 08:13:57 -0500 (Wed, 05 Aug 2009)
New Revision: 2840

Modified:
   trunk/roundcubemail/index.php
Log:
Allow a plugin to disable the cookie check

Modified: trunk/roundcubemail/index.php
===================================================================
--- trunk/roundcubemail/index.php	2009-08-05 08:05:32 UTC (rev 2839)
+++ trunk/roundcubemail/index.php	2009-08-05 13:13:57 UTC (rev 2840)
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | RoundCube Webmail IMAP Client                                           |
- | Version 0.3-20090724                                                    |
+ | Version 0.3-20090805                                                    |
  |                                                                         |
  | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                   |
  |                                                                         |
@@ -83,13 +83,15 @@
   $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
     'host' => $RCMAIL->autoselect_host(),
     'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
+    'cookiecheck' => true,
   )) + array('pass' => get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'));
 
   // check if client supports cookies
-  if (empty($_COOKIE)) {
+  if ($auth['cookiecheck'] && empty($_COOKIE)) {
     $OUTPUT->show_message("cookiesdisabled", 'warning');
   }
-  else if ($_SESSION['temp'] && !empty($auth['user']) && !empty($auth['host']) && isset($auth['pass']) && 
+  else if ($_SESSION['temp'] && !$auth['abort'] && !empty($auth['host']) &&
+            !empty($auth['user']) && isset($auth['pass']) && 
             $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
     // create new session ID
     rcube_sess_unset('temp');

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list