From 387d3929686b944ff77adaa64fecb02e2aa26796 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 05 Jan 2012 11:38:15 -0500
Subject: [PATCH] Added redirect option R=301,L for subdomain, aliasdomain and website on apache servers.
---
interface/web/admin/templates/server_config_web_edit.htm | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index a7d1026..da93a2e 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -8,7 +8,7 @@
<div class="ctrlHolder">
<p class="label">{tmpl_var name='server_type_txt'}</p>
<div class="multiField">
- <select name="server_type" id="server_type" class="selectInput" disabled="disabled">
+ <select name="server_type" id="server_type" class="selectInput">
{tmpl_var name='server_type'}
</select>
</div>
@@ -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 apache">
+ <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 apache">
+ <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 apache">
+ <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 apache">
+ <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,23 +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('.apache').hide();
- //jQuery('.tabbox_tabs li').find(":contains('FastCGI')").hide();
- //jQuery('.tabbox_tabs li').find(":contains('FastCGI')").remove();
} else {
jQuery('.nginx').hide();
jQuery('.apache').show();
- //jQuery('.tabbox_tabs li').find(":contains('FastCGI')").show();
- //jQuery('.tabbox_tabs li:eq(4)').after('<li><a href="javascript:changeTab(\'fastcgi\',\'admin/server_config_edit.php\')">FastCGI</a></li>');
}
}
</script>
\ No newline at end of file
--
Gitblit v1.9.1