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

[<big...@us...>]

Revision: 192
          http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=192&view=rev
Author:   bigmichi1
Date:     2009-04-18 11:36:37 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
read ModelTranslation File on Darwin

Modified Paths:
--------------
    includes/os/class.Darwin.inc.php

Added Paths:
-----------
    data/ModelTranslation.txt

Added: data/ModelTranslation.txt
===================================================================
--- data/ModelTranslation.txt	                        (rev 0)
+++ data/ModelTranslation.txt	2009-04-18 11:36:37 UTC (rev 192)
@@ -0,0 +1,69 @@
+ADP2,1:Developer Transition Kit
+iMac1,1:iMac G3 (Rev A-D)
+iMac4,1:iMac (Core Duo)
+iMac4,2:iMac for Education (17-inch, Core Duo)
+Macmini1,1:Mac Mini (Core Solo/Duo)
+MacBook1,1:MacBook
+MacBookPro1,1:MacBook Pro (15-inch)
+MacBookPro3,1:MacBook Pro SR (15-inch)
+MacBookPro1,2:MacBook Pro (17-inch)
+PowerBook1,1:PowerBook G3
+PowerBook2,1:iBook G3
+PowerBook2,2:iBook G3 (FireWire)
+PowerBook2,3:iBook G3
+PowerBook2,4:iBook G3
+PowerBook3,1:PowerBook G3 (FireWire)
+PowerBook3,2:PowerBook G4
+PowerBook3,3:PowerBook G4 (Gigabit Ethernet)
+PowerBook3,4:PowerBook G4 (DVI)
+PowerBook3,5:PowerBook G4 (1GHz / 867MHz)
+PowerBook4,1:iBook G3 (Dual USB, Late 2001)
+PowerBook4,2:iBook G3 (16MB VRAM)
+PowerBook4,3:iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003)
+PowerBook5,1:PowerBook G4 (17 inch)
+PowerBook5,2:PowerBook G4 (15 inch FW 800)
+PowerBook5,3:PowerBook G4 (17-inch 1.33GHz)
+PowerBook5,4:PowerBook G4 (15 inch 1.5/1.33GHz)
+PowerBook5,5:PowerBook G4 (17-inch 1.5GHz)
+PowerBook5,6:PowerBook G4 (15 inch 1.67GHz/1.5GHz)
+PowerBook5,7:PowerBook G4 (17-inch 1.67GHz)
+PowerBook5,8:PowerBook G4 (Double layer SD, 15 inch)
+PowerBook5,9:PowerBook G4 (Double layer SD, 17 inch)
+PowerBook6,1:PowerBook G4 (12 inch)
+PowerBook6,2:PowerBook G4 (12 inch, DVI)
+PowerBook6,3:iBook G4
+PowerBook6,4:PowerBook G4 (12 inch 1.33GHz)
+PowerBook6,5:iBook G4 (Early-Late 2004)
+PowerBook6,7:iBook G4 (Mid 2005)
+PowerBook6,8:PowerBook G4 (12 inch 1.5GHz)
+PowerMac1,1:Power Macintosh G3 (Blue & White)
+PowerMac1,2:Power Macintosh G4 (PCI Graphics)
+PowerMac2,1:iMac G3 (Slot-loading CD-ROM)
+PowerMac2,2:iMac G3 (Summer 2000)
+PowerMac3,1:Power Macintosh G4 (AGP Graphics)
+PowerMac3,2:Power Macintosh G4 (AGP Graphics)
+PowerMac3,3:Power Macintosh G4 (Gigabit Ethernet)
+PowerMac3,4:Power Macintosh G4 (Digital Audio)
+PowerMac3,5:Power Macintosh G4 (Quick Silver)
+PowerMac3,6:Power Macintosh G4 (Mirrored Drive Door)
+PowerMac4,1:iMac G3 (Early/Summer 2001)
+PowerMac4,2:iMac G4 (Flat Panel)
+PowerMac4,4:eMac
+PowerMac4,5:iMac G4 (17-inch Flat Panel)
+PowerMac5,1:Power Macintosh G4 Cube
+PowerMac6,1:iMac G4 (USB 2.0)
+PowerMac6,3:iMac G4 (20-inch Flat Panel)
+PowerMac6,4:eMac (USB 2.0, 2005)
+PowerMac7,2:Power Macintosh G5
+PowerMac7,3:Power Macintosh G5
+PowerMac8,1:iMac G5
+PowerMac8,2:iMac G5 (Ambient Light Sensor)
+PowerMac9,1:Power Macintosh G5 (Late 2005)
+PowerMac10,1:Mac Mini G4
+PowerMac10,2:Mac Mini (Late 2005)
+PowerMac11,2:Power Macintosh G5 (Late 2005)
+PowerMac12,1:iMac G5 (iSight)
+Xserve1,1:Xserve
+RackMac1,1:Xserve G4
+RackMac1,2:Xserve G4 (slot-loading, cluster node)
+RackMac3,1:Xserve G5


Property changes on: data/ModelTranslation.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: includes/os/class.Darwin.inc.php
===================================================================
--- includes/os/class.Darwin.inc.php	2009-04-18 11:05:45 UTC (rev 191)
+++ includes/os/class.Darwin.inc.php	2009-04-18 11:36:37 UTC (rev 192)
@@ -105,26 +105,25 @@
     {
         $results = array ();
         $buf = "";
+	$buffer = array();
         if (!CommonFunctions::executeProgram('hostinfo', '| grep "Processor type"', $buf, PSI_DEBUG)) {
             $buf = 'N.A.';
         }
         $results['model'] = ereg_replace('Processor type: ', '', $buf);
         $results['cpus'] = $this->grabkey('hw.ncpu');
-        // return cpu speed - Mhz
         $results['cpuspeed'] = round($this->grabkey('hw.cpufrequency')/1000000);
-        // return bus speed - Mhz
         $results['busspeed'] = round($this->grabkey('hw.busfrequency')/1000000);
-        // return l2 cache
         $results['cache'] = round($this->grabkey('hw.l2cachesize'));
-        if (($this->grabkey('hw.model') == "PowerMac3,6") && ($results['cpus'] == "2")) {
-            $results['model'] = 'Dual G4 - (PowerPC 7450)';
-        } // is Dual G4
-        if (($this->grabkey('hw.model') == "PowerMac7,2") && ($results['cpus'] == "2")) {
-            $results['model'] = 'Dual G5 - (PowerPC 970)';
-        } // is Dual G5
-        if (($this->grabkey('hw.model') == "PowerMac1,1") && ($results['cpus'] == "1")) {
-            $results['model'] = 'B&W G3 - (PowerPC 750)';
-        } // is B&W G3
+       
+        if(CommonFunctions::rfts(APP_ROOT.'/data/ModelTranslation.txt', $buffer)) {
+            $buffer = split("\n", $buffer);
+            foreach($buffer as $line) { 
+                $ar_buf = split(":", $line, 2);
+                if ($modelRAW === trim($ar_buf[0])) {
+                    $results['model'] = trim($ar_buf[1]); 
+                }
+            }
+        }
         return $results;
     }
 


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