[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[389]

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

Revision: 389
          http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=389&view=rev
Author:   jacky672
Date:     2010-11-11 13:53:45 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
commit patch post in the forum (#3843551)

Modified Paths:
--------------
    includes/os/class.Linux.inc.php
    includes/xml/class.XML.inc.php
    js/phpSysInfo/phpsysinfo.js

Modified: includes/os/class.Linux.inc.php
===================================================================
--- includes/os/class.Linux.inc.php	2010-11-11 13:42:03 UTC (rev 388)
+++ includes/os/class.Linux.inc.php	2010-11-11 13:53:45 UTC (rev 389)
@@ -258,7 +258,8 @@
                                 $dev->setModel($arrBuff[1]);
                                 break;
                             case 'bogomips':
-                                $dev->setCpuSpeed($arrBuff[1]); //BogoMIPS are not BogoMIPS on this CPU, it's the speed, no BogoMIPS available
+                                $dev->setCpuSpeed($arrBuff[1]); //BogoMIPS are not BogoMIPS on this CPU, it's the speed
+                                $dev->setBogomips(null); // no BogoMIPS available, unset previously set BogoMIPS 
                                 break;
                             case 'i size':
                             case 'd size':

Modified: includes/xml/class.XML.inc.php
===================================================================
--- includes/xml/class.XML.inc.php	2010-11-11 13:42:03 UTC (rev 388)
+++ includes/xml/class.XML.inc.php	2010-11-11 13:53:45 UTC (rev 389)
@@ -192,12 +192,14 @@
                 $tmp->addAttribute('Capacity', $dev->getCapacity());
             }
         }
-        
+
         $cpu = $hardware->addChild('CPU');
         foreach ($this->_sys->getCpus() as $oneCpu) {
             $tmp = $cpu->addChild('CpuCore');
             $tmp->addAttribute('Model', $oneCpu->getModel());
-            $tmp->addAttribute('CpuSpeed', $oneCpu->getCpuSpeed());
+            if ($oneCpu->getCpuSpeed() !== 0) {
+                $tmp->addAttribute('CpuSpeed', $oneCpu->getCpuSpeed());
+            }
             if ($oneCpu->getTemp() !== null) {
                 $tmp->addAttribute('CpuTemp', $oneCpu->getTemp());
             }

Modified: js/phpSysInfo/phpsysinfo.js
===================================================================
--- js/phpSysInfo/phpsysinfo.js	2010-11-11 13:42:03 UTC (rev 388)
+++ js/phpSysInfo/phpsysinfo.js	2010-11-11 13:53:45 UTC (rev 389)
@@ -599,7 +599,9 @@
         html += "<tr><td colspan=\"2\">" + model + "</td></tr>\n";
         cpucoreposition = tree.push(rootposition);
         html += "<tr><td style=\"width:50%\">" + genlang(13, true) + ":</td><td>" + formatHertz(speed) + "</td></tr>\n";
-        tree.push(cpucoreposition);
+        if (!isNaN(speed)) {
+            tree.push(cpucoreposition);
+        }
         collapsed.push(cpucoreposition);
         if (!isNaN(cache)) {
             html += "<tr><td style=\"width:50%\">" + genlang(15, true) + ":</td><td>" + formatBytes(cache) + "</td></tr>\n";


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