![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 1d568288ba01de15e9d9b538f444429ed0deab3f..5d8a3a0ad7ceb55b5ae6de01f6e2e77596904eae 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
session::global_set('runtime_cache',array());
session::set('limit_exceeded',FALSE);
+pathNavigator::clear();
+
if ($_SERVER["REQUEST_METHOD"] == "POST"){
@DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, "_POST");
}
$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 ("logo", image(get_template_path("images/logo.png")));
+$smarty->assign ("logout", image(get_template_path("images/btn-logout.png"), "log-out", _("Log out")));
$smarty->assign ("date", date("l, dS F Y H:i:s O"));
-$smarty->assign ("must", "<font class=\"must\">*</font>");
+$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
+$smarty->assign ("must", "<span class='required'>*</span>");
if (isset($plug)){
$plug= "?plug=$plug";
} else {
}
if($ui->ignore_acl_for_current_user()){
- $smarty->assign ("username", "<font color='#FF0000';>"._("User ACL checks disabled")."</font> ".$ui->username);
+ $smarty->assign ("loggedin", "<font color='red'>"._("ACLs are disabled")."</font> ".sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
}else{
- $smarty->assign ("username", $ui->username);
+ $smarty->assign ("loggedin", sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
}
$smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
$smarty->assign ("go_base", get_template_path('images/dtree.png'));
if($reload_navigation){
$plist->menu="";
}
-$plist->gen_headlines();
-$plist->gen_menu();
-$smarty->assign ("menu", $plist->menu);
+$smarty->assign ("menu", $plist->gen_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"){
-
- /* '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 */
/* 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();
}
/* Print_out last ErrorMessage repeated string. */
$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
+$smarty->assign ("pathMenu", $plist->genPathMenu());
$smarty->assign("contents", $display);
/* If there's some post, take a look if everything is there... */
$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.