From 1ed92e187ae2dfb51f5f2d62c290a85f93b6dc21 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 14 Aug 2014 13:54:00 -0400
Subject: [PATCH] - Added security check script. - Create md5 sums of all files at install and update.
---
interface/web/sites/templates/web_domain_edit.htm | 88 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 96319c9..d12c3a3 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -1,6 +1,15 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
+<tmpl_if name="config_error_msg">
+<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
+ <p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
+ <div>
+ <div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} : </div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
+ </div>
+</div>
+</tmpl_if>
+
<div class="panel panel_web_domain">
<div class="pnl_formsarea">
@@ -45,7 +54,7 @@
</div>
<div class="ctrlHolder">
<label for="ipv6_address">{tmpl_var name='ipv6_address_txt'}</label>
- <select name="ipv6_address" id="ipv6_address" class="selectInput formLengthIPv4">
+ <select name="ipv6_address" id="ipv6_address" class="selectInput formLengthIPv6">
{tmpl_var name='ipv6_address'}
</select>
</div>
@@ -67,48 +76,48 @@
<label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
<input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
</div>
- <div class="ctrlHolder">
+ <tmpl_if name="limit_cgi" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='cgi_txt'}</p>
<div class="multiField">
{tmpl_var name='cgi'}
</div>
- </div>
- <div class="ctrlHolder">
+ </div></tmpl_if>
+ <tmpl_if name="limit_ssi" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='ssi_txt'}</p>
<div class="multiField">
{tmpl_var name='ssi'}
</div>
- </div>
- <div class="ctrlHolder apache">
+ </div></tmpl_if>
+ <tmpl_if name="limit_perl" op="==" value="y"><div class="ctrlHolder apache">
<p class="label">{tmpl_var name='perl_txt'}</p>
<div class="multiField">
{tmpl_var name='perl'}
</div>
- </div>
- <div class="ctrlHolder apache">
+ </div></tmpl_if>
+ <tmpl_if name="limit_ruby" op="==" value="y"><div class="ctrlHolder apache">
<p class="label">{tmpl_var name='ruby_txt'}</p>
<div class="multiField">
{tmpl_var name='ruby'}
</div>
- </div>
- <div class="ctrlHolder apache">
+ </div></tmpl_if>
+ <tmpl_if name="limit_python" op="==" value="y"><div class="ctrlHolder apache">
<p class="label">{tmpl_var name='python_txt'}</p>
<div class="multiField">
{tmpl_var name='python'}
</div>
- </div>
- <div class="ctrlHolder apache">
+ </div></tmpl_if>
+ <tmpl_if name="force_suexec" op="==" value="n"><div class="ctrlHolder apache">
<p class="label">{tmpl_var name='suexec_txt'}</p>
<div class="multiField">
{tmpl_var name='suexec'}
</div>
- </div>
- <div class="ctrlHolder">
+ </div></tmpl_if>
+ <tmpl_if name="limit_hterror" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='errordocs_txt'}</p>
<div class="multiField">
{tmpl_var name='errordocs'}
</div>
- </div>
+ </div></tmpl_if>
<div class="ctrlHolder">
<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
@@ -116,12 +125,12 @@
{tmpl_var name='subdomain'}
</select>
</div>
- <div class="ctrlHolder">
+ <tmpl_if name="limit_ssl" op="==" value="y"><div class="ctrlHolder">
<p class="label">{tmpl_var name='ssl_txt'}</p>
<div class="multiField">
{tmpl_var name='ssl'}
</div>
- </div>
+ </div></tmpl_if>
<div class="ctrlHolder">
<label for="php">{tmpl_var name='php_txt'}</label>
<select name="php" id="php" class="selectInput formLengthHalf">
@@ -145,8 +154,8 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
</div>
@@ -166,11 +175,13 @@
reloadFastcgiPHPVersions();
});
}
- adjustForm();
+ adjustForm(true);
+ reloadFastcgiPHPVersions(true);
jQuery('#client_group_id').change(function(){
clientGroupId = $(this).val();
reloadWebIP();
+ reloadFastcgiPHPVersions();
});
if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
@@ -178,6 +189,8 @@
} else {
jQuery('.fastcgi_php_version:visible').hide();
}
+ //resetFormChanged();
+
jQuery('#php').change(function(){
reloadFastcgiPHPVersions();
if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
@@ -187,24 +200,31 @@
}
});
- function adjustForm(){
+ function adjustForm(noFormChange){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
if(data.servertype == "nginx"){
var selected = jQuery('#php').val();
jQuery('.apache').hide();
- jQuery('.apache').hide();
+ if(selected != "no" && selected != "php-fpm") {
+ jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
+ }
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 != "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();
+ }
+ if(noFormChange) {
+ resetFormChanged();
+ jQuery('#php').addClass('no-page-form-change').change();
+ jQuery('#php').removeClass('no-page-form-change');
+ } else {
+ jQuery('#php').change();
}
});
}
@@ -214,8 +234,8 @@
loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
}
- function reloadFastcgiPHPVersions() {
- jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
+ function reloadFastcgiPHPVersions(noFormChange) {
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi", client_group_id : clientGroupId}, function(data) {
var options = '<option value="">Default</option>';
var phpfastcgiselected = '';
$.each(data, function(key, val) {
@@ -226,8 +246,20 @@
}
options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
});
- $('#fastcgi_php_version').html(options);
+ $('#fastcgi_php_version').html(options).change();
+ if(noFormChange) resetFormChanged();
});
}
+
+ <tmpl_if name="readonly_tab">
+ jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
+ jQuery('#dom-edit-submit').click(function() {
+ submitForm('pageForm','sites/web_domain_edit.php');
+ });
+ <tmpl_else>
+ jQuery('#dom-edit-submit').click(function() {
+ submitForm('pageForm','sites/web_domain_edit.php');
+ });
+ </tmpl_if>
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.1