diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php index ca8a3492b..194aa4249 100644 --- a/application/controllers/Satellite.php +++ b/application/controllers/Satellite.php @@ -208,6 +208,7 @@ class Satellite extends CI_Controller { $this->load->library('Qra'); $pageData['latlng'] = $this->qra->qra2latlong($homegrid[0]); + $pageData['homegrid'] = $homegrid[0]; // Render Page $pageData['page_title'] = "Satellite Flightpath"; $this->load->view('interface_assets/header', $pageData); diff --git a/application/controllers/User.php b/application/controllers/User.php index c92ec6c1d..2c81f7fef 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -1155,7 +1155,7 @@ class User extends CI_Controller { $stationdata = [ 'user_id' => $this->session->userdata('user_id'), 'station_name' => $this->input->post('station_name', true), - 'station_callsign' => $this->input->post('station_callsign', true), + 'station_callsign' => trim($this->input->post('station_callsign', true)), 'station_dxcc' => $this->input->post('station_dxcc', true), 'station_cqz' => $this->input->post('station_cqz', true), 'station_ituz' => $this->input->post('station_ituz', true), diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 339f4de7b..e92e5007a 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: 2025-03-20 17:00+0000\n" +"POT-Creation-Date: 2025-03-22 21:29+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" +"POT-Creation-Date: 2025-03-22 21:29+0000\n" +"PO-Revision-Date: 2025-03-21 17:05+0000\n" +"Last-Translator: Jörg Dorgeist \n" "Language-Team: German \n" "Language: de_DE\n" @@ -3728,9 +3728,9 @@ msgstr "Anzeigen" #: application/views/interface_assets/header.php:192 #: application/views/logbookadvanced/edit.php:19 #: application/views/logbookadvanced/index.php:255 -#: application/views/satellite/flightpath.php:39 +#: application/views/satellite/flightpath.php:41 #: application/views/satellite/pass.php:47 -#: application/views/satellite/passtable.php:5 +#: application/views/satellite/passtable.php:6 #: application/views/satellite/skedtable.php:7 #: application/views/satellite/skedtable.php:56 #: application/views/sattimers/index.php:38 @@ -4530,11 +4530,11 @@ msgstr "" #: application/views/api/index.php:13 msgid "Links to 3rd-Party-Software which works with Wavelog:" -msgstr "" +msgstr "Links zu Software von Drittanbietern, die mit Wavelog funktionieren:" #: application/views/api/index.php:16 msgid "More Tools" -msgstr "" +msgstr "Mehr Informationen/Tools" #: application/views/api/index.php:19 msgid "API URL" @@ -9690,7 +9690,7 @@ msgstr "Sizilien" #: application/views/logbookadvanced/index.php:13 #: application/views/logbookadvanced/useroptions.php:194 -#: application/views/satellite/flightpath.php:12 +#: application/views/satellite/flightpath.php:13 msgctxt "Map Options" msgid "Gridsquares" msgstr "Locator" @@ -12044,53 +12044,53 @@ msgstr "Sked-Partner hinzufügen" msgid "No TLE information detected. Please update TLE's." msgstr "Keine TLE-Informationen erkannt. Bitte TLEs aktualisieren." -#: application/views/satellite/passtable.php:6 +#: application/views/satellite/passtable.php:7 #: application/views/satellite/skedtable.php:8 msgid "AOS Time" msgstr "AOS-Zeit" -#: application/views/satellite/passtable.php:7 +#: application/views/satellite/passtable.php:8 #: application/views/satellite/skedtable.php:12 msgid "LOS Time" msgstr "LOS-Zeit" -#: application/views/satellite/passtable.php:8 +#: application/views/satellite/passtable.php:9 #: application/views/satellite/skedtable.php:9 #: application/views/satellite/skedtable.php:60 #: application/views/sattimers/index.php:46 msgid "Duration" msgstr "Dauer" -#: application/views/satellite/passtable.php:9 -msgid "Path" -msgstr "" - #: application/views/satellite/passtable.php:10 +msgid "Path" +msgstr "Pfad" + +#: application/views/satellite/passtable.php:11 #: application/views/satellite/skedtable.php:11 #: application/views/sattimers/index.php:45 msgid "Max Elevation" msgstr "Max. Elevation" -#: application/views/satellite/passtable.php:11 +#: application/views/satellite/passtable.php:12 #: application/views/satellite/skedtable.php:10 msgid "AOS Azimuth" msgstr "AOS Azimut" -#: application/views/satellite/passtable.php:12 +#: application/views/satellite/passtable.php:13 #: application/views/satellite/skedtable.php:13 msgid "LOS Azimuth" msgstr "LOS Azimut" -#: application/views/satellite/passtable.php:35 +#: application/views/satellite/passtable.php:38 #: application/views/satellite/skedtable.php:83 msgid "Search failed!" msgstr "Suche fehlgeschlagen!" -#: application/views/satellite/passtable.php:36 +#: application/views/satellite/passtable.php:39 msgid "No passes found. Please check the input parameters." msgstr "Keine Überflüge gefunden. Bitte die Parameter überprüfen." -#: application/views/satellite/passtable.php:45 +#: application/views/satellite/passtable.php:48 #: application/views/satellite/skedtable.php:93 msgid "min" msgstr "min" diff --git a/application/locale/el_GR/LC_MESSAGES/messages.po b/application/locale/el_GR/LC_MESSAGES/messages.po index ebfbe563a..779334ef8 100644 --- a/application/locale/el_GR/LC_MESSAGES/messages.po +++ b/application/locale/el_GR/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-20 17:00+0000\n" +"POT-Creation-Date: 2025-03-22 21:29+0000\n" "PO-Revision-Date: 2024-11-19 01:22+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Hungarian \n" "Language-Team: Italian \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \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 , 2024, 2025. # wxy , 2024. # YuanRetro , 2025. +# 李宇翔 , 2025. msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-03-20 17:00+0000\n" -"PO-Revision-Date: 2025-03-17 17:33+0000\n" -"Last-Translator: YuanRetro \n" +"POT-Creation-Date: 2025-03-22 21:29+0000\n" +"PO-Revision-Date: 2025-03-20 09:40+0000\n" +"Last-Translator: 李宇翔 \n" "Language-Team: Chinese (Simplified Han script) \n" "Language: zh_CN\n" @@ -949,12 +950,12 @@ msgstr "您未设置 eQSL 的账户信息！" #: application/controllers/Eqsl.php:195 msgid "User/Pass wrong for eQSL" -msgstr "" +msgstr "eQSL 的用户名或密码错误" #: application/controllers/Eqsl.php:199 #, php-format msgid "No such eQSL QTH Nickname: %s" -msgstr "" +msgstr "没有找到昵称为：%s的eQSL QTH" #: application/controllers/Eqsl.php:437 msgid "eQSL Tools" @@ -2957,7 +2958,7 @@ msgstr "eQSL 服务异常！" #: application/models/Eqslmethods_model.php:308 msgid "QTH Nickname does not exist at eQSL" -msgstr "" +msgstr "QTH 别名在 eQSL 中不存在" #: application/models/Eqslmethods_model.php:317 msgid "eQSL.cc is experiencing issues. Please try exporting QSOs later." @@ -2977,7 +2978,7 @@ msgstr "eQSL 网站似乎更改了地址，请在 GitHub 上创建一个 issue #: application/models/Eqslmethods_model.php:333 msgid "" "An uncaught Error occured while uploading QSOs. Perhaps eQSL has hiccups" -msgstr "" +msgstr "上传 QSO 时发生未捕获的错误。也许 eQSL 出现了问题" #: application/models/Hrdlog_model.php:22 msgid "" @@ -3647,9 +3648,9 @@ msgstr "显示" #: application/views/interface_assets/header.php:192 #: application/views/logbookadvanced/edit.php:19 #: application/views/logbookadvanced/index.php:255 -#: application/views/satellite/flightpath.php:39 +#: application/views/satellite/flightpath.php:41 #: application/views/satellite/pass.php:47 -#: application/views/satellite/passtable.php:5 +#: application/views/satellite/passtable.php:6 #: application/views/satellite/skedtable.php:7 #: application/views/satellite/skedtable.php:56 #: application/views/sattimers/index.php:38 @@ -9361,7 +9362,7 @@ msgstr "西西里岛" #: application/views/logbookadvanced/index.php:13 #: application/views/logbookadvanced/useroptions.php:194 -#: application/views/satellite/flightpath.php:12 +#: application/views/satellite/flightpath.php:13 msgctxt "Map Options" msgid "Gridsquares" msgstr "网格" @@ -11617,53 +11618,53 @@ msgstr "添加通联伙伴" msgid "No TLE information detected. Please update TLE's." msgstr "没有找到TLE信息，请更新TLE信息。" -#: application/views/satellite/passtable.php:6 +#: application/views/satellite/passtable.php:7 #: application/views/satellite/skedtable.php:8 msgid "AOS Time" msgstr "AOS 时间" -#: application/views/satellite/passtable.php:7 +#: application/views/satellite/passtable.php:8 #: application/views/satellite/skedtable.php:12 msgid "LOS Time" msgstr "LOS 时间" -#: application/views/satellite/passtable.php:8 +#: application/views/satellite/passtable.php:9 #: application/views/satellite/skedtable.php:9 #: application/views/satellite/skedtable.php:60 #: application/views/sattimers/index.php:46 msgid "Duration" msgstr "持续时间" -#: application/views/satellite/passtable.php:9 -msgid "Path" -msgstr "" - #: application/views/satellite/passtable.php:10 +msgid "Path" +msgstr "卫星路径" + +#: application/views/satellite/passtable.php:11 #: application/views/satellite/skedtable.php:11 #: application/views/sattimers/index.php:45 msgid "Max Elevation" msgstr "最大仰角" -#: application/views/satellite/passtable.php:11 +#: application/views/satellite/passtable.php:12 #: application/views/satellite/skedtable.php:10 msgid "AOS Azimuth" msgstr "AOS 方位角" -#: application/views/satellite/passtable.php:12 +#: application/views/satellite/passtable.php:13 #: application/views/satellite/skedtable.php:13 msgid "LOS Azimuth" msgstr "LOS 方位角" -#: application/views/satellite/passtable.php:35 +#: application/views/satellite/passtable.php:38 #: application/views/satellite/skedtable.php:83 msgid "Search failed!" msgstr "搜索失败！" -#: application/views/satellite/passtable.php:36 +#: application/views/satellite/passtable.php:39 msgid "No passes found. Please check the input parameters." msgstr "没有找到卫星通过。请检查输入参数。" -#: application/views/satellite/passtable.php:45 +#: application/views/satellite/passtable.php:48 #: application/views/satellite/skedtable.php:93 msgid "min" msgstr "分钟" diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 056b78e25..06679e670 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1225,7 +1225,7 @@ class Logbook_model extends CI_Model { } $station_profile = $this->stations->profile_clean($stationId); - $stationCallsign = $station_profile->station_callsign; + $stationCallsign = trim($station_profile->station_callsign); $iotaRef = $station_profile->station_iota ?? ''; $sotaRef = $station_profile->station_sota ?? ''; $wwffRef = $station_profile->station_wwff ?? ''; @@ -3631,8 +3631,8 @@ class Logbook_model extends CI_Model { $binding[] = $datetime; $binding[] = $datetime; - $binding[] = $callsign ?? ''; - $binding[] = $station_callsign; + $binding[] = trim($callsign ?? ''); + $binding[] = trim($station_callsign); $binding[] = $band; $binding[] = $mode; @@ -3830,7 +3830,7 @@ class Logbook_model extends CI_Model { $station_qslmsg = (isset($options_object[0]->option_value)) ? $options_object[0]->option_value : ''; foreach ($records as $record) { - $one_error = $this->import($record, $station_id, $skipDuplicate, $markClublog, $markLotw, $dxccAdif, $markQrz, $markEqsl, $markHrd, $markDcl, $skipexport, $operatorName, $apicall, $skipStationCheck, true, $station_id_ok, $station_profile, $station_qslmsg); + $one_error = $this->import($record, $station_id, $skipDuplicate, $markClublog, $markLotw, $dxccAdif, $markQrz, $markEqsl, $markHrd, $markDcl, $skipexport, trim($operatorName), $apicall, $skipStationCheck, true, $station_id_ok, $station_profile, $station_qslmsg); if ($one_error['error'] ?? '' != '') { $custom_errors .= $one_error['error'] . "
"; } else { // No Errors / QSO doesn't exist so far @@ -3845,7 +3845,7 @@ class Logbook_model extends CI_Model { 'COL_BAND' => $record['band'], 'COL_BAND_RX' => $record['band_rx'] ?? '', 'COL_MODE' => $record['mode'], - 'COL_STATION_CALLSIGN' => $station_profile->station_callsign, + 'COL_STATION_CALLSIGN' => trim($station_profile->station_callsign), 'COL_MY_GRIDSQUARE' => $station_profile->station_gridsquare, ); array_push($amsat_qsos, $data); @@ -3897,7 +3897,7 @@ class Logbook_model extends CI_Model { if (($station_id != 0) && (!(isset($record['station_callsign'])))) { $record['station_callsign'] = $station_profile_call; } - if ((!$skipStationCheck) && ($station_id != 0) && (strtoupper($record['station_callsign']) != strtoupper($station_profile_call))) { // Check if station_call from import matches profile ONLY when submitting via GUI. + if ((!$skipStationCheck) && ($station_id != 0) && (trim(strtoupper($record['station_callsign'])) != trim(strtoupper($station_profile_call)))) { // Check if station_call from import matches profile ONLY when submitting via GUI. $returner['error'] =sprintf(__("Wrong station callsign %s while importing QSO with %s for %s: SKIPPED") . "
".__("Check %s for hints about errors in ADIF files."), ''.htmlentities($record['station_callsign'] ?? '').'',($record['call'] ?? ''),''.($station_profile_call ?? '').'',"Wavelog Wiki"); @@ -4397,7 +4397,7 @@ class Logbook_model extends CI_Model { 'COL_BAND' => $band ?? '', 'COL_BAND_RX' => $band_rx ?? '', 'COL_BIOGRAPHY' => (!empty($record['biography'])) ? $record['biography'] : '', - 'COL_CALL' => (!empty($record['call'])) ? strtoupper($record['call']) : '', + 'COL_CALL' => trim((!empty($record['call'])) ? strtoupper($record['call']) : ''), 'COL_CHECK' => (!empty($record['check'])) ? $record['check'] : '', 'COL_CLASS' => (!empty($record['class'])) ? $record['class'] : '', 'COL_CLUBLOG_QSO_UPLOAD_DATE' => $input_clublog_qslsdate, @@ -4538,7 +4538,7 @@ class Logbook_model extends CI_Model { //convert to integer to make sure no invalid entries are imported 'COL_SRX_STRING' => (!empty($record['srx_string'])) ? $record['srx_string'] : '', 'COL_STATE' => (!empty($record['state'])) ? strtoupper($record['state']) : '', - 'COL_STATION_CALLSIGN' => (!empty($record['station_callsign'])) ? $record['station_callsign'] : '', + 'COL_STATION_CALLSIGN' => trim((!empty($record['station_callsign'])) ? $record['station_callsign'] : ''), //convert to integer to make sure no invalid entries are imported 'COL_STX' => (!empty($record['stx'])) ? (int)$record['stx'] : null, 'COL_STX_STRING' => (!empty($record['stx_string'])) ? $record['stx_string'] : '', @@ -5266,7 +5266,7 @@ class Logbook_model extends CI_Model { if ($station_callsign == '') { $this->db->where(array('col_station_callsign' => NULL)); } else { - $this->db->where('col_station_callsign', $station_callsign); + $this->db->where('col_station_callsign', trim($station_callsign)); } $this->db->update($this->config->item('table_name'), $data); if ($this->db->affected_rows() > 0) { @@ -5623,7 +5623,7 @@ class Logbook_model extends CI_Model { $this->db->where_in('station_id', $station_ids); //load only for the station_callsign given - $this->db->where('COL_STATION_CALLSIGN', xss_clean($station_callsign)); + $this->db->where('COL_STATION_CALLSIGN', trim(xss_clean($station_callsign))); //load only for the given contest id $this->db->where('COL_CONTEST_ID', xss_clean($contest_id)); diff --git a/application/models/Stations.php b/application/models/Stations.php index d41d80254..f39546edb 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -134,7 +134,7 @@ class Stations extends CI_Model { 'station_pota' => xss_clean(strtoupper($this->input->post('pota', true))), 'station_sig' => xss_clean(strtoupper($this->input->post('sig', true))), 'station_sig_info' => xss_clean(strtoupper($this->input->post('sig_info', true))), - 'station_callsign' => xss_clean(strtoupper($this->input->post('station_callsign', true))), + 'station_callsign' => trim(xss_clean(strtoupper($this->input->post('station_callsign', true)))), 'station_power' => is_numeric(xss_clean($this->input->post('station_power', true))) ? xss_clean($this->input->post('station_power', true)) : NULL, 'station_dxcc' => xss_clean($this->input->post('dxcc', true)), 'station_cnty' => $county, @@ -196,7 +196,7 @@ class Stations extends CI_Model { 'station_pota' => xss_clean(strtoupper($this->input->post('pota', true))), 'station_sig' => xss_clean(strtoupper($this->input->post('sig', true))), 'station_sig_info' => xss_clean(strtoupper($this->input->post('sig_info', true))), - 'station_callsign' => xss_clean(strtoupper($this->input->post('station_callsign', true))), + 'station_callsign' => trim(xss_clean(strtoupper($this->input->post('station_callsign', true)))), 'station_power' => is_numeric(xss_clean($this->input->post('station_power', true))) ? xss_clean($this->input->post('station_power', true)) : NULL, 'station_dxcc' => xss_clean($this->input->post('dxcc', true)), 'station_cnty' => $county, diff --git a/application/views/satellite/flightpath.php b/application/views/satellite/flightpath.php index 674dbba9d..f0888acc0 100644 --- a/application/views/satellite/flightpath.php +++ b/application/views/satellite/flightpath.php @@ -5,11 +5,13 @@