Changeset 5690 in subversion

Timestamp:

Jan 3, 2012 4:56:19 AM (17 months ago)

Author:

alec

Message:

• Move some checks into login() method

Location:

trunk/roundcubemail

Files:

• index.php (modified) (1 diff)
• program/include/rcmail.php (modified) (1 diff)

trunk/roundcubemail/index.php

@@ -98 +98 @@
   }
   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

trunk/roundcubemail/program/include/rcmail.php

@@ -751 +751 @@
    * @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();