From c416e9b8e49be7c4d75995012988e4b82506f804 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Thu, 10 Nov 2022 14:45:40 +0100
Subject: [PATCH] Add more QSL details for E and M

---
 application/language/english/qslcard_lang.php |  6 +++
 application/language/german/qslcard_lang.php  |  6 +++
 application/views/view_log/qso.php            | 37 ++++++++++++++-----
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/application/language/english/qslcard_lang.php b/application/language/english/qslcard_lang.php
index b83b793f..f3806dab 100644
--- a/application/language/english/qslcard_lang.php
+++ b/application/language/english/qslcard_lang.php
@@ -7,10 +7,16 @@ $lang['qslcard_string_your_are_using'] = 'You are using';
 $lang['qslcard_string_disk_space'] = 'of disk space to store QSL Card assets';
 
 $lang['qslcard_info'] = 'QSL Info';
+$lang['qslcard_sent'] = 'QSL Card has been sent on';
 $lang['qslcard_sent_bureau'] = 'QSL Card has been sent via the bureau on';
 $lang['qslcard_sent_direct'] = 'QSL Card has been sent via direct on';
+$lang['qslcard_sent_electronic'] = 'QSL Card has been sent electronically on';
+$lang['qslcard_sent_manager'] = 'QSL Card has been sent via manager on';
+$lang['qslcard_rcvd'] = 'QSL Card has been received on';
 $lang['qslcard_rcvd_bureau'] = 'QSL Card has been received via the bureau on';
 $lang['qslcard_rcvd_direct'] = 'QSL Card has been received via direct on';
+$lang['qslcard_rcvd_electronic'] = 'QSL Card has been received electronically on';
+$lang['qslcard_rcvd_manager'] = 'QSL Card has been received via manager on';
 
 $lang['qslcard_upload_front'] = 'Uploaded QSL Card front image';
 $lang['qslcard_upload_back'] = 'Uploaded QSL Card back image';
diff --git a/application/language/german/qslcard_lang.php b/application/language/german/qslcard_lang.php
index d6c9f59e..ae55a90e 100644
--- a/application/language/german/qslcard_lang.php
+++ b/application/language/german/qslcard_lang.php
@@ -6,10 +6,16 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt');
 $lang['qslcard_string_your_are_using'] = 'Du benutzt';
 $lang['qslcard_string_disk_space'] = 'an Speicherplatz, um QSL-Karteninformationen zu speichern';
 $lang['qslcard_info'] = 'QSL Info';
+$lang['qslcard_sent'] = 'QSL Karte wurde gesendet am';
 $lang['qslcard_sent_bureau'] = 'QSL Karte wurde via Büro gesendet am';
 $lang['qslcard_sent_direct'] = 'QSL Karte wurde direkt gesendet am';
+$lang['qslcard_sent_electronic'] = 'QSL Karte wurde elektronisch gesendet am';
+$lang['qslcard_sent_manager'] = 'QSL Karte wurde via Manager gesendet am';
+$lang['qslcard_rcvd'] = 'QSL Karte wurde empfangen am';
 $lang['qslcard_rcvd_bureau'] = 'QSL Karte wurde via Büro empfangen am';
 $lang['qslcard_rcvd_direct'] = 'QSL Karte wurde direkt empfangen am';
+$lang['qslcard_rcvd_electronic'] = 'QSL Karte wurde elektronisch empfangen am';
+$lang['qslcard_rcvd_manager'] = 'QSL Karte wurde via Manager empfangen am';
 
 $lang['qslcard_upload_front'] = 'QSL Kartenfront hochgeladen';
 $lang['qslcard_upload_back'] = 'QSL Kartenrückseite hochgeladen';
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 5dea480f..bc7654a1 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -265,19 +265,36 @@
                 <?php if($row->COL_QSL_SENT == "Y" || $row->COL_QSL_RCVD == "Y") { ?>
                     <h3><?php echo $this->lang->line('qslcard_info'); ?></h3>
 
-                    <?php if($row->COL_QSL_SENT == "Y" && $row->COL_QSL_SENT_VIA == "B") { ?>
-                    <p><?php echo $this->lang->line('qslcard_sent_bureau'); ?> <?php $timestamp = strtotime($row->COL_QSLSDATE); echo date($custom_date_format, $timestamp); ?>.</p>
-                    <?php } ?>
-                    <?php if($row->COL_QSL_SENT == "Y" && $row->COL_QSL_SENT_VIA == "D") { ?>
-                    <p><?php echo $this->lang->line('qslcard_sent_direct'); ?> <?php $timestamp = strtotime($row->COL_QSLSDATE); echo date($custom_date_format, $timestamp); ?>.</p>
+                    <?php if($row->COL_QSL_SENT == "Y") {?>
+                        <?php if ($row->COL_QSL_SENT_VIA == "B") { ?>
+                            <p><?php echo $this->lang->line('qslcard_sent_bureau'); ?>
+                        <?php } else if($row->COL_QSL_SENT_VIA == "D") { ?>
+                            <p><?php echo $this->lang->line('qslcard_sent_direct'); ?>
+                        <?php } else if($row->COL_QSL_SENT_VIA == "E") { ?>
+                            <p><?php echo $this->lang->line('qslcard_sent_electronic'); ?>
+                        <?php } else if($row->COL_QSL_SENT_VIA == "M") { ?>
+                            <p><?php echo $this->lang->line('qslcard_sent_manager'); ?>
+                        <?php } else { ?>
+                            <p><?php echo $this->lang->line('qslcard_sent'); ?>
+                        <?php } ?>
                     <?php } ?>
+                    <?php $timestamp = strtotime($row->COL_QSLSDATE); echo date($custom_date_format, $timestamp); ?>.</p>
 
-                    <?php if($row->COL_QSL_RCVD == "Y" && $row->COL_QSL_RCVD_VIA == "B") { ?>
-                    <p><?php echo $this->lang->line('qslcard_rcvd_bureau'); ?> <?php $timestamp = strtotime($row->COL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
-                    <?php } ?>
-                    <?php if($row->COL_QSL_RCVD == "Y" && $row->COL_QSL_RCVD_VIA == "D") { ?>
-                    <p><?php echo $this->lang->line('qslcard_rcvd_direct'); ?> <?php $timestamp = strtotime($row->COL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
+                    <?php if($row->COL_QSL_RCVD == "Y") { ?>
+                        <?php if ($row->COL_QSL_RCVD_VIA == "B") { ?>
+                            <p><?php echo $this->lang->line('qslcard_rcvd_bureau'); ?>
+                        <?php } else if($row->COL_QSL_RCVD_VIA == "D") { ?>
+                            <p><?php echo $this->lang->line('qslcard_rcvd_direct'); ?>
+                        <?php } else if($row->COL_QSL_RCVD_VIA == "E") { ?>
+                            <p><?php echo $this->lang->line('qslcard_rcvd_electronic'); ?>
+                        <?php } else if($row->COL_QSL_RCVD_VIA == "M") { ?>
+                            <p><?php echo $this->lang->line('qslcard_rcvd_manager'); ?>
+                        <?php } else { ?>
+                            <p><?php echo $this->lang->line('qslcard_rcvd'); ?>
+                        <?php } ?>
                     <?php } ?>
+                    <?php $timestamp = strtotime($row->COL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
+
                 <?php } ?>
 
                     <?php if($row->COL_LOTW_QSL_RCVD == "Y") { ?>