From ac45d853aa39a4231f58e1073945da9a2416d4c4 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Tue, 12 May 2009 08:44:00 +0000 Subject: [PATCH] updates! git-svn-id: http://www.observium.org/svn/observer/trunk@433 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/customers.php | 55 ++++++++------- includes/discovery/cisco-mac-accounting.php | 76 +++++++++++++++++++++ 2 files changed, 108 insertions(+), 23 deletions(-) create mode 100755 includes/discovery/cisco-mac-accounting.php diff --git a/html/pages/customers.php b/html/pages/customers.php index bd97428be2..30985d393d 100644 --- a/html/pages/customers.php +++ b/html/pages/customers.php @@ -1,14 +1,27 @@ "); + echo(" + + + Customer + Device + Interface + Speed + Circuit + Notes + + "); + + $customers = 1; while($interface = mysql_fetch_array($query)) { $device = &$interface; @@ -16,26 +29,21 @@ $ifname = fixifname($device['ifDescr']); - $interface['ifAlias'] = str_replace("Cust: ", "", $interface['ifAlias']); - $interface['ifAlias'] = str_replace("[PNI]", "Private", $interface['ifAlias']); - $ifclass = ifclass($interface['ifOperStatus'], $interface['ifAdminStatus']); - - $displayifalias = $device['ifAlias']; - $device['ifAlias'] = str_replace(" [","|",$device['ifAlias']); - $device['ifAlias'] = str_replace("] (","|",$device['ifAlias']); - $device['ifAlias'] = str_replace(" (","||",$device['ifAlias']); - $device['ifAlias'] = str_replace("]","|",$device['ifAlias']); - $device['ifAlias'] = str_replace(")","|",$device['ifAlias']); - list($device['ifAlias'],$class,$notes) = explode("|", $device['ifAlias']); - $useifalias = $device['ifAlias']; - $used = '1'; - if ($device['ifAlias'] == $previfalias) { unset($useifalias ); - } elseif ($previfalias) { - echo(""); - if($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg="#ffffff"; } + + list(,$customer) = preg_split("/[\:\[\]\{\}\(\)]/", $interface['ifAlias']); + list(,$circuit) = preg_split("/[\{\}]/", $interface['ifAlias']); + list(,$notes) = preg_split("/[\(\)]/", $interface['ifAlias']); + list(,$speed) = preg_split("/[\[\]]/", $interface['ifAlias']); + + + if ($customer == $prev_customer) { + unset($customer); + } else { + if(is_integer($customers/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; } + $customers++; + $prev_customer = $customer; } - $previfalias = $device['ifAlias']; if($device['os'] == "IOS") { @@ -46,12 +54,13 @@ } echo(" - + - $useifalias - " . generatedevicelink($device) . " + $customer + " . generatedevicelink($device) . " " . generateiflink($interface, makeshortif($interface['ifDescr'])) . " - $vlan + $speed + $circuit $notes "); diff --git a/includes/discovery/cisco-mac-accounting.php b/includes/discovery/cisco-mac-accounting.php new file mode 100755 index 0000000000..ee5b52b15e --- /dev/null +++ b/includes/discovery/cisco-mac-accounting.php @@ -0,0 +1,76 @@ + $mac ($oid) -> $ip -> $name"); + if(mysql_result(mysql_query("SELECT COUNT(*) from mac_accounting WHERE interface_id = '".$interface['interface_id']."' AND mac = '$clean_mac'"),0)) { + #$sql = "UPDATE `mac_accounting` SET `mac` = '$clean_mac' WHERE interface_id = '".$interface['interface_id']."' AND `mac` = '$clean_mac'"; + #mysql_query($sql); + #if(mysql_affected_rows()) { echo(" UPDATED!"); } + #echo($sql); + } else { + #echo(" Not Exists!"); + mysql_query("INSERT INTO `mac_accounting` (interface_id, mac) VALUES ('".$interface['interface_id']."','$clean_mac')"); + } + echo("\n"); + } + } + +?>