From 25bf9e30e9f6f7d14573a95af6289ff3399cc920 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 26 Oct 2016 09:40:56 +0200 Subject: [PATCH 1/2] Minor spelling corrections --- include/disk.php | 6 +++--- include/repeaterinfo.php | 4 ++-- scripts/halt.php | 2 +- scripts/reboot.php | 2 +- scripts/rebootmmdvm.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/disk.php b/include/disk.php index 3b8f3d2..816ed8e 100644 --- a/include/disk.php +++ b/include/disk.php @@ -1,13 +1,13 @@
-
Disk use
+
Disk Use
- - + + diff --git a/include/repeaterinfo.php b/include/repeaterinfo.php index e138ce3..8c30b8f 100644 --- a/include/repeaterinfo.php +++ b/include/repeaterinfo.php @@ -5,7 +5,7 @@
FilesystemMountFile SystemMount Point Use Free Used
- + @@ -26,7 +26,7 @@ - + diff --git a/scripts/halt.php b/scripts/halt.php index c4fdb7c..f7550fb 100644 --- a/scripts/halt.php +++ b/scripts/halt.php @@ -52,7 +52,7 @@ checkSetup(); include "../include/sysinfo.php"; exec(HALTSYS. ' > /dev/null 2>&1 &'); ?> - +
diff --git a/scripts/reboot.php b/scripts/reboot.php index 99e84a7..dd31711 100644 --- a/scripts/reboot.php +++ b/scripts/reboot.php @@ -52,7 +52,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { checkSetup(); exec('sleep 5s && '. REBOOTSYS . ' > /dev/null 2>&1 &'); ?> - +
diff --git a/scripts/rebootmmdvm.php b/scripts/rebootmmdvm.php index f5c2ca3..2e809c2 100644 --- a/scripts/rebootmmdvm.php +++ b/scripts/rebootmmdvm.php @@ -53,7 +53,7 @@ checkSetup(); include "../include/sysinfo.php"; exec( REBOOTMMDVM ); ?> - +
From 6c80594f5635f091870f35461169ed84a38c02d5 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 26 Oct 2016 09:46:15 +0200 Subject: [PATCH 2/2] Remove needles whitespaces --- ajax.php | 38 ++++++++++++++++++------------------ include/disk.php | 8 ++++---- include/functions.php | 12 ++++++------ include/init.php | 2 +- include/lh.php | 4 ++-- include/lh_ajax.php | 10 +++++----- include/localtx.php | 6 +++--- include/localtx_ajax.php | 10 +++++----- include/modes.php | 2 +- include/repeaterinfo.php | 12 ++++++------ include/sysinfo.php | 40 +++++++++++++++++++------------------- include/sysinfo_ajax.php | 2 +- include/tools.php | 10 +++++----- include/txinfo.php | 4 ++-- include/ysfgatewayinfo.php | 8 ++++---- index.php | 6 +++--- scripts/halt.php | 8 ++++---- scripts/log.php | 8 ++++---- scripts/reboot.php | 10 +++++----- scripts/rebootmmdvm.php | 8 ++++---- setup.php | 28 +++++++++++++------------- txinfo.php | 2 +- 22 files changed, 119 insertions(+), 119 deletions(-) diff --git a/ajax.php b/ajax.php index 386af60..f20af34 100644 --- a/ajax.php +++ b/ajax.php @@ -72,7 +72,7 @@ if ($_GET['section'] == "sysinfo") { $cpufreq = $cpufreq[0] / 1000; } showLapTime("cpufreq"); - + if (defined("TEMPERATUREALERT") && $cputemp > TEMPERATUREHIGHLEVEL && $cputemp !== NULL) { ?> diff --git a/include/localtx.php b/include/localtx.php index 2f1d6f5..f6250ce 100644 --- a/include/localtx.php +++ b/include/localtx.php @@ -8,7 +8,7 @@ $localTXList = getHeardList($reverseLogLinesMMDVM, FALSE);
Today's local transmissions
-
+
Actual ModeCurrent Mode D-Star linked to YSF linked to DMR TS1 last linked to
Location TX-Freq.Rx-Freq.RX-Freq.
@@ -30,10 +30,10 @@ $localTXList = getHeardList($reverseLogLinesMMDVM, FALSE); - + "; echo""; diff --git a/include/localtx_ajax.php b/include/localtx_ajax.php index d1a1124..f958f64 100644 --- a/include/localtx_ajax.php +++ b/include/localtx_ajax.php @@ -5,7 +5,7 @@ $totalLH = count($lastHeard);
Today's local transmissions
-
+
BER
$listElem[0]
@@ -28,14 +28,14 @@ $totalLH = count($lastHeard);
-
+
diff --git a/include/txinfo.php b/include/txinfo.php index fc3c887..b507165 100644 --- a/include/txinfo.php +++ b/include/txinfo.php @@ -2,7 +2,7 @@
Currently TXing
-
+
@@ -25,7 +25,7 @@
-
+
@@ -39,7 +39,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") { echo "Repeater"; } else { - echo "Hotspot"; + echo "Hotspot"; } ?>:

MMDVMHost by G4KLX Version:

@@ -52,7 +52,7 @@ checkSetup(); include "../include/sysinfo.php"; exec(HALTSYS. ' > /dev/null 2>&1 &'); ?> - +
@@ -68,7 +68,7 @@ $finish = $time; $total_time = round(($finish - $start), 4); echo ''; } else { - + header('WWW-Authenticate: Basic realm="Dashboard"'); header('HTTP/1.0 401 Unauthorized'); echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!'; diff --git a/scripts/log.php b/scripts/log.php index 1991de7..385724a 100644 --- a/scripts/log.php +++ b/scripts/log.php @@ -42,7 +42,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") { echo "Repeater"; } else { - echo "Hotspot"; + echo "Hotspot"; } ?>:

MMDVMHost by G4KLX Version:

@@ -57,7 +57,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
Viewing log
-
+
@@ -104,9 +104,9 @@ $time = explode(' ', $time); $time = $time[1] + $time[0]; $finish = $time; $total_time = round(($finish - $start), 4); -echo ''; +echo ''; } else { - + header('WWW-Authenticate: Basic realm="Dashboard"'); header('HTTP/1.0 401 Unauthorized'); echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!'; diff --git a/scripts/reboot.php b/scripts/reboot.php index dd31711..a2150c5 100644 --- a/scripts/reboot.php +++ b/scripts/reboot.php @@ -23,7 +23,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { - + @@ -40,7 +40,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") { echo "Repeater"; } else { - echo "Hotspot"; + echo "Hotspot"; } ?>:

MMDVMHost by G4KLX Version:

@@ -52,7 +52,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { checkSetup(); exec('sleep 5s && '. REBOOTSYS . ' > /dev/null 2>&1 &'); ?> - +
@@ -66,9 +66,9 @@ $time = explode(' ', $time); $time = $time[1] + $time[0]; $finish = $time; $total_time = round(($finish - $start), 4); -echo ''; +echo ''; } else { - + header('WWW-Authenticate: Basic realm="Dashboard"'); header('HTTP/1.0 401 Unauthorized'); echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!'; diff --git a/scripts/rebootmmdvm.php b/scripts/rebootmmdvm.php index 2e809c2..5749446 100644 --- a/scripts/rebootmmdvm.php +++ b/scripts/rebootmmdvm.php @@ -23,7 +23,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { - + @@ -40,7 +40,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) { if (getConfigItem("General", "Duplex", $mmdvmconfigs) == "1") { echo "Repeater"; } else { - echo "Hotspot"; + echo "Hotspot"; } ?>:

MMDVMHost by G4KLX Version:

@@ -53,7 +53,7 @@ checkSetup(); include "../include/sysinfo.php"; exec( REBOOTMMDVM ); ?> - +
@@ -69,7 +69,7 @@ $finish = $time; $total_time = round(($finish - $start), 4); echo ''; } else { - + header('WWW-Authenticate: Basic realm="Dashboard"'); header('HTTP/1.0 401 Unauthorized'); echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!'; diff --git a/setup.php b/setup.php index 3059158..144eedf 100644 --- a/setup.php +++ b/setup.php @@ -113,7 +113,7 @@ include "include/tools.php"; YSFHosts.txt-filename " name="YSFHOSTSFILENAME" class="form-control" placeholder="YSFHosts.txt" aria-describedby="YSFHOSTSFILENAME">
-
+

ircddbgateway-Configuration

@@ -154,47 +154,47 @@ include "include/tools.php";
Username for view log: " name="VIEWLOGUSER" class="form-control" placeholder="username" aria-describedby="VIEWLOGUSER"> -
+
Password for view log: " name="VIEWLOGPW" class="form-control" placeholder="password" aria-describedby="VIEWLOGPW"> -
+
Username for halt: " name="HALTUSER" class="form-control" placeholder="username" aria-describedby="HALTUSER"> -
+
Password for halt: " name="HALTPW" class="form-control" placeholder="password" aria-describedby="HALTPW"> -
+
Username for reboot: " name="REBOOTUSER" class="form-control" placeholder="username" aria-describedby="REBOOTUSER"> -
+
Password for reboot: " name="REBOOTPW" class="form-control" placeholder="password" aria-describedby="REBOOTPW"> -
+
Username for restart: " name="RESTARTUSER" class="form-control" placeholder="username" aria-describedby="RESTARTUSER"> -
+
Password for restart: " name="RESTARTPW" class="form-control" placeholder="password" aria-describedby="RESTARTPW"> -
+
Reboot MMDVMHost command: " name="REBOOTMMDVM" class="form-control" placeholder="sudo systemctl restart mmdvmhost.service" aria-describedby="REBOOTMMDVM"> -
+
Reboot system command: " name="REBOOTSYS" class="form-control" placeholder="sudo reboot" aria-describedby="REBOOTSYS"> -
+
Halt system command: " name="HALTSYS" class="form-control" placeholder="sudo halt" aria-describedby="HALTSYS"> -
+
Show Powerstate (online or battery, wiringpi needed)
>
@@ -206,7 +206,7 @@ include "include/tools.php";
State that signalizes online-state: " name="POWERONLINESTATE" class="form-control" placeholder="1" aria-describedby="POWERONLINESTATE"> -
+
Show link to QRZ.com on Callsigns
>
@@ -214,7 +214,7 @@ include "include/tools.php";
- +
diff --git a/txinfo.php b/txinfo.php index 526fef8..99ae174 100644 --- a/txinfo.php +++ b/txinfo.php @@ -31,7 +31,7 @@ foreach ($lastHeard as $listElem) { } }*/ echo""; - + if (defined("ENABLEXTDLOOKUP")) { //echo ""; echo"";
$listElem[2]".getName($listElem[2])."$listElem[3]