Don't forget these... :(

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 43de04889b35120e41da8ec646ba78a606b41453..0d0e060d66efa7749ed7c4864c19990571811a2c 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
@@ -371,10 +371,10 @@ function isMember () {
        if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
 
        // is the cache entry there?
-       if (isset($GLOBALS['is_member'])) {
+       if (isset($GLOBALS[__FUNCTION__])) {
                // Then return it
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
-               return $GLOBALS['is_member'];
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS[__FUNCTION__]) . ')');
+               return $GLOBALS[__FUNCTION__];
        } elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
                // No member
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
@@ -424,7 +424,7 @@ function isMember () {
        }
 
        // Cache status
-       $GLOBALS['is_member'] = $ret;
+       $GLOBALS[__FUNCTION__] = $ret;
 
        // Return status
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
@@ -442,7 +442,7 @@ function fetchUserData ($userid, $column = 'userid') {
                setCurrentUserId($userid);
 
                // Don't look for invalid userids...
-               if ($userid < 1) {
+               if (!isValidUserId($userid)) {
                        // Invalid, so abort here
                        debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
                } elseif (isUserDataValid()) {
@@ -454,7 +454,6 @@ function fetchUserData ($userid, $column = 'userid') {
                return true;
        }
 
-
        // By default none was found
        $found = false;
 
@@ -541,9 +540,9 @@ function isAdmin () {
        } // END - if
 
        // Do we have cache?
-       if (!isset($GLOBALS['is_admin'][$adminId])) {
+       if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
                // Init it with failed
-               $GLOBALS['is_admin'][$adminId] = false;
+               $GLOBALS[__FUNCTION__][$adminId] = false;
 
                // Search in array for entry
                if (isset($GLOBALS['admin_hash'])) {
@@ -569,12 +568,12 @@ function isAdmin () {
                if (!empty($valPass)) {
                        // Check if password is valid
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
-                       $GLOBALS['is_admin'][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
+                       $GLOBALS[__FUNCTION__][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
                } // END - if
        } // END - if
 
        // Return result of comparision
-       return $GLOBALS['is_admin'][$adminId];
+       return $GLOBALS[__FUNCTION__][$adminId];
 }
 
 // Generates a list of "max receiveable emails per day"
@@ -717,7 +716,7 @@ function getActionFromModuleWhat ($module, $what) {
        // Init status
        $data['action'] = '';
 
-       //* DEBUG: */ debugOutput(__LINE__.'='.$module.'/'.$what.'/'.getAction().'=');
+       //* DEBUG: */ debugOutput(__LINE__ . '=' . $module . '/'.$what . '/' . getAction() . '=');
        if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
                // sql_patches is missing so choose depending on mode
                if (isWhatSet()) {
@@ -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;
@@ -1061,7 +1063,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
                        // Determine wether the user has some mails to click before he/she gets the points
                        $locked = false;
-                       if ((getUserData('ref_payout') > 0) && (!isDirectPaymentAllowed())) $locked = true;
+                       if ((getUserData('ref_payout') > 0) && (!isDirectPaymentEnabled())) $locked = true;
 
                        // Prepare data for the filter
                        $filterData = array(
@@ -1095,7 +1097,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                        } elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
                                // Prepare content
                                $content = array(
-                                       'text'   => '{--REASON_DIRECT_PAYMENT--}',
+                                       'reason' => '{--REASON_DIRECT_PAYMENT--}',
                                        'points' => $ref_points
                                );
 
@@ -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?
@@ -1374,11 +1379,11 @@ function getAdminDefaultAcl ($adminId) {
 }
 
 // Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default='', $special='', $where='', $disabled=array()) {
+function generateOptionList ($table, $id, $name, $default = '', $special = '', $where = '', $disabled = array(), $callback = '') {
        $ret = '';
        if ($table == '/ARRAY/') {
                // Selection from array
-               if ((is_array($id)) && (is_array($name)) && (count($id)) == (count($name))) {
+               if ((is_array($id)) && (is_array($name)) && ((count($id)) == (count($name)) || (!empty($callback)))) {
                        // Both are arrays
                        foreach ($id as $idx => $value) {
                                $ret .= '<option value="' . $value . '"';
@@ -1389,11 +1394,19 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
                                        // Disabled!
                                        $ret .= ' disabled="disabled"';
                                }
+
+                               // Is the call-back function set?
+                               if (!empty($callback)) {
+                                       // Call it
+                                       $name[$idx] = call_user_func_array($callback, array($id[$idx]));
+                               } // END - if
+
+                               // Finish option tag
                                $ret .= '>' . $name[$idx] . '</option>';
                        } // END - foreach
                } else {
                        // Problem in request
-                       debug_report_bug(__FUNCTION__, __LINE__, 'Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name));
+                       debug_report_bug(__FUNCTION__, __LINE__, 'Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name) . ',callback=' . $callback);
                }
        } else {
                // Data from database
@@ -1423,7 +1436,17 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
                                        // Disabled!
                                        $ret .= ' disabled="disabled"';
                                }
+
+                               // Add it, if set
                                if (!empty($add)) $add = ' ('.$add.')';
+
+                               // Is the call-back function set?
+                               if (!empty($callback)) {
+                                       // Call it
+                                       $title = call_user_func_array($callback, array($title));
+                               } // END - if
+
+                               // Finish option list
                                $ret .= '>' . $title . $add . '</option>';
                        } // END - while
                } else {