CS fixes, mostly around undefined variables

1 files changed, 10 insertions, 9 deletions

diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index ebd23417d..8d80fb113 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -31,6 +31,8 @@ class rcmail_install
     public $is_post           = false;
     public $failures          = 0;
     public $config            = array();
+    public $defaults          = array();
+    public $comments          = array();
     public $configured        = false;
     public $legacy_config     = false;
     public $email_pattern     = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9])';
@@ -133,6 +135,9 @@ class rcmail_install
             return;
         }
 
+        $config        = array();
+        $rcmail_config = array(); // deprecated var name
+
         include $file;
 
         // read comments from config file
@@ -158,12 +163,7 @@ class rcmail_install
             }
         }
 
-        // deprecated name of config variable
-        if (is_array($rcmail_config)) {
-            return $rcmail_config;
-        }
-
-        return $config;
+        return array_merge(array(), (array) $rcmail_config, (array) $config);
     }
 
     /**
@@ -507,9 +507,10 @@ class rcmail_install
      */
     private function db_read_schema($schemafile, &$version = null)
     {
-        $lines    = file($schemafile);
-        $schema   = array();
-        $keywords = array('PRIMARY','KEY','INDEX','UNIQUE','CONSTRAINT','REFERENCES','FOREIGN');
+        $lines      = file($schemafile);
+        $schema     = array();
+        $keywords   = array('PRIMARY','KEY','INDEX','UNIQUE','CONSTRAINT','REFERENCES','FOREIGN');
+        $table_name = null;
 
         foreach ($lines as $line) {
             if (preg_match('/^\s*create table ([\S]+)/i', $line, $m)) {