From 8e5e145b09f4d7cb7219ff1f849aa8f97109c40a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 13 Dec 2025 20:21:29 +0000 Subject: [PATCH 2/3] Modernize HTML/PHP to HTML5, improve security, and prepare for 2.0.2 release Co-authored-by: ShaYmez <76499782+ShaYmez@users.noreply.github.com> --- CHANGELOG.md | 89 +++++++++++++++++++++++++++++++++++++++ html/bridges.php | 28 ++++++------ html/elements/footer.php | 8 ++-- html/include/version.php | 4 +- html/index.php | 37 ++++++++-------- html/info.php | 36 ++++++++-------- html/log.php | 37 ++++++++-------- html/masters.php | 26 ++++++------ html/moni.php | 38 ++++++++--------- html/opb.php | 26 ++++++------ html/peers.php | 26 ++++++------ html/sysinfo.php | 43 +++++++++---------- templates/lastheard.html | 6 +-- templates/main_table.html | 38 ++++++++--------- 14 files changed, 266 insertions(+), 176 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..3f98a96 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,89 @@ +# Changelog + +All notable changes to HBMonv2 will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [2.0.2] - 2024-12-13 + +### Added +- Comprehensive CHANGELOG.md to document all changes +- Viewport meta tag for improved mobile responsiveness across all pages +- Proper HTML5 semantic structure with centered content containers + +### Changed +- **HTML5 Compliance**: Migrated all pages from XHTML 1.0 Transitional to HTML5 DOCTYPE +- **Modern HTML**: Replaced deprecated `
` tags with CSS-based centering using `margin: 0 auto` +- **Deprecated Tags Removed**: + - Replaced all `` tags with CSS `` elements with inline styles + - Fixed deprecated `

` tags used as containers, replaced with proper `

` elements + - Removed obsolete XHTML namespace declarations + - Updated all table tags to lowercase (TR/TH/TD → tr/th/td) +- **Accessibility Improvements**: + - Added descriptive alt text to all logo images ("HBlink Logo") + - Added descriptive alt attributes to system info graphs (CPU Temperature, Disk Usage, Memory Usage, CPU Load, Network Traffic) + - Improved semantic HTML structure +- **Security Enhancements**: + - Added `htmlspecialchars()` escaping to all PHP output variables in log.php to prevent XSS attacks + - Added `htmlspecialchars()` escaping to DASH and REPORT_NAME variables across all pages +- **Code Quality**: + - Standardized CSS border-radius properties (removed redundant vendor prefixes where not needed) + - Consolidated repeated border-radius declarations to single `border-radius` property + - Changed `overflow-y: scroll` to `overflow-y: auto` for better UX (scrollbar only when needed) + - Fixed invalid color values in CSS (removed trailing characters from rgba values) + - Improved code consistency and formatting across all templates +- **Copyright Updates**: Updated copyright years from 2023 to 2025 across all files +- **Version Updates**: Updated version from 1.6.9 to 2.0.2 + +### Fixed +- Fixed missing closing tags and proper HTML nesting throughout all pages +- Fixed invalid HTML attributes (removed deprecated `align` attributes) +- Fixed duplicate CSS properties in inline styles +- Fixed improperly nested table elements +- Fixed broken link structure in footer (added proper quote marks around href URLs) +- Fixed color styling using modern CSS instead of deprecated HTML attributes +- Corrected CSS syntax errors in template files + +### Improved +- Better code organization and readability +- Consistent styling across all pages +- Production-ready HTML/PHP code structure +- Cross-browser compatibility +- Performance optimizations through cleaner HTML + +## [1.6.9] - 2024-06-14 + +### Previous Release +- Last version before 2.0.2 improvements +- Docker version by ShaYmez M0VUB +- Based on SP2ONG's HBMonv2 + +--- + +## Version History + +- **2.0.2** (2024-12-13): HTML5 compliance, security improvements, code quality enhancements +- **1.6.9** (2024-06-14): Previous stable release +- **Original**: HBMonitor by N0MJS, further developed by KC1AWV, adapted by SP2ONG + +--- + +## Notes + +This version maintains **100% backward compatibility** with existing configurations and installations. No breaking changes have been introduced. All improvements are focused on: + +1. Code quality and modern standards compliance +2. Security hardening (XSS prevention) +3. Accessibility improvements +4. Performance optimization +5. Future maintainability + +--- + +## Credits + +- **Original Author**: Cortney T. Buffington (N0MJS) +- **HBMonitor3**: KC1AWV +- **HBMonv2**: SP2ONG (2019-2025) +- **Docker Version**: ShaYmez M0VUB (2020-2025) diff --git a/html/bridges.php b/html/bridges.php index 82fc87d..7104a1e 100644 --- a/html/bridges.php +++ b/html/bridges.php @@ -2,32 +2,32 @@ $progname = basename($_SERVER['SCRIPT_FILENAME'],".php"); include_once 'include/config.php'; include_once 'include/version.php';?> - - + + + HBlink3 DMR Server - Bridges - + -
-

Dashboard Version:

- +
+
+

Dashboard Version:

+HBlink Logo
-
-

-

+
+

-
+
-

-
+
+
-
+
diff --git a/html/elements/footer.php b/html/elements/footer.php index 7908b89..f063fc7 100644 --- a/html/elements/footer.php +++ b/html/elements/footer.php @@ -1,8 +1,8 @@ -
+

-Cortney T. Buffington, N0MJS. HBlink3. Copyright © 2016-2023
The Regents of the K0USY Group. All Rights Reserved.
Version SP2ONG 2019-2023
Docker Version 1.6.9
 +Cortney T. Buffington, N0MJS. HBlink3. Copyright © 2016-2025
The Regents of the K0USY Group. All Rights Reserved.
Version SP2ONG 2019-2025
Docker Version 2.0.2
- - + +

\ No newline at end of file diff --git a/html/include/version.php b/html/include/version.php index 6582ee6..e9ed5bc 100644 --- a/html/include/version.php +++ b/html/include/version.php @@ -1,4 +1,4 @@ diff --git a/html/index.php b/html/index.php index fc8b4b7..bda1156 100644 --- a/html/index.php +++ b/html/index.php @@ -2,39 +2,40 @@ $progname = basename($_SERVER['SCRIPT_FILENAME'],".php"); include_once 'include/config.php'; include_once 'include/version.php';?> - - + + + HBlink3 DMR Server - Dashboard - + -
-

Dashboard Version:

- +
+
+

Dashboard Version:

+HBlink Logo
-
-

-

+
+

-
+
-

+
-
-
-  .: Call Log :.  - 

-

+

+

+	 .: Call Log :. 
+        

+

+

 
 
 
-

+

 
 
\ No newline at end of file
diff --git a/html/info.php b/html/info.php
index d864da6..c6434e2 100644
--- a/html/info.php
+++ b/html/info.php
@@ -2,32 +2,32 @@
 $progname = basename($_SERVER['SCRIPT_FILENAME'],".php");
 include_once 'include/config.php';
 include_once 'include/version.php';?>
-
-
+
+
 
 
+
 HBlink3 DMR Server - Talkgroup Info
 
 
-
+
 
 
-

-
Dashboard Version: 

-
+

+

+
Dashboard Version: 

+HBlink Logo
 

-

-

-

+

+

 

 
 
-

-

- .: Talk Groups :. 
-
-    
+

+

+ .: Talk Groups :. 
+

+    
@@ -48,10 +48,12 @@ include_once 'include/version.php';?>
 

         TG#
         TS 1
         TS 2

 

 Hotspot: D - duplex | S - simplex
-


+
+

+

 
 
 
-

+
 
 
diff --git a/html/log.php b/html/log.php
index cddf8dc..92e7cec 100644
--- a/html/log.php
+++ b/html/log.php
@@ -2,34 +2,33 @@
 $progname = basename($_SERVER['SCRIPT_FILENAME'],".php");
 include_once 'include/config.php';
 include_once 'include/version.php';?>
-
-
+
+
 
 
+
 
 HBlink3 DMR Server - Lastheard
 
 
-
+
 
 
-

-
Dashboard Version: 

-
+

+

+
Dashboard Version: 

+HBlink Logo
 

-

-

-

+

+

 

 
-

-

+

 

-

-
-    
-
LastHeard
  Date Time Callsign (DMR-Id)  Name TG#  TG NameTX (s) Source
+

+
+    
+".$s.' '.$date_eu[2].".".$date_eu[1].".".$date_eu[0].$s.' '.substr($log_time[$i],11,5).$s.' '.$user_call[$i]." (".$user_id[$i].")".$s.''.TRIM($user_name[$i]).''.$s.''.$tg[$i].''.$s.' '.$tgname[$i].''.$s."
".round($transmit_timer[$i])."
".$s.$system[$i]."\n";
+echo "\n";
 }
 
-echo "\n
LastHeard
  Date Time Callsign (DMR-Id)  Name TG#  TG NameTX (s) Source
 

 
 
 ".$date_eu[2].".".$date_eu[1].".".$date_eu[0]." ".substr($log_time[$i],11,5)." ".htmlspecialchars($user_call[$i])." (".htmlspecialchars($user_id[$i]).")".htmlspecialchars(trim($user_name[$i]))."".htmlspecialchars($tg[$i])." ".htmlspecialchars($tgname[$i])."".htmlspecialchars(round($transmit_timer[$i]))."".htmlspecialchars($system[$i])."
";
+echo "\n
";
 
 // close logfile after parsing
 fclose ($handle);
@@ -110,6 +109,6 @@ fclose ($handle);
 
 
 
-

+
 
 
diff --git a/html/masters.php b/html/masters.php
index f096469..2735085 100644
--- a/html/masters.php
+++ b/html/masters.php
@@ -2,33 +2,33 @@
 $progname = basename($_SERVER['SCRIPT_FILENAME'],".php");
 include_once 'include/config.php';
 include_once 'include/version.php';?>
-
-
+
+
 
 
+
 HBlink3 DMR Server - Masters
 
 
-
+
 
 
-

-
Dashboard Version: 

-
+

+

+
Dashboard Version: 

+HBlink Logo
 

-

-

-

+

+

 
 

-

+

 
-        

+    

 

 
 
 
-

+
 
 
diff --git a/html/moni.php b/html/moni.php
index 8568d8c..538142b 100644
--- a/html/moni.php
+++ b/html/moni.php
@@ -2,40 +2,40 @@
 $progname = basename($_SERVER['SCRIPT_FILENAME'],".php");
 include_once 'include/config.php';
 include_once 'include/version.php';?>
-
-
+
+
 
 
+
 HBlink3 DMR Server - Log Monitor
 
 
-
+
 
 
-

-
Dashboard Version: 

-
+

+

+
Dashboard Version: 

+HBlink Logo
 

-

-

-

+

+

 

 
-

+

 
-

+

 

-

 
-   

-

-	 .: Call Log :. 
-        

-
    
+

+

+	 .: Call Log :. 
+    

+

+
    
 
 
 
-

+
 
 
diff --git a/html/opb.php b/html/opb.php
index f3b7b6f..4e59389 100644
--- a/html/opb.php
+++ b/html/opb.php
@@ -2,33 +2,33 @@
 $progname = basename($_SERVER['SCRIPT_FILENAME'],".php");
 include_once 'include/config.php';
 include_once 'include/version.php';?>
-
-
+
+
 
 
+
 HBlink3 DMR Server - OpenBridge Systems
 
 
-
+
 
 
-

-
Dashboard Version: 

-
+

+

+
Dashboard Version: 

+HBlink Logo
 

-

-

-

+

+

 

 
-

+

 
-        

+    

 

 
 
 
-

+
 
 
diff --git a/html/peers.php b/html/peers.php
index 1c7e0bc..b6431ff 100644
--- a/html/peers.php
+++ b/html/peers.php
@@ -2,33 +2,33 @@
 $progname = basename($_SERVER['SCRIPT_FILENAME'],".php");
 include_once 'include/config.php';
 include_once 'include/version.php';?>
-
-
+
+
 
 
+
 HBlink3 DMR Server - Peer Systems
 
 
-
+
 
 
-

-
Dashboard Version: 

-
+

+

+
Dashboard Version: 

+HBlink Logo
 

-

-

-

+

+

 

 
-

+

 
-        

+    

 

 
 
 
-

+
 
 
diff --git a/html/sysinfo.php b/html/sysinfo.php
index 3530ccc..8b4295a 100644
--- a/html/sysinfo.php
+++ b/html/sysinfo.php
@@ -2,25 +2,25 @@
 $progname = basename($_SERVER['SCRIPT_FILENAME'],".php");
 include_once 'include/config.php';
 include_once 'include/version.php';?>
-
-
+
+
 
 
+
 
 HBlink3 DMR Server - System Info
 
 
-
+
 
 
-

-
Dashboard Version: 

-
+

+

+
Dashboard Version: 

+HBlink Logo
 

-

-

-

+

+

 

 
 
-

- .: System Info :. 
-

+

+ .: System Info :. 
+

 
-

+
CPU Temperature

 
-

+
Disk Usage

 
-

+
Memory Usage

 
-

+
CPU Load

 
-

-

-BLUE Outgoing Traffic in Bits per Second | GREEN Incoming Traffic in Bits per Second
-

+
Network Traffic

+

+
BLUE Outgoing Traffic in Bits per Second | GREEN Incoming Traffic in Bits per Second

 
 

 
 
 
-

+
 
 
diff --git a/templates/lastheard.html b/templates/lastheard.html
index 9008f26..dc5f783 100644
--- a/templates/lastheard.html
+++ b/templates/lastheard.html
@@ -1,5 +1,5 @@
-

- .: Lastheard :. 
+

+ .: Lastheard :. 
 
-
+
DateTimeCallsign (DMR-Id)NameTG#TG NameTX (s)System
DateTimeCallsign (DMR-Id)NameTG#TG NameTX (s)System

 


diff --git a/templates/main_table.html b/templates/main_table.html
index ed2ce18..edb39ee 100644
--- a/templates/main_table.html
+++ b/templates/main_table.html
@@ -1,12 +1,12 @@
 
-

- .: Server Activity :. 
+

+ .: Server Activity :. 
 {% if _table['MASTERS']|length >0 %}
- 
-    
-      
+ 
Active QSO's

+    
+      
-    
+    
Active QSO's

     

     
     

     {% for _master in _table['MASTERS'] %}
@@ -14,19 +14,19 @@
     {% if _cdata[1]['TS'] == True or _cdata[2]['TS'] == True %}
         {% if _cdata[1]['TRX'] == "RX" %}
          [M: {{ _cdata[1]['CALL']|safe }}
-         >> {{ _cdata[1]['TG']|safe }}] 
+         >> {{ _cdata[1]['TG']|safe }}] 
         {% endif %}
         {% if _cdata[2]['TRX'] == "RX" %}
          [M: {{ _cdata[2]['CALL']|safe}}
-         >> {{_cdata[2]['TG']|safe}}] 
+         >> {{_cdata[2]['TG']|safe}}] 
         {% endif %}
     {% endif %}
     {% endfor %}
     {% endfor %}
 {% else %}
-         
-             
-             
+         
Waiting for data from the Server ...

+             
+             
Waiting for data from the Server ...
              

             

  {% endif %}
@@ -34,11 +34,11 @@
     {% if _pdata[1]['TS'] == True or _pdata[2]['TS'] == True %}
         {% if _pdata[1]['TRX'] == "RX" %}
          [M: {{ _pdata[1]['CALL']|safe }}
-         >> {{ _pdata[1]['TG']|safe }}] 
+         >> {{ _pdata[1]['TG']|safe }}] 
         {% endif %}
         {% if _pdata[2]['TRX'] == "RX" %}
          [M: {{ _pdata[2]['CALL']|safe }}
-         >> {{ _pdata[2]['TG']|safe }}] 
+         >> {{ _pdata[2]['TG']|safe }}] 
         {% endif %}
     {% endif %}
     {% endfor %}
@@ -50,7 +50,7 @@
          {% set rx.value=1 %}
        {% endfor %}
        {% if rx.value == 1 %}
-         {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' %} [O: {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1]}} >> TG {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe}}] {% endfor %}
+         {% for entry in _table['OPENBRIDGES'][_openbridge]['STREAMS']  if _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][0] == 'RX' %} [O: {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][1]}} >> TG {{ _table['OPENBRIDGES'][_openbridge]['STREAMS'][entry][2]|safe}}] {% endfor %}
       {% endif %}
    {% endif %}
    {% endfor %}
@@ -62,12 +62,12 @@
 {% if _table['SETUP']['LASTHEARD'] == True %}
   {% include 'lastheard.html' ignore missing %}
 {% endif %}
-

- .: Connected to Server :. 
-
+

+ .: Connected to Server :. 
+

 {% if _table['MASTERS']|length >0 %}
-\n";
+echo "";
+echo "";
+echo "";
+echo "";
+echo "";
+echo "";
+echo "";
+echo "";
+echo "";
+echo "\n";
 }
 
 echo "\n

-

+

+

 

 
  USERS:

 


From 4700c80288e7db32cbbe080a6b74d7d0a6c341d6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 13 Dec 2025 20:23:06 +0000
Subject: [PATCH 3/3] Improve code readability in log.php by breaking long echo
 statement

Co-authored-by: ShaYmez <76499782+ShaYmez@users.noreply.github.com>
---
 html/log.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/html/log.php b/html/log.php
index 92e7cec..ef18ad7 100644
--- a/html/log.php
+++ b/html/log.php
@@ -98,7 +98,17 @@ $log_time[$i]=substr($log_time[$i],0,19);
 if ($user_id[$i]=="1234567") {$user_call[$i] = "*NoCallsign*"; $user_id[$i]="-";}
 
 // output table
-echo "
 ".$date_eu[2].".".$date_eu[1].".".$date_eu[0]." ".substr($log_time[$i],11,5)." ".htmlspecialchars($user_call[$i])." (".htmlspecialchars($user_id[$i]).")".htmlspecialchars(trim($user_name[$i]))."".htmlspecialchars($tg[$i])." ".htmlspecialchars($tgname[$i])."".htmlspecialchars(round($transmit_timer[$i]))."".htmlspecialchars($system[$i])."
 ".$date_eu[2].".".$date_eu[1].".".$date_eu[0]." ".substr($log_time[$i],11,5)." ".htmlspecialchars($user_call[$i])."";
+echo " (".htmlspecialchars($user_id[$i]).")".htmlspecialchars(trim($user_name[$i]))."".htmlspecialchars($tg[$i])." ".htmlspecialchars($tgname[$i])."".htmlspecialchars(round($transmit_timer[$i]))."".htmlspecialchars($system[$i])."
";