Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from HB9HIL/dev

Browse Source 
Dev
This commit is contained in:
HB9HIL
2023-10-26 10:53:02 +02:00
committed by GitHub
parent 4292d6560f f0c556c6b5
commit 4bae53433a
37 changed files with 326 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/language/bulgarian/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/bulgarian/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Общо';
$lang['general_word_year'] = 'Година';
$lang['general_word_month'] = 'Месец';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Работени';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Потвърдени';
$lang['general_word_needed'] = 'Необходими';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Изпратени';
$lang['general_word_received'] = 'Получени';
$lang['general_word_requested'] = 'Заявени';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL катичка';
$lang['general_word_qslcard_management'] = 'Управление на QSL';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Локатор';

12
application/language/chinese_simplified/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/chinese_simplified/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = '总计';
$lang['general_word_year'] = '年';
$lang['general_word_month'] = '月';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = '已通联';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = '已确认';
$lang['general_word_needed'] = '待通联';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = '已发送';
$lang['general_word_received'] = '已收到';
$lang['general_word_requested'] = '已请求';
$lang['general_word_queued'] = '已排队';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = '无效(忽略)';
$lang['general_word_qslcard'] = 'QSL 卡片';
$lang['general_word_qslcard_management'] = 'QSL 管理';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = '信号交换 (发)';
$lang['gen_hamradio_exchange_rcvd_short'] = '信号交换 (收)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = '定位器';

12
application/language/czech/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/czech/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Celkem';
$lang['general_word_year'] = 'Rok';
$lang['general_word_month'] = 'Měsíc';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Spojeno';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Potvrzeno';
$lang['general_word_needed'] = 'Potřebuje se';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Odesláno';
$lang['general_word_received'] = 'Přijato';
$lang['general_word_requested'] = 'Vyžádáno';
$lang['general_word_queued'] = 'Ve frontě';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Neplatné (Ignorováno)';
$lang['general_word_qslcard'] = 'QSL karta';
$lang['general_word_qslcard_management'] = 'Správa QSL';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Výměna (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Výměna (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Lokátor';

12
application/language/dutch/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/dutch/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Totaal';
$lang['general_word_year'] = 'Jaar';
$lang['general_word_month'] = 'Maand';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Gewerkt';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Bevestigd';
$lang['general_word_needed'] = 'Nodig';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Sent';
$lang['general_word_received'] = 'Ontvangen';
$lang['general_word_requested'] = 'Aangevraagd';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL Card';
$lang['general_word_qslcard_management'] = 'QSL Management';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Verz (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Ontv (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Locator';

12
application/language/english/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/english/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Total';
$lang['general_word_year'] = 'Year';
$lang['general_word_month'] = 'Month';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Worked';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Confirmed';
$lang['general_word_needed'] = 'Needed';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Sent';
$lang['general_word_received'] = 'Received';
$lang['general_word_requested'] = 'Requested';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL Card';
$lang['general_word_qslcard_management'] = 'QSL Management';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Locator';

12
application/language/finnish/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/finnish/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Yhteensä';
$lang['general_word_year'] = 'Vuosi';
$lang['general_word_month'] = 'Kuukausi';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Workittu';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Kuitattu';
$lang['general_word_needed'] = 'Tarvittu';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Lähetetyt';
$lang['general_word_received'] = 'Vastaanotetut';
$lang['general_word_requested'] = 'Pyydetyt';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Virheellinen (Ohita)';
$lang['general_word_qslcard'] = 'QSL-kortti';
$lang['general_word_qslcard_management'] = 'QSL-manageri';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Lokaattori';

12
application/language/french/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/french/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Total';
$lang['general_word_year'] = 'Année';
$lang['general_word_month'] = 'Mois';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Réalisés';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Confirmés';
$lang['general_word_needed'] = 'Demandés';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Envoyées';
$lang['general_word_received'] = 'Reçues';
$lang['general_word_requested'] = 'Demandées';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL Card';
$lang['general_word_qslcard_management'] = 'QSL Management';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Locator';

26
application/language/german/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('Direkter Skriptzugriff nicht erlaubt');
$lang['awards_info_button'] = "Diplom Info";
$lang['awards_show_worked'] = "Zeige gearbeitete";
$lang['awards_show_confirmed'] = "Zeige bestätigte";
$lang['awards_show_not_worked'] = "Zeige nicht gearbeitete";
$lang['awards_show_cq_map'] = "Zeige CQ Zonen Karte";
$lang['awards_summary'] = "Zusammenfassung";
$lang['awards_total'] = "Gesamt";
$lang['awards_total_worked'] = "Gesamt gearbeitet";
$lang['awards_total_confirmed'] = "Gesamt bestätigt";
$lang['awards_cq_page_title'] = "Diplome - CQ Magazin WAZ";
/*
___________________________________________________________________________________________
@@ -11,7 +23,7 @@ ________________________________________________________________________________
*/
$lang['awards_cq_description_ln1'] = "CQ Magazine WAZ Diplom";
$lang['awards_cq_description_ln2'] = "Das CQ Magazine befindet sich in den USA und ist eines der beliebtesten Amateurfunkmagazine der Welt. Das Magazin erschien erstmals im Januar 1945 und konzentriert sich auf Auszeichnungen und die praktischen Aspekte des Amateurfunks.";
$lang['awards_cq_description_ln2'] = "Das CQ Magazine befindet sich in den USA und ist eines der beliebtesten Amateurfunkmagazine der Welt. Das Magazin erschien erstmals im Januar 1945 und konzentriert sich auf Diplome und die praktischen Aspekte des Amateurfunks.";
$lang['awards_cq_description_ln3'] = "Der WAZ Award steht für 'Worked All Zones' und erfordert Kontakte zu allen 40 CQ-Zonen sowie die entsprechende QSL Bestätigung.";
$lang['awards_cq_description_ln4'] = "Sie finden alle Informationen und Regeln auf der Website des <a href='https://cq-amateur-radio.com/cq_awards/cq_waz_awards/index_cq_waz_award.html' target='_blank'>CQ Magazine</a>.";
@@ -72,8 +84,8 @@ ________________________________________________________________________________
$lang['awards_pota_description_ln1'] = "POTA Diplome";
$lang['awards_pota_description_ln2'] = "Parks on the Air® (POTA) startete Anfang 2017, als das 'National Parks on the Air' - Special Event des ARRL endete. Eine Gruppe von Freiwilligen wollte den Spaß über das einjährige Ereignis hinaus fortsetzen, und so wurde POTA geboren.";
$lang['awards_pota_description_ln3'] = "POTA funktioniert ähnlich wie SOTA, mit Aktivatoren und Jägern. Für die Auszeichnungen gibt es verschiedene Kategorien, die auf der Anzahl der Parks, geografischen Gebieten und mehr basieren.";
$lang['awards_pota_description_ln4'] = "Für weitere Informationen zu den verfügbaren Auszeichnungen und Kategorien besuchen Sie bitte die <a href='https://parksontheair.com/pota-awards/' target='_blank'>Parks on the Air®-Website</a>.";
$lang['awards_pota_description_ln3'] = "POTA funktioniert ähnlich wie SOTA, mit Aktivatoren und Jägern. Für die Diplome gibt es verschiedene Kategorien, die auf der Anzahl der Parks, geografischen Gebieten und mehr basieren.";
$lang['awards_pota_description_ln4'] = "Für weitere Informationen zu den verfügbaren Diplome und Kategorien besuchen Sie bitte die <a href='https://parksontheair.com/pota-awards/' target='_blank'>Parks on the Air®-Website</a>.";
/*
@@ -83,8 +95,8 @@ ________________________________________________________________________________
*/
$lang['awards_sig_description_ln1'] = "SIG-Information";
$lang['awards_sig_description_ln2'] = "Die SIG- oder Signature-Kategorie ermöglicht die Verwendung beliebiger 'Diplom-Identifikationen' für Auszeichnungen, die nicht in Cloudlog implementiert sind.";
$lang['awards_sig_description_ln3'] = "Der Grund dafür ist, dass das gängige ADIF-Format nur wenige dedizierte Felder für bestimmte Auszeichnungen bietet. SIG ermöglicht es dennoch, alle anderen Arten von Signaturmarkierungen zu verwenden und auszuwerten.";
$lang['awards_sig_description_ln2'] = "Die SIG- oder Signature-Kategorie ermöglicht die Verwendung beliebiger 'Diplom-Identifikationen' für Diplome, die nicht in Cloudlog implementiert sind.";
$lang['awards_sig_description_ln3'] = "Der Grund dafür ist, dass das gängige ADIF-Format nur wenige dedizierte Felder für bestimmte Diplome bietet. SIG ermöglicht es dennoch, alle anderen Arten von Signaturmarkierungen zu verwenden und auszuwerten.";
$lang['awards_sig_description_ln4'] = "Im QSO-Verarbeitung finden Sie zwei Felder: 'SIG' enthält die tatsächliche Markierung, die auch in der Auswertung der Auszeichnung sichtbar ist, und 'SIG INFO', das eine Beschreibung der Signatur enthält. Beide Felder sind frei anpassbar.";
@@ -109,7 +121,7 @@ ________________________________________________________________________________
$lang['awards_counties_description_ln1'] = "US County Diplom";
$lang['awards_counties_description_ln2'] = "Das US Counties Diplom (USA-CA) der Vereinigten Staaten von Amerika, gesponsert von CQ Magazine, wird für bestätigte Funkkontakte mit einer festgelegten Anzahl von US-Counties unter Regeln und Bedingungen verliehen, die Sie <a href='https://cq-amateur-radio.com/cq_awards/cq_usa_ca_awards/cq_usa_ca_awards.html' target='_blank'>hier</a> finden können.";
$lang['awards_counties_description_ln3'] = "USA-CA steht allen lizenzierten Funkamateuren weltweit zur Verfügung und wird an Einzelpersonen für alle gemachten County-Kontakte verliehen, unabhängig von den verwendeten Rufzeichen, Stationsorten oder Daten.";
$lang['awards_counties_description_ln4'] = "Spezielle USA-CA-Auszeichnungen stehen auch für SWLs auf der Grundlage des Gehörten zur Verfügung.";
$lang['awards_counties_description_ln4'] = "Spezielle USA-CA-Diplome stehen auch für SWLs auf der Grundlage des Gehörten zur Verfügung.";
/*
@@ -120,7 +132,7 @@ ________________________________________________________________________________
$lang['awards_us_gridmaster_description_ln1'] = "US Gridmaster Diplom";
$lang['awards_us_gridmaster_description_ln2'] = "Der GridMaster Award ist die renommierteste AMSAT-Auszeichnung, die erstmals 2014 von der Star Comm Group eingeführt wurde. Sie steht allen Funkamateuren weltweit zur Verfügung, die es schaffen, alle 488 Planquadrate in den USA via Satellit zu arbeiten und für jeden Kontakt QSL-Bestätigungen vorlegen können.";
$lang['awards_us_gridmaster_description_ln3'] = "Offizielle Informationen von der <a href='https://www.amsat.org/gridmaster/' target='_blank'>Website</a>: Es muss eine Zweiwegekommunikation über Amateurfunksatellit mit jedem Gitter hergestellt werden. Es ist keine Mindest-Signalreport erforderlich. Die Kontakte müssen vom selben Standort aus erfolgen oder von Standorten aus, die nicht mehr als 200 Kilometer voneinander entfernt sind. Die Aussage des Antragstellers in der Auszeichnungsanwendung dient als Bestätigung der Einhaltung der Abstandsregel. Personen können mehrere GridMaster-Auszeichnungen beantragen und erhalten, wenn sie von einem anderen Standort aus erreicht werden, der sich in einem anderen 200-Kilometer-Kreis befindet.";
$lang['awards_us_gridmaster_description_ln3'] = "Offizielle Informationen von der <a href='https://www.amsat.org/gridmaster/' target='_blank'>Website</a>: Es muss eine Zweiwegekommunikation über Amateurfunksatellit mit jedem Gitter hergestellt werden. Es ist keine Mindest-Signalreport erforderlich. Die Kontakte müssen vom selben Standort aus erfolgen oder von Standorten aus, die nicht mehr als 200 Kilometer voneinander entfernt sind. Die Aussage des Antragstellers in der Auszeichnungsanwendung dient als Bestätigung der Einhaltung der Abstandsregel. Personen können mehrere GridMaster-Diplome beantragen und erhalten, wenn sie von einem anderen Standort aus erreicht werden, der sich in einem anderen 200-Kilometer-Kreis befindet.";
$lang['awards_us_gridmaster_description_ln4'] = "Diese Karte zeigt nur QSOs, die über SAT gearbeitet wurden.";

5
application/language/german/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Gesamt';
$lang['general_word_year'] = 'Jahr';
$lang['general_word_month'] = 'Monat';
$lang['general_word_colors'] = "Farben";
$lang['general_word_worked'] = 'Gearbeitet';
$lang['general_word_worked_not_confirmed'] = "Gearbeitet, nicht bestätigt";
$lang['general_word_not_worked'] = "Nicht gearbeitet";
$lang['general_word_confirmed'] = 'Bestätigt';
$lang['general_word_needed'] = 'Benötigt';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Gesendet';
$lang['general_word_received'] = 'Erhalten';
$lang['general_word_requested'] = 'Angefordert';
$lang['general_word_queued'] = 'In Warteschlange';
$lang['general_word_table'] = "Tabelle";
$lang['general_word_invalid_ignore'] = 'Ungültig (Ignorieren)';
$lang['general_word_qslcard'] = 'QSL Karte';
$lang['general_word_qslcard_management'] = 'QSL Verwaltung';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'Mein Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Typ";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Locator';

2
application/language/german/menu_lang.php
View File

@@ -34,7 +34,7 @@ $lang['menu_timeplotter'] = 'Zeitplotter';
$lang['menu_custom_maps'] = 'Benutzerdefinierte Karte';
$lang['menu_continents'] = 'Kontinente';
$lang['menu_awards'] = 'Auszeichnungen';
$lang['menu_awards'] = 'Diplome';
$lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';

12
application/language/greek/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/greek/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Σύνολο';
$lang['general_word_year'] = 'Ετος';
$lang['general_word_month'] = 'Μήνας';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Worked';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Επιβεβαιωμένο';
$lang['general_word_needed'] = 'Απαιτείται';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Απεσταλμένα';
$lang['general_word_received'] = 'Ελήφθη';
$lang['general_word_requested'] = 'Έχει ζητηθεί';
$lang['general_word_queued'] = 'Σε ουρά';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Μη έγκυρο (Αγνόησή)';
$lang['general_word_qslcard'] = 'Κάρτa QSL';
$lang['general_word_qslcard_management'] = 'QSL Management';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Τοποθετών';

12
application/language/italian/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/italian/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Totale';
$lang['general_word_year'] = 'Anno';
$lang['general_word_month'] = 'Mese';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Lavorato';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Confermato';
$lang['general_word_needed'] = 'Necessario';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Inviata';
$lang['general_word_received'] = 'Ricevuta';
$lang['general_word_requested'] = 'Richiesta';
$lang['general_word_queued'] = 'In coda';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalido (Ignora)';
$lang['general_word_qslcard'] = 'Cartolina QSL';
$lang['general_word_qslcard_management'] = 'Gestione QSL';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Scambio (I)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Scambio (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Locatore';

12
application/language/polish/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/polish/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Suma';
$lang['general_word_year'] = 'Rok';
$lang['general_word_month'] = 'Miesiąc';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Pracowane';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Potwierdzone';
$lang['general_word_needed'] = 'Wymagane';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Wysłane';
$lang['general_word_received'] = 'Odebrane';
$lang['general_word_requested'] = 'Poproszone';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'Karta QSL';
$lang['general_word_qslcard_management'] = 'Zarządzanie kartami';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Wymiana (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Wymiana (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Lokator';

12
application/language/russian/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/russian/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Всего';
$lang['general_word_year'] = 'Год';
$lang['general_word_month'] = 'Месяц';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Сработано';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Подтверждено';
$lang['general_word_needed'] = 'Необходимо';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Отправлено';
$lang['general_word_received'] = 'Принято';
$lang['general_word_requested'] = 'Запрошено';
$lang['general_word_queued'] = 'В очереди';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Некорректно (Игнорировать)';
$lang['general_word_qslcard'] = 'QSL карточка';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_refs'] = 'Refs';
$lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';

12
application/language/spanish/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/spanish/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Total';
$lang['general_word_year'] = 'Año';
$lang['general_word_month'] = 'Mes';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Realizados';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Confirmados';
$lang['general_word_needed'] = 'Solicitadas';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Enviado';
$lang['general_word_received'] = 'Recibido';
$lang['general_word_requested'] = 'Solicitadas';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'Tarjeta QSL';
$lang['general_word_qslcard_management'] = 'Gestión de QSL';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Intercambio (Env)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Intercambio (Recib)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Localizador';

12
application/language/swedish/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/swedish/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Totalt';
$lang['general_word_year'] = 'I år';
$lang['general_word_month'] = 'Denna månad';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Körda';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Bekräftade';
$lang['general_word_needed'] = 'Behövs';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Skickad';
$lang['general_word_received'] = 'Mottagen';
$lang['general_word_requested'] = 'Begärd';
$lang['general_word_queued'] = 'Köad';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL-kort';
$lang['general_word_qslcard_management'] = 'QSL Management';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Lokator';

12
application/language/turkish/awards_lang.php
View File

@@ -3,6 +3,18 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['awards_info_button'] = "Award Info";
$lang['awards_show_worked'] = "Show worked";
$lang['awards_show_confirmed'] = "Show confirmed";
$lang['awards_show_not_worked'] = "Show not worked";
$lang['awards_show_cq_map'] = "Show CQ Zone Map";
$lang['awards_summary'] = "Summary";
$lang['awards_total'] = "Total";
$lang['awards_total_worked'] = "Total worked";
$lang['awards_total_confirmed'] = "Total confirmed";
$lang['awards_cq_page_title'] = "Awards - CQ Magazine WAZ";
/*
___________________________________________________________________________________________

5
application/language/turkish/general_words_lang.php
View File

@@ -37,7 +37,10 @@ $lang['general_word_total'] = 'Toplam';
$lang['general_word_year'] = 'Yıl';
$lang['general_word_month'] = 'Ay';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Çalışılanlar';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Onaylanan';
$lang['general_word_needed'] = 'İstenenler';
@@ -50,6 +53,7 @@ $lang['general_word_sent'] = 'Gönderilen';
$lang['general_word_received'] = 'Gelen';
$lang['general_word_requested'] = 'İstenen';
$lang['general_word_queued'] = 'Sıralanan';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Geçersiz (Yok say)';
$lang['general_word_qslcard'] = 'QSL Kartı';
$lang['general_word_qslcard_management'] = 'QSL Yönetimi';
@@ -117,6 +121,7 @@ $lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (G)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (A)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Konum kodu';

16
application/models/Qslprint_model.php
View File

@@ -79,7 +79,13 @@ class Qslprint_model extends CI_Model {
// always filter user. this ensures that even if the station_id is from another user no inaccesible QSOs will be returned
$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
$this->db->where_in('COL_QSL_SENT', array('R', 'Q'));
$this->db->order_by("COL_TIME_ON", "DESC");
$this->db->order_by("COL_DXCC", "ASC");
$this->db->order_by("COL_CALL", "ASC");
$this->db->order_by("COL_SAT_NAME", "ASC");
$this->db->order_by("COL_SAT_MODE", "ASC");
$this->db->order_by("COL_BAND_RX", "ASC");
$this->db->order_by("COL_TIME_ON", "ASC");
$this->db->order_by("COL_MODE", "ASC");
$query = $this->db->get($this->config->item('table_name'));
return $query;
@@ -133,7 +139,13 @@ class Qslprint_model extends CI_Model {
$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
$this->db->where('COL_CALL like "%'.$callsign.'%"');
$this->db->where('coalesce(COL_QSL_SENT, "") not in ("R", "Q")');
$this->db->order_by("COL_TIME_ON", "DESC");
$this->db->order_by("COL_DXCC", "ASC");
$this->db->order_by("COL_CALL", "ASC");
$this->db->order_by("COL_SAT_NAME", "ASC");
$this->db->order_by("COL_SAT_MODE", "ASC");
$this->db->order_by("COL_BAND_RX", "ASC");
$this->db->order_by("COL_TIME_ON", "ASC");
$this->db->order_by("COL_MODE", "ASC");
$query = $this->db->get($this->config->item('table_name'));
return $query;

62
application/views/awards/cq/index.php
View File

@@ -1,6 +1,6 @@
<style>
#cqmap {
height: calc(100vh - 430px) !important;
height: calc(100vh - 480px) !important;
max-height: 900px !important;
}
/*Legend specific*/
@@ -43,7 +43,7 @@
var lang_award_info_ln3 = "<?php echo lang('awards_cq_description_ln3'); ?>";
var lang_award_info_ln4 = "<?php echo lang('awards_cq_description_ln4'); ?>";
</script>
<h2><?php echo $page_title; ?></h2>
<h2><?php echo lang('awards_cq_page_title'); ?></h2>
<button type="button" class="btn btn-sm btn-primary mr-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
</div>
<!-- End of Award Info Box -->
@@ -52,46 +52,46 @@
<!-- Multiple Checkboxes (inline) -->
<div class="form-group row">
<div class="col-md-2" for="checkboxes">Worked / Confirmed</div>
<div class="col-md-2" for="checkboxes"><?php echo lang('general_word_worked') . ' / ' . lang('general_word_confirmed')?></div>
<div class="col-md-10">
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="worked">Show worked</label>
<label class="form-check-label" for="worked"><?php echo lang('awards_show_worked'); ?></label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="confirmed" id="confirmed" value="1" <?php if ($this->input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="confirmed">Show confirmed</label>
<label class="form-check-label" for="confirmed"><?php echo lang('awards_show_confirmed'); ?></label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="notworked">Show not worked</label>
<label class="form-check-label" for="notworked"><?php echo lang('awards_show_not_worked'); ?></label>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-2">QSL Type</div>
<div class="col-md-2"><?php echo lang('gen_hamradio_qsltype'); ?></div>
<div class="col-md-10">
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="qsl">QSL</label>
<label class="form-check-label" for="qsl"><?php echo lang('general_word_qslcard'); ?></label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="lotw">LoTW</label>
<label class="form-check-label" for="lotw"><?php echo lang('lotw_short'); ?></label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
<label class="form-check-label" for="eqsl">eQSL</label>
<label class="form-check-label" for="eqsl"><?php echo lang('eqsl_short'); ?></label>
</div>
</div>
</div>
<div class="form-group row">
<label class="col-md-2 control-label" for="band">Band</label>
<label class="col-md-2 control-label" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
<div class="col-md-2">
<select id="band2" name="band" class="form-control custom-select-sm">
<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> ><?php echo lang('general_word_all'); ?></option>
<?php foreach($worked_bands as $band) {
echo '<option value="' . $band . '"';
if ($this->input->post('band') == $band) echo ' selected';
@@ -102,10 +102,10 @@
</div>
<div class="form-group row">
<label class="col-md-2 control-label" for="mode">Mode</label>
<label class="col-md-2 control-label" for="mode"><?php echo lang('gen_hamradio_mode'); ?></label>
<div class="col-md-2">
<select id="mode" name="mode" class="form-control custom-select-sm">
<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>>All</option>
<option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'mode') echo ' selected'; ?>><?php echo lang('general_word_all'); ?></option>
<?php
foreach($modes->result() as $mode){
if ($mode->submode == null) {
@@ -126,10 +126,10 @@
<div class="form-group row">
<label class="col-md-2 control-label" for="button1id"></label>
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary">Show</button>
<button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?php echo lang('filter_reset'); ?></button>
<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?php echo lang('filter_options_show'); ?></button>
<?php if ($cq_array) {
?><button type="button" onclick="load_cq_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> Show CQ Zone Map</button>
?><button type="button" onclick="load_cq_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> <?php echo lang('awards_show_cq_map'); ?></button>
<?php }?>
</div>
</div>
@@ -138,10 +138,10 @@
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="table-tab" data-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
<a class="nav-link active" id="table-tab" data-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?php echo lang('general_word_table'); ?></a>
</li>
<li class="nav-item">
<a class="nav-link" onclick="load_cq_map();" id="map-tab" data-toggle="tab" href="#cqmaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
<a class="nav-link" onclick="load_cq_map();" id="map-tab" data-toggle="tab" href="#cqmaptab" role="tab" aria-controls="home" aria-selected="false"><?php echo lang('filter_map'); ?></a>
</li>
</ul>
<br />
@@ -154,17 +154,17 @@
</div>
<div class="tab-pane fade show active" id="table" role="tabpanel" aria-labelledby="table-tab">
<div class="tab-pane fade show active" id="table" role="tabpanel" aria-labelledby="table-tab" style="margin-bottom: 30px;">
<?php
$i = 1;
if ($cq_array) {
echo '
<table style="width:100%" class="table tablecq table-sm table-bordered table-hover table-striped table-condensed text-center">
echo "
<table style='width:100%' class='table tablecq table-sm table-bordered table-hover table-striped table-condensed text-center'>
<thead>
<tr>
<td>#</td>
<td>CQ Zone</td>';
<td>" . lang('gen_hamradio_cq_zone') . "</td>";
foreach($bands as $band) {
echo '<td>' . $band . '</td>';
}
@@ -180,28 +180,28 @@
}
echo '</tr>';
}
echo '</table>
<h2>Summary</h2>
echo "</table>
<h2>" . lang('awards_summary') . "</h2>
<table class="table-sm tablesummary table table-bordered table-hover table-striped table-condensed text-center">
<table class='table-sm tablesummary table table-bordered table-hover table-striped table-condensed text-center'>
<thead>
<tr><td></td>';
<tr><td></td>";
foreach($bands as $band) {
echo '<td>' . $band . '</td>';
}
echo '<td>Total</td></tr>
echo "<td>" . lang('awards_total') . "</td></tr>
</thead>
<tbody>
<tr><td>Total worked</td>';
<tr><td>" . lang('awards_total_worked') . "</td>";
foreach ($cq_summary['worked'] as $dxcc) { // Fills the table with the data
echo '<td style="text-align: center">' . $dxcc . '</td>';
}
echo '</tr><tr>
<td>Total confirmed</td>';
echo "</tr><tr>
<td>" . lang('awards_total_confirmed') . "</td>";
foreach ($cq_summary['confirmed'] as $dxcc) { // Fills the table with the data
echo '<td style="text-align: center">' . $dxcc . '</td>';
}

4
application/views/interface_assets/footer.php
View File

@@ -18,6 +18,10 @@
var lang_general_word_qso_data = "<?php echo lang('general_word_qso_data'); ?>";
var lang_general_word_danger = "<?php echo lang('general_word_danger'); ?>";
var lang_qso_delete_warning = "<?php echo lang('qso_delete_warning'); ?>";
var lang_general_word_colors = "<?php echo lang('general_word_colors'); ?>";
var lang_general_word_confirmed = "<?php echo lang('general_word_confirmed'); ?>";
var lang_general_word_worked_not_confirmed = "<?php echo lang('general_word_worked_not_confirmed'); ?>";
var lang_general_word_not_worked = "<?php echo lang('general_word_not_worked'); ?>";
</script>
<!-- General JS Files used across Cloudlog -->
<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>

5
application/views/qslprint/qslprint.php
View File

@@ -13,6 +13,7 @@ if (empty($station_id)) {
}
if ($qsos->result() != NULL) {
echo '<div style="padding-top: 10px; margin-top: 0px;" class="container logbook">';
echo '<table style="width:100%" class="table table-sm table-bordered table-hover table-striped table-condensed qslprint">
<thead>
<tr>
@@ -43,7 +44,7 @@ if ($qsos->result() != NULL) {
foreach ($qsos->result() as $qsl) {
echo '<tr id="qslprint_'.$qsl->COL_PRIMARY_KEY.'">';
echo '<td style=\'text-align: center\'><div class="form-check"><input class="form-check-input" type="checkbox" /></div></td>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>';
?><td style='text-align: center'><span class="qso_call"><a id="edit_qso" href="javascript:displayQso(<?php echo $qsl->COL_PRIMARY_KEY; ?>);"><?php echo str_replace("0","&Oslash;",strtoupper($qsl->COL_CALL)); ?></a><a target="_blank" href="https://www.qrz.com/db/<?php echo strtoupper($qsl->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/qrz.png" alt="Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com"></a> <a target="_blank" href="https://www.hamqth.com/<?php echo strtoupper($qsl->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/hamqth.png" alt="Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH"></a> <a target="_blank" href="http://www.eqsl.cc/Member.cfm?<?php echo strtoupper($qsl->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/eqsl.png" alt="Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc"></a></td><?php
echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo '</td>';
echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo '</td>';
echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
@@ -56,7 +57,7 @@ if ($qsos->result() != NULL) {
echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>';
echo '</tr>';
}
echo '</tbody></table>';
echo '</tbody></table></div>';
?>
<p><button onclick="markSelectedQsos();" title="Mark selected QSOs as printed" class="btn btn-success markallprinted">Mark selected QSOs as printed</button>

8
assets/js/sections/cqmap.js
View File

@@ -176,10 +176,10 @@ function load_cq_map2(data) {
legend.onAdd = function(map) {
var div = L.DomUtil.create("div", "legend");
div.innerHTML += "<h4>Colors</h4>";
div.innerHTML += '<i style="background: green"></i><span>Confirmed ('+confirmed+')</span><br>';
div.innerHTML += '<i style="background: orange"></i><span>Worked not confirmed ('+workednotconfirmed+')</span><br>';
div.innerHTML += '<i style="background: red"></i><span>Not worked ('+notworked+')</span><br>';
div.innerHTML += "<h4>" + lang_general_word_colors + "</h4>";
div.innerHTML += "<i style='background: green'></i><span>" + lang_general_word_confirmed + " (" + confirmed + ")</span><br>";
div.innerHTML += "<i style='background: orange'></i><span>" + lang_general_word_worked_not_confirmed + " (" + workednotconfirmed + ")</span><br>";
div.innerHTML += "<i style='background: red'></i><span>" + lang_general_word_not_worked + " (" + notworked + ")</span><br>";
return div;
};

8
system/libraries/Session/Session_driver.php
View File

@@ -150,6 +150,12 @@ abstract class CI_Session_driver implements SessionHandlerInterface {
return;
}
if (isset($this->_config['cookie_samesite'])) {
$css=$this->_config['cookie_samesite'];
} else {
$css=TRUE;
}
return setcookie(
$this->_config['cookie_name'],
'',
@@ -159,7 +165,7 @@ abstract class CI_Session_driver implements SessionHandlerInterface {
'domain' => $this->_config['cookie_domain'],
'secure' => $this->_config['cookie_secure'],
'httponly' => TRUE,
'samesite' => $this->_config['cookie_samesite']
'samesite' => $css
)
);
}