index 36bc1eb22caddd589e0acecad226b89c3e3026a3..5d8a3a0ad7ceb55b5ae6de01f6e2e77596904eae 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
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");
}
}
/* 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", "<font class=\"must\">*</font>");
+$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
+$smarty->assign ("must", "<span class='required'>*</span>");
if (isset($plug)){
$plug= "?plug=$plug";
} else {
}
if($ui->ignore_acl_for_current_user()){
- $smarty->assign ("username", "<font color='#FF0000';>"._("User ACL checks disabled")."</font> ".$ui->username);
+ $smarty->assign ("loggedin", "<font color='red'>"._("ACLs are disabled")."</font> ".sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
}else{
- $smarty->assign ("username", $ui->username);
+ $smarty->assign ("loggedin", sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
}
$smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
$smarty->assign ("go_base", get_template_path('images/dtree.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= "<!-- headers.tpl-->".$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;
+ }
+ }
}
}
/* 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... */
$smarty->assign("errors", session::get('errors'));
}
if ($error_collector != ""){
-
- echo htmlentities($error_collector);
-
$smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
} else {
$smarty->assign("php_errors", "");
$smarty->assign("channel", "");
}
-$display= $header.$smarty->fetch(get_template_path('framework.tpl'));
+$display= "<!-- headers.tpl-->".$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.