goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #2127 from magicbug/dev

浏览代码 
Fixes a few things that I forgot in the release the first time.
这个提交包含在：
Peter Goodhall 2023-05-10 14:31:38 +01:00 提交者 GitHub
当前提交 377e3875dd
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 10 个文件被更改，包括 28 次插入 和 10 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/config/config.sample.php
查看文件

@ -14,7 +14,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
*/
$config['app_name'] = "Cloudlog";
$config['app_version'] = "2.4.1";
$config['app_version'] = "2.4.2";
$config['directory'] = "logbook";
$config['callbook'] = "hamqth"; // Options are hamqth or qrz

3
application/controllers/Debug.php
查看文件

@ -7,9 +7,6 @@ class Debug extends CI_Controller {
$this->load->model('user_model');
if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
if(ENVIRONMENT != "development") {
show_error("You must have global enviroment set to development", '403', $heading = 'An Error Was Encountered');
}
}
/* User Facing Links to Backup URLs */

6
application/models/Logbookadvanced_model.php
查看文件

@ -80,6 +80,12 @@ class Logbookadvanced_model extends CI_Model {
if ($searchCriteria['propmode'] !== '') {
$conditions[] = "COL_PROP_MODE = ?";
$binding[] = $searchCriteria['propmode'];
if($searchCriteria['propmode'] == "SAT") {
if ($searchCriteria['sats'] !== 'All') {
$conditions[] = "COL_SAT_NAME = ?";
$binding[] = trim($searchCriteria['sats']);
}
}
}
$where = trim(implode(" AND ", $conditions));

3
application/views/interface_assets/header.php
查看文件

@ -174,11 +174,10 @@
<a class="dropdown-item" href="<?php echo site_url('update');?>" title="Update Country Files"><i class="fas fa-sync"></i> Update Country Files</a>
<?php if(ENVIRONMENT == "development") { ?>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="<?php echo site_url('debug');?>" title="Debug Information"><i class="fas fa-tools"></i> Debug Information</a>
<?php } ?>
</div>
</li>
<?php } ?>

2
application/views/qso/index.php
查看文件

@ -5,7 +5,7 @@
<div class="col-sm-5">
<div class="card">
<form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $_GET['manual']; ?>" name="qsos">
<form id="qso_input" method="post" action="<?php echo site_url('qso') . "?manual=" . $_GET['manual']; ?>" name="qsos" autocomplete="off">
<div class="card-header">
<ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right" id="myTab" role="tablist">

3
application/views/user/add.php
查看文件

@ -417,6 +417,7 @@
<label
for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
<select class="custom-select" id="column5" name="user_column5">
<option value=""></option>
<option value="Band"> <?php echo $this->lang->line('gen_hamradio_band'); ?>
</option>
<option value="Frequency">
@ -439,6 +440,8 @@
<?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator">
<?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
<option value="Location">
<?php echo $this->lang->line('cloudlog_station_profile'); ?></option>
</select>
</div>
</div>

2
application/views/user/edit.php
查看文件

@ -423,6 +423,7 @@
<div class="form-group col-md-12">
<label for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
<select class="custom-select" id="column5" name="user_column5">
<option value="" <?php if ($user_column5 == "") { echo " selected =\"selected\""; } ?>></option>
<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
<option value="Frequency" <?php if ($user_column5 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_frequency'); ?></option>
<option value="Mode" <?php if ($user_column5 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
@ -436,6 +437,7 @@
<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('cloudlog_station_profile'); ?></option>
</select>
</div>
</div>

6
application/views/view_log/partial/log_ajax.php
查看文件

@ -14,6 +14,7 @@ function echo_table_header_col($ctx, $name) {
case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</td>'; break;
case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break;
case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break;
case 'Location': echo '<th>'.$ctx->lang->line('cloudlog_station_profile').'</th>'; break;
}
}
@ -33,6 +34,7 @@ function echo_table_col($row, $name) {
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;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator':echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
case 'Location':echo '<td>' . ($row->station_profile_name) . '</td>'; break;
}
}
@ -61,7 +63,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
echo_table_header_col($this, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3'));
echo_table_header_col($this, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
echo_table_header_col($this, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5'));
echo_table_header_col($this, $this->session->userdata('user_column5'));
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<th>QSL</th>
@ -104,7 +106,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
echo_table_col($row, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
echo_table_col($row, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3'));
echo_table_col($row, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
echo_table_col($row, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5'));
echo_table_col($row, $this->session->userdata('user_column5'));
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<td class="qsl">

9
assets/js/sections/logbookadvanced.js
查看文件

@ -11,6 +11,15 @@ $('#band').change(function () {
}
});
$('#selectPropagation').change(function () {
var prop_mode = $("#selectPropagation option:selected").text();
if (prop_mode != "Satellite") {
$(".sats_dropdown").attr("hidden", true);
} else {
$(".sats_dropdown").removeAttr("hidden");
}
});
function updateRow(qso) {
let row = $('#qsoID-' + qso.qsoID);
let cells = row.find('td');

2
install/config/config.php
查看文件

@ -14,7 +14,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
*/
$config['app_name'] = "Cloudlog";
$config['app_version'] = "2.4.1";
$config['app_version'] = "2.4.2";
$config['directory'] = "%directory%";
$config['callbook'] = "hamqth"; // Options are hamqth or qrz