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

Till Brehm

2014-05-02 18fa2e2b8bcf10091fdc8e2079a1ff76c173ec84

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

 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;

 interface/web/login/templates/index.htm

@@ -39,4 +39,7 @@
        </div>
    </div>

</div>
</div>
<script language="JavaScript" type="text/javascript">
    $('#username').closest('form').attr('autocomplete','on');
</script>

 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

 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

 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;

 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;
    }