Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle virtual Band "All" and "SAT" better

Browse Source
This commit is contained in:
int2001
2024-08-22 09:57:48 +00:00
parent 7c58a8f594
commit 3558fff589
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/controllers/Timeline.php
View File

@@ -17,49 +17,49 @@ class Timeline extends CI_Controller {
$this->load->model('Timeline_model');
if ($this->input->post('band') != NULL) { // Band is not set when page first loads.
$band = $this->input->post('band');
$band = $this->security->xss_clean($this->input->post('band'));
} else {
$band = 'All';
}
if ($this->input->post('propmode') != NULL) {
$propmode = $this->input->post('propmode');
$propmode = $this->security->xss_clean($this->input->post('propmode'));
} else {
$propmode = 'All';
}
if ($this->input->post('mode') != NULL) {
$mode = $this->input->post('mode');
$mode = $this->security->xss_clean($this->input->post('mode'));
} else {
$mode = 'All';
}
if ($this->input->post('award') != NULL) {
$award = $this->input->post('award');
$award = $this->security->xss_clean($this->input->post('award'));
} else {
$award = 'dxcc';
}
if ($this->input->post('qsl') != NULL) {
$qsl = $this->input->post('qsl');
$qsl = $this->security->xss_clean($this->input->post('qsl'));
} else {
$qsl = '0';
}
if ($this->input->post('lotw') != NULL) {
$lotw = $this->input->post('lotw');
$lotw = $this->security->xss_clean($this->input->post('lotw'));
} else {
$lotw = '0';
}
if ($this->input->post('clublog') != NULL) {
$clublog = $this->input->post('clublog');
$clublog = $this->security->xss_clean($this->input->post('clublog'));
} else {
$clublog = '0';
}
if ($this->input->post('eqsl') != NULL) {
$eqsl = $this->input->post('eqsl');
$eqsl = $this->security->xss_clean($this->input->post('eqsl'));
} else {
$eqsl = '0';
}

4
application/models/Timeline_model.php
View File

@@ -37,6 +37,10 @@ class Timeline_model extends CI_Model {
} else { // Not SAT
if ( $propmode == 'All' ) { // Not SAT and Prop=All -> Show everything but not prop_mode SAT
$sql .= " and col_prop_mode !='SAT'";
if ($band != 'All') {
$sql .= " and col_band = ?";
$binding[] = $band;
}
} elseif ($propmode == 'None') { // Not SAT and prop=None --> Take only care of Band (if set)
if ($band != 'All') {
$sql .= " and col_band = ?";