From a563d594aeb6f9d6553bfb9ed10aff5ffdd20d10 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 15 Apr 2015 09:02:14 -0400
Subject: [PATCH] - ported some patches

---
 interface/web/sites/templates/web_vhost_domain_edit.htm |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index e313b9f..e0a8276 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -274,6 +274,8 @@
     jQuery('#parent_domain_id').change(function() {
         reloadServerId(false);
     });
+	// new Vhostsubdomains/Vhostaliasdomains
+	if(serverId == '') jQuery('#parent_domain_id').trigger('change');
     
     function reloadServerId(noFormChange) {
         var parentWebId = jQuery('#parent_domain_id').val();
@@ -337,16 +339,31 @@
 		
     function reloadFastcgiPHPVersions(noFormChange) {
         jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi", client_group_id : clientGroupId}, function(data) {
-            var options = '<option value="">Default</option>';
+            //var options = '<option value="">Default</option>';
+			var options = '';
             var phpfastcgiselected = '';
             $.each(data, function(key, val) {
+				<tmpl_if name="id">
                 if($('#fastcgi_php_version').val() == key){
                     phpfastcgiselected = ' selected="selected"';
                 } else {
                     phpfastcgiselected = '';
                 }
+				</tmpl_else>
+					phpfastcgiselected = '';
+				</tmpl_if>
                 options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
             });
+			<tmpl_if name="id">
+			if($('#fastcgi_php_version').val() == ''){
+                phpfastcgiselected = ' selected="selected"';
+            } else {
+                phpfastcgiselected = '';
+            }
+			</tmpl_else>
+				phpfastcgiselected = '';
+			</tmpl_if>
+			options += '<option value=""'+phpfastcgiselected+'>{tmpl_var name="default_php_txt"}</option>';
             $('#fastcgi_php_version').html(options).change();
             if(noFormChange) ISPConfig.resetFormChanged();
         });

--
Gitblit v1.9.1