From 4342b609718fbdf683ab91ef7532b92d8b246d9d Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Thu, 1 Feb 2018 15:25:12 +0100
Subject: [PATCH] Add support for vdlm2dec

---
 install/index.php          | 4 ++--
 scripts/daemon-spotter.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/index.php b/install/index.php
index 1c8a8347..e4ca3091 100644
--- a/install/index.php
+++ b/install/index.php
@@ -619,7 +619,7 @@ if (!isset($_SESSION['install']) && !isset($_POST['dbtype']) && (count($error) =
 										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option>
 										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
 										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS SBS-3 over TCP</option>
-                                        <option value="acarsjson" <?php if (isset($source['format']) && $source['format'] == 'acarsjson') print 'selected'; ?>>ACARS from acarsdec json</option>
+                                        <option value="acarsjson" <?php if (isset($source['format']) && $source['format'] == 'acarsjson') print 'selected'; ?>>ACARS from acarsdec json and vdlm2dec</option>
 										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option>
 										<option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') print 'selected'; ?>>AirWhere website</option>
 										<option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') print 'selected'; ?>>HidnSeek Callback</option>
@@ -677,7 +677,7 @@ if (!isset($_SESSION['install']) && !isset($_POST['dbtype']) && (count($error) =
 										<option value="flightgearsp">FlightGear Singleplayer</option>
 										<option value="acars">ACARS from acarsdec/acarsdeco2 over UDP</option>
 										<option value="acarssbs3">ACARS SBS-3 over TCP</option>
-                                        <option value="acarsjson">ACARS from acarsdec json</option>
+                                        <option value="acarsjson">ACARS from acarsdec json and vdlm2dec</option>
 										<option value="ais">NMEA AIS over TCP</option>
 										<option value="airwhere">AirWhere website</option>
 										<option value="hidnseek_callback">HidnSeek Callback</option>
diff --git a/scripts/daemon-spotter.php b/scripts/daemon-spotter.php
index 78d38fc6..2acb69ac 100755
--- a/scripts/daemon-spotter.php
+++ b/scripts/daemon-spotter.php
@@ -1646,7 +1646,7 @@ while ($i > 0) {
                         if ($line != '') {
                             $line = json_decode($line, true);
                             if (!empty($line)) {
-                                $ACARS->add($line['text'], array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => $line['text']));
+                                $ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
                                 $ACARS->deleteLiveAcarsData();
                             }
                         }
-- 
2.11.4.GIT