diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 2083a3995..fa166e292 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -813,11 +813,11 @@ class Awards extends CI_Controller { $data['modes'] = $this->modes->active(); // Used in the view for mode select if($this->input->method() === 'post') { - $postdata['qsl'] = 1; - $postdata['lotw'] = 1; - $postdata['eqsl'] = 0; - $postdata['qrz'] = 0; - $postdata['clublog'] = 0; + $postdata['qsl'] = $this->security->xss_clean($this->input->post('qsl')) ?? NULL; + $postdata['lotw'] = $this->security->xss_clean($this->input->post('lotw')) ?? NULL; + $postdata['eqsl'] = $this->security->xss_clean($this->input->post('eqsl')) ?? NULL; + $postdata['qrz'] = $this->security->xss_clean($this->input->post('qrz')) ?? NULL; + $postdata['clublog'] = $this->security->xss_clean($this->input->post('qrz')) ?? NULL; $postdata['worked'] = $this->security->xss_clean($this->input->post('worked')) ?? NULL; $postdata['confirmed'] = $this->security->xss_clean($this->input->post('confirmed')) ?? NULL; $postdata['notworked'] = $this->security->xss_clean($this->input->post('notworked')) ?? NULL; @@ -1570,11 +1570,14 @@ class Awards extends CI_Controller { $postdata['lotw'] = $this->input->post('lotw') == 0 ? NULL: 1; $postdata['qsl'] = $this->input->post('qsl') == 0 ? NULL: 1; + $postdata['eqsl'] = $this->input->post('eqsl') == 0 ? NULL: 1; + $postdata['qrz'] = $this->input->post('qrz') == 0 ? NULL: 1; + $postdata['clublog'] = $this->input->post('clublog') == 0 ? NULL: 1; $postdata['worked'] = $this->input->post('worked') == 0 ? NULL: 1; $postdata['confirmed'] = $this->input->post('confirmed') == 0 ? NULL: 1; $postdata['notworked'] = $this->input->post('notworked') == 0 ? NULL: 1; $postdata['band'] = $this->input->post('band'); - $postdata['mode'] = $this->input->post('mode'); + $postdata['mode'] = $this->input->post('mode'); $postdata['includedeleted'] = $this->input->post('includedeleted') == 0 ? NULL: 1; $postdata['Africa'] = $this->input->post('Africa') == 0 ? NULL: 1; $postdata['Asia'] = $this->input->post('Asia') == 0 ? NULL: 1; diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index 1d4b8843d..643449877 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -53,6 +53,32 @@ +
+
+
+
+ input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('eqsl')) echo ' checked="checked"'; ?> > + +
+
+ input->post('qrz')) echo ' checked="checked"'; ?> > + +
+
+ input->post('clublog')) echo ' checked="checked"'; ?> > + +
+
+
+
diff --git a/assets/js/sections/iotamap.js b/assets/js/sections/iotamap.js index 91f73c1d2..44b821656 100644 --- a/assets/js/sections/iotamap.js +++ b/assets/js/sections/iotamap.js @@ -26,7 +26,7 @@ function load_iota_map() { Antarctica: +$('#Antarctica').prop('checked'), }, success: function(data) { - load_iota_map2(data, worked, confirmed, notworked); + load_iota_map2(data, +$('#worked').prop('checked'), +$('#confirmed').prop('checked'), +$('#notworked').prop('checked')); }, error: function() {