nveid
2011-12-07 f5b0ca26b34388a108f8fe1c77f3ef1c99829bfa
server/lib/app.inc.php
old mode 100644 new mode 100755
@@ -40,11 +40,6 @@
                if($conf['start_db'] == true) {
                   $this->load('db_'.$conf['db_type']);
                   $this->db = new db;
               if($this->db->linkId) $this->db->closeConn();
               $this->db->dbHost = $conf['db_host'];
               $this->db->dbName = $conf['db_database'];
               $this->db->dbUser = $conf['db_user'];
               $this->db->dbPass = $conf['db_password'];
               
               /*
               Initialize the connection to the master DB, 
@@ -53,11 +48,6 @@
               
               if($conf['dbmaster_host'] != '' && $conf['dbmaster_host'] != $conf['db_host']) {
                  $this->dbmaster = new db;
                  if($this->dbmaster->linkId) $this->dbmaster->closeConn();
                  $this->dbmaster->dbHost = $conf['dbmaster_host'];
                  $this->dbmaster->dbName = $conf['dbmaster_database'];
                  $this->dbmaster->dbUser = $conf['dbmaster_user'];
                  $this->dbmaster->dbPass = $conf['dbmaster_password'];
               } else {
                  $this->dbmaster = $this->db;
               }