Renamed more templates

[mailer.git] / inc / purge / purge-general.php

diff --git a/inc/purge/purge-general.php b/inc/purge/purge-general.php
index 07205e280fe3bddd5f4838163135208cb45a0dca..3694ae702759ce609755bcecf9a5ed6fb3a1f333 100644 (file)
--- a/inc/purge/purge-general.php
+++ b/inc/purge/purge-general.php
@@ -75,10 +75,9 @@ ORDER BY
                        // Check if confirmation links are purged or not
                        $result_links = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s LIMIT 1",
                                array(bigintval($content['id'])), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result_links) == 1) {
-                               // Free memory
-                               SQL_FREERESULT($result_links);
 
+                       // Is there one entry?
+                       if (SQL_NUMROWS($result_links) == 1) {
                                // At least one link was found, enougth to pay back the points
                                if (($userid != $content['userid']) && (isValidId($userid)) && ($points > 0)) {
                                        // Directly add points back to senders account
@@ -87,7 +86,9 @@ ORDER BY
                                } // END - if
 
                                // Add points
-                               $userid = $content['userid']; $points += $content['price']; $admin_points += $content['price'];
+                               $userid = $content['userid'];
+                               $points += $content['price'];
+                               $admin_points += $content['price'];
 
                                // Remove confirmation links from queue
                                addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
@@ -97,10 +98,16 @@ ORDER BY
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='DELETED' WHERE `id`=%s LIMIT 1",
                                        array(bigintval($content['pool_id'])), __FILE__, __LINE__, FALSE));
                        } // END - if
+
+                       // Free memory
+                       SQL_FREERESULT($result_links);
                } // END - while
 
-               // Add last points to last user account
-               if ($points > 0) addPointsAutoPurge($userid, $points);
+               // Are some points collected?
+               if (($points > 0) && (isValidId($userid))) {
+                       // Add last points to last user account
+                       addPointsAutoPurge($userid, $points);
+               } // END - if
        } // END - if
 
        // Free memory
@@ -134,8 +141,9 @@ ORDER BY
                                } // END - if
                        } // END - while
 
-                       // Add points to jackpot
+                       // Is ext-jackpot installed?
                        if (isExtensionActive('jackpot')) {
+                               // Add points to jackpot
                                addPointsToJackpot($points);
                        } // END - if
 
@@ -150,7 +158,7 @@ ORDER BY
        // Add points from deleted accounts to jackpot, but here just add to notify mail
        if ($admin_points > 0) {
                // Send mail to admin
-               sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', $admin_points);
+               sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_purge_points', $admin_points);
        } // END - if
 
        // Run all SQLs here