- Added other part of bug 673 patch for linux vserver

[gosa.git] / gosa-core / html / main.php

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 1d568288ba01de15e9d9b538f444429ed0deab3f..e002b9339366c0fd87b78639a721e8d7419c41d2 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -195,21 +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 */
-
-print_a(array($old_plugin_dir,$plugin_dir,$old_plugin_dir,getcwd()));
+/* 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;
 
-if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){
-  
+/* 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;
-    echo "Jaa . "."$old_plugin_dir/main.inc";
-    require_once ("$old_plugin_dir/main.inc");
-  }else{
-    echo "No";
+    $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;
 
 /* Check for sizelimits */
 eval_sizelimit();
@@ -247,19 +255,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
     header ("Location: logout.php");
     exit;
   }
-
-  if (isset($_POST['cancel_lock'])){
-    session::un_set('dn');
-  }
 }
 
 
 /* Load department list when plugin has changed. That is some kind of
    compromise between speed and beeing up to date */
 if (isset($_GET['reset'])){
-  if (session::is_set('objectinfo')){
-    session::un_set('objectinfo');
-  }
+  set_object_info();
 }
 
 /* show web frontend */
@@ -301,29 +303,30 @@ $plist->gen_menu();
 $smarty->assign ("menu", $plist->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'));
 
 /* React on clicks */
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
-
-  /* 'delete_lock' is set by the lock removal dialog. We should remove the
-     lock at this point globally. Plugins do not need to remove it. */
-  if (isset($_POST['delete_lock']) && session::is_set('dn')){
-    del_lock (session::get('dn'));
-
-  }
   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;
       } 
     }
-    session::un_set ('dn');
+    if(session::global_is_set('LOCK_VARS_USED_REQUEST')){
+      foreach(session::global_get('LOCK_VARS_USED_REQUEST') as $name => $value){
+        $_REQUEST[$name] = $value;
+      } 
+    }
   }
-
 }
 
 /* check if we are using account expiration */
@@ -338,12 +341,13 @@ 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();
 }