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 7b17a5d3e8003bff320431e908a8b4a06fa53752..afb381c18120c7ca5370b0fa3b70de426679c07b 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -53,18 +53,6 @@ $clicks = session::get('clicks');
 $clicks ++ ;
 session::set('clicks', $clicks);
 
-
-/* On some systems we can not operate on uploaded tmp files. We need to 
- *  explicitely copy them first 
- */
-foreach($_FILES as $postName => $entry){
-    $tempfile = tempnam(sys_get_temp_dir(), 'GOsa'); 
-    if(move_uploaded_file($_FILES[$postName]['tmp_name'], $tempfile)){ 
-        $_FILES[$postName]['tmp_name'] = $tempfile;
-    }
-}
-
-
 pathNavigator::clear();
 
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
@@ -90,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");
@@ -161,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();
 
@@ -175,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 {
@@ -200,7 +188,7 @@ $plist= session::global_get('plist');
 if (isset($global_check) && $config->boolValueIsTrue("core","forceGlobals")){
   msg_dialog::display(
             _("PHP configuration"),
-            _("FATAL: Register globals is active. Please fix this in order to continue."),
+            _("Fatal error: Register globals is active. Please fix this in order to continue."),
             FATAL_ERROR_DIALOG);
 
   new log("security","login","",array(),"Register globals is on. For security reasons, this should be turned off.") ;
@@ -248,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\"") ;
@@ -258,12 +249,19 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){
     exit;
   }
 } else {
-
-  /* set to welcome page as default plugin */
-  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.
@@ -408,7 +406,7 @@ if (is_file("$plugin_dir/main.inc")){
 } else {
   msg_dialog::display(
       _("Plug-in"),
-      sprintf(_("FATAL: Cannot find any plugin definitions for plugin %s!"), bold($plug)),
+      sprintf(_("Fatal error: Cannot find any plugin definitions for plugin %s!"), bold($plug)),
       FATAL_ERROR_DIALOG);
   exit();
 }
@@ -425,7 +423,7 @@ if (isset($_POST) && count($_POST)){
   if (!isset($_POST['php_c_check'])){
     msg_dialog::display(
             _("Configuration Error"),
-            sprintf(_("FATAL: not all POST variables have been transfered by PHP - please inform your administrator!")),
+            sprintf(_("Fatal error: not all POST variables have been transfered by PHP - please inform your administrator!")),
             FATAL_ERROR_DIALOG);
     exit();
   }