Applied in_array strict patches from trunk

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

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 8fd60d417cc3ec17b41c9934f18e606be47b288f..70432abcbbc76cae2150cab4d8d09b994f765b1c 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"){
@@ -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 {
@@ -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.