From 96884a1baf0c0eda8f991f2b45198af32edb19f6 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Sun, 6 May 2012 23:10:09 +0000 Subject: [PATCH] more time period corrections git-svn-id: http://www.observium.org/svn/observer/trunk@3145 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/print-vlan.inc.php | 4 +-- html/includes/print-vrf.inc.php | 4 +-- html/pages/device/port/macaccounting.inc.php | 36 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php index abd3c1f07..29c0273d0 100644 --- a/html/includes/print-vlan.inc.php +++ b/html/includes/print-vlan.inc.php @@ -31,9 +31,9 @@ foreach ($vlan_ports as $port) ".$device['hostname']." - ".$port['ifDescr']."\ ".$port['ifAlias']." \ - \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". - " + "
".truncate(short_port_descr($port['ifAlias']), 22, '')."
"); diff --git a/html/includes/print-vrf.inc.php b/html/includes/print-vrf.inc.php index 4548e6dd4..65c264ef4 100644 --- a/html/includes/print-vrf.inc.php +++ b/html/includes/print-vrf.inc.php @@ -19,9 +19,9 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVrf` = ?" ".$device['hostname']." - ".$port['ifDescr']."\ ".$port['ifAlias']." \ - \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". - " + "
".truncate(short_port_descr($port['ifAlias']), 22, '')."
"); diff --git a/html/pages/device/port/macaccounting.inc.php b/html/pages/device/port/macaccounting.inc.php index 4c8e67efd..639ec2ebc 100644 --- a/html/pages/device/port/macaccounting.inc.php +++ b/html/pages/device/port/macaccounting.inc.php @@ -34,73 +34,73 @@ if ($vars['subview'] == "top10")
Day
- 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => '1day'))."'> + 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => 'day'))."'> + "&stat=".$vars['graph']."&type=port_mac_acc_total&sort=".$vars['sort']."&from=".$config['time']['day']."&to=".$config['time']['now']."&width=150&height=50' />
Two Day
- 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => '2day'))."/'> + 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => 'twoday'))."/'> + "&stat=".$vars['graph']."&type=port_mac_acc_total&sort=".$vars['sort']."&from=".$config['time']['twoday']."&to=".$config['time']['now']."&width=150&height=50' />
Week
- 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => '1week'))."/'> - + 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => 'week'))."/'> +
Month
- 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => '1month'))."/'> - + 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => 'month'))."/'> +
Year
- 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => '1year'))."/'> - + 'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => $vars['sort'], 'period' => 'year'))."/'> +
- +
Traffic
'macaccounting', 'subview' => 'top10', 'graph'=>'bits', sort => $vars['sort'], 'period' => $vars['period']))."'> - +
Packets
'macaccounting', 'subview' => 'top10', 'graph'=>'pkts', sort => $vars['sort'], 'period' => $vars['period']))."/'> - +
Top Input
'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => 'in', 'period' => $vars['period']))."'> + "&stat=".$vars['graph']."&type=port_mac_acc_total&sort=in&from=$from&to=".$config['time']['now']."&width=150&height=50' />
Top Output
'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => 'out', 'period' => $vars['period']))."'> + "&stat=".$vars['graph']."&type=port_mac_acc_total&sort=out&from=$from&to=".$config['time']['now']."&width=150&height=50' />
Top Aggregate
'macaccounting', 'subview' => 'top10', 'graph'=>$vars['graph'], sort => 'both', 'period' => $vars['period']))."'> + "&stat=".$vars['graph']."&type=port_mac_acc_total&sort=both&from=$from&to=".$config['time']['now']."&width=150&height=50' />
@@ -151,9 +151,9 @@ if ($vars['subview'] == "top10") ".$addy['ipv4_address']." - ".$asn." ".$name." - ".$addy['ipv4_address']." - ".$asn."\ - \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" > - + ".$name." ");