diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 31580016b..310a5de22 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -581,19 +581,19 @@ class Awards extends CI_Controller { $this->load->view('interface_assets/footer', $footerData); } - public function h26() { + public function helvetia() { $footerData = []; $footerData['scripts'] = [ - 'assets/js/sections/h26map_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/h26map_geojson.js")), - 'assets/js/sections/h26map.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/h26map.js")), + 'assets/js/sections/helvetiamap_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/helvetiamap_geojson.js")), + 'assets/js/sections/helvetiamap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/helvetiamap.js")), 'assets/js/leaflet/L.Maidenhead.js', ]; - $this->load->model('h26'); + $this->load->model('helvetia'); $this->load->model('modes'); $this->load->model('bands'); - $data['worked_bands'] = $this->bands->get_worked_bands('h26'); + $data['worked_bands'] = $this->bands->get_worked_bands('helvetia'); $data['modes'] = $this->modes->active(); // Used in the view for mode select if ($this->input->post('band') != NULL) { // Band is not set when page first loads. @@ -633,13 +633,13 @@ class Awards extends CI_Controller { $postdata['mode'] = 'All'; } - $data['h26_array'] = $this->h26->get_h26_array($bands, $postdata); - $data['h26_summary'] = $this->h26->get_h26_summary($bands, $postdata); + $data['helvetia_array'] = $this->helvetia->get_helvetia_array($bands, $postdata); + $data['helvetia_summary'] = $this->helvetia->get_helvetia_summary($bands, $postdata); // Render Page $data['page_title'] = "Awards - H26"; $this->load->view('interface_assets/header', $data); - $this->load->view('awards/h26/index'); + $this->load->view('awards/helvetia/index'); $this->load->view('interface_assets/footer', $footerData); } @@ -1133,11 +1133,11 @@ class Awards extends CI_Controller { This displays the H26 map and requires the $band_type and $mode_type */ - public function h26_map() { + public function helvetia_map() { $stateString = 'AB,BC,MB,NB,NL,NT,NS,NU,ON,PE,QC,SK,YT'; - $h26Array = explode(',', $stateString); + $helvetiaArray = explode(',', $stateString); - $this->load->model('h26'); + $this->load->model('helvetia'); $bands[] = $this->security->xss_clean($this->input->post('band')); @@ -1151,16 +1151,16 @@ class Awards extends CI_Controller { $postdata['band'] = $this->security->xss_clean($this->input->post('band')); $postdata['mode'] = $this->security->xss_clean($this->input->post('mode')); - $h26_array = $this->h26->get_h26_array($bands, $postdata); + $helvetia_array = $this->helvetia->get_helvetia_array($bands, $postdata); $states = array(); - foreach ($h26Array as $state) { // Generating array for use in the table + foreach ($helvetiaArray as $state) { // Generating array for use in the table $states[$state] = '-'; // Inits each state's count } - foreach ($h26_array as $was => $value) { + foreach ($helvetia_array as $was => $value) { foreach ($value as $key) { if($key != "") { if (strpos($key, '>W<') !== false) { diff --git a/application/controllers/Band.php b/application/controllers/Band.php index 2c56080b4..d56e7a05d 100644 --- a/application/controllers/Band.php +++ b/application/controllers/Band.php @@ -122,7 +122,7 @@ class Band extends CI_Controller { $band['cq'] = $this->security->xss_clean($this->input->post('cq')); $band['dok'] = $this->security->xss_clean($this->input->post('dok')); $band['dxcc'] = $this->security->xss_clean($this->input->post('dxcc')); - $band['h26'] = $this->security->xss_clean($this->input->post('h26')); + $band['helvetia'] = $this->security->xss_clean($this->input->post('helvetia')); $band['iota'] = $this->security->xss_clean($this->input->post('iota')); $band['sig'] = $this->security->xss_clean($this->input->post('sig')); $band['sota'] = $this->security->xss_clean($this->input->post('sota')); diff --git a/application/language/bulgarian/awards_lang.php b/application/language/bulgarian/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/bulgarian/awards_lang.php +++ b/application/language/bulgarian/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/bulgarian/menu_lang.php b/application/language/bulgarian/menu_lang.php index 9627be476..024cc5ea3 100644 --- a/application/language/bulgarian/menu_lang.php +++ b/application/language/bulgarian/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/chinese_simplified/awards_lang.php b/application/language/chinese_simplified/awards_lang.php index e06c0c75a..b6b46fcc8 100644 --- a/application/language/chinese_simplified/awards_lang.php +++ b/application/language/chinese_simplified/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/chinese_simplified/menu_lang.php b/application/language/chinese_simplified/menu_lang.php index 450bdc30a..d84912b1b 100644 --- a/application/language/chinese_simplified/menu_lang.php +++ b/application/language/chinese_simplified/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/czech/awards_lang.php b/application/language/czech/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/czech/awards_lang.php +++ b/application/language/czech/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/czech/menu_lang.php b/application/language/czech/menu_lang.php index 2f1c2086d..587d5ba2b 100644 --- a/application/language/czech/menu_lang.php +++ b/application/language/czech/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/dutch/awards_lang.php b/application/language/dutch/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/dutch/awards_lang.php +++ b/application/language/dutch/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/dutch/menu_lang.php b/application/language/dutch/menu_lang.php index de81ee46e..62718d3e5 100644 --- a/application/language/dutch/menu_lang.php +++ b/application/language/dutch/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/english/awards_lang.php b/application/language/english/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/english/awards_lang.php +++ b/application/language/english/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/english/menu_lang.php b/application/language/english/menu_lang.php index c0d3f3ae0..ae7fbabdb 100644 --- a/application/language/english/menu_lang.php +++ b/application/language/english/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/finnish/awards_lang.php b/application/language/finnish/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/finnish/awards_lang.php +++ b/application/language/finnish/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/finnish/menu_lang.php b/application/language/finnish/menu_lang.php index f7400cb0b..6b6e3cc41 100644 --- a/application/language/finnish/menu_lang.php +++ b/application/language/finnish/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/french/awards_lang.php b/application/language/french/awards_lang.php index 662c13274..2cc16b38f 100644 --- a/application/language/french/awards_lang.php +++ b/application/language/french/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/french/menu_lang.php b/application/language/french/menu_lang.php index c0d3f3ae0..ae7fbabdb 100644 --- a/application/language/french/menu_lang.php +++ b/application/language/french/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/german/awards_lang.php b/application/language/german/awards_lang.php index 744de21eb..61269a00d 100644 --- a/application/language/german/awards_lang.php +++ b/application/language/german/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Verwende alle 4 Textzeilen ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "Die USKA (Union Schweizerischer Kurzwellen Amateure) stiftet zwei Auszeichnungen, den HELVETIA 26 (H26) Award und den SWITZERLAND Award, um Aktivitäten auf den Bändern zu fördern, indem sie Kontakte über möglichst viele Schweizer Kantone auf verschiedenen Bändern anregen."; -$lang['awards_h26_description_ln3'] = "Diese Auszeichnungen gibt es in zwei Versionen: eine für HF-Bänder und eine für VHF-Bänder (einschließlich SHF und UHF). Gültige Verbindungen für diese Auszeichnungen datieren bis zum 1. Januar 1980 zurück."; -$lang['awards_h26_description_ln4'] = "Für weitere Informationen besuche bitte diesen Link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "Die USKA (Union Schweizerischer Kurzwellen Amateure) stiftet zwei Auszeichnungen, den HELVETIA 26 (H26) Award und den SWITZERLAND Award, um Aktivitäten auf den Bändern zu fördern, indem sie Kontakte über möglichst viele Schweizer Kantone auf verschiedenen Bändern anregen."; +$lang['awards_helvetia_description_ln3'] = "Diese Auszeichnungen gibt es in zwei Versionen: eine für HF-Bänder und eine für VHF-Bänder (einschließlich SHF und UHF). Gültige Verbindungen für diese Auszeichnungen datieren bis zum 1. Januar 1980 zurück."; +$lang['awards_helvetia_description_ln4'] = "Für weitere Informationen besuche bitte diesen Link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/german/menu_lang.php b/application/language/german/menu_lang.php index 6c9d03c0a..de268c39d 100644 --- a/application/language/german/menu_lang.php +++ b/application/language/german/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/greek/awards_lang.php b/application/language/greek/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/greek/awards_lang.php +++ b/application/language/greek/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/greek/menu_lang.php b/application/language/greek/menu_lang.php index c0d3f3ae0..ae7fbabdb 100644 --- a/application/language/greek/menu_lang.php +++ b/application/language/greek/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/italian/awards_lang.php b/application/language/italian/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/italian/awards_lang.php +++ b/application/language/italian/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/italian/menu_lang.php b/application/language/italian/menu_lang.php index c0d3f3ae0..ae7fbabdb 100644 --- a/application/language/italian/menu_lang.php +++ b/application/language/italian/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/polish/awards_lang.php b/application/language/polish/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/polish/awards_lang.php +++ b/application/language/polish/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/polish/menu_lang.php b/application/language/polish/menu_lang.php index c0d3f3ae0..ae7fbabdb 100644 --- a/application/language/polish/menu_lang.php +++ b/application/language/polish/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/russian/awards_lang.php b/application/language/russian/awards_lang.php index 15bfc9a6b..50c602bbe 100644 --- a/application/language/russian/awards_lang.php +++ b/application/language/russian/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/russian/menu_lang.php b/application/language/russian/menu_lang.php index b80dbd995..d0be1dfd8 100644 --- a/application/language/russian/menu_lang.php +++ b/application/language/russian/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/spanish/awards_lang.php b/application/language/spanish/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/spanish/awards_lang.php +++ b/application/language/spanish/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/spanish/menu_lang.php b/application/language/spanish/menu_lang.php index 2a2cbe93c..bbb9fe8b6 100644 --- a/application/language/spanish/menu_lang.php +++ b/application/language/spanish/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/swedish/awards_lang.php b/application/language/swedish/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/swedish/awards_lang.php +++ b/application/language/swedish/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/swedish/menu_lang.php b/application/language/swedish/menu_lang.php index 94c32c438..b6253125d 100644 --- a/application/language/swedish/menu_lang.php +++ b/application/language/swedish/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/language/turkish/awards_lang.php b/application/language/turkish/awards_lang.php index 9a29b8409..b0e961908 100644 --- a/application/language/turkish/awards_lang.php +++ b/application/language/turkish/awards_lang.php @@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; -$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; -$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; -$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; +$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD"; +$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands."; +$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980"; +$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: https://www.uska.ch/contest/uska-diplome/."; /* diff --git a/application/language/turkish/menu_lang.php b/application/language/turkish/menu_lang.php index c0d3f3ae0..ae7fbabdb 100644 --- a/application/language/turkish/menu_lang.php +++ b/application/language/turkish/menu_lang.php @@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ'; $lang['menu_dok'] = 'DOK'; $lang['menu_dxcc'] = 'DXCC'; $lang['menu_ffma'] = 'Fred Fish Memorial Award'; -$lang['menu_h26'] = "H26"; +$lang['menu_helvetia'] = "H26"; $lang['menu_gridmaster'] = "Gridmaster"; $lang['menu_dl_gridmaster'] = 'DL Gridmaster'; $lang['menu_lx_gridmaster'] = 'LX Gridmaster'; diff --git a/application/migrations/181_add_h26_bandxuser.php b/application/migrations/181_add_h26_bandxuser.php deleted file mode 100644 index 9fbc779b8..000000000 --- a/application/migrations/181_add_h26_bandxuser.php +++ /dev/null @@ -1,23 +0,0 @@ -db->field_exists('h26', 'bandxuser')) { - $this->dbforge->add_column('bandxuser', $fields); - } - } - - public function down() - { - if ($this->db->field_exists('h26', 'bandxuser')) { - $this->dbforge->drop_column('bandxuser', 'h26'); - } - } -} diff --git a/application/migrations/181_add_helvetia_bandxuser.php b/application/migrations/181_add_helvetia_bandxuser.php new file mode 100644 index 000000000..573088f5d --- /dev/null +++ b/application/migrations/181_add_helvetia_bandxuser.php @@ -0,0 +1,23 @@ +db->field_exists('helvetia', 'bandxuser')) { + $this->dbforge->add_column('bandxuser', $fields); + } + } + + public function down() + { + if ($this->db->field_exists('helvetia', 'bandxuser')) { + $this->dbforge->drop_column('bandxuser', 'helvetia'); + } + } +} diff --git a/application/models/Bands.php b/application/models/Bands.php index 7fc915630..2a8df6cc5 100644 --- a/application/models/Bands.php +++ b/application/models/Bands.php @@ -260,7 +260,7 @@ class Bands extends CI_Model { 'cq' => $band['cq'] == "true" ? '1' : '0', 'dok' => $band['dok'] == "true" ? '1' : '0', 'dxcc' => $band['dxcc'] == "true" ? '1' : '0', - 'h26' => $band['h26'] == "true" ? '1' : '0', + 'helvetia' => $band['helvetia'] == "true" ? '1' : '0', 'iota' => $band['iota'] == "true" ? '1' : '0', 'pota' => $band['pota'] == "true" ? '1' : '0', 'sig' => $band['sig'] == "true" ? '1' : '0', @@ -308,8 +308,8 @@ class Bands extends CI_Model { $this->db->insert('bands', $data); } - $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, h26, iota, pota, sig, sota, uscounties, was, wwff, vucc) - select bands.id, " . $this->session->userdata('user_id') . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands where band ='".$data['band']."' and not exists (select 1 from bandxuser where userid = " . $this->session->userdata('user_id') . " and bandid = bands.id);"); + $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, helvetia, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja) + select bands.id, " . $this->session->userdata('user_id') . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands where band ='".$data['band']."' and not exists (select 1 from bandxuser where userid = " . $this->session->userdata('user_id') . " and bandid = bands.id);"); } function getband($id) { diff --git a/application/models/H26.php b/application/models/Helvetia.php similarity index 78% rename from application/models/H26.php rename to application/models/Helvetia.php index ebc950dfb..ef7ed6818 100644 --- a/application/models/H26.php +++ b/application/models/Helvetia.php @@ -1,10 +1,10 @@ load->model('logbooks_model'); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -17,7 +17,7 @@ class h26 extends CI_Model { $stateArray = explode(',', $this->stateString); - $states = array(); // Used for keeping th26k of which states that are not worked + $states = array(); // Used for keeping thelvetiak of which states that are not worked $qsl = ""; if ($postdata['confirmed'] != NULL) { @@ -42,20 +42,20 @@ class h26 extends CI_Model { foreach ($bands as $band) { foreach ($stateArray as $state) { // Generating array for use in the table - $bandh26[$state][$band] = '-'; // Sets all to dash to indicate no result + $bandhelvetia[$state][$band] = '-'; // Sets all to dash to indicate no result } if ($postdata['worked'] != NULL) { - $h26Band = $this->geth26Worked($location_list, $band, $postdata); - foreach ($h26Band as $line) { - $bandh26[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","h26", "")\'>W
'; + $helvetiaBand = $this->gethelvetiaWorked($location_list, $band, $postdata); + foreach ($helvetiaBand as $line) { + $bandhelvetia[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","helvetia", "")\'>W
'; $states[$line->col_state]['count']++; } } if ($postdata['confirmed'] != NULL) { - $h26Band = $this->geth26Confirmed($location_list, $band, $postdata); - foreach ($h26Band as $line) { - $bandh26[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","h26", "'.$qsl.'")\'>C
'; + $helvetiaBand = $this->gethelvetiaConfirmed($location_list, $band, $postdata); + foreach ($helvetiaBand as $line) { + $bandhelvetia[$line->col_state][$band] = '
col_state . '","' . $band . '","'. $postdata['mode'] . '","helvetia", "'.$qsl.'")\'>C
'; $states[$line->col_state]['count']++; } } @@ -63,30 +63,30 @@ class h26 extends CI_Model { // We want to remove the worked states in the list, since we do not want to display them if ($postdata['worked'] == NULL) { - $h26Band = $this->geth26Worked($location_list, $postdata['band'], $postdata); - foreach ($h26Band as $line) { - unset($bandh26[$line->col_state]); + $helvetiaBand = $this->gethelvetiaWorked($location_list, $postdata['band'], $postdata); + foreach ($helvetiaBand as $line) { + unset($bandhelvetia[$line->col_state]); } } // We want to remove the confirmed states in the list, since we do not want to display them if ($postdata['confirmed'] == NULL) { - $h26Band = $this->geth26Confirmed($location_list, $postdata['band'], $postdata); - foreach ($h26Band as $line) { - unset($bandh26[$line->col_state]); + $helvetiaBand = $this->gethelvetiaConfirmed($location_list, $postdata['band'], $postdata); + foreach ($helvetiaBand as $line) { + unset($bandhelvetia[$line->col_state]); } } if ($postdata['notworked'] == NULL) { foreach ($stateArray as $state) { if ($states[$state]['count'] == 0) { - unset($bandh26[$state]); + unset($bandhelvetia[$state]); }; } } - if (isset($bandh26)) { - return $bandh26; + if (isset($bandhelvetia)) { + return $bandhelvetia; } else { return 0; @@ -96,7 +96,7 @@ class h26 extends CI_Model { /* * Function gets worked and confirmed summary on each band on the active stationprofile */ - function get_h26_summary($bands, $postdata) + function get_helvetia_summary($bands, $postdata) { $CI =& get_instance(); $CI->load->model('logbooks_model'); @@ -111,17 +111,17 @@ class h26 extends CI_Model { foreach ($bands as $band) { $worked = $this->getSummaryByBand($band, $postdata, $location_list); $confirmed = $this->getSummaryByBandConfirmed($band, $postdata, $location_list); - $h26Summary['worked'][$band] = $worked[0]->count; - $h26Summary['confirmed'][$band] = $confirmed[0]->count; + $helvetiaSummary['worked'][$band] = $worked[0]->count; + $helvetiaSummary['confirmed'][$band] = $confirmed[0]->count; } $workedTotal = $this->getSummaryByBand($postdata['band'], $postdata, $location_list); $confirmedTotal = $this->getSummaryByBandConfirmed($postdata['band'], $postdata, $location_list); - $h26Summary['worked']['Total'] = $workedTotal[0]->count; - $h26Summary['confirmed']['Total'] = $confirmedTotal[0]->count; + $helvetiaSummary['worked']['Total'] = $workedTotal[0]->count; + $helvetiaSummary['confirmed']['Total'] = $confirmedTotal[0]->count; - return $h26Summary; + return $helvetiaSummary; } function getSummaryByBand($band, $postdata, $location_list) @@ -135,7 +135,7 @@ class h26 extends CI_Model { } else if ($band == 'All') { $this->load->model('bands'); - $bandslots = $this->bands->get_worked_bands('h26'); + $bandslots = $this->bands->get_worked_bands('helvetia'); $bandslots_list = "'".implode("','",$bandslots)."'"; @@ -168,7 +168,7 @@ class h26 extends CI_Model { } else if ($band == 'All') { $this->load->model('bands'); - $bandslots = $this->bands->get_worked_bands('h26'); + $bandslots = $this->bands->get_worked_bands('helvetia'); $bandslots_list = "'".implode("','",$bandslots)."'"; @@ -196,7 +196,7 @@ class h26 extends CI_Model { * Function returns all worked, but not confirmed states * $postdata contains data from the form, in this case Lotw or QSL are used */ - function geth26Worked($location_list, $band, $postdata) { + function gethelvetiaWorked($location_list, $band, $postdata) { $sql = "SELECT distinct col_state FROM " . $this->config->item('table_name') . " thcv where station_id in (" . $location_list . ")"; @@ -233,7 +233,7 @@ class h26 extends CI_Model { * Function returns all confirmed states on given band and on LoTW or QSL * $postdata contains data from the form, in this case Lotw or QSL are used */ - function geth26Confirmed($location_list, $band, $postdata) { + function gethelvetiaConfirmed($location_list, $band, $postdata) { $sql = "SELECT distinct col_state FROM " . $this->config->item('table_name') . " thcv where station_id in (" . $location_list . ")"; @@ -295,7 +295,7 @@ class h26 extends CI_Model { } else { $this->load->model('bands'); - $bandslots = $this->bands->get_worked_bands('h26'); + $bandslots = $this->bands->get_worked_bands('helvetia'); $bandslots_list = "'".implode("','",$bandslots)."'"; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index a8da7ba92..37f7101f4 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -380,7 +380,7 @@ class Logbook_model extends CI_Model { $this->db->where('COL_STATE', $searchphrase); $this->db->where_in('COL_DXCC', ['1']); break; - case 'h26': + case 'helvetia': $this->db->where('COL_STATE', $searchphrase); $this->db->where_in('COL_DXCC', ['287']); break; diff --git a/application/models/User_model.php b/application/models/User_model.php index 836d39b5a..c9116b5d0 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -200,7 +200,7 @@ class User_Model extends CI_Model { // Add user and insert bandsettings for user $this->db->insert($this->config->item('auth_table'), $data); $insert_id = $this->db->insert_id(); - $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja, rac, h26) select bands.id, " . $insert_id . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands;"); + $this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, helvetia, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja, rac) select bands.id, " . $insert_id . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands;"); $this->db->query("insert into paper_types (user_id,paper_name,metric,width,orientation,height) SELECT ".$insert_id.", paper_name, metric, width, orientation,height FROM paper_types where user_id = -1;"); return OK; } else { diff --git a/application/views/awards/h26/index.php b/application/views/awards/helvetia/index.php similarity index 85% rename from application/views/awards/h26/index.php rename to application/views/awards/helvetia/index.php index b0fb0c3c5..b5d1a09db 100644 --- a/application/views/awards/h26/index.php +++ b/application/views/awards/helvetia/index.php @@ -3,7 +3,7 @@