Merge remote-tracking branch 'upstream/dev' into version_dialog

application/controllers/Awards.php

@@ -238,7 +238,7 @@ class Awards extends CI_Controller {
 		$data['page_title'] = "Awards - WAJA";
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('awards/waja/index');
-		$this->load->view('interface_assets/footer');
+		$this->load->view('interface_assets/footer', $footerData);
 	}
 
     public function vucc()	{
@@ -1018,6 +1018,8 @@ class Awards extends CI_Controller {
             $cq_array = null;
         }
 
+		$zones = array();
+
         foreach ($cq_array as $cq => $value) {
             foreach ($value  as $key) {
                 if($key != "") {
@@ -1041,6 +1043,60 @@ class Awards extends CI_Controller {
         echo json_encode($zones);
     }
 
+	/*
+        function waja_map
+    */
+    public function waja_map() {
+		$prefectureString = '01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47';
+		$wajaArray = explode(',', $prefectureString);
+
+        $this->load->model('waja');
+        $this->load->model('bands');
+
+        $bands[] = $this->security->xss_clean($this->input->post('band'));
+
+        $postdata['qsl'] = $this->input->post('qsl') == 0 ? NULL: 1;
+        $postdata['lotw'] = $this->input->post('lotw') == 0 ? NULL: 1;
+        $postdata['eqsl'] = $this->input->post('eqsl') == 0 ? NULL: 1;
+        $postdata['worked'] = $this->input->post('worked') == 0 ? NULL: 1;
+        $postdata['confirmed'] = $this->input->post('confirmed')  == 0 ? NULL: 1;
+        $postdata['notworked'] = $this->input->post('notworked')  == 0 ? NULL: 1;
+        $postdata['band'] = $this->security->xss_clean($this->input->post('band'));
+        $postdata['mode'] = $this->security->xss_clean($this->input->post('mode'));
+
+
+		$waja_array = $this->waja->get_waja_array($bands, $postdata);
+
+		$prefectures = array();
+
+		foreach ($wajaArray as $state) {                  	 // Generating array for use in the table
+            $prefectures[$state] = '-';                   // Inits each state's count
+        }
+
+
+        foreach ($waja_array as $waja => $value) {
+            foreach ($value  as $key) {
+                if($key != "") {
+                    if (strpos($key, '>W<') !== false) {
+                        $prefectures[$waja] = 'W';
+                        break;
+                    }
+                    if (strpos($key, '>C<') !== false) {
+                        $prefectures[$waja] = 'C';
+                        break;
+                    }
+                    if (strpos($key, '-') !== false) {
+                        $prefectures[$waja] = '-';
+                        break;
+                    }
+                }
+            }
+        }
+
+        header('Content-Type: application/json');
+        echo json_encode($prefectures);
+    }
+
     /*
         function dxcc_map
         This displays the DXCC map

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";
 		}
 

application/controllers/Logbookadvanced.php

@@ -124,6 +124,7 @@ class Logbookadvanced extends CI_Controller {
 			'wwff' => xss_clean($this->input->post('wwff')),
 			'qslimages' => xss_clean($this->input->post('qslimages')),
 			'dupes' => xss_clean($this->input->post('dupes')),
+			'operator' => xss_clean($this->input->post('operator')),
 		);
 
 		$qsos = [];
@@ -286,6 +287,7 @@ class Logbookadvanced extends CI_Controller {
 			'pota' => '',
 			'wwff' => '',
 			'qslimages' => '',
+			'operator' => '',
 			'ids' => xss_clean($this->input->post('ids'))
 		);
 
@@ -324,6 +326,7 @@ class Logbookadvanced extends CI_Controller {
 			'sota' => xss_clean($this->input->post('sota')),
 			'pota' => xss_clean($this->input->post('pota')),
 			'wwff' => xss_clean($this->input->post('wwff')),
+			'operator' => xss_clean($this->input->post('operator')),
 			'qslimages' => xss_clean($this->input->post('qslimages')),
 		);
 
@@ -460,6 +463,8 @@ class Logbookadvanced extends CI_Controller {
 		$json_string['state']['show'] = $this->input->post('state');
 		$json_string['cqzone']['show'] = $this->input->post('cqzone');
 		$json_string['iota']['show'] = $this->input->post('iota');
+		$json_string['pota']['show'] = $this->input->post('pota');
+		$json_string['operator']['show'] = $this->input->post('operator');
 
 		$obj['column_settings']= json_encode($json_string);
 

application/language/bulgarian/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/bulgarian/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/chinese_simplified/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - 世界动植物奖";
 $lang['awards_wwff_description_ln2'] = "WWFF，即“业余无线电世界动植物群”，鼓励获得许可的业余无线电操作员离开棚屋，在全球动植物保护区 (PFF) 进行便携式操作。";
 $lang['awards_wwff_description_ln3'] = "全球已有超过 26,000 个动植物保护区 (PFF) 已在 WWFF 名录中注册。 猎人和激活者可以申请全球和国内的丰富多彩的奖项。";
 $lang['awards_wwff_description_ln4'] = "如需了解更多信息，请访问：<a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>。";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/chinese_simplified/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = '显示';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = '关闭';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/czech/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/czech/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/dutch/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/dutch/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/english/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/english/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/finnish/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/finnish/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/french/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/french/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = "Afficher";
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = "Fermer";

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/german/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, ermutigt lizenzierte Funkamateure, ihre Funkstationen zu verlassen und in geschützten Flora- und Fauna-Gebieten (PFF) weltweit portabel zu funken.";
 $lang['awards_wwff_description_ln3'] = "Bereits mehr als 26.000 geschützte Flora- und Fauna-Gebiete (PFF) weltweit sind in dem WWFF-Verzeichnis registriert. Jäger und Aktivatoren können bunte Diplome sowohl weltweit als auch national beantragen.";
 $lang['awards_wwff_description_ln4'] = "Für weitere Informationen besuchen Sie bitte: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/german/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Anzeigen';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Schliessen';

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
 

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'] = "Standard 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'] = "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 <a href='https://logbook.qrz.com/logbook' target='_blank'>QRZ.com Logbuch Einstellungen";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbuch Echtzeit Upload';

application/language/greek/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/greek/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/italian/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/italian/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/polish/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/polish/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/russian/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

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 находится на  <a href='https://logbook.qrz.com/logbook' target='_blank'>странице настроек журнала QRZ.com";
 $lang['station_location_qrz_realtime_upload'] = 'Загрузка в журнал QRZ.com в реальном времени';

application/language/spanish/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/spanish/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/swedish/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/swedish/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/language/turkish/awards_lang.php

@@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award"
 $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide.";
 $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally.";
 $lang['awards_wwff_description_ln4'] = "For more information, please visit: <a href='https://wwff.co/awards/' target='_blank'>https://wwff.co/awards/</a>.";
+
+/*
+___________________________________________________________________________________________
+WAJA -- Use all 4 Lines of Text
+___________________________________________________________________________________________
+*/
+
+$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award";
+$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan.";
+$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted.";
+$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";

application/language/turkish/filter_lang.php

@@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
 // $lang['gen_hamradio_wwff']           --> application/language/english/general_words_lang.php
 // $lang['gen_hamradio_pota']           --> application/language/english/general_words_lang.php
 // $lang['options_save']                --> application/language/english/options_lang.php
+$lang['filter_search_operator']='Search Operator';
 $lang['filter_options_close'] = 'Close';

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 <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
 $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';

application/models/Logbook_model.php

@@ -387,8 +387,9 @@ class Logbook_model extends CI_Model {
 			$this->db->where('COL_DARC_DOK', $searchphrase);
 			break;
 		case 'WAJA':
-			$this->db->where('COL_STATE', $searchphrase);
+			$state = str_pad($searchphrase, 2, '0', STR_PAD_LEFT);
-			$this->db->where_in('COL_DXCC', ['339']);
+			$this->db->where('COL_STATE', $state);
+			$this->db->where('COL_DXCC', '339');
 			break;
 		case 'QSLRDATE':
 			$this->db->where('date(COL_QSLRDATE)=date(SYSDATE())');

application/models/Logbookadvanced_model.php

@@ -168,6 +168,11 @@ class Logbookadvanced_model extends CI_Model {
 			$binding[] = $searchCriteria['wwff'].'%';
 		}
 
+		if ($searchCriteria['operator'] !== '') {
+			$conditions[] = "COL_OPERATOR like ?";
+			$binding[] = $searchCriteria['operator'].'%';
+		}
+
         if ($searchCriteria['gridsquare'] !== '') {
                 $conditions[] = "(COL_GRIDSQUARE like ? or COL_VUCC_GRIDS like ?)";
                 $binding[] = '%' . $searchCriteria['gridsquare'] . '%';

application/views/awards/waja/index.php

@@ -1,6 +1,9 @@
+<script>
+	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"
+</script>
 
 <style>
-    #dxccmap {
+    #wajamap {
 	height: calc(100vh - 500px) !important;
 	max-height: 900px !important;
 }
@@ -17,11 +20,12 @@
   text-align: center;
   font-size: 16px;
   margin: 2px 12px 8px;
-  color: #777;
+  color: #555;
 }
 .legend span {
   position: relative;
   bottom: 3px;
+  color: #555;
 }
 .legend i {
   width: 18px;
@@ -29,13 +33,36 @@
   float: left;
   margin: 0 8px 0 0;
   opacity: 0.7;
+  color: #555;
+}
+
+.info {
+    padding: 6px 8px;
+    font: 14px/16px Arial, Helvetica, sans-serif;
+    background: white;
+    background: rgba(255,255,255,0.8);
+    box-shadow: 0 0 15px rgba(0,0,0,0.2);
+    border-radius: 5px;
+	color: #555;
+}
+.info h4 {
+    margin: 0 0 5px;
+    color: #555;
 }
 </style>
 <div class="container">
-	        <!-- Award Info Box -->
+        <!-- Award Info Box -->
-			<br>
+        <br>
         <div id="awardInfoButton">
+            <script>
+            var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
+            var lang_award_info_ln1 = "<?php echo lang('awards_waja_description_ln1'); ?>";
+            var lang_award_info_ln2 = "<?php echo lang('awards_waja_description_ln2'); ?>";
+            var lang_award_info_ln3 = "<?php echo lang('awards_waja_description_ln3'); ?>";
+            var lang_award_info_ln4 = "<?php echo lang('awards_waja_description_ln4'); ?>";
+            </script>
             <h2><?php echo $page_title; ?></h2>
+            <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
         </div>
         <!-- End of Award Info Box -->
 
@@ -119,6 +146,9 @@
                 <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>
+                    <?php if ($waja_array) {
+                        ?><button type="button" onclick="load_waja_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> Show WAJA Map</button>
+                    <?php }?>
                 </div>
             </div>
 
@@ -129,14 +159,17 @@
         <li class="nav-item">
             <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
         </li>
+        <li class="nav-item">
+            <a class="nav-link" id="map-tab" onclick="load_waja_map();" data-bs-toggle="tab" href="#wajamaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
+        </li>
     </ul>
     <br />
 
     <div class="tab-content" id="myTabContent">
-        <div class="tab-pane fade" id="dxccmaptab" role="tabpanel" aria-labelledby="home-tab">
+        <div class="tab-pane fade" id="wajamaptab" role="tabpanel" aria-labelledby="home-tab">
     <br />
 
-    <div id="dxccmap"></div>
+    <div id="wajamap"></div>
 
     </div>
 
@@ -158,7 +191,7 @@
         echo '</tr>
                     </thead>
                     <tbody>';
-        foreach ($waja_array as $dxcc => $value) {      // Fills the table with the data
+        foreach ($waja_array as $waja => $value) {      // Fills the table with the data
             echo '<tr>';
             foreach ($value as $name => $key) {
 				echo '<td style="text-align: center">' . $key . '</td>';
@@ -182,14 +215,14 @@
 
         <tr><td>Total worked</td>';
 
-        foreach ($waja_summary['worked'] as $dxcc) {      // Fills the table with the data
+        foreach ($waja_summary['worked'] as $waja) {      // Fills the table with the data
-            echo '<td style="text-align: center">' . $dxcc . '</td>';
+            echo '<td style="text-align: center">' . $waja . '</td>';
         }
 
         echo '</tr><tr>
         <td>Total confirmed</td>';
-        foreach ($waja_summary['confirmed'] as $dxcc) {      // Fills the table with the data
+        foreach ($waja_summary['confirmed'] as $waja) {      // Fills the table with the data
-            echo '<td style="text-align: center">' . $dxcc . '</td>';
+            echo '<td style="text-align: center">' . $waja . '</td>';
         }
 
         echo '</tr>

application/views/interface_assets/footer.php

@@ -45,6 +45,7 @@
 <script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
 <script type="text/javascript" src="<?php echo base_url() ;?>assets/js/easyprint.js"></script>
 <script type="text/javascript" src="<?php echo base_url() ;?>assets/js/sections/common.js"></script>
+<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/sections/eqslcharcounter.js"></script>
 <script type="text/javascript" src="<?php echo base_url() ;?>assets/js/sections/version_dialog.js"></script>
 
 <script src="https://unpkg.com/htmx.org@1.6.1"></script>
@@ -1270,7 +1271,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(" ");
+    });
 
 <?php if ($this->session->userdata('user_qth_lookup') == 1) { ?>
     $('#qth').focusout(function() {

application/views/logbookadvanced/index.php

@@ -7,9 +7,13 @@
 var custom_date_format = "<?php echo $custom_date_format ?>";
 <?php
 if (!isset($options)) {
-   $options = "{\"datetime\":{\"show\":\"true\"},\"de\":{\"show\":\"true\"},\"dx\":{\"show\":\"true\"},\"mode\":{\"show\":\"true\"},\"rstr\":{\"show\":\"true\"},\"rsts\":{\"show\":\"true\"},\"band\":{\"show\":\"true\"},\"myrefs\":{\"show\":\"true\"},\"refs\":{\"show\":\"true\"},\"name\":{\"show\":\"true\"},\"qslvia\":{\"show\":\"true\"},\"qsl\":{\"show\":\"true\"},\"lotw\":{\"show\":\"true\"},\"eqsl\":{\"show\":\"true\"},\"qslmsg\":{\"show\":\"true\"},\"dxcc\":{\"show\":\"true\"},\"state\":{\"show\":\"true\"},\"cqzone\":{\"show\":\"true\"},\"iota\":{\"show\":\"true\"}}";
+   $options = "{\"datetime\":{\"show\":\"true\"},\"de\":{\"show\":\"true\"},\"dx\":{\"show\":\"true\"},\"mode\":{\"show\":\"true\"},\"rstr\":{\"show\":\"true\"},\"rsts\":{\"show\":\"true\"},\"band\":{\"show\":\"true\"},\"myrefs\":{\"show\":\"true\"},\"refs\":{\"show\":\"true\"},\"name\":{\"show\":\"true\"},\"qslvia\":{\"show\":\"true\"},\"qsl\":{\"show\":\"true\"},\"lotw\":{\"show\":\"true\"},\"eqsl\":{\"show\":\"true\"},\"qslmsg\":{\"show\":\"true\"},\"dxcc\":{\"show\":\"true\"},\"state\":{\"show\":\"true\"},\"cqzone\":{\"show\":\"true\"},\"iota\":{\"show\":\"true\"},\"pota\":{\"show\":\"true\"},\"operator\":{\"show\":\"true\"}}";
 }
 echo "var user_options = $options;";
+if (!isset($options->operator)) {
+	echo "\nvar o_template = { operator: {show: 'true'}};";
+	echo "\nuser_options={...user_options, ...o_template}";
+}
 ?>
 </script>
 <style>
@@ -200,6 +204,10 @@ $options = json_decode($options);
                         <label class="form-label" for="pota"><?php echo lang('gen_hamradio_pota'); ?></label>
                         <input type="text" name="pota" id="pota" class="form-control form-control-sm" value="">
                     </div>
+                    <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
+                        <label class="form-label" for="operator"><?php echo lang('gen_hamradio_operator'); ?></label>
+                        <input type="text" name="operator" id="operator" class="form-control form-control-sm" value="">
+                    </div>
                 </div>
             </div>
     </div>
@@ -366,6 +374,9 @@ $options = json_decode($options);
             <?php if (($options->refs->show ?? "true") == "true") { ?>
                 <button type="button" class="btn btn-sm btn-primary me-1" id="searchWwff"><?php echo lang('filter_search_wwff'); ?></button><?php
             } ?>
+            <?php if (($options->operator->show ?? "true") == "true") { ?>
+                <button type="button" class="btn btn-sm btn-primary me-1" id="searchOperator"><?php echo lang('filter_search_operator'); ?></button><?php
+            } ?>
         </div>
     </div>
 <div class="row pt-2">
@@ -457,6 +468,9 @@ $options = json_decode($options);
 			<?php if (($options->iota->show ?? "true") == "true") {
 				echo '<th>' . lang('gen_hamradio_iota') . '</th>';
 			} ?>
+			<?php if (($options->operator->show ?? "true") == "true") {
+				echo '<th>' . lang('gen_hamradio_operator') . '</th>';
+			} ?>
         </tr>
     </thead>
     <tbody>

application/views/logbookadvanced/useroptions.php

@@ -90,5 +90,9 @@
 			<td><?php echo lang('gen_hamradio_pota'); ?></td>
 			<td><div class="form-check"><input class="form-check-input" name="pota" type="checkbox" <?php if (($options->pota->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
 		</tr>
+		<tr>
+			<td><?php echo lang('gen_hamradio_operator'); ?></td>
+			<td><div class="form-check"><input class="form-check-input" name="operator" type="checkbox" <?php if (($options->operator->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
+		</tr>
 	</tbody>
 </table>

application/views/qso/edit_ajax.php

@@ -22,7 +22,6 @@
     <script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
     <script src="<?php echo base_url(); ?>assets/js/jquery.fancybox.min.js"></script>
     <script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
-
 </head>
 
 <body class="container-fluid qso-edit-box">
@@ -510,16 +509,17 @@
                                                 </select></div>
                                         </div>
                                         <div class="mb-3 row">
-                                             <div class="col-sm-9">
+                                            <div>
-                                                 <label for="qslmsg"><?php echo lang('general_word_notes'); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo lang('qso_eqsl_qslmsg_helptext'); ?>"><i class="fas fa-redo-alt"></i></span></label>
+                                                <div class="alert alert-info" role="alert">
-                                                 <div class="alert alert-info" role="alert">
+                                                    <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
-                                                     <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
+                                                </div>
-                                                 </div>
+                                            </div>
-                                             </div>
+                                            <div>
-                                             <div class="col-sm-9">
+                                                <label for="qslmsg"><?php echo lang('general_word_notes'); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo lang('qso_eqsl_qslmsg_helptext'); ?>"><i class="fas fa-redo-alt"></i></span></label>
+						                        <label class="position-absolute end-0 mb-2 me-3" for="qslmsg" id="charsLeft"> </label>
                                                 <textarea  type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5" maxlength="240"><?php echo $qso->COL_QSLMSG; ?></textarea>
                                                 <div id="qslmsg_hide" style="display:none;"><?php echo $qso->COL_QSLMSG; ?></div>
-                                             </div>
+                                            </div>
                                         </div>
 
                                     </div>

application/views/qso/index.php

@@ -532,9 +532,10 @@
               <span class="badge text-bg-info"><?php echo lang('general_word_info'); ?></span> <?php echo lang('qsl_notes_helptext'); ?>
             </div>
            <div class="mb-3">
-           <label for="qslmsg"><?php echo lang('general_word_notes'); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo lang('qso_eqsl_qslmsg_helptext'); ?>"><i class="fas fa-redo-alt"></i></span></label>
+            <label for="qslmsg"><?php echo lang('general_word_notes'); ?><span class="qso_eqsl_qslmsg_update" title="<?php echo lang('qso_eqsl_qslmsg_helptext'); ?>"><i class="fas fa-redo-alt"></i></span></label>
-              <textarea  type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5" maxlength="240"><?php echo $qslmsg; ?></textarea>
+						<label class="position-absolute end-0 mb-2 me-3" for="qslmsg" id="charsLeft"> </label>
-              <div id="qslmsg_hide" style="display:none;"><?php echo $qslmsg; ?></div>
+            <textarea  type="text" class="form-control" id="qslmsg" name="qslmsg" rows="5" maxlength="240"><?php echo $qslmsg; ?></textarea>
+            <div id="qslmsg_hide" style="display:none;"><?php echo $qslmsg; ?></div>
             </div>
           </div>
         </div>

application/views/station_profile/create.php

@@ -251,17 +251,18 @@
 
 			<div class="mb-3">
 				<label for="eqslDefaultQSLMsg"><?php echo lang("station_location_eqsl_defaultqslmsg"); ?></label>
-		    	<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;"></textarea>
+				<label class="position-absolute end-0 mb-2 me-3" for="eqslDefaultQSLMsg" id="charsLeft"> </label>
-		    	<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_defaultqslmsg_hint"); ?> 240.</small>
+				<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;"></textarea>
-		  	</div>
+				<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_defaultqslmsg_hint"); ?></small>
+			</div>
 
-                <div class="mb-3">
+            <div class="mb-3">
-			<label for="clublogrealtime"><?php echo lang("station_location_clublog_realtime_upload"); ?></label>
+				<label for="clublogrealtime"><?php echo lang("station_location_clublog_realtime_upload"); ?></label>
-			<select class="form-select" id="clublogrealtime" name="clublogrealtime">
+				<select class="form-select" id="clublogrealtime" name="clublogrealtime">
-				<option value="1"><?php echo lang("general_word_yes"); ?></option>
+					<option value="1"><?php echo lang("general_word_yes"); ?></option>
-				<option value="0" selected><?php echo lang("general_word_no"); ?></option>
+					<option value="0" selected><?php echo lang("general_word_no"); ?></option>
-			</select>
+				</select>
-		</div>
+			</div>
 
             <div class="row">
                 <div class="mb-3 col-sm-6">                                                                                                                                                    

application/views/station_profile/edit.php

@@ -354,9 +354,10 @@
 		  			</div>
 					<div class="mb-3">
 		    			<label for="eqslDefaultQSLMsg"><?php echo lang("station_location_eqsl_defaultqslmsg"); ?></label>
+						<label class="position-absolute end-0 mb-2 me-3" for="eqslDefaultQSLMsg" id="charsLeft"> </label>
 		    			<?php $eqsl_default_qslmsg = (set_value('eqsl_default_qslmsg') != "")?set_value('eqsl_default_qslmsg'):$eqsl_default_qslmsg; ?>
 		    			<textarea class="form-control" name="eqsl_default_qslmsg" id="eqslDefaultQSLMsg" aria-describedby="eqsldefaultqslmsghelp" maxlength="240" rows="2" style="width:100%;" value="<?php echo $eqsl_default_qslmsg; ?>"><?php echo $eqsl_default_qslmsg; ?></textarea>
-		    			<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_defaultqslmsg_hint"); ?> 240.</small>
+		    			<small id="eqsldefaultqslmsghelp" class="form-text text-muted"><?php echo lang("station_location_eqsl_defaultqslmsg_hint"); ?></small>
 		  			</div>
 				</div>
 			</div>

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 #stationProfile').change(function() { 
-                    $('.modal-content .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.modal-content #stationProfile').val(),true,'.modal-content'); });
+                        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');
+                    });
                 },
             });
         }

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', '');
+    }
+}

assets/js/sections/logbookadvanced.js

@@ -81,6 +81,12 @@ function updateRow(qso) {
 	if (user_options.iota.show == "true"){
 		cells.eq(c++).html(qso.iota);
 	}
+	// if (user_options.pota.show == "true"){
+	// 	cells.eq(c++).html(qso.pota);
+	// }
+	if ( (user_options.operator) && (user_options.operator.show == "true")){
+		cells.eq(c++).html(qso.operator);
+	}
 
 	$('[data-bs-toggle="tooltip"]').tooltip();
 	return row;
@@ -174,6 +180,12 @@ function loadQSOTable(rows) {
 		if (user_options.iota.show == "true"){
 			data.push(qso.iota);
 		}
+		// if (user_options.pota.show == "true"){
+		// 	data.push(qso.pota);
+		// }
+		if (user_options.operator.show == "true"){
+			data.push(qso.operator);
+		}
 
 		let createdRow = table.row.add(data).index();
 		table.rows(createdRow).nodes().to$().data('qsoID', qso.qsoID);
@@ -261,6 +273,7 @@ $(document).ready(function () {
 				qslSentMethod: this.qslSentMethod.value,
 				qslReceivedMethod: this.qslReceivedMethod.value,
 				iota: this.iota.value,
+				operator: this.operator.value,
 				dxcc: this.dxcc.value,
 				propmode: this.selectPropagation.value,
 				gridsquare: this.gridsquare.value,
@@ -497,6 +510,10 @@ $(document).ready(function () {
 		quickSearch('pota');
 	});
 
+	$('#searchOperator').click(function (event) {
+		quickSearch('operator');
+	});
+
 	$('#dupeButton').click(function (event) {
 		dupeSearch();
 	});
@@ -623,6 +640,7 @@ $(document).ready(function () {
 				case 'sota': 		col1 = $(currentRow).find('#dxsota').text(); break;
 				case 'wwff': 		col1 = $(currentRow).find('#dxwwff').text(); break;
 				case 'pota': 		col1 = $(currentRow).find('#dxpota').text(); break;
+				case 'operator': 	col1 = $(currentRow).find('#operator').text(); break;
 				case 'mode': 		col1 = currentRow.find("td:eq(4)").text(); break;
 				case 'band': 		col1 = currentRow.find("td:eq(7)").text(); col1 = col1.match(/\S\w*/); break;
 			}
@@ -872,6 +890,7 @@ function mapQsos(form) {
 				qslvia: $('[name="qslviainput"]').val(),
 				sota: form.sota.value,
 				pota: form.pota.value,
+				operator: form.operator.value,
 				wwff: form.wwff.value,
 				qslimages: form.qslimages.value,
 			},
@@ -1069,6 +1088,8 @@ function loadMap(data) {
 				state: $('input[name="state"]').is(':checked') ? true : false,
 				cqzone: $('input[name="cqzone"]').is(':checked') ? true : false,
 				iota: $('input[name="iota"]').is(':checked') ? true : false,
+				pota: $('input[name="pota"]').is(':checked') ? true : false,
+				operator: $('input[name="operator"]').is(':checked') ? true : false,
 			},
 			success: function(data) {
 				$('#saveButton').prop("disabled", false);

src/QSLManager/QSO.php

@@ -65,6 +65,7 @@ class QSO
 	private string $callsign;
 	private string $lastupload;
 	private string $lotw_hint;
+	private string $operator;
 
 	/**
 	 * @param array $data Does no validation, it's assumed to be a row from the database in array format
@@ -116,6 +117,7 @@ class QSO
 			'COL_STATE',
 			'COL_COUNTRY',
 			'COL_IOTA',
+			'COL_OPERATOR',
 		];
 
 
@@ -202,6 +204,7 @@ class QSO
 		$this->callsign = (($data['callsign'] ?? null) === null) ? '' : $data['callsign'];
 		$this->lastupload = (($data['lastupload'] ?? null) === null) ? '' : date($custom_date_format . " H:i", strtotime($data['lastupload'] ?? null));
 		$this->lotw_hint = $this->getLotwHint($data['lastupload'] ?? null);
+		$this->operator = ($data['COL_OPERATOR'] === null) ? '' :$data['COL_OPERATOR'];
 	}
 
 	/**
@@ -771,6 +774,11 @@ class QSO
 		return '<span id="iota">' . $this->iota . '</span>';
 	}
 
+	public function getOperator(): string
+	{
+		return '<span id="operator">' . $this->operator . '</span>';
+	}
+
 	public function toArray(): array
 	{
 		return [
@@ -792,6 +800,8 @@ class QSO
 			'name' => $this->getName(),
 			'dxcc' => $this->getDXCC(),
 			'state' => $this->getState(),
+			'pota' => $this->dxPOTAReference,
+			'operator' => $this->getOperator(),
 			'cqzone' => $this->getCqzone(),
 			'iota' => $this->getIOTA(),
 			'end' => $this->end === null ? null : $this->end->format("Y-m-d"),