diff --git a/html/index.php b/html/index.php
index 50a3d45a29d5a386e5f97df5c115c5dedce3dc80..67d3c08267dc230d6dda57a2c48c82c9bef30bc5 100644 (file)
--- a/html/index.php
+++ b/html/index.php
/* Restore filter settings from cookie, if available
*/
if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){
- $cookie_vars= array("MultiDialogFilters","CurrentMainBase","plug");
- foreach($cookie_vars as $var){
- if(isset($_COOKIE[$var])){
- $_SESSION[$var] = unserialize(base64_decode($_COOKIE[$var]));
- }elseif(isset($HTTP_COOKIE_VARS[$var])){
- $_SESSION[$var] = unserialize(base64_decode($HTTP_COOKIE_VARS[$var]));
+
+ if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
+
+ if(isset($_COOKIE['GOsa_Filter_Settings'])){
+ $cookie_all = unserialize(base64_decode($_COOKIE['GOsa_Filter_Settings']));
+ }else{
+ $cookie_all = unserialize(base64_decode($HTTP_COOKIE_VARS['GOsa_Filter_Settings']));
+ }
+ if(isset($cookie_all[$ui->dn])){
+ $cookie = $cookie_all[$ui->dn];
+ $cookie_vars= array("MultiDialogFilters","CurrentMainBase","plug");
+ foreach($cookie_vars as $var){
+ if(isset($cookie[$var])){
+ $_SESSION[$var] = $cookie[$var];
+ }
+ }
+ if(isset($cookie['plug'])){
+ $plug =$cookie['plug'];
+ }
}
- }
- if(isset($_COOKIE['plug'])){
- $plug = $_COOKIE['plug'];
- }elseif($HTTP_COOKIE_VARS['plug']){
- $plug = $HTTP_COOKIE_VARS['plug'];
}
}