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

Merge pull request #182 from lucamarche-iz1mlt/master

Browse source 
Fix "YSF linked to" status display
This commit is contained in:
Kim - DG9VH 2018-06-04 13:53:01 +02:00 committed by GitHub
commit c383e537e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ajax.php
View file

@ -46,7 +46,7 @@ if ($_GET['section'] == "ysflink") {
$reverseLogLinesYSFGateway = $logLinesYSFGateway; $reverseLogLinesYSFGateway = $logLinesYSFGateway;
rsort($reverseLogLinesYSFGateway); rsort($reverseLogLinesYSFGateway);
$activeYSFReflectors = getActiveYSFReflectors(); $activeYSFReflectors = getActiveYSFReflectors();
$link = getYSFReflectorById(getActualLink($reverseLogLinesYSFGateway, "YSF"), $activeYSFReflectors); $link = getActualLink($reverseLogLinesYSFGateway, "YSF");
echo $link; echo $link;
} }

46
include/functions.php
View file

@ -240,7 +240,7 @@ function getShortMMDVMLog() {
function getYSFGatewayLog() { function getYSFGatewayLog() {
// Open Logfile and copy loglines into LogLines-Array() // Open Logfile and copy loglines into LogLines-Array()
$logPath = YSFGATEWAYLOGPATH."/".YSFGATEWAYLOGPREFIX."-".date("Y-m-d").".log"; $logPath = YSFGATEWAYLOGPATH."/".YSFGATEWAYLOGPREFIX."-".date("Y-m-d").".log";
$logLines = explode("\n", `egrep -h "repeater|Starting|Disconnect|Connect|Automatic|Disconnecting|Reverting" $logPath`); $logLines = explode("\n", `egrep -h "repeater|Startinf|Disconnect|Linked|Automatic|Reverting|No connection" $logPath`);
return $logLines; return $logLines;
} }
@ -749,27 +749,19 @@ function getActualLink($logLines, $mode) {
// 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122 // 00000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999999990000000000111111111122
// 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901
// M: 2016-09-25 16:08:05.811 Connect to 62829 has been requested by DG9VH //I: 2018-06-04 11:04:22.190 The ID of this repeater is 50735
// M: 2016-10-01 17:52:36.586 Automatic connection to 62829 //M: 2018-06-04 11:04:22.202 No connection startup
// M: 2017-05-15 21:19:42.870 Reverting connection to 62829 //M: 2018-06-04 11:04:24.005 Linked to IT C4FM Piemonte
if (isProcessRunning("YSFGateway")) { if (isProcessRunning("YSFGateway")) {
foreach($logLines as $logLine) { foreach($logLines as $logLine) {
$to = ""; $to = "";
if (strpos($logLine,"Disconnect has been requested")) { if (strpos($logLine,"Disconnect") || strpos($logLine, "Unknown reflector") || strpos($logLine, "Disconnecting due to inactivity") || strpos($logLine, "No connection startup")) {
$to = -1; return _("not linked");
} }
if (strpos($logLine,"Connect to")) { if (strpos($logLine,"Linked to")) {
$to = substr($logLine, 38, 5); $to = substr($logLine, 37, 16);
}
if (strpos($logLine,"Reverting connection")) {
$to = substr($logLine, 51, 5);
}
if (strpos($logLine,"The ID of this repeater is")) {
$to = -1;
}
if (strpos($logLine,"Automatic connection to")) {
$to = substr($logLine, 51, 5);
} }
if ($to !== "") { if ($to !== "") {
$fp = fopen('/tmp/YSFState.txt', 'w'); $fp = fopen('/tmp/YSFState.txt', 'w');
@ -779,7 +771,7 @@ function getActualLink($logLines, $mode) {
} }
} }
} else { } else {
return -2; return _("YSFGateway not running");
} }
if (file_exists('/tmp/YSFState.txt')) { if (file_exists('/tmp/YSFState.txt')) {
$fp = fopen('/tmp/YSFState.txt', 'r'); $fp = fopen('/tmp/YSFState.txt', 'r');
@ -788,10 +780,10 @@ function getActualLink($logLines, $mode) {
if (count($contents)>0){ if (count($contents)>0){
return $contents; return $contents;
} else { } else {
return -1; return _("not linked");
} }
} else { } else {
return -1; return _("not linked");
} }
break; break;
} }
@ -867,20 +859,6 @@ function getActiveYSFReflectors() {
return $reflectorlist; return $reflectorlist;
} }
function getYSFReflectorById($id, $reflectors) {
if ($id ==-1) {
return _("not linked");
} else if ($id == -2 ) {
return _("YSFGateway not running");
} else {
foreach($reflectors as $reflector) {
if ($reflector[3] === $id) {
return $reflector[0];
}
}
}
}
function getName($callsign) { function getName($callsign) {
if (defined("USESQLITE")) { if (defined("USESQLITE")) {
return resolveNameFromDB($callsign); return resolveNameFromDB($callsign);

2
include/repeaterinfo.php
View file

@ -37,7 +37,7 @@
echo"<td id=\"dstarlink\">".getActualLink($reverseLogLinesMMDVM, "D-Star")."</td>"; echo"<td id=\"dstarlink\">".getActualLink($reverseLogLinesMMDVM, "D-Star")."</td>";
} }
if (getEnabled("System Fusion", $mmdvmconfigs) == 1) { if (getEnabled("System Fusion", $mmdvmconfigs) == 1) {
echo"<td id=\"ysflink\">".getYSFReflectorById(getActualLink($reverseLogLinesYSFGateway, "YSF"), $activeYSFReflectors)."</td>"; echo"<td id=\"ysflink\">".getActualLink($reverseLogLinesYSFGateway, "YSF")."</td>";
} }
if (getEnabled("DMR", $mmdvmconfigs) == 1) { if (getEnabled("DMR", $mmdvmconfigs) == 1) {
if (getConfigItem("DMR Network", "Slot1", $mmdvmconfigs) == "1") { if (getConfigItem("DMR Network", "Slot1", $mmdvmconfigs) == "1") {