Commit 18fa2e2b authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

parents 85f6fb3a c5541531
......@@ -5,7 +5,7 @@ server {
root {apps_vhost_dir};
client_max_body_size 20M;
client_max_body_size 100M;
location / {
index index.php index.html;
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -5,7 +5,7 @@ server {
root {apps_vhost_dir};
client_max_body_size 20M;
client_max_body_size 100M;
location / {
index index.php index.html;
......
......@@ -217,6 +217,11 @@ class web_module {
} 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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment