Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 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');
@@ -83,12 +87,16 @@
      }
   } else {
      //*  Loading Login Module
      /*
      include_once 'login/lib/module.conf.php';
      $_SESSION['s']['module'] = $module;
      $topnav[] = array( 'title'  => 'Login',
         'active'  => 1);
      $module = null;
      unset($module);
      */
      header('Location: /login/');
      die();
   }

   //* Topnavigation