Updated in

[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 1ba29747e639cb4c9d68043368e6c10a880e47a3..e13389a0399359300a6ab3b1697be670acb1982b 100644 (file)
--- a/gosa-core/include/class_msg_dialog.inc
+++ b/gosa-core/include/class_msg_dialog.inc
@@ -24,7 +24,8 @@ define("INFO_DIALOG"          , 10001);
 define("WARNING_DIALOG"                , 10002);
 define("ERROR_DIALOG"          , 10003);
 define("CONFIRM_DIALOG"                , 10004);
-define("FATAL_ERROR_DIALOG"    , 10005);
+define("OK_CANCEL_DIALOG"      , 10005);
+define("FATAL_ERROR_DIALOG"    , 10006);
 
 class msg_dialog
 {
@@ -40,7 +41,7 @@ class msg_dialog
 
                if(empty($s_message)) return;
        
-               if(!in_array($i_type,array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG))){
+               if(!in_array_strict($i_type,array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG,OK_CANCEL_DIALOG))){
                        trigger_error("Invalid msg_dialog type.");
                        $i_type = INFO_DIALOG;
                }
@@ -65,8 +66,7 @@ class msg_dialog
                        /* Append trace information, only if error messages are enabled */
                        if(     isset($config) && 
                                is_object($config) && 
-                               isset($config->data['MAIN']['DISPLAYERRORS']) &&
-                               preg_match("/^true$/i",$config->data['MAIN']['DISPLAYERRORS'])){
+                               $config->get_cfg_value("displayerrors") == "true" ){
                                $this->a_Trace   = debug_backtrace();
                        }
                        if(!session::is_set('msg_dialogs')){
@@ -135,7 +135,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::get('js'));
+                       $smarty->assign("JS",session::global_get('js'));
                        $smarty->assign("IE",preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']));
                        return($smarty->fetch(get_template_path('msg_dialog.tpl')));
                }
@@ -170,7 +170,7 @@ class msg_dialog
                        $smarty->assign("IE",preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']));
                        $return = $smarty->fetch(get_template_path('msg_dialog.tpl'));
 
-                       if(!session::get('js')){
+                       if(!session::global_get('js')){
                                $dialog = array_pop(session::get('msg_dialogs'));
                                $return.= $dialog->execute();
                        }else{