From b95f9b60bb3f281adf3d25068af7ad9568787419 Mon Sep 17 00:00:00 2001
From: dg9vh <dg9vh@darc.de>
Date: Fri, 28 Apr 2017 20:04:49 +0000
Subject: [PATCH] closes
 https://github.com/dg9vh/MMDVMHost-Dashboard/issues/131

---
 include/functions.php | 14 +++++++-------
 version.php           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index f7f5c56..380af97 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -210,7 +210,7 @@ function getYSFGatewayLog() {
    // Open Logfile and copy loglines into LogLines-Array()
    $logPath = YSFGATEWAYLOGPATH."/".YSFGATEWAYLOGPREFIX."-".date("Y-m-d").".log";
    //$logLines = explode("\n", `egrep -h "D:|M:" $logPath`);
-   $logLines = explode("\n", `egrep -h "Starting|DISCONNECT|Connect|Automatic|Disconnecting" $logPath`);
+   $logLines = explode("\n", `egrep -h "Starting|Disconnect|Connect|Automatic|Disconnecting" $logPath`);
    return $logLines;
 }
 
@@ -626,6 +626,7 @@ function getActualLink($logLines, $mode) {
 //M: 2016-05-02 07:04:10.504 D-Star link status set to "Verlinkt zu DCS002 S"
 //M: 2016-04-03 16:16:18.638 DMR Slot 2, received network voice header from 4000 to 2625094
 //M: 2016-04-03 19:30:03.099 DMR Slot 2, received network voice header from 4020 to 2625094
+
    switch ($mode) {
       case "D-Star":
          if (isProcessRunning(IRCDDBGATEWAY)) {
@@ -672,24 +673,23 @@ function getActualLink($logLines, $mode) {
 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901
 // 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("YSFGateway")) {
             foreach($logLines as $logLine) {
                $to = "";
+               if (strpos($logLine,"Disconnect has been requested")) {
+                  $to = -1;
+               }
                if (strpos($logLine,"Connect to")) {
                   $to = substr($logLine, 38, 5);
                }
                if (strpos($logLine,"Automatic connection to")) {
                   $to = substr($logLine, 51, 5);
                }
-               if ($to !== "") {
-                  return $to;
-               }
                if (strpos($logLine,"Starting YSFGateway")) {
                   $to = -1;
                }
-               if (strpos($logLine,"DISCONNECT Reply")) {
-                  $to = -1;
+               if ($to !== "") {
+                  return $to;
                }
             }
             return -1;
diff --git a/version.php b/version.php
index e00f74d..def6262 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20170427-1 (".getGitVersion().")");
+define("VERSION", "20170428-1 (".getGitVersion().")");
 ?>