diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index d5d52e9c..76c266b6 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -295,6 +295,7 @@ class eqsl extends CI_Controller { "_" = 5F "-" = 2D "." = 2E + "&" = 26 */ $adif .= "%3C"; @@ -422,12 +423,13 @@ class eqsl extends CI_Controller { // adding qslmsg if it isn't blank if ($qsl['COL_QSLMSG'] != ''){ + $qsl['COL_QSLMSG'] = str_replace(array(chr(10),chr(13)),array(' ',' '),$qsl['COL_QSLMSG']); $adif .= "%3C"; $adif .= "QSLMSG"; $adif .= "%3A"; $adif .= strlen($qsl['COL_QSLMSG']); $adif .= "%3E"; - $adif .= $qsl['COL_QSLMSG']; + $adif .= str_replace('&','%26',$qsl['COL_QSLMSG']); $adif .= "%20"; } diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index e6ab3188..d3206d8a 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index abb6e217..da43bc0d 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Message (QSLMSG) par défaut"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "Vous pouvez définir un message par défaut qui sera renseigné et envoyé pour chaque QSO pour ce lieu station. Taille max:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Vous pouvez définir un message par défaut qui sera renseigné et envoyé pour chaque QSO pour ce lieu station."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index b4defe32..38d20e14 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -26,7 +26,7 @@ $lang['qso_dok_helptext'] = 'Zum Beispiel: Q03'; $lang['qso_notes_helptext'] = 'Notizeninhalt wird nur innerhalb von Cloudlog genutzt und nicht an andere Dienste weitergegeben.'; $lang['qsl_notes_helptext'] = 'Dieser Notizeninhalt wird an QSL Services wie eqsl.cc exportiert.'; -$lang['qso_eqsl_qslmsg_helptext'] = "Get the default message for eQSL, for this station."; +$lang['qso_eqsl_qslmsg_helptext'] = "Setze die eQSL Nachricht auf den Standardtext zurück."; // Button Text on /qso Display diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index 4705aea4..597c95bf 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -94,8 +94,8 @@ $lang['station_location_signature_name_hint'] = "Signatur/Referenz der Station ( $lang['station_location_signature_info'] = "Signatur Information"; $lang['station_location_signature_info_hint'] = "Signatur/Referenz Information der Station (z.B. DA/NW-357)."; $lang['station_location_eqsl_hint'] = "Der 'QTH Nickname' wie er in deinem eQSL Profil konfiguriert ist."; -$lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg'] = "Standard QSLMSG"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Definiere eine Standard-Nachricht, welche für jedes QSO in diesem Stationsstandort an eQSL übertragen wird."; $lang['station_location_qrz_subscription'] = 'Abonnement erforderlich'; $lang['station_location_qrz_hint'] = "Finde deinen 'QRZ Logbook API Key' in den QRZ.com Logbuch Einstellungen"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbuch Echtzeit Upload'; diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index 7e8cdf46..6726851e 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Информация о подпис $lang['station_location_signature_info_hint'] = "Информация о подписис станции (т.е. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'Название профиля, который сконфигурирован в eQSL для данного QTH'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Требуется подписка'; $lang['station_location_qrz_hint'] = "Ваш ключ API находится на странице настроек журнала QRZ.com"; $lang['station_location_qrz_realtime_upload'] = 'Загрузка в журнал QRZ.com в реальном времени'; diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 2496cc11..987adc62 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -45,6 +45,7 @@ + @@ -1242,7 +1243,10 @@ $(document).on('keypress',function(e) { qso_set_eqsl_qslmsg(stationProfile,false,'.qso_panel'); }); // [eQSL default msg] change value on clic // - $('.qso_panel .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.qso_panel #stationProfile').val(),true,'.qso_panel'); }); + $('.qso_panel .qso_eqsl_qslmsg_update').off('click').on('click',function() { + qso_set_eqsl_qslmsg($('.qso_panel #stationProfile').val(),true,'.qso_panel'); + $('#charsLeft').text(" "); + }); session->userdata('user_qth_lookup') == 1) { ?> $('#qth').focusout(function() { diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 3efde2b1..91d5f8bf 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -22,7 +22,6 @@ - @@ -510,16 +509,17 @@
-
- - -
-
+
+ +
+
+ + -
+
diff --git a/application/views/qso/index.php b/application/views/qso/index.php index b6cbed4b..ba10812f 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -532,9 +532,10 @@
- - - + + + +
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index bcd2ff0b..833ab867 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -251,17 +251,18 @@
- - 240. -
+ + + + -
- - -
+
+ + +
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index e3192ad6..f41c48bb 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -354,9 +354,10 @@
+ - 240. +
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 123cb4a0..2c557560 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -295,8 +295,16 @@ function qso_edit(id) { } }); // [eQSL default msg] change value (for qso edit page) // - $('.modal-content #stationProfile').change(function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),false,'.modal-content'); }); - $('.modal-content .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),true,'.modal-content'); }); + $('.modal-content #stationProfile').change(function() { + qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),false,'.modal-content'); + }); + $('.modal-content .qso_eqsl_qslmsg_update').off('click').on('click',function() { + qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),true,'.modal-content'); + $('.modal-content #charsLeft').text(" "); + }); + $('.modal-content #qslmsg').keyup(function(event) { + calcRemainingChars(event, '.modal-content'); + }); }, }); } diff --git a/assets/js/sections/eqslcharcounter.js b/assets/js/sections/eqslcharcounter.js new file mode 100644 index 00000000..0f1e6826 --- /dev/null +++ b/assets/js/sections/eqslcharcounter.js @@ -0,0 +1,18 @@ +$('#eqslDefaultQSLMsg').keyup(function(event) { + calcRemainingChars(event); +}); + +$('.qso_panel #qslmsg').keyup(function(event) { + calcRemainingChars(event, '.qso_panel'); +}); + +function calcRemainingChars(event, object = '') { + var remainingChars = 240 - $(event.target).val().length; + $(object + ' #charsLeft').text(remainingChars + "/240"); + + if (remainingChars < 5) { + $(object + ' #charsLeft').css('color', 'red'); + } else { + $(object + ' #charsLeft').css('color', ''); + } +} \ No newline at end of file