[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[700] branches/namiltd-ini
Brought to you by:
namiltd
|
From: <na...@us...> - 2012-09-16 12:08:19
|
Revision: 700
http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=700&view=rev
Author: namiltd
Date: 2012-09-16 12:08:13 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
PCLinuxOS to detected distros
Modified Paths:
--------------
branches/namiltd-ini/ChangeLog
branches/namiltd-ini/config.php
branches/namiltd-ini/data/distros.ini
Added Paths:
-----------
branches/namiltd-ini/gfx/images/PCLinuxOS.png
Modified: branches/namiltd-ini/ChangeLog
===================================================================
--- branches/namiltd-ini/ChangeLog 2012-09-15 11:57:13 UTC (rev 699)
+++ branches/namiltd-ini/ChangeLog 2012-09-16 12:08:13 UTC (rev 700)
@@ -2,7 +2,7 @@
phpSysInfo 3.1.0
- - [ADD] Turbolinux and Oracle Linux to detected distros
+ - [ADD] Turbolinux, Oracle Linux and PCLinuxOS to detected distros
- [ADD] Show System Language and Code Page on Linux and WINNT
- [ADD] Minor support of ReactOS
Modified: branches/namiltd-ini/config.php
===================================================================
--- branches/namiltd-ini/config.php 2012-09-15 11:57:13 UTC (rev 699)
+++ branches/namiltd-ini/config.php 2012-09-16 12:08:13 UTC (rev 700)
@@ -43,7 +43,7 @@
define('PSI_VERSION_STRING', PSI_VERSION);
}
- /* get Linux code page */
+ /* get Linux charset */
if (PHP_OS == 'Linux'){
if (file_exists ('/etc/sysconfig/i18n')){
$contents = @file_get_contents('/etc/sysconfig/i18n');
@@ -51,12 +51,15 @@
$contents = @file_get_contents('/etc/default/locale');
} else if (file_exists ('/etc/locale.conf')){
$contents = @file_get_contents('/etc/locale.conf');
+ } else if (file_exists ('/etc/sysconfig/language')){
+ $contents = @file_get_contents('/etc/sysconfig/language');
} else $contents = false;
- if ($contents && preg_match("/^(LANG=\".*\")/m", $contents, $matches)) {
+ if ($contents && ( preg_match("/^(LANG=\".*\")/m", $contents, $matches)
+ || preg_match("/^RC_(LANG=\".*\")/m", $contents, $matches))) {
if (@exec($matches[1].' locale -k LC_CTYPE 2>/dev/null', $lines)) {
foreach ($lines as $line) {
if ($contents && preg_match("/^charmap=\"(.*)\"/m", $line, $matches2)) {
- define('PSI_SYSTEM_CODEPAGE', $matches2[1]);
+ define('PSI_SYSTEM_CHARSET', $matches2[1]);
break;
}
}
@@ -73,7 +76,7 @@
if ($lang == ""){
$lang = 'Unknown';
}
- define('PSI_SYSTEM_SYSLANG', $lang.' ('.$matches2[1].')');
+ define('PSI_SYSTEM_LANGUAGE', $lang.' ('.$matches2[1].')');
break;
}
}
@@ -81,11 +84,11 @@
}
}
- if (!defined('PSI_SYSTEM_SYSLANG')){
- define('PSI_SYSTEM_SYSLANG', null);
+ if (!defined('PSI_SYSTEM_CHARSET')){
+ define('PSI_SYSTEM_CHARSET', null);
}
- if (!defined('PSI_SYSTEM_CODEPAGE')){
- define('PSI_SYSTEM_CODEPAGE', null);
+ if (!defined('PSI_SYSTEM_LANGUAGE')){
+ define('PSI_SYSTEM_LANGUAGE', null);
}
/* restore error level */
Modified: branches/namiltd-ini/data/distros.ini
===================================================================
--- branches/namiltd-ini/data/distros.ini 2012-09-15 11:57:13 UTC (rev 699)
+++ branches/namiltd-ini/data/distros.ini 2012-09-16 12:08:13 UTC (rev 700)
@@ -12,14 +12,6 @@
Image = "Suse.png"
Files = "/etc/SuSE-release;/etc/UnitedLinux-release"
-[Mandrake]
-Image = "Mandrake.png"
-Files = "/etc/mandrake-release"
-
-[MandrivaLinux]
-Image = "Mandrake.png"
-Files = "/etc/mandrake-release"
-
[Gentoo]
Image = "Gentoo.png"
Files = "/etc/gentoo-release"
@@ -62,7 +54,7 @@
[Ubuntu]
Image = "Ubuntu.png"
-;Files = "/etc/lsb-release"
+;detected in "/etc/lsb-release"
[PLD]
Image = "PLD.png"
@@ -71,7 +63,7 @@
[CentOS]
Image = "CentOS.png"
Files = "/etc/centos-release"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[LFS]
Image = "lfs.png"
@@ -83,7 +75,7 @@
[IYCC]
Image = "iycc.png"
-;Files = "/etc/lsb-release"
+;detected in "/etc/lsb-release"
[Synology]
Name = "Synology"
@@ -96,31 +88,31 @@
[Scientific]
Image = "Scientific.png"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[Scientific Linux]
Image = "Scientific.png"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[ScientificSL]
Image = "Scientific.png"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[ScientificCERNSLC]
Image = "Scientific.png"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[ScientificFermiLTS]
Image = "Scientific.png"
-;also Files = "/etc/t-release"
+;detected in "/etc/redhat-release"
[ScientificSLF]
Image = "Scientific.png"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[LinuxMint]
Image = "Mint.png"
-;Files = "/etc/lsb-release"
+;detected in "/etc/lsb-release"
[Mageia]
Image = "Mageia.png"
@@ -128,7 +120,7 @@
[Chakra]
Image = "Chakra.png"
-;Files = "/etc/lsb-release"
+;detected in "/etc/lsb-release"
[Alpine]
Name = "Alpine"
@@ -137,20 +129,20 @@
[Puppy]
Image = "Puppy.png"
-;Files = "/etc/DISTRO_SPECS"
+;detected in "/etc/DISTRO_SPECS"
[Lucid]
Name = "Lucid Puppy"
Image = "Puppy.png"
-;Files = "/etc/DISTRO_SPECS"
+;detected in "/etc/DISTRO_SPECS"
[Slacko Puppy]
Image = "Puppy.png"
-;Files = "/etc/DISTRO_SPECS"
+;detected in "/etc/DISTRO_SPECS"
[Wary Puppy]
Image = "Puppy.png"
-;Files = "/etc/DISTRO_SPECS"
+;detected in "/etc/DISTRO_SPECS"
[Turbolinux]
Image = "Turbo.png"
@@ -159,25 +151,39 @@
[Oracle]
Image = "Oracle.png"
Files = "/etc/oracle-release"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[OracleServer]
Image = "Oracle.png"
Files = "/etc/oracle-release"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
-; at the end because some distros may also have the same files (like CentOS, Oracle, Scientific etc)
+[PCLinuxOS]
+Image = "PCLinuxOS.png"
+Files = "/etc/pclinuxos-release"
+
+; at the end because some distros may also have the same files (like PCLinuxOS etc)
+[MandrivaLinux]
+Image = "Mandrake.png"
+Files = "/etc/mandiva-release"
+
+; at the end because some distros may also have the same files (like MandivaLinux, PCLinuxOS etc)
+[Mandrake]
+Image = "Mandrake.png"
+Files = "/etc/mandrake-release;/etc/mandrakelinux-release"
+
+; at the end because some distros may also have the same files (like CentOS, Oracle, Scientific, Mandrake, MandivaLinux, PCLinuxOS etc)
[RedHat]
Image = "Redhat.png"
Files = "/etc/redhat_version"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[RedHatEnterpriseES]
Image = "Redhat.png"
Files = "/etc/redhat_version"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
[RedHatEnterpriseAS]
Image = "Redhat.png"
Files = "/etc/redhat_version"
-;detected Files = "/etc/redhat-release"
+;detected in "/etc/redhat-release"
Added: branches/namiltd-ini/gfx/images/PCLinuxOS.png
===================================================================
(Binary files differ)
Property changes on: branches/namiltd-ini/gfx/images/PCLinuxOS.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|