Renamed Lib

This commit is contained in:
int2001
2024-02-18 14:54:45 +00:00
parent 2f49882cc4
commit e73abf39ee
8 changed files with 68 additions and 68 deletions

View File

@@ -3,7 +3,7 @@
class CQ extends CI_Model{
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
function get_cq_array($bands, $postdata, $location_list) {
@@ -13,7 +13,7 @@ class CQ extends CI_Model{
$cqZ[$i]['count'] = 0; // Inits each cq zone's count
}
$qsl = $this->generichelpers->gen_qsl_from_postdata($postdata);
$qsl = $this->genfunctions->gen_qsl_from_postdata($postdata);
foreach ($bands as $band) {
for ($i = 1; $i <= 40; $i++) {
@@ -79,7 +79,7 @@ class CQ extends CI_Model{
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= " and not exists (select 1 from " . $this->config->item('table_name') .
" where station_id in (" . $location_list .
@@ -89,9 +89,9 @@ class CQ extends CI_Model{
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= ")";
@@ -112,9 +112,9 @@ class CQ extends CI_Model{
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);
@@ -197,7 +197,7 @@ class CQ extends CI_Model{
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);

View File

@@ -3,7 +3,7 @@
class DOK extends CI_Model {
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
function get_dok_array($bands, $postdata, $location_list) {
@@ -17,7 +17,7 @@ class DOK extends CI_Model {
$doks[$dok->COL_DARC_DOK]['count'] = 0;
}
$qsl = $this->generichelpers->gen_qsl_from_postdata($postdata);
$qsl = $this->genfunctions->gen_qsl_from_postdata($postdata);
foreach ($bands as $band) {
foreach ($list as $dok) {
@@ -88,13 +88,13 @@ class DOK extends CI_Model {
$sql .= " AND (COL_MODE = '" . $postdata['mode'] . "' OR COL_SUBMODE = '" . $postdata['mode'] . "')";
}
$sql .= $this->addDokTypeToQuery($postdata['doks']);
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= " AND NOT EXISTS (SELECT 1 from " . $this->config->item('table_name') .
" WHERE station_id in (" . $location_list .
") AND COL_DARC_DOK = thcv.COL_DARC_DOK AND COL_DARC_DOK <> '' AND COL_DARC_DOK <> 'NM' ";
$sql .= $this->addDokTypeToQuery($postdata['doks']);
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= ")";
$query = $this->db->query($sql);
@@ -109,8 +109,8 @@ class DOK extends CI_Model {
$sql .= " AND (COL_MODE = '" . $postdata['mode'] . "' or COL_SUBMODE = '" . $postdata['mode'] . "')";
}
$sql .= $this->addDokTypeToQuery($postdata['doks']);
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);
return $query->result();
}
@@ -186,7 +186,7 @@ class DOK extends CI_Model {
} else if ($postdata['doks'] == 'sdok') {
$sql .= " AND COL_DARC_DOK NOT REGEXP '^[A-Z][0-9]{2}$'";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);
return $query->result();
}

View File

@@ -3,7 +3,7 @@
class DXCC extends CI_Model {
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
/**
@@ -74,7 +74,7 @@ class DXCC extends CI_Model {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$qsl = $this->generichelpers->gen_qsl_from_postdata($postdata);
$qsl = $this->genfunctions->gen_qsl_from_postdata($postdata);
foreach ($bands as $band) { // Looping through bands and entities to generate the array needed for display
foreach ($dxccArray as $dxcc) {
@@ -136,13 +136,13 @@ class DXCC extends CI_Model {
where station_id in (" . $location_list .
") and col_dxcc > 0";
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
if ($postdata['mode'] != 'All') {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= " group by col_dxcc
) x on dxcc_entities.adif = x.col_dxcc";
@@ -164,7 +164,7 @@ class DXCC extends CI_Model {
select col_dxcc from ".$this->config->item('table_name')." thcv
where station_id in (" . $location_list .
") and col_dxcc > 0";
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
if ($postdata['mode'] != 'All') {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
@@ -232,20 +232,20 @@ class DXCC extends CI_Model {
from ".$this->config->item('table_name')." thcv
where station_id in (" . $location_list .
") and col_dxcc > 0";
$sql .= $this->generichelpers->addBandToQuery($postdata['band']);
$sql .= $this->genfunctions->addBandToQuery($postdata['band']);
if ($postdata['mode'] != 'All') {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= " and not exists (select 1 from ".$this->config->item('table_name')." where station_id in (". $location_list .") and col_dxcc = thcv.col_dxcc and col_dxcc > 0";
$sql .= $this->generichelpers->addBandToQuery($postdata['band']);
$sql .= $this->genfunctions->addBandToQuery($postdata['band']);
if ($postdata['mode'] != 'All') {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= ')';
$sql .= " group by col_dxcc
) ll on dxcc_entities.adif = ll.col_dxcc
@@ -268,13 +268,13 @@ class DXCC extends CI_Model {
where station_id in (". $location_list .
") and col_dxcc > 0";
$sql .= $this->generichelpers->addBandToQuery($postdata['band']);
$sql .= $this->genfunctions->addBandToQuery($postdata['band']);
if ($postdata['mode'] != 'All') {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= " group by col_dxcc
) ll on dxcc_entities.adif = ll.col_dxcc
@@ -417,7 +417,7 @@ class DXCC extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
if ($postdata['includedeleted'] == NULL) {

View File

@@ -3,7 +3,7 @@
class helvetia_model extends CI_Model {
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
public $stateString = 'AG,AI,AR,BE,BL,BS,FR,GE,GL,GR,JU,LU,NE,NW,OW,SG,SH,SO,SZ,TG,TI,UR,VD,VS,ZG,ZH';
@@ -23,7 +23,7 @@ class helvetia_model extends CI_Model {
$states = array(); // Used for keeping thelvetiak of which states that are not worked
$qsl = $this->generichelpers->gen_qsl_from_postdata($postdata);
$qsl = $this->genfunctions->gen_qsl_from_postdata($postdata);
foreach ($stateArray as $state) { // Generating array for use in the table
$states[$state]['count'] = 0; // Inits each state's count
@@ -173,7 +173,7 @@ class helvetia_model extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
@@ -196,7 +196,7 @@ class helvetia_model extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= " and not exists (select 1 from ". $this->config->item('table_name') .
" where station_id in (". $location_list . ")" .
@@ -206,9 +206,9 @@ class helvetia_model extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
@@ -233,9 +233,9 @@ class helvetia_model extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);

View File

@@ -2,7 +2,7 @@
class IOTA extends CI_Model {
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
function get_iota_array($iotaArray, $bands, $postdata) {
@@ -81,7 +81,7 @@ class IOTA extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
if ($postdata['includedeleted'] == NULL) {
$sql .= " and coalesce(iota.status, '') <> 'D'";
@@ -104,7 +104,7 @@ class IOTA extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
if ($postdata['includedeleted'] == NULL) {
$sql .= " and coalesce(iota.status, '') <> 'D'";
@@ -173,11 +173,11 @@ class IOTA extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($postdata['band']);
$sql .= $this->genfunctions->addBandToQuery($postdata['band']);
$sql .= " and (col_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y'))";
$sql .= $this->generichelpers->addBandToQuery($postdata['band']);
$sql .= $this->genfunctions->addBandToQuery($postdata['band']);
if ($postdata['includedeleted'] == NULL) {
$sql .= " and coalesce(iota.status, '') <> 'D'";
@@ -211,7 +211,7 @@ class IOTA extends CI_Model {
$sql .= $this->addContinentsToQuery($postdata);
$sql .= $this->generichelpers->addBandToQuery($postdata['band']);
$sql .= $this->genfunctions->addBandToQuery($postdata['band']);
$query = $this->db->query($sql);

View File

@@ -3,7 +3,7 @@
class rac extends CI_Model {
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
public $stateString = 'AB,BC,MB,NB,NL,NT,NS,NU,ON,PE,QC,SK,YT';
@@ -23,7 +23,7 @@ class rac extends CI_Model {
$states = array(); // Used for keeping track of which states that are not worked
$qsl = $this->generichelpers->gen_qsl_from_postdata($postdata);
$qsl = $this->genfunctions->gen_qsl_from_postdata($postdata);
foreach ($stateArray as $state) { // Generating array for use in the table
$states[$state]['count'] = 0; // Inits each state's count
@@ -173,7 +173,7 @@ class rac extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
@@ -196,7 +196,7 @@ class rac extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= " and not exists (select 1 from ". $this->config->item('table_name') .
" where station_id in (". $location_list . ")" .
@@ -206,9 +206,9 @@ class rac extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
@@ -233,9 +233,9 @@ class rac extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);

View File

@@ -3,7 +3,7 @@
class WAJA extends CI_Model {
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
public $jaPrefectures = array(
@@ -75,7 +75,7 @@ class WAJA extends CI_Model {
$prefectures[$state]['count'] = 0; // Inits each state's count
}
$qsl = $this->generichelpers->gen_qsl_from_postdata($postdata);
$qsl = $this->genfunctions->gen_qsl_from_postdata($postdata);
foreach ($bands as $band) {
@@ -140,13 +140,13 @@ class WAJA extends CI_Model {
where station_id in (" . $location_list .
") and col_dxcc > 0";
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
if ($postdata['mode'] != 'All') {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= " group by col_dxcc
) x on dxcc_entities.adif = x.col_dxcc";
@@ -169,7 +169,7 @@ class WAJA extends CI_Model {
where station_id in (" . $location_list .
") and col_dxcc > 0";
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
if ($postdata['mode'] != 'All') {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
@@ -203,7 +203,7 @@ class WAJA extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= " and not exists (select 1 from ". $this->config->item('table_name') .
" where station_id in (". $location_list . ")" .
@@ -213,9 +213,9 @@ class WAJA extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
@@ -240,9 +240,9 @@ class WAJA extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);
@@ -340,7 +340,7 @@ class WAJA extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();

View File

@@ -2,7 +2,7 @@
class was extends CI_Model {
function __construct() {
$this->load->library('Generichelpers');
$this->load->library('Genfunctions');
}
public $stateString = 'AK,AL,AR,AZ,CA,CO,CT,DE,FL,GA,HI,IA,ID,IL,IN,KS,KY,LA,MA,MD,ME,MI,MN,MO,MS,MT,NC,ND,NE,NH,NJ,NM,NV,NY,OH,OK,OR,PA,RI,SC,SD,TN,TX,UT,VA,VT,WA,WI,WV,WY';
@@ -21,7 +21,7 @@ class was extends CI_Model {
$states = array(); // Used for keeping track of which states that are not worked
$qsl = $this->generichelpers->gen_qsl_from_postdata($postdata);
$qsl = $this->genfunctions->gen_qsl_from_postdata($postdata);
foreach ($stateArray as $state) { // Generating array for use in the table
$states[$state]['count'] = 0; // Inits each state's count
@@ -171,7 +171,7 @@ class was extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
@@ -194,7 +194,7 @@ class was extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= " and not exists (select 1 from ". $this->config->item('table_name') .
" where station_id in (". $location_list . ")" .
@@ -204,9 +204,9 @@ class was extends CI_Model {
$sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')";
}
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
@@ -231,9 +231,9 @@ class was extends CI_Model {
$sql .= $this->addStateToQuery();
$sql .= $this->generichelpers->addBandToQuery($band);
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->generichelpers->addQslToQuery($postdata);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);