diff --git a/README.md b/README.md index 5a54f4dc6..0ca7a08b3 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Special thanks to our contributors, who are part of Wavelog by improving code! Translators: -[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/), [Filip Melik (OK1GOD)](https://translate.wavelog.org/user/filipmelik/), [Petr (OK1PTR)](https://translate.wavelog.org/user/OK1PTR/), [Stefan (DB4SCW)](https://translate.wavelog.org/user/DB4SCW/), [F4JSU](https://translate.wavelog.org/user/F4JSU/), [Maciej](https://translate.wavelog.org/user/maciejla/), [imlonghao](https://translate.wavelog.org/user/imlonghao/), [Reiner Herrmann](https://translate.wavelog.org/user/reinerh/), [Jian ke (BG8IXZ)](https://translate.wavelog.org/user/bg8ixz/), [Fabian Franz](https://translate.wavelog.org/user/fabianfrz/), [Fatih Önder](https://translate.wavelog.org/user/cektor/), [Qing He(BD8DHF)](https://translate.wavelog.org/user/BD8DHF), [hellofinch](https://translate.wavelog.org/user/hellofinch/), [tviitkar (ES5TVI )](https://translate.wavelog.org/user/tviitkar/), [utkuyalcin](https://translate.wavelog.org/user/utkuyalcin/), [Plamen Panteleev (LZ1PPL)](https://translate.wavelog.org/user/lz1ppl/), [Bartek](https://translate.wavelog.org/user/atimias/) +[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/), [Filip Melik (OK1GOD)](https://translate.wavelog.org/user/filipmelik/), [Petr (OK1PTR)](https://translate.wavelog.org/user/OK1PTR/), [Stefan (DB4SCW)](https://translate.wavelog.org/user/DB4SCW/), [F4JSU](https://translate.wavelog.org/user/F4JSU/), [Maciej](https://translate.wavelog.org/user/maciejla/), [imlonghao](https://translate.wavelog.org/user/imlonghao/), [Reiner Herrmann](https://translate.wavelog.org/user/reinerh/), [Jian ke (BG8IXZ)](https://translate.wavelog.org/user/bg8ixz/), [Fabian Franz](https://translate.wavelog.org/user/fabianfrz/), [Fatih Önder](https://translate.wavelog.org/user/cektor/), [Qing He(BD8DHF)](https://translate.wavelog.org/user/BD8DHF), [hellofinch](https://translate.wavelog.org/user/hellofinch/), [tviitkar (ES5TVI )](https://translate.wavelog.org/user/tviitkar/), [utkuyalcin](https://translate.wavelog.org/user/utkuyalcin/), [Plamen Panteleev (LZ1PPL)](https://translate.wavelog.org/user/lz1ppl/), [Bartek](https://translate.wavelog.org/user/atimias/), [Samir (DL4DCO)](https://translate.wavelog.org/user/DL4DCO/) If you would like to contribute in any way to Wavelog, it is most appreciated. This has been developed in free time, help coding new features or writing documentation is always useful. diff --git a/application/controllers/Cabrillo.php b/application/controllers/Cabrillo.php index 95764fd63..d713b2e9b 100644 --- a/application/controllers/Cabrillo.php +++ b/application/controllers/Cabrillo.php @@ -132,6 +132,7 @@ class Cabrillo extends CI_Controller { $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')); + $data['grid_export'] = $this->security->xss_clean($this->input->post('grid_export')) == '1' ? true : false; $this->load->view('cabrillo/export', $data); }else { diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 1170f15c4..22d82f06a 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -165,7 +165,7 @@ class Logbook extends CI_Controller { } } - if ($return['callsign_qra'] != "") { + if ($return['callsign_qra'] != "" || $return['callsign_qra'] != null) { $return['latlng'] = $this->qralatlng($return['callsign_qra']); $return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id); } diff --git a/application/controllers/Lookup.php b/application/controllers/Lookup.php index 7d081bdf6..ef73a9a78 100644 --- a/application/controllers/Lookup.php +++ b/application/controllers/Lookup.php @@ -51,6 +51,9 @@ class Lookup extends CI_Controller { $data['bands'] = $this->bands->get_worked_bands(xss_clean($this->input->post('type'))); } + $data['reduced_mode'] = xss_clean($this->input->post('reduced_mode')) == 'true' ? true : false; + $data['current_band'] = xss_clean($this->input->post('current_band')) ?? ''; + $data['current_mode'] = xss_clean($this->input->post('current_mode')) ?? ''; $data['dxcc'] = xss_clean($this->input->post('dxcc')); $data['was'] = xss_clean($this->input->post('was')); diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 7339b4af6..669398255 100644 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -119,6 +119,7 @@ class QSO extends CI_Controller { 'start_time' => $this->input->post('start_time', TRUE), 'end_time' => $this->input->post('end_time'), 'time_stamp' => time(), + 'mail' => $this->input->post('mail', TRUE), 'band' => $this->input->post('band', TRUE), 'band_rx' => $this->input->post('band_rx', TRUE), 'freq' => $this->input->post('freq_display', TRUE), diff --git a/application/libraries/Cabrilloformat.php b/application/libraries/Cabrilloformat.php index 7d3500f20..36fd25a56 100644 --- a/application/libraries/Cabrilloformat.php +++ b/application/libraries/Cabrilloformat.php @@ -62,7 +62,7 @@ class Cabrilloformat { return "END-OF-LOG:"; } - public function qso($qso) { + public function qso($qso, $grid_export) { $freq = substr($qso->COL_FREQ, 0, -3); if ($freq > 30000) { if ($freq > 250000000) { @@ -121,12 +121,19 @@ class Cabrilloformat { } } - if($qso->COL_MODE == "SSB") { + // based on the official cabrillo documentation + // https://wwrof.org/cabrillo/cabrillo-qso-data/ + + if($qso->COL_MODE == "CW") { + $mode = "CW"; + } elseif($qso->COL_MODE == "SSB" || $qso->COL_MODE == "AM") { $mode = "PH"; + } elseif($qso->COL_MODE == "FM") { + $mode = "FM"; } elseif($qso->COL_MODE == "RTTY") { $mode = "RY"; } else { - $mode = $qso->COL_MODE; + $mode = "DG"; } $time = substr($qso->COL_TIME_ON, 0, -3); @@ -139,6 +146,10 @@ class Cabrilloformat { $returnstring .= sprintf("%-6s", sprintf("%03d", $qso->COL_STX)) ." "; } + if ($grid_export == true) { + $returnstring .= substr($qso->station_gridsquare, 0, 4) ?? '' ." "; + } + if ($qso->COL_STX_STRING != "") { $returnstring .= $qso->COL_STX_STRING ." "; } @@ -148,6 +159,10 @@ class Cabrilloformat { if ($qso->COL_SRX != NULL) { $returnstring .= sprintf("%-6s", sprintf("%03d", $qso->COL_SRX)) ." "; } + + if ($grid_export == true) { + $returnstring .= substr($qso->COL_GRIDSQUARE, 0, 4) ?? '' ." "; + } if ($qso->COL_SRX_STRING != "") { $returnstring .= $qso->COL_SRX_STRING ." "; diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 6cf06f2f6..d8a3f34a6 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-11-10 13:02+0000\n" +"POT-Creation-Date: 2024-11-15 15:56+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian