Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Author: Florian Schaal

interface/web/mail/mail_transport_edit.php

@@ -70,19 +70,22 @@ function onShowNew() {
 	function onShowEnd() {
 		global $app, $conf;
 
+		$types = array('smtp' => 'smtp', 'uucp' => 'uucp', 'slow' => 'slow', 'error' => 'error', 'custom' => 'custom', '' => 'null');
 		$tmp_parts = explode(":", $this->dataRecord["transport"]);
 		if(!empty($this->id) && !stristr($this->dataRecord["transport"], ':')) {
 			$rec["type"] = 'custom';
 		} else {
 			if(empty($this->id) && empty($tmp_parts[0])) {
 				$rec["type"] = 'smtp';
 			} else {
-				$rec["type"] = $tmp_parts[0];
+				$rec["type"] = $types[$tmp_parts[0]] ? $tmp_parts[0] : 'custom';
 			}
 		}
-		if(!empty($tmp_parts[2])) {
+		if($rec["type"] == 'custom') {
+			$dest = $this->dataRecord["transport"];
+		} elseif(!empty($tmp_parts[2])) {
 			$dest = @$tmp_parts[1].':'.@$tmp_parts[2];
-		} elseif(!empty($tmp_parts[1])) {
+		} elseif(!empty($tmp_parts[1]) || $this->dataRecord["transport"] == ":") {
 			$dest = $tmp_parts[1];
 		} else {
 			$dest = $this->dataRecord["transport"];
@@ -95,7 +98,6 @@ function onShowEnd() {
 			$rec["destination"] = @$dest;
 		}
 
-		$types = array('smtp' => 'smtp', 'uucp' => 'uucp', 'slow' => 'slow', 'error' => 'error', 'custom' => 'custom', '' => 'null');
 		$type_select = '';
 		if(is_array($types)) {
 			foreach( $types as $key => $val) {

interface/web/sites/web_vhost_domain_edit.php

@@ -458,9 +458,13 @@ function onShowEnd() {
 					}
 					$server_id = intval(@$this->dataRecord["server_id"]);
 				} else {
-					// Get the first server ID
-					$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
-					$server_id = intval($tmp['server_id']);
+					$settings = $app->getconf->get_global_config('sites');
+					$server_id = intval($settings['default_webserver']);
+					if (!$server_id) {
+						// Get the first server ID
+						$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
+						$server_id = intval($tmp['server_id']);
+					}
 				}
 
 				//* get global web config