tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified the alert messages the system stores in the user session

This commit is contained in:
Alejandro Gallardo Escobar 2015-05-27 16:00:24 +02:00
parent 584000691c
commit 09998429b7
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pandora_console/include/functions.php
View File

@ -2324,12 +2324,11 @@ function clear_pandora_error_for_header() {
function set_pandora_error_for_header($message, $title = null) {
global $config;
if (!isset($config["alert_cnt"])) {
$config["alert_cnt"] = 0;
}
if (!isset($_SESSION["alert_msg"])) {
$_SESSION["alert_msg"] = "";
}
if (!isset($config['alert_cnt']))
$config['alert_cnt'] = 0;
if (!isset($_SESSION['alert_msg']))
$_SESSION['alert_msg'] = array();
$message_config = array();
if (isset($title))
@ -2337,10 +2336,32 @@ function set_pandora_error_for_header($message, $title = null) {
$message_config['message'] = $message;
$message_config['no_close'] = true;
$config['alert_cnt']++;
$_SESSION['alert_msg'][] = array('type' => 'error', 'message' => $message_config);
}
$config["alert_cnt"]++;
$_SESSION["alert_msg"] .= ui_print_error_message($message_config,
'', true);
function get_pandora_error_for_header() {
$result = '';
if (isset($_SESSION['alert_msg']) && is_array($_SESSION['alert_msg'])) {
foreach ($_SESSION['alert_msg'] as $key => $value) {
if (!isset($value['type']) || !isset($value['message']))
continue;
switch ($value['type']) {
case 'error':
$result .= ui_print_error_message($value['message'], '', true);
break;
case 'info':
$result .= ui_print_info_message($value['message'], '', true);
break;
default:
break;
}
}
}
return $result;
}
function set_if_defined (&$var, $test) {

2
pandora_console/operation/system_alert.php
View File

@ -2,6 +2,6 @@
// TODO: Poner esto resizable y dragable: http://jqueryui.com/demos/dialog
echo $_SESSION["alert_msg"];
echo get_pandora_error_for_header();
?>