Updated get_sub_list

[gosa.git] / gosa-core / include / class_msg_dialog.inc

diff --git a/gosa-core/include/class_msg_dialog.inc b/gosa-core/include/class_msg_dialog.inc
index 4293414ca1b3c563a5d6a530714407359271da88..004c029d54b4343190352eac6a2a89f7e2930b00 100644 (file)
--- a/gosa-core/include/class_msg_dialog.inc
+++ b/gosa-core/include/class_msg_dialog.inc
@@ -23,16 +23,17 @@ class msg_dialog
                        $i_type = INFO_DIALOG;
                }
 
-               if((!isset($_SESSION['errorsAlreadyPosted'])) || !is_array($_SESSION['errorsAlreadyPosted'])){
+               if((!session::is_set('errorsAlreadyPosted')) || !is_array(session::get('errorsAlreadyPosted'))){
                        session::set('errorsAlreadyPosted',array());
                }
 
-               if(!isset($_SESSION['errorsAlreadyPosted'][$s_title.$s_message])){
-                       $_SESSION['errorsAlreadyPosted'][$s_title.$s_message] = 0;
+               $errorsAlreadyPosted = session::get('errorsAlreadyPosted');
+               if(!isset($errorsAlreadyPosted[$s_title.$s_message])){
+                       $errorsAlreadyPosted[$s_title.$s_message] = 0;
                }
-               $_SESSION['errorsAlreadyPosted'][$s_title.$s_message]++;
+               $errorsAlreadyPosted[$s_title.$s_message]++;
 
-               if($_SESSION['errorsAlreadyPosted'][$s_title.$s_message] <=1  ){
+               if($errorsAlreadyPosted[$s_title.$s_message] <=1  ){
 
                        $this->i_ID      = preg_replace("/[^0-9]*/","",microtime()); 
                        $this->s_Title   = $s_title;
@@ -46,7 +47,7 @@ class msg_dialog
                                preg_match("/^true$/i",$config->data['MAIN']['DISPLAYERRORS'])){
                                $this->a_Trace   = debug_backtrace();
                        }
-                       if(!isset($_SESSION['msg_dialogs'])){
+                       if(!session::is_set('msg_dialogs')){
                                session::set('msg_dialogs',array());
                        }
                        if($this->i_Type == FATAL_ERROR_DIALOG){
@@ -54,9 +55,12 @@ class msg_dialog
                                error_reporting(E_ALL);
                                echo $this->execute();
                        }else{
-                               $_SESSION['msg_dialogs'][] = $this;
+                               $msg_dialogs   = session::get('msg_dialogs');
+                               $msg_dialogs[] = $this;
+                               session::set('msg_dialogs',$msg_dialogs);
                        }
                }
+               session::set('errorsAlreadyPosted',$errorsAlreadyPosted);
        }
 
        public static function display($s_title,$s_message,$i_type = INFO_DIALOG)
@@ -82,7 +86,7 @@ class msg_dialog
                                <tr><td style='vertical-align:top;padding:10px'>
                                <img src='images/error.png' alt='{t}Error{/t}'>
                                </td><td style='width:100%'>
-                               <b>Fatal Error - GOsa execution abortet - ".$this->s_Title."</b><br>
+                               <b>".$this->s_Title."</b><br>
                                ".$this->s_Message."<br><br>
                                "._("Please fix the above error and reload the page.")."
                                </td></tr>
@@ -98,7 +102,7 @@ class msg_dialog
                        $smarty->assign("s_Title",$this->s_Title);
                        $smarty->assign("i_ID",$this->i_ID);
                        $smarty->assign("frame",false);
-                       $smarty->assign("JS",$_SESSION['js']);
+                       $smarty->assign("JS",session::get('js'));
                        $smarty->assign("IE",preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']));
                        return($smarty->fetch(get_template_path('msg_dialog.tpl')));
                }
@@ -125,7 +129,7 @@ class msg_dialog
 #                      $seen = $_POST['closed_msg_dialogs'];
                }
 
-               if(isset($_SESSION['msg_dialogs']) && is_array($_SESSION['msg_dialogs']) && count($_SESSION['msg_dialogs'])){
+               if(session::is_set('msg_dialogs') && is_array(session::get('msg_dialogs')) && count(session::get('msg_dialogs'))){
 
                        /* Get frame one */
                        $smarty = get_smarty();
@@ -133,20 +137,22 @@ class msg_dialog
                        $smarty->assign("IE",preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']));
                        $return = $smarty->fetch(get_template_path('msg_dialog.tpl'));
 
-                       if(!$_SESSION['js']){
-                               $dialog = array_pop($_SESSION['msg_dialogs']);
+                       if(!session::get('js')){
+                               $dialog = array_pop(session::get('msg_dialogs'));
                                $return.= $dialog->execute();
                        }else{
-                               foreach($_SESSION['msg_dialogs'] as $key => $dialog){
+                               $msg_dialogs = session::get('msg_dialogs');
+                               foreach($msg_dialogs as $key => $dialog){
 
                                        if(preg_match("/".$dialog->get_ID()."/",$seen)){
-                                               unset($_SESSION['msg_dialogs'][$key]);
+                                               unset($msg_dialogs[$key]);
                                        }else{
                                                $return.= $dialog->execute();
                                                $dialog_ids= $dialog->get_ID().",".$dialog_ids;
                                        }
-                                       unset($_SESSION['msg_dialogs'][$key]);
+                                       unset($msg_dialogs[$key]);
                                }
+                               session::set('msg_dialogs',$msg_dialogs);
                        }
                        $dialog_ids = preg_replace("/,$/","",$dialog_ids);