[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17472] phpsysinfo: upgrade from upstream
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17472] phpsysinfo: upgrade from upstream |
|
Date: |
Tue, 26 Dec 2017 08:13:40 -0500 (EST) |
Revision: 17472
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17472
Author: sigurdne
Date: 2017-12-26 08:13:38 -0500 (Tue, 26 Dec 2017)
Log Message:
-----------
phpsysinfo: upgrade from upstream
Modified Paths:
--------------
trunk/phpsysinfo/.gitignore
trunk/phpsysinfo/.htaccess
trunk/phpsysinfo/.travis.yml
trunk/phpsysinfo/CHANGELOG.md
trunk/phpsysinfo/README.md
trunk/phpsysinfo/data/ModelTranslation.txt
trunk/phpsysinfo/data/distros.ini
trunk/phpsysinfo/data/languages.ini
trunk/phpsysinfo/gfx/body.gif
trunk/phpsysinfo/gfx/images/AIX.png
trunk/phpsysinfo/gfx/images/Alpine.png
trunk/phpsysinfo/gfx/images/Chakra.png
trunk/phpsysinfo/gfx/images/Deepin.png
trunk/phpsysinfo/gfx/images/DragonFly.png
trunk/phpsysinfo/gfx/images/Eisfair.png
trunk/phpsysinfo/gfx/images/HPUX.png
trunk/phpsysinfo/gfx/images/Mageia.png
trunk/phpsysinfo/gfx/images/Minix.png
trunk/phpsysinfo/gfx/images/NetBSD.png
trunk/phpsysinfo/gfx/images/Oracle.png
trunk/phpsysinfo/gfx/images/PCLinuxOS.png
trunk/phpsysinfo/gfx/images/PLD.png
trunk/phpsysinfo/gfx/images/Pear.png
trunk/phpsysinfo/gfx/images/SMS.png
trunk/phpsysinfo/gfx/images/Sabayon.png
trunk/phpsysinfo/gfx/images/Salix.png
trunk/phpsysinfo/gfx/images/Slackware.png
trunk/phpsysinfo/gfx/images/StartOS.png
trunk/phpsysinfo/gfx/images/Synology.png
trunk/phpsysinfo/gfx/images/Vector.png
trunk/phpsysinfo/gfx/images/Win8.png
trunk/phpsysinfo/gfx/images/antiX.png
trunk/phpsysinfo/gfx/images/elementaryOS.png
trunk/phpsysinfo/gfx/images/gNewSense.png
trunk/phpsysinfo/gfx/images/iycc.png
trunk/phpsysinfo/gfx/next.gif
trunk/phpsysinfo/gfx/prev.gif
trunk/phpsysinfo/gfx/treeTable/tv-collapsable-last.gif
trunk/phpsysinfo/gfx/treeTable/tv-expandable-last.gif
trunk/phpsysinfo/gfx/treeTable/tv-expandable.gif
trunk/phpsysinfo/includes/autoloader.inc.php
trunk/phpsysinfo/includes/class.CommonFunctions.inc.php
trunk/phpsysinfo/includes/class.Parser.inc.php
trunk/phpsysinfo/includes/interface/class.PSI_Interface_OS.inc.php
trunk/phpsysinfo/includes/interface/class.PSI_Interface_Output.inc.php
trunk/phpsysinfo/includes/interface/class.PSI_Interface_Plugin.inc.php
trunk/phpsysinfo/includes/interface/class.PSI_Interface_Sensor.inc.php
trunk/phpsysinfo/includes/interface/class.PSI_Interface_UPS.inc.php
trunk/phpsysinfo/includes/js/class.JavaScriptPacker.inc.php
trunk/phpsysinfo/includes/mb/class.coretemp.inc.php
trunk/phpsysinfo/includes/mb/class.hddtemp.inc.php
trunk/phpsysinfo/includes/mb/class.healthd.inc.php
trunk/phpsysinfo/includes/mb/class.hwsensors.inc.php
trunk/phpsysinfo/includes/mb/class.k8temp.inc.php
trunk/phpsysinfo/includes/mb/class.lmsensors.inc.php
trunk/phpsysinfo/includes/mb/class.mbm5.inc.php
trunk/phpsysinfo/includes/mb/class.mbmon.inc.php
trunk/phpsysinfo/includes/mb/class.pitemp.inc.php
trunk/phpsysinfo/includes/mb/class.sensors.inc.php
trunk/phpsysinfo/includes/os/class.AIX.inc.php
trunk/phpsysinfo/includes/os/class.Android.inc.php
trunk/phpsysinfo/includes/os/class.BSDCommon.inc.php
trunk/phpsysinfo/includes/os/class.Darwin.inc.php
trunk/phpsysinfo/includes/os/class.DragonFly.inc.php
trunk/phpsysinfo/includes/os/class.FreeBSD.inc.php
trunk/phpsysinfo/includes/os/class.HPUX.inc.php
trunk/phpsysinfo/includes/os/class.Haiku.inc.php
trunk/phpsysinfo/includes/os/class.Linux.inc.php
trunk/phpsysinfo/includes/os/class.Minix.inc.php
trunk/phpsysinfo/includes/os/class.NetBSD.inc.php
trunk/phpsysinfo/includes/os/class.OS.inc.php
trunk/phpsysinfo/includes/os/class.OpenBSD.inc.php
trunk/phpsysinfo/includes/os/class.SunOS.inc.php
trunk/phpsysinfo/includes/os/class.WINNT.inc.php
trunk/phpsysinfo/includes/output/class.Output.inc.php
trunk/phpsysinfo/includes/output/class.Template.inc.php
trunk/phpsysinfo/includes/output/class.Webpage.inc.php
trunk/phpsysinfo/includes/output/class.WebpageXML.inc.php
trunk/phpsysinfo/includes/output/class.WebpageXSLT.inc.php
trunk/phpsysinfo/includes/plugin/class.PSI_Plugin.inc.php
trunk/phpsysinfo/includes/to/class.MBInfo.inc.php
trunk/phpsysinfo/includes/to/class.System.inc.php
trunk/phpsysinfo/includes/to/class.UPSInfo.inc.php
trunk/phpsysinfo/includes/to/device/class.CpuDevice.inc.php
trunk/phpsysinfo/includes/to/device/class.DiskDevice.inc.php
trunk/phpsysinfo/includes/to/device/class.HWDevice.inc.php
trunk/phpsysinfo/includes/to/device/class.NetDevice.inc.php
trunk/phpsysinfo/includes/to/device/class.SensorDevice.inc.php
trunk/phpsysinfo/includes/to/device/class.UPSDevice.inc.php
trunk/phpsysinfo/includes/ups/class.apcupsd.inc.php
trunk/phpsysinfo/includes/ups/class.nut.inc.php
trunk/phpsysinfo/includes/ups/class.ups.inc.php
trunk/phpsysinfo/includes/xml/class.SimpleXMLExtended.inc.php
trunk/phpsysinfo/includes/xml/class.XML.inc.php
trunk/phpsysinfo/index.php
trunk/phpsysinfo/js/jQuery/README
trunk/phpsysinfo/js/jQuery/jquery-1.js
trunk/phpsysinfo/js/jQuery/jquery.dataTables.js
trunk/phpsysinfo/js/jQuery/jquery.jgrowl.js
trunk/phpsysinfo/js/jQuery/jquery.js
trunk/phpsysinfo/js/jQuery/jquery.nyroModal.js
trunk/phpsysinfo/js/jQuery/jquery.treeTable.js
trunk/phpsysinfo/js/phpSysInfo/phpsysinfo.js
trunk/phpsysinfo/js.php
trunk/phpsysinfo/language/ast.xml
trunk/phpsysinfo/language/bg.xml
trunk/phpsysinfo/language/cz.xml
trunk/phpsysinfo/language/da.xml
trunk/phpsysinfo/language/de.xml
trunk/phpsysinfo/language/en.xml
trunk/phpsysinfo/language/es.xml
trunk/phpsysinfo/language/et.xml
trunk/phpsysinfo/language/fi.xml
trunk/phpsysinfo/language/fr.xml
trunk/phpsysinfo/language/gl.xml
trunk/phpsysinfo/language/gr.xml
trunk/phpsysinfo/language/hu.xml
trunk/phpsysinfo/language/is.xml
trunk/phpsysinfo/language/it.xml
trunk/phpsysinfo/language/ja.xml
trunk/phpsysinfo/language/ko.xml
trunk/phpsysinfo/language/language.php
trunk/phpsysinfo/language/nl.xml
trunk/phpsysinfo/language/no.xml
trunk/phpsysinfo/language/pl.xml
trunk/phpsysinfo/language/pt-br.xml
trunk/phpsysinfo/language/pt-pt.xml
trunk/phpsysinfo/language/ro.xml
trunk/phpsysinfo/language/ru.xml
trunk/phpsysinfo/language/sk.xml
trunk/phpsysinfo/language/sl.xml
trunk/phpsysinfo/language/sv.xml
trunk/phpsysinfo/language/th.xml
trunk/phpsysinfo/language/tr.xml
trunk/phpsysinfo/language/translation-plugin.xsd
trunk/phpsysinfo/language/translation.xsd
trunk/phpsysinfo/language/tw.xml
trunk/phpsysinfo/language/uk.xml
trunk/phpsysinfo/language/zh.xml
trunk/phpsysinfo/phpsysinfo.ini
trunk/phpsysinfo/phpsysinfo.ini.new
trunk/phpsysinfo/phpsysinfo.xslt
trunk/phpsysinfo/phpsysinfo3.xsd
trunk/phpsysinfo/plugins/bat/class.bat.inc.php
trunk/phpsysinfo/plugins/bat/js/bat.js
trunk/phpsysinfo/plugins/bat/lang/cz.xml
trunk/phpsysinfo/plugins/bat/lang/en.xml
trunk/phpsysinfo/plugins/bat/lang/fr.xml
trunk/phpsysinfo/plugins/bat/lang/pl.xml
trunk/phpsysinfo/plugins/bat/lang/ru.xml
trunk/phpsysinfo/plugins/mdstatus/class.mdstatus.inc.php
trunk/phpsysinfo/plugins/mdstatus/js/mdstatus.js
trunk/phpsysinfo/plugins/mdstatus/lang/cz.xml
trunk/phpsysinfo/plugins/mdstatus/lang/de.xml
trunk/phpsysinfo/plugins/mdstatus/lang/en.xml
trunk/phpsysinfo/plugins/mdstatus/lang/fr.xml
trunk/phpsysinfo/plugins/mdstatus/lang/gr.xml
trunk/phpsysinfo/plugins/mdstatus/lang/ru.xml
trunk/phpsysinfo/plugins/ps/class.ps.inc.php
trunk/phpsysinfo/plugins/ps/js/ps.js
trunk/phpsysinfo/plugins/ps/lang/cz.xml
trunk/phpsysinfo/plugins/ps/lang/de.xml
trunk/phpsysinfo/plugins/ps/lang/en.xml
trunk/phpsysinfo/plugins/ps/lang/fr.xml
trunk/phpsysinfo/plugins/ps/lang/gr.xml
trunk/phpsysinfo/plugins/ps/lang/pl.xml
trunk/phpsysinfo/plugins/ps/lang/ru.xml
trunk/phpsysinfo/plugins/psstatus/class.psstatus.inc.php
trunk/phpsysinfo/plugins/psstatus/css/psstatus.css
trunk/phpsysinfo/plugins/psstatus/js/psstatus.js
trunk/phpsysinfo/plugins/psstatus/lang/cz.xml
trunk/phpsysinfo/plugins/psstatus/lang/de.xml
trunk/phpsysinfo/plugins/psstatus/lang/en.xml
trunk/phpsysinfo/plugins/psstatus/lang/fr.xml
trunk/phpsysinfo/plugins/psstatus/lang/gr.xml
trunk/phpsysinfo/plugins/psstatus/lang/pl.xml
trunk/phpsysinfo/plugins/psstatus/lang/ru.xml
trunk/phpsysinfo/plugins/quotas/class.quotas.inc.php
trunk/phpsysinfo/plugins/quotas/css/quotas.css
trunk/phpsysinfo/plugins/quotas/js/quotas.js
trunk/phpsysinfo/plugins/quotas/lang/cz.xml
trunk/phpsysinfo/plugins/quotas/lang/de.xml
trunk/phpsysinfo/plugins/quotas/lang/en.xml
trunk/phpsysinfo/plugins/quotas/lang/fr.xml
trunk/phpsysinfo/plugins/quotas/lang/pl.xml
trunk/phpsysinfo/plugins/quotas/lang/ru.xml
trunk/phpsysinfo/plugins/smart/class.smart.inc.php
trunk/phpsysinfo/plugins/smart/css/smart.css
trunk/phpsysinfo/plugins/smart/js/smart.js
trunk/phpsysinfo/plugins/smart/lang/cz.xml
trunk/phpsysinfo/plugins/smart/lang/en.xml
trunk/phpsysinfo/plugins/smart/lang/fr.xml
trunk/phpsysinfo/plugins/smart/lang/gr.xml
trunk/phpsysinfo/plugins/smart/lang/pl.xml
trunk/phpsysinfo/plugins/snmppinfo/class.snmppinfo.inc.php
trunk/phpsysinfo/plugins/snmppinfo/js/snmppinfo.js
trunk/phpsysinfo/plugins/snmppinfo/lang/cz.xml
trunk/phpsysinfo/plugins/snmppinfo/lang/en.xml
trunk/phpsysinfo/plugins/snmppinfo/lang/pl.xml
trunk/phpsysinfo/plugins/snmppinfo/lang/ru.xml
trunk/phpsysinfo/plugins/updatenotifier/class.updatenotifier.inc.php
trunk/phpsysinfo/plugins/updatenotifier/js/updatenotifier.js
trunk/phpsysinfo/plugins/updatenotifier/lang/cz.xml
trunk/phpsysinfo/plugins/updatenotifier/lang/en.xml
trunk/phpsysinfo/plugins/updatenotifier/lang/fr.xml
trunk/phpsysinfo/plugins/updatenotifier/lang/pl.xml
trunk/phpsysinfo/plugins/updatenotifier/lang/ru.xml
trunk/phpsysinfo/setup/setup.inc.php
trunk/phpsysinfo/setup/tables_update.inc.php
trunk/phpsysinfo/templates/aqua.css
trunk/phpsysinfo/templates/clean.css
trunk/phpsysinfo/templates/cream.css
trunk/phpsysinfo/templates/html/error_config.html
trunk/phpsysinfo/templates/html/index_all.html
trunk/phpsysinfo/templates/html/index_dynamic.html
trunk/phpsysinfo/templates/jstyle_blue.css
trunk/phpsysinfo/templates/jstyle_green.css
trunk/phpsysinfo/templates/nextgen.css
trunk/phpsysinfo/templates/phpsysinfo.css
trunk/phpsysinfo/templates/plugin/jquery.dataTables.css
trunk/phpsysinfo/templates/two.css
trunk/phpsysinfo/tools/check.sh
trunk/phpsysinfo/tools/phpsysinfo.ini
trunk/phpsysinfo/xml.php
Added Paths:
-----------
trunk/phpsysinfo/data/cpus.ini
trunk/phpsysinfo/data/osnames.ini
trunk/phpsysinfo/data/raspberry.ini
trunk/phpsysinfo/gfx/ajax-loader.gif
trunk/phpsysinfo/gfx/attention.gif
trunk/phpsysinfo/gfx/blank.gif
trunk/phpsysinfo/gfx/bullet_toggle_minus.gif
trunk/phpsysinfo/gfx/bullet_toggle_plus.gif
trunk/phpsysinfo/gfx/down_black.gif
trunk/phpsysinfo/gfx/down_gray.gif
trunk/phpsysinfo/gfx/favicon.gif
trunk/phpsysinfo/gfx/favicon.ico
trunk/phpsysinfo/gfx/images/4MLinux.png
trunk/phpsysinfo/gfx/images/Amazon.png
trunk/phpsysinfo/gfx/images/BOSS.png
trunk/phpsysinfo/gfx/images/Calculate.png
trunk/phpsysinfo/gfx/images/Canaima.png
trunk/phpsysinfo/gfx/images/Cloud.png
trunk/phpsysinfo/gfx/images/Container.png
trunk/phpsysinfo/gfx/images/CoreOS.png
trunk/phpsysinfo/gfx/images/Devuan.png
trunk/phpsysinfo/gfx/images/Generations.png
trunk/phpsysinfo/gfx/images/Gobo.png
trunk/phpsysinfo/gfx/images/Handy.png
trunk/phpsysinfo/gfx/images/HipServ.png
trunk/phpsysinfo/gfx/images/KaOS.png
trunk/phpsysinfo/gfx/images/Korora.png
trunk/phpsysinfo/gfx/images/LFS.png
trunk/phpsysinfo/gfx/images/Lakka.png
trunk/phpsysinfo/gfx/images/LibreELEC.png
trunk/phpsysinfo/gfx/images/Lunar.png
trunk/phpsysinfo/gfx/images/Mer.png
trunk/phpsysinfo/gfx/images/NeoKylin.png
trunk/phpsysinfo/gfx/images/NixOS.png
trunk/phpsysinfo/gfx/images/OpenELEC.png
trunk/phpsysinfo/gfx/images/OpenMamba.png
trunk/phpsysinfo/gfx/images/OpenMandriva.png
trunk/phpsysinfo/gfx/images/Parsix.png
trunk/phpsysinfo/gfx/images/Pisi.png
trunk/phpsysinfo/gfx/images/PureOS.png
trunk/phpsysinfo/gfx/images/QNX.png
trunk/phpsysinfo/gfx/images/QTS.png
trunk/phpsysinfo/gfx/images/Qubes.png
trunk/phpsysinfo/gfx/images/Raspbian.png
trunk/phpsysinfo/gfx/images/RedFlag.png
trunk/phpsysinfo/gfx/images/RedHat.png
trunk/phpsysinfo/gfx/images/SMEServer.png
trunk/phpsysinfo/gfx/images/SUSE.png
trunk/phpsysinfo/gfx/images/SalentOS.png
trunk/phpsysinfo/gfx/images/Semplice.png
trunk/phpsysinfo/gfx/images/SliTaz.png
trunk/phpsysinfo/gfx/images/Solus.png
trunk/phpsysinfo/gfx/images/SolydXK.png
trunk/phpsysinfo/gfx/images/SteamOS.png
trunk/phpsysinfo/gfx/images/Tails.png
trunk/phpsysinfo/gfx/images/Tanglu.png
trunk/phpsysinfo/gfx/images/TinyCore.png
trunk/phpsysinfo/gfx/images/Tizen.png
trunk/phpsysinfo/gfx/images/UltimateEdition.png
trunk/phpsysinfo/gfx/images/Void.png
trunk/phpsysinfo/gfx/images/VortexBox.png
trunk/phpsysinfo/gfx/images/Zenwalk.png
trunk/phpsysinfo/gfx/images/openSUSE.png
trunk/phpsysinfo/gfx/images/pfSense.png
trunk/phpsysinfo/gfx/logo_32.gif
trunk/phpsysinfo/gfx/reload.gif
trunk/phpsysinfo/gfx/right_black.gif
trunk/phpsysinfo/gfx/right_gray.gif
trunk/phpsysinfo/gfx/sort_asc.gif
trunk/phpsysinfo/gfx/sort_both.gif
trunk/phpsysinfo/gfx/sort_desc.gif
trunk/phpsysinfo/includes/error/class.PSI_Error.inc.php
trunk/phpsysinfo/includes/mb/class.freeipmi.inc.php
trunk/phpsysinfo/includes/mb/class.hwmon.inc.php
trunk/phpsysinfo/includes/mb/class.ipmitool.inc.php
trunk/phpsysinfo/includes/mb/class.ipmiutil.inc.php
trunk/phpsysinfo/includes/mb/class.ohm.inc.php
trunk/phpsysinfo/includes/mb/class.qtssnmp.inc.php
trunk/phpsysinfo/includes/mb/class.speedfan.inc.php
trunk/phpsysinfo/includes/mb/class.thermalzone.inc.php
trunk/phpsysinfo/includes/os/class.QNX.inc.php
trunk/phpsysinfo/includes/ups/class.pmset.inc.php
trunk/phpsysinfo/includes/ups/class.powersoftplus.inc.php
trunk/phpsysinfo/includes/ups/class.snmpups.inc.php
trunk/phpsysinfo/js/jQuery/README_bootstrap
trunk/phpsysinfo/js/jQuery/jquery.ifixpng.js
trunk/phpsysinfo/js/jQuery/jquery.timer.js
trunk/phpsysinfo/js/jQuery/jquery.treegrid.js
trunk/phpsysinfo/js/phpSysInfo/phpsysinfo_bootstrap.js
trunk/phpsysinfo/js/vendor/
trunk/phpsysinfo/js/vendor/README
trunk/phpsysinfo/js/vendor/bootstrap-modal.js
trunk/phpsysinfo/js/vendor/console-shim.js
trunk/phpsysinfo/js/vendor/html5shiv-printshiv.js
trunk/phpsysinfo/js/vendor/respond.js
trunk/phpsysinfo/js/vendor/sorttable.js
trunk/phpsysinfo/js/vendor/transparency.js
trunk/phpsysinfo/language/ca.xml
trunk/phpsysinfo/language/he.xml
trunk/phpsysinfo/plugins/bat/bat_bootstrap.html
trunk/phpsysinfo/plugins/bat/js/bat_bootstrap.js
trunk/phpsysinfo/plugins/bat/lang/de.xml
trunk/phpsysinfo/plugins/bat/lang/ro.xml
trunk/phpsysinfo/plugins/dmraid/
trunk/phpsysinfo/plugins/dmraid/class.dmraid.inc.php
trunk/phpsysinfo/plugins/dmraid/css/
trunk/phpsysinfo/plugins/dmraid/css/dmraid.css
trunk/phpsysinfo/plugins/dmraid/dmraid_bootstrap.html
trunk/phpsysinfo/plugins/dmraid/gfx/
trunk/phpsysinfo/plugins/dmraid/gfx/error.png
trunk/phpsysinfo/plugins/dmraid/gfx/harddrivefail.png
trunk/phpsysinfo/plugins/dmraid/gfx/harddriveok.png
trunk/phpsysinfo/plugins/dmraid/gfx/harddrivespare.png
trunk/phpsysinfo/plugins/dmraid/gfx/harddrivewarn.png
trunk/phpsysinfo/plugins/dmraid/js/
trunk/phpsysinfo/plugins/dmraid/js/dmraid.js
trunk/phpsysinfo/plugins/dmraid/js/dmraid_bootstrap.js
trunk/phpsysinfo/plugins/dmraid/lang/
trunk/phpsysinfo/plugins/dmraid/lang/en.xml
trunk/phpsysinfo/plugins/dmraid/lang/fr.xml
trunk/phpsysinfo/plugins/dmraid/lang/ro.xml
trunk/phpsysinfo/plugins/dmraid/lang/ru.xml
trunk/phpsysinfo/plugins/iptables/
trunk/phpsysinfo/plugins/iptables/class.iptables.inc.php
trunk/phpsysinfo/plugins/iptables/iptables_bootstrap.html
trunk/phpsysinfo/plugins/iptables/js/
trunk/phpsysinfo/plugins/iptables/js/iptables.js
trunk/phpsysinfo/plugins/iptables/js/iptables_bootstrap.js
trunk/phpsysinfo/plugins/iptables/lang/
trunk/phpsysinfo/plugins/iptables/lang/en.xml
trunk/phpsysinfo/plugins/iptables/lang/ru.xml
trunk/phpsysinfo/plugins/mdstatus/gfx/harddrivewarn.png
trunk/phpsysinfo/plugins/mdstatus/js/mdstatus_bootstrap.js
trunk/phpsysinfo/plugins/mdstatus/lang/ro.xml
trunk/phpsysinfo/plugins/mdstatus/mdstatus_bootstrap.html
trunk/phpsysinfo/plugins/pingtest/
trunk/phpsysinfo/plugins/pingtest/class.pingtest.inc.php
trunk/phpsysinfo/plugins/pingtest/css/
trunk/phpsysinfo/plugins/pingtest/css/pingtest.css
trunk/phpsysinfo/plugins/pingtest/js/
trunk/phpsysinfo/plugins/pingtest/js/pingtest.js
trunk/phpsysinfo/plugins/pingtest/js/pingtest_bootstrap.js
trunk/phpsysinfo/plugins/pingtest/lang/
trunk/phpsysinfo/plugins/pingtest/lang/de.xml
trunk/phpsysinfo/plugins/pingtest/lang/en.xml
trunk/phpsysinfo/plugins/pingtest/lang/pl.xml
trunk/phpsysinfo/plugins/pingtest/pingtest_bootstrap.html
trunk/phpsysinfo/plugins/ps/js/ps_bootstrap.js
trunk/phpsysinfo/plugins/ps/lang/ro.xml
trunk/phpsysinfo/plugins/ps/lang/uk.xml
trunk/phpsysinfo/plugins/ps/ps_bootstrap.html
trunk/phpsysinfo/plugins/psstatus/gfx/offline.gif
trunk/phpsysinfo/plugins/psstatus/gfx/online.gif
trunk/phpsysinfo/plugins/psstatus/js/psstatus_bootstrap.js
trunk/phpsysinfo/plugins/psstatus/lang/ro.xml
trunk/phpsysinfo/plugins/psstatus/lang/uk.xml
trunk/phpsysinfo/plugins/psstatus/psstatus_bootstrap.html
trunk/phpsysinfo/plugins/quotas/js/quotas_bootstrap.js
trunk/phpsysinfo/plugins/quotas/lang/ro.xml
trunk/phpsysinfo/plugins/quotas/quotas_bootstrap.html
trunk/phpsysinfo/plugins/smart/js/smart_bootstrap.js
trunk/phpsysinfo/plugins/smart/lang/ro.xml
trunk/phpsysinfo/plugins/smart/smart_bootstrap.html
trunk/phpsysinfo/plugins/snmppinfo/js/snmppinfo_bootstrap.js
trunk/phpsysinfo/plugins/snmppinfo/lang/de.xml
trunk/phpsysinfo/plugins/snmppinfo/lang/fr.xml
trunk/phpsysinfo/plugins/snmppinfo/lang/ro.xml
trunk/phpsysinfo/plugins/snmppinfo/snmppinfo_bootstrap.html
trunk/phpsysinfo/plugins/updatenotifier/js/updatenotifier_bootstrap.js
trunk/phpsysinfo/plugins/updatenotifier/lang/de.xml
trunk/phpsysinfo/plugins/updatenotifier/lang/ro.xml
trunk/phpsysinfo/plugins/updatenotifier/updatenotifier_bootstrap.html
trunk/phpsysinfo/plugins/uprecords/
trunk/phpsysinfo/plugins/uprecords/class.uprecords.inc.php
trunk/phpsysinfo/plugins/uprecords/js/
trunk/phpsysinfo/plugins/uprecords/js/uprecords.js
trunk/phpsysinfo/plugins/uprecords/js/uprecords_bootstrap.js
trunk/phpsysinfo/plugins/uprecords/lang/
trunk/phpsysinfo/plugins/uprecords/lang/en.xml
trunk/phpsysinfo/plugins/uprecords/lang/fr.xml
trunk/phpsysinfo/plugins/uprecords/lang/hu.xml
trunk/phpsysinfo/plugins/uprecords/lang/pl.xml
trunk/phpsysinfo/plugins/uprecords/lang/ro.xml
trunk/phpsysinfo/plugins/uprecords/lang/ru.xml
trunk/phpsysinfo/plugins/uprecords/uprecords_bootstrap.html
trunk/phpsysinfo/read_config.php
trunk/phpsysinfo/templates/blue/bar.png
trunk/phpsysinfo/templates/blue/barwarn.png
trunk/phpsysinfo/templates/blue/bg.png
trunk/phpsysinfo/templates/blue/title.png
trunk/phpsysinfo/templates/blue.css
trunk/phpsysinfo/templates/cleansyn.css
trunk/phpsysinfo/templates/dark_bootstrap.css
trunk/phpsysinfo/templates/green_bootstrap.css
trunk/phpsysinfo/templates/html/index_bootstrap.html
trunk/phpsysinfo/templates/idash/
trunk/phpsysinfo/templates/idash/bg.png
trunk/phpsysinfo/templates/idash/html.gif
trunk/phpsysinfo/templates/idash/htmlwarn.gif
trunk/phpsysinfo/templates/idash.css
trunk/phpsysinfo/templates/lingruby/
trunk/phpsysinfo/templates/lingruby/background.png
trunk/phpsysinfo/templates/lingruby.css
trunk/phpsysinfo/templates/phpsysinfo_bootstrap.css
trunk/phpsysinfo/templates/phpsysinfo_bootstrap.css.new
trunk/phpsysinfo/templates/schabau.css
trunk/phpsysinfo/templates/vendor/
trunk/phpsysinfo/templates/vendor/bootstrap.min.css
trunk/phpsysinfo/tools/checkdistro.php
trunk/phpsysinfo/tools/cputest.php
trunk/phpsysinfo/tools/distrotest.php
trunk/phpsysinfo/tools/speedfan/
trunk/phpsysinfo/tools/speedfan/SpeedFanGet_bin.zip
trunk/phpsysinfo/tools/speedfan/SpeedFanGet_src.zip
Removed Paths:
-------------
trunk/phpsysinfo/config.php
trunk/phpsysinfo/gfx/attention.png
trunk/phpsysinfo/gfx/bullet_toggle_minus.png
trunk/phpsysinfo/gfx/bullet_toggle_plus.png
trunk/phpsysinfo/gfx/favicon.png
trunk/phpsysinfo/gfx/images/CloudLinux.png
trunk/phpsysinfo/gfx/images/Redhat.png
trunk/phpsysinfo/gfx/images/Suse.png
trunk/phpsysinfo/gfx/images/Tinycore.png
trunk/phpsysinfo/gfx/images/lfs.png
trunk/phpsysinfo/gfx/reload.png
trunk/phpsysinfo/gfx/sort_asc.png
trunk/phpsysinfo/gfx/sort_both.png
trunk/phpsysinfo/gfx/sort_desc.png
trunk/phpsysinfo/includes/error/class.Error.inc.php
trunk/phpsysinfo/includes/mb/class.ipmi.inc.php
trunk/phpsysinfo/js/jQuery/jquery.timers.js
trunk/phpsysinfo/plugins/BAT/class.bat.inc.php
trunk/phpsysinfo/plugins/BAT/js/
trunk/phpsysinfo/plugins/BAT/lang/
trunk/phpsysinfo/plugins/MDStatus/
trunk/phpsysinfo/plugins/PS/class.ps.inc.php
trunk/phpsysinfo/plugins/PS/js/
trunk/phpsysinfo/plugins/PS/lang/
trunk/phpsysinfo/plugins/PSStatus/
trunk/phpsysinfo/plugins/Quotas/class.quotas.inc.php
trunk/phpsysinfo/plugins/Quotas/css/
trunk/phpsysinfo/plugins/Quotas/js/
trunk/phpsysinfo/plugins/Quotas/lang/
trunk/phpsysinfo/plugins/SMART/class.smart.inc.php
trunk/phpsysinfo/plugins/SMART/css/
trunk/phpsysinfo/plugins/SMART/js/
trunk/phpsysinfo/plugins/SMART/lang/
trunk/phpsysinfo/plugins/ipmiinfo/
trunk/phpsysinfo/plugins/psstatus/gfx/offline.png
trunk/phpsysinfo/plugins/psstatus/gfx/online.png
trunk/phpsysinfo/plugins/smart/lang/ru.xml
trunk/phpsysinfo/templates/base/config.tpl
Modified: trunk/phpsysinfo/.gitignore
===================================================================
--- trunk/phpsysinfo/.gitignore 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/.gitignore 2017-12-26 13:13:38 UTC (rev 17472)
@@ -1 +1,2 @@
phpsysinfo.ini
+composer.lock
Modified: trunk/phpsysinfo/.htaccess
===================================================================
--- trunk/phpsysinfo/.htaccess 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/.htaccess 2017-12-26 13:13:38 UTC (rev 17472)
@@ -1,4 +1,11 @@
<files phpsysinfo.ini>
+# Deny all requests from Apache 2.0-2.2
+ <IfModule !mod_authz_core.c>
order deny,allow
deny from all
+ </IfModule>
+# Deny all requests from Apache 2.4+
+ <IfModule mod_authz_core.c>
+ Require all denied
+ </IfModule>
</files>
Modified: trunk/phpsysinfo/.travis.yml
===================================================================
--- trunk/phpsysinfo/.travis.yml 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/.travis.yml 2017-12-26 13:13:38 UTC (rev 17472)
@@ -1,12 +1,14 @@
language: php
php:
- - 5.2
- - 5.3
- 5.4
- 5.5
+ - 5.6
+ - 7.0
+ - 7.1
+ - 7.2
-script: for i in `find . -name "*.php"`; do php -l $i; done;
+script: if find . -name "*.php" -exec php -l {} 2>&1 \; | grep "syntax error,
unexpected"; then exit 1; fi
branches:
only:
Modified: trunk/phpsysinfo/CHANGELOG.md
===================================================================
--- trunk/phpsysinfo/CHANGELOG.md 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/CHANGELOG.md 2017-12-26 13:13:38 UTC (rev 17472)
@@ -3,6 +3,244 @@
http://phpsysinfo.sourceforge.net/
+phpSysInfo 3.2.8
+----------------
+ - [UPD] jQuery 3.2.1
+ - [UPD] French Translation fr.xml
+ - [UPD] CPU usage on WinNT
+ - [UPD] Ukrainian Translation uk.xml
+
+ - [FIX] Fixed incorrect network usage on FreeBSD 11
+ - [FIX] Fixed healthd sensors
+ - [FIX] Fixed displaying for code pages windows-932, windows-949 and
windows-950 for WinNT
+
+ - [ADD] Container Linux, PureOS, OpenELEC, LibreELEC and Lakka to detected
distros
+ - [ADD] FreeIPMI, IPMItool and IPMIutil other information
+ - [ADD] PS plugin - CPU usage
+ - [ADD] PS plugin - MEMORY_USAGE, CPU_USAGE and SHOW_PID1CHILD_EXPANDED
options
+ - [ADD] SMART plugin - WMI access for WinNT
+
+ - [NEW] DATETIME_FORMAT option
+ - [NEW] BLOCKS option - order of data blocks
+ - [NEW] SHOW_NETWORK_ACTIVE_SPEED option
+ - [NEW] Ability to generate only part of the data
+ - [NEW] LOAD_BAR compact mode option
+ - [NEW] PingTest plugin
+
+ - [DEL] Removed deprecated IPMIinfo plugin
+
+phpSysInfo 3.2.7
+----------------
+ - [UPD] jQuery 3.1.1
+ - [UPD] Network interfaces info for WinNT
+ - [UPD] Turkish Translation tr.xml
+ - [UPD] Greek Translation gr.xml
+ - [UPD] Korean Translation ko.xml
+ - [UPD] Ukrainian Translation uk.xml
+
+ - [ADD] Devuan and SalentOS to detected distros
+ - [ADD] HIDE_NETWORK_MACADDR option
+
+ - [NEW] Raspberry Pi detection on Linux
+
+phpSysInfo 3.2.6
+----------------
+ - [UPD] jQuery 3.1.0 and jQuery 1.12.4
+ - [UPD] bootstrap 3.3.7
+ - [UPD] Swedish Translation sv.xml
+ - [UPD] Norwegian Translation no.xml
+
+ - [ADD] NeoKylin and Void to detected distros
+ - [ADD] schabau and lingruby template
+ - [ADD] DMRaid plugin - FreeBSD graid info
+ - [ADD] SNMPPInfo plugin - support for Ricoh printers
+ - [ADD] UpdateNotifier plugin - ACCESS option
+
+ - [NEW] sudo commands list
+ - [NEW] plugin Iptables - iptables rules list
+
+phpSysInfo 3.2.5
+----------------
+ - [UPD] jQuery 2.2.0 and jQuery 1.12.0
+
+ - [ADD] Show network interfaces infos for NetBSD and OpenBSD
+ - [ADD] SHOW_NETWORK_INFOS_EXPANDED option
+ - [ADD] SHOW_MEMORY_INFOS_EXPANDED option
+ - [ADD] QTS, OpenMamba and HipServ to detected distros
+ - [ADD] SNMPups - monitoring UPS via SNMP
+
+ - [NEW] reloading plugins also for frontend "bootstrap"
+ - [NEW] Network speed info on WinNT, Linux, Android, Darwin, NetBSD, OpenBSD
and FreeBSD
+ - [NEW] Coretemp monitoring also on Linux
+ - [NEW] QTSsnmp - SNMP sensors monitoring for QTS Linux
+ - [NEW] Hwmon - sensors monitoring for Linux
+ - [NEW] SpeedFan - sensors monitoring for WinNT
+ - [NEW] Separate configuration sections for motherboard monitoring sensors
programs
+ - [NEW] List of IP addresses of clients authorized to run
+
+phpSysInfo 3.2.4
+----------------
+ - [ADD] Solus to detected distros
+ - [ADD] Uprecords plugin - MAX_ENTRIES option - maximum number of entries to
show
+
+ - [UPD] Refreshing status of all plugins for dynamic mode
+ - [UPD] bootstrap 3.3.6
+
+ - [NEW] language and template selection also for frontend "bootstrap"
+
+ - [FIX] PHP 7 class Error issues
+
+phpSysInfo 3.2.3
+----------------
+ - [UPD] jQuery 2.1.4 and jQuery 1.11.3
+ - [UPD] bootstrap 3.3.5
+
+ - [NEW] I2C devices list on Android and Linux
+
+ - [ADD] blue template
+
+phpSysInfo 3.2.2
+----------------
+ - [UPD] bootstrap 3.3.4
+
+ - [NEW] Thunderbolt (TB) devices list on Darwin
+
+ - [ADD] cleansyn template
+ - [ADD] PS plugin - support for Android
+ - [ADD] PS plugin - SHOW_KTHREADD_EXPANDED option
+ - [ADD] Qubes and HandyLinux to detected distros
+
+ - [FIX] PS plugin - fixed display of the processes tree
+
+phpSysInfo 3.2.1
+----------------
+ - [UPD] bootstrap 3.3.2
+
+ - [NEW] REFRESH parameter also for frontend "bootstrap"
+
+ - [ADD] pfSense to detected distros
+
+ - [FIX] Percentage memory usage
+
+phpSysInfo 3.2.0
+----------------
+ - [UPD] jQuery 2.1.3 and jQuery 1.11.2
+
+ - [NEW] Frontend "bootstrap" with Bootstrap3 and Transparency (JSON)
+
+ - [ADD] Catalan Translation ca.xml
+ - [ADD] Mer (core of Sailfish OS) and Tizen to detected distros
+ - [ADD] ThermalZone sensor support for Linux and Android
+ - [ADD] Temperature, voltage and current sensor for Banana Pi
+
+ - [UPD] German Translation de.xml
+
+phpSysInfo 3.1.17
+----------------
+
+ - [UPD] BAT plugin - capacity unit, cycle count, FreeBSD support
+ - [UPD] Brazilian Portuguese Translation pt-br.xml
+
+ - [ADD] Show the number of processes on Haiku
+ - [ADD] ThermalZone sensor support for WinNT
+ - [ADD] Tanglu to detected distros
+ - [ADD] Android and OS X version name
+
+ - [FIX] Fixed display of treetables
+
+phpSysInfo 3.1.16
+----------------
+
+ - [ADD] Show the number of processes
+ - [ADD] Lunar and 4MLinux to detected distros
+
+phpSysInfo 3.1.15
+----------------
+
+ - [ADD] CoreOS and Pisi Linux to detected distros
+ - [ADD] pmset - UPS support on Darwin (thanks to pelletierr)
+ - [ADD] lspci support on Darwin
+ - [ADD] SHOW_CPULIST_EXPANDED option
+ - [ADD] lxc/docker detection on Linux
+ - [ADD] ability to hide all disks and all network interfaces
+
+ - [FIX] Small CSS fix
+
+ - [UPD] Memory informations on Darwin systems
+ - [UPD] BAT plugin - Darwin support
+
+phpSysInfo 3.1.14
+----------------
+
+ - [ADD] FreeIPMI sensor program support
+ - [ADD] IPMIutil sensor program support
+ - [ADD] PowerSoftPlus (EVER) UPS program support
+ - [ADD] Line frequency for the UPS info
+ - [ADD] SENSOR_EVENTS option - show events of sensors
+ - [ADD] HIDE_RAID_DEVICES option for plugins MDStatus and DMRaid - list of
RAID devices to hide
+ - [ADD] idash template
+
+phpSysInfo 3.1.13
+----------------
+
+ - [UPD] jQuery 2.1.1 and jQuery 1.11.1
+ - [UPD] Romanian Translation ro.xml
+
+ - [ADD] SHOW_CPUINFO_EXPANDED option
+ - [ADD] Machine detection on WINNT, Linux, Android and Darwin systems
+
+phpSysInfo 3.1.12
+----------------
+
+ - [ADD] GoboLinux, UltimateEdition, BOSS, Canaima, VortexBox, KaOS and NixOS
to detected distros
+ - [ADD] OpenHardwareMonitor sensor program support
+ - [ADD] Possibility to define multiple UPS_PROGRAM
+ - [ADD] UPS_NUT_LIST option
+
+ - [FIX] Fixed incorrect network usage on FreeBSD
+
+ - [UPD] SMART plugin - Smartctl --device option value setting method
+
+phpSysInfo 3.1.11
+----------------
+
+ - [ADD] Add Access-Control-Allow-Origin on XML (JSON) interface for Ajax Load
PR#47
+ - [ADD] Generations Linux and SliTaz to detected distros
+ - [ADD] IPMI and LMSensors currents information
+ - [ADD] Plugin IPMIInfo - added powers and currents values
+ - [ADD] Partial support of QNX
+
+ - [FIX] Reduce execution time on Linux systems when showing load average PR#47
+
+phpSysInfo 3.1.10
+----------------
+
+ - [ADD] Zenwalk and Raspbian to detected distros
+
+ - [FIX] /etc/os-release Linux distro detection
+
+phpSysInfo 3.1.9
+----------------
+
+ - [NEW] plugin DMRaid - software raid status
+
+ - [ADD] Calculate, Tails, SMEServer, Semplice, SolydXK, Parsix, RedFlag,
Amazon, Korora, OpenMandriva, SteamOS, ROSA Enterprise Server and ROSA Desktop
Fresh to detected distros
+
+ - [UPD] Rebuilding of the Linux distribution detection
+ - [UPD] jQuery 2.1.0 and jQuery 1.11.0
+
+phpSysInfo 3.1.8
+----------------
+
+ - [ADD] Add printers messages in the XML output
+ - [ADD] PSStatus plugin - added optional regular expression search in the
process name
+ - [ADD] RedHatEnterpriseClient distro icon #40
+ - [ADD] Hebrew Translation he.xml
+
+ - [FIX] BAT plugin - fix for old and new kernel /proc/acpi and
/sys/class/power_supply
+
+ - [UPD] LMSensors name for Mac hardware sensors
+
phpSysInfo 3.1.7
----------------
@@ -58,7 +296,7 @@
phpSysInfo 3.1.3
----------------
- - [ADD] IPFire, Sabayon, PearOS, ClearOS, Frugalware, Fuduntu, Foresight,
Tinycore, ALT Linux, ROSA and RedHatEnterpriseServer to detected distros
+ - [ADD] IPFire, Sabayon, PearOS, ClearOS, Frugalware, Fuduntu, Foresight,
Tinycore, ALT Linux, ROSA Desktop Marathon and RedHatEnterpriseServer to
detected distros
- [UPD] Added "username" to filtered mount credentials
- [UPD] jQuery 2.0 coexistent with jQuery 1.9.1 for old Internet Explorer
browser versions (IE 6/7/8)
Modified: trunk/phpsysinfo/README.md
===================================================================
--- trunk/phpsysinfo/README.md 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/README.md 2017-12-26 13:13:38 UTC (rev 17472)
@@ -1,15 +1,25 @@
phpSysInfo
==============
-* Copyright (c), 1999-2008, Uriah Welcome (address@hidden)
-* Copyright (c), 1999-2009, Michael Cramer (address@hidden)
-* Copyright (c), 2007-2008, Audun Larsen (address@hidden)
-* Copyright (c), 2007-2013, Erkan Valentin
-* Copyright (c), 2009-2013, Mieczyslaw Nalewaj (address@hidden)
-* Copyright (c), 2010-2012, Damien Roth (address@hidden)
+* Copyright (c), 1999-2008, Uriah Welcome
([sf.net/users/precision](https://sf.net/users/precision))
+* Copyright (c), 1999-2009, Michael Cramer
([sf.net/users/bigmichi1](https://sf.net/users/bigmichi1))
+* Copyright (c), 2007-2008, Audun Larsen
([sf.net/users/xqus](https://sf.net/users/xqus))
+* Copyright (c), 2007-2015, Erkan Valentin
([github.com/rk4an](https://github.com/rk4an),
[sf.net/users/jacky672](https://sf.net/users/jacky672))
+* Copyright (c), 2009-2017, Mieczyslaw Nalewaj
([github.com/namiltd](https://github.com/namiltd),
[sf.net/users/namiltd](https://sf.net/users/namiltd))
+* Copyright (c), 2010-2012, Damien Roth
([sf.net/users/iysaak](https://sf.net/users/iysaak))
+REQUIREMENTS
+------------
+PHP 5.1.3 or later with SimpleXML, PCRE, XML and DOM extension.
+
+#### Suggested extensions:
+- mbstring: Required for *nix non UTF-8 systems
+- com_dotnet: Required for Windows environments
+- xsl: Required for static mode
+- json: Required for bootstrap mode
+
CURRENT TESTED PLATFORMS
------------------------
@@ -18,19 +28,18 @@
- OpenBSD 2.8+
- NetBSD
- DragonFly
-- IBM AIX
- HP-UX
- Darwin/OSX
-- Windows 2000 / Windows 2003 / Windows XP / Windows Vista / Windows 7 /
Windows 8
-- > PHP 5.2 or later
- - With PCRE, XML, XSL, MBString and SimpleXML extension.
+- Windows 2000 / XP / 2003 / Vista / 2008 / 7 / 2011 / 2012 / 8 / 8.1 / 10 /
2016
+- Android
-####Platforms currently in progress:
+#### Platforms currently in progress:
- Haiku
- Minix
- SunOS
- ReactOS
-- Android
+- IBM AIX
+- QNX
If your platform is not here try checking out the mailing list archives or
the message boards on SourceForge.
@@ -38,6 +47,8 @@
INSTALLATION AND CONFIGURATION
------------------------------
+#### Typical installation
+
Just decompress and untar the source (which you should have done by now,
if you're reading this...), into your webserver's document root.
@@ -56,6 +67,12 @@
That's it. Restart your webserver (if you changed php.ini), and voila.
+#### Docker container installation
+
+- `sudo docker build -t phpsysinfo github.com/phpsysinfo/phpsysinfo`
+- `sudo docker run -i -p 8080:80 -t phpsysinfo`
+- go to http://localhost:8080/phpsysinfo/
+
KNOWN PROBLEMS
--------------
@@ -65,7 +82,7 @@
PLATFORM SPECIFIC ISSUES
------------------------
-####Windows with IIS
+#### Windows with IIS
On Windows systems we get our informations through the WMI interface.
If you run phpSysInfo on the IIS webserver, phpSysInfo will not connect
to the WMI interface for security reasons. At this point you MUST set
@@ -72,7 +89,7 @@
an authentication mechanism for the directory in the IIS admin
interface for the directory where phpSysInfo is installed. Then you
will be asked for an user and a password when opening the page. At this
- point it is necassary to log in with an user that will be able to
+ point it is necessary to log in with an user that will be able to
connect to the WMI interface. If you use the wrong user and/or password
you might get an "ACCESS DENIED ERROR".
@@ -79,7 +96,7 @@
SENSOR RELATED INFORMATION
---------------------------
-####MBM5
+#### MBM5
Make sure you set MBM5 Interval Logging to csv and to the data
directory of phpSysInfo. The file must be called MBM5. Also make sure
MBM5 doesn't add symbols to the values. This is a Quick MBM5 log parser,
@@ -92,10 +109,8 @@
"INSTALLATION AND CONFIGURATION" section. If it still doesn't work then
you can:
-Submit a bug on SourceForge (preferred)
(http://sourceforge.net/projects/phpsysinfo/)
+Ask for help or submit a bug on Github
(https://github.com/phpsysinfo/phpsysinfo/issues)
-Ask for help in the forum (http://sourceforge.net/projects/phpsysinfo/)
-
***!! If you have any problems, please set `DEBUG` to true in `phpsysinfo.ini`
and include any error messages in your bug report / help request !!***
@@ -102,11 +117,11 @@
OTHER NOTES
-----------
-If you have a great idea or want to help out, just drop by the project
-page at SourceForge (http://sourceforge.net/projects/phpsysinfo/).
+If you have a great idea or want to help out, just create a pull request with
your change proposal
+in the [phpSysInfo](https://github.com/phpsysinfo/phpsysinfo) repository.
LICENSING
---------
-This program and all associated files are released under the GNU Public
-License, see [COPYING](COPYING) for details.
+This program is released under the GNU Public License Version 2 or
+(at your option) any later version, see [COPYING](COPYING) for details.
Deleted: trunk/phpsysinfo/config.php
===================================================================
--- trunk/phpsysinfo/config.php 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/config.php 2017-12-26 13:13:38 UTC (rev 17472)
@@ -1,237 +0,0 @@
-<?php
-if (!defined('PSI_CONFIG_FILE')) {
- /**
- * phpSysInfo version
- */
- define('PSI_VERSION','3.1.7');
- /**
- * phpSysInfo configuration
- */
- define('PSI_CONFIG_FILE', APP_ROOT.'/phpsysinfo.ini');
-
- define('ARRAY_EXP', '/^return array \([^;]*\);$/'); //array expression
search
-
- if (!is_readable(PSI_CONFIG_FILE) || !($config =
@parse_ini_file(PSI_CONFIG_FILE, true))) {
- $tpl = new Template("/templates/html/error_config.html");
- echo $tpl->fetch();
- die();
- } else {
- foreach ($config as $name=>$group) {
- if (strtoupper($name)=="MAIN") {
- $name_prefix='PSI_';
- } else {
- $name_prefix='PSI_PLUGIN_'.strtoupper($name).'_';
- }
- foreach ($group as $param=>$value) {
- if (($value==="") || ($value==="0")) {
- define($name_prefix.strtoupper($param), false);
- } elseif ($value==="1") {
- define($name_prefix.strtoupper($param), true);
- } else {
- if (strstr($value, ',')) {
- define($name_prefix.strtoupper($param), 'return
'.var_export(preg_split('/\s*,\s*/', $value, -1, PREG_SPLIT_NO_EMPTY),1).';');
- } else {
- define($name_prefix.strtoupper($param), $value);
- }
- }
- }
- }
- }
-
- /* default error handler */
- if (function_exists('errorHandlerPsi')) {
- restore_error_handler();
- }
-
- /* fatal errors only */
- $old_err_rep = error_reporting();
- error_reporting(E_ERROR);
-
- /* get git revision */
- if (file_exists(APP_ROOT.'/.git/HEAD')) {
- $contents = @file_get_contents(APP_ROOT.'/.git/HEAD');
- if ($contents && preg_match("/^ref:\s+(.*)\/([^\/\s]*)/m", $contents,
$matches)) {
- $contents =
@file_get_contents(APP_ROOT.'/.git/'.$matches[1]."/".$matches[2]);
- if ($contents && preg_match("/^([^\s]*)/m", $contents, $revision))
{
- define('PSI_VERSION_STRING', PSI_VERSION
."-".$matches[2]."-".substr($revision[1],0,7));
- } else {
- define('PSI_VERSION_STRING', PSI_VERSION ."-".$matches[2]);
- }
- }
- }
- /* get svn revision */
- if (!defined('PSI_VERSION_STRING') &&
file_exists(APP_ROOT.'/.svn/entries')) {
- $contents = @file_get_contents(APP_ROOT.'/.svn/entries');
- if ($contents && preg_match("/dir\n(.+)/", $contents, $matches)) {
- define('PSI_VERSION_STRING', PSI_VERSION."-r".$matches[1]);
- } else {
- define('PSI_VERSION_STRING', PSI_VERSION);
- }
- }
- if (!defined('PSI_VERSION_STRING')) {
- define('PSI_VERSION_STRING', PSI_VERSION);
- }
-
- if (!defined('PSI_OS')) { //if not overloaded in phpsysinfo.ini
- /* get Linux code page */
- if (PHP_OS == 'Linux') {
- if (file_exists('/etc/sysconfig/i18n')) {
- $contents = @file_get_contents('/etc/sysconfig/i18n');
- } elseif (file_exists('/etc/default/locale')) {
- $contents = @file_get_contents('/etc/default/locale');
- } elseif (file_exists('/etc/locale.conf')) {
- $contents = @file_get_contents('/etc/locale.conf');
- } elseif (file_exists('/etc/sysconfig/language')) {
- $contents = @file_get_contents('/etc/sysconfig/language');
- } elseif (file_exists('/etc/profile.d/lang.sh')) {
- $contents = @file_get_contents('/etc/profile.d/lang.sh');
- } else {
- $contents = false;
- if (file_exists('/system/build.prop')) { //Android
- define('PSI_OS', 'Android');
- if (!defined('PSI_MODE_POPEN')) { //if not overloaded in
phpsysinfo.ini
- if (!function_exists("proc_open")) { //proc_open
function test by executing 'pwd' command
- define('PSI_MODE_POPEN', true); //use popen()
function - no stderr error handling
- } else {
- $out = '';
- $err = '';
- $pipes = array();
- $descriptorspec = array(0=>array("pipe", "r"),
1=>array("pipe", "w"), 2=>array("pipe", "w"));
- $process = proc_open("pwd 2>/dev/null ",
$descriptorspec, $pipes);
- if (!is_resource($process)) {
- define('PSI_MODE_POPEN', true);
- } else {
- $w = null;
- $e = null;
-
- while (!(feof($pipes[1]) || feof($pipes[2]))) {
- $read = array($pipes[1], $pipes[2]);
-
- $n = stream_select($read, $w, $e, 5);
-
- if (($n === FALSE) || ($n === 0)) {
- break;
- }
-
- foreach ($read as $r) {
- if ($r == $pipes[1]) {
- $out .= fread($r, 4096);
- }
- if ($r == $pipes[2]) {
- $err .= fread($r, 4096);
- }
- }
- }
-
- if (is_null($out) || (trim($out) == "") ||
(substr(trim($out),0 ,1) != "/")) {
- define('PSI_MODE_POPEN', true);
- }
- fclose($pipes[0]);
- fclose($pipes[1]);
- fclose($pipes[2]);
- // It is important that you close any pipes
before calling
- // proc_close in order to avoid a deadlock
- proc_close($process);
- }
- }
- }
- }
- }
- if (!(defined('PSI_SYSTEM_CODEPAGE') &&
defined('PSI_SYSTEM_LANG')) //also if both not overloaded in phpsysinfo.ini
- && $contents && ( preg_match('/^(LANG="?[^"\n]*"?)/m',
$contents, $matches)
- || preg_match('/^RC_(LANG="?[^"\n]*"?)/m', $contents, $matches)
- || preg_match('/^export (LANG="?[^"\n]*"?)/m', $contents,
$matches))) {
- if (!defined('PSI_SYSTEM_CODEPAGE') && @exec($matches[1].'
locale -k LC_CTYPE 2>/dev/null', $lines)) { //if not overloaded in
phpsysinfo.ini
- foreach ($lines as $line) {
- if (preg_match('/^charmap="?([^"]*)/', $line,
$matches2)) {
- define('PSI_SYSTEM_CODEPAGE', $matches2[1]);
- break;
- }
- }
- }
- if (!defined('PSI_SYSTEM_LANG') && @exec($matches[1].' locale
2>/dev/null', $lines)) { //also if not overloaded in phpsysinfo.ini
- foreach ($lines as $line) {
- if (preg_match('/^LC_MESSAGES="?([^\."@]*)/', $line,
$matches2)) {
- $lang = "";
- if (is_readable(APP_ROOT.'/data/languages.ini') &&
($langdata = @parse_ini_file(APP_ROOT.'/data/languages.ini', true))) {
- if
(isset($langdata['Linux']['_'.$matches2[1]])) {
- $lang =
$langdata['Linux']['_'.$matches2[1]];
- }
- }
- if ($lang == "") {
- $lang = 'Unknown';
- }
- define('PSI_SYSTEM_LANG', $lang.'
('.$matches2[1].')');
- break;
- }
- }
- }
- }
- } elseif (PHP_OS == 'Haiku') {
- if (!(defined('PSI_SYSTEM_CODEPAGE') &&
defined('PSI_SYSTEM_LANG')) //also if both not overloaded in phpsysinfo.ini
- && @exec('locale -m 2>/dev/null', $lines)) {
- foreach ($lines as $line) {
- if (preg_match('/^"?([^\."]*)\.?([^"]*)/', $line,
$matches2)) {
-
- if (!defined('PSI_SYSTEM_CODEPAGE') &&
isset($matches2[2]) && !is_null($matches2[2]) && (trim($matches2[2]) != "") ) {
//also if not overloaded in phpsysinfo.ini
- define('PSI_SYSTEM_CODEPAGE', $matches2[2]);
- }
-
- if (!defined('PSI_SYSTEM_LANG')) { //if not overloaded
in phpsysinfo.ini
- $lang = "";
- if (is_readable(APP_ROOT.'/data/languages.ini') &&
($langdata = @parse_ini_file(APP_ROOT.'/data/languages.ini', true))) {
- if
(isset($langdata['Linux']['_'.$matches2[1]])) {
- $lang =
$langdata['Linux']['_'.$matches2[1]];
- }
- }
- if ($lang == "") {
- $lang = 'Unknown';
- }
- define('PSI_SYSTEM_LANG', $lang.'
('.$matches2[1].')');
- }
- break;
- }
- }
- }
- } elseif (PHP_OS == 'Darwin') {
- if (!defined('PSI_SYSTEM_LANG') //if not overloaded in
phpsysinfo.ini
- && @exec('defaults read
/Library/Preferences/.GlobalPreferences AppleLocale 2>/dev/null', $lines)) {
- $lang = "";
- if (is_readable(APP_ROOT.'/data/languages.ini') && ($langdata
= @parse_ini_file(APP_ROOT.'/data/languages.ini', true))) {
- if (isset($langdata['Linux']['_'.$lines[0]])) {
- $lang = $langdata['Linux']['_'.$lines[0]];
- }
- }
- if ($lang == "") {
- $lang = 'Unknown';
- }
- define('PSI_SYSTEM_LANG', $lang.' ('.$lines[0].')');
- }
- }
- }
-
- if (!defined('PSI_OS')) {
- define('PSI_OS', PHP_OS);
- }
-
- if (!defined('PSI_SYSTEM_LANG')) {
- define('PSI_SYSTEM_LANG', null);
- }
- if (!defined('PSI_SYSTEM_CODEPAGE')) { //if not overloaded in
phpsysinfo.ini
- if ((PSI_OS=='Android') || (PSI_OS=='Darwin')) {
- define('PSI_SYSTEM_CODEPAGE', 'UTF-8');
- } elseif (PSI_OS=='Minix') {
- define('PSI_SYSTEM_CODEPAGE', 'CP437');
- } else {
- define('PSI_SYSTEM_CODEPAGE', null);
- }
- }
-
- /* restore error level */
- error_reporting($old_err_rep);
-
- /* restore error handler */
- if (function_exists('errorHandlerPsi')) {
- set_error_handler('errorHandlerPsi');
- }
-}
Modified: trunk/phpsysinfo/data/ModelTranslation.txt
===================================================================
--- trunk/phpsysinfo/data/ModelTranslation.txt 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/data/ModelTranslation.txt 2017-12-26 13:13:38 UTC (rev
17472)
@@ -1,98 +1,156 @@
-ADP2,1:Developer Transition Kit
-iMac,1:iMac
-iMac1,1:iMac G3 (Rev A-D)
-iMac4,1:iMac (Core Duo)
-iMac4,2:iMac for Education (17-inch, Core Duo)
-iMac5,1:iMac (Core 2 Duo)
-iMac6,1:iMac (24-inch Core 2 Duo)
-iMac7,1:iMac (Aluminum Core 2 Duo)
-iMac8,1:iMac (Aluminum Core 2 Duo)
-iMac9,1:iMac (Aluminum Core 2 Duo)
-iMac10,1:iMac (Unibody Core 2 Duo)
-iMac10,2:iMac (Unibody Core 2 Duo)
-iMac11,1:iMac (Unibody Core i5/i7)
-iMac11,2:iMac (Unibody Core i3)
-iMac11,3:iMac (Unibody Core i3/i5/i7)
-iMac12,1:iMac (Unibody Core i5/i7)
-iMac12,2:iMac (Unibody Core i5/i7)
-iMac13,1:iMac (Core i5/i7)
-iMac13,2:iMac (Core i5/i7)
-M43ADP1,1:Development Mac Pro
-MacBook1,1:MacBook (Core Duo)
-MacBook2,1:MacBook (Core 2 Duo)
-MacBook3,1:MacBook (Core 2 Duo)
-MacBook4,1:MacBook (Early 2008)
-MacBookAir1,1:MacBook Air
-MacBookPro1,1:MacBook Pro (15-inch Core Duo)
-MacBookPro1,2:MacBook Pro (17-inch Core Duo)
-MacBookPro2,1:MacBook Pro (17-inch Core 2 Duo)
-MacBookPro2,2:MacBook Pro (15-inch Core 2 Duo)
-MacBookPro3,1:MacBook Pro (15-inch or 17-inch LED, Core 2 Duo)
-MacBookPro4,1:MacBook Pro (15-inch or 17-inch LED, Early 2008)
-MacBookPro5,1:MacBook Pro (15-inch LED Unibody, Late 2008)
-MacBookPro5,4:MacBook Pro (15-inch LED Unibody, Mid 2009)
-Macmini1,1:Mac mini (Core Solo/Duo)
-MacPro1,1:Mac Pro (Quad Xeon)
-MacPro2,1:Mac Pro (Octal Xeon)
-MacPro3,1:Mac Pro (Early 2008)
-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 FW800)
-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.67/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)
-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 Doors)
-PowerMac4,1:iMac G3 (Early/Summer 2001)
-PowerMac4,2:iMac G4 (Flat Panel)
-PowerMac4,4:eMac G3
-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)
-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 2004)
-PowerMac10,1:Mac Mini G4
-PowerMac10,2:Mac Mini (Late 2005)
-PowerMac11,2:Power Macintosh G5 (PCIe, Late 2005)
-PowerMac12,1:iMac G5 (iSight)
-RackMac1,1:Xserve G4
-RackMac1,2:Xserve G4 (Slot-Loading, Cluster Node)
-RackMac3,1:Xserve G5
-Xserve1,1:Xserve Xeon
-Xserve2,1:Xserve Xeon
+ADP2,1:Developer Transition Kit:Intel Pentium 4
+iMac,1:iMac G3:PowerPC 750 (G3)
+iMac1,1:iMac G3*:PowerPC 750 (G3)
+iMac4,1:iMac Core Duo:Intel Core Duo T2400/T2500
+iMac4,2:iMac Core Duo:Intel Core Duo T2400
+iMac5,1:iMac Core 2 Duo:Intel Core 2 Duo T7200/T7400/T7600
+iMac5,2:iMac Core 2 Duo:Intel Core 2 Duo T5600
+iMac6,1:iMac Core 2 Duo:Intel Core 2 Duo T7400/T7600
+iMac7,1:iMac Core 2 Duo/Extreme:Intel Core 2 Duo T7300/T7700/X7900
+iMac8,1:iMac Core 2 Duo:Intel Core 2 Duo E8135/E8335/E8235/E8435
+iMac9,1:iMac Core 2 Duo:Intel Core 2 Duo P7350/P7550/E8135/E8335/E8435
+iMac10,1:iMac Core 2 Duo:Intel Core 2 Duo E7600/E8600
+iMac10,2:iMac Core 2 Duo*:Intel Core 2 Duo E7500/E7600/E8600
+iMac11,1:iMac Core i5/i7:Intel Core I5-750/I7-860
+iMac11,2:iMac Core i3/i5:Intel Core I3-540/I3-550/I5-680
+iMac11,3:iMac Core i3/i5/i7:Intel Core I3-550/I5-760/I5-680/I7-870
+iMac12,1:iMac Core i3/i5/i7:Intel Core I3-2100/I5-2400S/I5-2500S/I5-2600S
+iMac12,2:iMac Core i5/i7:Intel Core I5-2400/I5-2500S/I7-2600
+iMac13,1:iMac Core i3/i5/i7:Intel Core I3-3225/I5-3335S/I5-3470S/I7-3770S
+iMac13,2:iMac Core i5/i7:Intel Core I5-3470/I5-3470S/I7-3770
+iMac14,1:iMac Core i5:Intel Core I5-4570R
+iMac14,2:iMac Core i5/i7:Intel Core I5-4570/I5-4670/I7-4771
+iMac14,3:iMac Core i5/i7:Intel Core I5-4570S/I7-4770S
+iMac14,4:iMac Core i5:Intel Core I5-4260U
+iMac15,1:iMac Core i5/i7:Intel Core I5-4590/I5-4690/I7-4790K
+iMac16,1:iMac Core i5:Intel Core I5-5250U
+iMac16,2:iMac Core i5/i7:Intel Core I5-5575R/I5-5675R/I7-5775R
+iMac17,1:iMac Core i5/i7:Intel Core I5-6500/I5-6600/I7-6700K
+M43ADP1,1:Development Mac Pro:Intel Xeon X5340
+MacBook1,1:MacBook Core Duo:Intel Core Duo T2400/T2500
+MacBook2,1:MacBook Core 2 Duo:Intel Core 2 Duo T5600/T7200/T7400
+MacBook3,1:MacBook Core 2 Duo:Intel Core 2 Duo T7300/T7500
+MacBook4,1:MacBook Core 2 Duo:Intel Core 2 Duo T8100/T8300
+MacBook5,1:MacBook Core 2 Duo:Intel Core 2 Duo P7350/P8600
+MacBook5,2:MacBook Core 2 Duo:Intel Core 2 Duo P7350/P7450
+MacBook6,1:MacBook Core 2 Duo:Intel Core 2 Duo P7550
+MacBook7,1:MacBook Core 2 Duo:Intel Core 2 Duo P8600
+MacBook8,1:MacBook Core M:Intel Core M-5Y31/M-5Y51/M-5Y71
+MacBook9,1:MacBook Core m3/m5/m7:Intel Core M3-6Y30/M5-6Y54/M7-6Y75
+MacBookAir1,1:MacBook Air Core 2 Duo:Intel Core 2 Duo P7500/P7700
+MacBookAir2,1:MacBook Air Core 2 Duo:Intel Core 2 Duo SL9300/SL9400/SL9600
+MacBookAir3,1:MacBook Air Core 2 Duo:Intel Core 2 Duo SU9400/SU9600
+MacBookAir3,2:MacBook Air Core 2 Duo:Intel Core 2 Duo SL9400/SL9600
+MacBookAir4,1:MacBook Air Core i5/i7:Intel Core I5-2467M/I7-2677M
+MacBookAir4,2:MacBook Air Core i5/i7:Intel Core I5-2467M/I5-2557M/I7-2677M
+MacBookAir5,1:MacBook Air Core i5/i7:Intel Core I5-3317U/I7-3667U
+MacBookAir5,2:MacBook Air Core i5/i7:Intel Core I5-3427U/I7-3667U
+MacBookAir6,1:MacBook Air Core i5/i7:Intel Core I5-4250U/I5-4260U/I7-4650U
+MacBookAir6,2:MacBook Air Core i5/i7:Intel Core I5-4250U/I5-4260U/I7-4650U
+MacBookAir7,1:MacBook Air Core i5/i7:Intel Core I5-5250U/I7-5650U
+MacBookAir7,2:MacBook Air Core i5/i7:Intel Core I5-5250U/I7-5650U
+MacBookPro1,1:MacBook Pro Core Duo:Intel Core Duo L2400/T2400/T2500/T2600
+MacBookPro1,2:MacBook Pro Core Duo:Intel Core Duo T2600
+MacBookPro2,1:MacBook Pro Core 2 Duo:Intel Core 2 Duo T7600
+MacBookPro2,2:MacBook Pro Core 2 Duo:Intel Core 2 Duo T7400/T7600
+MacBookPro3,1:MacBook Pro Core 2 Duo:Intel Core 2 Duo T7500/T7700/T7800
+MacBookPro4,1:MacBook Pro Core 2 Duo:Intel Core 2 Duo T8300/T9300/T9500
+MacBookPro5,1:MacBook Pro Core 2 Duo:Intel Core 2 Duo
P8600/T9400/T9550/T9600/T9800
+MacBookPro5,2:MacBook Pro Core 2 Duo:Intel Core 2 Duo T9550/T9600/T9800/T9900
+MacBookPro5,3:MacBook Pro Core 2 Duo:Intel Core 2 Duo P8800/T9600/T9900
+MacBookPro5,4:MacBook Pro Core 2 Duo:Intel Core 2 Duo P8700
+MacBookPro5,5:MacBook Pro Core 2 Duo:Intel Core 2 Duo P8400/P8700
+MacBookPro6,1:MacBook Pro Core i5/i7:Intel Core I5-540M/I7-620M/I7-640M
+MacBookPro6,2:MacBook Pro Core i5/i7:Intel Core I5-520M/I5-540M/I7-620M/I7-640M
+MacBookPro7,1:MacBook Pro Core 2 Duo:Intel Core 2 Duo P8600/P8800
+MacBookPro8,1:MacBook Pro Core i5/i7:Intel Core
I5-2415M/I5-2435M/I7-2620M/I7-2640M
+MacBookPro8,2:MacBook Pro Core i7:Intel Core
I7-2635QM/I7-2720QM/I7-2675QM/I7-2820QM/I7-2760QM/I7-2860QM
+MacBookPro8,3:MacBook Pro Core i7:Intel Core
I7-2720QM/I7-2820QM/I7-2760QM/I7-2860QM
+MacBookPro9,1:MacBook Pro Core i7:Intel Core I7-3615QM/I7-3720QM/I7-3820QM
+MacBookPro9,2:MacBook Pro Core i5/i7:Intel Core I5-3210M/I7-3520M
+MacBookPro10,1:MacBook Pro Core i7:Intel Core
I7-3615QM/I7-3635QM/I7-3720QM/I7-3740QM/I7-3820QM/I7-3840QM
+MacBookPro10,2:MacBook Pro Core i5/i7:Intel Core
I5-3210M/I5-3230M/I7-3520M/I7-3540M
+MacBookPro11,1:MacBook Pro Core i5/i7:Intel Core
I5-4258U/I5-4278U/I5-4288U/I5-4308U/I7-4558U/I5-4578U
+MacBookPro11,2:MacBook Pro Core i7:Intel Core
I7-4750HQ/I7-4770HQ/I7-4850HQ/I7-4870HQ/I7-4960HQ/I7-4980HQ
+MacBookPro11,3:MacBook Pro Core i7:Intel Core
I7-4850HQ/I7-4870HQ/I7-4960HQ/I7-4980HQ
+MacBookPro11,4:MacBook Pro Core i7:Intel Core I7-4770HQ/I7-4870HQ/I7-4980HQ
+MacBookPro11,5:MacBook Pro Core i7:Intel Core I7-4870HQ/I7-4980HQ
+MacBookPro12,1:MacBook Pro Core i5/i7:Intel Core I5-5257U/I5-5287U/I7-5557U
+Macmini1,1:Mac mini Core Solo/Duo:Intel Core Duo T2300/T2400 Solo T1200
+Macmini2,1:Mac mini Core 2 Duo:Intel Core 2 Duo T5600/T7200
+Macmini3,1:Mac mini Core 2 Duo:Intel Core 2 Duo P7350/P8400/P7550/P8700/P8800
+Macmini4,1:Mac mini Core 2 Duo:Intel Core 2 Duo P8600/P8800
+Macmini5,1:Mac mini Core i5:Intel Core I5-2415M
+Macmini5,2:Mac mini Core i5/i7:Intel Core I5-2520M/I7-2620M
+Macmini5,3:Mac mini Core i7:Intel Core I7-2635QM
+Macmini6,1:Mac mini Core i5:Intel Core I5-3210M
+Macmini6,2:Mac mini Core i7:Intel Core I7-3615QM/I7-3720QM
+Macmini7,1:Mac mini Core i5/i7:Intel Core I5-4260U/I5-4278U/I5-4308U/I7-4578U
+MacPro1,1:Mac Pro Quad Core:Intel Xeon 5130/5150/5160
+MacPro2,1:Mac Pro Eight Core:Intel Xeon X5365
+MacPro3,1:Mac Pro Quad/Eight Core:Intel Xeon E5462/E5472/X5482
+MacPro4,1:Mac Pro Quad/Eight Core:Intel Xeon
E5520/E5550/X5570/W3520/W3540/W3580
+MacPro5,1:Mac Pro Quad/Six/Eight/Twelve Core:Intel Xeon
E5620/E5645/W3530/W3565/W3680/X5650/X5670/X5675
+MacPro6,1:Mac Pro Quad/Six/Eight/Twelve Core:Intel Xeon
E5-1620v2/E5-1650v2/E5-1680v2/E5-2697v2
+PowerBook1,1:PowerBook G3:PowerPC 750 (G3)
+PowerBook2,1:iBook G3:PowerPC 750 (G3)
+PowerBook2,2:iBook G3:PowerPC 750cx (G3)
+PowerBook2,3:iBook G3*:PowerPC 750cx (G3)
+PowerBook2,4:iBook G3*:PowerPC 750cx (G3)
+PowerBook3,1:PowerBook G3:PowerPC 750 (G3)
+PowerBook3,2:PowerBook G4:PowerPC 7410 (G4)
+PowerBook3,3:PowerBook G4:PowerPC 7440 (G4)
+PowerBook3,4:PowerBook G4:PowerPC 7451 (G4)
+PowerBook3,5:PowerBook G4:PowerPC 7455 (G4)
+PowerBook4,1:iBook G3:PowerPC 750cx (G3)
+PowerBook4,2:iBook G3 600:PowerPC 750cx (G3)
+PowerBook4,3:iBook G3:PowerPC 750fx (G3)
+PowerBook5,1:PowerBook G4:PowerPC 7455 (G4)
+PowerBook5,2:PowerBook G4:PowerPC 7447 (G4)
+PowerBook5,3:PowerBook G4:PowerPC 7447 (G4)
+PowerBook5,4:PowerBook G4:PowerPC 7447a (G4)
+PowerBook5,5:PowerBook G4:PowerPC 7447a (G4)
+PowerBook5,6:PowerBook G4:PowerPC 7447a (G4)
+PowerBook5,7:PowerBook G4:PowerPC 7447a (G4)
+PowerBook5,8:PowerBook G4:PowerPC 7447a (G4)
+PowerBook5,9:PowerBook G4:PowerPC 7447a (G4)
+PowerBook6,1:PowerBook G4:PowerPC 7455 (G4)
+PowerBook6,2:PowerBook G4:PowerPC 7447 (G4)
+PowerBook6,3:iBook G4:PowerPC 7457 (G4)
+PowerBook6,4:PowerBook G4:PowerPC 7447a (G4)
+PowerBook6,5:iBook G4:PowerPC 7447a (G4)
+PowerBook6,7:iBook G4:PowerPC 7447a (G4)
+PowerBook6,8:PowerBook G4:PowerPC 7447a (G4)
+PowerMac1,1:Power Macintosh/Mac Server G3:PowerPC 750 (G3)
+PowerMac1,2:Power Macintosh G4:PowerPC 7400 (G4)
+PowerMac2,1:iMac G3:PowerPC 750 (G3)
+PowerMac2,2:iMac G3:PowerPC 750 (G3)
+PowerMac3,1:Power Macintosh/Mac Server G4:PowerPC 7400 (G4)
+PowerMac3,2:Power Macintosh/Mac Server G4*:PowerPC 7400 (G4)
+PowerMac3,3:Power Macintosh/Mac Server G4:PowerPC 7400 (G4)
+PowerMac3,4:Power Macintosh/Mac Server G4:PowerPC 7410 (G4)
+PowerMac3,5:Power Macintosh/Mac Server G4:PowerPC 7450/7455 (G4)
+PowerMac3,6:Power Macintosh/Mac Server G4:PowerPC 7455 (G4)
+PowerMac4,1:iMac G3:PowerPC 750/750cx (G3)
+PowerMac4,2:iMac G4:PowerPC 7441/7445 (G4)
+PowerMac4,4:eMac G4:PowerPC 7441/7445 (G4)
+PowerMac4,5:iMac G4:PowerPC 7445 (G4)
+PowerMac5,1:Power Macintosh G4 Cube:PowerPC 7400 (G4)
+PowerMac6,1:iMac G4:PowerPC 7445 (G4)
+PowerMac6,3:iMac G4:PowerPC 7445 (G4)
+PowerMac6,4:eMac G4:PowerPC 7447a (G4)
+PowerMac7,2:Power Macintosh G5:PowerPC 970 (G5)
+PowerMac7,3:Power Macintosh G5:PowerPC 970fx (G5)
+PowerMac8,1:iMac G5:PowerPC 970 (G5)
+PowerMac8,2:iMac G5:PowerPC 970 (G5)
+PowerMac9,1:Power Macintosh G5:PowerPC 970fx (G5)
+PowerMac10,1:Mac mini G4:PowerPC 7447a (G4)
+PowerMac10,2:Mac mini G4:PowerPC 7447a (G4)
+PowerMac11,2:Power Macintosh G5 Dual/Quad Core:PowerPC 970MP (G5)
+PowerMac12,1:iMac G5:PowerPC 970fx (G5)
+RackMac1,1:Xserve G4:PowerPC 7455 (G4)
+RackMac1,2:Xserve G4:PowerPC 7455 (G4)
+RackMac3,1:Xserve G5:PowerPC 970fx (G5)
+Xserve1,1:Xserve Xeon Quad Core:Intel Xeon 5130/5150/5160
+Xserve2,1:Xserve Xeon Quad/Eight Core:Intel Xeon E5462/E5472
+Xserve3,1:Xserve Xeon Nehalem Quad/Eight Core:Intel Xeon E5520/E5550/E5570
Added: trunk/phpsysinfo/data/cpus.ini
===================================================================
--- trunk/phpsysinfo/data/cpus.ini (rev 0)
+++ trunk/phpsysinfo/data/cpus.ini 2017-12-26 13:13:38 UTC (rev 17472)
@@ -0,0 +1,108 @@
+[cpu]
+; ARM Limited
+0x41,0x810="ARM810"
+0x41,0x920="ARM920"
+0x41,0x922="ARM922"
+0x41,0x926="ARM926"
+0x41,0x940="ARM940"
+0x41,0x946="ARM946"
+0x41,0x966="ARM966"
+0x41,0xa20="ARM1020"
+0x41,0xa22="ARM1022"
+0x41,0xa26="ARM1026"
+0x41,0xb02="ARM11 MPCore"
+0x41,0xb36="ARM1136"
+0x41,0xb56="ARM1156"
+0x41,0xb76="ARM1176"
+0x41,0xc05="Cortex-A5"
+0x41,0xc07="Cortex-A7"
+0x41,0xc08="Cortex-A8"
+0x41,0xc09="Cortex-A9"
+0x41,0xc0d="Cortex-A12"
+0x41,0xc0f="Cortex-A15"
+0x41,0xc0e="Cortex-A17"
+0x41,0xc14="Cortex-R4"
+0x41,0xc15="Cortex-R5"
+0x41,0xc17="Cortex-R7"
+0x41,0xc18="Cortex-R8"
+0x41,0xc20="Cortex-M0"
+0x41,0xc21="Cortex-M1"
+0x41,0xc23="Cortex-M3"
+0x41,0xc24="Cortex-M4"
+0x41,0xc20="Cortex-M7"
+0x41,0xc60="Cortex-M0+"
+0x41,0xd01="Cortex-A32"
+0x41,0xd03="Cortex-A53"
+0x41,0xd04="Cortex-A35"
+0x41,0xd05="Cortex-A55"
+0x41,0xd07="Cortex-A57"
+0x41,0xd08="Cortex-A72"
+0x41,0xd09="Cortex-A73"
+0x41,0xd0a="Cortex-A75"
+0x41,0xd13="Cortex-R52"
+0x41,0xd20="Cortex-M23"
+0x41,0xd21="Cortex-M33"
+
+; Broadcom ('B') cores.
+0x42,0x516="vulcan/thunderx2t99p1"
+
+; DEC
+0x44,0xa10="SA110"
+0x44,0xa11="SA1100"
+
+; Cavium ('C') cores.
+0x43,0x0a0="thunderx"
+0x43,0x0a1="thunderxt88"
+0x43,0x0a2="thunderxt81"
+0x43,0x0a3="thunderxt83"
+0x43,0x0af="thunderx2t99"
+
+; Moto
+;0x44
+
+; APM ('P') cores.
+0x50,0x000="xgene1"
+
+; Qualcomm ('Q') cores.
+0x51,0x00f="Scorpion"
+0x51,0x02d="Scorpion"
+0x51,0x04d="Krait"
+0x51,0x06f="Krait"
+0x51,0x201="Kryo"
+0x51,0x205="Kryo"
+0x51,0x800="qdf24xx"
+0x51,0xc00="qdf24xx/falkor"
+
+; Samsung ('S') cores.
+0x53,0x001="exynos-m1"
+
+;
+0x54,0x925="TI925"
+
+; Marvell
+0x56,0x131="Feroceon 88FR131"
+0x56,0x581="PJ4/PJ4b"
+0x56,0x584="PJ4/PJ4b"
+
+;Intel/Marvell
+0x69,0x200="i80200"
+0x69,0x210="PXA250A"
+0x69,0x212="PXA210A"
+0x69,0x242="i80321-400"
+0x69,0x243="i80321-600"
+0x69,0x290="PXA250B/PXA26x"
+0x69,0x292="PXA210B"
+0x69,0x2c2="i80321-400-B0"
+0x69,0x2c3="i80321-600-B0"
+0x69,0x2d0="PXA250C/PXA255/PXA26x"
+0x69,0x2d2="PXA210C"
+0x69,0x411="PXA27x"
+0x69,0x41c="IPX425-533"
+0x69,0x41d="IPX425-400"
+0x69,0x41f="IPX425-266"
+0x69,0x682="PXA32x"
+0x69,0x683="PXA930/PXA935"
+0x69,0x688="PXA30x"
+0x69,0x689="PXA31x"
+0x69,0xb11="SA1110"
+0x69,0xc12="IPX1200"
Modified: trunk/phpsysinfo/data/distros.ini
===================================================================
--- trunk/phpsysinfo/data/distros.ini 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/data/distros.ini 2017-12-26 13:13:38 UTC (rev 17472)
@@ -3,13 +3,24 @@
; $Id: distros.ini 709 2012-12-05 11:20:40Z namiltd $
;
-[eisfair]
+[GoboLinux]
+Image = "Gobo.png"
+Name = "GoboLinux"
+Files = "/etc/GoboLinuxVersion"
+
+[SliTaz]
+Image = "SliTaz.png"
+Name = "SliTaz"
+Files = "/etc/slitaz-release"
+
+[eisfair project]
Image = "Eisfair.png"
Files = "/etc/eisfair-system"
Files2 = "/etc/version"
+;detected in "lsb_release -a"
-[Tinycore]
-Image = "Tinycore.png"
+[TinyCore]
+Image = "TinyCore.png"
Name = "Tiny Core Linux"
Files = "/usr/share/doc/tc/release.txt"
@@ -16,15 +27,33 @@
[Frugalware]
Image = "Frugalware.png"
Files = "/etc/frugalware-release"
+;detected in "/etc/os-release"
[antiX]
Image = "antiX.png"
Files = "/etc/antix-version"
+;wrong in "/etc/os-release" Debian GNU/Linux
+;wrong in "/etc/debian_version" Debian
[IPFire]
Image = "IPFire.png"
;detected in "/etc/system-release"
+[QTS]
+Image = "QTS.png"
+Name = "QTS"
+;detected in "/etc/config/uLinux.conf"
+
+[4MLinux]
+Image = "4MLinux.png"
+Name = "4MLinux"
+Files = "/etc/4MLinux-version"
+
+[Lunar Linux]
+Image = "Lunar.png"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+
[CRUX]
Image = "Crux.png"
Mode = "Execute"
@@ -34,39 +63,54 @@
Image = "Foresight.png"
;detected in "/etc/distro-release"
-[Android]
-Name = "Android"
-Image = "Android.png"
-;detected in "/system/build.prop"
-
[Trustix]
Image = "Trustix.png"
Files = "/etc/trustix-release;/etc/trustix-version"
+[NixOS]
+Image = "NixOS.png"
+;detected in "/etc/os-release"
+
[FreeEOS]
Image = "free-eos.png"
Files = "/etc/eos-version"
+[generations]
+Image = "Generations.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+
+[Generations Linux]
+Image = "Generations.png"
+;detected in "/etc/os-release"
+
[Manjaro Linux]
Image = "Manjaro.png"
+Files = "/etc/manjaro-release"
;detected in "/etc/os-release"
[ManjaroLinux]
Image = "Manjaro.png"
-Files = "/etc/manjaro-release"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+[void]
+Image = "Void.png"
+;detected in "/etc/os-release"
+
+[VoidLinux]
+Image = "Void.png"
+;detected in "lsb_release -a""
+
[Arch Linux]
Image = "Arch.png"
+Files = "/etc/arch-release"
;detected in "/etc/os-release"
-[arch]
-Image = "Arch.png"
-Name = "Arch Linux"
-
[Arch]
Image = "Arch.png"
-Files = "/etc/arch-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
[Cobalt]
Image = "Cobalt.png"
@@ -73,7 +117,7 @@
Files = "/etc/cobalt-release"
[LinuxFromScratch]
-Image = "lfs.png"
+Image = "LFS.png"
Files = "/etc/lfs-release"
[Rubix]
@@ -80,77 +124,301 @@
Image = "Rubix.png"
Files = "/etc/rubix-version"
+[Tails]
+Image = "Tails.png"
+;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
+
+[Tanglu]
+Image = "Tanglu.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;wrong in "/etc/debian_version" Debian
+
+[Tanglu GNU/Linux]
+Image = "Tanglu.png"
+;detected in "/etc/os-release"
+
+[PureOS]
+Image = "PureOS.png"
+;detected in "lsb_release -a"
+;wrong in "/etc/debian_version" Debian
+
+[PureOS GNU/Linux]
+Image = "PureOS.png"
+;detected in "/etc/os-release"
+
+[SalentOS]
+Image = "SalentOS.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
+
+[Mer]
+Image = "Mer.png"
+Mode = "Analyse"
+Files = "/etc/mer-release;/etc/meego-release;/etc/moblin-release"
+;detected in "lsb_release -a"
+;detected in "/etc/system-release"
+
+[KaOS]
+Image = "KaOS.png"
+Files = "/etc/KaOS-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+
+[openmamba]
+Image = "OpenMamba.png"
+Files = "/etc/openmamba-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+;detected in "/etc/system-release"
+
+[CoreOS]
+Image = "CoreOS.png"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+
+[Container Linux by CoreOS]
+Image = "Container.png"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+
+[BOSS]
+Image = "BOSS.png"
+Name = "BOSS GNU/Linux"
+Files = "/etc/boss_version"
+;detected in "lsb_release -a"
+;wrong in "/etc/debian_version" Debian
+
+[BOSS GNU/Linux]
+Image = "BOSS.png"
+;detected in "/etc/os-release"
+
+[BOSS Server Beta]
+Image = "BOSS.png"
+;detected in "lsb_release -a"
+
+[Solus]
+Image = "Solus.png"
+Files = "/etc/solus-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+
+[Solus Operating System]
+Image = "Solus.png"
+;detected in "/etc/os-release"
+
+[Canaima]
+Image = "Canaima.png"
+Name = "Canaima GNU/Linux"
+Files = "/etc/canaima_version"
+;detected in "lsb_release -a"
+;wrong in "/etc/debian_version" Debian
+
+[Canaima GNU/Linux]
+Image = "Canaima.png"
+;detected in "/etc/os-release"
+
+[Semplice]
+Image = "Semplice.png"
+Name = "Semplice"
+Files = "/etc/semplice_version"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
+
+[SolydXK]
+Image = "SolydXK.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/solydxk/info"
+;wrong in "/etc/os-release" Debian GNU/Linux
+;wrong in "/etc/debian_version" Debian
+
+[HandyLinux]
+Image = "Handy.png"
+Files = "/etc/handylinux_version"
+;detected in "lsb_release -a"
+;wrong in "/etc/os-release" Debian GNU/Linux
+;wrong in "/etc/debian_version" Debian
+
+[Parsix]
+Image = "Parsix.png"
+Files = "/etc/parsix-version"
+;detected in "lsb_release -a"
+;detected or wrong version in "/etc/os-release" | Parsix 4.0
+;wrong in "/etc/debian_version" Debian
+
[Linaro]
Image = "Linaro.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
[LinuxDeepin]
Image = "Deepin.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/os-release" Debian GNU/Linux
+;wrong in "/etc/debian_version" Debian
+[Ultimate_Edition]
+Image = "UltimateEdition.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
+
+[elementary]
+Image = "elementaryOS.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;wrong in "/etc/debian_version" Debian
+
[elementary OS]
Image = "elementaryOS.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
[PearLinux]
Image = "Pear.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/os-release" Ubuntu
+;wrong in "/etc/debian_version" Debian
[Pear Linux]
Image = "Pear.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/os-release" Ubuntu
+;wrong in "/etc/debian_version" Debian
[PearOS]
Image = "Pear.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/os-release" Ubuntu
+;wrong in "/etc/debian_version" Debian
[SolusOS]
Image = "SolusOS.png"
Files = "/etc/solusos_version"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/os-release" Debian GNU/Linux
+;wrong in "/etc/debian_version" Debian
[LinuxMint]
Image = "Mint.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/os-release" Ubuntu
+;wrong in "/etc/debian_version" Debian
[Trisquel]
Image = "Trisquel.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/os-release" Ubuntu
+;wrong in "/etc/debian_version" Debian
[Zorin]
Image = "Zorin.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong or almost in "/etc/os-release" Ubuntu | Zorin OS
+;wrong in "/etc/debian_version" Debian
+[Zorin OS]
+Image = "Zorin.png"
+;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
+
[Netrunner]
Image = "Netrunner.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
+[NetrunnerSE]
+Image = "Netrunner.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;wrong in "/etc/debian_version" Debian
+
+[Netrunner Rolling]
+Image = "Netrunner.png"
+;detected in "/etc/os-release"
+;wrong in "/etc/manjaro-release" Manjaro
+
[Peppermint]
Image = "Peppermint.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
[Ubuntu]
Image = "Ubuntu.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
;detected in "/etc/os-release"
+;wrong in "/etc/debian_version" Debian
[Chakra]
Image = "Chakra.png"
+Files = "/etc/chakra-release"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+[The Chakra-Project]
+Image = "Chakra.png"
+;detected in "/etc/os-release"
+
[IYCC]
Image = "iycc.png"
;detected in "/etc/lsb-release"
+[HipServ]
+Image = "HipServ.png"
+;detected in "/etc/redhat-release"
+
+[NeoKylin]
+Image = "NeoKylin.png"
+;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
+
+[NeoKylin Linux Desktop]
+Image = "NeoKylin.png"
+Files = "/etc/neokylin-release;/etc/cs2c-release"
+;detected in "lsb_release -a"
+;detected in "/etc/os-release"
+
[Mageia]
Image = "Mageia.png"
Files = "/etc/mageia-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/mandriva-release"
+;detected in "/etc/mandrake-release;/etc/mandrakelinux-release"
+;detected in "/etc/redhat-release"
+;detected in "/etc/os-release"
-[PLD]
+[PLD Linux]
Image = "PLD.png"
Files = "/etc/pld-release"
+;detected in "/etc/os-release"
[LFS]
Image = "lfs.png"
@@ -164,10 +432,11 @@
Image = "Synology.png"
Mode = "Detection"
Files = "/etc/synoinfo.conf"
+Files2 = "/etc/VERSION"
[Alpine]
+Image = "Alpine.png"
Name = "Alpine"
-Image = "Alpine.png"
Files = "/etc/alpine-release"
[Puppy]
@@ -175,8 +444,8 @@
;detected in "/etc/DISTRO_SPECS"
[Lucid]
+Image = "Puppy.png"
Name = "Lucid Puppy"
-Image = "Puppy.png"
;detected in "/etc/DISTRO_SPECS"
[Slacko Puppy]
@@ -191,71 +460,138 @@
Image = "Turbo.png"
Files = "/etc/turbolinux-release"
+[Amazon]
+Image = "Amazon.png"
+;detected in "/etc/system-release"
+
+[AmazonAMI]
+Image = "Amazon.png"
+;detected in "lsb_release -a"
+
+[RedFlag]
+Image = "RedFlag.png"
+Files = "/etc/redflag-release"
+;detected in "/etc/system-release"
+
+[Red Flag inWise]
+Image = "RedFlag.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
+
[StartOS]
Image = "StartOS.png"
Files = "/etc/startos-release"
+;detected in "lsb_release -a"
-[Scientific]
-Image = "Scientific.png"
+[OpenELEC]
+Image = "OpenELEC.png"
+;detected in "lsb_release -a"
+;detected in "/etc/os-release"
+
+[LibreELEC]
+Image = "LibreELEC.png"
+;detected in "lsb_release -a"
+;detected in "/etc/os-release"
+
+[Lakka]
+Image = "Lakka.png"
+;detected in "lsb_release -a"
+;detected in "/etc/os-release"
+
+[PisiLinux]
+Image = "Pisi.png"
+Files = "/etc/pisilinux-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+
+[Pisi_Linux]
+Image = "Pisi.png"
+;detected in "/etc/system-release"
+
+[SME]
+Image = "SMEServer.png"
+Files = "/etc/e-smith-release"
+;wrong in "/etc/centos-release" CentOS
;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
-[Scientific Linux]
+[SMEServer]
+Image = "SMEServer.png"
+;detected in "lsb_release -a"
+
+[Scientific]
Image = "Scientific.png"
+;detected in "lsb_release -a"
;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
[ScientificSL]
Image = "Scientific.png"
-;detected in "/etc/redhat-release"
+;detected in "lsb_release -a"
[ScientificCERNSLC]
Image = "Scientific.png"
-;detected in "/etc/redhat-release"
+;detected in "lsb_release -a"
+[ScientificFermi]
+Image = "Scientific.png"
+;detected in "lsb_release -a"
+
[ScientificFermiLTS]
Image = "Scientific.png"
-;detected in "/etc/redhat-release"
+;detected in "lsb_release -a"
[ScientificSLF]
Image = "Scientific.png"
-;detected in "/etc/redhat-release"
+;detected in "lsb_release -a"
[ClearOS]
Image = "ClearOS.png"
Files = "/etc/clearos-release"
;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
[CloudLinuxServer]
-Image = "CloudLinux.png"
-;detected in "/etc/lsb-release"
+Image = "Cloud.png"
+;detected in "lsb_release -a"
[CloudLinux]
-Image = "CloudLinux.png"
+Image = "Cloud.png"
Files = "/etc/CloudLinux-release"
;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
+; at the end because some distros may also have the same files (like SMEServer)
[CentOS]
Image = "CentOS.png"
Files = "/etc/centos-release"
+;detected in "lsb_release -a"
;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
[Oracle]
Image = "Oracle.png"
-Files = "/etc/oracle-release"
-;detected in "/etc/redhat-release"
+Files = "/etc/oracle-release;/etc/enterprise-release"
+;detected in "/etc/system-release"
+;wrong in "/etc/redhat-release" RedHat
[OracleServer]
Image = "Oracle.png"
-Files = "/etc/oracle-release"
-;detected in "/etc/redhat-release"
+;detected in "lsb_release -a"
-[RosaDesktop.Marathon]
-Image = "ROSA.png"
-;detected in "/etc/lsb-release"
-;detected in "/etc/redhat-release"
+[EnterpriseEnterpriseServer]
+Image = "Oracle.png"
+;detected in "lsb_release -a"
[PCLinuxOS]
Image = "PCLinuxOS.png"
Files = "/etc/pclinuxos-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/mandriva-release"
+;detected in "/etc/mandrake-release;/etc/mandrakelinux-release"
+;detected in "/etc/redhat-release"
[Salix]
Image = "Salix.png"
@@ -262,110 +598,303 @@
Mode = "Detection"
Files = "/etc/salix-update-notifier.conf"
Files2 = "/etc/slackware-version"
+;wrong in "/etc/os-release" Slackware
+;wrong in "/etc/slackware-version" Slackware
[Slax]
Image = "Slax.png"
Files = "/etc/slax-version"
+;wrong in "/etc/os-release" Slackware
+;wrong in "/etc/slackware-version" Slackware
[SMS]
Image = "SMS.png"
Files = "/etc/sms-version"
;detected in "/etc/os-release"
+;wrong in "/etc/slackware-version" Slackware
[Porteus]
Image = "Porteus.png"
Files = "/etc/porteus-version"
+;wrong in "/etc/os-release" Slackware
+;wrong in "/etc/slackware-version" Slackware
[Vector]
Image = "Vector.png"
Files = "/etc/vector-version"
+;wrong in "/etc/slackware-version" Slackware
+[Zenwalk]
+Image = "Zenwalk.png"
+Name = "Zenwalk"
+Files = "/etc/zenwalk-version"
+;detected in "/etc/os-release"
+;wrong in "/etc/slackware-version" Slackware
+
+[Calculate]
+Image = "Calculate.png"
+;detected in "/etc/gentoo-release"
+;wrong in "/etc/os-release" Gentoo
+
+[Tizen]
+Image = "Tizen.png"
+Files = "/etc/tizen-release"
+;detected in "/etc/system-release"
+;detected in "/etc/os-release"
+
[Sabayon]
Image = "Sabayon.png"
Files = "/etc/sabayon-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/system-release"
+;detected in "/etc/os-release"
+;wrong in "/etc/gentoo-release" Gentoo
+[VortexBox]
+Image = "VortexBox.png"
+Name = "VortexBox"
+Files = "/etc/vortexbox/vortexbox-version"
+;wrong in "/etc/fedora-release" Fedora
+;wrong in "/etc/redhat-release" Fedora
+;wrong in "/etc/system-release" Fedora
+;wrong in "/etc/os-release" Fedora
+
[ALT]
Image = "ALT.png"
Files = "/etc/altlinux-release"
+;detected in "/etc/fedora-release"
;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
+[Simply]
+Image = "ALT.png"
+;detected in "/etc/fedora-release"
+;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
+
+[Simply Linux]
+Image = "ALT.png"
+;detected in "/etc/os-release"
+
+[ALT Linux]
+Image = "ALT.png"
+;detected in "/etc/os-release"
+
[Fuduntu]
Image = "Fuduntu.png"
Files = "/etc/fuduntu-release"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;detected in "/etc/fedora-release"
;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
[gNewSense]
Image = "gNewSense.png"
+;detected in "lsb_release -a"
;detected in "/etc/lsb-release"
+;wrong in "/etc/debian_version" Debian
-[Debian GNU/Linux]
-Image = "Debian.png"
+[SteamOS]
+Image = "SteamOS.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;wrong in "/etc/debian_version" Debian
+
+[SteamOS GNU/Linux]
+Image = "SteamOS.png"
;detected in "/etc/os-release"
+[Raspbian]
+Image = "Raspbian.png"
+;detected in "lsb_release -a"
+;wrong in "/etc/debian_version" Debian
+
+[Raspbian GNU/Linux]
+Image = "Raspbian.png"
+;detected in "/etc/os-release"
+
+[Devuan]
+Image = "Devuan.png"
+Name = "Devuan"
+Files = "/etc/devuan_version"
+;detected in "lsb_release -a"
+;wrong in "/etc/debian_version" Debian
+
+[Devuan GNU/Linux]
+Image = "Devuan.png"
+;detected in "/etc/os-release"
+
[Debian]
+Image = "Debian.png"
Name = "Debian"
-Image = "Debian.png"
Files = "/etc/debian_release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
;detected in "/etc/debian_version"
+[Debian GNU/Linux]
+Image = "Debian.png"
+;detected in "/etc/os-release"
+
+[openSUSE]
+Image = "openSUSE.png"
+;detected in "/etc/os-release"
+;detected in "/etc/SuSE-release"
+
[openSUSE project]
-Image = "Suse.png"
-;detected in "/etc/lsb-release"
+Image = "openSUSE.png"
+;detected in "lsb_release -a"
; at the end because some distros may also have the same files (like openSUSE)
[SUSE LINUX]
-Image = "Suse.png"
+Image = "SUSE.png"
+Mode = "Analyse"
Files = "/etc/SuSE-release;/etc/UnitedLinux-release"
-; at the end because some distros may also have the same files (like Sabayon)
+; at the end because some distros may also have the same files (like Sabayon,
Calculate)
[Gentoo]
Image = "Gentoo.png"
+Mode = "Analyse"
Files = "/etc/gentoo-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+;detected in "/etc/os-release"
-; at the end because some distros may also have the same files (like Salix,
Slax, SMS, Porteus, Vector)
+; at the end because some distros may also have the same files (like Salix,
Slax, SMS, Porteus, Vector, Zenwalk)
[Slackware]
Image = "Slackware.png"
Files = "/etc/slackware-release;/etc/slackware-version"
;detected in "/etc/os-release"
-; at the end because some distros may also have the same files (like Fuduntu,
ALT etc)
+[Qubes]
+Image = "Qubes.png"
+Files = "/etc/qubes-release"
+;detected in "/etc/fedora-release"
+;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
+;detected in "/etc/os-release"
+
+[Korora]
+Image = "Korora.png"
+;detected in "lsb_release -a"
+;detected in "/etc/fedora-release"
+;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
+;detected in "/etc/os-release"
+
+; at the end because some distros may also have the same files (like Fuduntu,
ALT, VortexBox, Qubes, Korora)
[Fedora]
Image = "Fedora.png"
+Mode = "Analyse"
Files = "/etc/fedora-release"
+;detected in "lsb_release -a"
+;detected in "/etc/redhat-release"
+;detected in "/etc/system-release"
;detected in "/etc/os-release"
[FedoraCore]
Image = "Fedora.png"
-Files = "/etc/fedora-release"
+;detected in "/etc/lsb-release"
-; at the end because some distros may also have the same files (like
PCLinuxOS, RosaDesktop.Marathon etc)
+[OpenMandriva]
+Image = "OpenMandriva.png"
+;detected in "/etc/rosa-release"
+;detected in "/etc/mandriva-release"
+;detected in "/etc/mandrake-release;/etc/mandrakelinux-release"
+;detected in "/etc/redhat-release"
+;detected in "/etc/distro-release"
+;detected in "/etc/system-release"
+
+[OpenMandriva Lx]
+Image = "OpenMandriva.png"
+;detected in "/etc/os-release"
+
+[OpenMandrivaLinux]
+Image = "OpenMandriva.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+
+[ROSA MarathonLinux]
+Image = "ROSA.png"
+;detected in "/etc/lsb-release"
+
+[RosaDesktop.Marathon]
+Image = "ROSA.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+
+[RosaDesktop.Fresh]
+Image = "ROSA.png"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
+
+[ROSA Desktop Fresh]
+Image = "ROSA.png"
+;detected in "/etc/os-release"
+
+[ROSA Marathon]
+Image = "ROSA.png"
+;detected in "/etc/os-release"
+
+[ROSAEnterpriseServer]
+Image = "ROSA.png"
+;detected in "lsb_release -a"
+
+; at the end because some distros may also have the same files (like
OpenMandriva)
+[ROSA]
+Image = "ROSA.png"
+Mode = "Analyse"
+Files = "/etc/rosa-release"
+;detected in "lsb_release -a"
+;detected in "/etc/system-release"
+;detected in "/etc/mandriva-release"
+;detected in "/etc/mandrake-release;/etc/mandrakelinux-release"
+;detected in "/etc/redhat-release"
+
[MandrivaLinux]
Image = "Mandrake.png"
-Files = "/etc/mandiva-release"
+;detected in "lsb_release -a"
+;detected in "/etc/lsb-release"
-; at the end because some distros may also have the same files (like
MandivaLinux, PCLinuxOS, RosaDesktop.Marathon etc)
+; at the end because some distros may also have the same files (like Mageia,
PCLinuxOS, ROSA, OpenMandriva)
+[Mandriva]
+Image = "Mandrake.png"
+Mode = "Analyse"
+Files = "/etc/mandriva-release"
+;detected in "/etc/mandrake-release;/etc/mandrakelinux-release"
+;detected in "/etc/redhat-release"
+
+; at the end because some distros may also have the same files (like Mandriva,
Mageia, PCLinuxOS, ROSA, OpenMandriva)
[Mandrake]
Image = "Mandrake.png"
+Mode = "Analyse"
Files = "/etc/mandrake-release;/etc/mandrakelinux-release"
-; at the end because some distros may also have the same files (like CentOS,
Oracle, Scientific, CloudLinux, CloudLinuxServer, Mandrake, MandivaLinux,
PCLinuxOS, RosaDesktop.Marathon etc)
+; at the end because some distros may also have the same files (like
SMEServer, Fuduntu, ALT, VortexBox, Qubes, Korora, Fedora, CentOS, Oracle,
Scientific, CloudLinux, Mandrake, MandrivaLinux, Mageia, PCLinuxOS, ROSA,
OpenMandriva, HipServ, NeoKylin)
[RedHat]
-Image = "Redhat.png"
-Files = "/etc/redhat_version"
-;detected in "/etc/redhat-release"
+Image = "RedHat.png"
+Mode = "Analyse"
+Files = "/etc/redhat-release;/etc/redhat_version"
+;detected in "/etc/system-release"
+[Red Hat Enterprise Linux Everything]
+Image = "RedHat.png"
+;detected in "/etc/os-release"
+
[RedHatEnterpriseES]
-Image = "Redhat.png"
-Files = "/etc/redhat_version"
-;detected in "/etc/redhat-release"
+Image = "RedHat.png"
+;detected in "lsb_release -a"
[RedHatEnterpriseAS]
-Image = "Redhat.png"
-Files = "/etc/redhat_version"
-;detected in "/etc/redhat-release"
+Image = "RedHat.png"
+;detected in "lsb_release -a"
[RedHatEnterpriseServer]
-Image = "Redhat.png"
-Files = "/etc/redhat_version"
-;detected in "/etc/redhat-release"
+Image = "RedHat.png"
+;detected in "lsb_release -a"
+
+[RedHatEnterpriseClient]
+Image = "RedHat.png"
+;detected in "lsb_release -a"
Modified: trunk/phpsysinfo/data/languages.ini
===================================================================
--- trunk/phpsysinfo/data/languages.ini 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/data/languages.ini 2017-12-26 13:13:38 UTC (rev 17472)
@@ -304,6 +304,7 @@
_en_BW="English Botswana"
_en_BZ="English Belize"
_en_CA="English Canada"
+_en_DK="English Denmark"
_en_Dsrt="English (Deseret)"
_en_Dsrt_US="English United States (Deseret)"
_en="English"
@@ -687,7 +688,6 @@
_no_NO="Norwegian Nynorsk Norway"
_no_NO_NY="Norwegian Nynorsk Norway"
_no="Norwegian"
-_no="Norwegian Nynorsk"
_nor="Norwegian"
_norwegian="Norwegian"
_nr="South Ndebele"
Added: trunk/phpsysinfo/data/osnames.ini
===================================================================
--- trunk/phpsysinfo/data/osnames.ini (rev 0)
+++ trunk/phpsysinfo/data/osnames.ini 2017-12-26 13:13:38 UTC (rev 17472)
@@ -0,0 +1,39 @@
+[Android]
+1.0="Apple Pie"
+1.1="Banana Bread"
+1.5="Cupcake"
+1.6="Donut"
+2.0="Eclair"
+2.1="Eclair"
+2.2="Froyo"
+2.3="Gingerbread"
+3.0="Honeycomb"
+3.1="Honeycomb"
+3.2="Honeycomb"
+4.0="Ice Cream Sandwich"
+4.1="Jelly Bean"
+4.2="Jelly Bean"
+4.3="Jelly Bean"
+4.4="KitKat"
+5.0="Lollipop"
+5.1="Lollipop"
+6.0="Marshmallow"
+7.0="Nougat"
+7.1="Nougat"
+8.0="Oreo"
+
+[OS X]
+10.0="Cheetah"
+10.1="Puma"
+10.2="Jaguar"
+10.3="Panther"
+10.4="Tiger"
+10.5="Leopard"
+10.6="Snow Leopard"
+10.7="Lion"
+10.8="Mountain Lion"
+10.9="Mavericks"
+10.10="Yosemite"
+10.11="El Capitan"
+10.12="Sierra"
+10.13="High Sierra"
Added: trunk/phpsysinfo/data/raspberry.ini
===================================================================
--- trunk/phpsysinfo/data/raspberry.ini (rev 0)
+++ trunk/phpsysinfo/data/raspberry.ini 2017-12-26 13:13:38 UTC (rev 17472)
@@ -0,0 +1,29 @@
+[old]
+2="B (PCB 1.0)"
+3="B ECN0001 (PCB 1.0)"
+4="B (PCB 2.0)"
+5="B (PCB 2.0)"
+6="B (PCB 2.0)"
+7="A (PCB 2.0)"
+8="A (PCB 2.0)"
+9="A (PCB 2.0)"
+13="B (PCB 2.0)"
+14="B (PCB 2.0)"
+15="B (PCB 2.0)"
+16="B+ (PCB 1.0)"
+17="Compute Module (PCB 1.0)"
+18="A+ (PCB 1.1)"
+19="B+ (PCB 1.2)"
+20="Compute Module (PCB 1.0)"
+21="A+ (PCB 1.1)"
+
+[model]
+0="A"
+1="B"
+2="A+"
+3="B+"
+4="2 B"
+5="Alpha"
+6="Compute Module"
+8="3 B"
+9="Zero"
Added: trunk/phpsysinfo/gfx/ajax-loader.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/ajax-loader.gif
===================================================================
--- trunk/phpsysinfo/gfx/ajax-loader.gif 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/ajax-loader.gif 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/ajax-loader.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/attention.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/attention.gif
===================================================================
--- trunk/phpsysinfo/gfx/attention.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/attention.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/attention.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/attention.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/blank.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/blank.gif
===================================================================
--- trunk/phpsysinfo/gfx/blank.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/blank.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/body.gif
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/bullet_toggle_minus.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/bullet_toggle_minus.gif
===================================================================
--- trunk/phpsysinfo/gfx/bullet_toggle_minus.gif 2017-12-26 12:28:09 UTC
(rev 17471)
+++ trunk/phpsysinfo/gfx/bullet_toggle_minus.gif 2017-12-26 13:13:38 UTC
(rev 17472)
Property changes on: trunk/phpsysinfo/gfx/bullet_toggle_minus.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/bullet_toggle_minus.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/bullet_toggle_plus.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/bullet_toggle_plus.gif
===================================================================
--- trunk/phpsysinfo/gfx/bullet_toggle_plus.gif 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/bullet_toggle_plus.gif 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/bullet_toggle_plus.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/bullet_toggle_plus.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/down_black.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/down_black.gif
===================================================================
--- trunk/phpsysinfo/gfx/down_black.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/down_black.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/down_black.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/down_gray.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/down_gray.gif
===================================================================
--- trunk/phpsysinfo/gfx/down_gray.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/down_gray.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/down_gray.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/favicon.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/favicon.gif
===================================================================
--- trunk/phpsysinfo/gfx/favicon.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/favicon.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/favicon.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/favicon.ico
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/favicon.ico
===================================================================
--- trunk/phpsysinfo/gfx/favicon.ico 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/favicon.ico 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/favicon.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/favicon.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/4MLinux.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/4MLinux.png
===================================================================
--- trunk/phpsysinfo/gfx/images/4MLinux.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/4MLinux.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/4MLinux.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/AIX.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/Alpine.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Amazon.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Amazon.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Amazon.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Amazon.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Amazon.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/BOSS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/BOSS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/BOSS.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/BOSS.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/BOSS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Calculate.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Calculate.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Calculate.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Calculate.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Calculate.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Canaima.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Canaima.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Canaima.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Canaima.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Canaima.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Chakra.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Cloud.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Cloud.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Cloud.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Cloud.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Cloud.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/images/CloudLinux.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Container.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Container.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Container.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Container.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Container.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/CoreOS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/CoreOS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/CoreOS.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/CoreOS.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/CoreOS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Deepin.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Devuan.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Devuan.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Devuan.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Devuan.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Devuan.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/DragonFly.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/Eisfair.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Generations.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Generations.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Generations.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Generations.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Generations.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Gobo.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Gobo.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Gobo.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Gobo.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Gobo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/HPUX.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Handy.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Handy.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Handy.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Handy.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Handy.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/HipServ.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/HipServ.png
===================================================================
--- trunk/phpsysinfo/gfx/images/HipServ.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/HipServ.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/HipServ.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/KaOS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/KaOS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/KaOS.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/KaOS.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/KaOS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Korora.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Korora.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Korora.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Korora.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Korora.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/LFS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/LFS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/LFS.png 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/images/LFS.png 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/images/LFS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Lakka.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Lakka.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Lakka.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Lakka.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Lakka.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/LibreELEC.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/LibreELEC.png
===================================================================
--- trunk/phpsysinfo/gfx/images/LibreELEC.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/LibreELEC.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/LibreELEC.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Lunar.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Lunar.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Lunar.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Lunar.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Lunar.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Mageia.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Mer.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Mer.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Mer.png 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/images/Mer.png 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/images/Mer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Minix.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/NeoKylin.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/NeoKylin.png
===================================================================
--- trunk/phpsysinfo/gfx/images/NeoKylin.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/NeoKylin.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/NeoKylin.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/NetBSD.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/NixOS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/NixOS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/NixOS.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/NixOS.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/NixOS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/OpenELEC.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/OpenELEC.png
===================================================================
--- trunk/phpsysinfo/gfx/images/OpenELEC.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/OpenELEC.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/OpenELEC.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/OpenMamba.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/OpenMamba.png
===================================================================
--- trunk/phpsysinfo/gfx/images/OpenMamba.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/OpenMamba.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/OpenMamba.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/OpenMandriva.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/OpenMandriva.png
===================================================================
--- trunk/phpsysinfo/gfx/images/OpenMandriva.png 2017-12-26 12:28:09 UTC
(rev 17471)
+++ trunk/phpsysinfo/gfx/images/OpenMandriva.png 2017-12-26 13:13:38 UTC
(rev 17472)
Property changes on: trunk/phpsysinfo/gfx/images/OpenMandriva.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Oracle.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/PCLinuxOS.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/PLD.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Parsix.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Parsix.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Parsix.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Parsix.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Parsix.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Pear.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Pisi.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Pisi.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Pisi.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Pisi.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Pisi.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/PureOS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/PureOS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/PureOS.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/PureOS.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/PureOS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/QNX.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/QNX.png
===================================================================
--- trunk/phpsysinfo/gfx/images/QNX.png 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/images/QNX.png 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/images/QNX.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/QTS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/QTS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/QTS.png 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/images/QTS.png 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/images/QTS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Qubes.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Qubes.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Qubes.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Qubes.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Qubes.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Raspbian.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Raspbian.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Raspbian.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Raspbian.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Raspbian.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/RedFlag.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/RedFlag.png
===================================================================
--- trunk/phpsysinfo/gfx/images/RedFlag.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/RedFlag.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/RedFlag.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/RedHat.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/RedHat.png
===================================================================
--- trunk/phpsysinfo/gfx/images/RedHat.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/RedHat.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/RedHat.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/images/Redhat.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/SMEServer.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/SMEServer.png
===================================================================
--- trunk/phpsysinfo/gfx/images/SMEServer.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/SMEServer.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/SMEServer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/SMS.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/SUSE.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/SUSE.png
===================================================================
--- trunk/phpsysinfo/gfx/images/SUSE.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/SUSE.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/SUSE.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Sabayon.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/SalentOS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/SalentOS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/SalentOS.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/SalentOS.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/SalentOS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Salix.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Semplice.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Semplice.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Semplice.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Semplice.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Semplice.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Slackware.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/SliTaz.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/SliTaz.png
===================================================================
--- trunk/phpsysinfo/gfx/images/SliTaz.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/SliTaz.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/SliTaz.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Solus.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Solus.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Solus.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Solus.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Solus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/SolydXK.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/SolydXK.png
===================================================================
--- trunk/phpsysinfo/gfx/images/SolydXK.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/SolydXK.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/SolydXK.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/StartOS.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/SteamOS.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/SteamOS.png
===================================================================
--- trunk/phpsysinfo/gfx/images/SteamOS.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/SteamOS.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/SteamOS.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/images/Suse.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/Synology.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Tails.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Tails.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Tails.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Tails.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Tails.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/Tanglu.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Tanglu.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Tanglu.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Tanglu.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Tanglu.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/TinyCore.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/TinyCore.png
===================================================================
--- trunk/phpsysinfo/gfx/images/TinyCore.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/TinyCore.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/TinyCore.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/images/Tinycore.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Tizen.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Tizen.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Tizen.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Tizen.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Tizen.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/UltimateEdition.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/UltimateEdition.png
===================================================================
--- trunk/phpsysinfo/gfx/images/UltimateEdition.png 2017-12-26 12:28:09 UTC
(rev 17471)
+++ trunk/phpsysinfo/gfx/images/UltimateEdition.png 2017-12-26 13:13:38 UTC
(rev 17472)
Property changes on: trunk/phpsysinfo/gfx/images/UltimateEdition.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Vector.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Void.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Void.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Void.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Void.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Void.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/VortexBox.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/VortexBox.png
===================================================================
--- trunk/phpsysinfo/gfx/images/VortexBox.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/VortexBox.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/VortexBox.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/Win8.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/Zenwalk.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/Zenwalk.png
===================================================================
--- trunk/phpsysinfo/gfx/images/Zenwalk.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/Zenwalk.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/Zenwalk.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/images/antiX.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/elementaryOS.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/gNewSense.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/images/iycc.png
===================================================================
(Binary files differ)
Deleted: trunk/phpsysinfo/gfx/images/lfs.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/images/openSUSE.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/openSUSE.png
===================================================================
--- trunk/phpsysinfo/gfx/images/openSUSE.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/openSUSE.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/openSUSE.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/images/pfSense.png
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/images/pfSense.png
===================================================================
--- trunk/phpsysinfo/gfx/images/pfSense.png 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/images/pfSense.png 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/images/pfSense.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/logo_32.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/logo_32.gif
===================================================================
--- trunk/phpsysinfo/gfx/logo_32.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/logo_32.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/logo_32.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpsysinfo/gfx/next.gif
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/prev.gif
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/reload.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/reload.gif
===================================================================
--- trunk/phpsysinfo/gfx/reload.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/reload.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/reload.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/reload.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/right_black.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/right_black.gif
===================================================================
--- trunk/phpsysinfo/gfx/right_black.gif 2017-12-26 12:28:09 UTC (rev
17471)
+++ trunk/phpsysinfo/gfx/right_black.gif 2017-12-26 13:13:38 UTC (rev
17472)
Property changes on: trunk/phpsysinfo/gfx/right_black.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/right_gray.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/right_gray.gif
===================================================================
--- trunk/phpsysinfo/gfx/right_gray.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/right_gray.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/right_gray.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpsysinfo/gfx/sort_asc.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/sort_asc.gif
===================================================================
--- trunk/phpsysinfo/gfx/sort_asc.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/sort_asc.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/sort_asc.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/sort_asc.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/sort_both.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/sort_both.gif
===================================================================
--- trunk/phpsysinfo/gfx/sort_both.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/sort_both.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/sort_both.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/sort_both.png
===================================================================
(Binary files differ)
Added: trunk/phpsysinfo/gfx/sort_desc.gif
===================================================================
(Binary files differ)
Index: trunk/phpsysinfo/gfx/sort_desc.gif
===================================================================
--- trunk/phpsysinfo/gfx/sort_desc.gif 2017-12-26 12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/gfx/sort_desc.gif 2017-12-26 13:13:38 UTC (rev 17472)
Property changes on: trunk/phpsysinfo/gfx/sort_desc.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/phpsysinfo/gfx/sort_desc.png
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/treeTable/tv-collapsable-last.gif
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/treeTable/tv-expandable-last.gif
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/gfx/treeTable/tv-expandable.gif
===================================================================
(Binary files differ)
Modified: trunk/phpsysinfo/includes/autoloader.inc.php
===================================================================
--- trunk/phpsysinfo/includes/autoloader.inc.php 2017-12-26 12:28:09 UTC
(rev 17471)
+++ trunk/phpsysinfo/includes/autoloader.inc.php 2017-12-26 13:13:38 UTC
(rev 17472)
@@ -8,7 +8,7 @@
* @package PSI
* @author Michael Cramer <address@hidden>
* @copyright 2009 phpSysInfo
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License version 2, or (at your option) any later version
* @version SVN: $Id$
* @link http://phpsysinfo.sourceforge.net
*/
@@ -22,7 +22,7 @@
*
* @return void
*/
-function __autoload($class_name)
+function psi_autoload($class_name)
{
//$class_name = str_replace('-', '', $class_name);
@@ -48,12 +48,14 @@
}
}
- $error = Error::singleton();
+ $error = PSI_Error::singleton();
- $error->addError("_autoload(\"".$class_name."\")", "autoloading of class
file (class.".$class_name.".inc.php) failed!");
+ $error->addError("psi_autoload(\"".$class_name."\")", "autoloading of
class file (class.".$class_name.".inc.php) failed!");
$error->errorsAsXML();
}
+spl_autoload_register('psi_autoload');
+
/**
* sets a user-defined error handler function
*
@@ -66,8 +68,10 @@
*/
function errorHandlerPsi($level, $message, $file, $line)
{
- $error = Error::singleton();
+ $error = PSI_Error::singleton();
+ if (PSI_DEBUG || ($level !== 2) || !(preg_match("/^[^:]*: open_basedir /",
$message) || preg_match("/^fopen\(/", $message) ||
preg_match("/^is_readable\(/", $message) || preg_match("/^file_exists\(/",
$message))) { // disable open_basedir, fopen, is_readable and file_exists
warnings
$error->addPhpError("errorHandlerPsi : ", "Level : ".$level." Message :
".$message." File : ".$file." Line : ".$line);
+ }
}
set_error_handler('errorHandlerPsi');
Modified: trunk/phpsysinfo/includes/class.CommonFunctions.inc.php
===================================================================
--- trunk/phpsysinfo/includes/class.CommonFunctions.inc.php 2017-12-26
12:28:09 UTC (rev 17471)
+++ trunk/phpsysinfo/includes/class.CommonFunctions.inc.php 2017-12-26
13:13:38 UTC (rev 17472)
@@ -8,7 +8,7 @@
* @package PSI
* @author Michael Cramer <address@hidden>
* @copyright 2009 phpSysInfo
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License version 2, or (at your option) any later version
* @version SVN: $Id$
* @link http://phpsysinfo.sourceforge.net
*/
@@ -19,7 +19,7 @@
* @package PSI
* @author Michael Cramer <address@hidden>
* @copyright 2009 phpSysInfo
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License version 2, or (at your option) any later version
* @version Release: 3.0
* @link http://phpsysinfo.sourceforge.net
*/
@@ -31,16 +31,16 @@
$log_file = substr(PSI_LOG, 1);
if (file_exists($log_file)) {
$contents = @file_get_contents($log_file);
- if ($contents && preg_match("/^\-\-\-[^-\n]+\-\-\-
".preg_quote($string, '/')."\n/m", $contents, $matches, PREG_OFFSET_CAPTURE)) {
+ if ($contents && preg_match("/^\-\-\-[^-\r\n]+\-\-\-
".preg_quote($string, '/')."\r?\n/m", $contents, $matches,
PREG_OFFSET_CAPTURE)) {
$findIndex = $matches[0][1];
- if (preg_match("/\n/m", $contents, $matches,
PREG_OFFSET_CAPTURE, $findIndex)) {
+ if (preg_match("/\r?\n/m", $contents, $matches,
PREG_OFFSET_CAPTURE, $findIndex)) {
$startIndex = $matches[0][1]+1;
- if (preg_match("/^\-\-\-[^-\n]+\-\-\- /m", $contents,
$matches, PREG_OFFSET_CAPTURE, $startIndex)) {
+ if (preg_match("/^\-\-\-[^-\r\n]+\-\-\- /m",
$contents, $matches, PREG_OFFSET_CAPTURE, $startIndex)) {
$stopIndex = $matches[0][1];
- return substr($contents, $startIndex,
$stopIndex-$startIndex );
+ return substr($contents, $startIndex,
$stopIndex-$startIndex);
} else {
- return substr($contents, $startIndex );
+ return substr($contents, $startIndex);
}
}
}
@@ -56,30 +56,30 @@
*
* @param string $strProgram name of the program
*
- * @return string complete path and name of the program
+ * @return string|null complete path and name of the program
*/
private static function _findProgram($strProgram)
{
$path_parts = pathinfo($strProgram);
if (empty($path_parts['basename'])) {
- return;
+ return null;
}
$arrPath = array();
+
+ if (empty($path_parts['dirname']) || ($path_parts['dirname'] == '.')) {
if ((PSI_OS == 'WINNT') && empty($path_parts['extension'])) {
$strProgram .= '.exe';
$path_parts = pathinfo($strProgram);
}
- if (empty($path_parts['dirname']) || ($path_parts['dirname'] == '.')) {
if (PSI_OS == 'WINNT') {
$arrPath = preg_split('/;/', getenv("Path"), -1,
PREG_SPLIT_NO_EMPTY);
} else {
$arrPath = preg_split('/:/', getenv("PATH"), -1,
PREG_SPLIT_NO_EMPTY);
}
- } else {
- array_push($arrPath, $path_parts['dirname']);
- $strProgram = $path_parts['basename'];
+ if (defined('PSI_UNAMEO') && (PSI_UNAMEO === 'Android') &&
!empty($arrPath)) {
+ array_push($arrPath, '/system/bin'); // Termux patch
}
- if ( defined('PSI_ADD_PATHS') && is_string(PSI_ADD_PATHS) ) {
+ if (defined('PSI_ADD_PATHS') && is_string(PSI_ADD_PATHS)) {
if (preg_match(ARRAY_EXP, PSI_ADD_PATHS)) {
$arrPath = array_merge(eval(PSI_ADD_PATHS), $arrPath); // In
this order so $addpaths is before $arrPath when looking for a program
} else {
@@ -86,6 +86,11 @@
$arrPath = array_merge(array(PSI_ADD_PATHS), $arrPath); // In
this order so $addpaths is before $arrPath when looking for a program
}
}
+ } else { //directory defined
+ array_push($arrPath, $path_parts['dirname']);
+ $strProgram = $path_parts['basename'];
+ }
+
//add some default paths if we still have no paths here
if (empty($arrPath) && PSI_OS != 'WINNT') {
if (PSI_OS == 'Android') {
@@ -94,25 +99,44 @@
array_push($arrPath, '/bin', '/sbin', '/usr/bin', '/usr/sbin',
'/usr/local/bin', '/usr/local/sbin');
}
}
- // If open_basedir defined, fill the $open_basedir array with
authorized paths,. (Not tested when no open_basedir restriction)
- if ((bool) ini_get('open_basedir')) {
- $open_basedir = preg_split('/:/', ini_get('open_basedir'), -1,
PREG_SPLIT_NO_EMPTY);
+
+ $exceptPath = "";
+ if ((PSI_OS == 'WINNT') && (($windir = getenv("WinDir")) !== false)) {
+ $windir = strtolower($windir);
+ foreach ($arrPath as $strPath) {
+ if ((strtolower($strPath) == $windir."\\system32") &&
is_dir($windir."\\SysWOW64")) {
+ $exceptPath = $windir."\\sysnative";
+ array_push($arrPath, $exceptPath);
+ break;
+ }
+ }
+ } elseif (PSI_OS == 'Android') {
+ $exceptPath = '/system/bin';
}
+
foreach ($arrPath as $strPath) {
- // To avoid "open_basedir restriction in effect" error when
testing paths if restriction is enabled
- if ((isset($open_basedir) && !in_array($strPath, $open_basedir)) ||
- !(((PSI_OS == 'Android') && ($strPath=='/system/bin')) ||
is_dir($strPath))) { //is_dir('/system/bin') Android patch
+ // Path with and without trailing slash
+ if (PSI_OS == 'WINNT') {
+ $strPath = rtrim($strPath, "\\");
+ $strPathS = $strPath."\\";
+ } else {
+ $strPath = rtrim($strPath, "/");
+ $strPathS = $strPath."/";
+ }
+ if (($strPath !== $exceptPath) && !is_dir($strPath)) {
continue;
}
if (PSI_OS == 'WINNT') {
- $strProgrammpath = rtrim($strPath,'\\').'\\'.$strProgram;
+ $strProgrammpath = $strPathS.$strProgram;
} else {
- $strProgrammpath = rtrim($strPath,"/")."/".$strProgram;
+ $strProgrammpath = $strPathS.$strProgram;
}
if (is_executable($strProgrammpath)) {
return $strProgrammpath;
}
}
+
+ return null;
}
/**
@@ -149,14 +173,43 @@
$strError = '';
$pipes = array();
$strProgram = self::_findProgram($strProgramname);
- $error = Error::singleton();
+ $error = PSI_Error::singleton();
if (!$strProgram) {
if ($booErrorRep) {
- $error->addError('find_program('.$strProgramname.')', 'program
not found on the machine');
+ $error->addError('find_program("'.$strProgramname.'")',
'program not found on the machine');
}
return false;
+ } else {
+ if (preg_match('/\s/', $strProgram)) {
+ $strProgram = '"'.$strProgram.'"';
+ }
}
+
+ if ((PSI_OS !== 'WINNT') && defined('PSI_SUDO_COMMANDS') &&
is_string(PSI_SUDO_COMMANDS)) {
+ if (preg_match(ARRAY_EXP, PSI_SUDO_COMMANDS)) {
+ $sudocommands = eval(PSI_SUDO_COMMANDS);
+ } else {
+ $sudocommands = array(PSI_SUDO_COMMANDS);
+ }
+ if (in_array($strProgramname, $sudocommands)) {
+ $sudoProgram = self::_findProgram("sudo");
+ if (!$sudoProgram) {
+ if ($booErrorRep) {
+ $error->addError('find_program("sudo")', 'program not
found on the machine');
+ }
+
+ return false;
+ } else {
+ if (preg_match('/\s/', $sudoProgram)) {
+ $strProgram = '"'.$sudoProgram.'" '.$strProgram;
+ } else {
+ $strProgram = $sudoProgram.' '.$strProgram;
+ }
+ }
+ }
+ }
+
// see if we've gotten a |, if we have we need to do path checking on
the cmd
if ($strArgs) {
$arrArgs = preg_split('/ /', $strArgs, -1, PREG_SPLIT_NO_EMPTY);
@@ -164,15 +217,20 @@
if ($arrArgs[$i] == '|') {
$strCmd = $arrArgs[$i + 1];
$strNewcmd = self::_findProgram($strCmd);
- $strArgs = preg_replace("/\| ".$strCmd.'/', "|
".$strNewcmd, $strArgs);
+ $strArgs = preg_replace("/\| ".$strCmd.'/', '|
"'.$strNewcmd.'"', $strArgs);
}
}
+ $strArgs = ' '.$strArgs;
}
$descriptorspec = array(0=>array("pipe", "r"), 1=>array("pipe", "w"),
2=>array("pipe", "w"));
if (defined("PSI_MODE_POPEN") && PSI_MODE_POPEN === true) {
- $process = $pipes[1] = popen($strProgram." ".$strArgs."
2>/dev/null", "r");
+ if (PSI_OS == 'WINNT') {
+ $process = $pipes[1] = popen($strProgram.$strArgs." 2>nul",
"r");
+ } else {
+ $process = $pipes[1] = popen($strProgram.$strArgs."
2>/dev/null", "r");
+ }
} else {
- $process = proc_open($strProgram." ".$strArgs, $descriptorspec,
$pipes);
+ $process = proc_open($strProgram.$strArgs, $descriptorspec,
$pipes);
}
if (is_resource($process)) {
self::_timeoutfgets($pipes, $strBuffer, $strError);
@@ -196,7 +254,7 @@
$strError = trim($strError);
$strBuffer = trim($strBuffer);
if (defined('PSI_LOG') && is_string(PSI_LOG) && (strlen(PSI_LOG)>0) &&
(substr(PSI_LOG, 0, 1)!="-") && (substr(PSI_LOG, 0, 1)!="+")) {
- error_log("---".gmdate('r T')."--- Executing:
".trim($strProgramname.' '.$strArgs)."\n".$strBuffer."\n", 3, PSI_LOG);
+ error_log("---".gmdate('r T')."--- Executing:
".trim($strProgramname.$strArgs)."\n".$strBuffer."\n", 3, PSI_LOG);
}
if (! empty($strError)) {
if ($booErrorRep) {
@@ -239,7 +297,7 @@
$strFile = "";
$intCurLine = 1;
- $error = Error::singleton();
+ $error = PSI_Error::singleton();
if (file_exists($strFileName)) {
if (is_readable($strFileName)) {
if ($fd = fopen($strFileName, 'r')) {
@@ -254,8 +312,12 @@
fclose($fd);
$strRet = $strFile;
if (defined('PSI_LOG') && is_string(PSI_LOG) &&
(strlen(PSI_LOG)>0) && (substr(PSI_LOG, 0, 1)!="-") && (substr(PSI_LOG, 0,
1)!="+")) {
+ if ((strlen($strRet)>0)&&(substr($strRet, -1)!="\n")) {
+ error_log("---".gmdate('r T')."--- Reading:
".$strFileName."\n".$strRet."\n", 3, PSI_LOG);
+ } else {
error_log("---".gmdate('r T')."--- Reading:
".$strFileName."\n".$strRet, 3, PSI_LOG);
}
+ }
} else {
if ($booErrorRep) {
$error->addError('fopen('.$strFileName.')', 'file can not
read by phpsysinfo');
@@ -282,6 +344,31 @@
}
/**
+ * file exists
+ *
+ * @param string $strFileName name of the file which should be check
+ *
+ * @return boolean command successfull or not
+ */
+ public static function fileexists($strFileName)
+ {
+ if (defined('PSI_LOG') && is_string(PSI_LOG) && (strlen(PSI_LOG)>0) &&
((substr(PSI_LOG, 0, 1)=="-") || (substr(PSI_LOG, 0, 1)=="+"))) {
+ $log_file = substr(PSI_LOG, 1);
+ if (file_exists($log_file)
+ && ($contents = @file_get_contents($log_file))
+ && preg_match("/^\-\-\-[^-\n]+\-\-\- ".preg_quote("Reading:
".$strFileName, '/')."\n/m", $contents)) {
+ return true;
+ } else {
+ if (substr(PSI_LOG, 0, 1)=="-") {
+ return false;
+ }
+ }
+ }
+
+ return file_exists($strFileName);
+ }
+
+ /**
* reads a directory and return the name of the files and directorys in it
*
* @param string $strPath path of the directory which should be read
@@ -292,7 +379,7 @@
public static function gdc($strPath, $booErrorRep = true)
{
$arrDirectoryContent = array();
- $error = Error::singleton();
+ $error = PSI_Error::singleton();
if (is_dir($strPath)) {
if ($handle = opendir($strPath)) {
while (($strFile = readdir($handle)) !== false) {
@@ -330,12 +417,12 @@
*/
public static function checkForExtensions($arrExt = array())
{
- if ((strcasecmp(PSI_SYSTEM_CODEPAGE,"UTF-8") == 0) ||
(strcasecmp(PSI_SYSTEM_CODEPAGE,"CP437") == 0))
+ if ((strcasecmp(PSI_SYSTEM_CODEPAGE, "UTF-8") == 0) ||
(strcasecmp(PSI_SYSTEM_CODEPAGE, "CP437") == 0))
$arrReq = array('simplexml', 'pcre', 'xml', 'dom');
elseif (PSI_OS == "WINNT")
- $arrReq = array('simplexml', 'pcre', 'xml', 'mbstring', 'dom',
'com_dotnet');
+ $arrReq = array('simplexml', 'pcre', 'xml', 'dom', 'mbstring',
'com_dotnet');
else
- $arrReq = array('simplexml', 'pcre', 'xml', 'mbstring', 'dom');
+ $arrReq = array('simplexml', 'pcre', 'xml', 'dom', 'mbstring');
$extensions = array_merge($arrExt, $arrReq);
$text = "";
$error = false;
@@ -370,8 +457,8 @@
*/
private static function _timeoutfgets($pipes, &$out, &$err, $timeout = 30)
{
- $w = NULL;
- $e = NULL;
+ $w = null;
+ $e = null;
if (defined("PSI_MODE_POPEN") && PSI_MODE_POPEN === true) {
$pipe2 = false;
@@ -378,7 +465,7 @@
} else {
$pipe2 = true;
}
- while (!(feof($pipes[1]) || ($pipe2 && feof($pipes[2])))) {
+ while (!(feof($pipes[1]) && (!$pipe2 || feof($pipes[2])))) {
if ($pipe2) {
$read = array($pipes[1], $pipes[2]);
} else {
@@ -387,11 +474,10 @@
$n = stream_select($read, $w, $e, $timeout);
- if ($n === FALSE) {
+ if ($n === false) {
error_log('stream_select: failed !');
break;
- }
- else if ($n === 0) {
+ } elseif ($n === 0) {
error_log('stream_select: timeout expired !');
break;
}
@@ -399,8 +485,7 @@
foreach ($read as $r) {
if ($r == $pipes[1]) {
$out .= fread($r, 4096);
- }
- if ($pipe2 && ($r == $pipes[2])) {
+ } elseif (feof($pipes[1]) && $pipe2 && ($r == $pipes[2]))
{//read STDERR after STDOUT
$err .= fread($r, 4096);
}
}
@@ -411,7 +496,7 @@
* function for getting a list of values in the specified context
* optionally filter this list, based on the list from third parameter
*
- * @param $wmi holds the COM object that we pull the WMI data from
+ * @param $wmi object holds the COM object that we pull the WMI data from
* @param string $strClass name of the class where the values are stored
* @param array $strValue filter out only needed values, if not set all
values of the class are returned
*
@@ -432,8 +517,8 @@
}
$arrInstance = array();
foreach ($arrProp as $propItem) {
- eval("\$value = \$objItem->".$propItem->Name.";");
- if ( empty($strValue)) {
+ $value = $objItem->{$propItem->Name}; //instead
exploitable eval("\$value = \$objItem->".$propItem->Name.";");
+ if (empty($strValue)) {
if (is_string($value))
$arrInstance[$propItem->Name] = trim($value);
else $arrInstance[$propItem->Name] = $value;
} else {
@@ -447,7 +532,8 @@
}
} catch (Exception $e) {
if (PSI_DEBUG) {
- $this->error->addError($e->getCode(), $e->getMessage());
+ $error = PSI_Error::singleton();
+ $error->addError($e->getCode(), $e->getMessage());
}
}
}
@@ -456,13 +542,13 @@
}
/**
- * get all configured plugins from config.php (file must be included
before calling this function)
+ * get all configured plugins from phpsysinfo.ini (file must be included
and processed before calling this function)
*
* @return array
*/
public static function getPlugins()
{
- if ( defined('PSI_PLUGINS') && is_string(PSI_PLUGINS) ) {
+ if (defined('PSI_PLUGINS') && is_string(PSI_PLUGINS)) {
if (preg_match(ARRAY_EXP, PSI_PLUGINS)) {
return eval(strtolower(PSI_PLUGINS));
} else {
Modified: trunk/phpsysinfo/includes/class.Parser.inc.php
===================================================================
--- trunk/phpsysinfo/includes/class.Parser.inc.php 2017-12-26 12:28:09 UTC
(rev 17471)
+++ trunk/phpsysinfo/includes/class.Parser.inc.php 2017-12-26 13:13:38 UTC
(rev 17472)
@@ -8,7 +8,7 @@
* @package PSI
* @author Michael Cramer <address@hidden>
* @copyright 2009 phpSysInfo
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License version 2, or (at your option) any later version
* @version SVN: $Id$
* @link http://phpsysinfo.sourceforge.net
*/
@@ -19,7 +19,7 @@
* @package PSI
* @author Michael Cramer <address@hidden>
* @copyright 2009 phpSysInfo
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License version 2, or (at your option) any later version
* @version Release: 3.0
* @link http://phpsysinfo.sourceforge.net
*/
@@ -28,12 +28,13 @@
/**
* parsing the output of lspci command
*
- * @return Array
+ * @param bool $debug
+ * @return array
*/
- public static function lspci()
+ public static function lspci($debug = PSI_DEBUG)
{
$arrResults = array();
- if (CommonFunctions::executeProgram("lspci", "", $strBuf, PSI_DEBUG)) {
+ if (CommonFunctions::executeProgram("lspci", "", $strBuf, $debug)) {
$arrLines = preg_split("/\n/", $strBuf, -1, PREG_SPLIT_NO_EMPTY);
foreach ($arrLines as $strLine) {
$arrParams = preg_split('/ /', trim($strLine), 2);
@@ -52,50 +53,66 @@
}
/**
- * parsing the output of pciconf command
- *
- * @return Array
- */
- public static function pciconf()
- {
- $arrResults = array();
- $intS = 0;
- if (CommonFunctions::executeProgram("pciconf", "-lv", $strBuf,
PSI_DEBUG)) {
- $arrTemp = array();
- $arrLines = preg_split("/\n/", $strBuf, -1, PREG_SPLIT_NO_EMPTY);
- foreach ($arrLines as $strLine) {
- if (preg_match("/(.*) = '(.*)'/", $strLine, $arrParts)) {
- if (trim($arrParts[1]) == "vendor") {
- $arrTemp[$intS] = trim($arrParts[2]);
- } elseif (trim($arrParts[1]) == "device") {
- $arrTemp[$intS] .= " - ".trim($arrParts[2]);
- $intS++;
- }
- }
- }
- foreach ($arrTemp as $name) {
- $dev = new HWDevice();
- $dev->setName($name);
- $arrResults[] = $dev;
- }
- }
-
- return $arrResults;
- }
-
- /**
* parsing the output of df command
*
* @param string $df_param additional parameter for df command
+ * @param bool $get_inodes
*
* @return array
*/
- public static function df($df_param = "")
+ public static function df($df_param = "", $get_inodes = true)
{
$arrResult = array();
- if (CommonFunctions::executeProgram('df', '-k '.$df_param, $df,
PSI_DEBUG)) {
+ if (CommonFunctions::executeProgram('mount', '', $mount, PSI_DEBUG)) {
+ $mount = preg_split("/\n/", $mount, -1, PREG_SPLIT_NO_EMPTY);
+ foreach ($mount as $mount_line) {
+ if (preg_match("/(\S+) on ([\S ]+) type (.*) \((.*)\)/",
$mount_line, $mount_buf)) {
+ $parm = array();
+ $parm['mountpoint'] = trim($mount_buf[2]);
+ $parm['fstype'] = $mount_buf[3];
+ $parm['name'] = $mount_buf[1];
+ if (PSI_SHOW_MOUNT_OPTION) $parm['options'] =
$mount_buf[4];
+ $mount_parm[] = $parm;
+ } elseif (preg_match("/(\S+) is (.*) mounted on (\S+) \(type
(.*)\)/", $mount_line, $mount_buf)) {
+ $parm = array();
+ $parm['mountpoint'] = trim($mount_buf[3]);
+ $parm['fstype'] = $mount_buf[4];
+ $parm['name'] = $mount_buf[1];
+ if (PSI_SHOW_MOUNT_OPTION) $parm['options'] =
$mount_buf[2];
+ $mount_parm[] = $parm;
+ } elseif (preg_match("/(\S+) (.*) on (\S+) \((.*)\)/",
$mount_line, $mount_buf)) {
+ $parm = array();
+ $parm['mountpoint'] = trim($mount_buf[3]);
+ $parm['fstype'] = $mount_buf[2];
+ $parm['name'] = $mount_buf[1];
+ if (PSI_SHOW_MOUNT_OPTION) $parm['options'] =
$mount_buf[4];
+ $mount_parm[] = $parm;
+ } elseif (preg_match("/(\S+) on ([\S ]+)
\((\S+)(,\s(.*))?\)/", $mount_line, $mount_buf)) {
+ $parm = array();
+ $parm['mountpoint'] = trim($mount_buf[2]);
+ $parm['fstype'] = $mount_buf[3];
+ $parm['name'] = $mount_buf[1];
+ if (PSI_SHOW_MOUNT_OPTION) $parm['options'] =
isset($mount_buf[5]) ? $mount_buf[5] : '';
+ $mount_parm[] = $parm;
+ }
+ }
+ } elseif (CommonFunctions::rfts("/etc/mtab", $mount)) {
+ $mount = preg_split("/\n/", $mount, -1, PREG_SPLIT_NO_EMPTY);
+ foreach ($mount as $mount_line) {
+ if (preg_match("/(\S+) (\S+) (\S+) (\S+) ([0-9]+) ([0-9]+)/",
$mount_line, $mount_buf)) {
+ $parm = array();
+ $mount_point = preg_replace("/\\\\040/i", ' ',
$mount_buf[2]); //space as \040
+ $parm['mountpoint'] = $mount_point;
+ $parm['fstype'] = $mount_buf[3];
+ $parm['name'] = $mount_buf[1];
+ if (PSI_SHOW_MOUNT_OPTION) $parm['options'] =
$mount_buf[4];
+ $mount_parm[] = $parm;
+ }
+ }
+ }
+ if (CommonFunctions::executeProgram('df', '-k '.$df_param, $df,
PSI_DEBUG) && ($df!=="")) {
$df = preg_split("/\n/", $df, -1, PREG_SPLIT_NO_EMPTY);
- if (PSI_SHOW_INODES) {
+ if ($get_inodes && PSI_SHOW_INODES) {
if (CommonFunctions::executeProgram('df', '-i '.$df_param,
$df2, PSI_DEBUG)) {
$df2 = preg_split("/\n/", $df2, -1, PREG_SPLIT_NO_EMPTY);
// Store inode use% in an associative array (df_inodes)
for later use
@@ -106,23 +123,6 @@
}
}
}
- if (CommonFunctions::executeProgram('mount', '', $mount,
PSI_DEBUG)) {
- $mount = preg_split("/\n/", $mount, -1, PREG_SPLIT_NO_EMPTY);
- foreach ($mount as $mount_line) {
- if (preg_match("/\S+ on (\S+) type (.*) \((.*)\)/",
$mount_line, $mount_buf)) {
- $mount_parm[$mount_buf[1]]['fstype'] = $mount_buf[2];
- if (PSI_SHOW_MOUNT_OPTION)
$mount_parm[$mount_buf[1]]['options'] = $mount_buf[3];
- } elseif (preg_match("/\S+ is (.*) mounted on (\S+) \(type
(.*)\)/", $mount_line, $mount_buf)) {
- $mount_parm[$mount_buf[2]]['fstype'] = $mount_buf[3];
- if (PSI_SHOW_MOUNT_OPTION)
$mount_parm[$mount_buf[2]]['options'] = $mount_buf[1];
- } elseif (preg_match("/\S+ (.*) on (\S+) \((.*)\)/",
$mount_line, $mount_buf)) {
- $mount_parm[$mount_buf[2]]['fstype'] = $mount_buf[1];
- if (PSI_SHOW_MOUNT_OPTION)
$mount_parm[$mount_buf[2]]['options'] = $mount_buf[3];
- } elseif (preg_match("/\S+ on ([\S ]+)
\((\S+)(,\s(.*))?\)/", $mount_line, $mount_buf)) {
- $mount_parm[$mount_buf[1]]['fstype'] = $mount_buf[2];
- if (PSI_SHOW_MOUNT_OPTION)
$mount_parm[$mount_buf[1]]['options'] = isset($mount_buf[4]) ? $mount_buf[4] :
'';
- }
- }
foreach ($df as $df_line) {
$df_buf1 = preg_split("/(\%\s)/", $df_line, 3);
if (count($df_buf1) < 2) {
@@ -150,13 +150,16 @@
}
if (PSI_SHOW_MOUNT_POINT)
$dev->setMountPoint($df_buf[5]);
- if (isset($mount_parm[$df_buf[5]])) {
- $dev->setFsType($mount_parm[$df_buf[5]]['fstype']);
+ $notwas = true;
+ if (isset($mount_parm)) {
+ foreach ($mount_parm as $mount_param) { //name and
mountpoint find
+ if (($mount_param['name']===trim($df_buf[0]))
&& ($mount_param['mountpoint']===$df_buf[5])) {
+ $dev->setFsType($mount_param['fstype']);
if (PSI_SHOW_MOUNT_OPTION) {
if (PSI_SHOW_MOUNT_CREDENTIALS) {
- $dev->setOptions($mount_parm[$df_buf[5]]['options']);
+
$dev->setOptions($mount_param['options']);
} else {
-
$mpo=$mount_parm[$df_buf[5]]['options'];
+ $mpo=$mount_param['options'];
$mpo=preg_replace('/(^guest,)|(^guest$)|(,guest$)/i', '', $mpo);
$mpo=preg_replace('/,guest,/i', ',',
$mpo);
@@ -173,8 +176,45 @@
$dev->setOptions($mpo);
}
}
+ $notwas = false;
+ break;
}
- if (PSI_SHOW_INODES &&
isset($df_inodes[trim($df_buf[0])])) {
+ }
+ if ($notwas) foreach ($mount_parm as $mount_param)
{ //mountpoint find
+ if ($mount_param['mountpoint']===$df_buf[5]) {
+ $dev->setFsType($mount_param['fstype']);
+ if (PSI_SHOW_MOUNT_OPTION) {
+ if (PSI_SHOW_MOUNT_CREDENTIALS) {
+
$dev->setOptions($mount_param['options']);
+ } else {
+ $mpo=$mount_param['options'];
+
+
$mpo=preg_replace('/(^guest,)|(^guest$)|(,guest$)/i', '', $mpo);
+ $mpo=preg_replace('/,guest,/i',
',', $mpo);
+
+
$mpo=preg_replace('/(^user=[^,]*,)|(^user=[^,]*$)|(,user=[^,]*$)/i', '', $mpo);
+
$mpo=preg_replace('/,user=[^,]*,/i', ',', $mpo);
+
+
$mpo=preg_replace('/(^username=[^,]*,)|(^username=[^,]*$)|(,username=[^,]*$)/i',
'', $mpo);
+
$mpo=preg_replace('/,username=[^,]*,/i', ',', $mpo);
+
+
$mpo=preg_replace('/(^password=[^,]*,)|(^password=[^,]*$)|(,password=[^,]*$)/i',
'', $mpo);
+
$mpo=preg_replace('/,password=[^,]*,/i', ',', $mpo);
+
+ $dev->setOptions($mpo);
+ }
+ }
+ $notwas = false;
+ break;
+ }
+ }
+ }
+
+ if ($notwas) {
+ $dev->setFsType('unknown');
+ }
+
+ if ($get_inodes && PSI_SHOW_INODES &&
isset($df_inodes[trim($df_buf[0])])) {
$dev->setPercentInodesUsed($df_inodes[trim($df_buf[0])]);
}
$arrResult[] = $dev;
@@ -181,6 +221,50 @@
}
}
}
+ } else {
+ if (isset($mount_parm)) {
+ foreach ($mount_parm as $mount_param) {
+ $total = disk_total_space($mount_param['mountpoint']);
+ if (($mount_param['fstype'] != 'none') && ($total > 0)) {
+ $dev = new DiskDevice();
+ $dev->setName($mount_param['name']);
+ $dev->setFsType($mount_param['fstype']);
+
+ if (PSI_SHOW_MOUNT_POINT)
$dev->setMountPoint($mount_param['mountpoint']);
+
+ $dev->setTotal($total);
+ $free = disk_free_space($mount_param['mountpoint']);
+ if ($free > 0) {
+ $dev->setFree($free);
+ } else {
+ $free = 0;
+ }
+ if ($total > $free) $dev->setUsed($total - $free);
+
+ if (PSI_SHOW_MOUNT_OPTION) {
+ if (PSI_SHOW_MOUNT_CREDENTIALS) {
+ $dev->setOptions($mount_param['options']);
+ } else {
+ $mpo=$mount_param['options'];
+
+
$mpo=preg_replace('/(^guest,)|(^guest$)|(,guest$)/i', '', $mpo);
+ $mpo=preg_replace('/,guest,/i', ',', $mpo);
+
+
$mpo=preg_replace('/(^user=[^,]*,)|(^user=[^,]*$)|(,user=[^,]*$)/i', '', $mpo);
+ $mpo=preg_replace('/,user=[^,]*,/i', ',',
$mpo);
+
+
$mpo=preg_replace('/(^username=[^,]*,)|(^username=[^,]*$)|(,username=[^,]*$)/i',
'', $mpo);
+ $mpo=preg_replace('/,username=[^,]*,/i', ',',
$mpo);
+
+
$mpo=preg_replace('/(^password=[^,]*,)|(^password=[^,]*$)|(,password=[^,]*$)/i',
'', $mpo);
+ $mpo=preg_replace('/,password=[^,]*,/i', ',',
$mpo);
+
+ $dev->setOptions($mpo);
+ }
+ }
+ $arrResult[] = $dev;
+ }
+ }
}
}
Deleted: trunk/phpsysinfo/includes/error/class.Error.inc.php
===================================================================
--- trunk/phpsysinfo/includes/error/class.Error.inc.php 2017-12-26 12:28:09 UTC
(rev 17471)
+++ trunk/phpsysinfo/includes/error/class.Error.inc.php 2017-12-26 13:13:38 UTC
(rev 17472)
@@ -1,286 +0,0 @@
-<?php
-/**
- * Error class
- *
- * PHP version 5
- *
- * @category PHP
- * @package PSI_Error
- * @author Michael Cramer <address@hidden>
- * @copyright 2009 phpSysInfo
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License
- * @version SVN: $Id$
- * @link http://phpsysinfo.sourceforge.net
- */
- /**
- * class for the error handling in phpsysinfo
- *
- * @category PHP
- * @package PSI_Error
- * @author Michael Cramer <address@hidden>
- * @copyright 2009 phpSysInfo
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public
License
- * @version Release: 3.0
- * @link http://phpsysinfo.sourceforge.net
- */
-class Error
-{
- /**
- * holds the instance of this class
- *
- * @static
- * @var object
- */
- private static $_instance;
-
- /**
- * holds the error messages
- *
- * @var array
- */
- private $_arrErrorList = array();
-
- /**
- * current number ob errors
- *
- * @var integer
- */
- private $_errors = 0;
-
- /**
- * initalize some used vars
- */
- private function __construct()
- {
- $this->_errors = 0;
- $this->_arrErrorList = array();
- }
-
- /**
- * Singleton function
- *
- * @return Error instance of the class
- */
- public static function singleton()
- {
- if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
- }
-
- return self::$_instance;
- }
-
- /**
- * triggers an error when somebody tries to clone the object
- *
- * @return void
- */
- public function __clone()
- {
- trigger_error("Can't be cloned", E_USER_ERROR);
- }
-
- /**
- * adds an phpsysinfo error to the internal list
- *
- * @param string $strCommand Command, which cause the Error
- * @param string $strMessage additional Message, to describe the Error
- *
- * @return void
- */
- public function addError($strCommand, $strMessage)
- {
- $this->_addError($strCommand, $this->_trace($strMessage));
- }
-
- /**
- * adds an error to the internal list
- *
- * @param string $strCommand Command, which cause the Error
- * @param string $strMessage message, that describe the Error
- *
- * @return void
- */
- private function _addError($strCommand, $strMessage)
- {
- $index = count($this->_arrErrorList) + 1;
- $this->_arrErrorList[$index]['command'] = $strCommand;
- $this->_arrErrorList[$index]['message'] = $strMessage;
- $this->_errors++;
- }
-
- /**
- * add a config error to the internal list
- *
- * @param object $strCommand Command, which cause the Error
- * @param object $strMessage additional Message, to describe the Error
- *
- * @return void
- */
- public function addConfigError($strCommand, $strMessage)
- {
- $this->_addError($strCommand, "Wrong Value in config.php for
".$strMessage);
- }
-
- /**
- * add a php error to the internal list
- *
- * @param object $strCommand Command, which cause the Error
- * @param object $strMessage additional Message, to describe the Error
- *
- * @return void
- */
- public function addPhpError($strCommand, $strMessage)
- {
- $this->_addError($strCommand, "PHP throws a error\n".$strMessage);
- }
-
- /**
- * adds a waraning to the internal list
- *
- * @param string $strMessage Warning message to display
- *
- * @return void
- */
- public function addWarning($strMessage)
- {
- $index = count($this->_arrErrorList) + 1;
- $this->_arrErrorList[$index]['command'] = "WARN";
- $this->_arrErrorList[$index]['message'] = $strMessage;
- }
-
- /**
- * converts the internal error and warning list to a XML file
- *
- * @return void
- */
- public function errorsAsXML()
- {
- $dom = new DOMDocument('1.0', 'UTF-8');
- $root = $dom->createElement("phpsysinfo");
- $dom->appendChild($root);
- $xml = new SimpleXMLExtended(simplexml_import_dom($dom), 'UTF-8');
- $generation = $xml->addChild('Generation');
- $generation->addAttribute('version', PSI_VERSION_STRING);
- $generation->addAttribute('timestamp', time());
- $xmlerr = $xml->addChild("Errors");
- foreach ($this->_arrErrorList as $arrLine) {
- $error = $xmlerr->addCData('Error', $arrLine['message']);
- $error->addAttribute('Function', $arrLine['command']);
- }
- header("Cache-Control: no-cache, must-revalidate\n");
- header("Content-Type: text/xml\n\n");
- echo $xml->getSimpleXmlElement()->asXML();
- exit();
- }
- /**
- * add the errors to an existing xml document
- *
- * @param String $encoding encoding
- *
- * @return SimpleXmlElement
- */
- public function errorsAddToXML($encoding)
- {
- $dom = new DOMDocument('1.0', 'UTF-8');
- $root = $dom->createElement("Errors");
- $dom->appendChild($root);
- $xml = simplexml_import_dom($dom);
- $xmlerr = new SimpleXMLExtended($xml, $encoding);
- foreach ($this->_arrErrorList as $arrLine) {
- $error = $xmlerr->addCData('Error', $arrLine['message']);
- $error->addAttribute('Function', $arrLine['command']);
- }
-
- return $xmlerr->getSimpleXmlElement();
- }
- /**
- * check if errors exists
- *
- * @return boolean true if are errors logged, false if not
- */
- public function errorsExist()
- {
- if ($this->_errors > 0) {
- return true;
- } else {
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17472] phpsysinfo: upgrade from upstream,
sigurdne <=