Naming convention, internal TODOs solved:

- Naming convention says referal ids should be represented as 'refid' and not
  'rid' which is to short
- Internal TODO solved which wants us to make usage of addPointsFoo() function
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index e8048982851ab60677de49cb76616a566d2f4452..d62a9233a456ee6af9fc1bab6a63f744ac08509b 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -1,7 +1,7 @@
 ### WARNING: THIS FILE IS AUTO-GENERATED BY ./DOCS/todo-builder.sh (uid=/user=quix0r) ###
 ### DO NOT EDIT THIS FILE. ###
 ./autoreg.php:60:// @TODO Add processing of request here
-./beg.php:173:                 // @TODO Opps, what is missing here???
+./beg.php:172:                 // @TODO Opps, what is missing here???
 ./birthday_confirm.php:99:             // @TODO Try to rewrite the following unset()
 ./inc/autopurge/purge-inact.php:57:    // @TODO Rewrite these if() blocks to a filter
 ./inc/cache/config-local.php:126:// @TODO Rewrite the following three constants, somehow...
@@ -72,8 +72,7 @@
 ./inc/libs/refback_functions.php:61:           // @TODO Try to rewrite the following unset()
 ./inc/libs/register_functions.php:296: // @TODO Rewrite these all to a single filter
 ./inc/libs/register_functions.php:372: // @TODO Rewrite this to a filter
-./inc/libs/register_functions.php:379: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
-./inc/libs/register_functions.php:380: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
+./inc/libs/register_functions.php:379: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
 ./inc/libs/surfbar_functions.php:1540:         // @TODO This can be somehow rewritten
 ./inc/libs/surfbar_functions.php:712:// @TODO Can't we use our new expression language instead of this ugly code?
 ./inc/libs/surfbar_functions.php:953:  // @TODO Invalid salt should be refused
@@ -176,10 +175,11 @@
 ./inc/modules/member/what-unconfirmed.php:143: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/order.php:76:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:69:    // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1410:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1510:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1890:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1934:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1164:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1411:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1511:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1891:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1935:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:370:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:46:// @TODO Can we cache this?
 ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye

diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php
index 6606d3f6ee01d0645d8a29600c8221e8321ba7cb..d85a405b133d9affcf6893bc813c165b62385ca3 100644 (file)
--- a/inc/libs/beg_functions.php
+++ b/inc/libs/beg_functions.php
@@ -44,16 +44,16 @@ if (!defined('__SECURITY')) {
 
 // Add points to user or begging rallye account
 function addPointsBeg ($userid, $points) {
-       // Set mode depending on how many mails the member has to confirm
-       $locked = false;
-       if ((getConfig('ref_payout') > 0) && (getConfig('allow_direct_pay') != 'Y')) $locked = true;
-
        // Is begging rallye active?
        if (getConfig('beg_rallye') == 'Y') {
                // Add points to rallye account
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=`beg_points`+%s WHERE `userid`=%s LIMIT 1",
                        array($points, $userid), __FUNCTION__, __LINE__);
        } else {
+               // Set mode depending on how many mails the member has to confirm
+               $locked = false;
+               if ((getConfig('ref_payout') > 0) && (getConfig('allow_direct_pay') != 'Y')) $locked = true;
+
                // Add points to account
                // @TODO Try to rewrite the following unset()
                unset($GLOBALS['ref_level']);

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 5e331bd71e3873c224bf336c71f0eb6a12d973c1..b9a603e4e2cbc8a7ef00831a5b18a276e490d039 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -103,12 +103,7 @@ LIMIT %s",
                        } // END - if
 
                        // Prepare data for the row template
-                       $content = array(
-                               'userid'   => $content['userid'],
-                               'rid'      => $content['refid'],
-                               'points'   => $content['points'],
-                               'timemark' => generateDateTime($content['timemark'], $DT_MODE),
-                       );
+                       $content['timemark'] = generateDateTime($content['timemark'], $DT_MODE);
 
                        // Load template and switch color
                        $OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content);

diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index 69f7fe73ca8b7c1f71dee5aca3284d8aa9349969..844bc83f102e9d7a362bf07d96c2cad3b6b4186f 100644 (file)
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -144,9 +144,9 @@ function getRefbackPercents ($userid, $ref) {
 }
 
 // "Getter" for userid array which will return only one entry
-function getArrayFromRefbackLevel ($rid, $level) {
+function getArrayFromRefbackLevel ($refid, $level) {
        //* DEBUG: */ print("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
-       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):rid={$rid},level={$level}<br />");
+       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):refid={$refid},level={$level}<br />");
        // Init userids
        $userIds = array();
 
@@ -159,14 +159,14 @@ WHERE
        `refid`=%s AND `level`=%s
 ORDER BY
        `userid` ASC",
-               array($rid, $level), __FUNCTION__, __LINE__);
+               array($refid, $level), __FUNCTION__, __LINE__);
 
        // Entries found?
        //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):numRows=".SQL_NUMROWS($result)."<br />");
        if (!SQL_HASZERONUMS($result)) {
                // Add all
                while ($content = SQL_FETCHARRAY($result)) {
-                       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):rid={$rid},level={$level},userid={$content['userid']}<br />");
+                       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):refid={$refid},level={$level},userid={$content['userid']}<br />");
                        $userIds[] = $content['userid'];
                } // END - while
        } // END - if
@@ -175,7 +175,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Return array
-       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):rid={$rid},count()=".count($userIds)."<br />");
+       //* DEBUG: */ print(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__."</font>):refid={$refid},count()=".count($userIds)."<br />");
        //* DEBUG: */ print("</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />");
        return $userIds;
 }
@@ -228,7 +228,8 @@ function updateRefbackTable ($userid) {
                                                array(bigintval($userid), $GLOBALS['refback_level'], bigintval($GLOBALS['refback_refid'][$GLOBALS['refback_level']])), __FUNCTION__, __LINE__);
 
                                        // Move to next referal level and count his counter one up!
-                                       $GLOBALS['refback_level']++; updateRefbackTable($GLOBALS['refback_refid'][($GLOBALS['refback_level'] - 1)]);
+                                       $GLOBALS['refback_level']++;
+                                       updateRefbackTable($GLOBALS['refback_refid'][($GLOBALS['refback_level'] - 1)]);
                                } // END - if
 
                                // Do we have another level here?

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index abe48e3d13b3d0d1591092805936465bcfc5725e..665a4b7873fdd09c5722ac56952747e918634f61 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -376,26 +376,8 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // END - if
 
        // Write his welcome-points
-       // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
        // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`=0 LIMIT 1",
-               array($userid), __FUNCTION__, __LINE__);
-       if (SQL_HASZERONUMS($result)) {
-               // Add only when the line was not found (maybe some more secure?)
-               $locked = 'points';
-
-               // Pay him later. First he has to confirm some mails!
-               if (getConfig('ref_payout') > 0) $locked = 'locked_points';
-
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s,0,'{?points_register?}')",
-                       array($locked, $userid), __FUNCTION__, __LINE__);
-
-               // Update mediadata as well
-               if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
-                       // Update database
-                       updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
-               } // END - if
-       } // END - if
+       addPointsDirectly('register_welcome', $userid, getConfig('points_register'));
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index beff7d490e4e2f3bbebe991a5451ebb1d878202c..43e15afc41f299315c47a5b01121240988ef75f3 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -125,7 +125,8 @@ if (isFormSent()) {
                        if ((getConfig('ref_payout') == '0') && (postRequestParameter('ref_payout') > 0)) {
                                // Update account's ref_payout for "must-confirm"
                                addSql(sprintf("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_payout`=(%s - `mails_confirmed`)
-WHERE `mails_confirmed` < %s", $REF, $REF));
+WHERE
+       `mails_confirmed` < %s", $REF, $REF));
                        } elseif ((getConfig('ref_payout') > 0) && (postRequestParameter('ref_payout') == '0')) {
                                // Update account's ref_payout for "not-must-confirm"
                                addSql("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_payout`=0 WHERE `ref_payout` > 0");

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 32ad71a64a2358e02f6e86707f69f7f6de6ad16e..1e9ff87d4fe17bca25e94cf6040dbbca3a78f879 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -86,10 +86,10 @@ WHERE
                // Sponsor not found
                loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
        }
-} elseif (isGetRequestParameterSet('rid')) {
+} elseif (isGetRequestParameterSet('refid')) {
        // Search for sponsor
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`='%s' LIMIT 1",
-               array(bigintval(getRequestParameter('rid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('refid'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Free memory
                SQL_FREERESULT($result);
@@ -105,7 +105,7 @@ WHERE
        `refid`='%s'
 ORDER BY
        `id` ASC",
-               array(bigintval(getRequestParameter('rid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('refid'))), __FILE__, __LINE__);
 
                if (!SQL_HASZERONUMS($result)) {
                        // List refs now
@@ -113,11 +113,11 @@ ORDER BY
                        SQL_FREERESULT($result);
                } else {
                        // No refs made so far
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_REFS_404', '<a href="{%url=modules.php?module=admin&amp;what=list_sponsor&amp;id=' . bigintval(getRequestParameter('rid')) . '%}">' . bigintval(getRequestParameter('rid')) . '</a>'));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_REFS_404', '<a href="{%url=modules.php?module=admin&amp;what=list_sponsor&amp;id=' . bigintval(getRequestParameter('refid')) . '%}">' . bigintval(getRequestParameter('refid')) . '</a>'));
                }
        } else {
                // Sponsor not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('rid'))));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('refid'))));
        }
 } else {
        // List all sponsors

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 283fd4b02dbfea93eb5e6c12d6491b882cdb0d75..105ea2961e1dfe60f2d2343543ce86cb5281c923 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -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,
@@ -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

diff --git a/templates/de/html/member/member_doubler_list_rows.tpl b/templates/de/html/member/member_doubler_list_rows.tpl
index a7451f8aa9ef8a07a97fd6e567942b8809c55a9e..eaf1308b1d8a7d8dd9b4509a54861780a35c0566 100644 (file)
--- a/templates/de/html/member/member_doubler_list_rows.tpl
+++ b/templates/de/html/member/member_doubler_list_rows.tpl
@@ -3,7 +3,7 @@
                $content[userid]
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center" width="100">
-               $content[rid]
+               $content[refid]
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center" width="160">
                {%pipe,translateComma=$content[points]%}