diff --git a/include/functions.php b/include/functions.php index 55e1566..f64ecf4 100644 --- a/include/functions.php +++ b/include/functions.php @@ -490,15 +490,9 @@ function getActualLink($logLines, $mode) { // M: 2016-09-25 16:08:05.811 Connect to 62829 has been requested by DG9VH // M: 2016-10-01 17:52:36.586 Automatic connection to 62829 - if (isProcessRunning(IRCDDBGATEWAY)) { + if (isProcessRunning("YSFGateway")) { foreach($logLines as $logLine) { $to = ""; - if (strpos($logLine,"Starting YSFGateway")) { - $to = -1; - } - if (strpos($logLine,"DISCONNECT Reply")) { - $to = -1; - } if (strpos($logLine,"Connect to")) { $to = substr($logLine, 38, 5); } @@ -508,6 +502,12 @@ function getActualLink($logLines, $mode) { if ($to !== "") { return $to; } + if (strpos($logLine,"Starting YSFGateway")) { + $to = -1; + } + if (strpos($logLine,"DISCONNECT Reply")) { + $to = -1; + } } return -1; break; diff --git a/txinfo.php b/txinfo.php index c6dad15..aa987f3 100644 --- a/txinfo.php +++ b/txinfo.php @@ -15,8 +15,8 @@ echo""; foreach ($lastHeard as $listElem) { - echo ""; if (defined("ENABLEXTDLOOKUP") && $listElem[7] == null || !defined("ENABLEXTDLOOKUP") && $listElem[6] == null) { + echo ""; echo"$listElem[0]"; echo"$listElem[1]"; /*if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) { @@ -55,8 +55,7 @@ foreach ($lastHeard as $listElem) { $diff = $d2->getTimestamp() - $d1->getTimestamp(); echo"$diff s"; } - } - echo ""; + echo ""; + } } ?> - diff --git a/version.php b/version.php index 2f4b4ff..ddcbd13 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@