More usage of isValdUserId()

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 43de04889b35120e41da8ec646ba78a606b41453..33bbd3fd13af8fa5cd3d58d1d4c7fa5b96341bfc 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -125,7 +125,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
        }
 
        // Begin the navigation line
-       if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
+       if (!isset($GLOBALS['nav_depth'])) {
                // Init nav_depth
                $GLOBALS['nav_depth'] = '0';
 
@@ -147,7 +147,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
        if (substr($search, -4, 4) == '.php') {
                // Remove the .php
                $search = substr($search, 0, -4);
-       } // END - i
+       } // END - if
 
        if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
                // Output HTML code
@@ -454,7 +454,6 @@ function fetchUserData ($userid, $column = 'userid') {
                return true;
        }
 
-
        // By default none was found
        $found = false;
 
@@ -864,7 +863,7 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
        $ret = 'failed';
 
        // Is the userid valid?
-       if ($userid > 0) {
+       if (isValidUserId($userid)) {
                // Remove entry from array
                unset($receivers[$key]);
 
@@ -872,7 +871,10 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
                if ($stats_id > 0) {
                        // Only when we got a real stats id continue searching for the entry
                        $type = 'NORMAL'; $rowName = 'stats_id';
-                       if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
+                       if ($bonus) {
+                               $type = 'BONUS';
+                               $rowName = 'bonus_id';
+                       } // END - if
 
                        // Try to look the entry up
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE %s='%s' AND `userid`=%s AND link_type='%s' LIMIT 1",
@@ -891,8 +893,8 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
 
                        // Free memory
                        SQL_FREERESULT($result);
-               }
-       }
+               } // END - if
+       } // END - if
 
        // Return status for sending routine
        return $ret;
@@ -1104,7 +1106,10 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
                                // And sent it away
                                sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
-                               if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+                               if (!isGetRequestParameterSet('mid')) {
+                                       // Output message to admin
+                                       loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+                               } // END - if
                        }
 
                        // Maybe there's another ref?