Skip to content

Commit 377e387

Browse files
magicbugmagicbug
authored
Merge pull request #2127 from magicbug/dev
Fixes a few things that I forgot in the release the first time.
2 parents 9e502ea + c61bb81 commit 377e387

File tree

10 files changed

+28
-10
lines changed

10 files changed

+28
-10
lines changed

‎application/config/config.sample.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
$config['app_name'] = "Cloudlog";
17-
$config['app_version'] = "2.4.1";
17+
$config['app_version'] = "2.4.2";
1818
$config['directory'] = "logbook";
1919

2020
$config['callbook'] = "hamqth"; // Options are hamqth or qrz

‎application/controllers/Debug.php

-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ function __construct()
77

88
$this->load->model('user_model');
99
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
10-
if(ENVIRONMENT != "development") {
11-
show_error("You must have global enviroment set to development", '403', $heading = 'An Error Was Encountered');
12-
}
1310
}
1411

1512
/* User Facing Links to Backup URLs */

‎application/models/Logbookadvanced_model.php

+6
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ public function searchQsos($searchCriteria) : array {
8080
if ($searchCriteria['propmode'] !== '') {
8181
$conditions[] = "COL_PROP_MODE = ?";
8282
$binding[] = $searchCriteria['propmode'];
83+
if($searchCriteria['propmode'] == "SAT") {
84+
if ($searchCriteria['sats'] !== 'All') {
85+
$conditions[] = "COL_SAT_NAME = ?";
86+
$binding[] = trim($searchCriteria['sats']);
87+
}
88+
}
8389
}
8490

8591
$where = trim(implode(" AND ", $conditions));

‎application/views/interface_assets/header.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,10 @@
174174

175175
<a class="dropdown-item" href="<?php echo site_url('update');?>" title="Update Country Files"><i class="fas fa-sync"></i> Update Country Files</a>
176176

177-
<?php if(ENVIRONMENT == "development") { ?>
178177
<div class="dropdown-divider"></div>
179178

180179
<a class="dropdown-item" href="<?php echo site_url('debug');?>" title="Debug Information"><i class="fas fa-tools"></i> Debug Information</a>
181-
<?php } ?>
180+
182181
</div>
183182
</li>
184183
<?php } ?>

‎application/views/qso/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="col-sm-5">
66
<div class="card">
77

8-
<form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $_GET['manual']; ?>" name="qsos">
8+
<form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $_GET['manual']; ?>" name="qsos" autocomplete="off">
99

1010
<div class="card-header">
1111
<ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right" id="myTab" role="tablist">

‎application/views/user/add.php

+3
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@
417417
<label
418418
for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
419419
<select class="custom-select" id="column5" name="user_column5">
420+
<option value=""></option>
420421
<option value="Band"> <?php echo $this->lang->line('gen_hamradio_band'); ?>
421422
</option>
422423
<option value="Frequency">
@@ -439,6 +440,8 @@
439440
<?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
440441
<option value="Operator">
441442
<?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
443+
<option value="Location">
444+
<?php echo $this->lang->line('cloudlog_station_profile'); ?></option>
442445
</select>
443446
</div>
444447
</div>

‎application/views/user/edit.php

+2
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@
423423
<div class="form-group col-md-12">
424424
<label for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
425425
<select class="custom-select" id="column5" name="user_column5">
426+
<option value="" <?php if ($user_column5 == "") { echo " selected =\"selected\""; } ?>></option>
426427
<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
427428
<option value="Frequency" <?php if ($user_column5 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_frequency'); ?></option>
428429
<option value="Mode" <?php if ($user_column5 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
@@ -436,6 +437,7 @@
436437
<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
437438
<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
438439
<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
440+
<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('cloudlog_station_profile'); ?></option>
439441
</select>
440442
</div>
441443
</div>

‎application/views/view_log/partial/log_ajax.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ function echo_table_header_col($ctx, $name) {
1414
case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</td>'; break;
1515
case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break;
1616
case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break;
17+
case 'Location': echo '<th>'.$ctx->lang->line('cloudlog_station_profile').'</th>'; break;
1718
}
1819
}
1920

@@ -33,6 +34,7 @@ function echo_table_col($row, $name) {
3334
case 'Frequency': echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
3435
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
3536
case 'Operator':echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
37+
case 'Location':echo '<td>' . ($row->station_profile_name) . '</td>'; break;
3638
}
3739
}
3840

@@ -61,7 +63,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
6163
echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
6264
echo_table_header_col($this, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3'));
6365
echo_table_header_col($this, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
64-
echo_table_header_col($this, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5'));
66+
echo_table_header_col($this, $this->session->userdata('user_column5'));
6567

6668
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
6769
<th>QSL</th>
@@ -104,7 +106,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
104106
echo_table_col($row, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
105107
echo_table_col($row, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3'));
106108
echo_table_col($row, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
107-
echo_table_col($row, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5'));
109+
echo_table_col($row, $this->session->userdata('user_column5'));
108110

109111
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
110112
<td class="qsl">

‎assets/js/sections/logbookadvanced.js

+9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ $('#band').change(function () {
1111
}
1212
});
1313

14+
$('#selectPropagation').change(function () {
15+
var prop_mode = $("#selectPropagation option:selected").text();
16+
if (prop_mode != "Satellite") {
17+
$(".sats_dropdown").attr("hidden", true);
18+
} else {
19+
$(".sats_dropdown").removeAttr("hidden");
20+
}
21+
});
22+
1423
function updateRow(qso) {
1524
let row = $('#qsoID-' + qso.qsoID);
1625
let cells = row.find('td');

‎install/config/config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
$config['app_name'] = "Cloudlog";
17-
$config['app_version'] = "2.4.1";
17+
$config['app_version'] = "2.4.2";
1818
$config['directory'] = "%directory%";
1919
$config['callbook'] = "hamqth"; // Options are hamqth or qrz
2020

0 commit comments

Comments
 (0)