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

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

* include/config_process.php: added lost line about the autorefresh.
	
	* include/functions_html.php: re-fixed the images from metaconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9099 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-11-19 14:36:22 +00:00
parent ff35799c05
commit c7cfbfd77d
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-11-19 Miguel de Dios <miguel.dedios@artica.es>
* include/config_process.php: added lost line about the autorefresh.
* include/functions_html.php: re-fixed the images from metaconsole.
2013-11-19 Sergio Martin <sergio.martin@artica.es> 2013-11-19 Sergio Martin <sergio.martin@artica.es>
* operation/events/events.build_query.php: Fixed a * operation/events/events.build_query.php: Fixed a

1
pandora_console/include/config_process.php
View File

@ -219,6 +219,7 @@ $config['autorefresh_white_list'] = array(
'operation/snmpconsole/snmp_view', 'operation/snmpconsole/snmp_view',
'operation/agentes/networkmap', 'operation/agentes/networkmap',
'enterprise/operation/services/services', 'enterprise/operation/services/services',
'operation/visual_console/render_view',
'operation/events/events'); 'operation/events/events');
// Specific metaconsole autorefresh white list sections // Specific metaconsole autorefresh white list sections

11
pandora_console/include/functions_html.php
View File

@ -1641,7 +1641,6 @@ function html_print_image ($src, $return = false, $options = false, $return_src
// If metaconsole is activated and image doesn't exists try to search on normal console // If metaconsole is activated and image doesn't exists try to search on normal console
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
if (!$relative) { if (!$relative) {
if (strstr(getcwd(), 'enterprise/meta') === false) { if (strstr(getcwd(), 'enterprise/meta') === false) {
@ -1657,7 +1656,14 @@ function html_print_image ($src, $return = false, $options = false, $return_src
} }
} }
else { else {
if (!is_readable($src)) { if ($src[0] !== '/') {
$src = '/' . $src;
}
if (is_readable(getcwd() . $src)) {
$src = ui_get_full_url($src);
}
else if (!is_readable($src)) {
$src = ui_get_full_url('../../' . $src); $src = ui_get_full_url('../../' . $src);
} }
} }
@ -1673,7 +1679,6 @@ function html_print_image ($src, $return = false, $options = false, $return_src
} }
} }
// Only return src field of image // Only return src field of image
if ($return_src) { if ($return_src) {
if (!$return) { if (!$return) {