X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fmain.php;h=f9c2cc6e7d93e4517ce3ad36fb592389b0ad034e;hb=96a9229b8cbcda886c8c7ab826ae1e1ba3bf97d0;hp=5a7261cb9e7ee7516d8b95e3dcffdacc649b0982;hpb=6f80cf0a1d4ae8ba809c81b4696a55b5eafa8af2;p=gosa.git diff --git a/html/main.php b/html/main.php index 5a7261cb9..f9c2cc6e7 100644 --- a/html/main.php +++ b/html/main.php @@ -29,9 +29,6 @@ require_once ("functions_FAI.inc"); /* Set header */ header("Content-type: text/html; charset=UTF-8"); -/* Find all class files and include them */ -get_dir_list("$BASE_DIR/plugins"); - /* Set the text domain as 'messages' */ $domain = 'messages'; bindtextdomain($domain, "$BASE_DIR/locale"); @@ -125,19 +122,15 @@ if((!isset($_SESSION['Last_init_lang']))){ $_SESSION['Last_init_lang'] = get_browser_language(); } -/* Language setup */ -if ($config->data['MAIN']['LANG'] == ""){ - - /* If last language != current force navi reload */ - if($_SESSION['Last_init_lang'] != get_browser_language()){ - $reload_navigation = true; - } - $lang= get_browser_language(); - $_SESSION['Last_init_lang'] = $lang; -} else { - $lang= $config->data['MAIN']['LANG']; +/* If last language != current force navi reload */ +$lang= get_browser_language(); +if($_SESSION['Last_init_lang'] != $lang){ + $reload_navigation = true; } +/* Language setup */ +$_SESSION['Last_init_lang'] = $lang; + /* Preset current main base */ if(!isset($_SESSION['CurrentMainBase'])){ $_SESSION['CurrentMainBase']= get_base_from_people($ui->dn); @@ -157,8 +150,16 @@ textdomain($domain); /* Prepare plugin list */ if (!isset($_SESSION['plist'])){ - $_SESSION['plist']= new pluglist($config, $ui); + /* Initially load all classes */ + $class_list= get_declared_classes(); + foreach ($class_mapping as $class => $path){ + if (!in_array($class, $class_list)){ + require_once("$BASE_DIR/$path"); + } + } + $_SESSION['plist']= new pluglist($config, $ui); + /* Load ocMapping into userinfo */ $tmp= new acl($config, NULL, $ui->dn); $ui->ocMapping= $tmp->ocMapping; @@ -363,7 +364,14 @@ if (is_file("$plugin_dir/main.inc")){ /* Print_out last ErrorMessage repeated string. */ +if(isset($_GET['add'])){ +msg_dialog::display("Error" ,"Kann datei nicht schreiben, bla",ERROR_DIALOG); +msg_dialog::display("Warning" ,"Kann datei nicht schreiben, bla",WARNING_DIALOG); +msg_dialog::display("Info" ,"Kann datei nicht schreiben, bla",INFO_DIALOG); +msg_dialog::display("Confirm" ,"Kann datei nicht schreiben, bla",CONFIRM_DIALOG); +} +$smarty->assign("msg_dialogs", msg_dialog::get_dialogs()); $smarty->assign("contents", $display); /* Assign erros to smarty */ @@ -383,10 +391,28 @@ if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){ $focus.= 'document.forms[0].error_accept.focus();'; $focus.= ''; } + + $focus= ''; + + $smarty->assign("focus", $focus); $display= $header.$smarty->fetch(get_template_path('framework.tpl')); +/* Save dialog filters and selected base in a cookie. + So we may be able to restore the filter an base settings on reload. +*/ +if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){ + $cookie_vars = array("MultiDialogFilters","CurrentMainBase"); + foreach($cookie_vars as $var){ + if(isset($_SESSION[$var])){ + @setcookie($var,base64_encode(serialize($_SESSION[$var])),time()+ 60*60*24*30); + } + } +} + /* Show page... */ echo $display; @@ -395,7 +421,7 @@ $_SESSION['plist']= $plist; $_SESSION['config']= $config; /* Echo compilation time */ -//echo "
".get_MicroTimeDiff($start,microtime())."
"; +#echo "".get_MicroTimeDiff($start,microtime())."
"; // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>