From 16bb066d4d77cbe1387567e25dcf0a55ebb4aeb4 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 12 Dec 2008 13:14:10 +0000 Subject: [PATCH] Updated main.inc git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13284 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/main.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index a42fbe18e..c01fc8936 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -196,10 +196,17 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){ } /* Check if we need to delete a lock */ +$cleanup = FALSE; if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != "" || isset($_POST['delete_lock'])){ if (is_file("$old_plugin_dir/main.inc")){ - $remove_lock= true; - $cleanup= true; + if(isset($_POST['delete_lock'])){ + echo "Remove lock"; + $remove_lock= true; + } + if($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){ + echo "Cleanup"; + $cleanup= true; + } $display = ""; require_once ("$old_plugin_dir/main.inc"); $display = ""; @@ -320,7 +327,7 @@ if ($config->get_cfg_value("handleExpiredAccounts") == "true"){ /* Load plugin */ if (is_file("$plugin_dir/main.inc")){ - require_once ("$plugin_dir/main.inc"); + require ("$plugin_dir/main.inc"); } else { msg_dialog::display( _("Plugin"), -- 2.30.2