X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=c330f32f70cae30233e437a123d9c2931913da00;hb=c2615836c35054bcef93297199e21169004b3eb8;hp=f9e19fa341a9299e1d01dd558d2d8b7b107829e3;hpb=e6549ef71b8ea8dce60446b4b004874787aca759;p=gosa.git
diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index f9e19fa34..c330f32f7 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");
}
@@ -96,6 +98,7 @@ if(session::global_get('_LAST_PAGE_REQUEST') == ""){
/* Set template compile directory */
$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
+$smarty->error_unassigned= true;
/* Set default */
$reload_navigation = false;
@@ -265,10 +268,12 @@ if (isset($_GET['reset'])){
}
/* show web frontend */
-$smarty->assign ("logo", "
".image("themes/modern/images/logo.png")."
");
+$smarty->assign ("title","GOsa");
+$smarty->assign ("logo", image(get_template_path("images/logo.png")));
+$smarty->assign ("logoutimage", get_template_path("images/btn-logout.png"));
$smarty->assign ("date", date("l, dS F Y H:i:s O"));
$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
-$smarty->assign ("must", "*");
+$smarty->assign ("must", "*");
if (isset($plug)){
$plug= "?plug=$plug";
} else {
@@ -283,9 +288,9 @@ if (session::global_get('js')==FALSE){
}
if($ui->ignore_acl_for_current_user()){
- $smarty->assign ("loggedin", ""._("ACLs are disabled")." ".sprintf("You're logged in as %s [%s]", $ui->cn, $ui->username));
+ $smarty->assign ("loggedin", ""._("ACLs are disabled")." ".sprintf(_("You're logged in as %s"), "".$ui->cn." [".$ui->username."]"));
}else{
- $smarty->assign ("loggedin", sprintf("You're logged in as %s [%s]", $ui->cn, $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'));
@@ -301,7 +306,6 @@ if($reload_navigation){
$plist->menu="";
}
$smarty->assign ("menu", $plist->gen_menu());
-$smarty->assign ("pathMenu", $plist->genPathMenu());
$smarty->assign ("plug", "$plug");
$smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
@@ -355,6 +359,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... */