From 70831269e5252b790e1858613b9dfa59eea9ea34 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 8 Apr 2020 17:04:01 +0100
Subject: [PATCH] Added MY_STATE to the ADIF export

---
 application/views/adif/data/exportall.php | 2 +-
 application/views/adif/data/exportsat.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/adif/data/exportall.php b/application/views/adif/data/exportall.php
index 6843db77..ace3b21a 100644
--- a/application/views/adif/data/exportall.php
+++ b/application/views/adif/data/exportall.php
@@ -8,6 +8,6 @@
 <EOH>
 
 <?php foreach ($qsos->result() as $qso) { //print_r($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_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><freq:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?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_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 } ?><eor>
+<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_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><freq:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?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_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 } ?><eor>
 
 <?php } ?>
\ No newline at end of file
diff --git a/application/views/adif/data/exportsat.php b/application/views/adif/data/exportsat.php
index 6843db77..ace3b21a 100644
--- a/application/views/adif/data/exportsat.php
+++ b/application/views/adif/data/exportsat.php
@@ -8,6 +8,6 @@
 <EOH>
 
 <?php foreach ($qsos->result() as $qso) { //print_r($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_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><freq:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?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_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 } ?><eor>
+<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_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><freq:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?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_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 } ?><eor>
 
 <?php } ?>
\ No newline at end of file