From 8f34e0e30ed1b421a4bd61dd8a9082b563e459e4 Mon Sep 17 00:00:00 2001 From: Mike Rostermund Date: Wed, 20 Jan 2016 01:58:10 +0100 Subject: [PATCH 1/2] Fix SQL statement for .port command in irc bot --- irc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irc.php b/irc.php index 4a9a374d3..2e14b101e 100755 --- a/irc.php +++ b/irc.php @@ -640,7 +640,7 @@ class ircbot { } $device = dbFetchRow('SELECT * FROM `devices` WHERE `hostname` = ?', array($hostname)); - $port = dbFetchRow('SELECT * FROM `ports` WHERE `ifName` = ? OR `ifDescr` = ? AND device_id = ?', array($ifname, $ifname, $device['device_id'])); + $port = dbFetchRow('SELECT * FROM `ports` WHERE (`ifName` = ? OR `ifDescr` = ?) AND device_id = ?', array($ifname, $ifname, $device['device_id'])); if ($this->user['level'] < 5 && !in_array($port['port_id'], $this->user['ports']) && !in_array($device['device_id'], $this->user['devices'])) { return $this->respond('Error: Permission denied.'); } From acc76dbfbaf33aa5a4f4e05eceeca5b3c7547b1d Mon Sep 17 00:00:00 2001 From: Mike Rostermund Date: Wed, 20 Jan 2016 02:00:37 +0100 Subject: [PATCH 2/2] Use bits instead of octets for proper bps values when using ircbot's .port cmd --- irc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/irc.php b/irc.php index 2e14b101e..21d2b7260 100755 --- a/irc.php +++ b/irc.php @@ -645,8 +645,8 @@ class ircbot { return $this->respond('Error: Permission denied.'); } - $bps_in = formatRates($port['ifInOctets_rate']); - $bps_out = formatRates($port['ifOutOctets_rate']); + $bps_in = formatRates($port['ifInOctets_rate'] * 8); + $bps_out = formatRates($port['ifOutOctets_rate'] * 8); $pps_in = format_bi($port['ifInUcastPkts_rate']); $pps_out = format_bi($port['ifOutUcastPkts_rate']); return $this->respond($port['ifAdminStatus'].'/'.$port['ifOperStatus'].' '.$bps_in.' > bps > '.$bps_out.' | '.$pps_in.'pps > PPS > '.$pps_out.'pps');