* Mon May 12 2025 Brian Read <brianr@koozali.org> 11.0.0-1.sme

- Adding SM2 panel [SME: 13004]
- Upgrade to phpsysinfo 3.4.4
- Add code to delete inline styles and add css to make it look better.
- version saved / built uses the static version, which means no drops downs and choices.

.gitignore

@@ -1,4 +1,5 @@
 *.rpm
 *.log
 *spec-20*
+*.tar.xz
 *.tar.gz

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpsysinfoAlias

@@ -4,13 +4,12 @@ Alias /phpsysinfo /opt/phpsysinfo
 <Directory /opt/phpsysinfo>
     SSLRequireSSL
     Options -Indexes
-    AuthName "phpSysInfo"
-    AuthBasicProvider external
-    AuthType Basic
-    AuthExternal pwauth
+    #AuthName "phpSysInfo"
+    #AuthBasicProvider external
+    #AuthType Basic
+    #AuthExternal pwauth
 
     <RequireAll>
-        Require user admin
         Require {(($phpmyadmin{access} || 'private' ) eq "public" ) ?  "all granted": "ip $localAccess $externalSSLAccess";}
     </RequireAll>
 
@@ -19,5 +18,4 @@ Alias /phpsysinfo /opt/phpsysinfo
         SetHandler "proxy:unix:/var/run/php-fpm/php.sock|fcgi://localhost"
     </FilesMatch>
 
-</Directory>
-
+</Directory>

root/opt/phpsysinfo/.browserslistrc-bootstrap

@@ -0,0 +1,6 @@
+Explorer >= 8
+Firefox >= 3.6
+Sarafi >= 5.1
+Chrome >= 25
+Edge >= 12
+Opera >= 11

root/opt/phpsysinfo/.browserslistrc-dynamic

@@ -0,0 +1,6 @@
+Explorer >= 6
+Firefox >= 1.5
+Sarafi >= 5.1
+Chrome >= 1
+Edge >= 12
+Opera >= 11

root/opt/phpsysinfo/.browserslistrc-static

@@ -0,0 +1 @@
+>= 0%

root/opt/phpsysinfo/.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [phpsysinfo@yahoo.com](mailto:phpsysinfo@yahoo.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

root/opt/phpsysinfo/.github/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# Contributing to phpSysInfo
+First time contributing to phpSysInfo? Read our [Code of Conduct](https://github.com/phpsysinfo/phpsysinfo/blob/main/CODE_OF_CONDUCT.md).
+
+### Propose a feature
+
+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.

root/opt/phpsysinfo/.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: [https://phpsysinfo.github.io/phpsysinfo/]

root/opt/phpsysinfo/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
+
+***!! If you have any problems, please set `DEBUG` to true in `phpsysinfo.ini`
+and include any error messages in your bug report / help request !!***

root/opt/phpsysinfo/.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

root/opt/phpsysinfo/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

root/opt/phpsysinfo/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,25 @@
+### Summary ###
+<!--
+Describe what this PR does. All but trivial changes (e.g. typos)
+should start with an issue. Mention the issue number here.
+-->
+
+### Types of changes ###
+<!--
+What types of changes does your code introduce? Put an `[x]` in all the boxes that apply:
+-->
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+### Code Preparation ###
+<!--
+Please review all your changes one last time before committing
+-->
+
+- [ ] Check for unused code
+- [ ] No unrelated changes are included
+- [ ] None of the changed files are reformatting only
+- [ ] Code is self explanatory or documented
+- [ ] All written text is properly translated (english language)

root/opt/phpsysinfo/.github/workflows/phplint.yml

@@ -0,0 +1,38 @@
+name: PHP Linting
+
+jobs:
+  phplint:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: PHP Lint 5.4
+        uses: prestashop/github-action-php-lint/5.4@v2.1
+      - name: PHP Lint 5.5
+        uses: prestashop/github-action-php-lint/5.5@v2.1
+      - name: PHP Lint 5.6
+        uses: prestashop/github-action-php-lint/5.6@v2.1
+      - name: PHP Lint 7.1
+        uses: prestashop/github-action-php-lint/7.1@v2.1
+      - name: PHP Lint 7.2
+        uses: prestashop/github-action-php-lint/7.2@v2.1
+      - name: PHP Lint 7.3
+        uses: prestashop/github-action-php-lint/7.3@v2.1
+      - name: PHP Lint 7.4
+        uses: prestashop/github-action-php-lint/7.4@v2.1
+      - name: PHP Lint 8.0
+        uses: prestashop/github-action-php-lint/8.0@v2.1
+      - name: PHP Lint 8.1
+        uses: prestashop/github-action-php-lint/8.1@v2.1
+      - name: PHP Lint 8.2
+        uses: prestashop/github-action-php-lint/8.2@v2.1
+
+on:
+  push:
+    branches:
+      - main
+      - stable

root/opt/phpsysinfo/.gitignore

@@ -1 +1,2 @@
 phpsysinfo.ini
+composer.lock

root/opt/phpsysinfo/.htaccess

@@ -6,6 +6,30 @@
     </IfModule>
 # Deny all requests from Apache 2.4+
     <IfModule mod_authz_core.c>
-        Require all granted
+        Require all denied
     </IfModule>
 </files>
+
+<filesmatch "\.tmp$">
+# 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>
+</filesmatch>
+
+<filesmatch "\.log$">
+# 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>
+</filesmatch>

root/opt/phpsysinfo/.travis.yml

@@ -1,18 +0,0 @@
-language: php
-
-php:
-  - 5.2
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-
-script: for i in `find . -name "*.php"`; do php -l $i; done;
-
-branches:
-  only:
-    - "master"
-    - "stable"
-
-notifications:
-  email: false

root/opt/phpsysinfo/CHANGELOG.md

@@ -3,8 +3,242 @@ Changelog of phpSysInfo
 
 http://phpsysinfo.sourceforge.net/
 
+phpSysInfo 3.4.4
+----------------
+ - [ADD] Proxmox to detected distros
+
+ - [NEW] HIDE_SENSORS option
+
+ - [FIX] pmset - UPS support for macOS 10.15
+
+ - [UPD] IPMIcfg sensor program - pminfo
+ - [UPD] SMART Plugin - rebuilt to show the state of any defined attributes IDs
+
+phpSysInfo 3.4.3
+----------------
+ - [ADD] Linux Lite, BigLinux, Linspire, Tuxedo, Armbian, Photon, RebeccaBlackOS, QuemOS, dahliaOS, openEuler, Runtu, risiOS, Nobara, Fatdog, CachyOS, Snal, Feren, Archman, Elive, RoboLinux, ExTiX, Kaisen, LXLE, Neptune, Regata, Archcraft, Kodachi, Bodhi, Siduction, Vanilla, Q4OS, Guix, XeroLinux, OpenWRT, Gnoppix, Uruk, Laclin, Clear, Sparky and Venom Linux to detected distros
+
+ - [NEW] SHOW_NETWORK_BRIDGE option
+ - [NEW] JSONP option for enable JSONP data mode
+ - [NEW] plugin DiskLoad - show Disk Load information on WinNT
+
+phpSysInfo 3.4.2
+----------------
+ - [ADD] RebornOS, Parrot OS, Pop!_OS, Nitrux, Makulu, Absolute, Bluestar, Ultramarine Linux and TrueNAS to detected distros
+ - [ADD] schabau_bootstrap template
+ - [ADD] Raid plugin - storcli and perccli status
+ 
+ - [NEW] Partial support for GNU Hurd
+ - [NEW] Ability to retrieve Linux, GNU Hurd, DrayOS and FortiOS system information via SSH
+
+phpSysInfo 3.4.1
+----------------
+ - [ADD] Linuxfx, EndeavourOS, Garuda, Arco and Artix Linux to detected distros
+
+ - [FIX] Fixed sensors voltages
+
+ - [UPD] UpdateNotifier plugin - compatibility with newer data formats
+
+phpSysInfo 3.4.0
+----------------
+ - [ADD] Omarine, NethServer, JingOS, KDE neon, Alma, Virtuozzo, EuroLinux and Rocky Linux to detected distros
+
+ - [NEW] HIDE_NETWORK_INTERFACE_REGEX option to use a regular expression in the name of a hidden network interface
+ - [NEW] Ability to read UPS information from a file
+ - [NEW] Virtualizer detection on Linux, Android, FreeBSD, NetBSD, OpenBSD and WinNT
+ - [NEW] ROOTFS option to set root path of the system
+
+ - [UPD] Changed all data file extensions from .txt to .tmp
+ - [UPD] Sensor CoreTemp renamed to CpuMem and extended to read the CPU and memory supply voltages
+
+phpSysInfo 3.3.4
+----------------
+
+ - [FIX] Fixed display in static mode
+
+phpSysInfo 3.3.3
+----------------
+
+ - [ADD] Persian (Farsi) Translation fa.xml
+ - [ADD] Croatian Translation hr.xml
+ - [ADD] Mabox, Milis, FreeNAS, UOS and Septor to detected distros
+ - [ADD] SMART plugin - reading contents of wmic command for WinNT
+ - [ADD] Raid plugin - 3ware-status status
+ - [ADD] IPMIcfg sensor program support
+ 
+ - [NEW] Ability to read information from an external WinNT server (new WMI_HOSTNAME, WMI_USER and WMI_PASSWORD parameters)
+ - [NEW] NvidiaSMI - sensors monitoring for Nvidia GPU
+ - [NEW] plugin Viewer - show output of any command or file viewer.txt contents
+ - [NEW] Memory chips information
+ - [NEW] USB devices speed info on Linux
+ - [NEW] IGNORE_TOTAL option
+ - [NEW] HIDE_TOTALS option
+ - [NEW] INCREASE_WIDTH option for frontend "dynamic"
+
+ - [DEL] Removed deprecated plugin Iptables
+
+phpSysInfo 3.3.2
+----------------
+
+ - [UPD] Korean Translation ko.xml
+
+ - [ADD] Exherbo and EasyOS to detected distros
+ - [ADD] PCI devices list on SunOS
+ - [ADD] Raid plugin - megaclisas-status status
+
+ - [NEW] OS Type information
+ - [NEW] CPU manufacturer information
+ - [NEW] Frontend Bootstrap view in web app mode on mobile devices
+
+phpSysInfo 3.3.1
+----------------
+
+ - [UPD] bootstrap 4.3.1
+ - [UPD] bootstrap-ie 4.3.100
+ 
+ - [ADD] Indonesian Translation id.xml
+
+ - [NEW] HIDE_BOOTSTRAP_LOADER option
+ - [NEW] Uprecords plugin - DENOTE_BY_ASTERISK option
+ 
+ - [DEL] jQuery 3.3.1
+
+phpSysInfo 3.3.0
+----------------
+
+ - [UPD] Frontend Bootstrap3 to Bootstrap4 with IE8 and IE9 compatibility modules
+
+ - [ADD] Endless, Kali, Redcore and MX Linux to detected distros
+ - [ADD] SMART plugin - support for NVMe disks
+ - [ADD] Uprecords plugin - SHORT_MODE option
+ - [ADD] Raid plugin - IDRAC RAID status
+ 
+ - [NEW] NVMe devices list on Linux
+ - [NEW] Docker plugin - docker stats
+ - [NEW] SORT_NETWORK_INTERFACES_LIST and SORT_SENSORS_LIST options
+ - [NEW] IGNORE_FREE, IGNORE_USAGE and IGNORE_THRESHOLD_FS_TYPES options
+
+phpSysInfo 3.2.10
+----------------
+
+ - [UPD] jQuery 3.3.1
+
+ - [ADD] NuTyX to detected distros
+
+ - [FIX] Raid plugin - fixed zpool analize
+
+phpSysInfo 3.2.9
+----------------
+
+ - [UPD] Greek Translation gr.xml
+
+ - [ADD] BAT plugin - Model, Manufacturer and Serial Number information
+ - [ADD] BAT plugin - SHOW_SERIAL and UPOWER option
+ - [ADD] Springdale Linux to detected distros
+
+ - [NEW] SHOW_DEVICES_INFOS and SHOW_DEVICES_SERIAL options
+ - [NEW] Thinkpad - Lenovo Thinkpad sensors monitoring for Linux
+ - [NEW] StableBit plugin - StableBit Scanner info
+ - [NEW] HyperV plugin - Hyper-V info
+ - [NEW] Raid plugin - software, fake, zpool and megaraid RAID status
+
+ - [DEL] Removed deprecated MDStatus and DMRaid plugins
+
+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
 
@@ -14,6 +248,7 @@ phpSysInfo 3.2.3
 
 phpSysInfo 3.2.2
 ----------------
+
  - [UPD] bootstrap 3.3.4
 
  - [NEW] Thunderbolt (TB) devices list on Darwin
@@ -27,6 +262,7 @@ phpSysInfo 3.2.2
 
 phpSysInfo 3.2.1
 ----------------
+
  - [UPD] bootstrap 3.3.2
 
  - [NEW] REFRESH parameter also for frontend "bootstrap"
@@ -37,6 +273,7 @@ phpSysInfo 3.2.1
 
 phpSysInfo 3.2.0
 ----------------
+
  - [UPD] jQuery 2.1.3 and jQuery 1.11.2
 
  - [NEW] Frontend "bootstrap" with Bootstrap3 and Transparency (JSON)
@@ -121,7 +358,8 @@ phpSysInfo 3.1.11
  - [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
+
+ - [NEW] Partial support of QNX
 
  - [FIX] Reduce execution time on Linux systems when showing load average PR#47
 
@@ -135,7 +373,7 @@ phpSysInfo 3.1.10
 phpSysInfo 3.1.9
 ----------------
 
- - [NEW] New plugin DMRaid - software raid status
+ - [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
 

root/opt/phpsysinfo/COPYING

@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -303,9 +303,10 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

root/opt/phpsysinfo/Dockerfile

@@ -1,20 +1,24 @@
 # phpSysInfo
-# VERSION       2
+# VERSION       4
 
-FROM ubuntu:14.04
+FROM ubuntu:20.04
+ENV LC_ALL C.UTF-8
+ARG DEBIAN_FRONTEND=noninteractive
+ARG http_proxy=""
+ARG https_proxy=""
 
 MAINTAINER phpSysInfo
 
 # Update sources
-RUN echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" > /etc/apt/sources.list
-RUN apt-get update
+RUN apt-get -q update && \
+    apt-get -qy install apache2 php7.4 php7.4-xml php7.4-mbstring libapache2-mod-php7.4 git pciutils && \
+    apt-get clean && \
+    rm -Rf /var/lib/apt/lists/*
 
-RUN apt-get install -y apache2 php5 git pciutils
-
-RUN git clone https://github.com/phpsysinfo/phpsysinfo.git /var/www/html/phpsysinfo
-#RUN cp /var/www/html/phpsysinfo/phpsysinfo.ini.new /var/www/html/phpsysinfo/phpsysinfo.ini
-RUN cat /var/www/html/phpsysinfo/phpsysinfo.ini.new | sed 's/^LOAD_BAR=false/LOAD_BAR=true/' >/var/www/html/phpsysinfo/phpsysinfo.ini
+RUN git clone https://github.com/phpsysinfo/phpsysinfo.git /var/www/html/phpsysinfo && \
+    cp /var/www/html/phpsysinfo/phpsysinfo.ini.new /var/www/html/phpsysinfo/phpsysinfo.ini
 
+ENV APACHE_RUN_DIR /var/run/apache2
 ENV APACHE_RUN_USER www-data
 ENV APACHE_RUN_GROUP www-data
 ENV APACHE_LOG_DIR /var/log/apache2

root/opt/phpsysinfo/README.md

@@ -1,45 +1,56 @@
 phpSysInfo
 ==============
 
-* Copyright (c), 1999-2008, Uriah Welcome (precision@users.sf.net)
-* Copyright (c), 1999-2009, Michael Cramer (bigmichi1@users.sf.net)
-* Copyright (c), 2007-2008, Audun Larsen (xqus@users.sf.net)
-* Copyright (c), 2007-2015, Erkan Valentin
-* Copyright (c), 2009-2015, Mieczyslaw Nalewaj (namiltd@users.sf.net)
-* Copyright (c), 2010-2012, Damien Roth (iysaak@users.sf.net)
+* Copyright (c), 1999-2008, Uriah Welcome ([sf.net/users/precision](https://sf.net/users/precision))
+* Copyright (c), 1999-2009, Michael Cramer ([github.com/bigmichi1](https://github.com/bigmichi1), [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-2024, 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
 ------------------------
 
-- Linux 2.6.x
-- FreeBSD 7.x
+- Linux 2.6+
+- FreeBSD 7+
 - OpenBSD 2.8+
 - NetBSD
 - DragonFly
 - HP-UX
-- Darwin/OSX
-- Windows 2000 / 2003 / XP / Vista / 7 / 8 / 8.1 / 10
+- Darwin / Mac OS / OS X / iOS
+- Windows 2000 / XP / 2003 / Vista / 2008 / 7 / 2011 / 2012 / 8 / 8.1 / 10 / 10 IoT / 2016 / 2019 / 2022 / 11
 - Android
-- > PHP 5.2 or later
-  - With PCRE, XML, XSL, MBString and SimpleXML extension.
 
-####Platforms currently in progress:
+#### Platforms currently in progress:
 - Haiku
 - Minix
 - SunOS
 - ReactOS
 - IBM AIX
 - QNX
+- GNU Hurd
+- FortiOS (via SSH)
+- DrayOS (via SSH)
 
 If your platform is not here try checking out the mailing list archives or
-the message boards on SourceForge.
+the message boards on Github.
 
 INSTALLATION AND CONFIGURATION
 ------------------------------
 
-####Typical installation
+#### 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.
@@ -59,10 +70,10 @@ can do this.
 
 That's it.  Restart your webserver (if you changed php.ini), and voila.
 
-####Docker container installation
+#### Docker container installation
 
-- sudo docker build -t phpsysinfo github.com/phpsysinfo/phpsysinfo
-- sudo docker run -i -p 8080:80 -t phpsysinfo
+- `sudo docker build -t phpsysinfo github.com/phpsysinfo/phpsysinfo#main`
+- `sudo docker run -i -p 8080:80 -t phpsysinfo`
 - go to http://localhost:8080/phpsysinfo/
 
 KNOWN PROBLEMS
@@ -74,21 +85,21 @@ KNOWN PROBLEMS
 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
   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".
 
 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,
@@ -101,21 +112,19 @@ First make sure you've read this file completely, especially the
 "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` 
+***!! If you have any problems, please set `DEBUG` to true in `phpsysinfo.ini`
 and include any error messages in your bug report / help request !!***
 
 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.

root/opt/phpsysinfo/README_PLUGIN.md

@@ -13,13 +13,13 @@ Beginning with phpSysInfo 3.0, phpSysInfo can be extended by Plugins. So here is
 a description that a developer of a plugin must take care of. Plugins can be
 enabled through the `phpsysinfo.ini` in the PLUGINS variable. The name of the
 plugin is essential for the function of the plugin system. Lets say you write a
-plugin with the name 'hdd_stats', then this name is added to the PLUGINS
+plugin with the name 'pingtest', then this name is added to the PLUGINS
 variable in `phpsysinfo.ini`. And this is also then the name which is everywhere in
 the plugin system used, like creating the object, locate the needed files and
 so on.
 
 So if the name is now specified, phpSysInfo needs a special directory structure
-to find the needed files. The directory structure for the example `hdd_stats`
+to find the needed files. The directory structure for the example `pingtest`
 plugin can be seen here:
 
 ```
@@ -27,22 +27,22 @@ plugin can be seen here:
  |
  +---+ plugins (directory in that plugins are installed)
  |   |
- |   +---+ hdd_stats (the real plugin directory, must have the same name like
+ |   +---+ pingtest (the real plugin directory, must have the same name like
  |   |   |            the plugin named in PLUGINS, else it won't be found)
  |   |   |
  |   |   +---+ js (directory in which the needed JavaScript file is located,
  |   |   |   |     to generate the html output out of the xml)
- |   |   |   # hdd_stats.js (the js file must have the same name, like the
+ |   |   |   # pingtest.js (the js file must have the same name, like the
  |   |   |                   plugin in PSI_PLUGINS with the extension js)
  |   |   +---+ css (directory in which the needed style sheet information are
  |   |   |   |      located, can exists, but it's up to the author)
- |   |   |   # hdd_stats.css (the css file must have the same name, like the
+ |   |   |   # pingtest.css (the css file must have the same name, like the
  |   |   |                    plugin in PSI_PLUGINS with the extension css)
  |   |   +---+ lang (directory where translations for the plugin are located)
  |   |   |   |
  |   |   |   # en.xml (at least an english translation file must exist)
  |   |   |
- |   |   # class.hdd_stats.inc.php (this is the core file of the plugin,
+ |   |   # class.pingtest.inc.php (this is the core file of the plugin,
  |   |                              name must consists of 'class' +
  |   |                              name from PSI_PLUGINS + '.inc.php')
 ```
@@ -57,7 +57,7 @@ If the directory structure is build up, then it's time to start programming.
 Files
 -----
 
-An example implementation is the mdstat plugin, which is shipped with phpSysInfo
+An example implementation is the pingtest plugin, which is shipped with phpSysInfo
 
 * en.xml - at least this file must exist to get the translation working, and the
          the first entry in this file is normally the headline of the plugin.
@@ -70,12 +70,12 @@ An example implementation is the mdstat plugin, which is shipped with phpSysInfo
          other plugins don't redefine your translations. At the time of writing
          this, there is no check to verify the id's, so be carfull.
 
-* hdd_stats.css - here can all custom style sheet informations written down. The
+* pingtest.css - here can all custom style sheet informations written down. The
          names of the id's and classes SHOULD also begin, like the translation
          id's, with `'plugin_' + pluginname`. If thats not the case it might be
          possible that another plugin is overwriting your css definitions.
 
-* class.hdd_stats.inc.php - this file MUST include a class with the plugin name
+* class.pingtest.inc.php - this file MUST include a class with the plugin name
          and also this class MUST extend the 'psi_plugin' class. A check that
          such a class exist and also extends 'psi_plugin' will be included in
          the near future. And if the check fails the plugin won't be loaded.
@@ -93,26 +93,26 @@ An example implementation is the mdstat plugin, which is shipped with phpSysInfo
          standalone xml. So there is no need to do some special things, only
          create a xml object for the plugin.
 
-* hdd_stats.js - this file is called when the page is loaded. A block for the
+* pingtest.js - this file is called when the page is loaded. A block for the
         plugin is automatically created. This one is a div container with the
-        id `'plugin_'+ pluginname ("plugin_hdd_stats")`. The entire output must be
+        id `'plugin_'+ pluginname ("plugin_pingtest")`. The entire output must be
         placed in that container.
         There is a helper function for creating the headline: buildBlock() that
         can be called. This function returns a string with the html code of the
         headline, this code can then be appended to the plugin block. The
         generated headline can provide a reload icon for an ajax request. Only
         the click action of that icon must be created. The id of this icon is
-        `'reload_' + pluginname + 'Table' ("reload_hdd_statsTable")`.
+        `'reload_' + pluginname + 'Table' ("reload_pingtestTable")`.
         Everything that then is done to get the html output out of the xml is up
         to the author.
         To get the xml document the ajax request url is `'xml.php?plugin=' +
-        pluginname (xml.php?plugin=hdd_stats)`. This xml includes only the xml
+        pluginname (xml.php?plugin=pingtest)`. This xml includes only the xml
         from the plugin nothing more.
         The last two executed commands should/must be the translation call and
         the unhide of the filled div container.
         The translation function that needs to be called is named
         plugin_traslate() with one argument, that is the pluginname like in
-        `PSI_PLUGINS (plugin_translate("hdd_stats");)`.
+        `PSI_PLUGINS (plugin_translate("pingtest");)`.
         To unhide the filled container call the .show() function of it.
         `$("plugin_" + pluginname).show() ($("plugin_hdd_stat").show())`.
 

root/opt/phpsysinfo/SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+The [latest released version](https://github.com/phpsysinfo/phpsysinfo/releases) of phpSysInfo is supported.
+
+## Reporting a Vulnerability
+
+Please email phpsysinfo@yahoo.com, and we will respond as quickly as possible.
+
+If the vulnerability is considered valid and accepted, a patch will be made for the latest phpSysInfo version.
+If the vulnerability is deemed invalid, no further action is required.

root/opt/phpsysinfo/composer.json

@@ -1,10 +1,10 @@
 {
     "name": "phpsysinfo/phpsysinfo",
     "description": "phpSysInfo is a customizable PHP Script that parses /proc, and formats information nicely. It will display information about system facts like Uptime, CPU, Memory, PCI devices, SCSI devices, IDE devices, Network adapters, Disk usage, and more.",
-    "license": "GPL",
+    "license": "GPL-2.0-or-later",
     "homepage": "http://phpsysinfo.github.io/phpsysinfo/",
     "require": {
-        "php": ">=5.2.0",
+        "php": ">=5.1.3",
         "ext-simplexml": "*",
         "ext-pcre": "*",
         "ext-xml": "*",
@@ -13,6 +13,7 @@
     "suggest": {
         "ext-mbstring": "Required for *nix non UTF-8 systems",
         "ext-com_dotnet": "Required for Windows environments",
-        "ext-xsl": "Required for static mode"
+        "ext-xsl": "Required for static mode",
+        "ext-json": "Required for bootstrap mode"
     }
-}
+}

root/opt/phpsysinfo/data/.htaccess

@@ -0,0 +1,9 @@
+# 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>

root/opt/phpsysinfo/data/ModelTranslation.txt

@@ -21,7 +21,44 @@ 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
+iMac18,1:iMac Core i5:Intel Core I5-7360U
+iMac18,2:iMac Core i5/i7:Intel Core I5-7400/I5-7500/I7-7700
+iMac18,3:iMac Core i5/i7:Intel Core I5-7500/I5-7600/I5-7600K/I7-7700K
+iMac19,1:iMac Core i5/i9:Intel Core I5-8500/I5-8600/I5-9600K/I9-9900K
+iMac19,2:iMac Core i3/i5/i7:Intel Core I3-8100/I5-8500/I7-8700
+iMac20,1:iMac Core i5/i7/i9:Intel Core I5-10500/I5-10600/I7-10700K/I9-10910
+iMac20,2:iMac Core i7/i9:Intel Core I7-10700K/I9-10910
+iMac21,1:MacBook Air M1:Apple M1
+iMac21,2:MacBook Air M1:Apple M1
 M43ADP1,1:Development Mac Pro:Intel Xeon X5340
+Mac13,1:Mac Studio M1 Max:Apple M1 Max
+Mac13,2:Mac Studio M1 Ultra:Apple M1 Ultra
+Mac14,2:MacBook Air M2:Apple M2
+Mac14,3:Mac mini M2:Apple M2
+Mac14,5:MacBook Pro M2 Max:Apple M2 Max
+Mac14,6:MacBook Pro M2 Max:Apple M2 Max
+Mac14,7:MacBook Pro M2:Apple M2
+Mac14,8:Mac Pro M2 Ultra:Apple M2 Ultra
+Mac14,9:MacBook Pro M2 Pro:Apple M2 Pro
+Mac14,10:MacBook Pro M2 Pro:Apple M2 Pro
+Mac14,12:Mac mini M2 Pro:Apple M2 Pro
+Mac14,13:Mac Studio M2 Max:Apple M2 Max
+Mac14,14:Mac Studio M2 Ultra:Apple M2 Ultra
+Mac14,15:MacBook Air 15" M2:Apple M2
+Mac15,3:MacBook Pro 14" M3:Apple M3
+Mac15,4:iMac 24" M3:Apple M3
+Mac15,5:iMac 24" M3:Apple M3
+Mac15,6:MacBook Pro 14" M3 Pro:Apple M3 Pro
+Mac15,7:MacBook Pro 16" M3 Pro:Apple M3 Pro
+Mac15,8:MacBook Pro 14" M3 Max:Apple M3 Max
+Mac15,9:MacBook Pro 16" M3 Max:Apple M3 Max
+Mac15,10:MacBook Pro 14" M3 Max:Apple M3 Max
+Mac15,11:MacBook Pro 16" M3 Max:Apple M3 Max
 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
@@ -30,6 +67,9 @@ 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
+MacBook10,1:MacBook Core m3/i5/i7:Intel Core M3-7Y32/i5-7Y54/i7-7Y75
 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
@@ -40,6 +80,11 @@ 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
+MacBookAir8,1:MacBook Air Core i5:Intel Core I5-8210Y
+MacBookAir9,1:MacBook Air Core i3/i5/i7:Intel Core I3-1000NG4/I5-1030NG7/I7-1060NG7
+MacBookAir10,1:MacBook Air M1:Apple M1
 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
@@ -61,24 +106,50 @@ 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-4288U/I7-4558U
-MacBookPro11,2:MacBook Pro Core i7:Intel Core I7-4750HQ/I7-4850HQ/I7-4960HQ
-MacBookPro11,3:MacBook Pro Core i7:Intel Core I7-4850HQ/I7-4960HQ
+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
+MacBookPro13,1:MacBook Pro Core i5/i7:Intel Core I5-6360U/I7-6660U
+MacBookPro13,2:MacBook Pro Core i5/i7:Intel Core I5-6267U/I5-6287U/I7-6567U
+MacBookPro13,3:MacBook Pro Core i7:Intel Core I7-6700HQ/I7-6820HQ/I7-6920HQ
+MacBookPro14,1:MacBook Pro Core i5/i7:Intel Core I5-7360U/I7-7660U
+MacBookPro14,2:MacBook Pro Core i5/i7:Intel Core I5-7267U/I5-7287U/I7-7567U
+MacBookPro14,3:MacBook Pro Core i7:Intel Core I7-7700HQ/I7-7820HQ/I7-7920HQ
+MacBookPro15,1:MacBook Pro Core i7/i9:Intel Core I7-8750H/I7-8850H/I7-9750H/I9-8950HK/I9-9880H/I9-9980HK
+MacBookPro15,2:MacBook Pro Core i5/i7:Intel Core I5-8259U/I5-8279U/I7-8559U/I7-8569U
+MacBookPro15,3:MacBook Pro Core i7/i9:Intel Core I7-8850H/I9-8950HK/I9-9880H/I9-9980HK
+MacBookPro15,4:MacBook Pro Core i5/i7:Intel Core I5-8257U/I7-8557U
+MacBookPro16,1:MacBook Pro Core i7/i9:Intel Core I7-9750H/I9-9880H/I9-9980HK
+MacBookPro16,2:MacBook Pro Core i5/i7:Intel Core I5-1038NG7/I7-1068NG7
+MacBookPro16,3:MacBook Pro Core i5/i7:Intel Core I5-8257U/I7-8557U
+MacBookPro16,4:MacBook Pro Core i7/i9:Intel Core I7-9750H/I9-9880H/I9-9980HK
+MacBookPro17,1:MacBook Pro M1:Apple M1
+MacBookPro18,1:MacBook Pro M1 Pro:Apple M1 Pro
+MacBookPro18,2:MacBook Pro M1 Max:Apple M1 Max
+MacBookPro18,3:MacBook Pro M1 Pro:Apple M1 Pro
+MacBookPro18,4:MacBook Pro M1 Max:Apple M1 Max
 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
+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 I7-3615QM/I7-3720QM
+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
+Macmini8,1:Mac mini Core i3/i5/i7:Intel Core I3-8100/I5-8500B/I7-8700B
+Macmini9,1:Mac mini M1:Apple M1
 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
+MacPro7,1:Mac Pro Eight/12/16/24/28 Core:Intel Xeon W-3223/W-3235/W-3245/W-3265M/W-3275M
 PowerBook1,1:PowerBook G3:PowerPC 750 (G3)
 PowerBook2,1:iBook G3:PowerPC 750 (G3)
 PowerBook2,2:iBook G3:PowerPC 750cx (G3)

root/opt/phpsysinfo/data/cpus.ini

@@ -0,0 +1,229 @@
+[cpu]
+; Qemu
+0x0,0x51="QEMU TCG"
+
+; Ampere Computing
+;0xc0
+
+; 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,0xd02="Cortex-A34"
+0x41,0xd03="Cortex-A53"
+0x41,0xd04="Cortex-A35"
+0x41,0xd05="Cortex-A55"
+0x41,0xd06="Cortex-A65"
+0x41,0xd07="Cortex-A57"
+0x41,0xd08="Cortex-A72"
+0x41,0xd09="Cortex-A73"
+0x41,0xd0a="Cortex-A75"
+0x41,0xd0b="Cortex-A76"
+0x41,0xd0c="Neoverse-N1"
+0x41,0xd0d="Cortex-A77"
+0x41,0xd0e="Cortex-A76AE"
+0x41,0xd13="Cortex-R52"
+0x41,0xd15="Cortex-R82"
+0x41,0xd20="Cortex-M23"
+0x41,0xd21="Cortex-M33"
+0x41,0xd22="Cortex-M55"
+0x41,0xd23="Cortex-M85"
+0x41,0xd40="Neoverse-V1"
+0x41,0xd41="Cortex-A78"
+0x41,0xd42="Cortex-A78AE"
+0x41,0xd43="Cortex-A65AE"
+0x41,0xd44="Cortex-X1"
+0x41,0xd46="Cortex-A510"
+0x41,0xd47="Cortex-A710"
+0x41,0xd48="Cortex-X2"
+0x41,0xd49="Neoverse-N2"
+0x41,0xd4a="Neoverse-E1"
+0x41,0xd4b="Cortex-A78C"
+0x41,0xd4c="Cortex-X1C"
+0x41,0xd4d="Cortex-A715"
+0x41,0xd4e="Cortex-X3"
+0x41,0xd4f="Neoverse-V2"
+0x41,0xd80="Cortex-A520"
+0x41,0xd81="Cortex-A720"
+0x41,0xd82="Cortex-X4"
+0x41,0xd83="Neoverse-V3AE"
+0x41,0xd84="Neoverse-V3"
+0x41,0xd85="Cortex-X925"
+0x41,0xd87="Cortex-A725"
+0x41,0xd8e="Neoverse-N3"
+
+; Broadcom Corporation - ('B') cores.
+0x42,0xf="Brahma B15"
+0x42,0x100="Brahma B53"
+0x42,0x516="Vulcan/ThunderX2 T99p1"
+
+; Cavium Inc. - ('C') cores.
+0x43,0xa0="ThunderX"
+0x43,0xa1="ThunderX T88"
+0x43,0xa2="Octeon TX T81"
+0x43,0xa3="Octeon TX T83"
+0x43,0xaf="ThunderX2 T99"
+0x43,0xb0="Octeon TX2"
+0x43,0xb1="Octeon TX2 T98"
+0x43,0xb2="Octeon TX2 T93/T96"
+0x43,0xb3="Octeon TX2 F95"
+0x43,0xb4="Octeon TX2 F95N"
+0x43,0xb5="Octeon TX2 F95MM"
+0x43,0xb8="ThunderX3 T110"
+
+; DEC - Digital Equipment Corporation
+0x44,0xa10="SA110"
+0x44,0xa11="SA1100"
+
+; Fujitsu Ltd.
+0x46,0x1="A64FX"
+
+; HiSilicon Technologies, Inc.
+0x48,0xd01="TSV110"
+0x48,0xd40="Cortex-A76"
+
+; Infineon Technologies AG
+;0x49
+
+; Motorola or Freescale Semiconductor Inc.
+;0x4d
+
+; NVIDIA Corporation
+0x4e,0x0="Denver"
+0x4e,0x3="Denver 2"
+
+; APM - Applied Micro Circuits Corporation - ('P') cores.
+0x50,0x0="xgene1"
+
+; Qualcomm Inc. - ('Q') cores.
+0x51,0xf="Scorpion"
+0x51,0x2d="Scorpion"
+0x51,0x4d="Krait"
+0x51,0x6f="Krait"
+0x51,0x201="Kryo Silver"
+0x51,0x205="Kryo Gold"
+0x51,0x211="Kryo Silver"
+0x51,0x800="Kryo 2xx Gold (Cortex-A73)"
+0x51,0x801="Kryo 2xx Silver (Cortex-A53)"
+0x51,0x802="Kryo 3xx Gold (Cortex-A75)"
+0x51,0x803="Kryo 3xx Silver (Cortex-A55)"
+0x51,0x804="Kryo 4xx Gold (Cortex-A76)"
+0x51,0x805="Kryo 4xx/5xx Silver (Cortex-A55)"
+0x51,0xc00="Falkor"
+0x51,0xc01="Saphira"
+
+; Samsung ('S') cores.
+0x53,0x1="Exynos M1/M2 Mongoose"
+0x53,0x1,0x1="Exynos M1 Mongoose"
+0x53,0x1,0x4="Exynos M2 Mongoose"
+0x53,0x2="Exynos M3 Mongoose"
+0x53,0x3="Exynos M4 Mongoose"
+0x53,0x4="Exynos M5 Mongoose"
+
+; Texas Instruments
+0x54,0x925="TI925"
+
+; Marvell Semiconductor Inc.
+0x56,0x131="Feroceon 88FR131"
+0x56,0x581="PJ4/PJ4B"
+0x56,0x584="PJ4B-MP/PJ4C"
+
+; Apple Inc.
+0x61,0x1="Cyclone"
+0x61,0x2="Typhoon"
+0x61,0x3="Typhoon/Capri"
+0x61,0x4="Twister"
+0x61,0x5="Twister/Elba/Malta"
+0x61,0x6="Hurricane"
+0x61,0x7="Hurricane/Myst"
+ 
+; Faraday
+0x66,0x526="FA526"
+0x66,0x626="FA626"
+
+; HXT
+0x68,0x0="Phecda"
+
+;Intel Corporation/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"
+
+[manufacturer]
+AMDisbetter="AMD"
+AuthenticAMD="AMD"
+CentaurHauls="IDT WinChip/Centaur"
+CyrixInstead="Cyrix/STMicro./IBM"
+HygonGenuine="Hygon"
+GenuineIntel="Intel"
+TransmetaCPU="Transmeta"
+GenuineTMx86="Transmeta"
+GeodebyNSC="National Semiconductor"
+NexGenDriven="NexGen"
+RiseRiseRise="Rise"
+SiSSiSSiS="SiS"
+Shanghai="Zhaoxin"
+UMCUMCUMC="UMC"
+VIAVIAVIA="VIA"
+Vortex86SoC="DM&P Vortex"
+E2KMACHINE="MCST Elbrus"
+GenuineAO486="ao486 soft CPU"
+bhyvebhyve="bhyve"
+KVMKVMKVM="KVM"
+MicrosoftHv="Microsoft Hyper-V"
+lrpepyhvr="Parallels"
+VMwareVMware="VMware"
+XenVMMXenVMM="Xen HVM"
+ACRNACRNACRN="Project ACRN"
+TCGTCGTCGTCG="QEMU"
+QNXQVMBSQG="QNX Hypervisor"
+UnisysSpar64="Unisys sPar"
+VBoxVBoxVBox="Oracle VM VirtualBox"
+IBM/S390="IBM"

root/opt/phpsysinfo/data/languages.ini

@@ -304,6 +304,7 @@ _en_BE="English Belgium"
 _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 @@ _nob="Norwegian Bokmål"
 _no_NO="Norwegian Nynorsk Norway"
 _no_NO_NY="Norwegian Nynorsk Norway"
 _no="Norwegian"
-_no="Norwegian Nynorsk"
 _nor="Norwegian"
 _norwegian="Norwegian"
 _nr="South Ndebele"

root/opt/phpsysinfo/data/osnames.ini

@@ -18,8 +18,13 @@
 5.0="Lollipop"
 5.1="Lollipop"
 6.0="Marshmallow"
+7.0="Nougat"
+7.1="Nougat"
+8.0="Oreo"
+8.1="Oreo"
+9.0="Pie"
 
-[OS X]
+[macOS]
 10.0="Cheetah"
 10.1="Puma"
 10.2="Jaguar"
@@ -32,3 +37,31 @@
 10.9="Mavericks"
 10.10="Yosemite"
 10.11="El Capitan"
+10.12="Sierra"
+10.13="High Sierra"
+10.14="Mojave"
+10.15="Catalina"
+11="Big Sur"
+12="Monterey"
+13="Ventura"
+14="Sonoma"
+
+[win10]
+10240="1507"
+10586="1511"
+14393="1607"
+15063="1703"
+16299="1709"
+17134="1803"
+17763="1809"
+18362="1903"
+18363="1909"
+19041="2004"
+19042="20H2"
+19043="21H1"
+19044="21H2"
+19045="22H2"
+21996="leaked"
+22000="21H2"
+22621="22H2"
+22631="23H2"

root/opt/phpsysinfo/data/raspberry.ini

@@ -0,0 +1,46 @@
+[old]
+2="B (PCB 1.0 Egoman)"
+3="B ECN0001 (PCB 1.0 Egoman)"
+4="B (PCB 2.0 Sony UK)"
+5="B (PCB 2.0 Qisda)"
+6="B (PCB 2.0 Egoman)"
+7="A (PCB 2.0 Egoman)"
+8="A (PCB 2.0 Sony UK)"
+9="A (PCB 2.0 Qisda)"
+13="B (PCB 2.0 Egoman)"
+14="B (PCB 2.0 Sony UK)"
+15="B (PCB 2.0 Qisda)"
+16="B+ (PCB 1.0 Sony UK)"
+17="Compute Module (PCB 1.0 Sony UK)"
+18="A+ (PCB 1.1 Sony UK)"
+19="B+ (PCB 1.2 Embest)"
+20="Compute Module (PCB 1.0 Embest)"
+21="A+ (PCB 1.1 Embest)"
+
+[model]
+0="A"
+1="B"
+2="A+"
+3="B+"
+4="2 B"
+5="Alpha"
+6="Compute Module"
+8="3 B"
+9="Zero"
+10="Compute Module 3"
+12="Zero W"
+13="3 B+"
+14="3 A+"
+16="Compute Module 3+"
+17="4 B"
+19="400"
+20="Compute Module 4"
+21="Compute Module 4S"
+23="5"
+
+[manufacturer]
+0="Sony UK"
+1="Egoman"
+2="Embest"
+3="Sony Japan"
+4="Embest"