From af756a1edc184909037ba0778d388577d2acec90 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 19 Aug 2009 12:48:15 +0000
Subject: [PATCH] Fixed: FS#854 - Display Error in Internet Explorer creating a
 website

---
 interface/web/js/scrigo.js.php                | 22 +++++++++++++++++++
 interface/web/sites/ajax_get_ip.php           |  4 ++--
 .../web/sites/templates/database_edit.htm     |  2 +-
 .../web/sites/templates/web_domain_edit.htm   |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 1eac7101b..92eb74768 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -300,6 +300,28 @@ function loadContentInto(elementid,pagename) {
   var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);
 }
 
+function loadOptionInto(elementid,pagename) {
+	var itemContentCallback = {
+		success: function(o) {
+			var teste = o.responseText;
+			var elemente = teste.split('#');
+			el=document.getElementById(elementid);
+			el.innerHTML='';
+			for (var i = 0; i < elemente.length; ++i){
+
+				var foo2 = document.createElement("option");
+				foo2.appendChild(document.createTextNode(elemente[i]));
+				foo2.value=elemente[i];
+				el.appendChild(foo2);
+			}
+		},
+		failure: function(o) {
+		alert('Ajax Request was not successful.');
+		}
+	}
+	var pageContentObject2 = YAHOO.util.Connect.asyncRequest('GET', pagename, itemContentCallback);
+}
+
 function keepalive() {
 	var pageContentCallbackKeepalive = {
 		success: function(o) {
diff --git a/interface/web/sites/ajax_get_ip.php b/interface/web/sites/ajax_get_ip.php
index fbe92031a..0d3227bee 100644
--- a/interface/web/sites/ajax_get_ip.php
+++ b/interface/web/sites/ajax_get_ip.php
@@ -41,11 +41,11 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') {
 	$sql = "SELECT ip_address FROM server_ip WHERE server_id = $server_id";
 	$ips = $app->db->queryAllRecords($sql);
 	// $ip_select = "<option value=''></option>";
-	$ip_select = "<option value='*'>*</option>\r\n";
+	$ip_select = "*";
 	if(is_array($ips)) {
 		foreach( $ips as $ip) {
 			//$selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':'';
-			$ip_select .= "<option value='$ip[ip_address]'>$ip[ip_address]</option>\r\n";
+			$ip_select .= "#$ip[ip_address]";
 		}
 	}
 	unset($tmp);
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index da5ffecf1..99e1d07cd 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -15,7 +15,7 @@
 		<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
 		<tmpl_else>
 		<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+        <select name="server_id" id="server_id" class="selectInput">
 		  {tmpl_var name='server_id'}
 		</select>
 		</tmpl_if>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 3e67374a9..d19550fc7 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -15,7 +15,7 @@
 		<input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
 		<tmpl_else>
 		<label for="server_id">{tmpl_var name='server_id_txt'}</label>
-        <select name="server_id" id="server_id" class="selectInput" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+        <select name="server_id" id="server_id" class="selectInput" onChange="loadOptionInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
 		  {tmpl_var name='server_id'}
 		</select>
 		</tmpl_if>
-- 
GitLab