X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=da714d623e8863213720bb1ac92d7ea91686a3a2;hb=2142149f3f72f1a2476f95a87937c044d63bbaf2;hp=66ac239b2009063f46625eb0faf2407228725e67;hpb=a5d425e62fc53d0470cfbebfe67929e27483035b;p=mailer.git

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 66ac239b20..da714d623e 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['mid'])) {
 	// Load email data
@@ -68,7 +68,7 @@ if (!empty($_GET['mid'])) {
 		LOAD_TEMPLATE("admin_del_email_normal");
 
 		// Transfer data to data array
-		$DATA = array($url, $subject);
+		$DATA = array('url' => $url, 'subject' => $subject);
 
 		// Load email template and send the email away
 		$msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);
@@ -184,6 +184,35 @@ WHERE s.pool_id=%s LIMIT 1",
 		// Mail already deleted!
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_MAIL_ALREADY_DELETED);
 	}
+} elseif ((!empty($_GET['nid'])) && (GET_EXT_VERSION("bonus") >= "0.8.7")) {
+	// Load data from bonus mail
+	$result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp FROM "._MYSQL_PREFIX."_bonus WHERE id=%s",
+	 array(bigintval($_GET['nid'])), __FILE__, __LINE__);
+
+	// Delete mail only once
+	if (SQL_NUMROWS($result) == 1) {
+		// Load data
+		list ($id, $subject, $url, $timestamp) = SQL_FETCHROW($result);
+		SQL_FREERESULT($result);
+
+		// Delete bonus mail entirely from database
+		$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
+		 array(bigintval($_GET['nid'])), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s",
+		 array(bigintval($_GET['nid'])), __FILE__, __LINE__);
+
+		// Prepare data for the template
+		define('__ID'     , $id);
+		define('__SUBJECT', $subject);
+		define('__URL'    , DEREFERER($url));
+		define('__ORDERED', MAKE_DATETIME($timestamp, "0"));
+
+		// Load template
+		LOAD_TEMPLATE("admin_del_email_notify");
+	} else {
+		// Mail already deleted!
+		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NOTIFY_MAIL_ALREADY_DELETED);
+	}
 } else {
 	// No mail orders fond
 	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);