Some more wrappers added, code cleanups:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 322626c01f6f50e53158e9b7cbc0c1659acbff7e..45bd10646e9804c46928bb3529564d119a00a42f 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
        // Fix empty 'what'
        if (empty($what)) {
-               $what = getConfig('index_home');
+               $what = getIndexHome();
        } // END - if
 
        // Default is not found
@@ -208,7 +208,7 @@ ORDER BY
                array($mode), __FUNCTION__, __LINE__);
 
        //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
-       if (SQL_NUMROWS($result_main) > 0) {
+       if (!SQL_HASZERONUMS($result_main)) {
                // There are menus available, so we simply display them... :)
                $GLOBALS['rows'] = '';
                while ($content = SQL_FETCHARRAY($result_main)) {
@@ -237,7 +237,7 @@ ORDER BY
                                array($mode, $content['action']), __FUNCTION__, __LINE__);
 
                        // Do we have some entries?
-                       if (SQL_NUMROWS($result_sub) > 0) {
+                       if (!SQL_HASZERONUMS($result_sub)) {
                                // Init counter
                                $cnt = '0';
 
@@ -266,7 +266,7 @@ ORDER BY
                                        }
 
                                        // Menu title
-                                       $OUT .= getConfig('menu_blur_spacer') . $content['sub_title'];
+                                       $OUT .= '{?menu_blur_spacer?}' . $content['sub_title'];
 
                                        if (isIncludeReadable($inc)) {
                                                $OUT .= '</a>';
@@ -601,7 +601,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
        }
 
        // Some entries are found?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        $OUT .= '      <option value="' . $content['value'] . '"';
@@ -732,7 +732,7 @@ function getActionFromModuleWhat ($module, $what) {
                }
        } elseif ((empty($what)) && ($module != 'admin')) {
                // Use configured 'home'
-               $what = getConfig('index_home');
+               $what = getIndexHome();
        } // END - if
 
        if ($module == 'admin') {
@@ -989,12 +989,12 @@ function getReferalLevelPercents ($level) {
  * userid         = Referal id wich should receive...
  * points      = ... xxx points
  * sendNotify  = shall I send the referal an email or not?
- * rid         = inc/modules/guest/what-confirm.php need this
+ * refid       = inc/modules/guest/what-confirm.php need this
  * locked      = Shall I pay it to normal (false) or locked (true) points ammount?
  * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
  *               for default value will cause no referal will get points ever!!!)
  */
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $rid = '0', $locked = false, $add_mode = 'ref') {
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $locked = false, $add_mode = 'ref') {
        //* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">' . __FUNCTION__ . ' - ENTRY</font> ------------------------<ul><li>');
        // Convert mode to lower-case
        $add_mode = strtolower($add_mode);
@@ -1012,7 +1012,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                'userid'   => $userid,
                'points'   => $points,
                'notify'   => $sendNotify,
-               'rid'      => $rid,
+               'refid'    => $refid,
                'locked'   => $locked,
                'mode'     => 'add',
                'sub_mode' => $add_mode,
@@ -1075,7 +1075,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                        } // END - if
 
                        // Points updated, maybe I shall send him an email?
-                       if (($sendNotify === true) && (getUserData('refid') > 0) && ($locked === false)) {
+                       if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
                                // Prepare content
                                $content = array(
                                        'percents' => $per,
@@ -1104,7 +1104,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                        }
 
                        // Maybe there's another ref?
-                       if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
+                       if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
                                // Then let's credit him here...
                                //* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
                                addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
@@ -1161,6 +1161,7 @@ function updateReferalCounter ($userid) {
        $GLOBALS['cache_array']['ref_level'][$userid]--;
 
        // Handle refback here if extension is installed
+       // @TODO Rewrite this to a filter
        if (isExtensionActive('refback')) {
                updateRefbackTable($userid);
        } // END - if
@@ -1405,7 +1406,7 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
                        ), __FUNCTION__, __LINE__);
 
                // Do we have rows?
-               if (SQL_NUMROWS($result) > 0) {
+               if (!SQL_HASZERONUMS($result)) {
                        // Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
                        // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
                        while (list($value, $title, $add) = SQL_FETCHROW($result)) {
@@ -1442,9 +1443,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
        } // END - if
 
        // Check total amount of users
-       $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
-
-       if ($totalUsers >= getConfig('activate_xchange')) {
+       if (getTotalConfirmedUser() >= getConfig('activate_xchange')) {
                // Activate System
                setSqlsArray(array(
                        "UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",
@@ -1515,7 +1514,6 @@ LIMIT 1",
 
        // Add reason and translate points
        $data['text']   = $reason;
-       $data['points'] = translateComma($data['points']);
 
        // Now a mail to the user and that's all...
        $message = loadEmailTemplate('del-user', $data, $userid);
@@ -1547,7 +1545,7 @@ function getWhatFromModule ($modCheck) {
                        // Is ext-sql_patches installed and newer than 0.0.5?
                        if (isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
                                // Use it from config
-                               $what = getConfig('index_home');
+                               $what = getIndexHome();
                        } else {
                                // Use default 'welcome'
                                $what = 'welcome';
@@ -1620,7 +1618,7 @@ function generateCategoryOptionsList ($mode) {
                __FUNCTION__, __LINE__);
 
        // Do we have entries?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // ... and begin loading stuff
                while ($content = SQL_FETCHARRAY($result)) {
                        // Transfer some data
@@ -1827,11 +1825,11 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Are there some entries?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Fetch all entries
                while ($row = SQL_FETCHARRAY($result)) {
                        // Get total points of this user
-                       $row['points'] = countSumTotalData($row['refid'], 'user_points', 'points') - countSumTotalData($row['refid'], 'user_data', 'used_points');
+                       $row['points'] = getTotalPoints($row['refid']);
 
                        // Get unconfirmed mails
                        $row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);
@@ -1879,7 +1877,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
                array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
 
        // Are there entries?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Now load all userids for one big query!
                $userids = array();
                while ($data = SQL_FETCHARRAY($result)) {