From 9e64a3f3152d320b66d27d0ca7101a9c2ed3d55e Mon Sep 17 00:00:00 2001 From: Kim - DG9VH Date: Mon, 21 Sep 2020 22:33:02 +0200 Subject: [PATCH] Revert "Initial steps for showing DAPNET-Messages" --- ajax.php | 20 -------------------- include/functions.php | 36 +----------------------------------- include/tools.php | 15 --------------- index.php | 4 ---- setup.php | 35 ++--------------------------------- 5 files changed, 3 insertions(+), 107 deletions(-) diff --git a/ajax.php b/ajax.php index 199a61d..9272889 100644 --- a/ajax.php +++ b/ajax.php @@ -30,15 +30,6 @@ $logLinesMMDVM = getMMDVMLog(); $reverseLogLinesMMDVM = $logLinesMMDVM; rsort($reverseLogLinesMMDVM); - -if (defined("ENABLEDAPNETGATEWAY")) { - $logLinesDAPNETGateway = getDAPNETGatewayLog(); - showLapTime("getDAPNETGatewayLog"); - $reverseLogLinesDAPNETGateway = $logLinesDAPNETGateway; - rsort($reverseLogLinesDAPNETGateway); - showLapTime("array_multisort"); -} - if ($_GET['section'] == "mode") { $mode = getActualMode(getLastHeard($reverseLogLinesMMDVM, TRUE), $mmdvmconfigs); echo $mode; @@ -88,17 +79,6 @@ if ($_GET['section'] == "lastHeard") { } echo '{"data": '.json_encode($lastHeard)."}"; } - -if ($_GET['section'] == "DAPNETTx") { - $DAPNETTxList = getDAPNETTxList($reverseLogLinesDAPNETGateway); - $DAPNETTx = Array(); - for ($i = 0; $i < count($DAPNETTxList); $i++) { - $listElem = $DAPNETTxList[$i]; - array_push($DAPNETTx, $listElem); - } - echo '{"data": '.json_encode($DAPNETTx)."}"; -} - if ($_GET['section'] == "localTx") { $localTXList = getHeardList($reverseLogLinesMMDVM, FALSE); $lastHeard = Array(); diff --git a/include/functions.php b/include/functions.php index b2e18f2..f4900a7 100644 --- a/include/functions.php +++ b/include/functions.php @@ -264,13 +264,6 @@ function getYSFGatewayLog() { return $logLines; } -function getDAPNETGatewayLog() { - // Open Logfile and copy loglines into LogLines-Array() - $logPath = DAPNETGATEWAYLOGPATH."/".DAPNETGATEWAYLOGPREFIX."-".date("Y-m-d").".log"; - $logLines = explode("\n", `egrep -h "Sending" $logPath`); - return $logLines; -} - // 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 // M: 2016-04-29 00:15:00.013 D-Star, received network header from DG9VH /ZEIT to CQCQCQ via DCS002 S @@ -597,33 +590,6 @@ function getHeardList($logLines, $onlyLast) { return $heardList; } -// 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122 -// 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 -// D: 2020-09-21 18:16:12.814 Messages in Queue 0002 -// M: 2020-09-21 18:16:12.824 Sending message in slot 13 to 0000216, type 6, func Alphanumeric: "YYYYMMDDHHMMSS200921181600" -// D: 2020-09-21 18:16:12.825 Messages in Queue 0001 -// D: 2020-09-21 18:17:00.036 Queueing message to 0000208, type 6, func Alphanumeric: "XTIME=2017210920XTIME=2017210920" -function getDAPNETTxList($logLines) { - $DAPNETTxList = array(); - foreach ($logLines as $logLine) { - if (strpos($logLine,"Sending")) { - $timestamp = substr($logLine, 3, 23); - $slot = substr($logLine,51, 2); - if ($slot[1] == " ") { - $target = substr($logLine,56, 7); - } else { - $target = substr($logLine,57, 7); - } - $message = substr($logLine,strpos($logLine, "\"")); - $message = substr($message,1 , -1); - if ($target == "0004520") - $message = rot1($message); - array_push($DAPNETTxList, array(convertTimezone($timestamp), $slot, $target, $message)); - } - } - return $DAPNETTxList; -} - function getLastHeard($logLines, $onlyLast) { //returns last heard list from log $lastHeard = array(); @@ -635,7 +601,7 @@ function getLastHeard($logLines, $onlyLast) { if(!(array_search($listElem[2]."#".$listElem[1].$listElem[4], $heardCalls) > -1)) { // Generate a canonicalized call for QRZ and name lookups $call_canon = preg_replace('/\s+\w$/', '', $listElem[2]); - //remove suffix used sometimes in YSF (es: -FT2 , -991) + //remove suffix used sometimes in YSF (es: -FT2 , -991) if (strpos($call_canon,"-")!=false) { $call_canon = substr($call_canon, 0, strpos($call_canon, "-")); } diff --git a/include/tools.php b/include/tools.php index 6db5931..42308ab 100644 --- a/include/tools.php +++ b/include/tools.php @@ -133,19 +133,4 @@ function recursive_array_search($needle,$haystack) { } return false; } - -function rot1($text) { - $ric = 0; - $slot = 0; - $out = ""; - for ($i = 0; $i < strlen($text); $i++) { - if ($i == 0) - $ric = ord($text[$i])-31; - if ($i == 1) - $slot = ord($text[$i])-32; - if ($i > 1) - $out .= chr(ord($text[$i])-1); - } - return "Skyper-Rubric-No.: ".$ric.", Slot: ".$slot.", message: ".$out; -} ?> diff --git a/index.php b/index.php index e809837..06a4fab 100644 --- a/index.php +++ b/index.php @@ -218,10 +218,6 @@ if (defined("SHOWLOCALTX")) { include "include/localtx_ajax.php"; showLapTime("localtx_ajax"); } -if (defined("SHOWDAPNET")) { - include "include/dapnet_ajax.php"; - showLapTime("dapnet_ajax"); -} if (defined("ENABLEYSFGATEWAY")|| defined("ENABLEDMRGATEWAY")) { include "include/gatewayinfo.php"; showLapTime("gatewayinfo"); diff --git a/setup.php b/setup.php index d70ddb6..255b129 100644 --- a/setup.php +++ b/setup.php @@ -115,7 +115,7 @@ include "include/tools.php";

-
>
+
>
@@ -165,37 +165,10 @@ include "include/tools.php"; " name="DMRGATEWAYPATH" class="form-control" placeholder="/usr/local/bin/" aria-describedby="DMRGATEWAYPATH">
- + " name="DMRGATEWAYINIFILENAME" class="form-control" placeholder="DMRGateway.ini" aria-describedby="DMRGATEWAYINIFILENAME">
-
-

-
- -
>
-
-
- - " name="DAPNETGATEWAYLOGPATH" class="form-control" placeholder="/var/log/DAPNETGateway/" aria-describedby="DAPNETGATEWAYLOGPATH"> -
-
- - " name="DAPNETGATEWAYLOGPREFIX" class="form-control" placeholder="DAPNETGateway" aria-describedby="DAPNETGATEWAYLOGPREFIX"> -
-
- - " name="DAPNETGATEWAYINIPATH" class="form-control" placeholder="/etc/DAPNETGateway/" aria-describedby="DAPNETGATEWAYINIPATH"> -
-
- - " name="DAPNETGATEWAYPATH" class="form-control" placeholder="/usr/local/bin/" aria-describedby="DAPNETGATEWAYPATH"> -
-
- - " name="DAPNETGATEWAYINIFILENAME" class="form-control" placeholder="DAPNETGateway.ini" aria-describedby="DAPNETGATEWAYINIFILENAME"> -
-

@@ -337,10 +310,6 @@ foreach ($files as $file) {
>
-
- -
>
-
>