From 72e8ee4e0a4c333603fc73fda23ce412b01e46cd Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Sat, 14 Nov 2020 19:50:27 +0100
Subject: [PATCH 01/15] [Adif export] Refactor the view and added a library to
 make the adif-line. Also a bug fixed in MY_STATE. It was exporting COL_STATE,
 not COL_MY_STATE

---
 application/libraries/AdifHelper.php      | 125 ++++++++++++++++++++++
 application/views/adif/data/exportall.php |  12 ++-
 2 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 application/libraries/AdifHelper.php

diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php
new file mode 100644
index 00000000..be9ee192
--- /dev/null
+++ b/application/libraries/AdifHelper.php
@@ -0,0 +1,125 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+class AdifHelper {
+
+    public function getAdifLine($qso) {
+        $line = "";
+        $line .= $this->getAdifFieldLine("call", $qso->COL_CALL);
+        $line .= $this->getAdifFieldLine("band", $qso->COL_BAND);
+        $line .= $this->getAdifFieldLine("mode", $qso->COL_MODE);
+
+        if ($qso->COL_SUBMODE) {
+            $line .= $this->getAdifFieldLine("submode", $qso->COL_SUBMODE);
+        }
+
+        if ($qso->COL_FREQ != 0) {
+            $freq_in_mhz = $qso->COL_FREQ / 1000000;
+            $line .= $this->getAdifFieldLine("freq", $freq_in_mhz);
+        }
+
+        if ($qso->COL_FREQ_RX != 0) {
+            $freq_rx_in_mhz = $qso->COL_FREQ_RX / 1000000;
+            $line .= $this->getAdifFieldLine("freq_rx", $freq_rx_in_mhz);
+        }
+
+        if ($qso->COL_BAND_RX) {
+            $line .= $this->getAdifFieldLine("band_rx", $qso->COL_BAND_RX);
+        }
+
+        $date_on = strtotime($qso->COL_TIME_ON);
+        $new_date = date('Ymd', $date_on);
+        $line .= $this->getAdifFieldLine("qso_date", $new_date);
+
+        $time_on = strtotime($qso->COL_TIME_ON);
+        $new_on = date('His', $time_on);
+        $line .= $this->getAdifFieldLine("time_on", $new_on);
+
+        $time_off = strtotime($qso->COL_TIME_OFF);
+        $new_off = date('His', $time_off);
+        $line .= $this->getAdifFieldLine("time_off", $new_off);
+
+        $line .= $this->getAdifFieldLine("rst_rcvd", $qso->COL_RST_RCVD);
+
+        $line .= $this->getAdifFieldLine("rst_sent", $qso->COL_RST_SENT);
+
+        $line .= $this->getAdifFieldLine("qsl_rcvd", $qso->COL_QSL_RCVD);
+
+        $line .= $this->getAdifFieldLine("qsl_sent", $qso->COL_QSL_SENT);
+
+        $line .= $this->getAdifFieldLine("country", $qso->COL_COUNTRY);
+
+        if ($qso->COL_VUCC_GRIDS != "") {
+            $line .= $this->getAdifFieldLine("vucc_grids", $qso->COL_VUCC_GRIDS);
+        }
+        if ($qso->COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") {
+            $line .= $this->getAdifFieldLine("gridsquare", $qso->COL_GRIDSQUARE);
+        }
+        if ($qso->COL_SAT_NAME) {
+            if ($qso->COL_SAT_MODE != 0 || $qso->COL_SAT_MODE !="") {
+                $line .= $this->getAdifFieldLine("sat_mode", $qso->COL_SAT_MODE);
+                $line .= $this->getAdifFieldLine("sat_name", $qso->COL_SAT_NAME);
+            }
+        }
+
+        $line .= $this->getAdifFieldLine("prop_mode", $qso->COL_PROP_MODE);
+
+        $line .= $this->getAdifFieldLine("name", $qso->COL_NAME);
+
+        $line .= $this->getAdifFieldLine("state", $qso->COL_STATE);
+
+        $line .= $this->getAdifFieldLine("sota_ref", $qso->COL_SOTA_REF);
+
+        $line .= $this->getAdifFieldLine("operator", $qso->COL_OPERATOR);
+
+        $line .= $this->getAdifFieldLine("STATION_CALLSIGN", $qso->station_callsign);
+
+        $line .= $this->getAdifFieldLine("MY_CITY", $qso->station_city);
+
+        $line .= $this->getAdifFieldLine("MY_COUNTRY", $qso->station_country);
+
+        $line .= $this->getAdifFieldLine("MY_DXCC", $qso->station_dxcc);
+
+        if (strpos($qso->station_gridsquare, ',') !== false ) {
+            $line .= $this->getAdifFieldLine("MY_VUCC_GRIDS", $qso->station_gridsquare);
+        }
+        else {
+            $line .= $this->getAdifFieldLine("MY_GRIDSQUARE", $qso->station_gridsquare);
+        }
+
+        $line .= $this->getAdifFieldLine("MY_IOTA", $qso->station_iota);
+
+        $line .= $this->getAdifFieldLine("MY_SOTA_REF", $qso->station_sota);
+
+        $line .= $this->getAdifFieldLine("MY_CQ_ZONE", $qso->station_cq);
+
+        $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu);
+
+        $line .= $this->getAdifFieldLine("MY_CNTY", $qso->station_cnty);
+
+        $line .= $this->getAdifFieldLine("MY_STATE", $qso->COL_MY_STATE);
+
+        $line .= $this->getAdifFieldLine("stx", $qso->COL_STX);
+
+        $line .= $this->getAdifFieldLine("stx_string", $qso->COL_STX_STRING);
+
+        $line .= $this->getAdifFieldLine("srx", $qso->COL_SRX);
+
+        $line .= $this->getAdifFieldLine("srx_string", $qso->COL_SRX_STRING);
+
+        $line .= $this->getAdifFieldLine("TX_PWR", $qso->COL_TX_PWR);
+
+        $line .= $this->getAdifFieldLine("COMMENT", $qso->COL_COMMENT);
+
+        $line .= "<eor>\r\n";
+
+        return $line;
+    }
+
+    function getAdifFieldLine($adifcolumn, $dbvalue) {
+        if ($dbvalue != "") {
+            return "<" . $adifcolumn . ":" . strlen($dbvalue) . ">" . $dbvalue;
+        } else {
+            return "";
+        }
+    }
+}
\ No newline at end of file
diff --git a/application/views/adif/data/exportall.php b/application/views/adif/data/exportall.php
index 734bb347..9b29121d 100644
--- a/application/views/adif/data/exportall.php
+++ b/application/views/adif/data/exportall.php
@@ -7,7 +7,11 @@
 <PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>>Version <?php echo $this->config->item('app_version')."\n"; ?>
 <EOH>
 
-<?php foreach ($qsos->result() as $qso) { ?>
-	
-	<call:<?php echo strlen($qso->COL_CALL); ?>><?php echo $qso->COL_CALL; ?><band:<?php echo strlen($qso->COL_BAND); ?>><?php echo $qso->COL_BAND; ?><mode:<?php echo strlen($qso->COL_MODE); ?>><?php echo $qso->COL_MODE; ?><?php if($qso->COL_SUBMODE) { ?><SUBMODE:<?php echo strlen($qso->COL_SUBMODE); ?>><?php echo $qso->COL_SUBMODE; ?><?php } ?><?php if($qso->COL_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><freq:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?php } ?><?php if($qso->COL_FREQ_RX != "0") { ?><?php $freq_rx_in_mhz = $qso->COL_FREQ_RX / 1000000; ?><FREQ_RX:<?php echo strlen($freq_rx_in_mhz); ?>><?php echo $freq_rx_in_mhz; ?><?php } ?><?php if($qso->COL_BAND_RX) { ?><BAND_RX:<?php echo strlen($qso->COL_BAND_RX); ?>><?php echo $qso->COL_BAND_RX; ?><?php } ?><?php $date_on = strtotime($qso->COL_TIME_ON); $new_date = date('Ymd', $date_on); ?><qso_date:<?php echo strlen($new_date); ?>><?php echo $new_date; ?><?php $time_on = strtotime($qso->COL_TIME_ON); $new_on = date('His', $time_on); ?><time_on:<?php echo strlen($new_on); ?>><?php echo $new_on; ?><?php $time_off = strtotime($qso->COL_TIME_OFF); $new_off = date('His', $time_off); ?><time_off:<?php echo strlen($new_off); ?>><?php echo $new_off; ?><rst_rcvd:<?php echo strlen($qso->COL_RST_RCVD); ?>><?php echo $qso->COL_RST_RCVD; ?><rst_sent:<?php echo strlen($qso->COL_RST_SENT); ?>><?php echo $qso->COL_RST_SENT; ?><qsl_rcvd:<?php echo strlen($qso->COL_QSL_RCVD); ?>><?php echo $qso->COL_QSL_RCVD; ?><qsl_sent:<?php echo strlen($qso->COL_QSL_SENT); ?>><?php echo $qso->COL_QSL_SENT; ?><country:<?php echo strlen($qso->COL_COUNTRY); ?>><?php echo $qso->COL_COUNTRY; ?><?php if($qso->COL_VUCC_GRIDS != "") { ?><vucc_grids:<?php echo strlen($qso->COL_VUCC_GRIDS); ?>><?php echo $qso->COL_VUCC_GRIDS; ?><?php } ?><?php if($qso->COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") { ?><gridsquare:<?php echo strlen($qso->COL_GRIDSQUARE); ?>><?php echo $qso->COL_GRIDSQUARE; ?><?php } ?><?php if($qso->COL_SAT_NAME) { ?><?php if($qso->COL_SAT_MODE != 0 || $qso->COL_SAT_MODE !="") {?><sat_mode:<?php echo strlen($qso->COL_SAT_MODE); ?>><?php echo $qso->COL_SAT_MODE; ?><?php } ?><sat_name:<?php echo strlen($qso->COL_SAT_NAME); ?>><?php echo $qso->COL_SAT_NAME; ?><?php } ?><?php if($qso->COL_PROP_MODE) { ?><prop_mode:<?php echo strlen($qso->COL_PROP_MODE); ?>><?php echo $qso->COL_PROP_MODE; ?><?php } ?><?php if($qso->COL_NAME) { ?><name:<?php echo strlen($qso->COL_NAME); ?>><?php echo $qso->COL_NAME; ?><?php } ?><?php if($qso->COL_STATE) { ?><state:<?php echo strlen($qso->COL_STATE); ?>><?php echo $qso->COL_STATE; ?><?php } ?><?php if($qso->COL_SOTA_REF) { ?><sota_ref:<?php echo strlen($qso->COL_SOTA_REF); ?>><?php echo $qso->COL_SOTA_REF; ?><?php } ?><?php if($qso->COL_OPERATOR) { ?><operator:<?php echo strlen($qso->COL_OPERATOR); ?>><?php echo $qso->COL_OPERATOR; ?><?php } ?><?php if($qso->station_callsign) { ?><STATION_CALLSIGN:<?php echo strlen($qso->station_callsign); ?>><?php echo $qso->station_callsign; ?><?php } ?><?php if($qso->station_city) { ?><MY_CITY:<?php echo strlen($qso->station_city); ?>><?php echo $qso->station_city; ?><?php } ?><?php if($qso->station_country) { ?><MY_COUNTRY:<?php echo strlen($qso->station_country); ?>><?php echo $qso->station_country; ?><?php } ?><?php if($qso->station_dxcc) { ?><MY_DXCC:<?php echo strlen($qso->station_dxcc); ?>><?php echo $qso->station_dxcc; ?><?php } ?><?php if( strpos($qso->station_gridsquare, ',') !== false ) { ?><MY_VUCC_GRIDS:<?php echo strlen($qso->station_gridsquare); ?>><?php echo $qso->station_gridsquare; ?><?php } else { ?><MY_GRIDSQUARE:<?php echo strlen($qso->station_gridsquare); ?>><?php echo $qso->station_gridsquare; ?><?php } ?><?php if($qso->station_iota) { ?><MY_IOTA:<?php echo strlen($qso->station_iota); ?>><?php echo $qso->station_iota; ?><?php } ?><?php if($qso->station_sota) { ?><MY_SOTA_REF:<?php echo strlen($qso->station_sota); ?>><?php echo $qso->station_sota; ?><?php } ?><?php if($qso->station_cq) { ?><MY_CQ_ZONE:<?php echo strlen($qso->station_cq); ?>><?php echo $qso->station_cq; ?><?php } ?><?php if($qso->station_itu) { ?><MY_ITU_ZONE:<?php echo strlen($qso->station_itu); ?>><?php echo $qso->station_itu; ?><?php } ?><?php if($qso->station_cnty) { ?><MY_CNTY:<?php echo strlen($qso->station_cnty); ?>><?php echo $qso->station_cnty; ?><?php } ?><?php if($qso->state) { ?><MY_STATE:<?php echo strlen($qso->state); ?>><?php echo $qso->state; ?><?php } ?><?php if($qso->COL_STX !="") { ?><stx:<?php echo strlen($qso->COL_STX);?>><?php echo $qso->COL_STX; ?><?php } if($qso->COL_STX_STRING !="") { ?><stx_string:<?php echo strlen($qso->COL_STX_STRING);?>><?php echo $qso->COL_STX_STRING; ?><?php } if($qso->COL_SRX !="") { ?><srx:<?php echo strlen($qso->COL_SRX);?>><?php echo $qso->COL_SRX; ?><?php } if($qso->COL_SRX_STRING !="") { ?><srx_string:<?php echo strlen($qso->COL_SRX_STRING);?>><?php echo $qso->COL_SRX_STRING; ?><?php } if($qso->COL_TX_PWR !="") { ?><TX_PWR:<?php echo strlen($qso->COL_TX_PWR);?>><?php echo $qso->COL_TX_PWR; ?><?php } if($qso->COL_COMMENT !="") { ?><COMMENT:<?php echo strlen($qso->COL_COMMENT);?>><?php echo $qso->COL_COMMENT; ?><?php } ?><eor>
-<?php } ?>
+<?php
+$CI =& get_instance();
+$CI->load->library('adifhelper');
+
+foreach ($qsos->result() as $qso) {
+    echo $CI->adifhelper->getAdifLine($qso);
+}
+

From 2754e05dbe85d50002f0a5fb8479fa20f7dc4f67 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Mon, 16 Nov 2020 19:23:59 +0100
Subject: [PATCH 02/15] Uppercased every tag. Added MY_SIG and MY_SIG_INFO.
 This was not included, as this was in a PR at the time.

---
 application/libraries/AdifHelper.php | 60 +++++++++++++++-------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php
index be9ee192..aa8dd45e 100644
--- a/application/libraries/AdifHelper.php
+++ b/application/libraries/AdifHelper.php
@@ -4,72 +4,72 @@ class AdifHelper {
 
     public function getAdifLine($qso) {
         $line = "";
-        $line .= $this->getAdifFieldLine("call", $qso->COL_CALL);
-        $line .= $this->getAdifFieldLine("band", $qso->COL_BAND);
-        $line .= $this->getAdifFieldLine("mode", $qso->COL_MODE);
+        $line .= $this->getAdifFieldLine("CALL", $qso->COL_CALL);
+        $line .= $this->getAdifFieldLine("BAND", $qso->COL_BAND);
+        $line .= $this->getAdifFieldLine("MODE", $qso->COL_MODE);
 
         if ($qso->COL_SUBMODE) {
-            $line .= $this->getAdifFieldLine("submode", $qso->COL_SUBMODE);
+            $line .= $this->getAdifFieldLine("SUBMODE", $qso->COL_SUBMODE);
         }
 
         if ($qso->COL_FREQ != 0) {
             $freq_in_mhz = $qso->COL_FREQ / 1000000;
-            $line .= $this->getAdifFieldLine("freq", $freq_in_mhz);
+            $line .= $this->getAdifFieldLine("FREQ", $freq_in_mhz);
         }
 
         if ($qso->COL_FREQ_RX != 0) {
             $freq_rx_in_mhz = $qso->COL_FREQ_RX / 1000000;
-            $line .= $this->getAdifFieldLine("freq_rx", $freq_rx_in_mhz);
+            $line .= $this->getAdifFieldLine("FREQ_RX", $freq_rx_in_mhz);
         }
 
         if ($qso->COL_BAND_RX) {
-            $line .= $this->getAdifFieldLine("band_rx", $qso->COL_BAND_RX);
+            $line .= $this->getAdifFieldLine("BAND_RX", $qso->COL_BAND_RX);
         }
 
         $date_on = strtotime($qso->COL_TIME_ON);
         $new_date = date('Ymd', $date_on);
-        $line .= $this->getAdifFieldLine("qso_date", $new_date);
+        $line .= $this->getAdifFieldLine("QSO_DATE", $new_date);
 
         $time_on = strtotime($qso->COL_TIME_ON);
         $new_on = date('His', $time_on);
-        $line .= $this->getAdifFieldLine("time_on", $new_on);
+        $line .= $this->getAdifFieldLine("TIME_ON", $new_on);
 
         $time_off = strtotime($qso->COL_TIME_OFF);
         $new_off = date('His', $time_off);
-        $line .= $this->getAdifFieldLine("time_off", $new_off);
+        $line .= $this->getAdifFieldLine("TIME_OFF", $new_off);
 
-        $line .= $this->getAdifFieldLine("rst_rcvd", $qso->COL_RST_RCVD);
+        $line .= $this->getAdifFieldLine("RST_RCVD", $qso->COL_RST_RCVD);
 
-        $line .= $this->getAdifFieldLine("rst_sent", $qso->COL_RST_SENT);
+        $line .= $this->getAdifFieldLine("RST_SENT", $qso->COL_RST_SENT);
 
-        $line .= $this->getAdifFieldLine("qsl_rcvd", $qso->COL_QSL_RCVD);
+        $line .= $this->getAdifFieldLine("QSL_RCVD", $qso->COL_QSL_RCVD);
 
-        $line .= $this->getAdifFieldLine("qsl_sent", $qso->COL_QSL_SENT);
+        $line .= $this->getAdifFieldLine("QSL_SENT", $qso->COL_QSL_SENT);
 
-        $line .= $this->getAdifFieldLine("country", $qso->COL_COUNTRY);
+        $line .= $this->getAdifFieldLine("COUNTRY", $qso->COL_COUNTRY);
 
         if ($qso->COL_VUCC_GRIDS != "") {
-            $line .= $this->getAdifFieldLine("vucc_grids", $qso->COL_VUCC_GRIDS);
+            $line .= $this->getAdifFieldLine("VUCC_GRIDS", $qso->COL_VUCC_GRIDS);
         }
         if ($qso->COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") {
-            $line .= $this->getAdifFieldLine("gridsquare", $qso->COL_GRIDSQUARE);
+            $line .= $this->getAdifFieldLine("GRIDSQUARE", $qso->COL_GRIDSQUARE);
         }
         if ($qso->COL_SAT_NAME) {
             if ($qso->COL_SAT_MODE != 0 || $qso->COL_SAT_MODE !="") {
-                $line .= $this->getAdifFieldLine("sat_mode", $qso->COL_SAT_MODE);
-                $line .= $this->getAdifFieldLine("sat_name", $qso->COL_SAT_NAME);
+                $line .= $this->getAdifFieldLine("SAT_MODE", $qso->COL_SAT_MODE);
+                $line .= $this->getAdifFieldLine("SAT_NAME", $qso->COL_SAT_NAME);
             }
         }
 
-        $line .= $this->getAdifFieldLine("prop_mode", $qso->COL_PROP_MODE);
+        $line .= $this->getAdifFieldLine("PROP_MODE", $qso->COL_PROP_MODE);
 
-        $line .= $this->getAdifFieldLine("name", $qso->COL_NAME);
+        $line .= $this->getAdifFieldLine("NAME", $qso->COL_NAME);
 
-        $line .= $this->getAdifFieldLine("state", $qso->COL_STATE);
+        $line .= $this->getAdifFieldLine("STATE", $qso->COL_STATE);
 
-        $line .= $this->getAdifFieldLine("sota_ref", $qso->COL_SOTA_REF);
+        $line .= $this->getAdifFieldLine("SOTA_REF", $qso->COL_SOTA_REF);
 
-        $line .= $this->getAdifFieldLine("operator", $qso->COL_OPERATOR);
+        $line .= $this->getAdifFieldLine("OPERATOR", $qso->COL_OPERATOR);
 
         $line .= $this->getAdifFieldLine("STATION_CALLSIGN", $qso->station_callsign);
 
@@ -98,18 +98,22 @@ class AdifHelper {
 
         $line .= $this->getAdifFieldLine("MY_STATE", $qso->COL_MY_STATE);
 
-        $line .= $this->getAdifFieldLine("stx", $qso->COL_STX);
+        $line .= $this->getAdifFieldLine("STX", $qso->COL_STX);
 
-        $line .= $this->getAdifFieldLine("stx_string", $qso->COL_STX_STRING);
+        $line .= $this->getAdifFieldLine("STX_STRING", $qso->COL_STX_STRING);
 
-        $line .= $this->getAdifFieldLine("srx", $qso->COL_SRX);
+        $line .= $this->getAdifFieldLine("SRX", $qso->COL_SRX);
 
-        $line .= $this->getAdifFieldLine("srx_string", $qso->COL_SRX_STRING);
+        $line .= $this->getAdifFieldLine("SRX_STRING", $qso->COL_SRX_STRING);
 
         $line .= $this->getAdifFieldLine("TX_PWR", $qso->COL_TX_PWR);
 
         $line .= $this->getAdifFieldLine("COMMENT", $qso->COL_COMMENT);
 
+        $line .= $this->getAdifFieldLine("MY_SIG", $qso->station_sig);
+
+        $line .= $this->getAdifFieldLine("MY_SIG_INFO", $qso->station_sig_info);
+
         $line .= "<eor>\r\n";
 
         return $line;

From 2b5a424a78c8f03d2ec064bb27497329fafd9fd5 Mon Sep 17 00:00:00 2001
From: Adam <adam@ofadam.com>
Date: Mon, 16 Nov 2020 18:46:18 -0600
Subject: [PATCH 03/15] Display submode if available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This looks for submode first on the "MODE:" display fields – matching how the logbook itself functions.
---
 application/controllers/Dashboard.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 2d868c50..9cf3a7c2 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -101,9 +101,9 @@ class Dashboard extends CI_Controller {
 				}
 
 				if($row->COL_SAT_NAME != null) { 
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				} else {
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				}
 
 				$count++;
@@ -121,7 +121,7 @@ class Dashboard extends CI_Controller {
 					if($count != 1) {
 					echo ",";
 						}
-					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
 					$count++;
 				}
 			}
@@ -146,7 +146,7 @@ class Dashboard extends CI_Controller {
 			//print_r($row);
 			if($row->COL_GRIDSQUARE != null) {
 				$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
-				echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},";
+				echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},";
 			} else {
 				$query = $this->db->query('
 					SELECT *
@@ -157,7 +157,7 @@ class Dashboard extends CI_Controller {
 				');
 				
 				foreach ($query->result() as $dxcc) {
-					echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},";
+					echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},";
 				}
 			}
 			

From 6128c2a3ef8813932e20a4bf275634cea779c2cf Mon Sep 17 00:00:00 2001
From: Adam <adam@ofadam.com>
Date: Mon, 16 Nov 2020 18:50:40 -0600
Subject: [PATCH 04/15] Display submode if available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This looks for submode first on the "MODE:" display fields – matching how the logbook itself functions.
---
 application/controllers/Logbook.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index d7a78199..4bc95d0f 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -365,9 +365,9 @@ class Logbook extends CI_Controller {
 				}
 
 				if($row->COL_SAT_NAME != null) {
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				} else {
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				}
 
 				$count++;
@@ -385,7 +385,7 @@ class Logbook extends CI_Controller {
 					if($count != 1) {
 					echo ",";
 						}
-					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
 					$count++;
 				}
 			}
@@ -697,4 +697,4 @@ class Logbook extends CI_Controller {
     }
 
 
-}
\ No newline at end of file
+}

From e7d0d00e89e49204a86dd34a0a7bf958724a6e03 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Tue, 17 Nov 2020 17:35:48 +0000
Subject: [PATCH 05/15] Fixed issue with ADIF export when exporting all the log

---
 application/controllers/Adif.php          | 7 ++++---
 application/views/adif/data/exportall.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php
index 6b63d65e..600654fd 100644
--- a/application/controllers/Adif.php
+++ b/application/controllers/Adif.php
@@ -76,7 +76,6 @@ class adif extends CI_Controller {
 	}
 
 	public function export_custom() {
-
 		// Set memory limit to unlimited to allow heavy usage
 		ini_set('memory_limit', '-1');
 
@@ -87,12 +86,14 @@ class adif extends CI_Controller {
             $exportLotw = true;
         } else {
             $exportLotw = false;
-        }
-
+		}
+		
 		$data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to'), $exportLotw);
 
+
 		$this->load->view('adif/data/exportall', $data);
 
+
 		if ($this->input->post('markLotw') == 1) {
             foreach ($data['qsos']->result() as $qso)
             {
diff --git a/application/views/adif/data/exportall.php b/application/views/adif/data/exportall.php
index 64aaa173..dbe33c27 100644
--- a/application/views/adif/data/exportall.php
+++ b/application/views/adif/data/exportall.php
@@ -9,7 +9,7 @@
 
 <?php
 $CI =& get_instance();
-$CI->load->library('adifhelper');
+$CI->load->library('AdifHelper');
 
 foreach ($qsos->result() as $qso) {
     echo $CI->adifhelper->getAdifLine($qso);

From 388bfb848a9cf812aa0e9f708081fa138e9d067c Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Tue, 17 Nov 2020 17:40:55 +0000
Subject: [PATCH 06/15] Revert "Merge pull request #706 from ofadam/patch-1"

This reverts commit 9647fa917ece060dd6a65d0c79e3ae21e441bc57, reversing
changes made to e7d0d00e89e49204a86dd34a0a7bf958724a6e03.
---
 application/controllers/Dashboard.php | 10 +++++-----
 application/controllers/Logbook.php   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 9cf3a7c2..2d868c50 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -101,9 +101,9 @@ class Dashboard extends CI_Controller {
 				}
 
 				if($row->COL_SAT_NAME != null) { 
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				} else {
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				}
 
 				$count++;
@@ -121,7 +121,7 @@ class Dashboard extends CI_Controller {
 					if($count != 1) {
 					echo ",";
 						}
-					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
+					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
 					$count++;
 				}
 			}
@@ -146,7 +146,7 @@ class Dashboard extends CI_Controller {
 			//print_r($row);
 			if($row->COL_GRIDSQUARE != null) {
 				$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
-				echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},";
+				echo "{\"point\":new GLatLng(".$stn_loc[0].",".$stn_loc[1]."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},";
 			} else {
 				$query = $this->db->query('
 					SELECT *
@@ -157,7 +157,7 @@ class Dashboard extends CI_Controller {
 				');
 				
 				foreach ($query->result() as $dxcc) {
-					echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"},";
+					echo "{\"point\":new GLatLng(".$dxcc->lat.",".$dxcc->long."), \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"},";
 				}
 			}
 			
diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 4bc95d0f..d7a78199 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -365,9 +365,9 @@ class Logbook extends CI_Controller {
 				}
 
 				if($row->COL_SAT_NAME != null) {
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				} else {
-						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
+						echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
 				}
 
 				$count++;
@@ -385,7 +385,7 @@ class Logbook extends CI_Controller {
 					if($count != 1) {
 					echo ",";
 						}
-					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".->COL_SUBMODE==null?->COL_MODE:->COL_SUBMODE."\",\"label\":\"".$row->COL_CALL."\"}";
+					echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
 					$count++;
 				}
 			}
@@ -697,4 +697,4 @@ class Logbook extends CI_Controller {
     }
 
 
-}
+}
\ No newline at end of file

From 58a552ce23848dd737d7be2e5299415051ffb29a Mon Sep 17 00:00:00 2001
From: Daniel Clerc <mail@clerc.eu>
Date: Mon, 16 Nov 2020 21:21:59 +0100
Subject: [PATCH 07/15] add SIG and SIG_INFO to view_log

---
 application/views/view_log/qso.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 7a98d489..7719f6e2 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -192,6 +192,20 @@
                     </tr>
                     <?php } ?>
 
+                    <?php if($row->COL_SIG != null) { ?>
+                    <tr>
+                        <td>Sig:</td>
+                        <td><?php echo $row->COL_SIG; ?></td>
+                    </tr>
+                    <?php } ?>
+
+                    <?php if($row->COL_SIG_INFO != null) { ?>
+                    <tr>
+                        <td>Sig Info:</td>
+                        <td><?php echo $row->COL_SIG_INFO; ?></td>
+                    </tr>
+                    <?php } ?>
+
                     <?php if($row->COL_DARC_DOK != null) { ?>
                     <tr>
                         <td>DOK:</td>

From f8035613763568ffa46ce7fb4a6b2f7d7a6e858a Mon Sep 17 00:00:00 2001
From: Daniel Clerc <mail@clerc.eu>
Date: Mon, 16 Nov 2020 22:08:32 +0100
Subject: [PATCH 08/15] Add SIG and SIG_INFO to logbook model and qso view

---
 application/models/Logbook_model.php |  2 ++
 application/views/qso/index.php      | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index b5bd539b..4eaa7800 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -122,6 +122,8 @@ class Logbook_model extends CI_Model {
             'COL_CQZ' => $cqz,
             'COL_STATE' => trim($this->input->post('usa_state')),
             'COL_SOTA_REF' => trim($this->input->post('sota_ref')),
+            'COL_SIG' => trim($this->input->post('sig')),
+            'COL_SIG_INFO' => trim($this->input->post('sig_info')),
             'COL_DARC_DOK' => trim($this->input->post('darc_dok')),
 	    'COL_NOTES' => $this->input->post('notes'),
     );
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 1f02128a..312ba52f 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -328,6 +328,18 @@
               <small id="sotaRefHelp" class="form-text text-muted">For example: GM/NS-001</small>
             </div>
 
+            <div class="form-group">
+              <label for="sig">Sig</label>
+              <input class="form-control" id="sig" type="text" name="sig" value="" />
+              <small id="sigHelp" class="form-text text-muted">For example: WWFF or POTA</small>
+            </div>
+
+            <div class="form-group">
+              <label for="sig_info">Sig Info</label>
+              <input class="form-control" id="sig_info" type="text" name="sig_info" value="" />
+              <small id="sigInfoHelp" class="form-text text-muted">For example: DLFF-0029</small>
+            </div>
+
             <div class="form-group">
               <label for="sota_ref">DOK</label>
               <input class="form-control" id="darc_dok" type="text" name="darc_dok" value="" />

From 8d85ab230a7066b4367a7bdc2e854578d1400734 Mon Sep 17 00:00:00 2001
From: Daniel Clerc <mail@clerc.eu>
Date: Mon, 16 Nov 2020 22:14:10 +0100
Subject: [PATCH 09/15] Add SIG and SIG_INFO to edit qso views

---
 application/views/qso/edit.php      | 12 +++++++++++-
 application/views/qso/edit_ajax.php | 10 ++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php
index 5f881db7..42179dcd 100755
--- a/application/views/qso/edit.php
+++ b/application/views/qso/edit.php
@@ -334,7 +334,17 @@
 	            <div class="form-group">
 	            	<label for="sota_ref">SOTA</label>
 	                <input type="text" class="form-control" id="sota_ref" name="sota_ref" value="<?php echo $qso->COL_SOTA_REF; ?>">
-	            </div>
+				</div>
+				
+				<div class="form-group">
+                    <label for="sig">Sig</label>
+                    <input type="text" class="form-control" id="sig" name="sig" value="<?php echo $qso->COL_SIG; ?>">
+                </div>
+
+                <div class="form-group">
+                    <label for="sig_info">Sig Info</label>
+                    <input type="text" class="form-control" id="sig_info" name="sig_info" value="<?php echo $qso->COL_SIG_INFO; ?>">
+				</div>
 
 	            <div class="form-group">
 	            	<label for="darc_dok">DOK</label>
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index e0b2add0..ab7e1227 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -382,6 +382,16 @@
                                     <input type="text" class="form-control" id="sota_ref" name="sota_ref" value="<?php echo $qso->COL_SOTA_REF; ?>">
                                 </div>
 
+                                <div class="form-group">
+                                    <label for="sig">Sig</label>
+                                    <input type="text" class="form-control" id="sig" name="sig" value="<?php echo $qso->COL_SIG; ?>">
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="sig_info">Sig Info</label>
+                                    <input type="text" class="form-control" id="sig_info" name="sig_info" value="<?php echo $qso->COL_SIG_INFO; ?>">
+                                </div>
+
                                 <div class="form-group">
                                     <label for="darc_dok">DOK</label>
                                     <input type="text" class="form-control" id="darc_dok" name="darc_dok" value="<?php echo $qso->COL_DARC_DOK; ?>">

From 0b3af61fb12c28c858b7f1f16e38b3a8484dcdba Mon Sep 17 00:00:00 2001
From: Daniel Clerc <mail@clerc.eu>
Date: Mon, 16 Nov 2020 22:19:10 +0100
Subject: [PATCH 10/15] Add SIG and SIG_INFO to adif export

---
 application/views/adif/data/exportall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/adif/data/exportall.php b/application/views/adif/data/exportall.php
index dbe33c27..26991708 100644
--- a/application/views/adif/data/exportall.php
+++ b/application/views/adif/data/exportall.php
@@ -13,4 +13,4 @@ $CI->load->library('AdifHelper');
 
 foreach ($qsos->result() as $qso) {
     echo $CI->adifhelper->getAdifLine($qso);
-}
\ No newline at end of file
+}

From 98f4d45c605aeb063d98d772356d80f514716336 Mon Sep 17 00:00:00 2001
From: Daniel Clerc <mail@clerc.eu>
Date: Tue, 17 Nov 2020 21:39:05 +0100
Subject: [PATCH 11/15] Add SIG and SIG_INFO to AdifHelper

---
 application/libraries/AdifHelper.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php
index aa8dd45e..2489b9ed 100644
--- a/application/libraries/AdifHelper.php
+++ b/application/libraries/AdifHelper.php
@@ -114,6 +114,10 @@ class AdifHelper {
 
         $line .= $this->getAdifFieldLine("MY_SIG_INFO", $qso->station_sig_info);
 
+        $line .= $this->getAdifFieldLine("SIG", $qso->COL_SIG);
+
+        $line .= $this->getAdifFieldLine("SIG_INFO", $qso->COL_SIG_INFO);
+
         $line .= "<eor>\r\n";
 
         return $line;

From da342674f5435b4190993e453abe1c6a1fbd0072 Mon Sep 17 00:00:00 2001
From: Daniel Clerc <mail@clerc.eu>
Date: Tue, 17 Nov 2020 21:51:35 +0100
Subject: [PATCH 12/15] use local js and css in qso/edit and edit_ajax

---
 application/views/qso/edit.php      | 11 +++++------
 application/views/qso/edit_ajax.php |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php
index 5f881db7..91deb54a 100755
--- a/application/views/qso/edit.php
+++ b/application/views/qso/edit.php
@@ -7,15 +7,14 @@
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>">
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
 
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />
-
+    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
+   
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
 
-  <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js"></script>
+    <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
+    <script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
+    <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
     <script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
-
 	</head>
 
 	<body class="container-fluid qso-edit-box">
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index e0b2add0..d5e7f872 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -7,13 +7,13 @@
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>">
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
 
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />
-
+    <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
+   
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
 
     <script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js"></script>
+    <script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
+    <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
     <script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
 
 </head>

From 3a3b53bc5841337c116336597a4f47d39e20c93a Mon Sep 17 00:00:00 2001
From: Daniel Clerc <mail@clerc.eu>
Date: Tue, 17 Nov 2020 22:29:06 +0100
Subject: [PATCH 13/15] Add SIG and SIG_INFO to edit logbook model

---
 application/models/Logbook_model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 4eaa7800..ac044936 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -603,6 +603,8 @@ class Logbook_model extends CI_Model {
        'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_recv'),
        'COL_IOTA' => $this->input->post('iota_ref'),
        'COL_SOTA_REF' => $this->input->post('sota_ref'),
+       'COL_SIG' => $this->input->post('sig'),
+       'COL_SIG_INFO' => $this->input->post('sig_info'),
        'COL_DARC_DOK' => $this->input->post('darc_dok'),
        'COL_QTH' => $this->input->post('qth'),
        'COL_PROP_MODE' => $this->input->post('prop_mode'),

From e149d34ba18040c1b09620374ff77ba1143a91d2 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Wed, 18 Nov 2020 11:50:15 +0100
Subject: [PATCH 14/15] [QRZ Logbook] option for realtime logging added

---
 application/config/migration.php              |  2 +-
 .../056_add_qrz_upload_realtime_option.php    | 20 +++++++++++++++++
 application/models/Logbook_model.php          | 22 +++++++++++--------
 application/models/Stations.php               |  2 ++
 application/views/station_profile/create.php  | 17 ++++++++++----
 application/views/station_profile/edit.php    | 11 +++++++++-
 6 files changed, 59 insertions(+), 15 deletions(-)
 create mode 100644 application/migrations/056_add_qrz_upload_realtime_option.php

diff --git a/application/config/migration.php b/application/config/migration.php
index a9dbaec0..95bc2923 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 55;
+$config['migration_version'] = 56;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/migrations/056_add_qrz_upload_realtime_option.php b/application/migrations/056_add_qrz_upload_realtime_option.php
new file mode 100644
index 00000000..dd510fa4
--- /dev/null
+++ b/application/migrations/056_add_qrz_upload_realtime_option.php
@@ -0,0 +1,20 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Migration_add_qrz_upload_realtime_option extends CI_Migration {
+
+    public function up()
+    {
+        $fields = array(
+            'qrzrealtime bool DEFAULT TRUE',
+        );
+
+        $this->dbforge->add_column('station_profile', $fields);
+    }
+
+    public function down()
+    {
+        $this->dbforge->drop_column('station_profile', 'qrzrealtime');
+    }
+}
\ No newline at end of file
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index b5bd539b..f2f13802 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -336,15 +336,19 @@ class Logbook_model extends CI_Model {
       $data['COL_RX_PWR'] = str_replace("W", "", $data['COL_RX_PWR']);
     }
 
+    $result = $this->exists_qrz_api_key($data['station_id']);
+    
     // Push qso to qrz if apikey is set
-    if ($apikey = $this->exists_qrz_api_key($data['station_id'])) {
-        $adif = $this->create_adif_from_data($data);
-        $result = $this->push_qso_to_qrz($apikey, $adif);
-        IF ($result['status'] == 'OK') {
-            $data['COL_QRZCOM_QSO_UPLOAD_STATUS'] = 'Y';
-            $data['COL_QRZCOM_QSO_UPLOAD_DATE'] = date("Y-m-d H:i:s", strtotime("now"));
+      if ($result) {
+        if ($result->qrzrealtime == 1) {
+            $adif = $this->create_adif_from_data($data);
+            $result = $this->push_qso_to_qrz($result->qrzapikey, $adif);
+            IF ($result['status'] == 'OK') {
+                $data['COL_QRZCOM_QSO_UPLOAD_STATUS'] = 'Y';
+                $data['COL_QRZCOM_QSO_UPLOAD_DATE'] = date("Y-m-d H:i:s", strtotime("now"));
+            }
         }
-    }
+      }
 
       // Add QSO to database
       $this->db->insert($this->config->item('table_name'), $data);
@@ -354,7 +358,7 @@ class Logbook_model extends CI_Model {
    * Function checks if a QRZ API Key exists in the table with the given station id
   */
   function exists_qrz_api_key($station_id) {
-      $sql = 'select qrzapikey from station_profile
+      $sql = 'select qrzapikey, qrzrealtime from station_profile
             where station_id = ' . $station_id;
 
       $query = $this->db->query($sql);
@@ -362,7 +366,7 @@ class Logbook_model extends CI_Model {
       $result = $query->row();
 
       if ($result) {
-          return $result->qrzapikey;
+          return $result;
       }
       else {
           return false;
diff --git a/application/models/Stations.php b/application/models/Stations.php
index 47534858..d7945260 100644
--- a/application/models/Stations.php
+++ b/application/models/Stations.php
@@ -53,6 +53,7 @@ class Stations extends CI_Model {
 			'state' =>  xss_clean($this->input->post('station_state', true)),
             'eqslqthnickname' => xss_clean($this->input->post('eqslnickname', true)),
             'qrzapikey' => xss_clean($this->input->post('qrzapikey', true)),
+            'qrzrealtime' => xss_clean($this->input->post('qrzrealtime', true)),
 		);
 
 		// Insert Records
@@ -77,6 +78,7 @@ class Stations extends CI_Model {
 			'state' => xss_clean($this->input->post('station_state', true)),
 			'eqslqthnickname' => xss_clean($this->input->post('eqslnickname', true)),
             'qrzapikey' => xss_clean($this->input->post('qrzapikey', true)),
+            'qrzrealtime' => xss_clean($this->input->post('qrzrealtime', true)),
 		);
 
 		$this->db->where('station_id', xss_clean($this->input->post('station_id', true)));
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 0f05e4a4..d3652fab 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -200,10 +200,19 @@
                 <small id="eqslhelp" class="form-text text-muted">eQSL QTH Nickname.</small>
             </div>
 
-            <div class="form-group">
-                <label for="qrzApiKey">QRZ.com Logbook API Key</label>
-                <input type="text" class="form-control" name="qrzapikey" id="qrzApiKey" aria-describedby="qrzApiKeyHelp">
-                <small id="qrzApiKeyHelp" class="form-text text-muted">Find your API key on <a href="https://logbook.qrz.com/logbook" target="_blank">QRZ.com's settings page</a></small>
+            <div class="form-row">
+                <div class="form-group col-sm-6">
+                    <label for="qrzApiKey">QRZ.com Logbook API Key</label>
+                    <input type="text" class="form-control" name="qrzapikey" id="qrzApiKey" aria-describedby="qrzApiKeyHelp">
+                    <small id="qrzApiKeyHelp" class="form-text text-muted">Find your API key on <a href="https://logbook.qrz.com/logbook" target="_blank">QRZ.com's settings page</a></small>
+                </div>
+                <div class="form-group col-sm-6">
+                    <label for="qrzrealtime">QRZ.com Logbook Realtime Upload</label>
+                    <select class="custom-select" id="qrzrealtime" name="qrzrealtime">
+                        <option value="1" selected>True</option>
+                        <option value="0">False</option>
+                    </select>
+                </div>
             </div>
 
 			<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> Create Station Profile</button>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 5be02219..2be3a8e3 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -222,11 +222,20 @@
 		    <small id="eqslhelp" class="form-text text-muted">eQSL QTH Nickname.</small>
 		  </div>
 
-            <div class="form-group">
+            <div class="form-row">
+            <div class="form-group col-sm-6">
                 <label for="qrzApiKey">QRZ.com Logbook API Key</label>
                 <input type="text" class="form-control" name="qrzapikey" id="qrzApiKey" aria-describedby="qrzApiKeyHelp" value="<?php if(set_value('qrzapikey') != "") { echo set_value('qrzapikey'); } else { echo $my_station_profile->qrzapikey; } ?>">
                 <small id="qrzApiKeyHelp" class="form-text text-muted">Find your API key on <a href="https://logbook.qrz.com/logbook" target="_blank">QRZ.com's settings page</a></small>
             </div>
+                <div class="form-group col-sm-6">
+                    <label for="qrzrealtime">QRZ.com Logbook Realtime Upload</label>
+                    <select class="custom-select" id="qrzrealtime" name="qrzrealtime">
+                        <option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo " selected =\"selected\""; } ?>>True</option>
+                        <option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo " selected =\"selected\""; } ?>>False</option>
+                    </select>
+                </div>
+            </div>
 
 			<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> Update Station Profile</button>
 

From ea91773090e946b394b2d623cff1aee423e6a5a8 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 18 Nov 2020 14:19:21 +0000
Subject: [PATCH 15/15] Changed Dropdowns to Yes/No

---
 application/views/station_profile/create.php | 4 ++--
 application/views/station_profile/edit.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index d3652fab..6edb2359 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -209,8 +209,8 @@
                 <div class="form-group col-sm-6">
                     <label for="qrzrealtime">QRZ.com Logbook Realtime Upload</label>
                     <select class="custom-select" id="qrzrealtime" name="qrzrealtime">
-                        <option value="1" selected>True</option>
-                        <option value="0">False</option>
+                        <option value="1" selected>Yes</option>
+                        <option value="0">No</option>
                     </select>
                 </div>
             </div>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 2be3a8e3..f7831e8a 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -231,8 +231,8 @@
                 <div class="form-group col-sm-6">
                     <label for="qrzrealtime">QRZ.com Logbook Realtime Upload</label>
                     <select class="custom-select" id="qrzrealtime" name="qrzrealtime">
-                        <option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo " selected =\"selected\""; } ?>>True</option>
-                        <option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo " selected =\"selected\""; } ?>>False</option>
+                        <option value="1" <?php if ($my_station_profile->qrzrealtime == 1) { echo " selected =\"selected\""; } ?>>Yes</option>
+                        <option value="0" <?php if ($my_station_profile->qrzrealtime == 0) { echo " selected =\"selected\""; } ?>>No</option>
                     </select>
                 </div>
             </div>