ext-validator introduces, several HTML cleanups, fixes for e.g. user email link,...

[mailer.git] / inc / modules / admin / what-del_email.php

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 6015adb30719e6aa0dd608cc180e907c9973c1ba..e3e3146bce9d8a89b8bee47337fa40d87a6afc49 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -102,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!
@@ -138,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