Backport from trunk

[gosa.git] / gosa-core / html / main.php

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index ded3e1156202559325ea189c5fafaf95af1dbbce..afb381c18120c7ca5370b0fa3b70de426679c07b 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -78,13 +78,6 @@ $config= session::global_get('config');
 $config->check_and_reload();
 $config->configRegistry->reload();
 
-// Validate LDAP schema if not done already
-if( $config->boolValueIsTrue('core','schemaCheck') && 
-    !$config->configRegistry->schemaCheckFinished() && 
-    !$config->configRegistry->validateSchemata($force=FALSE,$disableIncompatiblePlugins=TRUE)){
-    $config->configRegistry->displayRequirementErrors();
-}
-
 /* Enable compressed output */
 if ($config->get_cfg_value("core","sendCompressedOutput") == "true"){
   ob_start("ob_gzhandler");
@@ -149,6 +142,13 @@ setlocale(LC_ALL, $lang);
 $GLOBALS['t_language']= $lang;
 $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/';
 
+// Validate LDAP schema if not done already
+if( $config->boolValueIsTrue('core','schemaCheck') && 
+    !$config->configRegistry->schemaCheckFinished() && 
+    !$config->configRegistry->validateSchemata($force=FALSE,$disableIncompatiblePlugins=TRUE)){
+    $config->configRegistry->displayRequirementErrors();
+}
+
 /* Check if the config is up to date */
 $config->check_config_version();
 
@@ -163,7 +163,7 @@ if (!session::global_is_set('plist')){
   /* Initially load all classes */
   $class_list= get_declared_classes();
   foreach ($class_mapping as $class => $path){
-    if (!in_array($class, $class_list)){
+    if (!in_array_strict($class, $class_list)){
       if (is_readable("$BASE_DIR/$path")){
         require_once("$BASE_DIR/$path");
       } else {
@@ -236,9 +236,12 @@ if ($config->boolValueIsTrue("core","handleExpiredAccounts")){
     }
 }
 
+$smarty->assign("noMenuMode", count($plist->getRegisteredMenuEntries()) == 0);
 if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){
   $plug= validate($_GET['plug']);
   $plugin_dir= $plist->get_path($plug);
+  $plugin= $plist->get_class($plug);
+  session::global_set('currentPlugin',$plugin);
   session::global_set('plugin_dir',$plugin_dir);
   if ($plugin_dir == ""){
     new log("security","gosa","",array(),"main.php called with invalid plug parameter \"$plug\"") ;
@@ -246,18 +249,19 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){
     exit;
   }
 } else {
-
-    // Display the welcome page for admins (iconmenu) and an info page for those 
-    //  who are not allowed to adminstrate anything (user)
-    if(count($plist->getRegisteredMenuEntries()) == 0){
-        session::global_set('plugin_dir',"infoPage");
-        $plugin_dir= "$BASE_DIR/plugins/generic/infoPage";
-    }else{
-        session::global_set('plugin_dir',"welcome");
-        $plugin_dir= "$BASE_DIR/plugins/generic/welcome";
-    } 
+    session::global_set('plugin_dir',"welcome");
+    session::global_set('currentPlugin','welcome');
+    $plugin_dir= "$BASE_DIR/plugins/generic/welcome";
 }
 
+// Display the welcome page for admins (iconmenu) and an info page for those 
+//  who are not allowed to adminstrate anything (user)
+if(count($plist->getRegisteredMenuEntries()) == 0 && session::global_get('currentPlugin') == "welcome"){
+    session::global_set('plugin_dir',"infoPage");
+    session::global_set('currentPlugin','welcome');
+    $plugin_dir= "$BASE_DIR/plugins/generic/infoPage";
+} 
+
 /* Handle plugin locks.
     - Remove the plugin from session if we switched to another. (cleanup) 
     - Remove all created locks if "reset" was posted.