X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=5d8a3a0ad7ceb55b5ae6de01f6e2e77596904eae;hb=ab302c2472a7c64058e4f0d7aa11a5cc639ad7ea;hp=3c799e8c0227aa881d30eb23bde74cd87bcf78ee;hpb=2b73f5614132da460ce7471df8d540f614ff5441;p=gosa.git
diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 3c799e8c0..5d8a3a0ad 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -41,6 +41,8 @@ session::set('errorsAlreadyPosted',array());
session::global_set('runtime_cache',array());
session::set('limit_exceeded',FALSE);
+pathNavigator::clear();
+
if ($_SERVER["REQUEST_METHOD"] == "POST"){
@DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, "_POST");
}
@@ -265,8 +267,11 @@ if (isset($_GET['reset'])){
}
/* show web frontend */
+$smarty->assign ("logo", image(get_template_path("images/logo.png")));
+$smarty->assign ("logout", image(get_template_path("images/btn-logout.png"), "log-out", _("Log out")));
$smarty->assign ("date", date("l, dS F Y H:i:s O"));
-$smarty->assign ("must", "*");
+$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
+$smarty->assign ("must", "*");
if (isset($plug)){
$plug= "?plug=$plug";
} else {
@@ -281,9 +286,9 @@ if (session::global_get('js')==FALSE){
}
if($ui->ignore_acl_for_current_user()){
- $smarty->assign ("username", ""._("User ACL checks disabled")." ".$ui->username);
+ $smarty->assign ("loggedin", ""._("ACLs are disabled")." ".sprintf(_("You're logged in as %s"), "".$ui->cn." [".$ui->username."]"));
}else{
- $smarty->assign ("username", $ui->username);
+ $smarty->assign ("loggedin", sprintf(_("You're logged in as %s"), "".$ui->cn." [".$ui->username."]"));
}
$smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
$smarty->assign ("go_base", get_template_path('images/dtree.png'));
@@ -298,25 +303,32 @@ $smarty->assign ("go_help", get_template_path('images/help.png'));
if($reload_navigation){
$plist->menu="";
}
-$plist->gen_headlines();
-$plist->gen_menu();
-$smarty->assign ("menu", $plist->menu);
+$smarty->assign ("menu", $plist->gen_menu());
$smarty->assign ("plug", "$plug");
$smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
-$header= "".$smarty->fetch(get_template_path('headers.tpl'));
+$smarty->assign("usePrototype", "false");
/* React on clicks */
if ($_SERVER["REQUEST_METHOD"] == "POST"){
if (isset($_POST['delete_lock']) || isset($_POST['open_readonly'])){
/* Set old Post data */
- if(session::global_is_set('LOCK_VARS_USED')){
- foreach(session::global_get('LOCK_VARS_USED') as $name => $value){
+ if(session::global_is_set('LOCK_VARS_USED_GET')){
+ foreach(session::global_get('LOCK_VARS_USED_GET') as $name => $value){
$_GET[$name] = $value;
+ }
+ }
+ if(session::global_is_set('LOCK_VARS_USED_POST')){
+ foreach(session::global_get('LOCK_VARS_USED_POST') as $name => $value){
$_POST[$name] = $value;
}
}
+ if(session::global_is_set('LOCK_VARS_USED_REQUEST')){
+ foreach(session::global_get('LOCK_VARS_USED_REQUEST') as $name => $value){
+ $_REQUEST[$name] = $value;
+ }
+ }
}
}
@@ -345,6 +357,7 @@ if (is_file("$plugin_dir/main.inc")){
/* Print_out last ErrorMessage repeated string. */
$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
+$smarty->assign ("pathMenu", $plist->genPathMenu());
$smarty->assign("contents", $display);
/* If there's some post, take a look if everything is there... */
@@ -398,7 +411,8 @@ if (isset($_POST['_channel_'])){
$smarty->assign("channel", "");
}
-$display= $header.$smarty->fetch(get_template_path('framework.tpl'));
+$display= "".$smarty->fetch(get_template_path('headers.tpl')).
+ $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.