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

Removed whitespace before line endings

Browse source
This commit is contained in:
phl0 2016-09-20 12:57:17 +02:00
parent b37c81ae83
commit 2536f4dc1c
No known key found for this signature in database
GPG key ID: 48EA1E640798CA9A
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
include/functions.php
View file

@ -69,13 +69,13 @@ function getEnabled ($mode, $mmdvmconfigs) {
function showMode($mode, $mmdvmconfigs) { function showMode($mode, $mmdvmconfigs) {
// shows if mode is enabled or not. // shows if mode is enabled or not.
?> ?>
<td><span class="label <?php <td><span class="label <?php
if (getEnabled($mode, $mmdvmconfigs) == 1) { if (getEnabled($mode, $mmdvmconfigs) == 1) {
switch ($mode) { switch ($mode) {
case "D-Star Network": case "D-Star Network":
if (getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "localhost" || getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "127.0.0.1") { if (getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "localhost" || getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "127.0.0.1") {
if (isProcessRunning(IRCDDBGATEWAY)) { if (isProcessRunning(IRCDDBGATEWAY)) {
echo "label-success"; echo "label-success";
} else { } else {
echo "label-danger\" title=\"ircddbgateway is down!"; echo "label-danger\" title=\"ircddbgateway is down!";
} }
@ -86,7 +86,7 @@ function showMode($mode, $mmdvmconfigs) {
case "System Fusion Network": case "System Fusion Network":
if (getConfigItem("System Fusion Network", "GwyAddress", $mmdvmconfigs) == "localhost" || getConfigItem("System Fusion Network", "GwyAddress", $mmdvmconfigs) == "127.0.0.1") { if (getConfigItem("System Fusion Network", "GwyAddress", $mmdvmconfigs) == "localhost" || getConfigItem("System Fusion Network", "GwyAddress", $mmdvmconfigs) == "127.0.0.1") {
if (isProcessRunning("YSFGateway")) { if (isProcessRunning("YSFGateway")) {
echo "label-success"; echo "label-success";
} else { } else {
echo "label-danger\" title=\"YSFGateway is down!"; echo "label-danger\" title=\"YSFGateway is down!";
} }
@ -96,7 +96,7 @@ function showMode($mode, $mmdvmconfigs) {
break; break;
default: default:
if (isProcessRunning("MMDVMHost")) { if (isProcessRunning("MMDVMHost")) {
echo "label-success"; echo "label-success";
} else { } else {
echo "label-danger\" title=\"MMDVMHost is down!"; echo "label-danger\" title=\"MMDVMHost is down!";
} }
@ -165,7 +165,7 @@ function getHeardList($logLines, $onlyLast) {
} else if(strpos($logLine,"overflow in the DMR slot RF queue")) { } else if(strpos($logLine,"overflow in the DMR slot RF queue")) {
continue; continue;
} }
if(strpos($logLine,"end of") || strpos($logLine,"watchdog has expired") || strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) { if(strpos($logLine,"end of") || strpos($logLine,"watchdog has expired") || strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) {
$lineTokens = explode(", ",$logLine); $lineTokens = explode(", ",$logLine);
if (array_key_exists(2,$lineTokens)) { if (array_key_exists(2,$lineTokens)) {
@ -174,7 +174,7 @@ function getHeardList($logLines, $onlyLast) {
if (array_key_exists(3,$lineTokens)) { if (array_key_exists(3,$lineTokens)) {
$loss = $lineTokens[3]; $loss = $lineTokens[3];
} }
// if RF-Packet, no LOSS would be reported, so BER is in LOSS position // if RF-Packet, no LOSS would be reported, so BER is in LOSS position
if (startsWith($loss,"BER")) { if (startsWith($loss,"BER")) {
$ber = substr($loss, 5); $ber = substr($loss, 5);
@ -185,7 +185,7 @@ function getHeardList($logLines, $onlyLast) {
$ber = substr($lineTokens[4], 5); $ber = substr($lineTokens[4], 5);
} }
} }
if (strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) { if (strpos($logLine,"ended RF data") || strpos($logLine,"ended network")) {
switch (substr($logLine, 27, strpos($logLine,",") - 27)) { switch (substr($logLine, 27, strpos($logLine,",") - 27)) {
case "DMR Slot 1": case "DMR Slot 1":
@ -220,7 +220,7 @@ function getHeardList($logLines, $onlyLast) {
} }
} }
} }
$timestamp = substr($logLine, 3, 19); $timestamp = substr($logLine, 3, 19);
$mode = substr($logLine, 27, strpos($logLine,",") - 27); $mode = substr($logLine, 27, strpos($logLine,",") - 27);
$callsign2 = substr($logLine, strpos($logLine,"from") + 5, strpos($logLine,"to") - strpos($logLine,"from") - 6); $callsign2 = substr($logLine, strpos($logLine,"from") + 5, strpos($logLine,"to") - strpos($logLine,"from") - 6);
@ -229,18 +229,18 @@ function getHeardList($logLines, $onlyLast) {
$callsign = substr($callsign2, 0, strpos($callsign2,"/")); $callsign = substr($callsign2, 0, strpos($callsign2,"/"));
} }
$callsign = trim($callsign); $callsign = trim($callsign);
$id =""; $id ="";
if ($mode == "D-Star") { if ($mode == "D-Star") {
$id = substr($callsign2, strpos($callsign2,"/") + 1); $id = substr($callsign2, strpos($callsign2,"/") + 1);
} }
$target = substr($logLine, strpos($logLine, "to") + 3); $target = substr($logLine, strpos($logLine, "to") + 3);
$source = "RF"; $source = "RF";
if (strpos($logLine,"network") > 0 ) { if (strpos($logLine,"network") > 0 ) {
$source = "Net"; $source = "Net";
} }
switch ($mode) { switch ($mode) {
case "D-Star": case "D-Star":
$duration = $dstarduration; $duration = $dstarduration;
@ -263,7 +263,7 @@ function getHeardList($logLines, $onlyLast) {
$ber = $ysfber; $ber = $ysfber;
break; break;
} }
// Callsign or ID should be less than 11 chars long, otherwise it could be errorneous // Callsign or ID should be less than 11 chars long, otherwise it could be errorneous
if ( strlen($callsign) < 11 ) { if ( strlen($callsign) < 11 ) {
array_push($heardList, array($timestamp, $mode, $callsign, $id, $target, $source, $duration, $loss, $ber)); array_push($heardList, array($timestamp, $mode, $callsign, $id, $target, $source, $duration, $loss, $ber));
@ -309,7 +309,7 @@ function getActualMode($metaLastHeard, $mmdvmconfigs) {
} else { } else {
$now = new DateTime(); $now = new DateTime();
$hangtime = getConfigItem("General", "ModeHang", $mmdvmconfigs); $hangtime = getConfigItem("General", "ModeHang", $mmdvmconfigs);
if ($hangtime != "") { if ($hangtime != "") {
$timestamp->add(new DateInterval('PT' . $hangtime . 'S')); $timestamp->add(new DateInterval('PT' . $hangtime . 'S'));
} else { } else {
@ -365,7 +365,7 @@ function getDSTARLinks() {
$linkDest = $linx[4][0]; $linkDest = $linx[4][0];
$linkDir = $linx[5][0]; $linkDir = $linx[5][0];
} }
// Dongle-Link, sample: // Dongle-Link, sample:
// 2011-09-24 07:26:59: DPlus link - Type: Dongle User: DC1PIA Dir: Incoming // 2011-09-24 07:26:59: DPlus link - Type: Dongle User: DC1PIA Dir: Incoming
// 2012-03-14 21:32:18: DPlus link - Type: Dongle User: DC1PIA Dir: Incoming // 2012-03-14 21:32:18: DPlus link - Type: Dongle User: DC1PIA Dir: Incoming
if(preg_match_all('/^(.{19}).*(D[A-Za-z]*).*Type: ([A-Za-z]*).*User: (.{6,8}).*Dir: (.*)$/',$linkLine,$linx) > 0){ if(preg_match_all('/^(.{19}).*(D[A-Za-z]*).*Type: ([A-Za-z]*).*User: (.{6,8}).*Dir: (.*)$/',$linkLine,$linx) > 0){
@ -380,7 +380,7 @@ function getDSTARLinks() {
} }
} }
$out .= "</table>"; $out .= "</table>";
fclose($linkLog); fclose($linkLog);
return $out; return $out;
} }
@ -403,7 +403,7 @@ function getActualLink($logLines, $mode) {
if(strpos($logLine,"unable to decode the network CSBK")) { if(strpos($logLine,"unable to decode the network CSBK")) {
continue; continue;
} else if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 1") { } else if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 1") {
$to = ""; $to = "";
if (strpos($logLine,"to")) { if (strpos($logLine,"to")) {
$to = trim(substr($logLine, strpos($logLine,"to") + 3)); $to = trim(substr($logLine, strpos($logLine,"to") + 3));
} }
@ -419,7 +419,7 @@ function getActualLink($logLines, $mode) {
if(strpos($logLine,"unable to decode the network CSBK")) { if(strpos($logLine,"unable to decode the network CSBK")) {
continue; continue;
} else if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 2") { } else if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 2") {
$to = ""; $to = "";
if (strpos($logLine,"to")) { if (strpos($logLine,"to")) {
$to = trim(substr($logLine, strpos($logLine,"to") + 3)); $to = trim(substr($logLine, strpos($logLine,"to") + 3));
} }
@ -442,19 +442,19 @@ function getActualReflector($logLines, $mode) {
foreach ($logLines as $logLine) { foreach ($logLines as $logLine) {
if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 2") { if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 2") {
$from = substr($logLine, strpos($logLine,"from") + 5, strpos($logLine,"to") - strpos($logLine,"from") - 6); $from = substr($logLine, strpos($logLine,"from") + 5, strpos($logLine,"to") - strpos($logLine,"from") - 6);
if (strlen($from) == 4 && startsWith($from,"4")) { if (strlen($from) == 4 && startsWith($from,"4")) {
if ($from == "4000") { if ($from == "4000") {
return "Reflector not linked"; return "Reflector not linked";
} else { } else {
return "Reflector ".$from; return "Reflector ".$from;
} }
} }
$source = "RF"; $source = "RF";
if (strpos($logLine,"network") > 0 ) { if (strpos($logLine,"network") > 0 ) {
$source = "Net"; $source = "Net";
} }
if ( $source == "RF") { if ( $source == "RF") {
$to = substr($logLine, strpos($logLine, "to") + 3); $to = substr($logLine, strpos($logLine, "to") + 3);
if (strlen($to) < 6 && startsWith($to, "4")) { if (strlen($to) < 6 && startsWith($to, "4")) {
@ -478,7 +478,7 @@ function getActiveYSFReflectors($logLines) {
$timestamp2 = new DateTime($timestamp); $timestamp2 = new DateTime($timestamp);
$now = new DateTime(); $now = new DateTime();
$timestamp2->add(new DateInterval('PT2H')); $timestamp2->add(new DateInterval('PT2H'));
if ($now->format('U') <= $timestamp2->format('U')) { if ($now->format('U') <= $timestamp2->format('U')) {
$str = substr($logLine, 60); $str = substr($logLine, 60);
$id = strtok($str, "/"); $id = strtok($str, "/");