[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[712] trunk/includes/os/class.Linux.inc.php
Brought to you by:
namiltd
Menu
▾
▴
[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[712] trunk/includes/os/class.Linux.inc.php
|
From: <na...@us...> - 2012-12-05 14:09:25
|
Revision: 712
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=712&view=rev
Author: namiltd
Date: 2012-12-05 14:09:18 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/includes/os/class.Linux.inc.php
Modified: trunk/includes/os/class.Linux.inc.php
===================================================================
--- trunk/includes/os/class.Linux.inc.php 2012-12-05 12:54:33 UTC (rev 711)
+++ trunk/includes/os/class.Linux.inc.php 2012-12-05 14:09:18 UTC (rev 712)
@@ -262,7 +262,7 @@
}
}
// sparc64 specific code ends
-
+
// XScale detection code
if ($dev->getModel() === "") {
foreach ($details as $detail) {
@@ -451,10 +451,17 @@
foreach ($bufe2 as $buf2) {
if (preg_match('/\s+encap:Ethernet\s+HWaddr\s(\S*)/i', $buf2, $ar_buf2))
$dev->setInfo(preg_replace('/:/', '-', $ar_buf2[1]));
+ else if (preg_match('/^\s+inet\saddr:(\S*)\s+P-t-P:(\S*)/i', $buf2, $ar_buf2)) {
+ if ($ar_buf2[1] != $ar_buf2[2]) {
+ $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1].";:".$ar_buf2[2]);
+ } else {
+ $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+ }
+ }
else if (preg_match('/^\s+inet\saddr:(\S*)/i', $buf2, $ar_buf2))
- $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
- else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
- $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+ $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+ else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
+ $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
}
}
$this->sys->setNetDevices($dev);
@@ -522,6 +529,7 @@
*/
private function _distro()
{
+ $this->sys->setDistribution("Linux");
$list = @parse_ini_file(APP_ROOT."/data/distros.ini", true);
if (!$list) {
return;
@@ -531,77 +539,166 @@
$distro_tmp = preg_split("/\n/", $distro_info, -1, PREG_SPLIT_NO_EMPTY);
foreach ($distro_tmp as $info) {
$info_tmp = preg_split('/:/', $info, 2);
- $distro[$info_tmp[0]] = trim($info_tmp[1]);
+ 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[$info_tmp[0]] = trim($info_tmp[1]);
+ }
}
- if (isset($distro['Distributor ID']) && isset($list[$distro['Distributor ID']]['Image'])) {
- $this->sys->setDistributionIcon($list[$distro['Distributor ID']]['Image']);
+ if (!isset($distro['Distributor ID']) && !isset($distro['Description'])) {
+ if ( !is_null($distro_tmp[0]) && (trim($distro_tmp[0]) != "") ) {
+ $this->sys->setDistribution(trim($distro_tmp[0]));
+ if ( preg_match('/^(\S+)\s*/', $distro_tmp[0], $id_buf)
+ && isset($list[trim($id_buf[1])]['Image'])) {
+ $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']);
+ }
+ }
+ } else {
+ if (isset($distro['Description'])) {
+ $this->sys->setDistribution($distro['Description']);
+ } else if (isset($distro['Distributor ID'])) {
+ $this->sys->setDistribution($distro['Distributor ID']);
+ }
+ if (isset($distro['Distributor ID']) && isset($list[$distro['Distributor ID']]['Image'])) {
+ $this->sys->setDistributionIcon($list[$distro['Distributor ID']]['Image']);
+ }
}
- if (isset($distro['Description'])) {
- $this->sys->setDistribution($distro['Description']);
+ } else {
+ /* default error handler */
+ if (function_exists('errorHandlerPsi')) {
+ restore_error_handler();
}
- } else {
- // Fall back in case 'lsb_release' does not exist ;)
+ /* fatal errors only */
+ $old_err_rep = error_reporting();
+ error_reporting(E_ERROR);
+
+ // Fall back in case 'lsb_release' does not exist
foreach ($list as $section=>$distribution) {
- if (!isset($distribution["Files"])) {
+ if (!isset($distribution['Files'])) {
continue;
} else {
- foreach (preg_split("/;/", $distribution["Files"], -1, PREG_SPLIT_NO_EMPTY) as $filename) {
+ foreach (preg_split("/;/", $distribution['Files'], -1, PREG_SPLIT_NO_EMPTY) as $filename) {
if (file_exists($filename)) {
- CommonFunctions::rfts($filename, $buf);
-
- // lsb-release file
- if (preg_match('/^DISTRIB_ID=(.*)/m', $buf, $id_buf)) {
- if (preg_match('/^DISTRIB_DESCRIPTION="(.*)"/m', $buf, $desc_buf)) {
- $this->sys->setDistribution(trim($desc_buf[1]));
+ if (!CommonFunctions::rfts($filename, $buf, 1, 4096, false)) {
+ $buf = "";
+ }
+ if (isset($distribution['Image'])) {
+ $this->sys->setDistributionIcon($distribution['Image']);
+ }
+ if (isset($distribution['Name'])) {
+ if (($distribution['Name'] == 'Synology') || is_null($buf) || (trim($buf) == "")) {
+ $this->sys->setDistribution($distribution['Name']);
} else {
- if (isset($list[trim($id_buf[1])]['Name'])) {
- $dist = trim($list[trim($id_buf[1])]['Name']);
- } else {
- $dist = trim($id_buf[1]);
- }
- if (preg_match('/^DISTRIB_RELEASE=(.*)/m', $buf, $vers_buf)) {
- $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1])));
- } else {
- $this->sys->setDistribution($dist);
- }
+ $this->sys->setDistribution($distribution['Name']." ".trim($buf));
}
- if (isset($list[trim($id_buf[1])]['Image'])) {
- $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']);
- }
- // DISTRO_SPECS file
- } else if (preg_match('/^DISTRO_NAME=\'(.*)\'/m', $buf, $id_buf)) {
- if (isset($list[trim($id_buf[1])]['Name'])) {
- $dist = trim($list[trim($id_buf[1])]['Name']);
- } else {
- $dist = trim($id_buf[1]);
- }
- if (preg_match('/^DISTRO_VERSION=(.*)/m', $buf, $vers_buf)) {
- $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1])));
- } else {
- $this->sys->setDistribution($dist);
- }
- if (isset($list[trim($id_buf[1])]['Image'])) {
- $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']);
- }
} else {
- if (isset($distribution["Image"])) {
- $this->sys->setDistributionIcon($distribution["Image"]);
- }
- if (isset($distribution["Name"])) {
- if ($distribution["Name"] == 'Synology') {
- $this->sys->setDistribution($distribution["Name"]);
- } else {
- $this->sys->setDistribution($distribution["Name"]." ".trim($buf));
- }
+ if ( is_null($buf) || (trim($buf) == "") ) {
+ $this->sys->setDistribution($section);
} else {
$this->sys->setDistribution(trim($buf));
}
}
- return;
+ break 2;
}
}
}
}
+ // Otherwise, if no files found
+ if ($this->sys->getDistribution() == "Linux") {
+ if ( file_exists($filename="/etc/lsb-release")
+ && CommonFunctions::rfts($filename, $buf, 0, 4096, false)
+ && preg_match('/^DISTRIB_ID="?([^"\n]*)"?/m', $buf, $id_buf) ) {
+ if (preg_match('/^DISTRIB_DESCRIPTION="?([^"\n]*)"?/m', $buf, $desc_buf)) {
+ $this->sys->setDistribution(trim($desc_buf[1]));
+ } else {
+ if (isset($list[trim($id_buf[1])]['Name'])) {
+ $dist = trim($list[trim($id_buf[1])]['Name']);
+ } else {
+ $dist = trim($id_buf[1]);
+ }
+ if (preg_match('/^DISTRIB_RELEASE="?([^"\n]*)"?/m', $buf, $vers_buf)) {
+ $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1])));
+ } else {
+ $this->sys->setDistribution($dist);
+ }
+ }
+ if (isset($list[trim($id_buf[1])]['Image'])) {
+ $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']);
+ }
+ } else
+ if ( file_exists($filename="/etc/DISTRO_SPECS")
+ && CommonFunctions::rfts($filename, $buf, 0, 4096, false)
+ && preg_match('/^DISTRO_NAME=\'(.*)\'/m', $buf, $id_buf) ) {
+ if (isset($list[trim($id_buf[1])]['Name'])) {
+ $dist = trim($list[trim($id_buf[1])]['Name']);
+ } else {
+ $dist = trim($id_buf[1]);
+ }
+ if (preg_match('/^DISTRO_VERSION=(.*)/m', $buf, $vers_buf)) {
+ $this->sys->setDistribution(trim($dist." ".trim($vers_buf[1])));
+ } else {
+ $this->sys->setDistribution($dist);
+ }
+ if (isset($list[trim($id_buf[1])]['Image'])) {
+ $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']);
+ } else {
+ if (isset($list['Puppy']['Image'])) {
+ $this->sys->setDistributionIcon($list['Puppy']['Image']);
+ }
+ }
+ } else
+ if (file_exists($filename="/etc/redhat-release")) {
+ if (!CommonFunctions::rfts($filename, $buf, 1, 4096, false)) {
+ $buf = "";
+ }
+ if ( is_null($buf) || (trim($buf) == "") ) {
+ if (isset($list['RedHat']['Name'])) {
+ $this->sys->setDistribution(trim($list['RedHat']['Name']));
+ } else {
+ $this->sys->setDistribution('RedHat');
+ }
+ if (isset($list['RedHat']['Image'])) {
+ $this->sys->setDistributionIcon($list['RedHat']['Image']);
+ }
+ } else {
+ $this->sys->setDistribution(trim($buf));
+ if ( preg_match('/^(\S+)\s*/', $buf, $id_buf)
+ && isset($list[trim($id_buf[1])]['Image'])) {
+ $this->sys->setDistributionIcon($list[trim($id_buf[1])]['Image']);
+ } else {
+ if (isset($list['RedHat']['Image'])) {
+ $this->sys->setDistributionIcon($list['RedHat']['Image']);
+ }
+ }
+ }
+ } else
+ if (file_exists($filename="/etc/debian_version")){
+ if (!CommonFunctions::rfts($filename, $buf, 1, 4096, false)) {
+ $buf = "";
+ }
+ if (isset($list['Debian']['Image'])) {
+ $this->sys->setDistributionIcon($list['Debian']['Image']);
+ }
+ if (isset($list['Debian']['Name'])) {
+ if ( is_null($buf) || (trim($buf) == "")) {
+ $this->sys->setDistribution($list['Debian']['Name']);
+ } else {
+ $this->sys->setDistribution($list['Debian']['Name']." ".trim($buf));
+ }
+ } else {
+ if ( is_null($buf) || (trim($buf) == "") ) {
+ $this->sys->setDistribution('Debian');
+ } else {
+ $this->sys->setDistribution(trim($buf));
+ }
+ }
+ }
+ }
+ /* restore error level */
+ error_reporting($old_err_rep);
+ /* restore error handler */
+ if (function_exists('errorHandlerPsi')) {
+ set_error_handler('errorHandlerPsi');
+ }
}
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|