Merge branch 'stable-3.1'

Marius Burkard

2016-04-06 df8e42319fc83110bd2db2b96b97367f42c71c6c

 interface/web/nav.php

@@ -69,6 +69,10 @@
                  $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'];