Some more wrappers added, code cleanups:

[mailer.git] / inc / modules / member / what-wernis.php

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index 4729c81f1de3cd656f1efcb93709c5032ab9a716..a0acd2d8e6bd2dbd2b01a1563e37fffa2a0fc3ee 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -66,7 +66,6 @@ $content = array(); $points = false;
 // Is the mode set (withdraw or payout)
 if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choose')) {
        // Let the user choose what he wants to do
-       $content['refid']    = getConfig(('wernis_refid'));
        $content['wernis_userid'] = '0';
 
        // Is there an id?
@@ -79,7 +78,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
                        array(getMemberId()), __FILE__, __LINE__);
 
                // Load all rows
-               $content['rows'] = ''; $SW = 2;
+               $content['rows'] = '';
                while ($data = SQL_FETCHARRAY($result)) {
                        // Prepare data for output
                        $rowContent = array(
@@ -87,13 +86,11 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
                                'wernis_amount'    => $data['wernis_amount'],
                                'wernis_account'   => $data['wernis_account'],
                                'wernis_type'      => $data['wernis_type'],
-                               'sw'               => $SW,
                        );
 
                        // Load row template
                        $content['rows'] .= loadTemplate('member_wernis_mode_list_row', true, $rowContent);
-                       $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Free result
                SQL_FREERESULT($result);
@@ -118,11 +115,8 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
                setGetRequestParameter('mode', 'choose');
        }
 } elseif ((getRequestParameter('mode') == 'payout') && (getConfig('wernis_payout_active') == 'Y')) {
-       // Get total points and check if the user can request a payout
-       $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-
-       // Remove the registration fee
-       $points = $points - getConfig('points_register');
+       // Get user's total points and remove the registration fee
+       $points = getTotalPoints(getMemberId()) - getPointsRegister();
 
        // Is there a percentage or fixed fee?
        $points = WERNIS_TAKE_FEE($points, 'payout');
@@ -143,21 +137,15 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
        $points = bigintval($points[0]);
 
        // Add points to content array
-       $content['points']     = translateComma($points);
+       $content['points']     = $points;
 
        // Get WDS66 username
        $content['wernis_userid'] = getUserData('wernis_userid');
 } elseif ((getRequestParameter('mode') == 'withdraw') && (getConfig('wernis_withdraw_active') == 'Y')) {
-       // Get total points for just displaying them
-       $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-
        // Prepare data for the template
-       $content['points']        = translateComma($points);
+       $content['points']        = getTotalPoints(getMemberId());
        $content['wernis_userid'] = '';
 
-       // Add fees to array
-       WERNIS_ADD_FEES_TO_ARRAY($content);
-
        // Fetch id
        $content['wernis_userid'] = getUserData('wernis_userid');
 } else {
@@ -169,13 +157,13 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
 // Is the formular sent?
 if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
        // Is the user id and password set?
-       if (!isPostRequestParameterSet(('wernis_userid'))) {
+       if (!isPostRequestParameterSet('wernis_userid')) {
                // Nothing entered in WDS66 user id
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_USERNAME--}');
-       } elseif (!isPostRequestParameterSet(('wds66_password'))) {
+       } elseif (!isPostRequestParameterSet('wds66_password')) {
                // Nothing entered in WDS66 password
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_PASSWORD--}');
-       } elseif (!isPostRequestParameterSet(('amount'))) {
+       } elseif (!isPostRequestParameterSet('amount')) {
                // Nothing entered in amount
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_AMOUNT--}');
        } elseif (postRequestParameter('wernis_userid') != bigintval(postRequestParameter('wernis_userid'))) {
@@ -250,7 +238,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode')));
                                loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_WERNIS_MODE_INVALID', getRequestParameter('mode')));
                                return;
-               }
+               } // END - switch
        }
 } // END - if