From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
interface/web/admin/templates/server_config_web_edit.htm | 77 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 60ad32c..ed522f6 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -55,7 +55,7 @@
<label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
<input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
</div>
- <div class="ctrlHolder apache">
+ <div class="ctrlHolder">
<p class="label">{tmpl_var name='security_level_txt'}</p>
<div class="multiField">
<select name="security_level" id="security_level" class="selectInput">
@@ -68,6 +68,34 @@
<div class="multiField">
{tmpl_var name='check_apache_config'}
</div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='enable_sni_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='enable_sni'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='set_folder_permissions_on_update'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='add_web_users_to_sshusers_group'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='connect_userid_to_webid'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+ <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
<div class="ctrlHolder apache">
<label for="user">{tmpl_var name='web_user_txt'}</label>
@@ -108,6 +136,10 @@
<div class="ctrlHolder nginx">
<label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
<input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="php_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+ <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
<div class="ctrlHolder">
<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
@@ -162,55 +194,20 @@
</div>
<script language="JavaScript" type="text/javascript">
var serverType = jQuery('#server_type').val();
- adjustForm(serverType);
+ jQuery('#server_type').replaceWith('<label for="server_Type">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
+ adjustForm();
jQuery('#server_type').change(function(){
serverType = $(this).val();
- adjustForm(serverType);
+ adjustForm();
});
- function adjustForm(serverType){
+ function adjustForm(){
if(serverType == "nginx"){
jQuery('.nginx').show();
- /*
- jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').show();
- jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
- jQuery('#nginx_user').closest('div.ctrlHolder').show();
- jQuery('#nginx_group').closest('div.ctrlHolder').show();
- jQuery('#nginx_cgi_socket').closest('div.ctrlHolder').show();
- */
-
jQuery('.apache').hide();
- /*
- jQuery('#vhost_conf_dir').closest('div.ctrlHolder').hide();
- jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
- jQuery('#security_level').closest('div.ctrlHolder').hide();
- jQuery('#check_apache_config').closest('div.ctrlHolder').hide();
- jQuery('#user').closest('div.ctrlHolder').hide();
- jQuery('#group').closest('div.ctrlHolder').hide();
- jQuery('#php_ini_path_apache').closest('div.ctrlHolder').hide();
- jQuery('#htaccess_allow_override').closest('div.ctrlHolder').hide();
- */
} else {
jQuery('.nginx').hide();
- /*
- jQuery('#nginx_vhost_conf_dir').closest('div.ctrlHolder').hide();
- jQuery('#nginx_vhost_conf_enabled_dir').closest('div.ctrlHolder').hide();
- jQuery('#nginx_user').closest('div.ctrlHolder').hide();
- jQuery('#nginx_group').closest('div.ctrlHolder').hide();
- jQuery('#nginx_cgi_socket').closest('div.ctrlHolder').hide();
- */
-
jQuery('.apache').show();
- /*
- jQuery('#vhost_conf_dir').closest('div.ctrlHolder').show();
- jQuery('#vhost_conf_enabled_dir').closest('div.ctrlHolder').show();
- jQuery('#security_level').closest('div.ctrlHolder').show();
- jQuery('#check_apache_config').closest('div.ctrlHolder').show();
- jQuery('#user').closest('div.ctrlHolder').show();
- jQuery('#group').closest('div.ctrlHolder').show();
- jQuery('#php_ini_path_apache').closest('div.ctrlHolder').show();
- jQuery('#htaccess_allow_override').closest('div.ctrlHolder').show();
- */
}
}
</script>
\ No newline at end of file
--
Gitblit v1.9.1