[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[468] trunk

[<jac...@us...>]

Revision: 468
          http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=468&view=rev
Author:   jacky672
Date:     2011-07-12 17:02:33 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
[FIX] Fix PCI and network information on BSD [3536419]

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/includes/os/class.BSDCommon.inc.php
    trunk/includes/os/class.FreeBSD.inc.php

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-07-01 08:24:09 UTC (rev 467)
+++ trunk/ChangeLog	2011-07-12 17:02:33 UTC (rev 468)
@@ -4,6 +4,8 @@
  - [ADD] SNMPPInfo status plugin (printers status via SNMP)
  - [ADD] Partial support of IBM AIX
 
+ - [FIX] Fix PCI and network information on BSD [3536419]
+
  - [UPD] Updated jQuery plugin to 1.6.2
 
 phpSysInfo 3.0.11

Modified: trunk/includes/os/class.BSDCommon.inc.php
===================================================================
--- trunk/includes/os/class.BSDCommon.inc.php	2011-07-01 08:24:09 UTC (rev 467)
+++ trunk/includes/os/class.BSDCommon.inc.php	2011-07-12 17:02:33 UTC (rev 468)
@@ -328,7 +328,7 @@
      */
     protected function pci()
     {
-        if (!(is_array($results = Parser::lspci()) || is_array($results = Parser::pciconf()))) {
+        if (!is_array($results = Parser::lspci()) || !is_array($results = Parser::pciconf())) {
             foreach ($this->readdmesg() as $line) {
                 if (preg_match("/".$this->_PCIRegExp1."/", $line, $ar_buf)) {
                     $dev = new HWDevice();
@@ -341,7 +341,7 @@
                 }
             }
         }
-        foreach ($results as $device) {
+        foreach ($results as $dev) {
             $this->sys->setPciDevices($dev);
         }
     }

Modified: trunk/includes/os/class.FreeBSD.inc.php
===================================================================
--- trunk/includes/os/class.FreeBSD.inc.php	2011-07-01 08:24:09 UTC (rev 467)
+++ trunk/includes/os/class.FreeBSD.inc.php	2011-07-12 17:02:33 UTC (rev 468)
@@ -68,15 +68,15 @@
                     $dev = new NetDevice();
                     $dev->setName($ar_buf[0]);
                     if (strlen($ar_buf[3]) < 15) {
-                        $dev->setTxBytes($ar_buf[8]);
-                        $dev->setRxBytes($ar_buf[5]);
-                        $dev->setDrops($ar_buf[10]);
-                        $dev->setErrors($ar_buf[4] + $ar_buf[7]);
+                        $dev->setTxBytes($ar_buf[6]);
+                        $dev->setRxBytes($ar_buf[9]);
+                        $dev->setDrops($ar_buf[11]);
+                        $dev->setErrors($ar_buf[4] + $ar_buf[8]); 
                     } else {
-                        $dev->setTxBytes($ar_buf[9]);
-                        $dev->setRxBytes($ar_buf[6]);
-                        $dev->setErrors($ar_buf[5] + $ar_buf[8]);
-                        $dev->setDrops($ar_buf[11]);
+                        $dev->setTxBytes($ar_buf[7]);
+                        $dev->setRxBytes($ar_buf[10]);
+                        $dev->setErrors($ar_buf[5] + $ar_buf[9]);
+                        $dev->setDrops($ar_buf[12]);
                     }
                     $this->sys->setNetDevices($dev);
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.