diff --git a/html/main.php b/html/main.php
index 745a2d2d79994fe5407b9a2da70852befaad9113..37a2eec73c14796cb2a3bceeaddd24c303c9413c 100644 (file)
--- a/html/main.php
+++ b/html/main.php
exit;
}
-/* Reset errors */
-$_SESSION['errors'] = "";
-$_SESSION['errorsAlreadyPosted']= array();
-$_SESSION['LastError'] = "";
-
/* Check for uniqe ip address */
$ui= $_SESSION["ui"];
if ($_SERVER['REMOTE_ADDR'] != $ui->ip){
exit;
}
$config= $_SESSION['config'];
+$config->check_and_reload();
/* Enable compressed output */
if (isset($config->data['MAIN']['COMPRESSED']) && preg_match('/^(true|on)$/i', $config->data['MAIN']['COMPRESSED'])){
$focus.= '</script>';
}
- $focus= '<script language="JavaScript" type="text/javascript">';
- $focus.= 'next_msg_dialog();';
- $focus.= '</script>';
-
-
+$focus= '<script language="JavaScript" type="text/javascript">';
+$focus.= 'next_msg_dialog();';
+$focus.= '</script>';
$smarty->assign("focus", $focus);
$display= $header.$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.
*/
+$cookie = array();
+
+if(isset($_COOKIE['GOsa_Filter_Settings'])){
+ $cookie = unserialize(base64_decode($_COOKIE['GOsa_Filter_Settings']));
+}elseif(isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
+ $cookie = unserialize(base64_decode($HTTP_COOKIE_VARS['GOsa_Filter_Settings']));
+}
if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){
$cookie_vars = array("MultiDialogFilters","CurrentMainBase");
foreach($cookie_vars as $var){
if(isset($_SESSION[$var])){
- @setcookie($var,base64_encode(serialize($_SESSION[$var])),time()+ 60*60*24*30);
+ $cookie[$ui->dn][$var] = $_SESSION[$var];
}
}
+ if(isset($_GET['plug'])){
+ $cookie[$ui->dn]['plug'] = $_GET['plug'];
+ }
+ setcookie("GOsa_Filter_Settings",base64_encode(serialize($cookie)),time() + (60*60*24));
}
/* Show page... */
/* Save plist and config */
$_SESSION['plist']= $plist;
$_SESSION['config']= $config;
+$_SESSION['errorsAlreadyPosted']= array();
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>