From ac2cdc6e587eb0871e8e89827fd67241918c1183 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 14 May 2023 13:45:10 +0200 Subject: [PATCH] [Translation] Replaced all language string from $this->lang->line to lang --- application/views/api/help.php | 4 +- application/views/awards/pota/index.php | 14 +- application/views/awards/wwff/index.php | 14 +- application/views/contesting/index.php | 60 +++--- application/views/csv/index.php | 2 +- application/views/dashboard/index.php | 54 +++--- application/views/debug/main.php | 2 +- application/views/dxatlas/index.php | 2 +- application/views/interface_assets/header.php | 132 ++++++------- application/views/lotw/import.php | 22 +-- application/views/lotw_views/index.php | 38 ++-- application/views/lotw_views/upload_cert.php | 18 +- application/views/notes/add.php | 20 +- application/views/notes/edit.php | 20 +- application/views/notes/main.php | 6 +- application/views/notes/view.php | 10 +- application/views/qslcard/index.php | 4 +- application/views/qslcard/searchresult.php | 116 ++++++------ application/views/qslprint/index.php | 2 +- application/views/qso/edit_ajax.php | 20 +- application/views/qso/index.php | 160 ++++++++-------- .../views/search/search_result_ajax.php | 130 ++++++------- application/views/stations/index.php | 106 +++++++++++ application/views/user/add.php | 156 +++++++-------- application/views/user/edit.php | 178 +++++++++--------- application/views/view_log/index.php | 4 +- application/views/view_log/partial/log.php | 30 +-- .../views/view_log/partial/log_ajax.php | 20 +- application/views/view_log/qso.php | 100 +++++----- application/views/visitor/index.php | 42 ++--- 30 files changed, 796 insertions(+), 690 deletions(-) create mode 100644 application/views/stations/index.php diff --git a/application/views/api/help.php b/application/views/api/help.php index a7a000b21..e422f0d49 100644 --- a/application/views/api/help.php +++ b/application/views/api/help.php @@ -16,7 +16,7 @@

The Cloudlog API (Application Programming Interface) lets third party systems access Cloudlog in a controlled way. Access to the API is managed via API keys.

You will need to generate an API key for each tool you wish to use (e.g. CloudlogCAT). Generate a read-write key if the application needs to send data to Cloudlog. Generate a read-only key if the application only needs to obtain data from Cloudlog.

-

API URL The API URL for this Cloudlog instance is:

+

API URL The API URL for this Cloudlog instance is:

Info It's good practice to delete a key if you are no longer using the associated application.

num_rows() > 0) { ?> @@ -35,7 +35,7 @@ result() as $row) { ?> - key; ?> + key; ?> description; ?> last_used; ?> diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php index a5f2b9425..d14d86fdf 100644 --- a/application/views/awards/pota/index.php +++ b/application/views/awards/pota/index.php @@ -17,13 +17,13 @@ - lang->line('gen_hamradio_pota_reference') ?> - lang->line('general_word_date') ?> - lang->line('general_word_time') ?> - lang->line('gen_hamradio_callsign') ?> - lang->line('gen_hamradio_band') ?> - lang->line('gen_hamradio_rsts') ?> - lang->line('gen_hamradio_rstr') ?> + + + + + + + diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php index eb33579fb..7b0f75c71 100644 --- a/application/views/awards/wwff/index.php +++ b/application/views/awards/wwff/index.php @@ -17,13 +17,13 @@ - lang->line('gen_hamradio_wwff_reference') ?> - lang->line('general_word_date') ?> - lang->line('general_word_time') ?> - lang->line('gen_hamradio_callsign') ?> - lang->line('gen_hamradio_band') ?> - lang->line('gen_hamradio_rsts') ?> - lang->line('gen_hamradio_rstr') ?> + + + + + + + diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php index 150886f98..8fd63e2f3 100644 --- a/application/views/contesting/index.php +++ b/application/views/contesting/index.php @@ -1,6 +1,6 @@
- -

lang->line('contesting_page_title'); ?>

+ +

@@ -8,7 +8,7 @@
- +
- +
>
- + >
@@ -49,7 +49,7 @@
- + $bandgroup) { @@ -79,14 +79,14 @@
- +
- +
- +
@@ -112,7 +112,7 @@
@@ -122,7 +122,7 @@
- +
@@ -132,7 +132,7 @@
@@ -144,18 +144,18 @@
- +
- +
- - + +
@@ -172,26 +172,26 @@
-
lang->line('contesting_title_callsign_suggestions'); ?>
+
-
lang->line('contesting_title_contest_logbook'); ?>
+
- - - - - - - - + + + + + + + + diff --git a/application/views/csv/index.php b/application/views/csv/index.php index 2f235a081..6e77f1360 100644 --- a/application/views/csv/index.php +++ b/application/views/csv/index.php @@ -16,7 +16,7 @@
- +
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')); @@ -186,21 +186,21 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
lang->line('general_word_date'); ?>/lang->line('general_word_time'); ?>lang->line('gen_hamradio_call'); ?>lang->line('gen_hamradio_band'); ?>lang->line('gen_hamradio_mode'); ?>lang->line('gen_hamradio_rsts'); ?>lang->line('gen_hamradio_rstr'); ?>lang->line('gen_hamradio_exchange_sent_short'); ?>lang->line('gen_hamradio_exchange_rcvd_short'); ?>/ Serial (S) Serial (R) Gridsquare
lang->line('general_word_date'); ?> lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?>
- + - + - + - +
lang->line('dashboard_qso_breakdown'); ?>
lang->line('general_word_total'); ?>
lang->line('general_word_year'); ?>
lang->line('general_word_month'); ?>
@@ -209,15 +209,15 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + - + - + - +
lang->line('dashboard_countries_breakdown'); ?>
lang->line('general_word_worked'); ?>
lang->line('general_word_confirmed'); ?> / / @@ -226,7 +226,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
lang->line('general_word_needed'); ?>
@@ -234,21 +234,21 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?> - + - + - + - +
lang->line('general_word_qslcards'); ?>
lang->line('general_word_sent'); ?>
lang->line('general_word_received'); ?>
lang->line('general_word_requested'); ?>
@@ -257,16 +257,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?> - + - + - +
lang->line('general_word_eqslcards'); ?>
lang->line('general_word_sent'); ?>
lang->line('general_word_received'); ?>
@@ -275,16 +275,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?> - + - + - +
lang->line('general_word_lotw'); ?>
lang->line('general_word_sent'); ?>
lang->line('general_word_received'); ?>
diff --git a/application/views/debug/main.php b/application/views/debug/main.php index 2567611db..64e9857ae 100644 --- a/application/views/debug/main.php +++ b/application/views/debug/main.php @@ -19,7 +19,7 @@ Base URL - config->item('base_url'); ?> ")'> + config->item('base_url'); ?> ")'>
diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php index 5038f9c2d..6e7ad86f9 100644 --- a/application/views/dxatlas/index.php +++ b/application/views/dxatlas/index.php @@ -16,7 +16,7 @@
- + + - + @@ -200,7 +200,7 @@ - + @@ -211,25 +211,25 @@
- session->userdata('user_id'); ?>" title="Account"> lang->line('menu_account'); ?> + session->userdata('user_id'); ?>" title="Account"> - lang->line('menu_station_logbooks'); ?> + - lang->line('menu_station_locations'); ?> + - lang->line('menu_bands'); ?> +
- lang->line('menu_adif_import_export'); ?> + - lang->line('menu_kml_export'); ?> + - lang->line('menu_dx_atlas_gridsquare_export'); ?> + - lang->line('menu_sota_csv_export'); ?> + - lang->line('menu_cabrillo_export'); ?> +
@@ -246,35 +246,35 @@ if ($logbooks_locations_array) { $oqrs_requests = $CI->oqrs_model->oqrs_requests($location_list); ?> - lang->line('menu_oqrs_requests'); ?> 0) { echo "".$oqrs_requests.""; } ?> + 0) { echo "".$oqrs_requests.""; } ?> - lang->line('menu_print_requested_qsls'); ?> +
- lang->line('menu_logbook_of_the_world'); ?> + - lang->line('menu_eqsl_import_export'); ?> + - lang->line('menu_qrz_logbook'); ?> + - lang->line('menu_qo_100_dx_club_upload'); ?> +
- lang->line('menu_api_keys'); ?> + - lang->line('menu_hardware_interfaces'); ?> +
- lang->line('menu_help'); ?> + - lang->line('menu_forum'); ?> +
- lang->line('menu_logout'); ?> +
diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php index 7efd04068..76139dea8 100644 --- a/application/views/lotw/import.php +++ b/application/views/lotw/import.php @@ -1,9 +1,9 @@
-

lang->line('lotw_title'); ?> - lang->line('lotw_title_adif_import'); ?>

+

-

-
lang->line('lotw_title_adif_import_options'); ?>
+
load->view('layout/messages'); ?> @@ -12,14 +12,14 @@
- + -

lang->line('lotw_upload_exported_adif_file_from_lotw'); ?>

-

lang->line('general_word_important'); ?> lang->line('lotw_upload_type_must_be_adi'); ?>

+

+

- +
@@ -29,9 +29,9 @@
- +
-

lang->line('gen_from_date'); ?>:

+

:

@@ -45,14 +45,14 @@
- +
-

lang->line('lotw_report_download_overview_helptext'); ?>

+

- +
diff --git a/application/views/lotw_views/index.php b/application/views/lotw_views/index.php index 093fc7662..53bf670aa 100644 --- a/application/views/lotw_views/index.php +++ b/application/views/lotw_views/index.php @@ -1,12 +1,12 @@

- lang->line('lotw_btn_lotw_import'); ?> -

lang->line('lotw_title'); ?>

+ +

- lang->line('lotw_btn_upload_certificate'); ?> lang->line('lotw_title_available_cert'); ?> +
@@ -28,14 +28,14 @@ - - - - - - - - + + + + + + + + @@ -79,22 +79,22 @@ date_expires.'-30 days')); ?> $row->date_expires) { ?> - lang->line('lotw_expired'); ?> + date_expires && $current_date > $warning_date) { ?> - lang->line('lotw_expiring'); ?> + - lang->line('lotw_valid'); ?> + last_upload) { $last_upload = date($this->config->item('qso_date_format').' H:i:s', strtotime( $row->last_upload )); ?> - lang->line('lotw_not_synced'); ?> + @@ -105,7 +105,7 @@ @@ -118,11 +118,11 @@
- lang->line('lotw_title_information'); ?> +
-

lang->line('lotw_btn_manual_sync'); ?>

+

diff --git a/application/views/lotw_views/upload_cert.php b/application/views/lotw_views/upload_cert.php index e9aa6e615..6a08a2c22 100644 --- a/application/views/lotw_views/upload_cert.php +++ b/application/views/lotw_views/upload_cert.php @@ -1,11 +1,11 @@
-

lang->line('lotw_title'); ?>

+

- lang->line('lotw_title_upload_p12_cert'); ?> +
@@ -16,23 +16,23 @@
- +
- +
diff --git a/application/views/notes/add.php b/application/views/notes/add.php index 5251f3d2b..9194bf920 100644 --- a/application/views/notes/add.php +++ b/application/views/notes/add.php @@ -3,13 +3,13 @@
-

lang->line('notes_create_note'); ?>

+

@@ -26,26 +26,26 @@
- +
- +
- +
- +
diff --git a/application/views/notes/edit.php b/application/views/notes/edit.php index 5a1e23f98..edb355bfc 100644 --- a/application/views/notes/edit.php +++ b/application/views/notes/edit.php @@ -4,13 +4,13 @@ result() as $row) { ?>
-

lang->line('notes_edit_note'); ?>

+

@@ -27,27 +27,27 @@
- +
- +
- +
note; ?>
- +
diff --git a/application/views/notes/main.php b/application/views/notes/main.php index 84374a12a..ccef4f534 100644 --- a/application/views/notes/main.php +++ b/application/views/notes/main.php @@ -2,13 +2,13 @@
-

lang->line('notes_menu_notes'); ?>

+

diff --git a/application/views/notes/view.php b/application/views/notes/view.php index ded9057be..c6848abef 100644 --- a/application/views/notes/view.php +++ b/application/views/notes/view.php @@ -3,22 +3,22 @@
result() as $row) { ?>
-

lang->line('notes_menu_notes'); ?> - title; ?>

+

- title; ?>

note); ?>

- lang->line('notes_input_btn_edit_note'); ?> + - lang->line('notes_input_btn_delete_note'); ?> +
diff --git a/application/views/qslcard/index.php b/application/views/qslcard/index.php index 4ed6665b2..4f8a7a913 100644 --- a/application/views/qslcard/index.php +++ b/application/views/qslcard/index.php @@ -2,10 +2,10 @@
-

lang->line('general_word_qslcards'); ?>

+

lang->line('gen_hamradio_callsign'); ?>lang->line('gen_hamradio_dxcc'); ?>lang->line('lotw_qso_start_date'); ?>lang->line('lotw_qso_end_date'); ?>lang->line('lotw_date_created'); ?>lang->line('lotw_date_expires'); ?>lang->line('lotw_status'); ?>lang->line('lotw_options'); ?>
- lang->line('lotw_btn_delete'); ?> +
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - + '; switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo ''; echo ''; echo ''; echo ''; echo ''; diff --git a/application/views/qslprint/index.php b/application/views/qslprint/index.php index 2d9c44012..64c3de6cb 100644 --- a/application/views/qslprint/index.php +++ b/application/views/qslprint/index.php @@ -17,7 +17,7 @@
- lang->line('cloudlog_station_profile'); ?>: + :
- +
@@ -508,9 +508,9 @@
- +
diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 8d76fecca..930dabfc1 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -10,29 +10,29 @@
@@ -43,12 +43,12 @@
- + >
- + >
@@ -63,7 +63,7 @@
- +
@@ -75,7 +75,7 @@
- + $bandgroup) { @@ -110,32 +110,32 @@
- +
- +
- +
- +
- +
@@ -143,7 +143,7 @@
- +
@@ -154,7 +154,7 @@
- + - + result() as $row) { ?> @@ -176,17 +176,17 @@
- +
- +
- + - lang->line('qso_transmit_power_helptext'); ?> +
- + - - - - - - - + + + + + + +
- + @@ -279,7 +279,7 @@
- +
- + - lang->line('qso_sota_ref_helptext'); ?> +
@@ -368,9 +368,9 @@
- + - lang->line('qso_wwff_ref_helptext'); ?> +
@@ -379,9 +379,9 @@
- + - lang->line('qso_pota_ref_helptext'); ?> +
@@ -389,28 +389,28 @@
- + - lang->line('qso_sig_helptext'); ?> +
- + - lang->line('qso_sig_info_helptext'); ?> +
- + - lang->line('qso_dok_helptext'); ?> +
- + @@ -418,7 +418,7 @@
- + @@ -429,10 +429,10 @@ @@ -441,43 +441,43 @@
- +
- +
- +
- +
@@ -489,8 +489,8 @@
- - + +
@@ -517,14 +517,14 @@
-

lang->line('qso_title_suggestions'); ?>

+

session->userdata('user_show_profile_image')) { ?>
lang->line('general_word_date'); ?> lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?> '; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_band'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_band'); break; } echo ''; switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo '
- - - - - + + + + + session->userdata('user_column1')=='Frequency' || $this->session->userdata('user_column2')=='Frequency' || $this->session->userdata('user_column3')=='Frequency' || $this->session->userdata('user_column4')=='Frequency' || $this->session->userdata('user_column5')=='Frequency') { echo ''; } else { diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index e51d4fcd7..f37efe1a0 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -2,86 +2,86 @@
lang->line('general_word_date'); ?>/lang->line('general_word_time'); ?>lang->line('gen_hamradio_call'); ?>lang->line('gen_hamradio_mode'); ?>lang->line('gen_hamradio_rsts'); ?>lang->line('gen_hamradio_rstr'); ?>/ '.$this->lang->line('gen_hamradio_frequency').'
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - + '; switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo ''; echo ''; echo ''; echo ''; echo ''; @@ -94,7 +94,7 @@ $ci =& get_instance(); - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> @@ -377,21 +377,21 @@ $ci =& get_instance();
- lang->line('general_edit_qso'); ?> + COL_QSL_SENT !='Y') { ?>
- lang->line('general_mark_qsl_tx_bureau'); ?> - lang->line('general_mark_qsl_tx_direct'); ?> + +
COL_QSL_RCVD !='Y') { ?>
- lang->line('general_mark_qsl_rx_bureau'); ?> - lang->line('general_mark_qsl_rx_direct'); ?> + + Mark QSL Card Requested Mark QSL Card Not Required
@@ -405,7 +405,7 @@ $ci =& get_instance();
- lang->line('general_delete_qso'); ?> +
diff --git a/application/views/stations/index.php b/application/views/stations/index.php new file mode 100644 index 000000000..aa881178b --- /dev/null +++ b/application/views/stations/index.php @@ -0,0 +1,106 @@ +
+ +
+ session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+ + +

+ +
+
+ Station Locations +
+
+

Station Locations define operating locations, such as your QTH, a friend's QTH, or a portable station.

+

Similar to logbooks, a station profile keeps a set of QSOs together.

+

Only one station may be active at a time. In the table below this is shown with the "Active Station" badge.

+ +

Create a Station Location

+ + + + + + + + = 1) { ?> + + + +
+
lang->line('general_word_date'); ?> lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?> '; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo ''; switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { - case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break; - case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break; - case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break; - case 'Country': echo $this->lang->line('general_word_country'); break; - case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break; - case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; - case 'State': echo $this->lang->line('gen_hamradio_state'); break; - case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; - case 'Band': echo $this->lang->line('gen_hamradio_band'); break; - case 'Frequency': echo $this->lang->line('gen_hamradio_frequency'); break; - case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; + case 'Mode': echo lang('gen_hamradio_mode'); break; + case 'RSTS': echo lang('gen_hamradio_rsts'); break; + case 'RSTR': echo lang('gen_hamradio_rstr'); break; + case 'Country': echo lang('general_word_country'); break; + case 'IOTA': echo lang('gen_hamradio_iota'); break; + case 'SOTA': echo lang('gen_hamradio_sota'); break; + case 'State': echo lang('gen_hamradio_state'); break; + case 'Grid': echo lang('gen_hamradio_gridsquare'); break; + case 'Band': echo lang('gen_hamradio_band'); break; + case 'Frequency': echo lang('gen_hamradio_frequency'); break; + case 'Operator': echo lang('gen_hamradio_operator'); break; } echo 'LoTW lang->line('gen_hamradio_station'); ?>
+ + + + + + + + + + + + + + + result() as $row) { ?> + + + + + + + + + + + + + + + +
Profile NameStation CallsignCountryGridsquareEditCopyEmpty LogDelete
+ station_profile_name;?>
+ 		station_callsign;?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; } ?>station_gridsquare;?> + station_active != 1) { ?> + station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('Are you sure you want to make station station_profile_name; ?> the active station?');">Set Active + + Active Station + + + = 1) { ?> + Reassign + +
+ ID: station_id;?> + qso_total;?> QSOs + 		+ user_id == "") { ?> + station_id; ?>" class="btn btn-outline-primary btn-sm"> Claim Ownership + + station_id; ?>" title="Edit" class="btn btn-outline-primary btn-sm"> + + station_id; ?>" title="Copy" class="btn btn-outline-primary btn-sm"> + + station_id; ?>" class="btn btn-danger btn-sm" title="Empty Log" onclick="return confirm('Are you sure you want to delete all QSOs within this station profile?');"> + station_active != 1) { ?> + station_id; ?>" class="btn btn-danger btn-sm" title="Delete" onclick="return confirm('Are you sure you want delete station profile station_profile_name; ?> this will delete all QSOs within this station profile?');"> + +
+ + + + + + + diff --git a/application/views/user/add.php b/application/views/user/add.php index 02846f2d4..b922e3717 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -209,8 +209,8 @@
@@ -231,9 +231,9 @@
If set, gridsquare is fetched based on @@ -244,9 +244,9 @@
If set, name and gridsquare is fetched @@ -258,9 +258,9 @@
If set, name and gridsquare is fetched @@ -272,9 +272,9 @@
If set, name and gridsquare is fetched @@ -299,149 +299,149 @@
+ for="column1">
+ for="column2">
+ for="column3">
+ for="column4">
+ for="column5">
@@ -464,9 +464,9 @@
@@ -484,8 +484,8 @@
Please set your qrz.com/hamqth.com credentials in the general config file.
@@ -508,8 +508,8 @@
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 93e1f5f43..4f775eb05 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -283,8 +283,8 @@
@@ -304,32 +304,32 @@
If set, gridsquare is fetched based on location name.
If set, name and gridsquare is fetched from the API and filled in location and locator.
If set, name and gridsquare is fetched from the API and filled in location and locator.
If set, name and gridsquare is fetched from the API and filled in location and locator.
@@ -341,103 +341,103 @@
- lang->line('account_logbook_fields'); ?> +
- +
- +
- +
- +
- +
@@ -457,9 +457,9 @@
@@ -477,8 +477,8 @@
Please set your qrz.com/hamqth.com credentials in the general config file.
@@ -499,8 +499,8 @@
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php index 9b1798f0d..10f459cca 100644 --- a/application/views/view_log/index.php +++ b/application/views/view_log/index.php @@ -1,8 +1,8 @@
-

lang->line('gen_hamradio_logbook'); ?>

+

-
lang->line('gen_hamradio_logbook').": ".$this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?> lang->line('general_word_location').": ".$this->stations->find_name(); ?>
+
logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?> stations->find_name(); ?>
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index aec0283ec..2eb83bdff 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -1,16 +1,16 @@
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - - - - - - + + + + + + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> session->userdata('user_eqsl_name') != "") { ?> @@ -19,7 +19,7 @@ session->userdata('user_lotw_name') != "") { ?> - + @@ -125,28 +125,28 @@
- lang->line('general_edit_qso'); ?> + COL_QSL_SENT !='Y') { ?>
- lang->line('general_mark_qsl_tx_bureau'); ?> - lang->line('general_mark_qsl_tx_direct'); ?> + +
COL_QSL_RCVD !='Y') { ?>
- lang->line('general_mark_qsl_rx_bureau'); ?> - lang->line('general_mark_qsl_rx_direct'); ?> + + Mark QSL Card Requested Mark QSL Card Not Required
- lang->line('general_delete_qso'); ?> + diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 15d160386..6149f5290 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -53,11 +53,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
lang->line('general_word_date'); ?> lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?>lang->line('gen_hamradio_mode'); ?>lang->line('gen_hamradio_rsts'); ?>lang->line('gen_hamradio_rstr'); ?>lang->line('gen_hamradio_band'); ?>lang->line('general_word_country'); ?> QSL LoTW lang->line('gen_hamradio_station'); ?>
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')); @@ -74,7 +74,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> @@ -224,13 +224,13 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
- lang->line('general_edit_qso'); ?> + COL_QSL_SENT !='Y') { ?>
- lang->line('general_mark_qsl_tx_bureau'); ?> - lang->line('general_mark_qsl_tx_direct'); ?> + + Mark QSL Card Requested Mark QSL Card Not Required
@@ -239,8 +239,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { COL_QSL_RCVD !='Y') { ?>
- lang->line('general_mark_qsl_rx_bureau'); ?> - lang->line('general_mark_qsl_rx_direct'); ?> + +
@@ -252,7 +252,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
- lang->line('general_delete_qso'); ?> +
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 7868fea22..8c1bf1d63 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -3,10 +3,10 @@ + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> @@ -64,39 +64,39 @@ - + - + config->item('display_freq') == true) { ?> - + COL_FREQ_RX != 0) { ?> - + - + - + - + @@ -110,7 +110,7 @@ COL_GRIDSQUARE != null && strlen($row->COL_GRIDSQUARE) >= 4) { ?> - + - + @@ -168,7 +168,7 @@ config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?> COL_COMMENT != null) { ?> - + @@ -176,50 +176,50 @@ COL_SAT_NAME != null) { ?> - + COL_SAT_MODE != null) { ?> - + name != null) { ?> - + COL_CONT != null) { ?> - + - + COL_IOTA != null) { ?> - + COL_SOTA_REF != null) { ?> - + COL_WWFF_REF != null) { ?> - + COL_POTA_REF != null) { ?> - + COL_SIG != null) { ?> - + COL_SIG_INFO != null) { ?> - + COL_SIG) { case "GMA": @@ -290,7 +290,7 @@ COL_DARC_DOK != null) { ?> - + COL_DARC_DOK)) { ?> COL_DARC_DOK)) { ?> @@ -303,19 +303,19 @@
lang->line('general_word_date'); ?> lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?> LoTW lang->line('gen_hamradio_station'); ?> lang->line('general_word_datetime'); ?> COL_TIME_ON); echo date($custom_date_format, $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?>
lang->line('gen_hamradio_callsign'); ?> COL_CALL)); ?> Lookup <?php echo strtoupper($row->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($row->COL_CALL); ?> on HamQTH
lang->line('gen_hamradio_band'); ?> COL_BAND; ?>
lang->line('gen_hamradio_frequency'); ?> frequency->hz_to_mhz($row->COL_FREQ); ?>
lang->line('gen_hamradio_frequency_rx'); ?> frequency->hz_to_mhz($row->COL_FREQ_RX); ?>
lang->line('gen_hamradio_mode'); ?> COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?>
lang->line('gen_hamradio_rsts'); ?> COL_RST_SENT; ?> COL_STX) { ?>(COL_STX);?>) COL_STX_STRING) { ?>(COL_STX_STRING;?>)
lang->line('gen_hamradio_rstr'); ?> COL_RST_RCVD; ?> COL_SRX) { ?>(COL_SRX);?>) COL_SRX_STRING) { ?>(COL_SRX_STRING;?>)
lang->line('general_total_distance'); //Total distance ?> COL_NAME != null) { ?>
lang->line('general_word_name'); ?> COL_NAME; ?>
lang->line('general_word_comment'); ?> COL_COMMENT; ?>
lang->line('gen_hamradio_satellite_name'); ?> COL_SAT_NAME; ?>
lang->line('gen_hamradio_satellite_mode'); ?> COL_SAT_MODE; ?>
lang->line('general_word_country'); ?> name)), "- (/"); if ($row->end != null) { echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; } ?>
lang->line('gen_hamradio_continent'); ?> COL_CONT) { case "AF": - echo $this->lang->line('africa'); + echo lang('africa'); break; case "AN": - echo $this->lang->line('antarctica'); + echo lang('antarctica'); break; case "AS": - echo $this->lang->line('asia'); + echo lang('asia'); break; case "EU": - echo $this->lang->line('europe'); + echo lang('europe'); break; case "NA": - echo $this->lang->line('northamerica'); + echo lang('northamerica'); break; case "OC": - echo $this->lang->line('oceania'); + echo lang('oceania'); break; case "SA": - echo $this->lang->line('southamerica'); + echo lang('southamerica'); break; } ?> @@ -229,49 +229,49 @@ COL_CONTEST_ID != null) { ?>
lang->line('contesting_contest_name'); ?> COL_CONTEST_ID; ?>
lang->line('gen_hamradio_iota_reference'); ?> COL_IOTA; ?>
lang->line('gen_hamradio_sota_reference'); ?> COL_SOTA_REF; ?>
lang->line('gen_hamradio_wwff_reference'); ?> COL_WWFF_REF; ?>
lang->line('gen_hamradio_pota_reference'); ?> COL_POTA_REF; ?>
lang->line('gen_hamradio_sig'); ?> COL_SIG; ?>
lang->line('gen_hamradio_sig_info'); ?>
lang->line('gen_hamradio_dok'); ?> COL_DARC_DOK; ?>
COL_QSL_SENT == "Y" || $row->COL_QSL_RCVD == "Y") { ?> -

lang->line('qslcard_info'); ?>

+

COL_QSL_SENT == "Y") {?> COL_QSL_SENT_VIA == "B") { ?> -

lang->line('qslcard_sent_bureau'); ?> +

COL_QSL_SENT_VIA == "D") { ?> -

lang->line('qslcard_sent_direct'); ?> +

COL_QSL_SENT_VIA == "E") { ?> -

lang->line('qslcard_sent_electronic'); ?> +

COL_QSL_SENT_VIA == "M") { ?> -

lang->line('qslcard_sent_manager'); ?> +

-

lang->line('qslcard_sent'); ?> +

COL_QSLSDATE != null) { ?> COL_QSLSDATE); echo " (".date($custom_date_format, $timestamp).")"; ?>

@@ -324,15 +324,15 @@ COL_QSL_RCVD == "Y") { ?> COL_QSL_RCVD_VIA == "B") { ?> -

lang->line('qslcard_rcvd_bureau'); ?> +

COL_QSL_RCVD_VIA == "D") { ?> -

lang->line('qslcard_rcvd_direct'); ?> +

COL_QSL_RCVD_VIA == "E") { ?> -

lang->line('qslcard_rcvd_electronic'); ?> +

COL_QSL_RCVD_VIA == "M") { ?> -

lang->line('qslcard_rcvd_manager'); ?> +

-

lang->line('qslcard_rcvd'); ?> +

COL_QSLRDATE != null) { ?> COL_QSLRDATE); echo " (".date($custom_date_format, $timestamp).")"; ?>

@@ -342,13 +342,13 @@ COL_LOTW_QSL_RCVD == "Y") { ?> -

lang->line('lotw_short'); ?>

-

lang->line('gen_this_qso_was_confirmed_on'); ?> COL_LOTW_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.

+

+

COL_LOTW_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.

COL_EQSL_QSL_RCVD == "Y") { ?>

eQSL

-

lang->line('gen_this_qso_was_confirmed_on'); ?> COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.

+

COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.

@@ -358,7 +358,7 @@ config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
- +

@@ -495,18 +495,18 @@
- +
- +
- +
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php index 0be7c6978..d316ed6d1 100644 --- a/application/views/visitor/index.php +++ b/application/views/visitor/index.php @@ -59,12 +59,12 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - lang->line('general_word_date'); ?> + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - lang->line('general_word_time'); ?> + - lang->line('gen_hamradio_call'); ?> + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')); @@ -142,21 +142,21 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + - + - + - +
lang->line('dashboard_qso_breakdown'); ?>
lang->line('general_word_total'); ?>
lang->line('general_word_year'); ?>
lang->line('general_word_month'); ?>
@@ -165,15 +165,15 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { - + - + - + - +
lang->line('dashboard_countries_breakdown'); ?>
lang->line('general_word_worked'); ?>
lang->line('general_word_confirmed'); ?> / / @@ -182,7 +182,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
lang->line('general_word_needed'); ?>
@@ -190,21 +190,21 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?> - + - + - + - +
lang->line('general_word_qslcards'); ?>
lang->line('general_word_sent'); ?>
lang->line('general_word_received'); ?>
lang->line('general_word_requested'); ?>
@@ -213,16 +213,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?> - + - + - +
lang->line('general_word_eqslcards'); ?>
lang->line('general_word_sent'); ?>
lang->line('general_word_received'); ?>
@@ -231,16 +231,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?> - + - + - +
lang->line('general_word_lotw'); ?>
lang->line('general_word_sent'); ?>
lang->line('general_word_received'); ?>