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

2013-06-11 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_html.php: revert my own changes in
	"html_print_image", the code didn't run fine.
	
	* operation/tree.php: fixed the params to call the function.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8285 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-11 10:06:23 +00:00
parent 6c56262c2b
commit 4cdd6bbde6
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-06-11 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php: revert my own changes in
"html_print_image", the code didn't run fine.
* operation/tree.php: fixed the params to call the function.
2013-06-10 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/jquery.ui-timepicker-addon.js: updated the

7
pandora_console/include/functions_html.php
View File

@ -1639,11 +1639,16 @@ function html_print_image ($src, $return = false, $options = false, $return_src
}
if (!$relative) {
$src_tmp = $src;
$src = ui_get_full_url($src);
}
// If metaconsole is activated and image doesn't exists try to search on normal console
if (defined('METACONSOLE')) {
if (!$relative) {
if (false === @file_get_contents($src, 0, null, 0, 1)) {
$src = ui_get_full_url('../../' . $src);
$src = ui_get_full_url('../../' . $src_tmp);
}
}
else {

8
pandora_console/operation/tree.php
View File

@ -187,8 +187,12 @@ if (is_ajax ())
$agent_info["modules"] = $row["total_count"];
$agent_info["alert_img"] = agents_tree_view_alert_img ($agent_info["monitor_alertsfired"]);
$agent_info["status_img"] = agents_tree_view_status_img ($agent_info["monitor_critical"], $agent_info["monitor_warning"], $agent_info["monitor_unknown"].
$agent_info["modules"], $agent_info["monitor_notinit"]);
$agent_info["status_img"] = agents_tree_view_status_img(
$agent_info["monitor_critical"],
$agent_info["monitor_warning"],
$agent_info["monitor_unknown"],
$agent_info["modules"],
$agent_info["monitor_notinit"]);
// Filter by status (only in policy view)
if ($type == 'policies') {