X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=5d8a3a0ad7ceb55b5ae6de01f6e2e77596904eae;hb=ab302c2472a7c64058e4f0d7aa11a5cc639ad7ea;hp=e358c41096e0a975fbab95ffedfc2e09f7b71c44;hpb=7997a5c7fecafe190100e42f666cedc82184cfe4;p=gosa.git

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index e358c4109..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");
 }
@@ -195,18 +197,29 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){
   $plugin_dir= "$BASE_DIR/plugins/generic/welcome";
 }
 
-/* Check if we need to delete a lock */
-if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != "" || isset($_POST['delete_lock'])){
+/* Handle plugin locks.
+    - Remove the plugin from session if we switched to another. (cleanup) 
+    - Remove all created locks if "reset" was posted.
+    - Remove all created locks if we switched to another plugin.
+*/
+$cleanup    = FALSE;
+$remove_lock= FALSE;
+
+/* Check if we have changed the selected plugin 
+*/
+if($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){
   if (is_file("$old_plugin_dir/main.inc")){
-    $remove_lock= true;
-    $cleanup= true;
-    $display = "";
-    require_once ("$old_plugin_dir/main.inc");
-    $display = "";
+    $cleanup = $remove_lock = TRUE;
+    require ("$old_plugin_dir/main.inc");
+    $cleanup = $remove_lock = FALSE;
   }
+}else // elseif
+
+/* Reset was posted, remove all created locks for the current plugin
+*/
+if((isset($_GET['reset']) && $_GET['reset'] == 1) || isset($_POST['delete_lock'])){
+  $remove_lock = TRUE;
 }
-$remove_lock= false;
-$cleanup= false;
 
 /* Check for sizelimits */
 eval_sizelimit();
@@ -254,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", "<font class=\"must\">*</font>");
+$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
+$smarty->assign ("must", "<span class='required'>*</span>");
 if (isset($plug)){
   $plug= "?plug=$plug";
 } else {
@@ -270,9 +286,9 @@ if (session::global_get('js')==FALSE){
 }
 
 if($ui->ignore_acl_for_current_user()){
-  $smarty->assign ("username", "<font color='#FF0000';>"._("User ACL checks disabled")."</font>&nbsp;".$ui->username);
+  $smarty->assign ("loggedin", "<font color='red'>"._("ACLs are disabled")."</font>&nbsp;".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'));
@@ -287,24 +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");
 
-$header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
+$smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
+$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;
+      } 
+    }
   }
 }
 
@@ -320,18 +344,20 @@ if ($config->get_cfg_value("handleExpiredAccounts") == "true"){
 
 /* Load plugin */
 if (is_file("$plugin_dir/main.inc")){
-  require_once ("$plugin_dir/main.inc");
+  $display ="";
+  require ("$plugin_dir/main.inc");
 } else {
   msg_dialog::display(
-            _("Plugin"),
-            sprintf(_("FATAL: Cannot find any plugin definitions for plugin '%s'!"), $plug),
-            FATAL_ERROR_DIALOG);
+      _("Plugin"),
+      sprintf(_("FATAL: Cannot find any plugin definitions for plugin '%s'!"), $plug),
+      FATAL_ERROR_DIALOG);
   exit();
 }
 
 
 /* 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... */
@@ -374,7 +400,10 @@ $smarty->assign("focus", $focus);
 #      * remove regulary created channels when not needed anymore
 #      * take a look at external php calls (i.e. get fax, ldif, etc.)
 #      * handle aborted sessions (by pressing anachors i.e. Main, Menu, etc.)
+#      * check lock removals, is "dn" global or not in this case?
 #      * last page request -> global or not?
+#      * check that filters are still global
+#      * maxC global?
 if (isset($_POST['_channel_'])){
 	echo "DEBUG - current channel: ".$_POST['_channel_'];
 	$smarty->assign("channel", $_POST['_channel_']);
@@ -382,7 +411,8 @@ if (isset($_POST['_channel_'])){
 	$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.