rename merge generateiflink && generate_if_link to generate_port_link, rename generatedevicelink to generate_device_link

git-svn-id: http://www.observium.org/svn/observer/trunk@1624 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-08-02 22:09:52 +00:00
parent a484319bb0
commit 8143340a02
56 changed files with 115 additions and 124 deletions

View File

@@ -4,7 +4,7 @@ if(is_numeric($id) && application_permitted($id))
{
$app = get_application_by_id($id);
$device = device_by_id_cache($app['device_id']);
$title = generatedevicelink($device);
$title = generate_device_link($device);
$title .= $graph_subtype;
$auth = TRUE;
}

View File

@@ -9,7 +9,7 @@ if(is_numeric($id))
{
$device = device_by_id_cache($data['device_id']);
$title = generatedevicelink($device);
$title = generate_device_link($device);
$title .= " :: BGP :: " . htmlentities($data['bgp_peerid']);
$auth = TRUE;
}

View File

@@ -3,7 +3,7 @@
if ($_SESSION['userlevel'] >= "5")
{
$id = mres($_GET['id']);
$title = generatedevicelink($device);
$title = generate_device_link($device);
$auth = TRUE;
}

View File

@@ -3,7 +3,7 @@
if(is_numeric($id) && device_permitted($id))
{
$device = device_by_id_cache($id);
$title = generatedevicelink($device);
$title = generate_device_link($device);
$auth = TRUE;
}

View File

@@ -12,7 +12,7 @@ if(is_numeric($id))
$rrd_filename = $config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd");
$title = generatedevicelink($device);
$title = generate_device_link($device);
$title .= " :: Disk :: " . htmlentities($disk['diskio_descr']);
$auth = TRUE;
}

View File

@@ -9,7 +9,7 @@ if(is_numeric($id))
{
$device = device_by_id_cache($mempool['device_id']);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
$title = generatedevicelink($device);
$title = generate_device_link($device);
$title .= " :: Memory Pool :: " . htmlentities($mempool['mempool_descr']);
$auth = TRUE;
}

View File

@@ -7,8 +7,8 @@
# $device = device_by_id_cache($port['device_id']);
#}
#$title = generatedevicelink($device);
#$title .= " :: Port ".generateiflink($port);
#$title = generate_device_link($device);
#$title .= " :: Port ".generate_port_link($port);
$title = "Multi Port :: ";

View File

@@ -3,8 +3,8 @@
if(is_numeric($id) && port_permitted($id)) {
$port = get_port_by_id($id);
$device = device_by_id_cache($port['device_id']);
$title = generatedevicelink($device);
$title .= " :: Port ".generateiflink($port);
$title = generate_device_link($device);
$title .= " :: Port ".generate_port_link($port);
$auth = TRUE;
}

View File

@@ -7,7 +7,7 @@ if(is_numeric($proc['device_id']) && device_permitted($proc['device_id']))
{
$device = device_by_id_cache($proc['device_id']);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
$title = generatedevicelink($device);
$title = generate_device_link($device);
$title .= " :: Processor :: " . htmlentities($proc['processor_descr']);
$auth = TRUE;
}

View File

@@ -11,7 +11,7 @@ if(is_numeric($id))
### This doesn't quite work for all yet.
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename($sensor['sensor_class']."-" . $sensor['sensor_type'] . "-".$sensor['sensor_index'].".rrd");
$title = generatedevicelink($device);
$title = generate_device_link($device);
$title .= " :: Sensor :: " . htmlentities($sensor['sensor_descr']);
$auth = TRUE;
}

View File

@@ -10,7 +10,7 @@ if(is_numeric($id))
$device = device_by_id_cache($storage['device_id']);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_descr'] . ".rrd");
$title = generatedevicelink($device);
$title = generate_device_link($device);
$title .= " :: Storage :: " . htmlentities($storage['storage_descr']);
$auth = TRUE;
}