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

Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop' 

Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro

See merge request artica/pandorafms!5736
This commit is contained in:
Matias Didier 2023-04-24 10:44:21 +00:00
parent b8b255f7a5 b39f4a2f04
commit d7ee0ca2da
3 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/class/NetworkMap.class.php
View File

@ -1723,6 +1723,12 @@ class NetworkMap
$item['image_width'] = 0;
$item['image_height'] = 0;
if (empty($node['style']['image']) === false) {
if (strpos($node['style']['image'], '.svg') === false) {
$node['style']['image'] = os_transform_url_icon(
$node['style']['image']
);
}
$item['image_url'] = ui_get_full_url(
$node['style']['image'],
false,

94
pandora_console/include/functions_os.php
View File

@ -232,3 +232,97 @@ function os_get_icon($id_os)
{
return db_get_value('icon_name', 'tconfig_os', 'id_os', (int) $id_os);
}
/**
* Transform the old icon url.
*
* @param string $url_icon Icon url .
*
* @return string
*/
function os_transform_url_icon($url_icon)
{
$return = substr($url_icon, 0, strpos($url_icon, basename($url_icon)));
switch (basename($url_icon)) {
case 'android.png':
$return .= 'android@os.svg';
break;
case 'so_mac.png':
$return .= 'apple@os.svg';
break;
case 'so_cisco.png':
$return .= 'cisco@os.svg';
break;
case 'so_aix.png':
$return .= 'aix@os.svg';
break;
case 'so_win.png':
$return .= 'windows@os.svg';
break;
case 'so_vmware.png':
$return .= 'vmware@os.svg';
break;
case 'so_solaris.png':
$return .= 'solaris@os.svg';
break;
case 'so_linux.png':
$return .= 'linux@os.svg';
break;
case 'so_bsd.png':
$return .= 'freebsd@os.svg';
break;
case 'so_cluster.png':
$return .= 'cluster@os.svg';
break;
case 'so_other.png':
$return .= 'other-OS@os.svg';
break;
case 'so_switch.png':
$return .= 'switch@os.svg';
break;
case 'so_mainframe.png':
$return .= 'mainframe@os.svg';
break;
case 'so_hpux.png':
case 'server_hpux.png':
$return .= 'HP@os.svg';
break;
case 'so_router.png':
case 'router.png':
$return .= 'routers@os.svg';
break;
case 'embedded.png':
$return .= 'embedded@os.svg';
break;
case 'network.png':
$return .= 'network-server@os.svg';
break;
case 'satellite.png':
$return .= 'satellite@os.svg';
break;
default:
$return = $url_icon;
break;
}
return $return;
}

3
pandora_console/include/javascript/functions_pandora_networkmap.js
View File

@ -3887,7 +3887,8 @@ function draw_elements_graph() {
return d.id + networkmap_id;
})
.attr("style", function(d) {
return d.id === 0 ? "filter: invert(0%)" : "";
const extension = d.image_url.split(".").pop();
return extension !== "svg" || d.id === 0 ? "filter: invert(0%)" : "";
})
.attr("id", "image2995")
.classed("dragable_node", true) //own dragable