From 6de0aab86c64d68578258139bea75cc6221882f7 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 07 Mar 2012 09:48:47 -0500
Subject: [PATCH] - Improved support for multiple PHP versions. Additional PHP versions have now their own form and database table.
---
interface/web/sites/templates/web_domain_advanced.htm | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm
index bd77b16..2000ff6 100644
--- a/interface/web/sites/templates/web_domain_advanced.htm
+++ b/interface/web/sites/templates/web_domain_advanced.htm
@@ -8,16 +8,56 @@
<input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
<div class="ctrlHolder">
<label for="system_user">{tmpl_var name='system_user_txt'}</label>
- <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ <label for="system_user">{tmpl_var name='system_user'}</label>
+ <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
</div>
<div class="ctrlHolder">
<label for="system_group">{tmpl_var name='system_group_txt'}</label>
- <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ <label for="system_group">{tmpl_var name='system_group'}</label>
+ <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
</div>
- <div class="ctrlHolder">
+ <div class="ctrlHolder apache">
+ <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="ctrlHolder nginx">
+ <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 nginx">
+ <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 nginx">
+ <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 nginx">
+ <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 nginx">
+ <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">
+ <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;" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
+ <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea>
+ </div>
+ <div class="ctrlHolder apache">
<label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
- <textarea name="apache_directives" id="apache_directives" rows='10' cols='30'>{tmpl_var name='apache_directives'}</textarea>
- </div>
+ <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea>
+ </div>
+ <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>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -29,3 +69,28 @@
</div>
</div>
+<script language="JavaScript" type="text/javascript">
+ var webId = jQuery('input[name="id"]').val();
+ var serverId;
+ getServerId();
+ adjustForm();
+
+ 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(){
+ 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();
+ jQuery('.apache').hide();
+ } else {
+ jQuery('.nginx').hide();
+ jQuery('.apache').show();
+ }
+ });
+ }
+
+</script>
\ No newline at end of file
--
Gitblit v1.9.1