Requrie new schema for gosaAccount

[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 004c029d54b4343190352eac6a2a89f7e2930b00..6cd25e6d6f4c0bbe45ab5f8e05ac57ed63d30bd4 100644 (file)
--- a/gosa-core/include/class_msg_dialog.inc
+++ b/gosa-core/include/class_msg_dialog.inc
@@ -1,10 +1,31 @@
 <?php
+/*
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 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
 {
@@ -17,8 +38,10 @@ class msg_dialog
        public function __construct($s_title,$s_message,$i_type)
        {
                global $config;
+
+               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($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;
                }
@@ -43,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')){
@@ -63,11 +85,22 @@ class msg_dialog
                session::set('errorsAlreadyPosted',$errorsAlreadyPosted);
        }
 
+
        public static function display($s_title,$s_message,$i_type = INFO_DIALOG)
        {
                new msg_dialog($s_title,$s_message,$i_type);    
        }
 
+
+       public static function displayChecks($messages)
+       {
+               /* Assemble the message array to a plain string */
+               foreach ($messages as $error){
+                       msg_dialog::display(_("Error"), $error, ERROR_DIALOG);
+               }
+       }
+
+
        public function get_ID()
        {
                return($this->i_ID);
@@ -102,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')));
                }
@@ -137,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{
@@ -164,5 +197,6 @@ class msg_dialog
                }
                return($return);
        }
+
 }
 ?>