X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=6fb6f1c43934f521931cc5c88d1af0ae2d5f487e;hp=ea385836bafe042d347596e2ea13db2d6316d24a;hb=e45e218c4f629ec63f0788cab231bfc88b3fa46e;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index ea385836ba..6fb6f1c439 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -16,6 +16,7 @@
  *                                                                      *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -101,34 +102,32 @@ LIMIT 1",
 			$totalPoints = $links * $price;
 
 			// Shall we pay the points back to the user?
-			if (getConfig('repay_deleted_mails') != 'SHRED') {
+			if ($totalPoints == 0) {
+				// No points repayed!
+				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+			} elseif (getConfig('repay_deleted_mails') != 'SHRED') {
 				//* DEBUG: */ outputHtml($stats_id.':'.$totalPoints.'/'.$links.'/'.$price."<br />");
-				if ($totalPoints > 0) {
-					// Shall we payback to user or jackpot?
-					if (getConfig('repay_deleted_mails') == 'JACKPOT') {
-						// Set jackpot
-						$sender = '0';
-					} // END - if
-
-					// Pay back points
-					//* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
-					addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
-
-					// Output message
-					if (getConfig('repay_deleted_mails') == 'REPAY') {
-						// Repayed
-						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
-							translateComma($totalPoints)
-						));
-					} else {
-						// To jackpot
-						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
-							translateComma($totalPoints)
-						));
-					}
+				// Shall we payback to user or jackpot?
+				if (getConfig('repay_deleted_mails') == 'JACKPOT') {
+					// Set jackpot
+					$sender = '0';
+				} // END - if
+
+				// Pay back points
+				//* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
+				addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
+
+				// Output message
+				if (getConfig('repay_deleted_mails') == 'REPAY') {
+					// Repayed
+					loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
+						translateComma($totalPoints)
+					));
 				} else {
-					// No points repayed!
-					loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+					// To jackpot
+					loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
+						translateComma($totalPoints)
+					));
 				}
 			} else {
 				// Points shredded!
@@ -137,7 +136,7 @@ LIMIT 1",
 
 			// Remove links from DB
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
-			array(bigintval($stats_id)), __FILE__, __LINE__);
+				array(bigintval($stats_id)), __FILE__, __LINE__);
 			$cnt += SQL_AFFECTEDROWS();
 
 			// Load template for link
@@ -203,7 +202,7 @@ LIMIT 1",
 
 	// Free result
 	SQL_FREERESULT($result);
-} elseif ((isGetRequestParameterSet('nid')) && (getExtensionVersion('bonus') >= '0.8.7')) {
+} elseif ((isGetRequestParameterSet('nid')) && (isExtensionInstalledAndNewer('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(getRequestParameter('nid'))), __FILE__, __LINE__);