| 325,14 → 325,16 |
|---|
| $swap1 = preg_split('/M/', $swapBuff); |
| $swap2 = preg_split('/=/', $swap1[1]); |
| $swap3 = preg_split('/=/', $swap1[2]); |
| $dev = new DiskDevice(); |
| $dev->setName('SWAP'); |
| $dev->setMountPoint('SWAP'); |
| $dev->setFsType('swap'); |
| $dev->setTotal($swap1[0] * 1024 * 1024); |
| $dev->setUsed($swap2[1] * 1024 * 1024); |
| $dev->setFree($swap3[1] * 1024 * 1024); |
| $this->sys->setSwapDevices($dev); |
| if (($swap=trim($swap1[0])) > 0) { |
| $dev = new DiskDevice(); |
| $dev->setName('SWAP'); |
| $dev->setMountPoint('SWAP'); |
| $dev->setFsType('swap'); |
| $dev->setTotal($swap * 1024 * 1024); |
| $dev->setUsed(trim($swap2[1]) * 1024 * 1024); |
| $dev->setFree(trim($swap3[1]) * 1024 * 1024); |
| $this->sys->setSwapDevices($dev); |
| } |
| } |
| } |
| } |
| 413,28 → 415,37 |
|---|
| protected function distro() |
| { |
| $this->sys->setDistributionIcon('Darwin.png'); |
| if (!CommonFunctions::executeProgram('system_profiler', 'SPSoftwareDataType', $buffer, PSI_DEBUG)) { |
| if ((!CommonFunctions::executeProgram('system_profiler', 'SPSoftwareDataType', $buffer, PSI_DEBUG) || !preg_match('/\n\s*System Version:/', $buffer)) |
| && (!CommonFunctions::executeProgram('sw_vers', '', $buffer, PSI_DEBUG) || !preg_match('/^ProductName:/', $buffer))) { |
| parent::distro(); |
| } else { |
| $arrBuff = preg_split("/\n/", $buffer, -1, PREG_SPLIT_NO_EMPTY); |
| foreach ($arrBuff as $line) { |
| $arrLine = preg_split("/:/", $line, -1, PREG_SPLIT_NO_EMPTY); |
| if (trim($arrLine[0]) === "System Version") { |
| $distro = trim($arrLine[1]); |
| |
| if (preg_match('/^Mac OS|^OS X|^macOS/', $distro)) { |
| $this->sys->setDistributionIcon('Apple.png'); |
| if (preg_match('/(^Mac OS X Server|^Mac OS X|^OS X Server|^OS X|^macOS Server|^macOS) (\d+\.\d+)/', $distro, $ver) |
| && ($list = @parse_ini_file(PSI_APP_ROOT."/data/osnames.ini", true)) |
| && isset($list['OS X'][$ver[2]])) { |
| $distro.=' '.$list['OS X'][$ver[2]]; |
| $distro_tmp = preg_split("/\n/", $buffer, -1, PREG_SPLIT_NO_EMPTY); |
| foreach ($distro_tmp as $info) { |
| $info_tmp = preg_split('/:/', $info, 2); |
| if (isset($distro_tmp[0]) && !is_null($distro_tmp[0]) && (trim($distro_tmp[0]) != "") && |
| isset($distro_tmp[1]) && !is_null($distro_tmp[1]) && (trim($distro_tmp[1]) != "")) { |
| $distro_arr[trim($info_tmp[0])] = trim($info_tmp[1]); |
| } |
| } |
| if (isset($distro_arr['ProductName']) && isset($distro_arr['ProductVersion']) && isset($distro_arr['BuildVersion'])) { |
| $distro_arr['System Version'] = $distro_arr['ProductName'].' '.$distro_arr['ProductVersion'].' ('.$distro_arr['BuildVersion'].')'; |
| } |
| if (isset($distro_arr['System Version'])) { |
| $distro = $distro_arr['System Version']; |
| if (preg_match('/^Mac OS|^OS X|^macOS/', $distro)) { |
| $this->sys->setDistributionIcon('Apple.png'); |
| if (preg_match('/(^Mac OS X Server|^Mac OS X|^OS X Server|^OS X|^macOS Server|^macOS) ((\d+)\.\d+)/', $distro, $ver) |
| && ($list = @parse_ini_file(PSI_APP_ROOT."/data/osnames.ini", true))) { |
| if (isset($list['macOS'][$ver[2]])) { |
| $distro.=' '.$list['macOS'][$ver[2]]; |
| } elseif (isset($list['macOS'][$ver[3]])) { |
| $distro.=' '.$list['macOS'][$ver[3]]; |
| } |
| } |
| |
| $this->sys->setDistribution($distro); |
| |
| return; |
| } |
| $this->sys->setDistribution($distro); |
| } else { |
| parent::distro(); |
| } |
| } |
| } |