From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).

---
 interface/web/sites/templates/web_domain_edit.htm |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index b15036f..8a07871 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -167,14 +167,14 @@
 			reloadWebIP();
 		});
 		
-		if(jQuery('#php').val() == 'fast-cgi'){
+		if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
 			jQuery('.fastcgi_php_version:hidden').show();
 		} else {
 			jQuery('.fastcgi_php_version:visible').hide();
 		}
 		jQuery('#php').change(function(){
-		reloadFastcgiPHPVersions();
-			if(jQuery(this).val() == 'fast-cgi'){
+			reloadFastcgiPHPVersions();
+			if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
 				jQuery('.fastcgi_php_version:hidden').show();
 			} else {
 				jQuery('.fastcgi_php_version:visible').hide();
@@ -187,13 +187,15 @@
 					var selected = jQuery('#php').val();
 					jQuery('.apache').hide();
 					jQuery('.apache').hide();
+					jQuery('#php option[value="fast-cgi"]').hide();
 					jQuery('#php option[value="cgi"]').hide();
 					jQuery('#php option[value="mod"]').hide();
 					jQuery('#php option[value="suphp"]').hide();
-					if(selected != "no" && selected != "fast-cgi") jQuery('#php option[value="fast-cgi"]').attr('selected', 'selected');
+					if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
 				} else {
 					jQuery('.apache').show();
 					jQuery('.apache').show();
+					jQuery('#php option[value="fast-cgi"]').show();
 					jQuery('#php option[value="cgi"]').show();
 					jQuery('#php option[value="mod"]').show();
 					jQuery('#php option[value="suphp"]').show();
@@ -207,7 +209,7 @@
 		}
 		
 		function reloadFastcgiPHPVersions() {
-			jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getphpfastcgi"}, function(data) {
+			jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
 				var options = '<option value="">Default</option>';
 				var phpfastcgiselected = '';
 				$.each(data, function(key, val) {

--
Gitblit v1.9.1