From d587b33f0a6d9d16ba8edd22f301e708eaac3989 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 17 Aug 2011 16:22:29 +0000 Subject: [PATCH] 2011-08-17 Miguel de Dios * include/functions_html.php, include/functions_networkmap.php, include/functions_ui.php: fixed to use the name of file in tconfig_os instead the id for icon networkmap. * images/networkmap/*: renamed the image files to use the names of tconfig_os. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4760 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 ++++++ .../images/networkmap/{15.png => android.png} | Bin .../networkmap/{14.png => embedded.png} | Bin .../images/networkmap/{11.png => network.png} | Bin .../images/networkmap/{3.png => so_aix.png} | Bin .../images/networkmap/{4.png => so_bsd.png} | Bin .../images/networkmap/{7.png => so_cisco.png} | Bin .../images/networkmap/{5.png => so_hpux.png} | Bin .../images/networkmap/{1.png => so_linux.png} | Bin .../images/networkmap/{8.png => so_mac.png} | Bin .../networkmap/{10.png => so_other.png} | Bin .../networkmap/{2.png => so_solaris.png} | Bin .../images/networkmap/{9.png => so_win.png} | Bin .../images/networkmap/{0.png => unknown.png} | Bin pandora_console/include/functions_html.php | 6 ++-- .../include/functions_networkmap.php | 7 ++--- pandora_console/include/functions_ui.php | 26 ++++++++++++++---- 17 files changed, 35 insertions(+), 13 deletions(-) rename pandora_console/images/networkmap/{15.png => android.png} (100%) rename pandora_console/images/networkmap/{14.png => embedded.png} (100%) rename pandora_console/images/networkmap/{11.png => network.png} (100%) rename pandora_console/images/networkmap/{3.png => so_aix.png} (100%) rename pandora_console/images/networkmap/{4.png => so_bsd.png} (100%) rename pandora_console/images/networkmap/{7.png => so_cisco.png} (100%) rename pandora_console/images/networkmap/{5.png => so_hpux.png} (100%) rename pandora_console/images/networkmap/{1.png => so_linux.png} (100%) rename pandora_console/images/networkmap/{8.png => so_mac.png} (100%) rename pandora_console/images/networkmap/{10.png => so_other.png} (100%) rename pandora_console/images/networkmap/{2.png => so_solaris.png} (100%) rename pandora_console/images/networkmap/{9.png => so_win.png} (100%) rename pandora_console/images/networkmap/{0.png => unknown.png} (100%) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 38e6b1d6fb..a68af67031 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-08-17 Miguel de Dios + + * include/functions_html.php, include/functions_networkmap.php, + include/functions_ui.php: fixed to use the name of file in tconfig_os + instead the id for icon networkmap. + + * images/networkmap/*: renamed the image files to use the names of + tconfig_os. + 2011-08-17 Sancho Lerena * operation/snmpconsole/snmp_view.php: SQL optimization and diff --git a/pandora_console/images/networkmap/15.png b/pandora_console/images/networkmap/android.png similarity index 100% rename from pandora_console/images/networkmap/15.png rename to pandora_console/images/networkmap/android.png diff --git a/pandora_console/images/networkmap/14.png b/pandora_console/images/networkmap/embedded.png similarity index 100% rename from pandora_console/images/networkmap/14.png rename to pandora_console/images/networkmap/embedded.png diff --git a/pandora_console/images/networkmap/11.png b/pandora_console/images/networkmap/network.png similarity index 100% rename from pandora_console/images/networkmap/11.png rename to pandora_console/images/networkmap/network.png diff --git a/pandora_console/images/networkmap/3.png b/pandora_console/images/networkmap/so_aix.png similarity index 100% rename from pandora_console/images/networkmap/3.png rename to pandora_console/images/networkmap/so_aix.png diff --git a/pandora_console/images/networkmap/4.png b/pandora_console/images/networkmap/so_bsd.png similarity index 100% rename from pandora_console/images/networkmap/4.png rename to pandora_console/images/networkmap/so_bsd.png diff --git a/pandora_console/images/networkmap/7.png b/pandora_console/images/networkmap/so_cisco.png similarity index 100% rename from pandora_console/images/networkmap/7.png rename to pandora_console/images/networkmap/so_cisco.png diff --git a/pandora_console/images/networkmap/5.png b/pandora_console/images/networkmap/so_hpux.png similarity index 100% rename from pandora_console/images/networkmap/5.png rename to pandora_console/images/networkmap/so_hpux.png diff --git a/pandora_console/images/networkmap/1.png b/pandora_console/images/networkmap/so_linux.png similarity index 100% rename from pandora_console/images/networkmap/1.png rename to pandora_console/images/networkmap/so_linux.png diff --git a/pandora_console/images/networkmap/8.png b/pandora_console/images/networkmap/so_mac.png similarity index 100% rename from pandora_console/images/networkmap/8.png rename to pandora_console/images/networkmap/so_mac.png diff --git a/pandora_console/images/networkmap/10.png b/pandora_console/images/networkmap/so_other.png similarity index 100% rename from pandora_console/images/networkmap/10.png rename to pandora_console/images/networkmap/so_other.png diff --git a/pandora_console/images/networkmap/2.png b/pandora_console/images/networkmap/so_solaris.png similarity index 100% rename from pandora_console/images/networkmap/2.png rename to pandora_console/images/networkmap/so_solaris.png diff --git a/pandora_console/images/networkmap/9.png b/pandora_console/images/networkmap/so_win.png similarity index 100% rename from pandora_console/images/networkmap/9.png rename to pandora_console/images/networkmap/so_win.png diff --git a/pandora_console/images/networkmap/0.png b/pandora_console/images/networkmap/unknown.png similarity index 100% rename from pandora_console/images/networkmap/0.png rename to pandora_console/images/networkmap/unknown.png diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 3b939de5a6..14daa6ea4b 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -1144,15 +1144,15 @@ function html_print_image ($src, $return = false, $options = false, $return_src if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { $skin_path = enterprise_hook('skins_get_image_path',array($src)); if ($skin_path) - $src = $skin_path; + $src = $skin_path; } // path to image (relative or absolute) $src = ($relative? '' : $config["homeurl"] . '/') . $src; // Only return src field of image - if ($return_src){ - if (!$return){ + if ($return_src) { + if (!$return) { echo io_safe_input($src); return; } diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index b99258e603..cd070ec466 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -433,11 +433,8 @@ function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10) { if ($simple == 0){ // Set node icon - if (file_exists (html_print_image('images/networkmap/'.$agent['id_os'].'.png', true, false, true, true))) { - $img_node = 'images/networkmap/'.$agent['id_os'].'.png'; - } else { - $img_node = 'images/networkmap/0.png'; - } + $img_node = ui_print_os_icon ($agent['id_os'], false, true, true, true, true); + $img_node = str_replace('/pandora_console/', '', $img_node); $node = $agent['id_node'].' [ color="'.$status_color.'", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.40, height=0.40, label=<
' . html_print_image($img_node, true, false, false, true) . '
'.$name.'
>, diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 175935597c..87db21ad84 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -390,18 +390,34 @@ function ui_print_group_icon_path ($id_group, $return = false, $path = "images/g * * @return string HTML with icon of the OS */ -function ui_print_os_icon ($id_os, $name = true, $return = false, $apply_skin = true) { +function ui_print_os_icon ($id_os, $name = true, $return = false, $apply_skin = true, $networkmap = false, $only_src = false) { + $subfolter = 'os_icons'; + if ($networkmap) { + $subfolter = 'networkmap'; + } + $icon = (string) db_get_value ('icon_name', 'tconfig_os', 'id_os', (int) $id_os); $os_name = get_os_name ($id_os); if (empty ($icon)) { - return "-"; + if ($only_src) { + $output = html_print_image("images/".$subfolter."/unknown.png", false, false, true); + } + else { + return "-"; + } } - if ($apply_skin) - $output = html_print_image("images/os_icons/".$icon, true, array("alt" => $os_name, "title" => $os_name)); + if ($apply_skin) { + if ($only_src) { + $output = html_print_image("images/".$subfolter."/".$icon, true, false, true); + } + else { + $output = html_print_image("images/".$subfolter."/".$icon, true, array("alt" => $os_name, "title" => $os_name)); + } + } else //$output = "" . $os_name . ""; - $output = "images/os_icons/" . $icon; + $output = "images/".$subfolter."/" . $icon; if ($name === true) { $output .= ' - '.$os_name;