Merge branch '5805-relayhost-change-not-reflected' into 'develop'

Resolve "relayhost change not reflected"

Closes #5805

See merge request ispconfig/ispconfig3!1237

server/lib/classes/getconf.inc.php

@@ -30,34 +30,28 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class getconf {
 
-	var $config;
-
 	function get_server_config($server_id, $section = '') {
 		global $app;
 
-		if(!is_array($this->config[$server_id])) {
-			$app->uses('ini_parser');
-			$server_id = intval($server_id);
-			$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = ?', $server_id);
-			$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
-		}
+		$app->uses('ini_parser');
+		$server_id = intval($server_id);
+		$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = ?', $server_id);
+		$config = $app->ini_parser->parse_ini_string(stripslashes($server['config']));
 
 		if($section == '') {
-			return $this->config[$server_id];
+			return $config;
 		} else {
-			return $this->config[$server_id][$section];
+			return $config[$section];
 		}
 	}
 
 	public function get_global_config($section = '') {
 		global $app;
 
-		if(!@is_array($this->config['global'])) {
-			$app->uses('ini_parser');
-			$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
-			$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
-		}
-		return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
+		$app->uses('ini_parser');
+		$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
+		$config = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
+		return ($section == '') ? $config : $config[$section];
 	}
 	
 	public function get_security_config($section = '') {