Merge pull request #2818 from SaaldjorMike/ircbot-bugs

Minor fixes for the IRC bot's .port command

irc.php

@@ -640,13 +640,13 @@ private function _port($params) {
         }
 
         $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.');
         }
 
-        $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');