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

Fixed an if check callbook result

浏览代码
这个提交包含在：
Andreas 2023-10-20 11:37:12 +02:00
父节点 3383e5a92a
当前提交 810cc58c3b
共有 1 个文件被更改，包括 3 次插入 和 5 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

8
application/models/Logbook_model.php
查看文件

@ -1703,7 +1703,7 @@ class Logbook_model extends CI_Model {
$extrawhere=''; $extrawhere='';
if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'"; $extrawhere="COL_QSL_RCVD='Y'";
} }
if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
@ -3176,7 +3176,7 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
} else { } else {
$input_lotw_qslrdate = NULL; $input_lotw_qslrdate = NULL;
} }
if (isset($record['lotw_qsl_sent'])){ if (isset($record['lotw_qsl_sent'])){
$input_lotw_qsl_sent = mb_strimwidth($record['lotw_qsl_sent'], 0, 1); $input_lotw_qsl_sent = mb_strimwidth($record['lotw_qsl_sent'], 0, 1);
} else if ($markLotw != NULL) { } else if ($markLotw != NULL) {
@ -4131,12 +4131,10 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$this->session->set_userdata('qrz_session_key', $qrz_session_key); $this->session->set_userdata('qrz_session_key', $qrz_session_key);
} }
$callbook = $this->qrz->search($callsign, $this->session->userdata('qrz_session_key'), $use_fullname); $callbook = $this->qrz->search($callsign, $this->session->userdata('qrz_session_key'), $use_fullname);
// if we got nothing, it's probably because our session key is invalid, try again // if we got nothing, it's probably because our session key is invalid, try again
if (!isset($callbook['callsign'])) if (($callbook['callsign'] ?? '') == '')
{ {
$qrz_session_key = $this->qrz->session($this->config->item('qrz_username'), $this->config->item('qrz_password')); $qrz_session_key = $this->qrz->session($this->config->item('qrz_username'), $this->config->item('qrz_password'));
$this->session->set_userdata('qrz_session_key', $qrz_session_key); $this->session->set_userdata('qrz_session_key', $qrz_session_key);