Merge branch 'master_fixes' into 'master'

Master fixes

Fixed problem that broke the updater (wrong name of variable)

See merge request !133

Author: Marius Cramer

install/dist/lib/debian60.lib.php

@@ -38,7 +38,7 @@ public function configure_dovecot()
 
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
-			$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+			$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
 			$ini_array = ini_to_array(stripslashes($tmp['config']));
 			// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
 

install/dist/lib/fedora.lib.php

@@ -385,7 +385,7 @@ public function configure_dovecot()
 
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
-			$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+			$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
 			$ini_array = ini_to_array(stripslashes($tmp['config']));
 			// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
 

install/dist/lib/gentoo.lib.php

@@ -229,7 +229,7 @@ public function configure_dovecot()
 
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
-			$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+			$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
 			$ini_array = ini_to_array(stripslashes($tmp['config']));
 			// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
 

install/dist/lib/opensuse.lib.php

@@ -440,7 +440,7 @@ public function configure_dovecot()
 
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
-			$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+			$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
 			$ini_array = ini_to_array(stripslashes($tmp['config']));
 			// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
 

install/lib/installer_base.lib.php

@@ -961,7 +961,7 @@ public function configure_dovecot() {
 
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
-			$tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+			$tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
 			$ini_array = ini_to_array(stripslashes($tmp['config']));
 			// ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()