X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=c088754c0c7bf3ada17570e5a0ee3913fd8f454a;hb=43073ac4d0e6b18428c163774622e15629b4ffb5;hp=a5d9c2a7491ff45b55df92e0a46cf8e13719ae30;hpb=f4b36811e51e7099204672c829e0a8c3fa3ddec7;p=gosa.git

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index a5d9c2a74..c088754c0 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -195,23 +195,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 */
-$cleanup = FALSE;
-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")){
-    if(isset($_POST['delete_lock'])){
-      $remove_lock= true;
-    }
-    if($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){
-      $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();
@@ -260,6 +266,7 @@ if (isset($_GET['reset'])){
 
 /* show web frontend */
 $smarty->assign ("date", date("l, dS F Y H:i:s O"));
+$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
 $smarty->assign ("must", "<font class=\"must\">*</font>");
 if (isset($plug)){
   $plug= "?plug=$plug";
@@ -297,19 +304,29 @@ $plist->gen_menu();
 $smarty->assign ("menu", $plist->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;
+      } 
+    }
   }
 }
 
@@ -325,12 +342,13 @@ if ($config->get_cfg_value("handleExpiredAccounts") == "true"){
 
 /* Load plugin */
 if (is_file("$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();
 }
 
@@ -390,7 +408,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.