Adding of network type handlers finished (listing is still work-in-progress)

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

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 2a1322dbee11f5106ae0d3a870aa66bec457b8d9..f87b0b5ba6f4e4975f24e9a521c22622c7fa04d2 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -69,16 +69,10 @@ if (!isGetRequestElementSet('mode')) {
        // Get referal id
        $content['refid'] = getConfig(('primera_refid'));
 
-       // Are there some entries?
-       if (fetchUserData(getMemberId())) {
-               // Fetch id
-               $content['primera_nickname'] = getUserData('primera_nickname');
-       } // END - if
-
        // Is there an id?
        if ((!empty($content['primera_nickname'])) && (!isGetRequestElementSet('mode'))) {
                // Then use an other "mode"
-               setRequestGetElement('mode', 'list');
+               setGetRequestElement('mode', 'list');
 
                // And load all rows!
                $result = SQL_QUERY_ESC("SELECT `id`,`primera_account`,`primera_amount`,`primera_timestamp`,`primera_type` FROM `{?_MYSQL_PREFIX?}_user_primera` WHERE `userid`=%s ORDER BY `primera_timestamp` DESC",
@@ -106,7 +100,7 @@ if (!isGetRequestElementSet('mode')) {
                SQL_FREERESULT($result);
        } else {
                // Mode pay
-               setRequestGetElement('mode', 'pay');
+               setGetRequestElement('mode', 'pay');
        }
 } // END - if
 
@@ -124,25 +118,15 @@ if (getRequestElement('mode') == 'pay') {
        // Is this enougth for a payout?
        if ($points < getConfig('primera_min_payout')) {
                // No, then abort here
-               loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT'), translateComma(getConfig('primera_min_payout'))));
+               loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT'));
                return;
        }
 
        // Add points to content array
-       $content['points']     = $points;
-       $content['min_points'] = translateComma(getConfig('primera_min_payout'));
-
-       // Get Primera id
-       $content['primera_nickname'] = '';
-
-       // Do we have a user account? (should be!)
-       if (fetchUserData(getMemberId())) {
-               // Fetch id
-               $content['primera_nickname'] = getUserData('primera_nickname');
-       } // END - if
+       $content['points'] = $points;
 } else {
        // Invalid mode!
-       loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), getRequestElement('mode')));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_MODE_INVALID', getRequestElement('mode')));
        return;
 }
 
@@ -166,7 +150,7 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
                                loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_INVALID_AMOUNT'));
                        } elseif (postRequestElement('amount') < getConfig('primera_min_payout')) {
                                // Not enougth entered!
-                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_AMOUNT_SMALLER_MIN'), getConfig(('primera_min_payout'))));
+                               loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_AMOUNT_SMALLER_MIN'));
                        } elseif (postRequestElement('amount') > $points) {
                                // Not enougth points left!
                                loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestElement('amount')), bigintval($points)));
@@ -198,14 +182,14 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
                                        loadTemplate('admin_settings_saved', false, GET_PRIMERA_ERROR_MESSAGE());
                                } else {
                                        // Something went wrong
-                                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_PAYOUT_FAILED'), GET_PRIMERA_ERROR_MESSAGE()));
+                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_PAYOUT_FAILED', GET_PRIMERA_ERROR_MESSAGE()));
                                }
                        }
                        break;
 
                default: // Invalid mode!
                        logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestElement('mode')));
-                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), getRequestElement('mode')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_MODE_INVALID', getRequestElement('mode')));
                        return;
        }
 } // END - if