diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index c102a070..d1ec8f38 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -225,6 +225,13 @@ class Logbook extends CI_Controller { $extrawhere.=" COL_EQSL_QSL_RCVD='Y'"; } + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) { + if ($extrawhere!='') { + $extrawhere.=" OR"; + } + $extrawhere.=" COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y'"; + } + if($type == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); @@ -350,6 +357,13 @@ class Logbook extends CI_Controller { $extrawhere.=" COL_EQSL_QSL_RCVD='Y'"; } + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) { + if ($extrawhere!='') { + $extrawhere.=" OR"; + } + $extrawhere.=" COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y'"; + } + if($type == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); if ($extrawhere != '') { @@ -432,6 +446,13 @@ class Logbook extends CI_Controller { $extrawhere.=" COL_EQSL_QSL_RCVD='Y'"; } + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) { + if ($extrawhere!='') { + $extrawhere.=" OR"; + } + $extrawhere.=" COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y'"; + } + if($type == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); @@ -526,6 +547,13 @@ class Logbook extends CI_Controller { } $extrawhere.=" COL_EQSL_QSL_RCVD='Y'"; } + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) { + if ($extrawhere!='') { + $extrawhere.=" OR"; + } + $extrawhere.=" COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y'"; + } + if($type == "SAT") { diff --git a/application/controllers/User.php b/application/controllers/User.php index 7dd7802d..31cc70c4 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -89,7 +89,7 @@ class User extends CI_Controller { $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); $data['user_default_band'] = $this->input->post('user_default_band'); - $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); + $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter'); @@ -127,7 +127,7 @@ class User extends CI_Controller { $this->input->post('user_amsat_status_upload'), $this->input->post('user_mastodon_url'), $this->input->post('user_default_band'), - ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''), + ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : ''), $this->input->post('user_qso_end_times'), $this->input->post('user_quicklog'), $this->input->post('user_quicklog_enter'), @@ -177,7 +177,7 @@ class User extends CI_Controller { $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); $data['user_default_band'] = $this->input->post('user_default_band'); - $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); + $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter'); @@ -447,7 +447,7 @@ class User extends CI_Controller { } if($this->input->post('user_default_confirmation')) { - $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); + $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : ''); } else { $data['user_default_confirmation'] = $q->user_default_confirmation; } @@ -605,7 +605,7 @@ class User extends CI_Controller { $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); $data['user_default_band'] = $this->input->post('user_default_band'); - $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : ''); + $data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : ''); $data['user_qso_end_times'] = $this->input->post('user_qso_end_times'); $data['user_quicklog'] = $this->input->post('user_quicklog'); $data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter'); diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 97c20cb4..1f91344c 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1848,6 +1848,13 @@ class Logbook_model extends CI_Model { $extrawhere.=" COL_EQSL_QSL_RCVD='Y'"; } + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) { + if ($extrawhere!='') { + $extrawhere.=" OR"; + } + $extrawhere.=" COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y'"; + } + $this->db->select('COL_CALL'); $this->db->where_in('station_id', $logbooks_locations_array); diff --git a/application/models/User_model.php b/application/models/User_model.php index f80ffbc5..31ea1496 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -239,7 +239,7 @@ class User_Model extends CI_Model { 'user_amsat_status_upload' => xss_clean($fields['user_amsat_status_upload']), 'user_mastodon_url' => xss_clean($fields['user_mastodon_url']), 'user_default_band' => xss_clean($fields['user_default_band']), - 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''), + 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : '').(isset($fields['user_default_confirmation_qrz']) ? 'Z' : ''), 'user_qso_end_times' => xss_clean($fields['user_qso_end_times']), 'user_quicklog' => xss_clean($fields['user_quicklog']), 'user_quicklog_enter' => xss_clean($fields['user_quicklog_enter']), diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 283690df..fd19d762 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -106,6 +106,14 @@ echo '>'; ?> +
+ '; ?> + +
diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index 4a1f692b..4481baab 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -107,6 +107,14 @@ echo '>'; ?> +
+ '; ?> + +
diff --git a/application/views/user/add.php b/application/views/user/add.php index 9f328783..ca269bd4 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -626,6 +626,14 @@ echo '>'; ?> +
+ '; ?> + +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 9aa3e67e..c5f9bd98 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -618,6 +618,14 @@ echo '>'; ?> +
+ '; ?> + +