- Fix bugs on unexpected IMAP connection close (#1486190, #1486270)

- Iloha's imap.inc rewritten into rcube_imap_generic class
- rcube_imap code re-formatting

CHANGELOG

@@ -1,6 +1,8 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix bugs on unexpected IMAP connection close (#1486190, #1486270)
+- Iloha's imap.inc rewritten into rcube_imap_generic class
 - Added contact groups in address book (not finished yet)
 - Added PageUp/PageDown/Home/End keys support on lists (#1486430)
 - Added possibility to select all messages in a folder (#1484756)

installer/check.php

@@ -1,25 +1,47 @@
 <form action="index.php" method="get">
 <?php
 
-$required_php_exts = array('PCRE' => 'pcre', 'DOM' => 'dom',
-    'Session' => 'session', 'XML' => 'xml', 'JSON' => 'json');
+$required_php_exts = array(
+    'PCRE'      => 'pcre',
+    'DOM'       => 'dom',
+    'Session'   => 'session',
+    'XML'       => 'xml',
+    'JSON'      => 'json'
+);
 
-$optional_php_exts = array('FileInfo' => 'fileinfo', 'Libiconv' => 'iconv',
-    'Multibyte' => 'mbstring', 'OpenSSL' => 'openssl', 'Mcrypt' => 'mcrypt',
+$optional_php_exts = array(
+    'FileInfo'  => 'fileinfo',
+    'Libiconv'  => 'iconv',
+    'Multibyte' => 'mbstring',
+    'OpenSSL'   => 'openssl',
+    'Mcrypt'    => 'mcrypt',
 );
 
-$required_libs = array('PEAR' => 'PEAR.php', 'MDB2' => 'MDB2.php',
-    'Net_SMTP' => 'Net/SMTP.php', 'Mail_mime' => 'Mail/mime.php',
-    'iilConnection' => 'lib/imap.inc');
+$required_libs = array(
+    'PEAR'      => 'PEAR.php',
+    'MDB2'      => 'MDB2.php',
+    'Net_SMTP'  => 'Net/SMTP.php',
+    'Mail_mime' => 'Mail/mime.php',
+);
 
-$supported_dbs = array('MySQL' => 'mysql', 'MySQLi' => 'mysqli',
-    'PostgreSQL' => 'pgsql', 'SQLite (v2)' => 'sqlite');
+$supported_dbs = array(
+    'MySQL'         => 'mysql',
+    'MySQLi'        => 'mysqli',
+    'PostgreSQL'    => 'pgsql',
+    'SQLite (v2)'   => 'sqlite',
+);
 
-$ini_checks = array('file_uploads' => 1, 'session.auto_start' => 0,
-    'zend.ze1_compatibility_mode' => 0, 'mbstring.func_overload' => 0,
-    'suhosin.session.encrypt' => 0);
+$ini_checks = array(
+    'file_uploads'                  => 1,
+    'session.auto_start'            => 0,
+    'zend.ze1_compatibility_mode'   => 0,
+    'mbstring.func_overload'        => 0,
+    'suhosin.session.encrypt'       => 0,
+);
 
-$optional_checks = array('date.timezone' => '-NOTEMPTY-');
+$optional_checks = array(
+    'date.timezone' => '-NOTEMPTY-',
+);
 
 $source_urls = array(
     'Sockets' => 'http://www.php.net/manual/en/book.sockets.php',

program/include/rcmail.php

@@ -456,21 +456,21 @@ class rcmail
    */
   public function imap_connect()
   {
-    $conn = false;
-
     if (!$this->imap)
       $this->imap_init();
     
-    if ($_SESSION['imap_host'] && !$this->imap->conn) {
-      if (!($conn = $this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']))) {
+    if ($_SESSION['imap_host'] && !$this->imap->conn->connected()) {
+      if (!$this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl'])) {
         if ($this->output)
           $this->output->show_message($this->imap->error_code == -1 ? 'imaperror' : 'sessionerror', 'error');
       }
-
+      else {
         $this->set_imap_prop();
+        return $this->imap->conn;
+      }
     }
 
-    return $conn;
+    return false;
   }
 
 
@@ -957,10 +957,8 @@ class rcmail
    */
   public function shutdown()
   {
-    if (is_object($this->imap)) {
+    if (is_object($this->imap))
       $this->imap->close();
-      $this->imap->write_cache();
-    }
 
     if (is_object($this->smtp))
       $this->smtp->disconnect();