diff --git a/html/includes/device-header.inc.php b/html/includes/device-header.inc.php index d08dc376f3..8080c2c131 100644 --- a/html/includes/device-header.inc.php +++ b/html/includes/device-header.inc.php @@ -13,7 +13,7 @@ echo(" $image - " . generatedevicelink($device) . " + " . generate_device_link($device) . "
" . $device['location'] . " "); diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 5f47a11487..23486106b6 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -18,16 +18,7 @@ function rewrite_entity_descr ($descr) { return $descr; } -function generateiflink($interface, $text=0, $type = NULL) -{ - - ## Exists only to support older version of this function (i suck) - - if($type) { $interface['type'] = $type; } - return generate_if_link($interface, $text); -} - -function generatedevicelink($device, $text=0, $start=0, $end=0) +function generate_device_link($device, $text=0, $start=0, $end=0) { global $twoday; global $day; global $now; global $config; if (!$start) { $start = $day; } @@ -242,13 +233,13 @@ function print_percentage_bar ($width, $height, $percent, $left_text, $left_colo return $output; } -function generate_if_link($args, $text = NULL) +function generate_port_link($args, $text = NULL, $type = NULL) { global $twoday; global $now; global $config; global $day; global $month; $args = ifNameDescr($args); if(!$text) { $text = fixIfName($args['label']); } + if($type) { $args['graph_type'] = $type; } if(!$args['graph_type']) { $args['graph_type'] = 'port_bits'; } - $class = ifclass($args['ifOperStatus'], $args['ifAdminStatus']); if(!isset($args['hostname'])) { $args = array_merge($args, device_by_id_cache($args['device_id'])); } @@ -286,7 +277,7 @@ function generate_port_thumbnail($args) { if(!$args['bg']) { $args['bg'] = "FFFFF"; } $args['content'] = ""; - $output = generate_if_link($args, $args['content']); + $output = generate_port_link($args, $args['content']); echo $output; } diff --git a/html/includes/graphs/application/auth.inc.php b/html/includes/graphs/application/auth.inc.php index c8a5701dfb..80256e0a58 100644 --- a/html/includes/graphs/application/auth.inc.php +++ b/html/includes/graphs/application/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/bgp/auth.inc.php b/html/includes/graphs/bgp/auth.inc.php index 97ff118e15..204df1d81d 100644 --- a/html/includes/graphs/bgp/auth.inc.php +++ b/html/includes/graphs/bgp/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/customer/auth.inc.php b/html/includes/graphs/customer/auth.inc.php index 54c76e8367..e740d68a7b 100755 --- a/html/includes/graphs/customer/auth.inc.php +++ b/html/includes/graphs/customer/auth.inc.php @@ -3,7 +3,7 @@ if ($_SESSION['userlevel'] >= "5") { $id = mres($_GET['id']); - $title = generatedevicelink($device); + $title = generate_device_link($device); $auth = TRUE; } diff --git a/html/includes/graphs/device/auth.inc.php b/html/includes/graphs/device/auth.inc.php index 7487d44a44..acd186fefe 100644 --- a/html/includes/graphs/device/auth.inc.php +++ b/html/includes/graphs/device/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/diskio/auth.inc.php b/html/includes/graphs/diskio/auth.inc.php index 89bd5d7f82..2b76cac5b4 100644 --- a/html/includes/graphs/diskio/auth.inc.php +++ b/html/includes/graphs/diskio/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/mempool/auth.inc.php b/html/includes/graphs/mempool/auth.inc.php index 7b19754183..b549cef04e 100755 --- a/html/includes/graphs/mempool/auth.inc.php +++ b/html/includes/graphs/mempool/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/multiport/auth.inc.php b/html/includes/graphs/multiport/auth.inc.php index 8d62f590a7..f6881336bd 100644 --- a/html/includes/graphs/multiport/auth.inc.php +++ b/html/includes/graphs/multiport/auth.inc.php @@ -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 :: "; diff --git a/html/includes/graphs/port/auth.inc.php b/html/includes/graphs/port/auth.inc.php index 002feb7d0e..a62c579f69 100644 --- a/html/includes/graphs/port/auth.inc.php +++ b/html/includes/graphs/port/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/processor/auth.inc.php b/html/includes/graphs/processor/auth.inc.php index 98363488be..ae06324027 100755 --- a/html/includes/graphs/processor/auth.inc.php +++ b/html/includes/graphs/processor/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/sensor/auth.inc.php b/html/includes/graphs/sensor/auth.inc.php index 1fd0d832b6..c6453f5186 100644 --- a/html/includes/graphs/sensor/auth.inc.php +++ b/html/includes/graphs/sensor/auth.inc.php @@ -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; } diff --git a/html/includes/graphs/storage/auth.inc.php b/html/includes/graphs/storage/auth.inc.php index 0343201a41..769dd03085 100755 --- a/html/includes/graphs/storage/auth.inc.php +++ b/html/includes/graphs/storage/auth.inc.php @@ -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; } diff --git a/html/includes/hostbox.inc b/html/includes/hostbox.inc index 9a095df17f..97406f2cfa 100644 --- a/html/includes/hostbox.inc +++ b/html/includes/hostbox.inc @@ -17,7 +17,7 @@ echo(' ' . $image . ' - ' . generatedevicelink($device) . ' + ' . generate_device_link($device) . '
' . $device['sysName'] . ' ' . $device['os_text'] . '
' . $device['version'] . ' diff --git a/html/includes/print-event-short.inc b/html/includes/print-event-short.inc index f0f27fba4f..78250a2cd2 100644 --- a/html/includes/print-event-short.inc +++ b/html/includes/print-event-short.inc @@ -17,7 +17,7 @@ if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; } "); if($entry['type'] == "interface") { - $entry['link'] = "".generateiflink(getifbyid($entry['reference'])).""; + $entry['link'] = "".generate_port_link(getifbyid($entry['reference'])).""; } echo($entry['link'] ." ". htmlspecialchars($entry['message']) diff --git a/html/includes/print-event.inc b/html/includes/print-event.inc index 6b2c9f287d..cca256adb2 100644 --- a/html/includes/print-event.inc +++ b/html/includes/print-event.inc @@ -20,12 +20,12 @@ if(isset($bg) && $bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$li $dev['device_id'] = $entry['host']; $dev['hostname'] = $hostname; echo(" - " . generatedevicelink($dev, shorthost($dev['hostname'])) . " + " . generate_device_link($dev, shorthost($dev['hostname'])) . " "); } if($entry['type'] == "interface") { - $entry['link'] = "".generateiflink(getifbyid($entry['reference'])).""; + $entry['link'] = "".generate_port_link(getifbyid($entry['reference'])).""; } else { $entry['link'] = "System"; } diff --git a/html/includes/print-interface-adsl.inc.php b/html/includes/print-interface-adsl.inc.php index d215f10162..918cfc12ee 100644 --- a/html/includes/print-interface-adsl.inc.php +++ b/html/includes/print-interface-adsl.inc.php @@ -17,14 +17,14 @@ if($interface['ifInErrors_delta'] > 0 || $interface['ifOutErrors_delta'] > 0) { - $error_img = generateiflink($interface,"Interface Errors","port_errors"); + $error_img = generate_port_link($interface,"Interface Errors","port_errors"); } else { $error_img = ""; } echo(" "); echo(" - " . generateiflink($interface, $interface['ifIndex'] . ". ".$interface['label']) . " + " . generate_port_link($interface, $interface['ifIndex'] . ". ".$interface['label']) . "
".$interface['ifAlias'].""); @@ -53,7 +53,7 @@ echo(formatRates($interface['ifInOctets_rate'] * 8)." ".formatRates($interface['ifOutOctets_rate'] * 8)); echo("
"); $interface['graph_type'] = "port_bits"; - echo(generateiflink($interface, "", $interface['graph_type'])); @@ -61,35 +61,35 @@ echo("".formatRates($interface['adslAturChanCurrTxRate']) . "/". formatRates($interface['adslAtucChanCurrTxRate'])); echo("
"); $interface['graph_type'] = "port_adsl_speed"; - echo(generateiflink($interface, "", $interface['graph_type'])); echo(""); echo("".formatRates($interface['adslAturCurrAttainableRate']) . "/". formatRates($interface['adslAtucCurrAttainableRate'])); echo("
"); $interface['graph_type'] = "port_adsl_attainable"; - echo(generateiflink($interface, "", $interface['graph_type'])); echo(""); echo("".$interface['adslAturCurrAtn'] . "dB/". $interface['adslAtucCurrAtn'] . "dB"); echo("
"); $interface['graph_type'] = "port_adsl_attenuation"; - echo(generateiflink($interface, "", $interface['graph_type'])); echo(""); echo("".$interface['adslAturCurrSnrMgn'] . "dB/". $interface['adslAtucCurrSnrMgn'] . "dB"); echo("
"); $interface['graph_type'] = "port_adsl_snr"; - echo(generateiflink($interface, "", $interface['graph_type'])); echo(""); echo("".$interface['adslAturCurrOutputPwr'] . "dBm/". $interface['adslAtucCurrOutputPwr'] . "dBm"); echo("
"); $interface['graph_type'] = "port_adsl_power"; - echo(generateiflink($interface, "", $interface['graph_type'])); diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php index b48e1251c1..636b10d892 100644 --- a/html/includes/print-interface.inc.php +++ b/html/includes/print-interface.inc.php @@ -20,7 +20,7 @@ if($interface['ifInErrors_delta'] > 0 || $interface['ifOutErrors_delta'] > 0) { - $error_img = generateiflink($interface,"Interface Errors","port_errors"); + $error_img = generate_port_link($interface, "Interface Errors", "port_errors"); } else { $error_img = ""; } if(mysql_result(mysql_query("SELECT count(*) FROM mac_accounting WHERE interface_id = '".$interface['interface_id']."'"),0)){ @@ -31,7 +31,7 @@ "); echo(" - " . generateiflink($interface, $interface['ifIndex'] . ". ".$interface['label']) . " $error_img $mac + " . generate_port_link($interface, $interface['ifIndex'] . ". ".$interface['label']) . " $error_img $mac
".$interface['ifAlias'].""); @@ -57,11 +57,11 @@ if($port_details) { $interface['graph_type'] = "port_bits"; - echo(generateiflink($interface, "", $interface['graph_type'])); + echo(generate_port_link($interface, "")); $interface['graph_type'] = "port_upkts"; - echo(generateiflink($interface, "",$interface['graph_type'])); + echo(generate_port_link($interface, "")); $interface['graph_type'] = "port_errors"; - echo(generateiflink($interface, "",$interface['graph_type'])); + echo(generate_port_link($interface, "")); } echo(""); @@ -121,7 +121,7 @@ echo(""); if ( strpos($interface['label'], "oopback") === false && !$graph_type) { $link_query = mysql_query("select * from links AS L, ports AS I, devices AS D WHERE L.local_interface_id = '$if_id' AND L.remote_interface_id = I.interface_id AND I.device_id = D.device_id"); while($link = mysql_fetch_array($link_query)) { -# echo("Directly Connected " . generateiflink($link, makeshortif($link['label'])) . " on " . generatedevicelink($link, shorthost($link['hostname'])) . "
"); +# echo("Directly Connected " . generate_port_link($link, makeshortif($link['label'])) . " on " . generate_device_link($link, shorthost($link['hostname'])) . "
"); # $br = "
"; $int_links[$link['interface_id']] = $link['interface_id']; $int_links_phys[$link['interface_id']] = 1; @@ -181,7 +181,7 @@ echo(""); if($int_links_phys[$int_link]) { echo(" "); } else { echo(" "); } - echo("" . generateiflink($link_if, makeshortif($link_if['label'])) . " on " . generatedevicelink($link_if, shorthost($link_if['hostname'])) ); + echo("" . generate_port_link($link_if, makeshortif($link_if['label'])) . " on " . generate_device_link($link_if, shorthost($link_if['hostname'])) ); if($int_links_v6[$int_link]) { echo(" v6"); } if($int_links_v4[$int_link]) { echo(" v4"); } @@ -200,19 +200,19 @@ echo(""); P.cpwVcID = '".$pseudowire['cpwVcID']."' AND P.interface_id = I.interface_id")); $pw_peer_int = ifNameDescr($pw_peer_int); - echo("$br " . generateiflink($pw_peer_int, makeshortif($pw_peer_int['label'])) ." on ". generatedevicelink($pw_peer_dev, shorthost($pw_peer_dev['hostname'])) . ""); + echo("$br " . generate_port_link($pw_peer_int, makeshortif($pw_peer_int['label'])) ." on ". generate_device_link($pw_peer_dev, shorthost($pw_peer_dev['hostname'])) . ""); $br = "
"; } $members = mysql_query("SELECT * FROM `ports` WHERE `pagpGroupIfIndex` = '".$interface['ifIndex']."' and `device_id` = '".$device['device_id']."'"); while($member = mysql_fetch_array($members)) { - echo("$br " . generateiflink($member) . " (PAgP)"); + echo("$br " . generate_port_link($member) . " (PAgP)"); $br = "
"; } if($interface['pagpGroupIfIndex'] && $interface['pagpGroupIfIndex'] != $interface['ifIndex']) { $parent = mysql_fetch_array(mysql_query("SELECT * FROM `ports` WHERE `ifIndex` = '".$interface['pagpGroupIfIndex']."' and `device_id` = '".$device['device_id']."'")); - echo("$br " . generateiflink($parent) . " (PAgP)"); + echo("$br " . generate_port_link($parent) . " (PAgP)"); $br = "
"; } diff --git a/html/includes/print-service.inc b/html/includes/print-service.inc index b685c793a0..f25db907d2 100644 --- a/html/includes/print-service.inc +++ b/html/includes/print-service.inc @@ -36,7 +36,7 @@ if($device_id) { if(!$samehost) { $device['device_id'] = $device_id; $device['hostname'] = $device_hostname; - echo("" . generatedevicelink($device) . ""); + echo("" . generate_device_link($device) . ""); } else { echo(""); } diff --git a/html/includes/print-syslog.inc b/html/includes/print-syslog.inc index d72a7d7c73..7a05933c0f 100644 --- a/html/includes/print-syslog.inc +++ b/html/includes/print-syslog.inc @@ -16,7 +16,7 @@ if(!is_integer($syslog_iter/2)) { $bg_colour = $list_colour_a; } else { $bg_colo $entry['hostname'] = shorthost($entry['hostname'], 20); if($_GET['page'] != "device") { - echo("".generatedevicelink($entry).""); + echo("".generate_device_link($entry).""); } echo(" diff --git a/html/includes/print-vlan.inc b/html/includes/print-vlan.inc index 36761768fd..fc78ffe860 100644 --- a/html/includes/print-vlan.inc +++ b/html/includes/print-vlan.inc @@ -29,7 +29,7 @@ while($port = mysql_fetch_array($ports_query)) { } else { - echo($vlan['port_sep'] . generateiflink($port, makeshortif($port['ifDescr']))); + echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['ifDescr']))); $vlan['port_sep'] = ", "; } } diff --git a/html/includes/print-vrf.inc b/html/includes/print-vrf.inc index 86defec0e4..7f8352ab6a 100644 --- a/html/includes/print-vrf.inc +++ b/html/includes/print-vrf.inc @@ -26,7 +26,7 @@ while($port = mysql_fetch_array($ports_query)) {
".truncate(short_port_descr($port['ifAlias']), 22, '')."
"); } else { - echo($vrf['port_sep'] . generateiflink($port, makeshortif($port['ifDescr']))); + echo($vrf['port_sep'] . generate_port_link($port, makeshortif($port['ifDescr']))); $vrf['port_sep'] = ", "; } } diff --git a/html/pages/bgp.inc.php b/html/pages/bgp.inc.php index 21470902a7..8ccca1ad04 100644 --- a/html/pages/bgp.inc.php +++ b/html/pages/bgp.inc.php @@ -37,11 +37,11 @@ else $peerhost = mysql_fetch_array(mysql_query("SELECT * FROM ipaddr AS A, ports AS I, devices AS D WHERE A.addr = '".$peer['bgpPeerIdentifier']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id")); - if($peerhost) { $peername = generatedevicelink($peerhost, shorthost($peerhost['hostname'])); } else { unset($peername); } + if($peerhost) { $peername = generate_device_link($peerhost, shorthost($peerhost['hostname'])); } else { unset($peername); } echo(" - " . $peer['bgpLocalAddr'] . "
".generatedevicelink($peer, shorthost($peer['hostname']))." + " . $peer['bgpLocalAddr'] . "
".generate_device_link($peer, shorthost($peer['hostname']))." -> " . $peer['bgpPeerIdentifier'] . "
".$peername." $peer_type diff --git a/html/pages/bill.inc.php b/html/pages/bill.inc.php index 76434309de..5732af8036 100644 --- a/html/pages/bill.inc.php +++ b/html/pages/bill.inc.php @@ -88,7 +88,7 @@ if(bill_permitted($bill_id)) { while ($port = mysql_fetch_array($ports)) { - echo(generateiflink($port) . " on " . generatedevicelink($port) . "
"); + echo(generate_port_link($port) . " on " . generate_device_link($port) . "
"); } diff --git a/html/pages/bill/edit.php b/html/pages/bill/edit.php index 210e998082..d4f5a5ac6c 100644 --- a/html/pages/bill/edit.php +++ b/html/pages/bill/edit.php @@ -25,7 +25,7 @@ if(mysql_affected_rows()) if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; } echo(""); echo(""); - echo(generatedevicelink($port) . " - " . generateiflink($port)); + echo(generate_device_link($port) . " - " . generate_port_link($port)); if($port['ifAlias']) { echo(" - " . $port['ifAlias']); } echo(""); echo("
diff --git a/html/pages/customers.inc.php b/html/pages/customers.inc.php index 7ba965a16b..2db8bd07e3 100644 --- a/html/pages/customers.inc.php +++ b/html/pages/customers.inc.php @@ -51,8 +51,8 @@ while($customer = mysql_fetch_array($cust_query)) { ".$customer_name." - " . generatedevicelink($device) . " - " . generateiflink($port, makeshortif($port['ifDescr'])) . " + " . generate_device_link($device) . " + " . generate_port_link($port, makeshortif($port['ifDescr'])) . " ".$port['port_descr_speed']." ".$port['port_descr_circuit']." ".$port['port_descr_notes']." diff --git a/html/pages/device/arp.inc.php b/html/pages/device/arp.inc.php index a6125e3ac2..7e5116ea55 100644 --- a/html/pages/device/arp.inc.php +++ b/html/pages/device/arp.inc.php @@ -10,15 +10,15 @@ while($arp = mysql_fetch_array($query)) { if(!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; } $arp_host = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = '".$arp['ipv4_address']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id")); - if($arp_host) { $arp_name = generatedevicelink($arp_host); } else { unset($arp_name); } - if($arp_host) { $arp_if = generateiflink($arp_host); } else { unset($arp_if); } + if($arp_host) { $arp_name = generate_device_link($arp_host); } else { unset($arp_name); } + if($arp_host) { $arp_if = generate_port_link($arp_host); } else { unset($arp_if); } if($arp_host['device_id'] == $device['device_id']) { $arp_name = "Localhost"; } if($arp_host['interface_id'] == $arp['interface_id']) { $arp_if = "Local Port"; } echo(" - ".generateiflink(array_merge($arp, $device))." + ".generate_port_link(array_merge($arp, $device))." ".formatmac($arp['mac_address'])." ".$arp['ipv4_address']." $arp_name diff --git a/html/pages/device/bgp.inc.php b/html/pages/device/bgp.inc.php index 0c1041cf8b..a503984e41 100644 --- a/html/pages/device/bgp.inc.php +++ b/html/pages/device/bgp.inc.php @@ -49,7 +49,7 @@ print_optionbar_end(); } else { unset($peerhost); } if($peerhost) { - $peername = generatedevicelink($peerhost); + $peername = generate_device_link($peerhost); } else { $peername = gethostbyaddr($peer['bgpPeerIdentifier']); if($peername == $peer['bgpPeerIdentifier']) { diff --git a/html/pages/device/entphysical.inc.php b/html/pages/device/entphysical.inc.php index 23b9ec5717..c2d709423c 100644 --- a/html/pages/device/entphysical.inc.php +++ b/html/pages/device/entphysical.inc.php @@ -24,7 +24,7 @@ function printEntPhysical($ent, $level, $class) { if($ent['ifIndex']) { $interface = mysql_fetch_array(mysql_query("SELECT * FROM `ports` WHERE ifIndex = '".$ent['ifIndex']."' AND device_id = '".$device['device_id']."'")); - $ent['entPhysicalName'] = generateiflink($interface); + $ent['entPhysicalName'] = generate_port_link($interface); } if ($ent['entPhysicalModelName'] && $ent['entPhysicalName']) { diff --git a/html/pages/device/hrdevice.inc.php b/html/pages/device/hrdevice.inc.php index 23f21fb151..a7b44187f9 100644 --- a/html/pages/device/hrdevice.inc.php +++ b/html/pages/device/hrdevice.inc.php @@ -31,7 +31,7 @@ if($hrdevice['hrDeviceType'] == "hrDeviceProcessor") { $int = str_replace("network interface ", "", $hrdevice['hrDeviceDescr']); $interface = mysql_fetch_array(mysql_query("SELECT * FROM ports WHERE device_id = '".$device['device_id']."' AND ifDescr = '".$int."'")); if($interface['ifIndex']) { - echo("".generateiflink($interface).""); + echo("".generate_port_link($interface).""); $graph_array['height'] = "20"; $graph_array['width'] = "100"; diff --git a/html/pages/device/overview/ports.inc.php b/html/pages/device/overview/ports.inc.php index f6be41c968..8b9628960d 100644 --- a/html/pages/device/overview/ports.inc.php +++ b/html/pages/device/overview/ports.inc.php @@ -53,7 +53,7 @@ if($ports['total']) { while($data = mysql_fetch_array($query)) { $data = ifNameDescr($data); $data = array_merge($data, $device); - echo("$ifsep" . generate_if_link($data, makeshortif(strtolower($data['label'])))); + echo("$ifsep" . generate_port_link($data, makeshortif(strtolower($data['label'])))); $ifsep = ", "; } unset($ifsep); diff --git a/html/pages/device/port/arp.inc.php b/html/pages/device/port/arp.inc.php index c3c7dfbc46..0f21664e50 100644 --- a/html/pages/device/port/arp.inc.php +++ b/html/pages/device/port/arp.inc.php @@ -10,8 +10,8 @@ while($arp = mysql_fetch_array($query)) { if(!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; } $arp_host = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = '".$arp['ipv4_address']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id")); - if($arp_host) { $arp_name = generatedevicelink($arp_host); } else { unset($arp_name); } - if($arp_host) { $arp_if = generateiflink($arp_host); } else { unset($arp_if); } + if($arp_host) { $arp_name = generate_device_link($arp_host); } else { unset($arp_name); } + if($arp_host) { $arp_if = generate_port_link($arp_host); } else { unset($arp_if); } if($arp_host['device_id'] == $device['device_id']) { $arp_name = "Localhost"; } if($arp_host['interface_id'] == $arp['interface_id']) { $arp_if = "Local Port"; } diff --git a/html/pages/device/port/macaccounting.inc.php b/html/pages/device/port/macaccounting.inc.php index b6c0bfab15..1f03c00959 100644 --- a/html/pages/device/port/macaccounting.inc.php +++ b/html/pages/device/port/macaccounting.inc.php @@ -126,7 +126,7 @@ $name = gethostbyaddr($addy['ipv4_address']); $arp_host = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = '".$addy['ipv4_address']."' AND I.interface_id = A.interface_id AND D.device_id = I.device_id")); - if($arp_host) { $arp_name = generatedevicelink($arp_host); $arp_name .= " ".generateiflink($arp_host); } else { unset($arp_if); } + if($arp_host) { $arp_name = generate_device_link($arp_host); $arp_name .= " ".generate_port_link($arp_host); } else { unset($arp_if); } if($name == $addy['ipv4_address']) { unset ($name); } if(mysql_result(mysql_query("SELECT count(*) FROM bgpPeers WHERE device_id = '".$acc['device_id']."' AND bgpPeerIdentifier = '".$addy['ipv4_address']."'"),0)) { diff --git a/html/pages/device/port/pagp.inc.php b/html/pages/device/port/pagp.inc.php index 433de9d919..57b88c8190 100644 --- a/html/pages/device/port/pagp.inc.php +++ b/html/pages/device/port/pagp.inc.php @@ -29,7 +29,7 @@ $members = mysql_query("SELECT * FROM `ports` WHERE `pagpGroupIfIndex` = '".$interface['ifIndex']."' and `device_id` = '".$device['device_id']."'"); while($member = mysql_fetch_array($members)) { - echo("$br " . generateiflink($member) . " (PAgP)"); + echo("$br " . generate_port_link($member) . " (PAgP)"); $br = "
"; } diff --git a/html/pages/front/default.php b/html/pages/front/default.php index 391fe719a6..ef07387e37 100644 --- a/html/pages/front/default.php +++ b/html/pages/front/default.php @@ -29,7 +29,7 @@ $sql = mysql_query("SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.dev } while($device = mysql_fetch_array($sql)){ - generate_front_box("alert", "
".generatedevicelink($device, shorthost($device['hostname']))."
+ generate_front_box("alert", "
".generate_device_link($device, shorthost($device['hostname']))."
Device Down
".truncate($device['location'], 20)."
"); @@ -48,10 +48,10 @@ $sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D, devices_perms AS while($interface = mysql_fetch_array($sql)){ if(!$interface['deleted']){ $interface = ifNameDescr($interface); - generate_front_box("warn", "
".generatedevicelink($interface, shorthost($interface['hostname']))."
+ generate_front_box("warn", "
".generate_device_link($interface, shorthost($interface['hostname']))."
Port Down
- ".generateiflink($interface, truncate(makeshortif($interface['label']),13,''))."
+ ".generate_port_link($interface, truncate(makeshortif($interface['label']),13,''))."
" . ($interface['ifAlias'] ? ''.truncate($interface['ifAlias'], 20, '').'' : '') . "
"); @@ -61,7 +61,7 @@ while($interface = mysql_fetch_array($sql)){ /* FIXME service permissions? seem nonexisting now.. */ $sql = mysql_query("SELECT * FROM `services` AS S, `devices` AS D WHERE S.device_id = D.device_id AND service_status = 'down' AND D.ignore = '0' AND S.service_ignore = '0'"); while($service = mysql_fetch_array($sql)){ - generate_front_box("alert", "
".generatedevicelink($service, shorthost($service['hostname']))."
+ generate_front_box("alert", "
".generate_device_link($service, shorthost($service['hostname']))."
Service Down ".$service['service_type']."
".truncate($interface['ifAlias'], 20)." @@ -78,7 +78,7 @@ if (isset($config['enable_bgp']) && $config['enable_bgp']) } while($peer = mysql_fetch_array($sql)) { - generate_front_box("alert", "
".generatedevicelink($peer, shorthost($peer['hostname']))."
+ generate_front_box("alert", "
".generate_device_link($peer, shorthost($peer['hostname']))."
BGP Down ".$peer['bgpPeerIdentifier']."
AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)." @@ -92,7 +92,7 @@ $sql = mysql_query("SELECT * FROM `devices` AS D WHERE D.status = '1' AND D.upti $sql = mysql_query("SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' AND D.status = '1' AND D.uptime < '84600' AND D.ignore = 0"); } while($device = mysql_fetch_array($sql)){ - generate_front_box("info", "
".generatedevicelink($device, shorthost($device['hostname']))."
+ generate_front_box("info", "
".generate_device_link($device, shorthost($device['hostname']))."
Device
Rebooted
".formatUptime($device['uptime'], 'short')."
"); diff --git a/html/pages/front/demo.php b/html/pages/front/demo.php index 8702c791f9..087a5e1178 100644 --- a/html/pages/front/demo.php +++ b/html/pages/front/demo.php @@ -26,7 +26,7 @@ $sql = mysql_query("SELECT * FROM `devices` WHERE `status` = '0' AND `ignore` = while($device = mysql_fetch_array($sql)){ if(device_permitted($device['device_id'])) { echo("
- ".generatedevicelink($device, shorthost($device['hostname']))."
+ ".generate_device_link($device, shorthost($device['hostname']))."
Device Down
".truncate($device['location'], 35)."
"); @@ -39,9 +39,9 @@ $sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id while($interface = mysql_fetch_array($sql)){ if(port_permitted($interface['interface_id'])) { echo("
- ".generatedevicelink($interface, shorthost($interface['hostname']))."
+ ".generate_device_link($interface, shorthost($interface['hostname']))."
Port Down
- ".generateiflink($interface, makeshortif($interface['ifDescr']))."
+ ".generate_port_link($interface, makeshortif($interface['ifDescr']))."
".truncate($interface['ifAlias'], 15)."
"); } @@ -53,7 +53,7 @@ $sql = mysql_query("SELECT * FROM `services` AS S, `devices` AS D WHERE S.device while($service = mysql_fetch_array($sql)){ if(device_permitted($service['device_id'])) { echo("
- ".generatedevicelink($service, shorthost($service['hostname']))."
+ ".generate_device_link($service, shorthost($service['hostname']))."
Service Down
".$service['service_type']."
".truncate($interface['ifAlias'], 15)." @@ -65,7 +65,7 @@ $sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerAdm while($peer = mysql_fetch_array($sql)){ if(device_permitted($peer['device_id'])) { echo("
- ".generatedevicelink($peer, shorthost($peer['hostname']))."
+ ".generate_device_link($peer, shorthost($peer['hostname']))."
BGP Down
".$peer['bgpPeerIdentifier']."
AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)." @@ -77,7 +77,7 @@ $sql = mysql_query("SELECT * FROM devices_attribs AS A, `devices` AS D WHERE A.a while($device = mysql_fetch_array($sql)){ if(device_permitted($device['device_id']) && $device['attrib_value'] < "84600" && $device['attrib_type'] == "uptime" ) { echo("
- ".generatedevicelink($device, shorthost($device['hostname']))."
+ ".generate_device_link($device, shorthost($device['hostname']))."
Device
Rebooted
".formatUptime($device['attrib_value'])."
"); diff --git a/html/pages/front/example2.php b/html/pages/front/example2.php index 239b6c4534..306516d395 100644 --- a/html/pages/front/example2.php +++ b/html/pages/front/example2.php @@ -29,7 +29,7 @@ $sql = mysql_query("SELECT * FROM `devices` WHERE `status` = '0' AND `ignore` = while($device = mysql_fetch_array($sql)){ echo("
-
".generatedevicelink($device, shorthost($device['hostname']))."
+
".generate_device_link($device, shorthost($device['hostname']))."
Device Down ".truncate($device['location'], 20)."
"); @@ -40,9 +40,9 @@ $sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id while($interface = mysql_fetch_array($sql)){ echo("
-
".generatedevicelink($interface, shorthost($interface['hostname']))."
+
".generate_device_link($interface, shorthost($interface['hostname']))."
Port Down - ".generateiflink($interface, makeshortif($interface['ifDescr']))."
+ ".generate_port_link($interface, makeshortif($interface['ifDescr']))."
".truncate($interface['ifAlias'], 20)."
"); @@ -52,7 +52,7 @@ $sql = mysql_query("SELECT * FROM `services` AS S, `devices` AS D WHERE S.device while($service = mysql_fetch_array($sql)){ echo("
-
".generatedevicelink($service, shorthost($service['hostname']))."
+
".generate_device_link($service, shorthost($service['hostname']))."
Service Down ".$service['service_type']."
".truncate($interface['ifAlias'], 20)." @@ -64,7 +64,7 @@ $sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerSta while($peer = mysql_fetch_array($sql)){ echo("
-
".generatedevicelink($peer, shorthost($peer['hostname']))."
+
".generate_device_link($peer, shorthost($peer['hostname']))."
BGP Down ".$peer['bgpPeerIdentifier']."
AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)." @@ -76,7 +76,7 @@ $sql = mysql_query("SELECT * FROM `devices` AS D, devices_attribs AS A WHERE A.d while($device = mysql_fetch_array($sql)){ echo("
-
".generatedevicelink($device, shorthost($device['hostname']))."
+
".generate_device_link($device, shorthost($device['hostname']))."
Device
Rebooted
".formatUptime($device['attrib_value'])."
"); diff --git a/html/pages/front/jt.php b/html/pages/front/jt.php index b07f19a4a3..297d9420e7 100644 --- a/html/pages/front/jt.php +++ b/html/pages/front/jt.php @@ -26,7 +26,7 @@ $sql = mysql_query("SELECT * FROM `devices` WHERE `status` = '0' AND `ignore` = while($device = mysql_fetch_array($sql)){ if(device_permitted($device['device_id'])) { echo("
- ".generatedevicelink($device, shorthost($device['hostname']))."
+ ".generate_device_link($device, shorthost($device['hostname']))."
Device Down
".truncate($device['location'], 35)."
"); @@ -39,9 +39,9 @@ $sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id while($interface = mysql_fetch_array($sql)){ if(port_permitted($interface['interface_id'])) { echo("
- ".generatedevicelink($interface, shorthost($interface['hostname']))."
+ ".generate_device_link($interface, shorthost($interface['hostname']))."
Port Down
- ".generateiflink($interface, makeshortif($interface['ifDescr']))."
+ ".generate_port_link($interface, makeshortif($interface['ifDescr']))."
".truncate($interface['ifAlias'], 15)."
"); } @@ -53,7 +53,7 @@ $sql = mysql_query("SELECT * FROM `services` AS S, `devices` AS D WHERE S.device while($service = mysql_fetch_array($sql)){ if(device_permitted($service['device_id'])) { echo("
- ".generatedevicelink($service, shorthost($service['hostname']))."
+ ".generate_device_link($service, shorthost($service['hostname']))."
Service Down
".$service['service_type']."
".truncate($interface['ifAlias'], 15)." @@ -65,7 +65,7 @@ $sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerAdm while($peer = mysql_fetch_array($sql)){ if(device_permitted($peer['device_id'])) { echo("
- ".generatedevicelink($peer, shorthost($peer['hostname']))."
+ ".generate_device_link($peer, shorthost($peer['hostname']))."
BGP Down
".$peer['bgpPeerIdentifier']."
AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)." @@ -77,7 +77,7 @@ $sql = mysql_query("SELECT * FROM devices_attribs AS A, `devices` AS D WHERE A.a while($device = mysql_fetch_array($sql)){ if(device_permitted($device['device_id']) && $device['attrib_value'] < "84600" && $device['attrib_type'] == "uptime" ) { echo("
- ".generatedevicelink($device, shorthost($device['hostname']))."
+ ".generate_device_link($device, shorthost($device['hostname']))."
Device
Rebooted
".formatUptime($device['attrib_value'])."
"); diff --git a/html/pages/health/current.inc.php b/html/pages/health/current.inc.php index 368f082953..7140f31f07 100644 --- a/html/pages/health/current.inc.php +++ b/html/pages/health/current.inc.php @@ -45,7 +45,7 @@ while($current = mysql_fetch_array($query)) $current_minigraph .= "
', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >"; echo(" - " . generatedevicelink($current) . " + " . generate_device_link($current) . " $current_popup $current_minigraph $alert diff --git a/html/pages/health/fanspeeds.inc.php b/html/pages/health/fanspeeds.inc.php index df670d8635..2ac3f57ba6 100644 --- a/html/pages/health/fanspeeds.inc.php +++ b/html/pages/health/fanspeeds.inc.php @@ -44,7 +44,7 @@ while($fan = mysql_fetch_array($query)) $fan_minigraph .= "
', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >"; echo(" - " . generatedevicelink($fan) . " + " . generate_device_link($fan) . " $fan_popup $fan_minigraph $alert diff --git a/html/pages/health/frequencies.inc.php b/html/pages/health/frequencies.inc.php index 1a35129faf..bb89b13304 100644 --- a/html/pages/health/frequencies.inc.php +++ b/html/pages/health/frequencies.inc.php @@ -44,7 +44,7 @@ while($freq = mysql_fetch_array($query)) $freq_minigraph .= "
', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >"; echo(" - " . generatedevicelink($freq) . " + " . generate_device_link($freq) . " $freq_popup $freq_minigraph $alert diff --git a/html/pages/health/humidity.inc.php b/html/pages/health/humidity.inc.php index 7f377266aa..b9f36515d4 100644 --- a/html/pages/health/humidity.inc.php +++ b/html/pages/health/humidity.inc.php @@ -49,7 +49,7 @@ while($humidity = mysql_fetch_array($query)) $humidity_minigraph .= "
', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >"; echo(" - " . generatedevicelink($humidity) . " + " . generate_device_link($humidity) . " $humidity_popup $humidity_minigraph $alert diff --git a/html/pages/health/memory.inc.php b/html/pages/health/memory.inc.php index a59d812eb0..d7de967742 100644 --- a/html/pages/health/memory.inc.php +++ b/html/pages/health/memory.inc.php @@ -34,7 +34,7 @@ $graph_type = "mempool_usage"; } else { $left_background='9abf5b'; $right_background='bbd392'; } echo(" - ".generatedevicelink($mempool)." + ".generate_device_link($mempool)." " . $text_descr . " diff --git a/html/pages/health/processors.inc.php b/html/pages/health/processors.inc.php index a0fee41061..d3a8bfdc49 100644 --- a/html/pages/health/processors.inc.php +++ b/html/pages/health/processors.inc.php @@ -38,7 +38,7 @@ $graph_type = "processor_usage"; } else { $left_background='9abf5b'; $right_background='bbd392'; } echo(" - ".generatedevicelink($proc)." + ".generate_device_link($proc)." " . $text_descr . " diff --git a/html/pages/health/storage.inc.php b/html/pages/health/storage.inc.php index 928a429ce3..dba98f4708 100644 --- a/html/pages/health/storage.inc.php +++ b/html/pages/health/storage.inc.php @@ -62,7 +62,7 @@ while($drive = mysql_fetch_array($query)) { } else { $left_background='9abf5b'; $right_background='bbd392'; } - echo("" . generatedevicelink($drive) . "" . $drive['storage_descr'] . " + echo("" . generate_device_link($drive) . "" . $drive['storage_descr'] . " ".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $left_background, $free, "ffffff", $right_background)." diff --git a/html/pages/health/temperatures.inc.php b/html/pages/health/temperatures.inc.php index 809cb01d98..d9191ea77f 100644 --- a/html/pages/health/temperatures.inc.php +++ b/html/pages/health/temperatures.inc.php @@ -49,7 +49,7 @@ while($temp = mysql_fetch_array($query)) $temp_minigraph .= "
', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >"; echo(" - " . generatedevicelink($temp) . " + " . generate_device_link($temp) . " $temp_popup $temp_minigraph $alert diff --git a/html/pages/health/voltages.inc.php b/html/pages/health/voltages.inc.php index d0060c945a..60b7a31a41 100644 --- a/html/pages/health/voltages.inc.php +++ b/html/pages/health/voltages.inc.php @@ -44,7 +44,7 @@ while($volt = mysql_fetch_array($query)) $volt_minigraph .= "
', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >"; echo(" - " . generatedevicelink($volt) . " + " . generate_device_link($volt) . " $volt_popup $volt_minigraph $alert diff --git a/html/pages/iftype.inc.php b/html/pages/iftype.inc.php index 13b8c64e70..b4a4018bb1 100644 --- a/html/pages/iftype.inc.php +++ b/html/pages/iftype.inc.php @@ -44,8 +44,8 @@ echo(""); $ifclass = ifclass($interface['ifOperStatus'], $interface['ifAdminStatus']); if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; } echo(" - "); } diff --git a/html/pages/ipv4.inc.php b/html/pages/ipv4.inc.php index 7cabbd5616..e05e402885 100644 --- a/html/pages/ipv4.inc.php +++ b/html/pages/ipv4.inc.php @@ -68,14 +68,14 @@ while($interface = mysql_fetch_array($query)) { list($prefix, $length) = explode("/", $interface['ipv4_network']); if($interface['in_errors'] > 0 || $interface['out_errors'] > 0) { - $error_img = generateiflink($interface,"Interface Errors",errors); + $error_img = generate_port_link($interface,"Interface Errors",errors); } else { $error_img = ""; } if( port_permitted($interface['interface_id']) ) { echo(' - - + + \n"); diff --git a/html/pages/ipv6.inc.php b/html/pages/ipv6.inc.php index b2879eb640..e57c7f666c 100644 --- a/html/pages/ipv6.inc.php +++ b/html/pages/ipv6.inc.php @@ -70,14 +70,14 @@ if(!$ignore) { list($prefix, $length) = explode("/", $interface['ipv6_network']); if($interface['in_errors'] > 0 || $interface['out_errors'] > 0) { - $error_img = generateiflink($interface,"Interface Errors",errors); + $error_img = generate_port_link($interface,"Interface Errors",errors); } else { $error_img = ""; } if( port_permitted($interface['interface_id']) ) { echo(" - - + + \n"); diff --git a/html/pages/ports/default.inc.php b/html/pages/ports/default.inc.php index 834d4f4cc4..dae57eb52d 100644 --- a/html/pages/ports/default.inc.php +++ b/html/pages/ports/default.inc.php @@ -135,7 +135,7 @@ while($interface = mysql_fetch_array($query)) { $type = humanmedia($interface['ifType']); if($interface['in_errors'] > 0 || $interface['out_errors'] > 0) { - $error_img = generateiflink($interface,"Interface Errors",errors); + $error_img = generate_port_link($interface,"Interface Errors",errors); } else { $error_img = ""; } if( port_permitted($interface['interface_id'], $interface['device_id']) ) @@ -143,8 +143,8 @@ while($interface = mysql_fetch_array($query)) { $interface = ifLabel($interface, $device); echo(" - - + + diff --git a/html/pages/ports/deleted.inc.php b/html/pages/ports/deleted.inc.php index eee2e5f14f..d6b1fb003f 100644 --- a/html/pages/ports/deleted.inc.php +++ b/html/pages/ports/deleted.inc.php @@ -7,14 +7,14 @@ if($_GET['optb'] == "purge" && $_GET['optc'] == "all") { while($interface = mysql_fetch_assoc($query)) { if(port_permitted($interface['interface_id'], $interface['device_id'])){ delete_port($interface['interface_id']); - echo("
Deleted ".generatedevicelink($interface)." - ".generateiflink($interface)."
"); + echo("
Deleted ".generate_device_link($interface)." - ".generate_port_link($interface)."
"); } } } elseif($_GET['optb'] == "purge" && $_GET['optc']) { $interface = mysql_fetch_assoc(mysql_query("SELECT * from `ports` AS P, `devices` AS D WHERE `interface_id` = '".mres($_GET['optc'])."' AND D.device_id = P.device_id")); if(port_permitted($interface['interface_id'], $interface['device_id'])) delete_port($interface['interface_id']); - echo("
Deleted ".generatedevicelink($interface)." - ".generateiflink($interface)."
"); + echo("
Deleted ".generate_device_link($interface)." - ".generate_port_link($interface)."
"); } @@ -33,8 +33,8 @@ while($interface = mysql_fetch_assoc($query)) { if(is_integer($i_deleted/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } echo(""); - echo(""); - echo(""); + echo(""); + echo(""); echo(""); echo(""); diff --git a/html/pages/pseudowires.inc.php b/html/pages/pseudowires.inc.php index 702f8f1466..681437c4b3 100644 --- a/html/pages/pseudowires.inc.php +++ b/html/pages/pseudowires.inc.php @@ -37,9 +37,9 @@ while($pw_a = mysql_fetch_array($query)) { } else { if($bg == "ffffff") { $bg = "e5e5e5"; } else { $bg="ffffff"; } - echo(" + echo(" - "); + "); echo(""); if($opta == "graphs") { echo(" + echo("
" . generateiflink($interface,$interface['port_descr_descr']) . "
- ".generatedevicelink($interface)." ".generateiflink($interface)." "); + 		" . generate_port_link($interface,$interface['port_descr_descr']) . "
+ ".generate_device_link($interface)." ".generate_port_link($interface)." "); if(mysql_result(mysql_query("SELECT count(*) FROM mac_accounting WHERE interface_id = '".$interface['interface_id']."'"),0)){ echo(" MAC Accounting"); diff --git a/html/pages/inventory.inc.php b/html/pages/inventory.inc.php index 694ad63b8b..ee25aa1140 100644 --- a/html/pages/inventory.inc.php +++ b/html/pages/inventory.inc.php @@ -79,7 +79,7 @@ echo("
HostnameDescriptionNamePart No while($entry = mysql_fetch_array($query)) { if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; } -echo("
" . generatedevicelink($entry, shortHost($entry['hostname'])) . "" . $entry['entPhysicalDescr'] . +echo("
" . generate_device_link($entry, shortHost($entry['hostname'])) . "" . $entry['entPhysicalDescr'] . "" . $entry['entPhysicalName'] . "" . $entry['entPhysicalModelName'] . "" . $entry['entPhysicalSerialNum'] . "
' . generatedevicelink($interface) . '' . generateiflink($interface, makeshortif(fixifname($interface['ifDescr']))) . ' ' . $error_img . '' . generate_device_link($interface) . '' . generate_port_link($interface, makeshortif(fixifname($interface['ifDescr']))) . ' ' . $error_img . ' ' . $interface['ipv4_address'] . '/'.$length.' ' . $interface['ifAlias'] . "
" . generatedevicelink($interface) . "" . generateiflink($interface, makeshortif(fixifname($interface['ifDescr']))) . " $error_img" . generate_device_link($interface) . "" . generate_port_link($interface, makeshortif(fixifname($interface['ifDescr']))) . " $error_img " . Net_IPv6::compress($interface['ipv6_address']) . "/".$length." " . $interface['ifAlias'] . "
" . generatedevicelink($interface) . "" . generateiflink($interface) . " $error_img" . generate_device_link($interface) . "" . generate_port_link($interface) . " $error_img $speed $type " . $interface['ifAlias'] . "
".generatedevicelink($interface)."".generateiflink($interface)."".generate_device_link($interface)."".generate_port_link($interface)." Purge
".$pw_a['cpwVcID']."".generatedevicelink($pw_a)."".generateiflink($pw_a)."
".$pw_a['cpwVcID']."".generate_device_link($pw_a)."".generate_port_link($pw_a)." ".generatedevicelink($pw_b)."".generateiflink($pw_b)."
".generate_device_link($pw_b)."".generate_port_link($pw_b)."
".$pw_a['ifAlias']."".$pw_b['ifAlias']."
"); diff --git a/html/pages/storage.inc.php b/html/pages/storage.inc.php index 8560129a3b..563f16f15f 100644 --- a/html/pages/storage.inc.php +++ b/html/pages/storage.inc.php @@ -63,7 +63,7 @@ while($drive = mysql_fetch_array($query)) { } else { $left_background='9abf5b'; $right_background='bbd392'; } - echo("
" . generatedevicelink($drive) . "" . $drive['storage_descr'] . "
" . generate_device_link($drive) . "" . $drive['storage_descr'] . " ".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $left_background, formatStorage($free), "ffffff", $right_background)." diff --git a/html/pages/vrfs.inc.php b/html/pages/vrfs.inc.php index 9ef6852003..e34b8beb89 100644 --- a/html/pages/vrfs.inc.php +++ b/html/pages/vrfs.inc.php @@ -32,7 +32,7 @@ print_optionbar_end(); } else { if(!is_integer($x/2)) { $dev_colour = $list_colour_b_b; } else { $dev_colour = $list_colour_b_a; } } - echo("
".generatedevicelink($device, shorthost($device['hostname']))); + echo("
".generate_device_link($device, shorthost($device['hostname']))); if($device['vrf_name'] != $vrf['vrf_name']) { echo("Configured : ".$device['vrf_name']."', CAPTION, 'VRF Inconsistency' ,FGCOLOR,'#e5e5e5', BGCOLOR, '#c0c0c0', BORDER, 5, CELLPAD, 4, CAPCOLOR, '#050505');\" onmouseout=\"return nd();\"> "); } echo(""); $ports = mysql_query("SELECT * FROM `ports` WHERE `ifVrf` = '".$device['vrf_id']."' and device_id = '".$device['device_id']."'"); @@ -54,7 +54,7 @@ print_optionbar_end(); echo("
".truncate(short_port_descr($port['ifAlias']), 22, '')."
"); } else { - echo($seperator.generateiflink($port,makeshortif($port['ifDescr']))); + echo($seperator.generate_port_link($port,makeshortif($port['ifDescr']))); $seperator = ", "; } }