Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 22c91099a17a134ed90cd94223baf9c92ba106f4

Merge branch 'master' into 'stable-3.1'

Master



See merge request !302

 install/install.php

@@ -445,6 +445,7 @@
        swriteln('Configuring Bastille Firewall');
        $inst->configure_bastille_firewall();
        $conf['services']['firewall'] = true;
        $conf['bastille']['installed'] = true;
    }

    //* Configure Fail2ban

 interface/web/nav.php

@@ -69,7 +69,11 @@
                        $web_servers = $app->db->queryOneRecord("SELECT COUNT(*) as cnt FROM server WHERE web_server = 1 AND active = 1");
                        if($web_servers['cnt'] == 0) continue;
                    }
					
                    if($mt == 'vm'){
                        $vm_servers = $app->db->queryOneRecord("SELECT COUNT(*) AS cnt FROM server WHERE vserver_server = 1 AND active = 1");
                        if($vm_servers['cnt'] == 0) continue;
                    }

                    include_once $mt.'/lib/module.conf.php';
                    $language = (isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language'];
                    $app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');