From 18fa2e2b8bcf10091fdc8e2079a1ff76c173ec84 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 02 May 2014 06:40:23 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/web/themes/default/templates/main.tpl.htm | 2 +-
install/tpl/nginx_apps.vhost.master | 2 +-
interface/web/themes/blue/templates/main.tpl.htm | 2 +-
interface/web/login/templates/index.htm | 5 ++++-
server/mods-available/web_module.inc.php | 5 +++++
server/conf/nginx_apps.vhost.master | 2 +-
6 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
index a8fe664..2c720b5 100644
--- a/install/tpl/nginx_apps.vhost.master
+++ b/install/tpl/nginx_apps.vhost.master
@@ -5,7 +5,7 @@
root {apps_vhost_dir};
- client_max_body_size 20M;
+ client_max_body_size 100M;
location / {
index index.php index.html;
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index eaf9e08..3fbd278 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -39,4 +39,7 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
+<script language="JavaScript" type="text/javascript">
+ $('#username').closest('form').attr('autocomplete','on');
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm
index 8d6ffde..70c4f26 100644
--- a/interface/web/themes/blue/templates/main.tpl.htm
+++ b/interface/web/themes/blue/templates/main.tpl.htm
@@ -22,7 +22,7 @@
jQuery(document).ready(function() {
loadInitContent();
- $('form').attr('autocomplete','off');
+ $('form').not('#dummy_login_form').attr('autocomplete','off');
$("#pageForm").submit(function(e){
//Prevent form submit: e.preventDefault() in lists
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index dee8117..fd38222 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -22,7 +22,7 @@
jQuery(document).ready(function() {
loadInitContent();
- $('form').attr('autocomplete','off');
+ $('form').not('#dummy_login_form').attr('autocomplete','off');
$("#pageForm").submit(function(e){
//Prevent form submit: e.preventDefault() in lists
diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master
index a8fe664..2c720b5 100644
--- a/server/conf/nginx_apps.vhost.master
+++ b/server/conf/nginx_apps.vhost.master
@@ -5,7 +5,7 @@
root {apps_vhost_dir};
- client_max_body_size 20M;
+ client_max_body_size 100M;
location / {
index index.php index.html;
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index c31aa67..666e845 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -217,6 +217,11 @@
} else {
exec($app->system->getinitcommand($daemon, 'reload').' 2>&1', $retval['output'], $retval['retval']);
}
+
+ // nginx: do a syntax check because on some distributions, the init script always returns 0 - even if the syntax is not ok (how stupid is that?)
+ if($web_config['server_type'] == 'nginx' && $retval['retval'] == 0){
+ exec('nginx -t 2>&1', $retval['output'], $retval['retval']);
+ }
return $retval;
}
--
Gitblit v1.9.1