From 9a2abd2f1ec8109f7ec91639ce937b73da5f8059 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 23 Jun 2019 16:11:55 +0100
Subject: [PATCH] You can now delete a QSO via the cog dropdown

---
 application/controllers/Qso.php            | 5 +++++
 application/views/view_log/partial/log.php | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index 84dd207d..e159fd0d 100755
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -133,6 +133,11 @@ class QSO extends CI_Controller {
 		$data['message_contents'] = "QSO Deleted Successfully";
 		$this->load->view('messages/message', $data);
 
+
+		// If deletes from /logbook dropdown redirect
+		if (strpos($_SERVER['HTTP_REFERER'], '/logbook') !== false) {
+		    redirect($_SERVER['HTTP_REFERER']);
+		}
 	}
 	
 	
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index a901e5b4..13e325e2 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -69,12 +69,17 @@
 
 				  <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
 				  	<a class="dropdown-item" data-fancybox data-type="iframe" data-src="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a>
+				  	
 				  	<div class="dropdown-divider"></div>	
 
 				  	<?php if($row->COL_QSL_RCVD !='Y') { ?> 
 				    <a class="dropdown-item" href="<?php echo site_url('qso/qsl_rcvd'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>/B" ><i class="fas fa-envelope"></i> Mark QSL Received (Bureau)</a>
 				    <a class="dropdown-item" href="<?php echo site_url('qso/qsl_rcvd'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>/D" ><i class="fas fa-envelope"></i> Mark QSL Received (Direct)</a>
 					<?php } ?>
+
+					<div class="dropdown-divider"></div>	
+
+					<a class="dropdown-item" href="<?php echo site_url('qso/delete'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" onclick="return confirm('Are you sure you want delete QSO <?php echo $row->COL_CALL; ?>?');"><i class="fas fa-trash-alt"></i> Delete QSO</a>
 				  </div>
 				</div>
 			</td>