index a95c09367bcdf6ae9ea4478de44ab28303320f2e..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 */
-if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){
+/* 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;
- require_once ("$old_plugin_dir/main.inc");
+ $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();
$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 */
/* 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();
}
# * 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_']);