klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code-reorg and remove of non-D-Star or DMR-lines...

Browse source
This commit is contained in:
dg9vh 2016-05-01 22:53:23 +02:00
parent 8341971fc0
commit c4da4570d7
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/functions.php
View file

@ -1,14 +1,12 @@
<?php <?php
// 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122 // 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122
// 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901
// M: 2016-04-29 00:15:00.013 D-Star, received network header from DG9VH /ZEIT to CQCQCQ via DCS002 S // M: 2016-04-29 00:15:00.013 D-Star, received network header from DG9VH /ZEIT to CQCQCQ via DCS002 S
// M: 2016-04-29 19:43:21.839 DMR Slot 2, received network voice header from DL1ESZ to TG 9 // M: 2016-04-29 19:43:21.839 DMR Slot 2, received network voice header from DL1ESZ to TG 9
// M: 2016-04-30 14:57:43.072 DMR Slot 2, received RF voice header from DG9VH to 5000 // M: 2016-04-30 14:57:43.072 DMR Slot 2, received RF voice header from DG9VH to 5000
function getHeardList() {
function getLastHeard() {
$lastHeard = array();
$heardList = array(); $heardList = array();
$heardCalls = array();
if ($log = fopen(LOGFILE,'r')) { if ($log = fopen(LOGFILE,'r')) {
while ($logLine = fgets($log)) { while ($logLine = fgets($log)) {
// timestamp, mode, callsign, dstarid, target // timestamp, mode, callsign, dstarid, target
@ -33,20 +31,25 @@ function getLastHeard() {
if ( strlen($callsign <7) ) { if ( strlen($callsign <7) ) {
array_push($heardList, array($timestamp, $mode, $callsign, $id, $target, $source)); array_push($heardList, array($timestamp, $mode, $callsign, $id, $target, $source));
} }
//Last-Heard-Liste: Array aufbauen in umgekehrter Richtung des Logs
//Zeilen ausblenden, bei denen das Callsign länger als 6 Stellen ist
} }
fclose($log); fclose($log);
} }
return $heardList;
}
function getLastHeard() {
$lastHeard = array();
$heardCalls = array();
$heardList = getHeardList();
array_multisort($heardList,SORT_DESC); array_multisort($heardList,SORT_DESC);
foreach ($heardList as $listElem) { foreach ($heardList as $listElem) {
if ( ($listElem[1] == "D-Star") || (startsWith($listElem[1], "DMR")) ) {
if(!(array_search($listElem[2]."#".$listElem[1].$listElem[3], $heardCalls) > -1)) { if(!(array_search($listElem[2]."#".$listElem[1].$listElem[3], $heardCalls) > -1)) {
array_push($heardCalls, $listElem[2]."#".$listElem[1].$listElem[3]); array_push($heardCalls, $listElem[2]."#".$listElem[1].$listElem[3]);
array_push($lastHeard, $listElem); array_push($lastHeard, $listElem);
} }
} }
}
return $lastHeard; return $lastHeard;
} }
//getLastHeard();
?> ?>

4
include/tools.php
View file

@ -24,4 +24,8 @@ function format_time($seconds) {
} }
return $uptimeString; return $uptimeString;
} }
function startsWith($haystack, $needle) {
return $needle === "" || strrpos($haystack, $needle, -strlen($haystack)) !== false;
}
?> ?>