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

2012-04-23 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2012-04-23 16:38:09 +00:00
parent 1a1f9607bc
commit e09449c110
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2012-04-23 Miguel de Dios <miguel.dedios@artica.es>
* 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 <sergio.martin@artica.es> 2012-04-23 Sergio Martin <sergio.martin@artica.es>
* operation/menu.php: Changed the order of the reporting * operation/menu.php: Changed the order of the reporting

2
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -266,7 +266,7 @@ if ($action == 'new' || $idVisualConsole === false){
$buttons[$activeTab]['active'] = true; $buttons[$activeTab]['active'] = true;
ui_print_page_header(__('Visual console') . " &raquo; " . $visualConsoleName, "images/reporting_edit", false, "visual_console_editor_" . $activeTab . "_tab", true, $buttons); ui_print_page_header(__('Visual console') . " &raquo; " . $visualConsoleName, "images/reporting_edit.png", false, "visual_console_editor_" . $activeTab . "_tab", true, $buttons);
//The source code for PAINT THE PAGE //The source code for PAINT THE PAGE
if ($statusProcessInDB !== null) { if ($statusProcessInDB !== null) {

6
pandora_console/index.php
View File

@ -307,7 +307,11 @@ if ($page == 'operation/users/webchat') {
//Reload the global counter. //Reload the global counter.
users_get_last_global_counter('session'); 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'); $now_global_counter_chat = users_get_last_global_counter('return');
if ($old_global_counter_chat != $now_global_counter_chat) { if ($old_global_counter_chat != $now_global_counter_chat) {