From 4441931e6373f4f3bae0428dd62a59bafc9f13b6 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 May 2024 19:02:08 +0200 Subject: [PATCH 01/15] responsive map height (gridmap and lba) --- application/views/activated_gridmap/index.php | 4 +- application/views/awards/ffma/index.php | 20 +- application/views/awards/gridmaster/index.php | 4 +- application/views/gridmap/index.php | 4 +- application/views/logbookadvanced/index.php | 999 +++++++++--------- assets/css/cosmo_wide/overrides.css | 5 - assets/css/cyborg_wide/overrides.css | 5 - assets/css/darkly_wide/overrides.css | 5 - assets/css/default_wide/overrides.css | 5 - assets/css/general.css | 12 +- assets/css/superhero_wide/overrides.css | 5 - assets/js/sections/common.js | 22 + assets/js/sections/ffma.js | 9 +- assets/js/sections/gridmap.js | 9 +- assets/js/sections/gridmaster.js | 9 +- assets/js/sections/logbookadvanced_map.js | 564 +++++----- 16 files changed, 852 insertions(+), 829 deletions(-) diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 1b9c28335..0c2da4145 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -1,4 +1,4 @@ -
+

@@ -96,7 +96,7 @@
-
+
: 
diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php index ba4b8c7b2..e9baf3c0b 100644 --- a/application/views/awards/ffma/index.php +++ b/application/views/awards/ffma/index.php @@ -1,21 +1,5 @@ - - -
+

@@ -40,7 +24,7 @@
-
+
:
diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 5dcab8ace..37bfab1e9 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -1,4 +1,4 @@ -
+

@@ -23,7 +23,7 @@
-
+
:
diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index 93a292a94..d9c46718f 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -1,4 +1,4 @@ -
+

@@ -140,7 +140,7 @@
-
+
: 
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 05351ed9c..7f4fe803d 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -1,520 +1,515 @@ -
- session->flashdata('message')) { ?> - -
-

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

-
- -
+
+
+ session->flashdata('message')) { ?> + +
+

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

+
+ +
-
" - method="post"> - -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - + " method="post"> + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
-
- -
- - - - - - - - - - - - - - - - +
+ +
+ + + + + + + + + + + + + + + + +
-
-
-
- - dx->show ?? "true") == "true") { ?> - - dxcc->show ?? "true") == "true") { ?> - - state->show ?? "true") == "true") { ?> - - refs->show ?? "true") == "true") { ?> - - cqzone->show ?? "true") == "true") { ?> - - ituzone->show ?? "true") == "true") { ?> - - mode->show ?? "true") == "true") { ?> - - band->show ?? "true") == "true") { ?> - - iota->show ?? "true") == "true") { ?> - - refs->show ?? "true") == "true") { ?> - - refs->show ?? "true") == "true") { ?> - - refs->show ?? "true") == "true") { ?> - - operator->show ?? "true") == "true") { ?> - +
+
+ + dx->show ?? "true") == "true") { ?> + + dxcc->show ?? "true") == "true") { ?> + + state->show ?? "true") == "true") { ?> + + refs->show ?? "true") == "true") { ?> + + cqzone->show ?? "true") == "true") { ?> + + ituzone->show ?? "true") == "true") { ?> + + mode->show ?? "true") == "true") { ?> + + band->show ?? "true") == "true") { ?> + + iota->show ?? "true") == "true") { ?> + + refs->show ?? "true") == "true") { ?> + + refs->show ?? "true") == "true") { ?> + + refs->show ?? "true") == "true") { ?> + + operator->show ?? "true") == "true") { ?> + +
-
-
-
- - - - - - - - - - - - -
- - -
    -
    • -
-
- - +
+
+ + + + + + + + + + + + +
+ + +
    +
    • +
+
+ + +
+
+ + + + + + datetime->show ?? "true") == "true") { + echo ''; + } ?> + de->show ?? "true") == "true") { + echo ''; + } ?> + dx->show ?? "true") == "true") { + echo ''; + } ?> + mode->show ?? "true") == "true") { + echo ''; + } ?> + rsts->show ?? "true") == "true") { + echo ''; + } ?> + rstr->show ?? "true") == "true") { + echo ''; + } ?> + band->show ?? "true") == "true") { + echo ''; + } ?> + myrefs->show ?? "true") == "true") { + echo ''; + } ?> + refs->show ?? "true") == "true") { + echo ''; + } ?> + name->show ?? "true") == "true") { + echo ''; + } ?> + qslvia->show ?? "true") == "true") { + echo ''; + } ?> + qsl->show ?? "true") == "true") { + echo ''; + } ?> + session->userdata('user_eqsl_name') != "" && ($options->eqsl->show ?? "true") == "true") { + echo ''; + } ?> + session->userdata('user_lotw_name') != "" && ($options->lotw->show ?? "true") == "true") { + echo ''; + } ?> + qslmsg->show ?? "true") == "true") { + echo ''; + } ?> + dxcc->show ?? "true") == "true") { + echo ''; + } ?> + state->show ?? "true") == "true") { + echo ''; + } ?> + cqzone->show ?? "true") == "true") { + echo ''; + } ?> + ituzone->show ?? "true") == "true") { + echo ''; + } ?> + iota->show ?? "true") == "true") { + echo ''; + } ?> + pota->show ?? "true") == "true") { + echo ''; + } ?> + operator->show ?? "true") == "true") { + echo ''; + } ?> + comment->show ?? "true") == "true") { + echo ''; + } ?> + + + + +
+
+ 		' . lang('general_word_datetime') . '' . lang('gen_hamradio_de') . '' . lang('gen_hamradio_dx') . '' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_rsts') . '' . lang('gen_hamradio_rstr') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_myrefs') . '' . lang('gen_hamradio_refs') . '' . lang('general_word_name') . '' . lang('gen_hamradio_qslvia') . '' . lang('gen_hamradio_qsl') . 'eQSLLoTW' . lang('gen_hamradio_qslmsg') . '' . lang('gen_hamradio_dxcc') . '' . lang('gen_hamradio_state') . '' . lang('gen_hamradio_cq_zone') . '' . lang('gen_hamradio_itu_zone') . '' . lang('gen_hamradio_iota') . '' . lang('gen_hamradio_pota') . '' . lang('gen_hamradio_operator') . '' . lang('general_word_comment') . '
-
- - - - - - datetime->show ?? "true") == "true") { - echo ''; - } ?> - de->show ?? "true") == "true") { - echo ''; - } ?> - dx->show ?? "true") == "true") { - echo ''; - } ?> - mode->show ?? "true") == "true") { - echo ''; - } ?> - rsts->show ?? "true") == "true") { - echo ''; - } ?> - rstr->show ?? "true") == "true") { - echo ''; - } ?> - band->show ?? "true") == "true") { - echo ''; - } ?> - myrefs->show ?? "true") == "true") { - echo ''; - } ?> - refs->show ?? "true") == "true") { - echo ''; - } ?> - name->show ?? "true") == "true") { - echo ''; - } ?> - qslvia->show ?? "true") == "true") { - echo ''; - } ?> - qsl->show ?? "true") == "true") { - echo ''; - } ?> - session->userdata('user_eqsl_name') != "" && ($options->eqsl->show ?? "true") == "true"){ - echo ''; - } ?> - session->userdata('user_lotw_name') != "" && ($options->lotw->show ?? "true") == "true"){ - echo ''; - } ?> - qslmsg->show ?? "true") == "true") { - echo ''; - } ?> - dxcc->show ?? "true") == "true") { - echo ''; - } ?> - state->show ?? "true") == "true") { - echo ''; - } ?> - cqzone->show ?? "true") == "true") { - echo ''; - } ?> - ituzone->show ?? "true") == "true") { - echo ''; - } ?> - iota->show ?? "true") == "true") { - echo ''; - } ?> - pota->show ?? "true") == "true") { - echo ''; - } ?> - operator->show ?? "true") == "true") { - echo ''; - } ?> - comment->show ?? "true") == "true") { - echo ''; - } ?> - - - - -
-
- 		' . lang('general_word_datetime') . '' . lang('gen_hamradio_de') . '' . lang('gen_hamradio_dx') . '' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_rsts') . '' . lang('gen_hamradio_rstr') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_myrefs') . '' . lang('gen_hamradio_refs') . '' . lang('general_word_name') . '' . lang('gen_hamradio_qslvia') . '' . lang('gen_hamradio_qsl') . 'eQSLLoTW' . lang('gen_hamradio_qslmsg') . '' . lang('gen_hamradio_dxcc') . '' . lang('gen_hamradio_state') . '' . lang('gen_hamradio_cq_zone') . '' . lang('gen_hamradio_itu_zone') . '' . lang('gen_hamradio_iota') . '' . lang('gen_hamradio_pota') . '' . lang('gen_hamradio_operator') . '' . lang('general_word_comment') . '
-
+
\ No newline at end of file diff --git a/assets/css/cosmo_wide/overrides.css b/assets/css/cosmo_wide/overrides.css index fb0d66928..729f7b612 100644 --- a/assets/css/cosmo_wide/overrides.css +++ b/assets/css/cosmo_wide/overrides.css @@ -65,11 +65,6 @@ height: 500px !important; } -#gridsquare_map { - height: calc(100vh - 380px) !important; - max-height: 900px !important; -} - @media (min-width: 992px) { .modal-lg, .modal-xl { max-width: 1300px; diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css index 1dbf2c575..14dca4f97 100644 --- a/assets/css/cyborg_wide/overrides.css +++ b/assets/css/cyborg_wide/overrides.css @@ -223,11 +223,6 @@ path.grid-worked { height: 500px !important; } -#gridsquare_map { - height: calc(100vh - 380px) !important; - max-height: 900px !important; -} - #mapqso { height: 400px !important; } diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css index 7a0878e2b..39f745e6d 100644 --- a/assets/css/darkly_wide/overrides.css +++ b/assets/css/darkly_wide/overrides.css @@ -241,11 +241,6 @@ div.alert-danger { height: 500px !important; } -#gridsquare_map { - height: calc(100vh - 380px) !important; - max-height: 900px !important; -} - #mapqso { height: 400px !important; } diff --git a/assets/css/default_wide/overrides.css b/assets/css/default_wide/overrides.css index a83139a56..f2f1749d4 100644 --- a/assets/css/default_wide/overrides.css +++ b/assets/css/default_wide/overrides.css @@ -65,11 +65,6 @@ thead > tr > td { height: 500px !important; } -#gridsquare_map { - height: calc(100vh - 380px) !important; - max-height: 900px !important; -} - @media (min-width: 992px) { .modal-lg, .modal-xl { max-width: 1300px; diff --git a/assets/css/general.css b/assets/css/general.css index 29fb898ca..589906874 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -666,11 +666,6 @@ div#station_logbooks_linked_table_paginate { margin-bottom: 0px; } -#advancedmap { - height: calc(100vh - 280px) !important; - max-height: 1000px !important; -} - .lotw-cert-list table { margin-bottom: 0px; } @@ -840,9 +835,14 @@ label { } .coordinates { - justify-content: center; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + justify-content: center; align-items: stretch; } + .cohidden { display:none; } diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css index b5367b4f4..62808f476 100644 --- a/assets/css/superhero_wide/overrides.css +++ b/assets/css/superhero_wide/overrides.css @@ -87,11 +87,6 @@ path.grid-worked { height: 400px !important; } -#gridsquare_map { - height: calc(100vh - 380px) !important; - max-height: 900px !important; -} - /* * Dark Navigation */ diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 6b422c0cc..2f56f9240 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -929,6 +929,28 @@ $(document).ready(function() { } }); +// auto setting of gridmap height +function set_map_height() { + //header menu + var headerNavHeight = $('nav').outerHeight(); + // console.log('nav: ' + headerNavHeight); + + // line with coordinates + var coordinatesHeight = $('.coordinates').outerHeight(); + // console.log('.coordinates: ' + coordinatesHeight); + + // form for gridsquare map + var gridsquareFormHeight = $('.gridsquare_map_form').outerHeight(); + // console.log('.gridsquare_map_form: ' + gridsquareFormHeight); + + // calculate correct map height + var gridsquareMapHeight = window.innerHeight - headerNavHeight - coordinatesHeight - gridsquareFormHeight; + + // and set it + $('#gridsquare_map').css('height', gridsquareMapHeight + 'px'); + // console.log('#gridsquare_map: ' + gridsquareMapHeight); +} + console.log("Ready to unleash your coding prowess and join the fun?\n\n" + "Check out our GitHub Repository and dive into the coding adventure:\n\n" + diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index 0bfbe813d..157afb8f3 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -13,7 +13,8 @@ function gridPlot(form) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#gridmapcontainer").append('
'); + $("#gridmapcontainer").append('
'); + set_map_height(); } ajax_url = site_url + '/awards/getFfmaGridsjs'; @@ -23,6 +24,7 @@ function gridPlot(form) { type: 'get', success: function (data) { $('.cohidden').show(); + set_map_height(); $(".ld-ext-right-plot").removeClass('running'); $(".ld-ext-right-plot").prop('disabled', false); $('#plot').prop("disabled", false); @@ -145,5 +147,8 @@ function spawnGridsquareModal(loc_4char) { } $(document).ready(function(){ - gridPlot(this.form); + gridPlot(this.form); + $(window).resize(function () { + set_map_height(); + }); }) diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index 807002bb7..b90f29519 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -39,7 +39,8 @@ function gridPlot(form, visitor=true) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#gridmapcontainer").append('
'); + $("#gridmapcontainer").append('
'); + set_map_height(); } if (typeof type == 'undefined') { type=''; } @@ -68,6 +69,7 @@ function gridPlot(form, visitor=true) { }, success: function (data) { $('.cohidden').show(); + set_map_height(); $(".ld-ext-right-plot").removeClass('running'); $(".ld-ext-right-plot").prop('disabled', false); $('#plot').prop("disabled", false); @@ -219,5 +221,8 @@ function clearMarkers() { } $(document).ready(function(){ - gridPlot(this.form, visitor); + gridPlot(this.form, visitor); + $(window).resize(function () { + set_map_height(); + }); }) diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index b1a15bbf9..18d67cee3 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -13,7 +13,8 @@ function gridPlot(form, dxcc) { if(container != null){ container._leaflet_id = null; container.remove(); - $("#gridmapcontainer").append('
'); + $("#gridmapcontainer").append('
'); + set_map_height(); } ajax_url = site_url + '/awards/getGridmasterGridsjs/'+dxcc; @@ -27,6 +28,7 @@ function gridPlot(form, dxcc) { success: function (data) { $('.cohidden').show(); + set_map_height(); $(".ld-ext-right-plot").removeClass('running'); $(".ld-ext-right-plot").prop('disabled', false); $('#plot').prop("disabled", false); @@ -151,5 +153,8 @@ function spawnGridsquareModal(loc_4char) { } $(document).ready(function(){ - gridPlot(this.form, dxcc); + gridPlot(this.form, dxcc); + $(window).resize(function () { + set_map_height(); + }); }) diff --git a/assets/js/sections/logbookadvanced_map.js b/assets/js/sections/logbookadvanced_map.js index 7b6292c70..9623c6904 100644 --- a/assets/js/sections/logbookadvanced_map.js +++ b/assets/js/sections/logbookadvanced_map.js @@ -273,8 +273,8 @@ function loadMap(data, iconsList) { container._leaflet_id = null; container.remove(); $(".coordinates").remove(); - $(".qso_manager").append('
'); - $(".qso_manager").append('
' + + $("#lba_div").append('
'); + $("#lba_div").append('
' + '
' + lang_gen_hamradio_latitude + ' 
' + '
' + '
' + lang_gen_hamradio_longitude + ' 
' + @@ -287,6 +287,7 @@ function loadMap(data, iconsList) { '
' + '
'); $('.cohidden').show(); + set_advancedmap_height(); } map = new L.Map('advancedmap', { @@ -435,292 +436,323 @@ function loadMap(data, iconsList) { } } - function createContentMessage(qso) { - var table = '' + - '' + - '" + - '' + - '"; - return (table += "
' + - 'Station callsign: ' + qso.mycallsign + - "
' + - 'Gridsquare: ' + qso.mygridsquare + - "
"); - } +function createContentMessage(qso) { + var table = '' + + '' + + '" + + '' + + '"; + return (table += "
' + + 'Station callsign: ' + qso.mycallsign + + "
' + + 'Gridsquare: ' + qso.mygridsquare + + "
"); +} - function createContentMessageDx(qso) { - var table = '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + +function createContentMessageDx(qso) { + var table = '
Callsign' + qso.callsign + '
Date/time' + qso.datetime + '
' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + if (qso.satname != "") { + table += '' + + '' + '' + ''; - if (qso.satname != "") { - table += '' + - '' + + '' + + '' + + ''; + } + table += '' + + '' + + '' + + ''; + if (qso.gridsquare != undefined) { + table += '' + + '' + + ''; + } + if (qso.distance != undefined) { + table += '' + + '' + + ''; + } + if (qso.bearing != undefined) { + table += '' + + '' + + ''; + } + return (table += '
Callsign' + qso.callsign + '
Date/time' + qso.datetime + '
BandSAT ' + qso.satname + if (qso.orbit != "") { + table += ' (' + qso.orbit + ') ' + } + table += '
BandSAT ' + qso.satname - if (qso.orbit != "") { - table += ' (' + qso.orbit + ') ' + } else { + table += 'Band' + qso.band + '
Mode' + qso.mode + '
Gridsquare' + qso.gridsquare + '
Distance' + qso.distance + '
Bearing' + qso.bearing + '
'); +} + +function loadMapOptions(data) { + $.ajax({ + url: base_url + 'index.php/user_options/get_map_custom', + type: 'GET', + dataType: 'json', + error: function () { + }, + success: function (json_mapinfo) { + if (typeof json_mapinfo.qso !== "undefined") { + iconsList = json_mapinfo; } - table += '' + - '' + - ''; - } else { - table += 'Band' + - '' + qso.band + '' + - '' + - ''; + loadMap(data, iconsList) } - table += 'Mode' + - '' + qso.mode + '' + - '' + - ''; - if (qso.gridsquare != undefined) { - table += 'Gridsquare' + - '' + qso.gridsquare + '' + - ''; - } - if (qso.distance != undefined) { - table += 'Distance' + - '' + qso.distance + '' + - ''; - } - if (qso.bearing != undefined) { - table += 'Bearing' + - '' + qso.bearing + '' + - ''; - } - return (table += ''); + }); +} + +function mapQsos(form) { + $('#mapButton').prop("disabled", true).addClass("running"); + + var id_list=[]; + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; + + elements.each(function() { + let id = $(this).first().closest('tr').data('qsoID') + id_list.push(id); + unselectQsoID(id); + }); + + $("#qsoList").attr("Hidden", true); + $("#qsoList_wrapper").attr("Hidden", true); + $("#qsoList_info").attr("Hidden", true); + + amap = $('#advancedmap').val(); + if (amap == undefined) { + $("#lba_div").append('
'); } - function loadMapOptions(data) { + if (id_list.length > 0) { $.ajax({ - url: base_url + 'index.php/user_options/get_map_custom', - type: 'GET', - dataType: 'json', - error: function () { - }, - success: function (json_mapinfo) { - if (typeof json_mapinfo.qso !== "undefined") { - iconsList = json_mapinfo; - } - loadMap(data, iconsList) - } + url: base_url + 'index.php/logbookadvanced/mapSelectedQsos', + type: 'post', + data: { + ids: id_list, + de: form.de.value + }, + success: function(data) { + loadMapOptions(data); + }, + error: function() { + $('#mapButton').prop("disabled", false).removeClass("running"); + }, + }); + } else { + $.ajax({ + url: base_url + 'index.php/logbookadvanced/mapQsos', + type: 'post', + data: { + dateFrom: form.dateFrom.value, + dateTo: form.dateTo.value, + de: form.de.value, + dx: form.dx.value, + mode: form.mode.value, + band: form.band.value, + qslSent: form.qslSent.value, + qslReceived: form.qslReceived.value, + qslSentMethod: this.qslSentMethod.value, + qslReceivedMethod: this.qslReceivedMethod.value, + iota: form.iota.value, + dxcc: form.dxcc.value, + propmode: form.selectPropagation.value, + gridsquare: form.gridsquare.value, + state: form.state.value, + qsoresults: form.qsoResults.value, + sats: form.sats.value, + orbits: form.orbits.value, + cqzone: form.cqzone.value, + lotwSent: form.lotwSent.value, + lotwReceived: form.lotwReceived.value, + eqslSent: form.eqslSent.value, + eqslReceived: form.eqslReceived.value, + qslvia: $('[name="qslviainput"]').val(), + sota: form.sota.value, + pota: form.pota.value, + operator: form.operator.value, + wwff: form.wwff.value, + qslimages: form.qslimages.value, + }, + success: function(data) { + loadMapOptions(data); + }, + error: function() { + $('#mapButton').prop("disabled", false).removeClass("running"); + }, }); } +}; - function mapQsos(form) { - $('#mapButton').prop("disabled", true).addClass("running"); +function mapGlobeQsos(form) { + var container = L.DomUtil.get('advancedmap'); + if(container != null){ + container._leaflet_id = null; + container.remove(); + $(".coordinates").remove(); + } - var id_list=[]; - var elements = $('#qsoList tbody input:checked'); - var nElements = elements.length; + var id_list=[]; + var elements = $('#qsoList tbody input:checked'); + var nElements = elements.length; - elements.each(function() { - let id = $(this).first().closest('tr').data('qsoID') - id_list.push(id); - unselectQsoID(id); + elements.each(function() { + let id = $(this).first().closest('tr').data('qsoID') + id_list.push(id); + unselectQsoID(id); + }); + + $("#qsoList").attr("Hidden", true); + $("#qsoList_wrapper").attr("Hidden", true); + $("#qsoList_info").attr("Hidden", true); + + amap = $('#advancedmap').val(); + if (amap == undefined) { + $("#lba_div").append('
'); + } + + if (id_list.length > 0) { + $.ajax({ + url: base_url + 'index.php/logbookadvanced/mapSelectedQsos', + type: 'post', + data: { + ids: id_list, + de: form.de.value + }, + success: function(data) { + globemap(data); + }, + error: function() { + + }, }); + } else { + $.ajax({ + url: base_url + 'index.php/logbookadvanced/mapQsos', + type: 'post', + data: { + dateFrom: form.dateFrom.value, + dateTo: form.dateTo.value, + de: form.de.value, + dx: form.dx.value, + mode: form.mode.value, + band: form.band.value, + qslSent: form.qslSent.value, + qslReceived: form.qslReceived.value, + qslSentMethod: this.qslSentMethod.value, + qslReceivedMethod: this.qslReceivedMethod.value, + iota: form.iota.value, + dxcc: form.dxcc.value, + propmode: form.selectPropagation.value, + gridsquare: form.gridsquare.value, + state: form.state.value, + qsoresults: form.qsoResults.value, + sats: form.sats.value, + orbits: form.orbits.value, + cqzone: form.cqzone.value, + lotwSent: form.lotwSent.value, + lotwReceived: form.lotwReceived.value, + eqslSent: form.eqslSent.value, + eqslReceived: form.eqslReceived.value, + qslvia: $('[name="qslviainput"]').val(), + sota: form.sota.value, + pota: form.pota.value, + operator: form.operator.value, + wwff: form.wwff.value, + qslimages: form.qslimages.value, + }, + success: function(data) { + globemap(data); + }, + error: function() { - $("#qsoList").attr("Hidden", true); - $("#qsoList_wrapper").attr("Hidden", true); - $("#qsoList_info").attr("Hidden", true); + }, + }); + } +}; - amap = $('#advancedmap').val(); - if (amap == undefined) { - $(".qso_manager").append('
'); - } - - if (id_list.length > 0) { - $.ajax({ - url: base_url + 'index.php/logbookadvanced/mapSelectedQsos', - type: 'post', - data: { - ids: id_list, - de: form.de.value - }, - success: function(data) { - loadMapOptions(data); - }, - error: function() { - $('#mapButton').prop("disabled", false).removeClass("running"); - }, - }); +function globemap(x) { + globePayArc=[]; + globePayLab=[]; + x.forEach((element) => { + let OneQsoArc={}; + OneQsoArc.startLat=element.latlng1[0]; + OneQsoArc.startLng=element.latlng1[1]; + OneQsoArc.endLat=element.latlng2[0]; + OneQsoArc.endLng=element.latlng2[1]; + OneQsoArc.name=element.callsign; + if (element.confirmed) { + OneQsoArc.color = 'green'; } else { - $.ajax({ - url: base_url + 'index.php/logbookadvanced/mapQsos', - type: 'post', - data: { - dateFrom: form.dateFrom.value, - dateTo: form.dateTo.value, - de: form.de.value, - dx: form.dx.value, - mode: form.mode.value, - band: form.band.value, - qslSent: form.qslSent.value, - qslReceived: form.qslReceived.value, - qslSentMethod: this.qslSentMethod.value, - qslReceivedMethod: this.qslReceivedMethod.value, - iota: form.iota.value, - dxcc: form.dxcc.value, - propmode: form.selectPropagation.value, - gridsquare: form.gridsquare.value, - state: form.state.value, - qsoresults: form.qsoResults.value, - sats: form.sats.value, - orbits: form.orbits.value, - cqzone: form.cqzone.value, - lotwSent: form.lotwSent.value, - lotwReceived: form.lotwReceived.value, - eqslSent: form.eqslSent.value, - eqslReceived: form.eqslReceived.value, - qslvia: $('[name="qslviainput"]').val(), - sota: form.sota.value, - pota: form.pota.value, - operator: form.operator.value, - wwff: form.wwff.value, - qslimages: form.qslimages.value, - }, - success: function(data) { - loadMapOptions(data); - }, - error: function() { - $('#mapButton').prop("disabled", false).removeClass("running"); - }, - }); + OneQsoArc.color = 'red'; } - }; + // OneQsoArc.color = [['red', 'white', 'blue', 'green'][Math.round(Math.random() * 3)], ['red', 'white', 'blue', 'green'][Math.round(Math.random() * 3)]] + OneQsoArc.altitude=0.15; + globePayArc.push(OneQsoArc); + let OneQsoLab={}; + OneQsoLab.lat=element.latlng2[0]; + OneQsoLab.lng=element.latlng2[1]; + OneQsoLab.text=element.callsign; + globePayLab.push(OneQsoLab); + }); + renderGlobe(globePayArc,globePayLab); +} - function mapGlobeQsos(form) { - var container = L.DomUtil.get('advancedmap'); - if(container != null){ - container._leaflet_id = null; - container.remove(); - $(".coordinates").remove(); - } +function renderGlobe(arcsData,labelData) { + Globe() + .globeImageUrl(base_url + '/assets/images/earth-blue-marble.jpg') + .pointOfView({ lat: arcsData[0].startLat, lng: arcsData[0].startLng, altitude:1}, 100) + .labelsData(labelData) + .arcsData(arcsData) + .arcColor('color') + //.arcAltitude('altitude') + .arcAltitudeAutoScale(.3) + .arcStroke(.2) + .arcDashLength(() => .1) + .arcDashGap(() => 0.01) + .arcDashAnimateTime(() => 4000 + 500) + (document.getElementById('advancedmap')) +} - var id_list=[]; - var elements = $('#qsoList tbody input:checked'); - var nElements = elements.length; +// auto setting of gridmap height +function set_advancedmap_height() { + //header menu + var headerNavHeight = $('nav').outerHeight(); + // console.log('nav: ' + headerNavHeight); - elements.each(function() { - let id = $(this).first().closest('tr').data('qsoID') - id_list.push(id); - unselectQsoID(id); - }); + // line with coordinates + var coordinatesHeight = $('.coordinates').outerHeight(); + // console.log('.coordinates: ' + coordinatesHeight); - $("#qsoList").attr("Hidden", true); - $("#qsoList_wrapper").attr("Hidden", true); - $("#qsoList_info").attr("Hidden", true); + // form for gridsquare map + var qsoManagerHeight = $('.qso_manager').outerHeight(); + // console.log('.qso_manager: ' + qsoManagerHeight); - amap = $('#advancedmap').val(); - if (amap == undefined) { - $(".qso_manager").append('
'); - } + // calculate correct map height + var advancedMapHeight = window.innerHeight - headerNavHeight - coordinatesHeight - qsoManagerHeight; - if (id_list.length > 0) { - $.ajax({ - url: base_url + 'index.php/logbookadvanced/mapSelectedQsos', - type: 'post', - data: { - ids: id_list, - de: form.de.value - }, - success: function(data) { - globemap(data); - }, - error: function() { - - }, - }); - } else { - $.ajax({ - url: base_url + 'index.php/logbookadvanced/mapQsos', - type: 'post', - data: { - dateFrom: form.dateFrom.value, - dateTo: form.dateTo.value, - de: form.de.value, - dx: form.dx.value, - mode: form.mode.value, - band: form.band.value, - qslSent: form.qslSent.value, - qslReceived: form.qslReceived.value, - qslSentMethod: this.qslSentMethod.value, - qslReceivedMethod: this.qslReceivedMethod.value, - iota: form.iota.value, - dxcc: form.dxcc.value, - propmode: form.selectPropagation.value, - gridsquare: form.gridsquare.value, - state: form.state.value, - qsoresults: form.qsoResults.value, - sats: form.sats.value, - orbits: form.orbits.value, - cqzone: form.cqzone.value, - lotwSent: form.lotwSent.value, - lotwReceived: form.lotwReceived.value, - eqslSent: form.eqslSent.value, - eqslReceived: form.eqslReceived.value, - qslvia: $('[name="qslviainput"]').val(), - sota: form.sota.value, - pota: form.pota.value, - operator: form.operator.value, - wwff: form.wwff.value, - qslimages: form.qslimages.value, - }, - success: function(data) { - globemap(data); - }, - error: function() { - - }, - }); - } - }; - - function globemap(x) { - globePayArc=[]; - globePayLab=[]; - x.forEach((element) => { - let OneQsoArc={}; - OneQsoArc.startLat=element.latlng1[0]; - OneQsoArc.startLng=element.latlng1[1]; - OneQsoArc.endLat=element.latlng2[0]; - OneQsoArc.endLng=element.latlng2[1]; - OneQsoArc.name=element.callsign; - if (element.confirmed) { - OneQsoArc.color = 'green'; - } else { - OneQsoArc.color = 'red'; - } - // OneQsoArc.color = [['red', 'white', 'blue', 'green'][Math.round(Math.random() * 3)], ['red', 'white', 'blue', 'green'][Math.round(Math.random() * 3)]] - OneQsoArc.altitude=0.15; - globePayArc.push(OneQsoArc); - let OneQsoLab={}; - OneQsoLab.lat=element.latlng2[0]; - OneQsoLab.lng=element.latlng2[1]; - OneQsoLab.text=element.callsign; - globePayLab.push(OneQsoLab); - }); - renderGlobe(globePayArc,globePayLab); - } - - function renderGlobe(arcsData,labelData) { - Globe() - .globeImageUrl(base_url + '/assets/images/earth-blue-marble.jpg') - .pointOfView({ lat: arcsData[0].startLat, lng: arcsData[0].startLng, altitude:1}, 100) - .labelsData(labelData) - .arcsData(arcsData) - .arcColor('color') - //.arcAltitude('altitude') - .arcAltitudeAutoScale(.3) - .arcStroke(.2) - .arcDashLength(() => .1) - .arcDashGap(() => 0.01) - .arcDashAnimateTime(() => 4000 + 500) - (document.getElementById('advancedmap')) - } + // and set it + $('#advancedmap').css('height', advancedMapHeight + 'px'); + // console.log('#advancedmap: ' + advancedMapHeight); +} +$(document).ready(function() { + $(window).resize(function() { + set_advancedmap_height(); + }); + $('.lba_buttons').click(function() { + // we need some delay because of the bs collapse menu + setTimeout(set_advancedmap_height, 400); + }); +}); \ No newline at end of file From b998f56b76068031061d43c7b1d68b9c6e681507 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 7 May 2024 19:44:49 +0200 Subject: [PATCH 02/15] fix visitor gridsquare map --- application/views/visitor/layout/footer.php | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php index 3b37372db..d4a767cf0 100644 --- a/application/views/visitor/layout/footer.php +++ b/application/views/visitor/layout/footer.php @@ -59,6 +59,32 @@ + + \ No newline at end of file + From 331c3defe0d764dbedc0b0d92407d73acc0fdfcf Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 8 May 2024 13:36:36 +0200 Subject: [PATCH 05/15] Add tooltip --- application/views/debug/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/debug/index.php b/application/views/debug/index.php index 38e8088f0..204377f22 100644 --- a/application/views/debug/index.php +++ b/application/views/debug/index.php @@ -69,7 +69,7 @@ ".phpversion().""; + echo "".phpversion().""; } else { echo "".phpversion().""; } From 84e2e7065e891fdaa2c1c913955386fcfa14a095 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 8 May 2024 14:06:36 +0200 Subject: [PATCH 06/15] Put badge after text --- application/views/debug/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/debug/index.php b/application/views/debug/index.php index 204377f22..09c5ef4ff 100644 --- a/application/views/debug/index.php +++ b/application/views/debug/index.php @@ -68,10 +68,10 @@ PHP Version ".phpversion().""; + if (version_compare(phpversion(), '8', '>')) { + echo phpversion()." OK"; } else { - echo "".phpversion().""; + echo phpversion()." Deprecated"; } ?> From 7e7064a49265fc91c127e07eb3d4680da7948f55 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 8 May 2024 14:21:10 +0200 Subject: [PATCH 07/15] Align version comparison --- application/views/debug/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/debug/index.php b/application/views/debug/index.php index 09c5ef4ff..086ac8ae5 100644 --- a/application/views/debug/index.php +++ b/application/views/debug/index.php @@ -68,7 +68,7 @@ PHP Version ')) { + if (version_compare(PHP_VERSION, '8.0.0') >= 0) { echo phpversion()." OK"; } else { echo phpversion()." Deprecated"; From 0f7650815e93d77853a27738338dfac079e0972b Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 9 May 2024 09:18:48 +0200 Subject: [PATCH 08/15] Added the ability to check for LoTW-user in Quick Lookup --- application/controllers/Lookup.php | 48 ++++++++++++++++----------- application/views/lookup/index.php | 3 +- application/views/lookup/lotwuser.php | 16 +++++++++ assets/js/sections/common.js | 3 +- 4 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 application/views/lookup/lotwuser.php diff --git a/application/controllers/Lookup.php b/application/controllers/Lookup.php index 86e953614..35990fb0a 100644 --- a/application/controllers/Lookup.php +++ b/application/controllers/Lookup.php @@ -27,30 +27,40 @@ class Lookup extends CI_Controller { } public function search() { - $CI =& get_instance(); - $CI->load->model('logbooks_model'); - $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + $this->load->model('logbooks_model'); + $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $location_list = "'".implode("','",$logbooks_locations_array)."'"; $this->load->model('lookup_model'); - $this->load->model('bands'); - - $data['bands'] = $this->bands->get_worked_bands(xss_clean($this->input->post('type'))); $data['type'] = xss_clean($this->input->post('type')); - $data['dxcc'] = xss_clean($this->input->post('dxcc')); - $data['was'] = xss_clean($this->input->post('was')); - $data['sota'] = xss_clean($this->input->post('sota')); - $data['grid'] = xss_clean($this->input->post('grid')); - $data['iota'] = xss_clean($this->input->post('iota')); - $data['cqz'] = xss_clean($this->input->post('cqz')); - $data['wwff'] = xss_clean($this->input->post('wwff')); - $data['location_list'] = $location_list; - $data['result'] = $this->lookup_model->getSearchResult($data); + if ($data['type'] == "lotw") { + $this->load->model('logbook_model'); + $data['callsign'] = xss_clean($this->input->post('lotw')); + $data['lotw_lastupload'] = $this->logbook_model->check_last_lotw($data['callsign']); + + $this->load->view('lookup/lotwuser', $data); + } else { + $this->load->model('bands'); + + $data['bands'] = $this->bands->get_worked_bands(xss_clean($this->input->post('type'))); + + + $data['dxcc'] = xss_clean($this->input->post('dxcc')); + $data['was'] = xss_clean($this->input->post('was')); + $data['sota'] = xss_clean($this->input->post('sota')); + $data['grid'] = xss_clean($this->input->post('grid')); + $data['iota'] = xss_clean($this->input->post('iota')); + $data['cqz'] = xss_clean($this->input->post('cqz')); + $data['wwff'] = xss_clean($this->input->post('wwff')); + $data['location_list'] = $location_list; + + $data['result'] = $this->lookup_model->getSearchResult($data); + $this->load->view('lookup/result', $data); + } - $this->load->view('lookup/result', $data); } public function scp() { @@ -131,11 +141,11 @@ class Lookup extends CI_Controller { public function get_state_list() { $this->load->library('subdivisions'); - + $dxcc = xss_clean($this->input->post('dxcc')); $states_result = $this->subdivisions->get_state_list($dxcc); $subdivision_name = $this->subdivisions->get_primary_subdivision_name($dxcc); - + if ($states_result->num_rows() > 0) { $states_array = $states_result->result_array(); $result = array( @@ -150,7 +160,7 @@ class Lookup extends CI_Controller { echo json_encode(array('status' => 'No States for this DXCC in Database')); } } - + public function get_county() { $json = []; diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php index d1572cf5d..c454e729b 100644 --- a/application/views/lookup/index.php +++ b/application/views/lookup/index.php @@ -7,6 +7,7 @@ +
 
@@ -63,4 +64,4 @@
-
\ No newline at end of file +
diff --git a/application/views/lookup/lotwuser.php b/application/views/lookup/lotwuser.php new file mode 100644 index 000000000..eaa4fa431 --- /dev/null +++ b/application/views/lookup/lotwuser.php @@ -0,0 +1,16 @@ + 365) { + $lotw_hint = ' lotw_info_red'; + } elseif ($lotw_lastupload > 30) { + $lotw_hint = ' lotw_info_orange'; + } elseif ($lotw_lastupload > 7) { + $lotw_hint = ' lotw_info_yellow'; + } + echo 'Yes last upload '.$lotw_lastupload.' days ago'; +} else { + echo "No"; +} +?> diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 2f56f9240..681ee1207 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -661,7 +661,7 @@ function changeLookupType(type) { $('#quicklookupcqz').hide(); $('#quicklookupwas').hide(); $('#quicklookuptext').hide(); - } else if (type == "vucc" || type == "sota" || type == "wwff") { + } else if (type == "vucc" || type == "sota" || type == "wwff" || type == "lotw") { $('#quicklookuptext').show(); $('#quicklookupiota').hide(); $('#quicklookupdxcc').hide(); @@ -698,6 +698,7 @@ function getLookupResult() { iota: $('#quicklookupiota').val(), sota: $('#quicklookuptext').val(), wwff: $('#quicklookuptext').val(), + lotw: $('#quicklookuptext').val(), }, success: function (html) { $('#lookupresulttable').html(html); From 18eb23437def557d8faf40e5c1d6372d2545ae4b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 May 2024 09:44:43 +0200 Subject: [PATCH 09/15] allow to remove lotw, eqsl and clublog password from db --- application/models/User_model.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/application/models/User_model.php b/application/models/User_model.php index cd29c6e20..a362e6574 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -300,19 +300,25 @@ class User_Model extends CI_Model { } } - if($fields['user_lotw_password'] != NULL) + if($fields['user_lotw_password'] != '') { $data['user_lotw_password'] = $fields['user_lotw_password']; + } else { + $data['user_lotw_password'] = NULL; } - if($fields['user_clublog_password'] != NULL) + if($fields['user_clublog_password'] != '') { $data['user_clublog_password'] = $fields['user_clublog_password']; + } else { + $data['user_clublog_password'] = NULL; } - if($fields['user_eqsl_password'] != NULL) + if($fields['user_eqsl_password'] != '') { $data['user_eqsl_password'] = $fields['user_eqsl_password']; + } else { + $data['user_eqsl_password'] = NULL; } // Update the user From 210c84fcb90468285a1c596b0a1a290d2bcc60d6 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 May 2024 09:49:07 +0200 Subject: [PATCH 10/15] removed not needed langline --- application/language/bulgarian/account_lang.php | 1 - application/language/chinese_simplified/account_lang.php | 1 - application/language/czech/account_lang.php | 1 - application/language/dutch/account_lang.php | 1 - application/language/english/account_lang.php | 1 - application/language/finnish/account_lang.php | 1 - application/language/french/account_lang.php | 1 - application/language/german/account_lang.php | 1 - application/language/greek/account_lang.php | 1 - application/language/italian/account_lang.php | 1 - application/language/polish/account_lang.php | 1 - application/language/russian/account_lang.php | 1 - application/language/spanish/account_lang.php | 1 - application/language/swedish/account_lang.php | 1 - application/language/turkish/account_lang.php | 1 - 15 files changed, 15 deletions(-) diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 7543b566c..a95925125 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 5884a1cf8..91056caad 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = '上传卫星状态到'; $lang['account_logbook_of_the_world'] = 'Logbook of the World（LoTW）'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) 用户名'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) 密码'; -$lang['account_leave_blank_to_keep_existing_password'] = '留空以保留现有密码'; $lang['account_clublog'] = 'Clublog'; $lang['account_clublog_email_callsign'] = 'Clublog 邮件地址/呼号'; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index 5ac22ac49..a816dadfd 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Nahrávání stavu SAT QSOs na' $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Přihlašovací jméno Logbook of The World (LoTW)'; $lang['account_logbook_of_the_world_lotw_password'] = 'Heslo Logbook of The World (LoTW)'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Ponechte prázdné, pokud chcete zachovat stávající heslo'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Email nebo značka volacího znaku Club Logu'; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 955e00c93..ef2d9d3b9 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index e1a1543e4..ee38d4384 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index cfa9bfe54..931993338 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Käyttäjänimi'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Salasana'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Jätä tyhjäksi säilyttääksesi tietokannan nykyisen salasanan'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Sähköposti/Kutsu'; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index d6d50ccd5..2eb5ac9e1 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -73,7 +73,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = "Envoi des statuts des QSO par S $lang['account_logbook_of_the_world'] = "Logbook of the World"; $lang['account_logbook_of_the_world_lotw_username'] = "Utilisateur"; $lang['account_logbook_of_the_world_lotw_password'] = "Mot de passe"; -$lang['account_leave_blank_to_keep_existing_password'] = "(Laisser vide pour conserver le mot de passe existant)"; $lang['account_clublog'] = "Club Log"; $lang['account_clublog_email_callsign'] = "Email/Callsign"; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 9cec4eeb5..17c7d3ef8 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Status von SAT QSOs hochladen a $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Benutzername'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Passwort'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leer lassen um das existierende Passwort zu übernehmen'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Rufzeichen'; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index 00158661b..1b1d89f66 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 1137c86db..38d9cfd18 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index 23ed747aa..02ba7fb1f 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 224fead36..72d46dc85 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Загружать статус $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Логин'; $lang['account_logbook_of_the_world_lotw_password'] = 'Пароль'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Оставьте пустым для сохранения текущего пароля'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Емэйл/позывной'; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index f9f6178ea..e0afbe24d 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Subir los estados de QSOs de SA $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Nombre de Usuario Logbook of The World (LoTW)'; $lang['account_logbook_of_the_world_lotw_password'] = 'Contraseña Logbook of The World (LoTW)'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Deje la contraseña en blanco para mantener la contraseña actual'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Correo/Indicativo de Club Log'; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index eb77aa2d3..51f95b8d9 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Ladda upp status för SAT QSOs $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Användarnamn'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Lösenord'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Lämna tomt om du vill behålla befintligt lösenord'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 8b250f043..84084966d 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -75,7 +75,6 @@ $lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; $lang['account_logbook_of_the_world'] = 'Logbook of the World'; $lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; $lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; -$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; $lang['account_clublog'] = 'Club Log'; $lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; From ea893c7a61790aa296fd85f6e9377137b80a8b66 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 May 2024 10:04:17 +0200 Subject: [PATCH 11/15] fix error msg (already in dev) --- application/views/user/edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/user/edit.php b/application/views/user/edit.php index c1738e1b7..c5dbd7959 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -80,7 +80,7 @@ config->item('auth_level'); foreach ($levels as $key => $value) { - echo ''; + echo ''; } ?> From bd4f2a2a50ec09f772cbf9312ad45e1178f6b199 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 May 2024 13:09:34 +0200 Subject: [PATCH 12/15] don't overwrite pwd if it's the placeholder --- application/controllers/User.php | 9 +++++---- application/models/User_model.php | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/application/controllers/User.php b/application/controllers/User.php index bc39cfe83..9816815c5 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -227,6 +227,7 @@ class User extends CI_Controller { $query = $this->user_model->get_by_id($this->uri->segment(3)); $data['existing_languages'] = $this->find(); + $pwd_placeholder = '**********'; $this->load->model('bands'); $this->load->library('form_validation'); @@ -276,7 +277,7 @@ class User extends CI_Controller { $data['user_password'] = $this->input->post('user_password',true); } else { if ($q->user_password !== '' && $q->user_password !== null) { - $data['user_password'] = '**********'; + $data['user_password'] = $pwd_placeholder; } else { $data['user_password'] = ''; } @@ -346,7 +347,7 @@ class User extends CI_Controller { $data['user_clublog_password'] = $this->input->post('user_clublog_password', true); } else { if ($q->user_clublog_password !== '' && $q->user_clublog_password !== null) { - $data['user_clublog_password'] = '**********'; + $data['user_clublog_password'] = $pwd_placeholder; } else { $data['user_clublog_password'] = ''; } @@ -356,7 +357,7 @@ class User extends CI_Controller { $data['user_lotw_password'] = $this->input->post('user_lotw_password', true); } else { if ($q->user_lotw_password !== '' && $q->user_lotw_password !== null) { - $data['user_lotw_password'] = '**********'; + $data['user_lotw_password'] = $pwd_placeholder; } else { $data['user_lotw_password'] = ''; } @@ -372,7 +373,7 @@ class User extends CI_Controller { $data['user_eqsl_password'] = $this->input->post('user_eqsl_password', true); } else { if ($q->user_eqsl_password !== '' && $q->user_eqsl_password !== null) { - $data['user_eqsl_password'] = '**********'; + $data['user_eqsl_password'] = $pwd_placeholder; } else { $data['user_eqsl_password'] = ''; } diff --git a/application/models/User_model.php b/application/models/User_model.php index a362e6574..fb8451ff7 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -291,32 +291,42 @@ class User_Model extends CI_Model { return EEMAILEXISTS; } + $pwd_placeholder = '**********'; + // Hash password if($fields['user_password'] != NULL) { - $data['user_password'] = $this->_hash($fields['user_password']); - if($data['user_password'] == EPASSWORDINVALID) { - return EPASSWORDINVALID; + if ($fields['user_password'] !== $pwd_placeholder) { + $data['user_password'] = $this->_hash($fields['user_password']); + if($data['user_password'] == EPASSWORDINVALID) { + return EPASSWORDINVALID; + } } } if($fields['user_lotw_password'] != '') { - $data['user_lotw_password'] = $fields['user_lotw_password']; + if ($fields['user_lotw_password'] !== $pwd_placeholder) { + $data['user_lotw_password'] = $fields['user_lotw_password']; + } } else { $data['user_lotw_password'] = NULL; } if($fields['user_clublog_password'] != '') { - $data['user_clublog_password'] = $fields['user_clublog_password']; + if ($fields['user_clublog_password'] !== $pwd_placeholder) { + $data['user_clublog_password'] = $fields['user_clublog_password']; + } } else { $data['user_clublog_password'] = NULL; } if($fields['user_eqsl_password'] != '') { - $data['user_eqsl_password'] = $fields['user_eqsl_password']; + if ($fields['user_eqsl_password'] !== $pwd_placeholder) { + $data['user_eqsl_password'] = $fields['user_eqsl_password']; + } } else { $data['user_eqsl_password'] = NULL; } From c30a5509168ec12b8c996a43df93d0892e649d8a Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 9 May 2024 13:15:10 +0200 Subject: [PATCH 13/15] Added striped class to previous qso table --- application/controllers/Logbook.php | 2 +- application/views/qso/components/previous_contacts.php | 10 +++++----- application/views/qso/index.php | 8 +++++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 920d15839..a80ef2c2c 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -656,7 +656,7 @@ class Logbook extends CI_Controller { if (!empty($logbooks_locations_array) && $query->num_rows() > 0) { $html .= "
"; - $html .= ""; + $html .= "
"; $html .= ""; $html .= ""; $html .= ""; diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php index f4cf26494..283818269 100644 --- a/application/views/qso/components/previous_contacts.php +++ b/application/views/qso/components/previous_contacts.php @@ -1,7 +1,7 @@
-
DateCallsign
+
@@ -61,13 +61,13 @@ function echo_table_col($row, $name) { case 'SOTA': echo ''; break; case 'WWFF': echo ''; break; case 'POTA': echo ''; break; - case 'Grid': - $ci->load->library('qra'); + case 'Grid': + $ci->load->library('qra'); echo ''; break; case 'Distance': echo ''; break; case 'Band': echo ''; } else { echo strtolower($row->COL_BAND); } echo ''; break; - case 'Frequency': - $ci->load->library('frequency'); + case 'Frequency': + $ci->load->library('frequency'); echo ''; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break; case 'State': echo ''; break; case 'Operator': echo ''; break; diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 7671ffc5c..39cdc4e43 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -694,7 +694,13 @@
-
+ optionslib->get_option('disable_refresh_past_contacts'); + if($result === null) { ?> +
+ +
+
From a6cd207f37605b1cfa90b538aa874c83bf966945 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 May 2024 14:08:25 +0200 Subject: [PATCH 14/15] add missing data to database --- application/controllers/User.php | 9 ++++++++- application/models/User_model.php | 13 +++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/application/controllers/User.php b/application/controllers/User.php index 9816815c5..ccbe1e257 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -149,7 +149,14 @@ class User extends CI_Controller { $this->input->post('user_wwff_to_qso_tab'), $this->input->post('user_pota_to_qso_tab'), $this->input->post('user_sig_to_qso_tab'), - $this->input->post('user_dok_to_qso_tab') + $this->input->post('user_dok_to_qso_tab'), + $this->input->post('user_lotw_name'), + $this->input->post('user_lotw_password'), + $this->input->post('user_eqsl_name'), + $this->input->post('user_eqsl_password'), + $this->input->post('user_clublog_name'), + $this->input->post('user_clublog_password'), + $this->input->post('user_winkey') )) { // Check for errors case EUSERNAMEEXISTS: diff --git a/application/models/User_model.php b/application/models/User_model.php index fb8451ff7..6d01343c3 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -151,7 +151,9 @@ class User_Model extends CI_Model { $user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url, $user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $user_quicklog_enter, $language, $user_hamsat_key, $user_hamsat_workable_only, $user_iota_to_qso_tab, $user_sota_to_qso_tab, - $user_wwff_to_qso_tab, $user_pota_to_qso_tab, $user_sig_to_qso_tab, $user_dok_to_qso_tab) { + $user_wwff_to_qso_tab, $user_pota_to_qso_tab, $user_sig_to_qso_tab, $user_dok_to_qso_tab, + $user_lotw_name, $user_lotw_password, $user_eqsl_name, $user_eqsl_password, $user_clublog_name, $user_clublog_password, + $user_winkey) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -186,7 +188,14 @@ class User_Model extends CI_Model { 'user_qso_end_times' => xss_clean($user_qso_end_times), 'user_quicklog' => xss_clean($user_quicklog), 'user_quicklog_enter' => xss_clean($user_quicklog_enter), - 'language' => xss_clean($language) + 'language' => xss_clean($language), + 'user_lotw_name' => xss_clean($user_lotw_name), + 'user_lotw_password' => xss_clean($user_lotw_password), + 'user_eqsl_name' => xss_clean($user_eqsl_name), + 'user_eqsl_password' => xss_clean($user_eqsl_password), + 'user_clublog_name' => xss_clean($user_clublog_name), + 'user_clublog_password' => xss_clean($user_clublog_password), + 'winkey' => xss_clean($user_winkey) ); // Check the password is valid From c7a5465b54f1ea49746b09f558fd00d94b6ec8b3 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 9 May 2024 14:24:56 +0200 Subject: [PATCH 15/15] we want to show options of the user the admin is editing --- application/controllers/User.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/application/controllers/User.php b/application/controllers/User.php index ccbe1e257..2ca5bcad9 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -534,7 +534,7 @@ class User extends CI_Controller { if($this->input->post('user_hamsat_key', true)) { $data['user_hamsat_key'] = $this->input->post('user_hamsat_key', true); } else { - $hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'api'))->result(); + $hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'api'), $this->uri->segment(3))->result(); if (count($hkey_opt)>0) { $data['user_hamsat_key'] = $hkey_opt[0]->option_value; } else { @@ -545,7 +545,7 @@ class User extends CI_Controller { if($this->input->post('user_hamsat_workable_only')) { $data['user_hamsat_workable_only'] = $this->input->post('user_hamsat_workable_only', false); } else { - $hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'workable'))->result(); + $hkey_opt=$this->user_options_model->get_options('hamsat',array('option_name'=>'hamsat_key','option_key'=>'workable'), $this->uri->segment(3))->result(); if (count($hkey_opt)>0) { $data['user_hamsat_workable_only'] = $hkey_opt[0]->option_value; } @@ -554,7 +554,7 @@ class User extends CI_Controller { if($this->input->post('user_iota_to_qso_tab')) { $data['user_iota_to_qso_tab'] = $this->input->post('user_iota_to_qso_tab', false); } else { - $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'iota','option_key'=>'show'))->result(); + $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'iota','option_key'=>'show'), $this->uri->segment(3))->result(); if (count($qkey_opt)>0) { $data['user_iota_to_qso_tab'] = $qkey_opt[0]->option_value; } @@ -563,7 +563,7 @@ class User extends CI_Controller { if($this->input->post('user_sota_to_qso_tab')) { $data['user_sota_to_qso_tab'] = $this->input->post('user_sota_to_qso_tab', false); } else { - $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'sota','option_key'=>'show'))->result(); + $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'sota','option_key'=>'show'), $this->uri->segment(3))->result(); if (count($qkey_opt)>0) { $data['user_sota_to_qso_tab'] = $qkey_opt[0]->option_value; } @@ -572,7 +572,7 @@ class User extends CI_Controller { if($this->input->post('user_wwff_to_qso_tab')) { $data['user_wwff_to_qso_tab'] = $this->input->post('user_wwff_to_qso_tab', false); } else { - $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'wwff','option_key'=>'show'))->result(); + $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'wwff','option_key'=>'show'), $this->uri->segment(3))->result(); if (count($qkey_opt)>0) { $data['user_wwff_to_qso_tab'] = $qkey_opt[0]->option_value; } @@ -581,7 +581,7 @@ class User extends CI_Controller { if($this->input->post('user_pota_to_qso_tab')) { $data['user_pota_to_qso_tab'] = $this->input->post('user_pota_to_qso_tab', false); } else { - $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'pota','option_key'=>'show'))->result(); + $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'pota','option_key'=>'show'), $this->uri->segment(3))->result(); if (count($qkey_opt)>0) { $data['user_pota_to_qso_tab'] = $qkey_opt[0]->option_value; } @@ -590,7 +590,7 @@ class User extends CI_Controller { if($this->input->post('user_sig_to_qso_tab')) { $data['user_sig_to_qso_tab'] = $this->input->post('user_sig_to_qso_tab', false); } else { - $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'sig','option_key'=>'show'))->result(); + $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'sig','option_key'=>'show'), $this->uri->segment(3))->result(); if (count($qkey_opt)>0) { $data['user_sig_to_qso_tab'] = $qkey_opt[0]->option_value; } @@ -599,7 +599,7 @@ class User extends CI_Controller { if($this->input->post('user_dok_to_qso_tab')) { $data['user_dok_to_qso_tab'] = $this->input->post('user_dok_to_qso_tab', false); } else { - $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'dok','option_key'=>'show'))->result(); + $qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'dok','option_key'=>'show'), $this->uri->segment(3))->result(); if (count($qkey_opt)>0) { $data['user_dok_to_qso_tab'] = $qkey_opt[0]->option_value; } @@ -636,8 +636,8 @@ class User extends CI_Controller { 'qso'=>array('fas fa-broadcast-tower', 'fas fa-user', 'fas fa-dot-circle' ), 'qsoconfirm'=>array('0', 'fas fa-broadcast-tower', 'fas fa-user', 'fas fa-dot-circle', 'fas fa-check-circle' )); - $data['user_locations_quickswitch'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false'); - $data['user_utc_headermenu'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'utc_headermenu'))->row()->option_value ?? 'false'); + $data['user_locations_quickswitch'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'), $this->uri->segment(3))->row()->option_value ?? 'false'); + $data['user_utc_headermenu'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'utc_headermenu'), $this->uri->segment(3))->row()->option_value ?? 'false'); $this->load->view('interface_assets/header', $data); $this->load->view('user/edit', $data);
/ ' . ($row->COL_SOTA_REF) . '' . ($row->COL_WWFF_REF) . '' . ($row->COL_POTA_REF) . '' . ($ci->qra->echoQrbCalcLink($row->COL_MY_GRIDSQUARE, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.'' . ($row->COL_STATE) . '' . ($row->COL_OPERATOR) . '