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

Merge pull request #2691 from phl0/fixPreviousLookups

浏览代码 
Prevent fetching image from non-existent qrz.com entry
这个提交包含在：
Peter Goodhall 2023-11-15 10:29:27 +00:00 提交者 GitHub
当前提交 5a3f362a3e
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改，包括 18 次插入 和 8 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

26
application/controllers/Logbook.php
查看文件

@ -168,7 +168,7 @@ class Logbook extends CI_Controller {
$return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $type, $band, $mode); $return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $type, $band, $mode);
if ($this->session->userdata('user_show_profile_image')) { if ($this->session->userdata('user_show_profile_image')) {
if (isset($callbook)) { if (isset($callbook) && isset($callbook['image'])) {
if ($callbook['image'] == "") { if ($callbook['image'] == "") {
$return['image'] = "n/a"; $return['image'] = "n/a";
} else { } else {
@ -851,14 +851,16 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
$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);
} }
$data= $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname')); $callsign['callsign'] = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname'));
if (empty($data['callsign'])) if (empty($callsign['callsign']['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);
$data = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname')); $callsign['callsign'] = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname'));
} }
} else {
$callsign['error'] = 'Lookup not configured or set to hamqth. Currently only qrz is supported.';
} }
// There's no hamli integration? Disabled for now. // There's no hamli integration? Disabled for now.
@ -866,12 +868,20 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
// Lookup using hamli // Lookup using hamli
$this->load->library('hamli'); $this->load->library('hamli');
$data['callsign'] = $this->hamli->callsign($id); $callsign['callsign'] = $this->hamli->callsign($id);
}*/ }*/
$data['id'] = strtoupper($id); if (isset($callsign['callsign']['gridsquare'])) {
$CI = &get_instance();
$CI->load->model('logbook_model');
$callsign['grid_worked'] = $CI->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($callsign['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
}
if (isset($callsign['callsign']['error'])) {
$callsign['error'] = $callsign['callsign']['error'];
}
$callsign['id'] = strtoupper($id);
return $this->load->view('search/result', $data, true); return $this->load->view('search/result', $callsign, true);
} }
} }
@ -928,7 +938,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
$data['error'] = $data['callsign']['error']; $data['error'] = $data['callsign']['error'];
} }
} else { } else {
$data['error'] = 'No result (qrz not configured)'; $data['error'] = 'Lookup not configured or set to hamqth. Currently only qrz is supported.';
} /*else { } /*else {
// Lookup using hamli // Lookup using hamli
$this->load->library('hamli'); $this->load->library('hamli');