WebSVN – ALCASAR – Diff – //web/acc/phpsysinfo/includes/os/class.Linux.inc.php

     private $_uptime = null;
     /**
      * Assoc array of all CPUs loads.
      */
-    private $_cpu_loads = null;
+    protected $_cpu_loads = null;
     /**
      * Version string.
      */
     private $_kernel_string = null;
+            }
             if (isset($this->_machine_info['machine'])) {
                 $this->_machine_info['machine'] = trim(preg_replace("/^\/,?/", "", preg_replace("/ ?(To be filled by O\.E\.M\.|System manufacturer|System Product Name|Not Specified|Default string) ?/i", "", $this->_machine_info['machine'])));
+            }
-            if (defined('PSI_SHOW_VIRTUALIZER_INFO') && PSI_SHOW_VIRTUALIZER_INFO && ($this->system_detect_virt === null) && count($vendor_array)>0) {
+            if (defined('PSI_SHOW_VIRTUALIZER_INFO') && PSI_SHOW_VIRTUALIZER_INFO && ($this->system_detect_virt === null) && count($vendor_array) > 0) {
                 $virt = CommonFunctions::decodevirtualizer($vendor_array);
                 if ($virt !== null) {
                     $this->_machine_info['hypervisor'] = $virt;
+                }
+            }
      */
     private function _get_kernel_string()
+    {
         if ($this->_kernel_string === null) {
             $this->_kernel_string = "";
+            if ($this->sys->getOS() == 'SSH') {
+                if (CommonFunctions::executeProgram('uname', '-s', $strBuf, false) && ($strBuf !== '')) {
+                    $this->sys->setOS($strBuf);
+                } else {
+                    return $this->_kernel_string;
+                }
+            }
-            if (CommonFunctions::executeProgram($uname="uptrack-uname", '-r', $strBuf, false) || // show effective kernel if ksplice uptrack is installed
+            if ((CommonFunctions::executeProgram($uname="uptrack-uname", '-r', $strBuf, false) && ($strBuf !== '')) || // show effective kernel if ksplice uptrack is installed
-                CommonFunctions::executeProgram($uname="uname", '-r', $strBuf, PSI_DEBUG)) {
+                (CommonFunctions::executeProgram($uname="uname", '-r', $strBuf, PSI_DEBUG) && ($strBuf !== ''))) {
                 $this->_kernel_string = $strBuf;
-                if (CommonFunctions::executeProgram($uname, '-v', $strBuf, PSI_DEBUG)) {
+                if (CommonFunctions::executeProgram($uname, '-v', $strBuf, PSI_DEBUG) && ($strBuf !== '')) {
                     if (preg_match('/ SMP /', $strBuf)) {
                         $this->_kernel_string .= ' (SMP)';
+                    }
+                }
-                if (CommonFunctions::executeProgram($uname, '-m', $strBuf, PSI_DEBUG)) {
+                if (CommonFunctions::executeProgram($uname, '-m', $strBuf, PSI_DEBUG) && ($strBuf !== '')) {
                     $this->_kernel_string .= ' '.$strBuf;
+                }
             } elseif (CommonFunctions::rfts('/proc/version', $strBuf, 1)) {
+                if (preg_match('/\/Hurd-([^\)]+)/', $strBuf, $ar_buf)) {
+                    $this->_kernel_string = $ar_buf[1];
-                if (preg_match('/version\s+(\S+)/', $strBuf, $ar_buf)) {
+                } elseif (preg_match('/version\s+(\S+)/', $strBuf, $ar_buf)) {
                     $this->_kernel_string = $ar_buf[1];
                     if (preg_match('/ SMP /', $strBuf)) {
                         $this->_kernel_string .= ' (SMP)';
+                    }
+                }
         return $this->_kernel_string;
+    }
     /**
+     * check OS type
+     */
+    public function __construct($blockname = false)
+    {
+        parent::__construct($blockname);
+        $this->_get_kernel_string();
+    }
+    /**
      * Machine
+     *
      * @return void
      */
-    private function _machine()
+    protected function _machine()
+    {
         $machine_info = $this->_get_machine_info();
         if (isset($machine_info['machine'])) {
             $machine = $machine_info['machine'];
         } else {
+     *
      * @return void
      */
     protected function _hostname()
+    {
-        if (PSI_USE_VHOST) {
+        if (PSI_USE_VHOST && !defined('PSI_EMU_PORT')) {
             if (CommonFunctions::readenv('SERVER_NAME', $hnm)) $this->sys->setHostname($hnm);
         } else {
             if (CommonFunctions::rfts('/proc/sys/kernel/hostname', $result, 1, 4096, PSI_DEBUG && (PSI_OS != 'Android'))) {
                 $result = trim($result);
                 $ip = gethostbyname($result);
     /**
      * Kernel Version
+     *
      * @return void
      */
-    private function _kernel()
+    protected function _kernel()
+    {
         if (($verBuf = $this->_get_kernel_string()) != "") {
             $this->sys->setKernel($verBuf);
+        }
+    }
             $cpuvirt = $this->sys->getVirtualizer(); // previous info from _cpuinfo()
             $novm = true;
             // code based on src/basic/virt.c from systemd-detect-virt source code (https://github.com/systemd/systemd)
-            // First, try to detect Oracle Virtualbox and Amazon EC2 Nitro, even if they use KVM, as well as Xen even if
+            // First, try to detect Oracle Virtualbox, Amazon EC2 Nitro and Parallels, even if they use KVM,
-            // it cloaks as Microsoft Hyper-V. Attempt to detect uml at this stage also since it runs as a user-process
+            // as well as Xen even if it cloaks as Microsoft Hyper-V. Attempt to detect uml at this stage also
-            // nested inside other VMs. Also check for Xen now, because Xen PV mode does not override CPUID when nested
+            // since it runs as a user-process nested inside other VMs. Also check for Xen now, because Xen PV
-            // inside another hypervisor.
+            // mode does not override CPUID when nested inside another hypervisor.
             $machine_info = $this->_get_machine_info();
             if (isset($machine_info['hypervisor'])) {
                 $hypervisor = $machine_info['hypervisor'];
-                if (($hypervisor === 'oracle') || ($hypervisor === 'amazon') || ($hypervisor === 'xen')) {
+                if (($hypervisor === 'oracle') || ($hypervisor === 'amazon') || ($hypervisor === 'xen') || ($hypervisor === 'parallels')) {
                     $this->sys->setVirtualizer($hypervisor);
                     $novm = false;
+                }
+            }
      * UpTime
      * time the system is running
+     *
      * @return void
      */
-    protected function _uptime()
+    protected function _uptime($bufu = null)
+    {
         if (CommonFunctions::rfts('/proc/uptime', $buf, 1, 4096, PSI_OS != 'Android')) {
             $ar_buf = preg_split('/ /', $buf);
             $this->sys->setUptime(trim($ar_buf[0]));
-        } elseif (($this->_uptime !== null) || CommonFunctions::executeProgram('uptime', '', $this->_uptime)) {
+        } elseif (($this->_uptime !== null) || ($bufu !== null) || CommonFunctions::executeProgram('uptime', '', $bufu)) {
+            if (($this->_uptime === null) && ($bufu !== null)) {
+                $this->_uptime = $bufu;
+            }
             if (preg_match("/up (\d+) day[s]?,[ ]+(\d+):(\d+),/", $this->_uptime, $ar_buf)) {
                 $min = $ar_buf[3];
                 $hours = $ar_buf[2];
                 $days = $ar_buf[1];
                 $this->sys->setUptime($days * 86400 + $hours * 3600 + $min * 60);
                 $this->sys->setUptime($days * 86400 + $min * 60);
             } elseif (preg_match("/up[ ]+(\d+):(\d+),/", $this->_uptime, $ar_buf)) {
                 $min = $ar_buf[2];
                 $hours = $ar_buf[1];
                 $this->sys->setUptime($hours * 3600 + $min * 60);
+            } elseif (preg_match("/up[ ]+(\d+):(\d+):(\d+)/", $this->_uptime, $ar_buf)) {
+                $sec = $ar_buf[3];
+                $min = $ar_buf[2];
+                $hours = $ar_buf[1];
+                $this->sys->setUptime($hours * 3600 + $min * 60 + $sec);
             } elseif (preg_match("/up[ ]+(\d+) min,/", $this->_uptime, $ar_buf)) {
                 $min = $ar_buf[1];
                 $this->sys->setUptime($min * 60);
+            } elseif (preg_match("/up[ ]+(\d+) day[s]?,[ ]+(\d+) hour[s]?,[ ]+(\d+) minute[s]?/", $this->_uptime, $ar_buf)) {
+                $min = $ar_buf[3];
+                $hours = $ar_buf[2];
+                $days = $ar_buf[1];
+                $this->sys->setUptime($days * 86400 + $hours * 3600 + $min * 60);
+            }
+        }
+    }
     /**
      * Processor Load
      * optionally create a loadbar
+     *
      * @return void
      */
-    protected function _loadavg()
+    protected function _loadavg($buf = null)
+    {
-        if (CommonFunctions::rfts('/proc/loadavg', $buf, 1, 4096, PSI_OS != 'Android')) {
+        if ((($buf !== null) || CommonFunctions::rfts('/proc/loadavg', $buf, 1, 4096, PSI_OS != 'Android')) && preg_match("/^\d/", trim($buf))) {
             $result = preg_split("/\s/", $buf, 4);
             // don't need the extra values, only first three
             unset($result[3]);
             $this->sys->setLoad(implode(' ', $result));
-        } elseif ((($this->_uptime !== null) || CommonFunctions::executeProgram('uptime', '', $this->_uptime)) && preg_match("/load average: (.*), (.*), (.*)$/", $this->_uptime, $ar_buf)) {
+        } elseif (($buf === null) && ((($this->_uptime !== null) || CommonFunctions::executeProgram('uptime', '', $this->_uptime)) && preg_match("/load average: (.*), (.*), (.*)$/", $this->_uptime, $ar_buf))) {
-            $this->sys->setLoad($ar_buf[1].' '.$ar_buf[2].' '.$ar_buf[3]);
+              $this->sys->setLoad($ar_buf[1].' '.$ar_buf[2].' '.$ar_buf[3]);
+        }
         if (PSI_LOAD_BAR) {
             $this->sys->setLoadPercent($this->_parseProcStat('cpu'));
+        }
+    }
      * CPU information
      * All of the tags here are highly architecture dependant.
+     *
      * @return void
      */
-    protected function _cpuinfo()
+    protected function _cpuinfo($bufr = null)
+    {
-        if (CommonFunctions::rfts('/proc/cpuinfo', $bufr)) {
+        if (($bufr !== null) || CommonFunctions::rfts('/proc/cpuinfo', $bufr)) {
             $cpulist = null;
             $raslist = null;
             // sparc
             if (preg_match('/\nCpu(\d+)Bogo\s*:/i', $bufr)) {
                             $_revi = $arrBuff1;
                             break;
                         case 'cpu frequency':
                             if (preg_match('/^(\d+)\s+Hz/i', $arrBuff1, $bufr2)) {
                                 $_cpus = round($bufr2[1]/1000000);
+                            } elseif (preg_match('/^(\d+)\s+MHz/i', $arrBuff1, $bufr2)) {
+                                $_cpus = $bufr2[1];
+                            }
                             break;
                         case 'system bus frequency':
                             if (preg_match('/^(\d+)\s+Hz/i', $arrBuff1, $bufr2)) {
                                 $_buss = round($bufr2[1]/1000000);
+                            } elseif (preg_match('/^(\d+)\s+MHz/i', $arrBuff1, $bufr2)) {
+                                $_buss = $bufr2[1];
+                            }
                             break;
                         case 'bogomips per cpu':
                             $_bogo = round($arrBuff1);
                             break;
                     if ((count($arrBuff) == 2) && (($arrBuff1 = trim($arrBuff[1])) !== '')) {
                         switch (strtolower($arrBuff[0])) {
                         case 'processor':
                             $proc = $arrBuff1;
                             if (is_numeric($proc)) {
-                                if (($procname !== null) && (strlen($procname)>0)) {
+                                if (($procname !== null) && (strlen($procname) > 0)) {
                                     $dev->setModel($procname);
+                                }
                             } else {
                                 $procname = $proc;
                                 $dev->setModel($procname);
                         case 'cpu model':
                         case 'cpu type':
                         case 'cpu':
                             $dev->setModel($arrBuff1);
                             break;
+                        case 'cpu frequency':
+                            if (preg_match('/^(\d+)\s+Hz/i', $arrBuff1, $bufr2)) {
+                                if (($tmpsp = round($bufr2[1]/1000000)) > 0) {
+                                    $dev->setCpuSpeed($tmpsp);
+                                    $speedset = true;
+                                }
+                            } elseif (preg_match('/^(\d+)\s+MHz/i', $arrBuff1, $bufr2)) {
+                                if ($bufr2[1] > 0) {
+                                    $dev->setCpuSpeed($bufr2[1]);
+                                    $speedset = true;
+                                }
+                            }
+                            break;
                         case 'cpu mhz':
                         case 'clock':
-                            if ($arrBuff1 > 0) { // openSUSE fix
+                            if ($arrBuff1 > 0) {
                                 $dev->setCpuSpeed($arrBuff1);
                                 $speedset = true;
+                            }
                             break;
                         case 'cpu mhz static':
-                            if ($arrBuff1 > 0) { // openSUSE fix
-                                $dev->setCpuSpeedMax($arrBuff1);
+                            $dev->setCpuSpeedMax($arrBuff1);
-                            }
                             break;
                         case 'cycle frequency [hz]':
+                            if (($tmpsp = round($arrBuff1/1000000)) > 0) {
-                            $dev->setCpuSpeed($arrBuff1 / 1000000);
+                                $dev->setCpuSpeed($tmpsp);
-                            $speedset = true;
+                                $speedset = true;
+                            }
                             break;
-                        case 'cpu0clktck':
+                        case 'cpu0clktck': // Linux sparc64
-                            $dev->setCpuSpeed(hexdec($arrBuff1) / 1000000); // Linux sparc64
+                            if (($tmpsp = round(hexdec($arrBuff1)/1000000)) > 0) {
+                                $dev->setCpuSpeed($tmpsp);
-                            $speedset = true;
+                                $speedset = true;
+                            }
                             break;
                         case 'l3 cache':
                         case 'cache size':
                             $dev->setCache(trim(preg_replace("/[a-zA-Z]/", "", $arrBuff1)) * 1024);
                             break;
+                    }
+                }
                 // sparc64 specific code ends
                 // XScale detection code
-                if (($arch === "5TE") && ($dev->getBogomips() !== null)) {
+                if (($arch === "5TE") && (($bogo = $dev->getBogomips()) !== null) && ($bogo > 0)) {
-                    $dev->setCpuSpeed($dev->getBogomips()); // BogoMIPS are not BogoMIPS on this CPU, it's the speed
+                    $dev->setCpuSpeed($bogo); // BogoMIPS are not BogoMIPS on this CPU, it's the speed
                     $speedset = true;
                     $dev->setBogomips(null); // no BogoMIPS available, unset previously set BogoMIPS
+                }
                 if (($dev->getBusSpeed() == 0) && ($_buss !== null)) {
                     $dev->setBusSpeed($_buss);
+                }
-                if (($dev->getCpuSpeed() == 0) && ($_cpus !== null)) {
+                if (($dev->getCpuSpeed() == 0) && ($_cpus !== null) && ($_cpus > 0)) {
                     $dev->setCpuSpeed($_cpus);
                     $speedset = true;
+                }
                 if (($dev->getBogomips() == 0) && ($_bogo !== null)) {
                     $dev->setBogomips($_bogo);
                 if ($proc !== null) {
                     if (!is_numeric($proc)) {
                         $proc = 0;
+                    }
                     // variable speed processors specific code follows
-                    if (CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/cpuinfo_cur_freq', $buf, 1, 4096, false)) {
+                    if (CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/cpuinfo_cur_freq', $buf, 1, 4096, false)
-                        $dev->setCpuSpeed(trim($buf) / 1000);
+                       || CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/scaling_cur_freq', $buf, 1, 4096, false)) {
-                        $speedset = true;
+                        if (round(trim($buf)/1000) > 0) {
-                    } elseif (CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/scaling_cur_freq', $buf, 1, 4096, false)) {
-                        $dev->setCpuSpeed(trim($buf) / 1000);
+                            $dev->setCpuSpeed(round(trim($buf)/1000));
-                        $speedset = true;
+                            $speedset = true;
-                    }
+                        }
-                    if (CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/cpuinfo_max_freq', $buf, 1, 4096, false)) {
-                        $dev->setCpuSpeedMax(trim($buf) / 1000);
+                    }
+                    if (CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/cpuinfo_max_freq', $buf, 1, 4096, false)
+                       || CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/scaling_max_freq', $buf, 1, 4096, false)) {
+                        $dev->setCpuSpeedMax(round(trim($buf)/1000));
+                    }
-                    if (CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/cpuinfo_min_freq', $buf, 1, 4096, false)) {
+                    if (CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/cpuinfo_min_freq', $buf, 1, 4096, false)
+                       || CommonFunctions::rfts('/sys/devices/system/cpu/cpu'.$proc.'/cpufreq/scaling_min_freq', $buf, 1, 4096, false)) {
-                        $dev->setCpuSpeedMin(trim($buf) / 1000);
+                        $dev->setCpuSpeedMin(round(trim($buf)/1000));
+                    }
                     // variable speed processors specific code ends
                     if (PSI_LOAD_BAR) {
                             $dev->setLoad($this->_parseProcStat('cpu'.$proc));
+                    }
                     if (($arch !== null) && ($impl !== null) && ($part !== null)) {
                         if (($impl === '0x41')
                            && (($_hard === 'BCM2708') || ($_hard === 'BCM2835') || ($_hard === 'BCM2709') || ($_hard === 'BCM2836') || ($_hard === 'BCM2710') || ($_hard === 'BCM2837') || ($_hard === 'BCM2711') || ($_hard === 'BCM2838'))
                            && ($_revi !== null)) { // Raspberry Pi detection (instead of 'cat /proc/device-tree/model')
                             if ($raslist === null) $raslist = @parse_ini_file(PSI_APP_ROOT."/data/raspberry.ini", true);
+                            $oldmach = $this->sys->getMachine();
+                            if (($oldmach !== '') && preg_match("/^raspberrypi rpi(,.+)/", $oldmach, $machbuf)) {
+                                $oldmachend = $machbuf[1];
+                            } else {
+                                 $oldmachend = '';
+                            }
                             if ($raslist && !preg_match('/[^0-9a-f]/', $_revi)) {
                                 if (($revidec = hexdec($_revi)) & 0x800000) {
-                                    if ($this->sys->getMachine() === '') {
+                                    if (($oldmach === '') || ($oldmachend !== '')) {
                                         $manufacturer = ($revidec >> 16) & 15;
                                         if (isset($raslist['manufacturer'][$manufacturer])) {
                                             $manuf = ' '.$raslist['manufacturer'][$manufacturer];
                                         } else {
                                             $manuf = '';
+                                        }
                                         $model = ($revidec >> 4) & 255;
                                         if (isset($raslist['model'][$model])) {
-                                            $this->sys->setMachine('Raspberry Pi '.$raslist['model'][$model].' (PCB 1.'.($revidec & 15).$manuf.')');
+                                            $this->sys->setMachine('Raspberry Pi '.$raslist['model'][$model].' (PCB 1.'.($revidec & 15).$manuf.')'.$oldmachend);
                                         } else {
-                                            $this->sys->setMachine('Raspberry Pi (PCB 1.'.($revidec & 15).$manuf.')');
+                                            $this->sys->setMachine('Raspberry Pi (PCB 1.'.($revidec & 15).$manuf.')'.$oldmachend);
+                                        }
+                                    }
                                 } else {
-                                    if ($this->sys->getMachine() === '') {
+                                    if (($oldmach === '') || ($oldmachend !== '')) {
                                         if (isset($raslist['old'][$revidec & 0x7fffff])) {
-                                            $this->sys->setMachine('Raspberry Pi '.$raslist['old'][$revidec & 0x7fffff]);
+                                            $this->sys->setMachine('Raspberry Pi '.$raslist['old'][$revidec & 0x7fffff].$oldmachend);
                                         } else {
-                                            $this->sys->setMachine('Raspberry Pi');
+                                            $this->sys->setMachine('Raspberry Pi'.$oldmachend);
+                                        }
+                                    }
+                                }
+                            }
                         } elseif (($_hard !== null) && ($this->sys->getMachine() === '')) { // other ARM hardware
     /**
      * USB devices
+     *
      * @return void
      */
-    protected function _usb()
+    protected function _usb($bufu = null)
+    {
         $usbarray = array();
+        if ($nobufu = ($bufu === null)) {
-        if (CommonFunctions::executeProgram('lsusb', (PSI_OS != 'Android')?'':'2>/dev/null', $bufr, PSI_DEBUG && (PSI_OS != 'Android'), 5) && ($bufr !== "")) {
+            if (CommonFunctions::executeProgram('lsusb', (PSI_OS != 'Android')?'':'2>/dev/null', $bufr, PSI_DEBUG && (PSI_OS != 'Android'), 5) && ($bufr !== "")) {
-            $bufe = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
+                $bufe = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
-            foreach ($bufe as $buf) {
+                foreach ($bufe as $buf) {
-                $device = preg_split("/ /", $buf, 7);
+                    $device = preg_split("/ /", $buf, 7);
-                if (((isset($device[6]) && trim($device[6]) != "")) ||
+                    if (((isset($device[6]) && trim($device[6]) != "")) ||
-                    ((isset($device[5]) && trim($device[5]) != ""))) {
+                        ((isset($device[5]) && trim($device[5]) != ""))) {
-                    $usbid = intval($device[1]).'-'.intval(trim($device[3], ':')).' '.$device[5];
+                        $usbid = intval($device[1]).'-'.intval(trim($device[3], ':')).' '.$device[5];
-                    if ((isset($device[6]) && trim($device[6]) != "")) {
+                        if ((isset($device[6]) && trim($device[6]) != "")) {
-                        $usbarray[$usbid]['name'] = trim($device[6]);
+                            $usbarray[$usbid]['name'] = trim($device[6]);
-                    } else {
+                        } else {
-                        $usbarray[$usbid]['name'] = 'unknown';
+                            $usbarray[$usbid]['name'] = 'unknown';
+                        }
+                    }
+                }
+            }
-        }
-        $usbdevices = CommonFunctions::findglob('/sys/bus/usb/devices/*/idProduct', GLOB_NOSORT);
+            $usbdevices = CommonFunctions::findglob('/sys/bus/usb/devices/*/idProduct', GLOB_NOSORT);
-        if (is_array($usbdevices) && (($total = count($usbdevices)) > 0)) {
+            if (is_array($usbdevices) && (($total = count($usbdevices)) > 0)) {
-            for ($i = 0; $i < $total; $i++) {
+                for ($i = 0; $i < $total; $i++) {
-                if (CommonFunctions::rfts($usbdevices[$i], $idproduct, 1, 4096, false) && (($idproduct=trim($idproduct)) != "")) { // is readable
+                    if (CommonFunctions::rfts($usbdevices[$i], $idproduct, 1, 4096, false) && (($idproduct=trim($idproduct)) != "")) { // is readable
-                    $busnum = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/busnum');
+                        $busnum = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/busnum');
-                    $devnum = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/devnum');
+                        $devnum = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/devnum');
-                    $idvendor = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/idVendor');
+                        $idvendor = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/idVendor');
-                    if (($busnum!==null) && ($devnum!==null) && ($idvendor!==null)) {
+                        if (($busnum!==null) && ($devnum!==null) && ($idvendor!==null)) {
-                        $usbid = intval($busnum).'-'.intval($devnum).' '.$idvendor.':'.$idproduct;
+                            $usbid = intval($busnum).'-'.intval($devnum).' '.$idvendor.':'.$idproduct;
-                        $manufacturer = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/manufacturer');
+                            $manufacturer = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/manufacturer');
-                        if ($manufacturer!==null) {
+                            if ($manufacturer!==null) {
-                            $usbarray[$usbid]['manufacturer'] = $manufacturer;
+                                $usbarray[$usbid]['manufacturer'] = $manufacturer;
-                        }
+                            }
-                        $product = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/product');
+                            $product = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/product');
-                        if ($product!==null) {
+                            if ($product!==null) {
-                            $usbarray[$usbid]['product'] = $product;
+                                $usbarray[$usbid]['product'] = $product;
-                        }
+                            }
-                        $speed = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/speed');
+                            $speed = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/speed');
-                        if ($product!==null) {
+                            if ($product!==null) {
-                            $usbarray[$usbid]['speed'] = $speed;
+                                $usbarray[$usbid]['speed'] = $speed;
-                        }
+                            }
-                        if (defined('PSI_SHOW_DEVICES_INFOS') && PSI_SHOW_DEVICES_INFOS
+                            if (defined('PSI_SHOW_DEVICES_INFOS') && PSI_SHOW_DEVICES_INFOS
-                           && defined('PSI_SHOW_DEVICES_SERIAL') && PSI_SHOW_DEVICES_SERIAL) {
+                               && defined('PSI_SHOW_DEVICES_SERIAL') && PSI_SHOW_DEVICES_SERIAL) {
-                            $serial = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/serial');
+                                $serial = CommonFunctions::rolv($usbdevices[$i], '/\/idProduct$/', '/serial');
-                            if (($serial!==null) && !preg_match('/\W/', $serial)) {
+                                if (($serial!==null) && !preg_match('/\W/', $serial)) {
-                                $usbarray[$usbid]['serial'] = $serial;
+                                    $usbarray[$usbid]['serial'] = $serial;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
-        if ((count($usbarray) == 0) && CommonFunctions::rfts('/proc/bus/usb/devices', $bufr, 0, 4096, false)) { // usb-devices
+        if (!$nobufu || ((count($usbarray) == 0) && CommonFunctions::rfts('/proc/bus/usb/devices', $bufu, 0, 4096, false))) { // usb-devices
             $devnum = -1;
-            $bufe = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
+            $bufe = preg_split("/\n/", $bufu, -1, PREG_SPLIT_NO_EMPTY);
             foreach ($bufe as $buf) {
                 if (preg_match('/^T/', $buf)) {
                     $devnum++;
                     if (preg_match('/\sSpd=([\d\.]+)/', $buf, $bufr)
                        && isset($bufr[1]) && ($bufr[1]!=="")) {
+                    }
+                }
+            }
+        }
-        if ((count($usbarray) == 0) && CommonFunctions::rfts('/proc/bus/input/devices', $bufr, 0, 4096, false)) {
+        if ($nobufu && (count($usbarray) == 0) && CommonFunctions::rfts('/proc/bus/input/devices', $bufr, 0, 4096, false)) {
             $devnam = "unknown";
             $bufe = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
             foreach ($bufe as $buf) {
                 if (preg_match('/^I:\s+(.+)/', $buf, $bufr)
                    && isset($bufr[1]) && (trim($bufr[1])!=="")) {
      * Network devices
      * includes also rx/tx bytes
+     *
      * @return void
      */
-    protected function _network()
+    protected function _network($bufr = null)
+    {
-        if (CommonFunctions::rfts('/proc/net/dev', $bufr, 0, 4096, PSI_DEBUG)) {
+        if (($bufr === null) && CommonFunctions::rfts('/proc/net/dev', $bufr, 0, 4096, PSI_DEBUG)) {
             $bufe = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
             foreach ($bufe as $buf) {
                 if (preg_match('/:/', $buf)) {
                     list($dev_name, $stats_list) = preg_split('/:/', $buf, 2);
                     $stats = preg_split('/\s+/', trim($stats_list));
                                 } elseif ((preg_match('/^\s+inet\saddr:(\S+)/i', $buf2, $ar_buf2)
                                    || preg_match('/^\s+inet\s+(\S+)\s+netmask/i', $buf2, $ar_buf2)
                                    || preg_match('/^'.trim($dev_name).':\s+ip\s+(\S+)\s+mask/i', $buf2, $ar_buf2)
                                    || preg_match('/^\s+inet6\saddr:\s([^\/\s]+)(.+)\s+Scope:[GH]/i', $buf2, $ar_buf2)
                                    || preg_match('/^\s+inet6\s+(\S+)\s+prefixlen(.+)((<global>)|(<host>))/i', $buf2, $ar_buf2)
-                                   || preg_match('/^\s+inet6?\s+([^\/\s]+).*\s+scope\s((global)|(host))/i', $buf2, $ar_buf2))
+                                   || preg_match('/^\s+inet6?\s+([^\/\s]+).*\s+scope\s((global)|(host))/i', $buf2, $ar_buf2)
+                                   || preg_match('/^\s+inet\saddr6:\s+(\S+)\s+prefixlen(.+)/i', $buf2, $ar_buf2))
                                    && ($ar_buf2[1]!="::") && !preg_match('/^fe80::/i', $ar_buf2[1])) {
                                     $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').strtolower($ar_buf2[1]));
+                                }
+                            }
+                        }
+                        }
+                    }
                     $this->sys->setNetDevices($dev);
+                }
+            }
-        } elseif (CommonFunctions::executeProgram('ip', 'addr show', $bufr, PSI_DEBUG) && ($bufr!="")) {
+        } elseif (($bufr === null) && CommonFunctions::executeProgram('ip', 'addr show', $bufr, PSI_DEBUG) && ($bufr!="")) {
             $lines = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
             $was = false;
             $macaddr = "";
             $speedinfo = "";
             $dev = null;
                 if ($speedinfo != "") {
                     $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$speedinfo);
+                }
                 $this->sys->setNetDevices($dev);
+            }
-        } elseif (CommonFunctions::executeProgram('ifconfig', '-a', $bufr, PSI_DEBUG)) {
+        } elseif (($bufr !== null) || CommonFunctions::executeProgram('ifconfig', '-a', $bufr, PSI_DEBUG)) {
             $lines = preg_split("/\n/", $bufr, -1, PREG_SPLIT_NO_EMPTY);
             $was = false;
             $errors = 0;
             $drops = 0;
             $macaddr = "";
                                      $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+                                }
                             } elseif ((preg_match('/^\s+inet\saddr:(\S+)/i', $line, $ar_buf2)
                                   || preg_match('/^\s+inet\s+(\S+)\s+netmask/i', $line, $ar_buf2)
                                   || preg_match('/^\s+inet6\saddr:\s([^\/\s]+)(.+)\s+Scope:[GH]/i', $line, $ar_buf2)
-                                  || preg_match('/^\s+inet6\s+(\S+)\s+prefixlen(.+)((<global>)|(<host>))/i', $line, $ar_buf2))
+                                  || preg_match('/^\s+inet6\s+(\S+)\s+prefixlen(.+)((<global>)|(<host>))/i', $line, $ar_buf2)
+                                  || preg_match('/^\s+inet\saddr6:\s+(\S+)\s+prefixlen(.+)/i', $line, $ar_buf2))
                                   && ($ar_buf2[1]!="::") && !preg_match('/^fe80::/i', $ar_buf2[1])) {
                                 $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').strtolower($ar_buf2[1]));
+                            }
+                        }
+                    }
     /**
      * Physical memory information and Swap Space information
+     *
      * @return void
      */
-    protected function _memory()
+    protected function _memory($mbuf = null, $sbuf = null)
+    {
-        if (CommonFunctions::rfts('/proc/meminfo', $mbuf)) {
+        if (($mbuf !== null) || CommonFunctions::rfts('/proc/meminfo', $mbuf)) {
             $swaptotal = null;
             $swapfree = null;
             $bufe = preg_split("/\n/", $mbuf, -1, PREG_SPLIT_NO_EMPTY);
             foreach ($bufe as $buf) {
                 if (preg_match('/^MemTotal:\s+(\d+)\s*kB/i', $buf, $ar_buf)) {
             $this->sys->setMemUsed($this->sys->getMemTotal() - $this->sys->getMemFree());
             // values for splitting memory usage
             if (($this->sys->getMemCache() !== null) && ($this->sys->getMemBuffer() !== null)) {
                 $this->sys->setMemApplication($this->sys->getMemUsed() - $this->sys->getMemCache() - $this->sys->getMemBuffer());
+            }
-            if (CommonFunctions::rfts('/proc/swaps', $sbuf, 0, 4096, false)) {
+            if (($sbuf !== null) || CommonFunctions::rfts('/proc/swaps', $sbuf, 0, 4096, false)) {
                 $swaps = preg_split("/\n/", $sbuf, -1, PREG_SPLIT_NO_EMPTY);
                 unset($swaps[0]);
                 foreach ($swaps as $swap) {
                     $ar_buf = preg_split('/\s+/', $swap, 5);
                     $dev = new DiskDevice();
     /**
      * filesystem information
+     *
      * @return void
      */
-    private function _filesystems()
+    protected function _filesystems()
+    {
         $df_args = "";
         $hideFstypes = array();
         if (defined('PSI_HIDE_FS_TYPES') && is_string(PSI_HIDE_FS_TYPES)) {
             if (preg_match(ARRAY_EXP, PSI_HIDE_FS_TYPES)) {
                             $this->sys->setDistribution('Debian');
                         } else {
                             $this->sys->setDistribution(trim($buf));
+                        }
+                    }
+                } elseif (CommonFunctions::fileexists($filename="/etc/slackware-version")) {
+                    if (!CommonFunctions::rfts($filename, $buf, 1, 4096, false)) {
+                        $buf = "";
+                    }
+                    if (isset($list['Slackware']['Image'])) {
+                        $this->sys->setDistributionIcon($list['Slackware']['Image']);
+                    }
+                    if (isset($list['Slackware']['Name'])) {
+                        if (($buf === null) || (trim($buf) == "")) {
+                            $this->sys->setDistribution($list['Slackware']['Name']);
+                        } else {
+                            $this->sys->setDistribution($list['Slackware']['Name']." ".trim($buf));
+                        }
+                    } else {
+                        if (($buf === null) || (trim($buf) == "")) {
+                            $this->sys->setDistribution('Slackware');
+                        } else {
+                            $this->sys->setDistribution(trim($buf));
+                        }
+                    }
                 } elseif (CommonFunctions::fileexists($filename="/etc/config/uLinux.conf")
                    && CommonFunctions::rfts($filename, $buf, 0, 4096, false)
                    && preg_match("/^Rsync\sModel\s*=\s*QNAP/m", $buf)
                    && preg_match("/^Version\s*=\s*([\d\.]+)\r?\nBuild\sNumber\s*=\s*(\S+)/m", $buf, $ver_buf)) {
                     $buf = $ver_buf[1]."-".$ver_buf[2];

Subversion Repositories ALCASAR

(root)//web/acc/phpsysinfo/includes/os/class.Linux.inc.php – Rev 3037 → 3100