Added image

[gosa.git] / html / main.php

diff --git a/html/main.php b/html/main.php
index e43f2aaeb104149ffc1c5b3d6bc85e9e71146f32..e03e40b75cb59304a537581e8d8ab311df90eee9 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -23,6 +23,7 @@ $start = microtime();
 $timing= array();
 require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
+require_once ("functions_FAI.inc");
 header("Content-type: text/html; charset=UTF-8");
 
 /* Find all class files and include them */
@@ -135,6 +136,11 @@ if ($config->data['MAIN']['LANG'] == ""){
   $lang= $config->data['MAIN']['LANG'];
 }
 
+/* Preset current main base */
+if(!isset($_SESSION['CurrentMainBase'])){
+  $_SESSION['CurrentMainBase']= get_base_from_people($ui->dn);
+}
+
 $lang.=".UTF-8";
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
@@ -151,6 +157,11 @@ textdomain($domain);
 /* Prepare plugin list */
 if (!isset($_SESSION['plist'])){
   $_SESSION['plist']= new pluglist($config, $ui);
+  
+  /* Load ocMapping into userinfo */
+  $tmp= new acl($config, NULL, $ui->dn);
+  $ui->ocMapping= $tmp->ocMapping;
+  $_SESSION['ui']= $ui;
 }
 $plist= $_SESSION['plist'];
 
@@ -329,6 +340,8 @@ if (isset ($_SESSION['post_cnt'])){
   echo "<input type=\"hidden\" name=\"session_cnt\" value=\"".$_SESSION['post_cnt']."\">\n";
 }
 
+$start = microtime();
+
 /* Load plugin */
 if (is_file("$plugin_dir/main.inc")){
   require_once ("$plugin_dir/main.inc");
@@ -355,7 +368,7 @@ if (is_file("$plugin_dir/main.inc")){
 /* Print_out last ErrorMessage repeated string. */
 print_red(NULL);
 
-$smarty->assign("contents", $display);
+$smarty->assign("contents", $display.get_MicroTimeDiff($start,microtime()));
 
 if (isset($_SESSION['errors'])){
   $smarty->assign("errors", $_SESSION['errors']);
@@ -386,7 +399,6 @@ echo $display;
 $_SESSION['plist']= $plist;
 $_SESSION['config']= $config;
 
-
 /* Echo compilation time * /
 $r = split(" ",$start);
 $ms = $r[0];