mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

webui: Updated remaining display options where we do not show sysName if hostname is IP (#6585)

Browse Source 
* webui: Updated remaining display options where we do not show sysName if hostname is IP

* renamed function + simplified
This commit is contained in:
Neil Lathwood
2017-05-05 12:25:58 +01:00
committed by Tony Murray
parent 1135bb9146
commit 34c35f3627
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
includes/common.php
View File

@@ -206,11 +206,9 @@ function get_all_devices()
// FIXME respect $type (server, network, etc) -- needs an array fill in topnav.
if (isset($cache['devices']['hostname'])) {
$devices = array_keys($cache['devices']['hostname']);
$devices = array_keys($cache['devices']);
} else {
foreach (dbFetchRows("SELECT `hostname` FROM `devices`") as $data) {
$devices[] = $data['hostname'];
}
$devices = dbFetchRows("SELECT * FROM `devices`");
}
return $devices;
@@ -1128,21 +1126,24 @@ function inet6_ntop($ip)
}
/**
* Convert IP to use sysName
* If hostname is an ip, use return sysName
* @param array device
* @param string ip address
* @param string hostname
* @return string
**/
function ip_to_sysname($device, $ip)
function format_hostname($device, $hostname = '')
{
global $config;
if ($config['force_ip_to_sysname'] === true) {
if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) == true || filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) == true) {
$ip = $device['sysName'];
if (empty($hostname)) {
$hostname = $device['hostname'];
}
if ($config['force_ip_to_sysname'] === true && !empty($device['sysName'])) {
if (filter_var($hostname, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) == true || filter_var($hostname, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) == true) {
$hostname = $device['sysName'];
}
}
return $ip;
}//end ip_to_sysname
return $hostname;
}//end format_hostname
/**
* Return valid port association modes