index 1d568288ba01de15e9d9b538f444429ed0deab3f..3c799e8c0227aa881d30eb23bde74cd87bcf78ee 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
$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();
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 */
$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 */
$_POST[$name] = $value;
}
}
- session::un_set ('dn');
}
-
}
/* check if we are using account expiration */
/* 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();
}