From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 5 Jul 2010 11:50:38 +0000 (+0000)
Subject: Fixed main.php and expiration handling of accounts
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aab05afd3c5f30c803121ccb08720f050157ccd8;p=gosa.git

Fixed main.php and expiration handling of accounts
-Password changed wasn't forceddue to lack of ACL initialization.


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@18927 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index c088754c0..3a47c061c 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -179,6 +179,14 @@ if (session::global_is_set('plugin_dir')){
 } else {
   $old_plugin_dir= "";
 }
+
+/* reload navigation if language changed*/  
+if($reload_navigation){
+  $plist->menu="";
+}
+$plist->gen_headlines();
+$plist->gen_menu();
+
 if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){
   $plug= validate($_GET['plug']);
   $plugin_dir= $plist->get_path($plug);
@@ -295,12 +303,6 @@ $smarty->assign ("go_corner", get_template_path('images/go_corner.png'));
 $smarty->assign ("go_left", get_template_path('images/go_left.png'));
 $smarty->assign ("go_help", get_template_path('images/help.png'));
 
-/* reload navigation if language changed*/  
-if($reload_navigation){
-  $plist->menu="";
-}
-$plist->gen_headlines();
-$plist->gen_menu();
 $smarty->assign ("menu", $plist->menu);
 $smarty->assign ("plug", "$plug");