index 5fb06268f92e79e1656e947e41c96c3dfc34ed9f..6cd25e6d6f4c0bbe45ab5f8e05ac57ed63d30bd4 100644 (file)
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
{
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;
}
/* 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')){
$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')));
}
$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{