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

Merge pull request #2323 from int2001/remove_old_api_endpoints

浏览代码 
Removed old API-Endpoints for country_ and grid_worked
这个提交包含在：
Peter Goodhall 2023-07-25 14:19:44 +01:00 提交者 GitHub
当前提交 cb54beed1c
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 0 次插入 和 65 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

13
application/controllers/Api.php
查看文件

@ -618,19 +618,6 @@ class API extends CI_Controller {
}
function country_worked($dxcc_num, $band, $mode = NULL) {
$this->load->model('api_model');
echo $this->api_model->country_worked($dxcc_num, $band, $mode);
}
function gridsquare_worked($gridsquare, $band, $mode = NULL) {
$this->load->model('api_model');
echo $this->api_model->gridsquare_worked($gridsquare, $band, $mode);
}
/* ENDPOINT for Rig Control */
function radio() {

52
application/models/Api_model.php
查看文件

@ -61,58 +61,6 @@ class API_Model extends CI_Model {
}
function country_worked($dxcc_num, $band, $mode){
if($band == "all") {
if($mode != NULL) {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_MODE = "'.$mode.'"');
} else {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'"');
}
} else {
if($mode != NULL) {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"');
} else {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'"');
}
}
if ($query->num_rows() > 0)
{
foreach ($query->result() as $row)
{
return $row->count;
}
}
}
function gridsquare_worked($gridsquare, $band, $mode){
if($band == "all") {
if($mode != NULL) {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_MODE = "'.$mode.'"');
} else {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%"');
}
} else {
if($mode != NULL) {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"');
} else {
$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND ="'.$band.'"');
}
}
if ($query->num_rows() > 0)
{
foreach ($query->result() as $row)
{
return $row->count;
}
}
}
function delete_key($key) {
$this->db->where('user_id', $this->session->userdata('user_id'));