- Fix imap login (#1486591)

2 files changed, 4 insertions, 2 deletions

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index b1f9132c5..26d0ef48a 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -135,6 +135,8 @@ class rcube_imap
                 $this->set_rootdir($this->conn->rootdir);
             if (empty($this->delimiter))
 	            $this->get_hierarchy_delimiter();
+
+            return true;
         }
         // write error log
         else if ($this->conn->error) {
@@ -144,7 +146,7 @@ class rcube_imap
                 'message' => $this->conn->error), true, false);
         }
 
-        return $this->conn ? true : false;
+        return false;
     }
 
 
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 81e296083..a199a389f 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -566,7 +566,7 @@ class rcube_imap_generic
 	    // check input
 	    if (empty($host)) {
 		    $this->error    = "Empty host";
-		    $this->errornum = -1;
+		    $this->errornum = -2;
 		    return false;
 	    }
         if (empty($user)) {