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_advanced.htm | 82 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm
index 7fb4ac3..a9819e0 100644
--- a/interface/web/sites/templates/web_domain_advanced.htm
+++ b/interface/web/sites/templates/web_domain_advanced.htm
@@ -20,6 +20,47 @@
<label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
<input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
</div>
+ <div class="phpfpm">
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='php_fpm_use_socket'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="pm">{tmpl_var name='pm_txt'}</label>
+ <select name="pm" id="pm" class="selectInput">
+ {tmpl_var name='pm'}
+ </select>
+ </div>
+ <div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
+ {tmpl_var name='pm_ondemand_hint_txt'}
+ </div>
+ <div class="ctrlHolder">
+ <label for="pm_max_children">{tmpl_var name='pm_max_children_txt'}</label>
+ <input name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_dynamic">
+ <label for="pm_start_servers">{tmpl_var name='pm_start_servers_txt'}</label>
+ <input name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_dynamic">
+ <label for="pm_min_spare_servers">{tmpl_var name='pm_min_spare_servers_txt'}</label>
+ <input name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_dynamic">
+ <label for="pm_max_spare_servers">{tmpl_var name='pm_max_spare_servers_txt'}</label>
+ <input name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+ </div>
+ <div class="ctrlHolder pm_ondemand">
+ <label for="pm_process_idle_timeout">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
+ <input name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" /> s
+ </div>
+ <div class="ctrlHolder">
+ <label for="pm_max_requests">{tmpl_var name='pm_max_requests_txt'}</label>
+ <input name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />
+ </div>
+ </div>
<div class="ctrlHolder">
<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
<input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput" style="width:400px;" />
@@ -32,7 +73,7 @@
<label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
<textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea>
</div>
- <div class="ctrlHolder apache">
+ <div class="ctrlHolder nginx">
<label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
<textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea>
</div>
@@ -50,16 +91,40 @@
<script language="JavaScript" type="text/javascript">
var webId = jQuery('input[name="id"]').val();
var serverId;
- getServerId(webId);
- adjustForm(serverId);
+ getServerId();
+ adjustForm();
- function getServerId(webId){
+ var pm = jQuery('#pm').val();
+ pmMode(pm);
+ jQuery('#pm').change(function(){
+ pm = jQuery(this).val();
+ pmMode(pm);
+ });
+
+ function pmMode(pm){
+ switch(pm){
+ case "static":
+ jQuery('.pm_dynamic').add('.pm_ondemand').hide();
+ jQuery('.pm_static').show();
+ break;
+ case "dynamic":
+ jQuery('.pm_static').add('.pm_ondemand').hide();
+ jQuery('.pm_dynamic').show();
+ break;
+ case "ondemand":
+ jQuery('.pm_static').add('.pm_dynamic').hide();
+ jQuery('.pm_ondemand').show();
+ break;
+ }
+ }
+
+ function getServerId(){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
serverId = data.serverid;
});
}
- function adjustForm(serverId){
+ function adjustForm(){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
if(data.servertype == "nginx"){
jQuery('.nginx').show();
@@ -69,6 +134,13 @@
jQuery('.apache').show();
}
});
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getphptype"}, function(data) {
+ if(data.phptype == "php-fpm"){
+ jQuery('.phpfpm').show();
+ } else {
+ jQuery('.phpfpm').hide();
+ }
+ });
}
</script>
\ No newline at end of file
--
Gitblit v1.9.1