Merge branch 'magicbug:dev' into dev

application/controllers/Logbookadvanced.php

@@ -105,6 +105,8 @@ class Logbookadvanced extends CI_Controller {
 			'band' => xss_clean($this->input->post('band')),
 			'qslSent' => xss_clean($this->input->post('qslSent')),
 			'qslReceived' => xss_clean($this->input->post('qslReceived')),
+			'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')),
+			'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')),
 			'iota' => xss_clean($this->input->post('iota')),
 			'dxcc' => xss_clean($this->input->post('dxcc')),
 			'propmode' => xss_clean($this->input->post('propmode')),
@@ -253,6 +255,8 @@ class Logbookadvanced extends CI_Controller {
 			'band' => '',
 			'qslSent' => '',
 			'qslReceived' => '',
+			'qslSentMethod' => '',
+			'qslReceivedMethod' => '',
 			'iota' => '',
 			'dxcc' => '',
 			'propmode' => '',
@@ -290,6 +294,8 @@ class Logbookadvanced extends CI_Controller {
 			'band' => xss_clean($this->input->post('band')),
 			'qslSent' => xss_clean($this->input->post('qslSent')),
 			'qslReceived' => xss_clean($this->input->post('qslReceived')),
+			'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')),
+			'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')),
 			'iota' => xss_clean($this->input->post('iota')),
 			'dxcc' => xss_clean($this->input->post('dxcc')),
 			'propmode' => xss_clean($this->input->post('propmode')),

application/language/bulgarian/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/chinese_simplified/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/czech/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/dutch/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/english/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/finnish/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/french/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/german/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL gesendet';
 $lang['filter_qsl_recv'] = 'QSL erhalten';
+$lang['filter_qsl_sent_method'] = 'QSL-Sende Methode';
+$lang['filter_qsl_recv_method'] = 'QSL-Empfangs Methode';
 $lang['filter_lotw_sent'] = 'LoTW gesendet';
 $lang['filter_lotw_recv'] = 'LoTW erhalten';
 $lang['filter_eqsl_sent'] = 'eQSL gesendet';
@@ -108,6 +110,7 @@ $lang['filter_actions_not_sent'] = 'Nicht gesendet';
 $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich';
 $lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)';
 $lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)';
+$lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)';
 $lang['filter_actions_create_adif'] = 'Erstelle ADIF';
 $lang['filter_actions_print_label'] = 'Label drucken';
 $lang['filter_actions_start_print_title'] = 'Label Drucken';

application/language/greek/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/italian/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/polish/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/russian/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/spanish/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/swedish/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/language/turkish/filter_lang.php

@@ -46,6 +46,8 @@ ________________________________________________________________________________
 
 $lang['filter_qsl_sent'] = 'QSL sent';
 $lang['filter_qsl_recv'] = 'QSL received';
+$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
+$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
 $lang['filter_lotw_sent'] = 'LoTW sent';
 $lang['filter_lotw_recv'] = 'LoTW received';
 $lang['filter_eqsl_sent'] = 'eQSL sent';
@@ -101,13 +103,14 @@ $lang['filter_actions_update_f_callbook'] = 'Update from Callbook';
 $lang['filter_actions_queue_bureau'] = 'Queue Bureau';
 $lang['filter_actions_queue_direct'] = 'Queue Direct';
 $lang['filter_actions_queue_electronic'] = 'Queue Electronic';
-$lang['filter_actions_sent_bureau'] = 'Sent Bureau';
+$lang['filter_actions_sent_bureau'] = 'Sent (Bureau)';
-$lang['filter_actions_sent_direct'] = 'Sent Direct';
+$lang['filter_actions_sent_direct'] = 'Sent (Direct)';
-$lang['filter_actions_sent_electronic'] = 'Sent Electronic';
+$lang['filter_actions_sent_electronic'] = 'Sent (Electronic)';
 $lang['filter_actions_not_sent'] = 'Not Sent';
 $lang['filter_actions_qsl_n_required'] = 'QSL Not Required';
 $lang['filter_actions_recv_bureau'] = 'Received (Bureau)';
 $lang['filter_actions_recv_direct'] = 'Received (Direct)';
+$lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
 $lang['filter_actions_create_adif'] = 'Create ADIF';
 $lang['filter_actions_print_label'] = 'Print Label';
 $lang['filter_actions_start_print_title'] = 'Print Labels';

application/models/Logbookadvanced_model.php

@@ -63,6 +63,18 @@ class Logbookadvanced_model extends CI_Model {
 			$binding[] = $searchCriteria['qslReceived'];
 		}
 
+		if ($searchCriteria['qslSentMethod'] !== '') {
+			$condition = "COL_QSL_SENT_VIA = ?";
+			$conditions[] = $condition;
+			$binding[] = $searchCriteria['qslSentMethod'];
+		}
+
+		if ($searchCriteria['qslReceivedMethod'] !== '') {
+			$condition = "COL_QSL_RCVD_VIA = ?";
+			$conditions[] = $condition;
+			$binding[] = $searchCriteria['qslReceivedMethod'];
+		}
+
 		if ($searchCriteria['lotwSent'] !== '') {
 			$condition = "COL_LOTW_QSL_SENT = ?";
 			if ($searchCriteria['lotwSent'] == 'N') {

application/views/logbookadvanced/index.php

@@ -234,6 +234,26 @@ $options = json_decode($options);
                     <option value="V"><?php echo lang('filter_qsl_verified'); ?></option>
                 </select>
             </div>
+            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                <label for="qslSentMethod"><?php echo lang('filter_qsl_sent_method'); ?></label>
+                <select id="qslSentMethod" name="qslSentMethod" class="form-control form-control-sm">
+                    <option value=""><?php echo lang('general_word_all'); ?></option>
+                    <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
+                    <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
+                    <option value="E"><?php echo lang('general_word_qslcard_electronic'); ?></option>
+                    <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
+                </select>
+            </div>
+            <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+                <label for="qslReceivedMethod"><?php echo lang('filter_qsl_recv_method'); ?></label>
+                <select id="qslReceivedMethod" name="qslReceivedMethod" class="form-control form-control-sm">
+                    <option value=""><?php echo lang('general_word_all'); ?></option>
+                    <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
+                    <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
+                    <option value="E"><?php echo lang('general_word_qslcard_electronic'); ?></option>
+                    <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
+                </select>
+            </div>
             <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="lotwSent"><?php echo lang('filter_lotw_sent'); ?></label>
                 <select id="lotwSent" name="lotwSent" class="form-control form-control-sm">
@@ -280,14 +300,7 @@ $options = json_decode($options);
             </div>
             <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslvia"><?php echo lang('filter_qsl_via'); ?></label>
-                <datalist id="qslvia" name="qslvia">
+                <input type="search" name="qslviainput" class="form-control form-control-sm">
-                    <option value=""><?php echo lang('general_word_all'); ?></option>
-                    <option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
-                    <option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
-                    <option value="E"><?php echo lang('general_word_qslcard_electronic'); ?></option>
-                    <option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
-                </datalist>
-                <input type="search" list="qslvia" name="qslviainput" class="custom-select custom-select-sm">
             </div>
             <div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
                 <label for="qslimages"><?php echo lang('filter_qsl_images'); ?></label>
@@ -314,6 +327,7 @@ $options = json_decode($options);
             <button type="button" class="btn btn-sm btn-warning mr-1" id="notRequired"><?php echo lang('filter_actions_qsl_n_required'); ?></button>
             <button type="button" class="btn btn-sm btn-warning mr-1" id="receivedBureau"><?php echo lang('filter_actions_recv_bureau'); ?></button>
             <button type="button" class="btn btn-sm btn-warning mr-1" id="receivedDirect"><?php echo lang('filter_actions_recv_direct'); ?></button>
+            <button type="button" class="btn btn-sm btn-warning mr-1" id="receivedElectronic"><?php echo lang('filter_actions_recv_electronic'); ?></button>
             <button type="button" class="btn btn-sm btn-info mr-1" id="exportAdif"><?php echo lang('filter_actions_create_adif'); ?></button>
             <button type="button" class="btn btn-sm btn-info mr-1" id="printLabel"><?php echo lang('filter_actions_print_label'); ?></button>
             <button type="button" class="btn btn-sm btn-info mr-1" id="qslSlideshow"><?php echo lang('filter_actions_qsl_slideshow'); ?></button>

assets/css/default/overrides.css

@@ -23,5 +23,9 @@ thead>tr>td {
         float:right;
 }
 
+.btn { 
+        white-space: normal; 
+}
+
 #qsoList_wrapper th { text-align: left !important; white-space: nowrap;}
 #qsoList_wrapper td { text-align: left !important; white-space: nowrap;}

assets/js/sections/logbookadvanced.js

@@ -264,6 +264,8 @@ $(document).ready(function () {
 				band: this.band.value,
 				qslSent: this.qslSent.value,
 				qslReceived: this.qslReceived.value,
+				qslSentMethod: this.qslSentMethod.value,
+				qslReceivedMethod: this.qslReceivedMethod.value,
 				iota: this.iota.value,
 				dxcc: this.dxcc.value,
 				propmode: this.selectPropagation.value,
@@ -447,10 +449,15 @@ $(document).ready(function () {
 	$('#receivedBureau').click(function (event) {
 		handleQslReceived('Y','B', 'receivedBureau');
 	});
+
 	$('#receivedDirect').click(function (event) {
 		handleQslReceived('Y','D', 'receivedDirect');
 	});
 
+	$('#receivedElectronic').click(function (event) {
+		handleQslReceived('Y','E', 'receivedElectronic');
+	});
+
 	$('#searchGridsquare').click(function (event) {
 		quickSearch('gridsquare');
 	});
@@ -850,6 +857,8 @@ function mapQsos(form) {
 				band: form.band.value,
 				qslSent: form.qslSent.value,
 				qslReceived: form.qslReceived.value,
+				qslSentMethod: this.qslSentMethod.value,
+				qslReceivedMethod: this.qslReceivedMethod.value,
 				iota: form.iota.value,
 				dxcc: form.dxcc.value,
 				propmode: form.selectPropagation.value,