git-svn-id: http://www.observium.org/svn/observer/trunk@2310 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-13 13:52:01 +00:00
parent 952ae3b365
commit f1285f2e31
8 changed files with 55 additions and 112 deletions

View File

@ -38,29 +38,29 @@ along with this program. If not, see <a href="http://www.gnu.org/licenses/">htt
<h3>Statistics</h3>
<?php
$stat_devices = mysql_result(mysql_query("SELECT COUNT(*) FROM `devices`"),0);
$stat_ports = mysql_result(mysql_query("SELECT COUNT(*) FROM `ports`"),0);
$stat_syslog = mysql_result(mysql_query("SELECT COUNT(*) FROM `syslog`"),0);
$stat_events = mysql_result(mysql_query("SELECT COUNT(*) FROM `eventlog`"),0);
$stat_apps = mysql_result(mysql_query("SELECT COUNT(*) FROM `applications`"),0);
$stat_services = mysql_result(mysql_query("SELECT COUNT(*) FROM `services`"),0);
$stat_storage = mysql_result(mysql_query("SELECT COUNT(*) FROM `storage`"),0);
$stat_diskio = mysql_result(mysql_query("SELECT COUNT(*) FROM `ucd_diskio`"),0);
$stat_processors = mysql_result(mysql_query("SELECT COUNT(*) FROM `processors`"),0);
$stat_memory = mysql_result(mysql_query("SELECT COUNT(*) FROM `mempools`"),0);
$stat_sensors = mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors`"),0);
$stat_toner = mysql_result(mysql_query("SELECT COUNT(*) FROM `toner`"),0);
$stat_hrdev = mysql_result(mysql_query("SELECT COUNT(*) FROM `hrDevice`"),0);
$stat_entphys = mysql_result(mysql_query("SELECT COUNT(*) FROM `entPhysical`"),0);
$stat_devices = dbFetchCell("SELECT COUNT(*) FROM `devices`");
$stat_ports = dbFetchCell("SELECT COUNT(*) FROM `ports`");
$stat_syslog = dbFetchCell("SELECT COUNT(*) FROM `syslog`");
$stat_events = dbFetchCell("SELECT COUNT(*) FROM `eventlog`");
$stat_apps = dbFetchCell("SELECT COUNT(*) FROM `applications`");
$stat_services = dbFetchCell("SELECT COUNT(*) FROM `services`");
$stat_storage = dbFetchCell("SELECT COUNT(*) FROM `storage`");
$stat_diskio = dbFetchCell("SELECT COUNT(*) FROM `ucd_diskio`");
$stat_processors = dbFetchCell("SELECT COUNT(*) FROM `processors`");
$stat_memory = dbFetchCell("SELECT COUNT(*) FROM `mempools`");
$stat_sensors = dbFetchCell("SELECT COUNT(*) FROM `sensors`");
$stat_toner = dbFetchCell("SELECT COUNT(*) FROM `toner`");
$stat_hrdev = dbFetchCell("SELECT COUNT(*) FROM `hrDevice`");
$stat_entphys = dbFetchCell("SELECT COUNT(*) FROM `entPhysical`");
$stat_ipv4_addy = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv4_addresses`"),0);
$stat_ipv4_nets = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv4_networks`"),0);
$stat_ipv6_addy = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv6_addresses`"),0);
$stat_ipv6_nets = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv6_networks`"),0);
$stat_ipv4_addy = dbFetchCell("SELECT COUNT(*) FROM `ipv4_addresses`");
$stat_ipv4_nets = dbFetchCell("SELECT COUNT(*) FROM `ipv4_networks`");
$stat_ipv6_addy = dbFetchCell("SELECT COUNT(*) FROM `ipv6_addresses`");
$stat_ipv6_nets = dbFetchCell("SELECT COUNT(*) FROM `ipv6_networks`");
$stat_pw = mysql_result(mysql_query("SELECT COUNT(*) FROM `pseudowires`"),0);
$stat_vrf = mysql_result(mysql_query("SELECT COUNT(*) FROM `vrfs`"),0);
$stat_vlans = mysql_result(mysql_query("SELECT COUNT(*) FROM `vlans`"),0);
$stat_pw = dbFetchCell("SELECT COUNT(*) FROM `pseudowires`");
$stat_vrf = dbFetchCell("SELECT COUNT(*) FROM `vrfs`");
$stat_vlans = dbFetchCell("SELECT COUNT(*) FROM `vlans`");
echo("
<table width=95% cellpadding=5 cellspacing=0>
@ -121,9 +121,7 @@ $apache_version = str_replace("Apache/", "", $_SERVER['SERVER_SOFTWARE']);
$php_version = phpversion();
$t = mysql_query("select version() as ve");
$r = mysql_fetch_object($t);
$mysql_version = $r->ve;
$mysql_version = dbFetchCell("SELECT version()");
$netsnmp_version = shell_exec($config['snmpget'] . " --version");

View File

@ -26,8 +26,7 @@ else
closedir($handle);
}
$query = mysql_query("SELECT * FROM `devices` ORDER BY `hostname`");
while ($device = mysql_fetch_assoc($query))
foreach(dbFetchRows("SELECT * FROM `devices` ORDER BY `hostname`") as $device)
{
$devicesform .= "<option value='" . $device['device_id'] . "'>" . $device['hostname'] . "</option>";
}
@ -80,4 +79,4 @@ else
}
?>
?>

View File

@ -2,12 +2,9 @@
if ($_SESSION['userlevel'] == '10')
{
$query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate FROM `authlog` ORDER BY `datetime` DESC LIMIT 0,250";
$data = mysql_query($query);
echo("<table cellspacing=0 cellpadding=1 width=100%>");
while ($entry = mysql_fetch_assoc($data))
foreach (dbFetchRows("SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate FROM `authlog` ORDER BY `datetime` DESC LIMIT 0,250") as $entry)
{
if ($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
@ -31,4 +28,4 @@ if ($_SESSION['userlevel'] == '10')
echo("</table>");
}
?>
?>

View File

@ -9,13 +9,12 @@ if ($_SESSION['userlevel'] == "10")
if (bill_permitted($bill_id))
{
$bi_q = mysql_query("SELECT * FROM bills WHERE bill_id = $bill_id");
$bill_data = mysql_fetch_assoc($bi_q);
$bill_data = dbFetchRow("SELECT * FROM bills WHERE bill_id = ?", array($bill_id));
$today = str_replace("-", "", mysql_result(mysql_query("SELECT CURDATE()"), 0));
$yesterday = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_SUB(CURDATE(), INTERVAL 1 DAY)"), 0));
$tomorrow = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_ADD(CURDATE(), INTERVAL 1 DAY)"), 0));
$last_month = str_replace("-", "", mysql_result(mysql_query("SELECT DATE_SUB(CURDATE(), INTERVAL 1 MONTH)"), 0));
$today = str_replace("-", "", dbFetchCell("SELECT CURDATE()"));
$yesterday = str_replace("-", "", dbFetchCell("SELECT DATE_SUB(CURDATE(), INTERVAL 1 DAY)"));
$tomorrow = str_replace("-", "", dbFetchCell("SELECT DATE_ADD(CURDATE(), INTERVAL 1 DAY)"));
$last_month = str_replace("-", "", dbFetchCell("SELECT DATE_SUB(CURDATE(), INTERVAL 1 MONTH)"));
$rightnow = $today . date(His);
$before = $yesterday . date(His);
@ -54,13 +53,13 @@ if (bill_permitted($bill_id))
$bill_color = "#0000cc";
}
$fromtext = mysql_result(mysql_query("SELECT DATE_FORMAT($datefrom, '%M %D %Y')"), 0);
$totext = mysql_result(mysql_query("SELECT DATE_FORMAT($dateto, '%M %D %Y')"), 0);
$unixfrom = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP('$datefrom')"), 0);
$unixto = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP('$dateto')"), 0);
$fromtext = dbFetchCell("SELECT DATE_FORMAT($datefrom, '%M %D %Y')");
$totext = dbFetchCell("SELECT DATE_FORMAT($dateto, '%M %D %Y')");
$unixfrom = dbFetchCell("SELECT UNIX_TIMESTAMP('$datefrom')");
$unixto = dbFetchCell("SELECT UNIX_TIMESTAMP('$dateto')");
$unix_prev_from = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP('$lastfrom')"), 0);
$unix_prev_to = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP('$lastto')"), 0);
$unix_prev_from = dbFetchCell("SELECT UNIX_TIMESTAMP('$lastfrom')");
$unix_prev_to = dbFetchCell("SELECT UNIX_TIMESTAMP('$lastto')");
echo("<font face=\"Verdana, Arial, Sans-Serif\"><h2>
Bill : " . $bill_name . "</h2>");
@ -103,11 +102,11 @@ if (bill_permitted($bill_id))
echo("<h3>Billed Ports</h3>");
$ports = mysql_query("SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D
WHERE B.bill_id = '".$bill_id."' AND P.interface_id = B.port_id
AND D.device_id = P.device_id");
$ports = dbFetchRows("SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D
WHERE B.bill_id = ? AND P.interface_id = B.port_id
AND D.device_id = P.device_id", array($bill_id));
while ($port = mysql_fetch_assoc($ports))
foreach ($ports as $port)
{
echo(generate_port_link($port) . " on " . generate_device_link($port) . "<br />");
}
@ -184,8 +183,8 @@ if (bill_permitted($bill_id))
$bi .= "&amp;from=" . $unixfrom . "&amp;to=" . $unixto;
$bi .= "&amp;width=715&amp;height=200&amp;total=1'>";
$lastmonth = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 MONTH))"), 0);
$yesterday = mysql_result(mysql_query("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 DAY))"), 0);
$lastmonth = dbFetchCell("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 MONTH))");
$yesterday = dbFetchCell("SELECT UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 1 DAY))");
$rightnow = date(U);

View File

@ -4,14 +4,10 @@ if ($_POST['addbill'] == "yes")
{
$updated = '1';
$sql = "INSERT INTO `bills` (`bill_name`,`bill_type`,`bill_cdr`,`bill_day`,`bill_gb`, `bill_custid`, `bill_ref`, `bill_notes`)
VALUES ('" . mres($_POST['bill_name']) . "','" . mres($_POST['bill_type']) . "',
'" . mres($_POST['bill_cdr']) . "','" . mres($_POST['bill_day']) . "',
'" . mres($_POST['bill_quota']) . "','" . mres($_POST['bill_custid']) . "',
'" . mres($_POST['bill_ref']) . "','" . mres($_POST['bill_notes']) . "' )";
$insert = array('bill_name' => $_POST['bill_name'], 'bill_type' => $_POST['bill_type'], 'bill_cdr' => $_POST['bill_cdr'], 'bill_day' => $_POST['bill_day'], 'bill_gb' => $_POST['bill_quota'],
'bill_custid' => $_POST['bill_custid'], 'bill_ref' => $_POST['bill_ref'], 'bill_notes' => $_POST['bill_notes']);
$query = mysql_query($sql);
$affected = mysql_affected_rows() . "records affected";
$affected = dbInsert($insert, 'bills');
$message .= $message_break . "Bill ".mres($_POST['bill_name'])." added!";
$message_break .= "<br />";
@ -119,11 +115,9 @@ if ($_GET['opta'] == "add")
print_optionbar_end();
$sql = "SELECT * FROM `bills` ORDER BY `bill_name`";
$query = mysql_query($sql);
echo("<table border=0 cellspacing=0 cellpadding=5 class=devicetable width=100%>");
$i=1;
while ($bill = mysql_fetch_assoc($query))
foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
{
#echo("<pre>");
#print_r($permissions);

View File

@ -1,8 +1,5 @@
<?php
$sql = "SELECT * FROM `ports` WHERE `port_descr_type` = 'cust' GROUP BY `port_descr_descr` ORDER BY `port_descr_descr`";
$cust_query = mysql_query($sql);
echo("<table border=0 cellspacing=0 cellpadding=2 class=devicetable width=100%>");
echo("
@ -19,7 +16,7 @@ echo("
$i = 1;
while ($customer = mysql_fetch_assoc($cust_query))
foreach (dbFetchRows("SELECT * FROM `ports` WHERE `port_descr_type` = 'cust' GROUP BY `port_descr_descr` ORDER BY `port_descr_descr`") as $customer)
{
$i++;
@ -72,4 +69,4 @@ while ($customer = mysql_fetch_assoc($cust_query))
echo("</table>");
?>
?>

View File

@ -12,10 +12,7 @@ list($opta, $optb, $optc, $optd, $opte) = explode("/", $_GET['opta']);
echo("<table cellpadding=5 cellspacing=0 class=devicetable width=100%>");
$sql = "SELECT * FROM pseudowires AS P, ports AS I, devices AS D WHERE P.interface_id = I.interface_id AND I.device_id = D.device_id ORDER BY D.hostname,I.ifDescr";
$query = mysql_query($sql);
while ($pw_a = mysql_fetch_assoc($query))
foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D WHERE P.interface_id = I.interface_id AND I.device_id = D.device_id ORDER BY D.hostname,I.ifDescr") as $pw_a)
{
$i = 0;
while ($i < count($linkdone))
@ -25,10 +22,8 @@ while ($pw_a = mysql_fetch_assoc($query))
$i++;
}
$pw_b = mysql_fetch_assoc(mysql_query("SELECT * from `devices` AS D, `ports` AS I, `pseudowires` AS P WHERE D.device_id = '".$pw_a['peer_device_id']."' AND
D.device_id = I.device_id AND
P.cpwVcID = '".$pw_a['cpwVcID']."' AND
P.interface_id = I.interface_id"));
$pw_b = dbFetchRow("SELECT * from `devices` AS D, `ports` AS I, `pseudowires` AS P WHERE D.device_id = ? AND D.device_id = I.device_id
AND P.cpwVcID = ? AND P.interface_id = I.interface_id", array($pw_a['peer_device_id'], $pw_a['cpwVcID']));
if (!port_permitted($pw_a['interface_id'])) { $skip = "yes"; }
if (!port_permitted($pw_b['interface_id'])) { $skip = "yes"; }
@ -88,4 +83,4 @@ while ($pw_a = mysql_fetch_assoc($query))
echo("</table>");
?>
?>

View File

@ -1,46 +1,10 @@
<?php
# FIXME there's a delete port function in the functions... merge?!
function delete_port($interface_id)
{
$ipaddrs = mysql_query("SELECT * FROM `ipaddr` WHERE `interface_id` = '$interface_id'");
while ($ipaddr = mysql_fetch_assoc($ipaddrs))
{
echo("<div style='padding-left:8px; font-weight: normal;'>Deleting IPv4 address " . $ipaddr['addr'] . "/" . $ipaddr['cidr']);
mysql_query("DELETE FROM addr WHERE id = '".$addr['id']."'");
echo("</div>");
}
$ip6addr = mysql_query("SELECT * FROM `ip6addr` WHERE `interface_id` = '$interface_id'");
while ($ip6addr = mysql_fetch_assoc($ip6addrs))
{
echo("<div style='padding-left:8px; font-weight: normal;'>Deleting IPv6 address " . $ip6addr['ip6_comp_addr'] . "/" . $ip6addr['ip6_prefixlen']);
mysql_query("DELETE FROM ip6addr WHERE ip6_addr_id = '".$ip6addr['ip6_addr_id']."'");
echo("</div>");
}
$ip6addr = mysql_query("SELECT * FROM `ip6addr` WHERE `interface_id` = '$interface_id'");
while ($ip6addr = mysql_fetch_assoc($ip6addrs))
{
echo("<div style='padding-left:8px; font-weight: normal;'>Deleting IPv6 address " . $ip6addr['ip6_comp_addr'] . "/" . $ip6addr['ip6_prefixlen']);
mysql_query("DELETE FROM ip6addr WHERE ip6_addr_id = '".$ip6addr['ip6_addr_id']."'");
echo("</div>");
}
mysql_query("DELETE FROM `pseudowires` WHERE `interface_id` = '$interface_id'");
mysql_query("DELETE FROM `mac_accounting` WHERE `interface_id` = '$interface_id'");
mysql_query("DELETE FROM `links` WHERE `local_interface_id` = '$interface_id'");
mysql_query("DELETE FROM `links` WHERE `remote_interface_id` = '$interface_id'");
mysql_query("DELETE FROM `ports_perms` WHERE `interface_id` = '$interface_id'");
mysql_query("DELETE FROM `ports` WHERE `interface_id` = '$interface_id'");
}
$ports = mysql_query("SELECT * FROM `ports` WHERE `deleted` = '1'");
while ($port = mysql_fetch_assoc($ports))
foreach (dbFetchRows("SELECT * FROM `ports` WHERE `deleted` = '1'") as $port)
{
echo("<div style='font-weight: bold;'>Deleting port " . $port['interface_id'] . " - " . $port['ifDescr']);
delete_port($port['interface_id']);
echo("</div>");
}
?>
?>