From 2536f4dc1c8dde2df37c42aba91b8b2bcd0edde6 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 20 Sep 2016 12:57:17 +0200 Subject: [PATCH] Removed whitespace before line endings --- include/functions.php | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/include/functions.php b/include/functions.php index eb67d71..6e7bd26 100644 --- a/include/functions.php +++ b/include/functions.php @@ -69,13 +69,13 @@ function getEnabled ($mode, $mmdvmconfigs) { function showMode($mode, $mmdvmconfigs) { // shows if mode is enabled or not. ?> - 0 ) { $source = "Net"; } - + switch ($mode) { case "D-Star": $duration = $dstarduration; @@ -263,7 +263,7 @@ function getHeardList($logLines, $onlyLast) { $ber = $ysfber; break; } - + // Callsign or ID should be less than 11 chars long, otherwise it could be errorneous if ( strlen($callsign) < 11 ) { array_push($heardList, array($timestamp, $mode, $callsign, $id, $target, $source, $duration, $loss, $ber)); @@ -309,7 +309,7 @@ function getActualMode($metaLastHeard, $mmdvmconfigs) { } else { $now = new DateTime(); $hangtime = getConfigItem("General", "ModeHang", $mmdvmconfigs); - + if ($hangtime != "") { $timestamp->add(new DateInterval('PT' . $hangtime . 'S')); } else { @@ -365,7 +365,7 @@ function getDSTARLinks() { $linkDest = $linx[4][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 // 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){ @@ -380,7 +380,7 @@ function getDSTARLinks() { } } $out .= ""; - + fclose($linkLog); return $out; } @@ -403,7 +403,7 @@ function getActualLink($logLines, $mode) { if(strpos($logLine,"unable to decode the network CSBK")) { continue; } else if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 1") { - $to = ""; + $to = ""; if (strpos($logLine,"to")) { $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")) { continue; } else if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 2") { - $to = ""; + $to = ""; if (strpos($logLine,"to")) { $to = trim(substr($logLine, strpos($logLine,"to") + 3)); } @@ -442,19 +442,19 @@ function getActualReflector($logLines, $mode) { foreach ($logLines as $logLine) { if(substr($logLine, 27, strpos($logLine,",") - 27) == "DMR Slot 2") { $from = substr($logLine, strpos($logLine,"from") + 5, strpos($logLine,"to") - strpos($logLine,"from") - 6); - + if (strlen($from) == 4 && startsWith($from,"4")) { if ($from == "4000") { return "Reflector not linked"; } else { return "Reflector ".$from; } - } + } $source = "RF"; if (strpos($logLine,"network") > 0 ) { $source = "Net"; } - + if ( $source == "RF") { $to = substr($logLine, strpos($logLine, "to") + 3); if (strlen($to) < 6 && startsWith($to, "4")) { @@ -478,7 +478,7 @@ function getActiveYSFReflectors($logLines) { $timestamp2 = new DateTime($timestamp); $now = new DateTime(); $timestamp2->add(new DateInterval('PT2H')); - + if ($now->format('U') <= $timestamp2->format('U')) { $str = substr($logLine, 60); $id = strtok($str, "/");