[Svn] r5690 - in trunk/roundcubemail: . program/include

[trac at roundcube.net]

Author: alec
Date: 2012-01-03 03:56:19 -0600 (Tue, 03 Jan 2012)
New Revision: 5690

Modified:
   trunk/roundcubemail/index.php
   trunk/roundcubemail/program/include/rcmail.php
Log:
- Move some checks into login() method


Modified: trunk/roundcubemail/index.php
===================================================================
--- trunk/roundcubemail/index.php	2012-01-03 09:55:38 UTC (rev 5689)
+++ trunk/roundcubemail/index.php	2012-01-03 09:56:19 UTC (rev 5690)
@@ -97,8 +97,7 @@
     $OUTPUT->show_message("cookiesdisabled", 'warning');
   }
   else if ($auth['valid'] && !$auth['abort'] &&
-        !empty($auth['host']) && !empty($auth['user']) &&
-        $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])
+    $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

Modified: trunk/roundcubemail/program/include/rcmail.php
===================================================================
--- trunk/roundcubemail/program/include/rcmail.php	2012-01-03 09:55:38 UTC (rev 5689)
+++ trunk/roundcubemail/program/include/rcmail.php	2012-01-03 09:56:19 UTC (rev 5690)
@@ -750,11 +750,15 @@
    * @param string IMAP user name
    * @param string IMAP password
    * @param string IMAP host
+   *
    * @return boolean True on success, False on failure
    */
   function login($username, $pass, $host=NULL)
   {
-    $user = NULL;
+    if (empty($username)) {
+      return false;
+    }
+
     $config = $this->config->all();
 
     if (!$host)

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