diff --git a/application/views/lotw_views/adif_views/adif_export.php b/application/views/lotw_views/adif_views/adif_export.php index 3198070c9..96f45fd6f 100644 --- a/application/views/lotw_views/adif_views/adif_export.php +++ b/application/views/lotw_views/adif_views/adif_export.php @@ -4,92 +4,85 @@ $clean_cert = trim($lotw_cert_info->cert); $cert1 = str_replace("-----BEGIN CERTIFICATE-----", "", $clean_cert); $cert2 = str_replace("-----END CERTIFICATE-----", "", $cert1); ?> -TQSL V2.8.1 Lib: V2.6 Config: V11.34 AllowDupes: false +TQSL V2.8.2 Lib: V2.6 Config: V11.34 AllowDupes: false tCERT 1 > - + tSTATION 1 1 -callsign); ?>>callsign; ?> - -cert_dxcc_id); ?>>cert_dxcc_id; ?> - -station_gridsquare) { ?>station_gridsquare); ?>>station_gridsquare; } ?> - -station_itu) { ?>station_itu); ?>>station_itu; } ?> - -station_cq) { ?>station_cq); ?>>station_cq; } ?> - -station_iota) { ?>station_iota); ?>>station_iota; } ?> - cert_dxcc_id) { +print "callsign).">".$lotw_cert_info->callsign."\n"; +print "cert_dxcc_id).">".$lotw_cert_info->cert_dxcc_id."\n"; +if($station_profile->station_gridsquare) { + print "station_gridsquare).">".$station_profile->station_gridsquare."\n"; +} +if($station_profile->station_itu) { + print "station_itu).">".$station_profile->station_itu."\n"; +} +if($station_profile->station_cq) { + print "station_cq).">".$station_profile->station_cq."\n"; +} +if($station_profile->station_iota) { + print "station_iota).">".$station_profile->station_iota."\n"; +} + +switch ($lotw_cert_info->cert_dxcc_id) { case 6: // Alaska case 110: // Hawaii case 291: // Cont US - if($station_profile->state != "") { ?> -state); ?>>state; ?> - -station_cnty != "") { ?> -station_cnty); ?>>station_cnty; ?> - -state != "") { + print "state).">".$station_profile->state."\n"; + } + if($station_profile->station_cnty != "") { + print "station_cnty).">".$station_profile->station_cnty."\n"; + } break; case 1: // Canada - if($station_profile->state != "") { ?> -lotw_ca_province_map($station_profile->state)); ?>>lotw_ca_province_map($station_profile->state); ?> - - state != "") { + print "lotw_ca_province_map($station_profile->state)).">".$CI->lotw_ca_province_map($station_profile->state)."\n"; + } break; case 15: // Asiatic Russia case 54: // European Russia case 61: // FJL case 125: // Juan Fernandez case 151: // Malyj Vysotskij - if($station_profile->state != "") { ?> -lotw_ru_oblast_map($station_profile->state)); ?>>lotw_ru_oblast_map($station_profile->state); ?> - - state != "") { + print "lotw_ru_oblast_map($station_profile->state)).">".$CI->lotw_ru_oblast_map($station_profile->state)."\n"; + } break; case 318: // China - if($station_profile->state != "") { ?> -state); ?>>state; ?> - - state != "") { + print "state).">".$station_profile->state."\n"; + } break; case 150: // Australia - if($station_profile->state != "") { ?> -state); ?>>state; ?> - - state != "") { + print "state).">".$station_profile->state."\n"; + } break; case 339: // Japan - if($station_profile->state != "") { ?> -state); ?>>state; ?> - -station_cnty != "") { ?> -station_cnty); ?>>station_cnty; ?> - -state != "") { + print "state).">".$station_profile->state."\n"; + } + if($station_profile->station_cnty != "") { + print "station_cnty).">".$station_profile->station_cnty."\n"; + } break; case 5: // Aland Island case 224: // Finland - if($station_profile->state != "") { ?> -state); ?>>state; ?> - - state != "") { + print "state).">".$station_profile->state."\n"; + } break; } ?> - - + result() as $qso) { unset($freq_in_mhz); @@ -97,30 +90,33 @@ $cert2 = str_replace("-----END CERTIFICATE-----", "", $cert1); ?> tCONTACT 1 -COL_CALL); ?>>COL_CALL; ?> - -COL_BAND); ?>>COL_BAND); ?> - -mode_map($qso->COL_MODE, $qso->COL_SUBMODE)); ?>>mode_map(($qso->COL_MODE == null ? '' : strtoupper($qso->COL_MODE)), ($qso->COL_SUBMODE == null ? '' : strtoupper($qso->COL_SUBMODE)))); ?> - -COL_FREQ != "" && $qso->COL_FREQ != "0") { $freq_in_mhz = $qso->COL_FREQ / 1000000; ?>> - -COL_FREQ_RX != "" && $qso->COL_FREQ_RX != "0") { $freq_in_mhz_rx = $qso->COL_FREQ_RX / 1000000; ?>> - -COL_PROP_MODE) { ?>COL_PROP_MODE); ?>>COL_PROP_MODE); } ?> - -COL_SAT_NAME) { ?>COL_SAT_NAME); ?>>COL_SAT_NAME); } ?> - -COL_BAND_RX) { ?>COL_BAND_RX); ?>>COL_BAND_RX); } ?> - -COL_TIME_ON); $new_date = date('Y-m-d', $date_on); ?> -> - -COL_TIME_ON); $new_on = date('H:i:s', $time_on); ?> -> - -COL_CALL).">".$qso->COL_CALL."\n"; +print "COL_BAND).">".strtoupper($qso->COL_BAND)."\n"; +print "mode_map($qso->COL_MODE, $qso->COL_SUBMODE)).">".strtoupper($CI->mode_map(($qso->COL_MODE == null ? '' : strtoupper($qso->COL_MODE)), ($qso->COL_SUBMODE == null ? '' : strtoupper($qso->COL_SUBMODE))))."\n"; +if($qso->COL_FREQ != "" && $qso->COL_FREQ != "0") { + $freq_in_mhz = $qso->COL_FREQ / 1000000; + print "".$freq_in_mhz."\n"; +} +if($qso->COL_FREQ_RX != "" && $qso->COL_FREQ_RX != "0") { + $freq_in_mhz_rx = $qso->COL_FREQ_RX / 1000000; + print "".$freq_in_mhz_rx."\n"; +} +if($qso->COL_PROP_MODE) { + print "COL_PROP_MODE).">".strtoupper($qso->COL_PROP_MODE)."\n"; +} +if($qso->COL_SAT_NAME) { + print "COL_SAT_NAME).">".strtoupper($qso->COL_SAT_NAME)."\n"; +} +if($qso->COL_BAND_RX) { + print "COL_BAND_RX).">".strtoupper($qso->COL_BAND_RX)."\n"; +} +$date_on = strtotime($qso->COL_TIME_ON); +$new_date = date('Y-m-d', $date_on); +print "".$new_date."\n"; +$time_on = strtotime($qso->COL_TIME_ON); +$new_on = date('H:i:s', $time_on); +print "".$new_on."Z\n"; $sign_string = ""; @@ -200,27 +196,27 @@ if($qso->COL_MODE) { $sign_string .= strtoupper($CI->mode_map($qso->COL_MODE, $qso->COL_SUBMODE)); } - if($qso->COL_PROP_MODE) { $sign_string .= strtoupper($qso->COL_PROP_MODE); } $sign_string .= $new_date; - $sign_string .= $new_on."Z"; if($qso->COL_SAT_NAME) { $sign_string .= strtoupper($qso->COL_SAT_NAME); } - ?> -signlog($lotw_cert_info->cert_key, $sign_string); +$signed_item = $CI->signlog($lotw_cert_info->cert_key, $sign_string); +print ""; +for ($i=0; $i".$sign_string."\n"; ?> -:6> - -> - - +