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

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

* include/functions_networkmap.php: fixes and changes for the new
	form to set the urls and url images.
	
	* include/functions_html.php: fixed the "html_print_image" for the
	relative urls images (uses in the networkmap).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7064 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-10-10 14:49:03 +00:00
parent 4f95a7b2d5
commit f39fdfcff1
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-10-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixes and changes for the new
form to set the urls and url images.
* include/functions_html.php: fixed the "html_print_image" for the
relative urls images (uses in the networkmap).
2012-10-10 Sergio Martin <sergio.martin@artica.es> 2012-10-10 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql * pandoradb_data.sql

17
pandora_console/include/functions_html.php
View File

@ -1255,7 +1255,7 @@ function html_print_image ($src, $return = false, $options = false, $return_src
// If metaconsole is in use then don't use skins // If metaconsole is in use then don't use skins
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
/* Checks if user's skin is available */ /* Checks if user's skin is available */
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
@ -1267,13 +1267,20 @@ function html_print_image ($src, $return = false, $options = false, $return_src
} }
$src_tmp = $src; if (!$relative) {
$src = ui_get_full_url($src); $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 metaconsole is activated and image doesn't exists try to search on normal console
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
if (false === file_get_contents($src,0,null,0,1)) { if (!$relative) {
$src = ui_get_full_url('../../' . $src_tmp); if (false === @file_get_contents($src,0,null,0,1)) {
$src = ui_get_full_url('../../' . $src_tmp);
}
}
else {
$src = '../../' . $src;
} }
} }

4
pandora_console/include/functions_networkmap.php
View File

@ -501,9 +501,10 @@ function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10, $cu
// Set node icon // Set node icon
$img_node = ui_print_os_icon ($agent['id_os'], false, true, true, true, true, $relative); $img_node = ui_print_os_icon ($agent['id_os'], false, true, true, true, true, $relative);
$img_node = str_replace($config['homeurl'] . '/', '', $img_node); $img_node = str_replace($config['homeurl'] . '/', '', $img_node);
$img_node = str_replace($config['homeurl'], '', $img_node);
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$img_node = '../../' . $img_node; $img_node = str_replace('../../', '', $img_node);
} }
if ($relative) { if ($relative) {
@ -582,7 +583,6 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
$img_src = "images/networkmap/pandora_node.png"; $img_src = "images/networkmap/pandora_node.png";
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$img_src = '../../' . $img_src;
$url_tooltip = '../../ajax.php?' . $url_tooltip = '../../ajax.php?' .
'page=include/ajax/networkmap.ajax&' . 'page=include/ajax/networkmap.ajax&' .