diff --git a/application/controllers/Cabrillo.php b/application/controllers/Cabrillo.php index 062c079ee..95764fd63 100644 --- a/application/controllers/Cabrillo.php +++ b/application/controllers/Cabrillo.php @@ -117,9 +117,11 @@ class Cabrillo extends CI_Controller { $data['categorypower'] = $this->security->xss_clean($this->input->post('categorypower')); $data['categorystation'] = $this->security->xss_clean($this->input->post('categorystation')); $data['categorytransmitter'] = $this->security->xss_clean($this->input->post('categorytransmitter')); + $data['categorytime'] = $this->security->xss_clean($this->input->post('categorytime')); $data['categoryoverlay'] = $this->security->xss_clean($this->input->post('categoryoverlay')); $data['operators'] = $this->security->xss_clean($this->input->post('operators')); $data['club'] = $this->security->xss_clean($this->input->post('club')); + $data['location'] = $this->security->xss_clean($this->input->post('location')); $data['name'] = $userinfo->user_firstname . ' ' . $userinfo->user_lastname; $data['email'] = $userinfo->user_email; $data['address'] = $this->security->xss_clean($this->input->post('address')); @@ -129,6 +131,7 @@ class Cabrillo extends CI_Controller { $data['addresscountry'] = $this->security->xss_clean($this->input->post('addresscountry')); $data['soapbox'] = $this->security->xss_clean($this->input->post('soapbox')); $data['gridlocator'] = $station->station_gridsquare; + $data['certificate'] = $this->security->xss_clean($this->input->post('certificate')); $this->load->view('cabrillo/export', $data); }else { diff --git a/application/libraries/Cabrilloformat.php b/application/libraries/Cabrilloformat.php index 78fca1339..7d3500f20 100644 --- a/application/libraries/Cabrilloformat.php +++ b/application/libraries/Cabrilloformat.php @@ -4,8 +4,8 @@ class Cabrilloformat { public function header($contest_id, $callsign, $claimed_score, - $operators, $club, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, - $categoryoverlay, $categorytransmitter, $categorystation, $categorypower, $categorymode, $categoryband, $categoryassisted, $categoryoperator, $email) { + $operators, $club, $location, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, + $categoryoverlay, $categorytransmitter, $categorytime, $categorystation, $categorypower, $categorymode, $categoryband, $categoryassisted, $categoryoperator, $email, $certificate) { $cab_header = ""; $cab_header .= "START-OF-LOG: 3.0"."\r\n"; $cab_header .= "CONTEST: ".$contest_id."\r\n"; @@ -21,6 +21,10 @@ class Cabrilloformat { $cab_header .= "CLUB: ".$club."\r\n"; } + if($location != null) { + $cab_header .= "LOCATION: ".$location."\r\n"; + } + $cab_header .= "CATEGORY-OPERATOR: ".$categoryoperator."\r\n"; $cab_header .= "CATEGORY-BAND: ".$categoryband."\r\n"; $cab_header .= "CATEGORY-ASSISTED: ".$categoryassisted."\r\n"; @@ -28,6 +32,7 @@ class Cabrilloformat { $cab_header .= "CATEGORY-POWER: ".$categorypower."\r\n"; $cab_header .= "CATEGORY-STATION: ".$categorystation."\r\n"; $cab_header .= "CATEGORY-TRANSMITTER: ".$categorytransmitter."\r\n"; + $cab_header .= "CATEGORY-TIME: ".$categorytime."\r\n"; $cab_header .= "CATEGORY-OVERLAY: ".$categoryoverlay."\r\n"; $cab_header .= "NAME: ".$name."\r\n"; @@ -38,6 +43,10 @@ class Cabrilloformat { $cab_header .= "ADDRESS-COUNTRY: ".$addresscountry."\r\n"; $cab_header .= "EMAIL: ".$email."\r\n"; $cab_header .= "SOAPBOX: ".$soapbox."\r\n"; + + if ($certificate != null || $certificate != "") { + $cab_header .= "CERTIFICATE: ".$certificate."\r\n"; + } if($gridlocator != null) { $cab_header .= "GRID-LOCATOR: ".$gridlocator."\r\n"; diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 6df7abba4..12d84d375 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-10-04 08:59+0000\n" +"POT-Creation-Date: 2024-10-05 05:47+0000\n" "PO-Revision-Date: 2024-08-17 10:46+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Italian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified Han script) security->xss_clean($username); - $data['user_eqsl_password'] = html_entity_decode($this->security->xss_clean($password)); + $data['user_eqsl_password'] = $password; $clean_userid = $this->security->xss_clean($userid); $qslsnotsent = $this->eqsl_not_yet_sent($clean_userid); @@ -49,7 +49,7 @@ class Eqslmethods_model extends CI_Model { foreach ($qslsnotsent->result_array() as $qsl) { $data['user_eqsl_name'] = $qsl['station_callsign']; $adif = $this->generateAdif($qsl, $data); - + $status = $this->uploadQso($adif, $qsl); if ($status == 'Error') { @@ -69,8 +69,8 @@ class Eqslmethods_model extends CI_Model { $COL_TIME_ON = date('Hi', strtotime($qsl['COL_TIME_ON'])); # Set up the single record file - $adif = "https://www.eqsl.cc/qslcard/importADIF.cfm?"; - $adif .= "ADIFData=WavelogUpload%20"; + $adifhead = "https://www.eqsl.cc/qslcard/importADIF.cfm?"; + $adifhead .= "ADIFData=WavelogUpload%20"; /* Handy reference of escaping chars "<" = 3C @@ -83,33 +83,34 @@ class Eqslmethods_model extends CI_Model { "&" = 26 */ - $adif .= "%3C"; - $adif .= "ADIF%5FVER"; - $adif .= "%3A"; - $adif .= "4"; - $adif .= "%3E"; - $adif .= "1%2E00 "; - $adif .= "%20"; + $adifhead .= "%3C"; + $adifhead .= "ADIF%5FVER"; + $adifhead .= "%3A"; + $adifhead .= "4"; + $adifhead .= "%3E"; + $adifhead .= "1%2E000"; + $adifhead .= "%20"; - $adif .= "%3C"; - $adif .= "EQSL%5FUSER"; - $adif .= "%3A"; - $adif .= strlen($data['user_eqsl_name']); - $adif .= "%3E"; - $adif .= $data['user_eqsl_name']; - $adif .= "%20"; + $adifhead .= "%3C"; + $adifhead .= "EQSL%5FUSER"; + $adifhead .= "%3A"; + $adifhead .= strlen($data['user_eqsl_name']); + $adifhead .= "%3E"; + $adifhead .= $data['user_eqsl_name']; + $adifhead .= "%20"; - $adif .= "%3C"; - $adif .= "EQSL%5FPSWD"; - $adif .= "%3A"; - $adif .= strlen($data['user_eqsl_password']); - $adif .= "%3E"; - $adif .= urlencode($data['user_eqsl_password']); - $adif .= "%20"; + $adifhead .= "%3C"; + $adifhead .= "EQSL%5FPSWD"; + $adifhead .= "%3A"; + $adifhead .= mb_strlen((($data['user_eqsl_password']))); + $adifhead .= "%3E"; + $adifhead .= rawurlencode($data['user_eqsl_password']); + $adifhead .= "%20"; - $adif .= "%3C"; - $adif .= "EOH"; - $adif .= "%3E"; + $adifhead .= "%3C"; + $adifhead .= "EOH"; + + $adif = "%3E"; # Lay out the required fields $adif .= "%3C"; @@ -246,6 +247,7 @@ class Eqslmethods_model extends CI_Model { # Make sure we don't have any spaces $adif = str_replace(" ", '%20', $adif); + $adif = $adifhead.$adif; return $adif; } @@ -324,7 +326,6 @@ class Eqslmethods_model extends CI_Model { } } } - log_message('debug', $result); return $status; } diff --git a/application/views/cabrillo/export.php b/application/views/cabrillo/export.php index 64136eeac..aeba10dba 100644 --- a/application/views/cabrillo/export.php +++ b/application/views/cabrillo/export.php @@ -6,8 +6,8 @@ $CI =& get_instance(); $CI->load->library('Cabrilloformat'); echo $CI->cabrilloformat->header($contest_id, $callsign, $claimed_score, - $operators, $club, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, - $categoryoverlay, $categorytransmitter, $categorystation, $categorypower, $categorymode, $categoryband, $categoryassisted, $categoryoperator, $email); + $operators, $club, $location, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, + $categoryoverlay, $categorytransmitter, $categorytime, $categorystation, $categorypower, $categorymode, $categoryband, $categoryassisted, $categoryoperator, $email, $certificate); foreach ($qsos->result() as $row) { echo $CI->cabrilloformat->qso($row); } diff --git a/application/views/cabrillo/index.php b/application/views/cabrillo/index.php index a4cf9c4ea..7956b7fa3 100644 --- a/application/views/cabrillo/index.php +++ b/application/views/cabrillo/index.php @@ -41,8 +41,12 @@
+ + +