Skip to content

Commit 4047814

Browse files
magicbugmagicbug
authored
Merge dev into master for a tagged 2.4.3 release
This merges development branch into master tagged for 2.4.3
2 parents 377e387 + 4f91857 commit 4047814

File tree

134 files changed

+3022
-1259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+3022
-1259
lines changed

‎application/config/autoload.php

+12-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
| $autoload['helper'] = array('url', 'file');
6565
*/
6666

67-
$autoload['helper'] = array('url', 'security');
67+
$autoload['helper'] = array('url', 'security', 'language');
6868

6969

7070
/*
@@ -96,8 +96,17 @@
9696
|
9797
*/
9898

99-
$autoload['language'] = array('general_words');
100-
99+
$autoload['language'] = array(
100+
'account',
101+
'contesting',
102+
'eqsl',
103+
'general_words',
104+
'lotw',
105+
'menu',
106+
'notes',
107+
'qslcard',
108+
'qso',
109+
);
101110

102111
/*
103112
| -------------------------------------------------------------------

‎application/config/migration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
| be upgraded / downgraded to.
2222
|
2323
*/
24-
$config['migration_version'] = 121;
24+
$config['migration_version'] = 123;
2525

2626
/*
2727
|--------------------------------------------------------------------------

‎application/controllers/Activated_grids.php

+44-45
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22

33
/*
4-
4+
55
Activated_grids Controller
6-
6+
77
*/
88

99
class Activated_grids extends CI_Controller {
@@ -14,6 +14,15 @@ class Activated_grids extends CI_Controller {
1414
* - Band page provide a band dropdown list
1515
* - Find somewhere in the main menu to add a button to it
1616
*/
17+
function __construct()
18+
{
19+
parent::__construct();
20+
21+
// Load language files
22+
$this->lang->load(array(
23+
'gridsquares',
24+
));
25+
}
1726

1827

1928
public function index() {
@@ -77,21 +86,19 @@ public function satellites()
7786
if ($this->config->item('map_6digit_grids')) {
7887
$grid_six = strtoupper(substr($subsquare,0,6));
7988
}
80-
89+
8190
// Check if 2 Char is in array
82-
if(!in_array($grid_two, $array_grid_2char)){
83-
array_push($array_grid_2char, $grid_two);
91+
if(!in_array($grid_two, $array_confirmed_grid_2char)){
92+
array_push($array_confirmed_grid_2char, $grid_two);
8493
}
85-
86-
87-
if(!in_array($grid_four, $array_grid_4char)){
88-
array_push($array_grid_4char, $grid_four);
94+
95+
if(!in_array($grid_four, $array_confirmed_grid_4char)){
96+
array_push($array_confirmed_grid_4char, $grid_four);
8997
}
90-
91-
98+
9299
if ($this->config->item('map_6digit_grids')) {
93-
if(!in_array($grid_six, $array_grid_6char)){
94-
array_push($array_grid_6char, $grid_six);
100+
if(!in_array($grid_six, $array_confirmed_grid_6char)){
101+
array_push($array_confirmed_grid_6char, $grid_six);
95102
}
96103
}
97104
}
@@ -103,21 +110,19 @@ public function satellites()
103110
if ($this->config->item('map_6digit_grids')) {
104111
$grid_6char_confirmed = strtoupper(substr($row->SAT_SQUARE,0,6));
105112
}
106-
113+
107114
// Check if 2 Char is in array
108115
if(!in_array($grid_2char_confirmed, $array_confirmed_grid_2char)){
109-
array_push($array_confirmed_grid_2char, $grid_2char_confirmed);
116+
array_push($array_confirmed_grid_2char, $grid_2char_confirmed);
110117
}
111-
112-
118+
113119
if(!in_array($grid_4char_confirmed, $array_confirmed_grid_4char)){
114-
array_push($array_confirmed_grid_4char, $grid_4char_confirmed);
120+
array_push($array_confirmed_grid_4char, $grid_4char_confirmed);
115121
}
116-
117-
122+
118123
if ($this->config->item('map_6digit_grids')) {
119124
if(!in_array($grid_6char_confirmed, $array_confirmed_grid_6char)){
120-
array_push($array_confirmed_grid_6char, $grid_6char_confirmed);
125+
array_push($array_confirmed_grid_6char, $grid_6char_confirmed);
121126
}
122127
}
123128

@@ -144,21 +149,19 @@ public function satellites()
144149
if ($this->config->item('map_6digit_grids')) {
145150
$grid_six = strtoupper(substr($subsquare,0,6));
146151
}
147-
152+
148153
// Check if 2 Char is in array
149154
if(!in_array($grid_two, $array_grid_2char)){
150-
array_push($array_grid_2char, $grid_two);
155+
array_push($array_grid_2char, $grid_two);
151156
}
152-
153-
157+
154158
if(!in_array($grid_four, $array_grid_4char)){
155-
array_push($array_grid_4char, $grid_four);
159+
array_push($array_grid_4char, $grid_four);
156160
}
157-
158-
161+
159162
if ($this->config->item('map_6digit_grids')) {
160163
if(!in_array($grid_six, $array_grid_6char)){
161-
array_push($array_grid_6char, $grid_six);
164+
array_push($array_grid_6char, $grid_six);
162165
}
163166
}
164167
}
@@ -170,21 +173,19 @@ public function satellites()
170173
if ($this->config->item('map_6digit_grids')) {
171174
$grid_six = strtoupper(substr($row->SAT_SQUARE,0,6));
172175
}
173-
176+
174177
// Check if 2 Char is in array
175178
if(!in_array($grid_two, $array_grid_2char)){
176-
array_push($array_grid_2char, $grid_two);
179+
array_push($array_grid_2char, $grid_two);
177180
}
178-
179-
181+
180182
if(!in_array($grid_four, $array_grid_4char)){
181-
array_push($array_grid_4char, $grid_four);
183+
array_push($array_grid_4char, $grid_four);
182184
}
183-
184-
185+
185186
if ($this->config->item('map_6digit_grids')) {
186187
if(!in_array($grid_six, $array_grid_6char)){
187-
array_push($array_grid_6char, $grid_six);
188+
array_push($array_grid_6char, $grid_six);
188189
}
189190
}
190191

@@ -205,7 +206,6 @@ function js_array($array)
205206
return '[' . implode(',', $temp) . ']';
206207
}
207208

208-
209209
$data['grid_2char_confirmed'] = js_array($array_confirmed_grid_2char);
210210
$data['grid_4char_confirmed'] = js_array($array_confirmed_grid_4char);
211211
$data['grid_6char_confirmed'] = js_array($array_confirmed_grid_6char);
@@ -219,7 +219,6 @@ function js_array($array)
219219
$this->load->view('activated_grids/index.php');
220220
$this->load->view('interface_assets/footer');
221221
}
222-
223222

224223
public function band($band)
225224
{
@@ -257,16 +256,16 @@ public function band($band)
257256

258257
// Check if 2 Char is in array
259258
if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
260-
array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
259+
array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
261260
}
262261

263262
if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
264-
array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
263+
array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
265264
}
266265

267266
if ($this->config->item('map_6digit_grids')) {
268267
if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
269-
array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
268+
array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
270269
}
271270
}
272271
}
@@ -287,18 +286,18 @@ public function band($band)
287286

288287
// Check if 2 Char is in array
289288
if(!in_array($grid_two, $array_grid_2char)){
290-
array_push($array_grid_2char, $grid_two);
289+
array_push($array_grid_2char, $grid_two);
291290
}
292291

293292

294293
if(!in_array($grid_four, $array_grid_4char)){
295-
array_push($array_grid_4char, $grid_four);
294+
array_push($array_grid_4char, $grid_four);
296295
}
297296

298297

299298
if ($this->config->item('map_6digit_grids')) {
300299
if(!in_array($grid_six, $array_grid_6char)){
301-
array_push($array_grid_6char, $grid_six);
300+
array_push($array_grid_6char, $grid_six);
302301
}
303302
}
304303

‎application/controllers/Dashboard.php

+7
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@ public function index()
114114

115115
}
116116

117+
function radio_display_component() {
118+
$this->load->model('cat');
119+
120+
$data['radio_status'] = $this->cat->recent_status();
121+
$this->load->view('components/radio_display_table', $data);
122+
}
123+
117124
function map() {
118125
$this->load->model('logbook_model');
119126

0 commit comments

Comments
 (0)