Merge pull request #298 from Manawyrm/patch-2

removed hardcoded table name
这个提交包含在:
Peter Goodhall 2019-06-17 17:47:38 +01:00 提交者 GitHub
当前提交 b6fd9c9668
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23

查看文件

@ -32,7 +32,7 @@ class DXCC extends CI_Model {
function get_worked_bands() {
// get all worked slots from database
$data = $this->db->query(
"SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `TABLE_HRD_CONTACTS_V01`"
"SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `".$this->config->item('table_name')."`"
);
$worked_slots = array();
foreach($data->result() as $row){
@ -54,7 +54,7 @@ class DXCC extends CI_Model {
$data = $this->db->query(
"select COL_COUNTRY, COL_MODE, lcase(COL_BAND) as COL_BAND, count(COL_COUNTRY) as cnt
from TABLE_HRD_CONTACTS_V01
from ".$this->config->item('table_name')."
group by COL_COUNTRY, COL_MODE, COL_BAND"
);
@ -68,6 +68,12 @@ class DXCC extends CI_Model {
}
// update stats
if (!isset($results[$row->COL_COUNTRY]))
$results[$row->COL_COUNTRY] = [];
if (!isset($results[$row->COL_COUNTRY][$row->COL_BAND]))
$results[$row->COL_COUNTRY][$row->COL_BAND] = 0;
$results[$row->COL_COUNTRY][$row->COL_BAND] += $row->cnt;
}