Skip to content

Commit b1c1df2

Browse files
phl0phl0
authored
Merge pull request #254 from phl0/fixActivatedGridsReOrbit
Fix activated grids re orbit
2 parents b923bfb + d86474c commit b1c1df2

File tree

5 files changed

+204
-168
lines changed

5 files changed

+204
-168
lines changed

‎application/controllers/Activated_gridmap.php

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ function __construct() {
66
parent::__construct();
77
}
88

9-
public function index() {
9+
public function index() {
1010
$data['page_title'] = "Activated Gridsquare Map";
1111

12-
$this->load->model('bands');
13-
$this->load->model('activated_gridmap_model');
12+
$this->load->model('bands');
13+
$this->load->model('activated_gridmap_model');
1414
$this->load->model('stations');
1515

1616
$data['visitor'] = false;
1717
$data['homegrid'] = explode(',', $this->stations->find_gridsquare());
1818

1919
$data['modes'] = $this->activated_gridmap_model->get_worked_modes();
2020
$data['bands'] = $this->bands->get_worked_bands();
21+
$data['orbits'] = $this->bands->get_worked_orbits();
2122
$data['sats_available'] = $this->bands->get_worked_sats();
2223

2324
$data['user_default_band'] = $this->session->userdata('user_default_band');
@@ -32,7 +33,7 @@ public function index() {
3233
$data['gridsquares_gridsquares_not_confirmed'] = lang('gridsquares_gridsquares_not_confirmed');
3334
$data['gridsquares_gridsquares_total_activated'] = lang('gridsquares_gridsquares_total_activated');
3435

35-
$footerData = [];
36+
$footerData = [];
3637
$footerData['scripts'] = [
3738
'assets/js/leaflet/geocoding.js',
3839
'assets/js/leaflet/L.MaidenheadColouredGridMap.js',
@@ -45,13 +46,14 @@ public function index() {
4546
}
4647

4748
public function getGridsjs() {
48-
$band = $this->security->xss_clean($this->input->post('band'));
49-
$mode = $this->security->xss_clean($this->input->post('mode'));
50-
$qsl = $this->security->xss_clean($this->input->post('qsl'));
51-
$lotw = $this->security->xss_clean($this->input->post('lotw'));
52-
$eqsl = $this->security->xss_clean($this->input->post('eqsl'));
53-
$qrz = $this->security->xss_clean($this->input->post('qrz'));
49+
$band = $this->security->xss_clean($this->input->post('band'));
50+
$mode = $this->security->xss_clean($this->input->post('mode'));
51+
$qsl = $this->security->xss_clean($this->input->post('qsl'));
52+
$lotw = $this->security->xss_clean($this->input->post('lotw'));
53+
$eqsl = $this->security->xss_clean($this->input->post('eqsl'));
54+
$qrz = $this->security->xss_clean($this->input->post('qrz'));
5455
$sat = $this->security->xss_clean($this->input->post('sat'));
56+
$orbit = $this->security->xss_clean($this->input->post('orbit'));
5557
$this->load->model('activated_gridmap_model');
5658

5759
$array_grid_2char = array();
@@ -70,7 +72,7 @@ public function getGridsjs() {
7072
$grid_4char_confirmed = "";
7173
$grid_6char_confirmed = "";
7274

73-
$query = $this->activated_gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
75+
$query = $this->activated_gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
7476

7577
if ($query && $query->num_rows() > 0) {
7678
foreach ($query->result() as $row) {
@@ -100,7 +102,7 @@ public function getGridsjs() {
100102
}
101103
}
102104

103-
$query = $this->activated_gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
105+
$query = $this->activated_gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
104106

105107
if ($query && $query->num_rows() > 0) {
106108
foreach ($query->result() as $row) {
@@ -130,7 +132,7 @@ public function getGridsjs() {
130132
}
131133
}
132134
}
133-
$query_vucc = $this->activated_gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
135+
$query_vucc = $this->activated_gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
134136

135137
if ($query_vucc && $query_vucc->num_rows() > 0) {
136138
foreach ($query_vucc->result() as $row) {
@@ -155,7 +157,7 @@ public function getGridsjs() {
155157
}
156158

157159
// // Confirmed Squares
158-
$query_vucc = $this->activated_gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
160+
$query_vucc = $this->activated_gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
159161

160162
if ($query_vucc && $query_vucc->num_rows() > 0) {
161163
foreach ($query_vucc->result() as $row) {
@@ -179,15 +181,15 @@ public function getGridsjs() {
179181
}
180182
}
181183

182-
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
184+
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
183185
$data['grid_4char_confirmed'] = ($array_grid_4char_confirmed);
184186
$data['grid_6char_confirmed'] = ($array_grid_6char_confirmed);
185187

186188
$data['grid_2char'] = ($array_grid_2char);
187189
$data['grid_4char'] = ($array_grid_4char);
188190
$data['grid_6char'] = ($array_grid_6char);
189191

190-
header('Content-Type: application/json');
191-
echo json_encode($data);
192-
}
192+
header('Content-Type: application/json');
193+
echo json_encode($data);
194+
}
193195
}

0 commit comments

Comments
 (0)