From ae90fd50168dd7608cbf4c388a7b6b9b1a80869f Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 23 Apr 2012 16:38:09 +0000 Subject: [PATCH] 2012-04-23 Miguel de Dios * index.php: fixed php noticie message about uninicialized var. * godmode/reporting/visual_console_builder.php: fixed the image url in the header. MERGED FROM 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6110 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ .../godmode/reporting/visual_console_builder.php | 2 +- pandora_console/index.php | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c671f8c2f6..a7a9073b76 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2012-04-23 Miguel de Dios + + * index.php: fixed php noticie message about uninicialized var. + + * godmode/reporting/visual_console_builder.php: fixed the image url + in the header. + + MERGED FROM 4.0.2 + 2012-04-23 Sergio Martin * operation/menu.php: Changed the order of the reporting diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index c70806649b..57af3170d4 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -266,7 +266,7 @@ if ($action == 'new' || $idVisualConsole === false){ $buttons[$activeTab]['active'] = true; -ui_print_page_header(__('Visual console') . " » " . $visualConsoleName, "images/reporting_edit", false, "visual_console_editor_" . $activeTab . "_tab", true, $buttons); +ui_print_page_header(__('Visual console') . " » " . $visualConsoleName, "images/reporting_edit.png", false, "visual_console_editor_" . $activeTab . "_tab", true, $buttons); //The source code for PAINT THE PAGE if ($statusProcessInDB !== null) { diff --git a/pandora_console/index.php b/pandora_console/index.php index f5779e27aa..fd5509f15c 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -307,7 +307,11 @@ if ($page == 'operation/users/webchat') { //Reload the global counter. users_get_last_global_counter('session'); } -$old_global_counter_chat = $_SESSION['global_counter_chat']; + +if (isset($_SESSION['global_counter_chat'])) + $old_global_counter_chat = $_SESSION['global_counter_chat']; +else + $old_global_counter_chat = users_get_last_global_counter('return'); $now_global_counter_chat = users_get_last_global_counter('return'); if ($old_global_counter_chat != $now_global_counter_chat) {