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] 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;