From 33130201f6d84d0503edf93bb4fa3f3d9dde3111 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 20 Feb 2022 11:57:09 +0000
Subject: [PATCH] Revert "Merge pull request #1403 from
 AndreasK79/dxcc_add_text_deleted"

This reverts commit a6faa1310bdca12eae11690ec22e71fcc1c6d848, reversing
changes made to 6b0e9b5eeb22eb9e1190bb8f03bcf5b870cf6c15.
---
 application/views/dxatlas/index.php          | 6 +-----
 application/views/kml/index.php              | 6 +-----
 application/views/lookup/index.php           | 6 +-----
 application/views/qso/edit_ajax.php          | 6 +-----
 application/views/qso/index.php              | 6 +-----
 application/views/station_profile/create.php | 3 +--
 application/views/station_profile/edit.php   | 3 +--
 application/views/timeplotter/index.php      | 2 +-
 8 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index e013ecf9..7d7cad24 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -60,11 +60,7 @@
 						<option value="All">All</option>
 						<?php
 						foreach($dxcc as $d){
-							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
-							if ($d->Enddate != null) {
-								echo ' (deleted dxcc)';
-							}
-							echo '</option>';
+							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
 						}
 						?>
 
diff --git a/application/views/kml/index.php b/application/views/kml/index.php
index eff5ebf2..bef91511 100644
--- a/application/views/kml/index.php
+++ b/application/views/kml/index.php
@@ -33,11 +33,7 @@
                         <option value="All">All</option>
                         <?php
                         foreach($dxcc as $d){
-                            echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
-                            if ($d->Enddate != null) {
-                                echo ' (deleted dxcc)';
-                            }
-                            echo '</option>';
+                            echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
                         }
                         ?>
 
diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php
index d77358d1..995ef6c6 100644
--- a/application/views/lookup/index.php
+++ b/application/views/lookup/index.php
@@ -14,11 +14,7 @@
 
 			<?php
 			foreach($dxcc as $d){
-				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
-				if ($d->Enddate != null) {
-					echo ' (deleted dxcc)';
-				}
-				echo '</option>';
+				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
 			}
 			?>
 
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index 184c7215..5e377816 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -266,11 +266,7 @@
                                                 if ($qso->COL_DXCC == $d->adif) {
                                                     echo " selected=\"selected\"";
                                                 }
-                                                echo '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name));
-                                                if ($d->Enddate != null) {
-                                                    echo ' (deleted dxcc)';
-                                                }
-                                                echo '</option>';
+                                                echo '>' . $d->prefix . ' - ' . $d->name . '</option>';
                                             }
                                             ?>
 
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 4cffb987..47d63432 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -258,11 +258,7 @@
                       <option value="0">None</option>
                       <?php
                       foreach($dxcc as $d){
-                        echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
-                        if ($d->Enddate != null) {
-                          echo ' (deleted dxcc)';
-                        }
-                        echo '</option>';
+                          echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
                       }
                       ?>
 
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 2c83e6f2..bb900dcf 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -46,8 +46,7 @@
 				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 				<option value="0" selected>NONE</option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
-				</option>
+				<option value="<?php echo $dxcc->adif; ?>"><?php echo $dxcc->name; ?></option>
 				<?php } ?>
 				</select>
 				<?php } ?>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index bd1a01ab..dc9c5f07 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -57,8 +57,7 @@
 							<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
 							<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
-							</option>
+							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo $dxcc->name; ?></option>
 							<?php } ?>
 							</select>
 							<?php } ?>
diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php
index f5bcc5be..7fb28766 100644
--- a/application/views/timeplotter/index.php
+++ b/application/views/timeplotter/index.php
@@ -21,7 +21,7 @@
                         <?php
                         if ($dxcc_list->num_rows() > 0) {
                                 foreach ($dxcc_list->result() as $dxcc) {
-                                    echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
+                                    echo '<option value=' . $dxcc->adif . '> ' . $dxcc->name . ' - ' . $dxcc->prefix;
                                     if ($dxcc->end != null) {
                                         echo ' (deleted)';
                                     }