From be06f100b04fc6b70982cf68aa63dd63d9b1d944 Mon Sep 17 00:00:00 2001 From: ShaYmez Date: Tue, 3 Jan 2023 02:53:37 +0000 Subject: [PATCH] Make html less verbose, include footer, update html versioning --- html/bridges.php | 16 +- html/buttons.html | 8 +- html/elements/footer.php | 8 + html/include/config.php | 2 +- html/include/version.php | 4 + html/index.php | 20 +-- html/index_APACHE.html | 368 +++++++++++++++++++++++++++++++++++++++ html/info.php | 18 +- html/log.php | 18 +- html/masters.php | 15 +- html/moni.php | 15 +- html/opb.php | 15 +- html/peers.php | 15 +- html/sysinfo.php | 15 +- 14 files changed, 450 insertions(+), 87 deletions(-) create mode 100644 html/elements/footer.php create mode 100644 html/include/version.php create mode 100644 html/index_APACHE.html diff --git a/html/bridges.php b/html/bridges.php index d3cbf58..82fc87d 100644 --- a/html/bridges.php +++ b/html/bridges.php @@ -1,19 +1,20 @@ +include_once 'include/version.php';?> -DMR Server monitor - STATUS +HBlink3 DMR Server - Bridges - +
+

Dashboard Version:

@@ -24,12 +25,9 @@ include_once 'include/config.php';

-
-

- Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022

 - - -

+ + +
diff --git a/html/buttons.html b/html/buttons.html index 1df2b41..c750eff 100644 --- a/html/buttons.html +++ b/html/buttons.html @@ -1,6 +1,6 @@
- - + + + + +

+
\ No newline at end of file diff --git a/html/include/config.php b/html/include/config.php index 1e3038b..6b79d50 100644 --- a/html/include/config.php +++ b/html/include/config.php @@ -5,7 +5,7 @@ error_reporting(E_ALL & ~E_NOTICE); // Name of the monitored Dashboard -define("REPORT_NAME","Dashboard of local DMR Network"); +define("REPORT_NAME","HBlink 3 Master Server"); // Height of Server Activity window: 45px; 1 row, 60px 2 rows, 80px 3 rows define("HEIGHT_ACTIVITY","45px"); diff --git a/html/include/version.php b/html/include/version.php new file mode 100644 index 0000000..af97250 --- /dev/null +++ b/html/include/version.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/html/index.php b/html/index.php index d4eced8..fc8b4b7 100644 --- a/html/index.php +++ b/html/index.php @@ -1,19 +1,20 @@ +include_once 'include/version.php';?> -DMR Server monitor - STATUS +HBlink3 DMR Server - Dashboard - +
+

Dashboard Version:

@@ -31,14 +32,9 @@ include_once 'include/config.php';  .: Call Log :.  

 

-
-

-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022


-    
-    
-

-

+
+
+
 

 
-
+
\ No newline at end of file
diff --git a/html/index_APACHE.html b/html/index_APACHE.html
new file mode 100644
index 0000000..766401d
--- /dev/null
+++ b/html/index_APACHE.html
@@ -0,0 +1,368 @@
+
+
+
+  
+    
+    Apache2 Debian Default Page: It works
+    
+  
+  
+    

+      

+        Debian Logo
+        
+          Apache2 Debian Default Page
+        
+      

+
+      

+
+
+        

+          

+          It works!
+        

+        

+          

+                This is the default welcome page used to test the correct 
+                operation of the Apache2 server after installation on Debian systems.
+                If you can read this page, it means that the Apache HTTP server installed at
+                this site is working properly. You should replace this file (located at
+                /var/www/html/index.html) before continuing to operate your HTTP server.
+          

+
+
+          

+                If you are a normal user of this web site and don't know what this page is
+                about, this probably means that the site is currently unavailable due to
+                maintenance.
+                If the problem persists, please contact the site's administrator.
+          

+
+        

+        

+          

+                Configuration Overview
+        

+        

+          

+                Debian's Apache2 default configuration is different from the
+                upstream default configuration, and split into several files optimized for
+                interaction with Debian tools. The configuration system is
+                fully documented in
+                /usr/share/doc/apache2/README.Debian.gz. Refer to this for the full
+                documentation. Documentation for the web server itself can be
+                found by accessing the manual if the apache2-doc
+                package was installed on this server.
+
+          

+          

+                The configuration layout for an Apache2 web server installation on Debian systems is as follows:
+          

+          
+/etc/apache2/
+|-- apache2.conf
+|       `--  ports.conf
+|-- mods-enabled
+|       |-- *.load
+|       `-- *.conf
+|-- conf-enabled
+|       `-- *.conf
+|-- sites-enabled
+|       `-- *.conf
+          

+          
    
+                        
  • 
+                           apache2.conf is the main configuration
+                           file. It puts the pieces together by including all remaining configuration
+                           files when starting up the web server.
+                        
    • 
+
+                        
  • 
+                           ports.conf is always included from the
+                           main configuration file. It is used to determine the listening ports for
+                           incoming connections, and this file can be customized anytime.
+                        
    • 
+
+                        
  • 
+                           Configuration files in the mods-enabled/,
+                           conf-enabled/ and sites-enabled/ directories contain
+                           particular configuration snippets which manage modules, global configuration
+                           fragments, or virtual host configurations, respectively.
+                        
    • 
+
+                        
  • 
+                           They are activated by symlinking available
+                           configuration files from their respective
+                           *-available/ counterparts. These should be managed
+                           by using our helpers
+                           
+                                a2enmod,
+                                a2dismod,
+                           
+                           
+                                a2ensite,
+                                a2dissite,
+                            
+                                and
+                           
+                                a2enconf,
+                                a2disconf
+                           . See their respective man pages for detailed information.
+                        
    • 
+
+                        
  • 
+                           The binary is called apache2. Due to the use of
+                           environment variables, in the default configuration, apache2 needs to be
+                           started/stopped with /etc/init.d/apache2 or apache2ctl.
+                           Calling /usr/bin/apache2 directly will not work with the
+                           default configuration.
+                        
    • 
+          

+        

+
+        

+            

+                Document Roots
+        

+
+        

+            

+                By default, Debian does not allow access through the web browser to
+                any file apart of those located in /var/www,
+                public_html
+                directories (when enabled) and /usr/share (for web
+                applications). If your site is using a web document root
+                located elsewhere (such as in /srv) you may need to whitelist your
+                document root directory in /etc/apache2/apache2.conf.
+            

+            

+                The default Debian document root is /var/www/html. You
+                can make your own virtual hosts under /var/www. This is different
+                to previous releases which provides better security out of the box.
+            

+        

+
+        

+          

+                Reporting Problems
+        

+        

+          

+                Please use the reportbug tool to report bugs in the
+                Apache2 package with Debian. However, check existing bug reports before reporting a new bug.
+          

+          

+                Please report bugs specific to modules (such as PHP and others)
+                to respective packages, not to the web server itself.
+          

+        

+
+
+
+
+      

+    

+    

+    

+  
+
+
diff --git a/html/info.php b/html/info.php
index 4ae4b1b..d864da6 100644
--- a/html/info.php
+++ b/html/info.php
@@ -1,19 +1,20 @@
 
+include_once 'include/version.php';?>
 
 
 
 
-DMR Server monitor - Info
+HBlink3 DMR Server - Talkgroup Info
 
 
-
+
 
 
 

+
Dashboard Version: 

 
 

 

@@ -36,7 +37,7 @@ include_once 'include/config.php';
          TG 5 
           
      D | S 
-    Talk group XLX132-D D-Star/DMR/C4FM.
+    Talk group XLX750-X D-Star/DMR/C4FM.
     
      
          TG 9999 
@@ -48,12 +49,9 @@ include_once 'include/config.php';
 

 Hotspot: D - duplex | S - simplex
 


-
-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022


-    
-    
-

+
+
+
 

 
 
diff --git a/html/log.php b/html/log.php
index 0f16ad4..cddf8dc 100644
--- a/html/log.php
+++ b/html/log.php
@@ -1,20 +1,21 @@
 
+include_once 'include/version.php';?>
 
 
 
 
 
-DMR Server monitor - STATUS
+HBlink3 DMR Server - Lastheard
 
 
-
+
 
 
 

+
Dashboard Version: 

 
 

 

@@ -106,14 +107,9 @@ echo "\n
";
 // close logfile after parsing
 fclose ($handle);
 ?>
-

-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022

-    
-    
-© developed by DL1BZ as logging-extension of HBmonitor (2018,2019)

-

-

+
+
+
 

 
 
diff --git a/html/masters.php b/html/masters.php
index 84921e5..f096469 100644
--- a/html/masters.php
+++ b/html/masters.php
@@ -1,19 +1,20 @@
 
+include_once 'include/version.php';?>
 
 
 
 
-DMR Server monitor - Masters
+HBlink3 DMR Server - Masters
 
 
-
+
 
 
 

+
Dashboard Version: 

 
 

 

@@ -25,11 +26,9 @@ include_once 'include/config.php';
 
         

 

-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022


-    
-    
-

+
+
+
 

 
 
diff --git a/html/moni.php b/html/moni.php
index d581d97..8568d8c 100644
--- a/html/moni.php
+++ b/html/moni.php
@@ -1,19 +1,20 @@
 
+include_once 'include/version.php';?>
 
 
 
 
-DMR Server - Monitor
+HBlink3 DMR Server - Log Monitor
 
 
-
+
 
 
 

+
Dashboard Version: 

 
 

 

@@ -32,11 +33,9 @@ include_once 'include/config.php';
 	 .: Call Log :. 
         

 
    
-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022


-    
-    
-

+
+
+
 

 
 
diff --git a/html/opb.php b/html/opb.php
index 4ded114..f3b7b6f 100644
--- a/html/opb.php
+++ b/html/opb.php
@@ -1,19 +1,20 @@
 
+include_once 'include/version.php';?>
 
 
 
 
-DMR Server monitor - OpenBridge
+HBlink3 DMR Server - OpenBridge Systems
 
 
-
+
 
 
 

+
Dashboard Version: 

 
 

 

@@ -25,11 +26,9 @@ include_once 'include/config.php';
 
         

 

-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022


-    
-    
-

+
+
+
 

 
 
diff --git a/html/peers.php b/html/peers.php
index 9534b19..1c7e0bc 100644
--- a/html/peers.php
+++ b/html/peers.php
@@ -1,19 +1,20 @@
 
+include_once 'include/version.php';?>
 
 
 
 
-DMR Server monitor - Peers
+HBlink3 DMR Server - Peer Systems
 
 
-
+
 
 
 

+
Dashboard Version: 

 
 

 

@@ -25,11 +26,9 @@ include_once 'include/config.php';
 
         

 

-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022


-    
-    
-

+
+
+
 

 
 
diff --git a/html/sysinfo.php b/html/sysinfo.php
index 80fb17a..3530ccc 100644
--- a/html/sysinfo.php
+++ b/html/sysinfo.php
@@ -1,20 +1,21 @@
 
+include_once 'include/version.php';?>
 
 
 
 
 
-DMR Server monitor - System Info
+HBlink3 DMR Server - System Info
 
 
-
+
 
 
 

+
Dashboard Version: 

 
 

 

@@ -45,11 +46,9 @@ include_once 'include/config.php';
 

 
 

-

-Copyright © 2016-2022
The Regents of the K0USY Group. All rights reserved.
Version SP2ONG 2019-2022


-    
-    
-

+
+
+