A lot has been rewritten, ext-teams added, ext-forced continued:

[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 96483eed6d900129a670c690ead67864f28c5f52..cf4a196098614d7320d30ea384d2e2210405956f 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,14 +48,14 @@ addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('primera')) && (!isAdmin())) {
        // Extension 'primera' is not activated
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('primera'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=primera%}');
        return;
 } // END - if
 
 // Check if the admin has entered the data
 if ((getConfig('primera_api_name') == '') || (getConfig('primera_api_md5') == '')) {
        // Something important is missing...
-       loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_API_DATA_MISSING--}');
+       displayMessage('{--MEMBER_PRIMERA_API_DATA_MISSING--}');
        return;
 } // END - if
 
@@ -106,7 +106,7 @@ if (getRequestParameter('mode') == 'pay') {
        // Is this enougth for a payout?
        if ($points < getConfig('primera_min_payout')) {
                // No, then abort here
-               loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT--}');
+               displayMessage('{--MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT--}');
                return;
        } // END - if
 
@@ -114,7 +114,7 @@ if (getRequestParameter('mode') == 'pay') {
        $content['points'] = $points;
 } else {
        // Invalid mode!
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_PRIMERA_MODE_INVALID', getRequestParameter('mode')));
+       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestParameter('mode') . '%}');
        return;
 }
 
@@ -126,22 +126,22 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                        // Is the user id and password set?
                        if (!isPostRequestParameterSet('primera_nickname')) {
                                // Nothing entered in Primus nickname
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_USERNAME--}');
+                               displayMessage('{--MEMBER_PRIMERA_EMPTY_USERNAME--}');
                        } elseif (!isPostRequestParameterSet('primera_password')) {
                                // Nothing entered in Primera password
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_PASSWORD--}');
+                               displayMessage('{--MEMBER_PRIMERA_EMPTY_PASSWORD--}');
                        } elseif (!isPostRequestParameterSet('amount')) {
                                // Nothing entered in amount
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_AMOUNT--}');
+                               displayMessage('{--MEMBER_PRIMERA_EMPTY_AMOUNT--}');
                        } elseif (postRequestParameter('amount') != bigintval(postRequestParameter('amount'))) {
                                // Only numbers in amount!
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_INVALID_AMOUNT--}');
+                               displayMessage('{--MEMBER_PRIMERA_INVALID_AMOUNT--}');
                        } elseif (postRequestParameter('amount') < getConfig('primera_min_payout')) {
                                // Not enougth entered!
-                               loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_AMOUNT_SMALLER_MIN--}');
+                               displayMessage('{--MEMBER_PRIMERA_AMOUNT_SMALLER_MIN--}');
                        } elseif (postRequestParameter('amount') > $points) {
                                // Not enougth points left!
-                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points)));
+                               displayMessage(sprintf(getMessage('MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points)));
                        } else {
                                // All is fine here so do the payout
                                $success = executePrimeraPayout(postRequestParameter('primera_nickname'), md5(postRequestParameter('primera_password')), postRequestParameter('amount'));
@@ -155,7 +155,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                                $locked = false;
                                        } // END - if
 
-                                       // Remove points from account
+                                       // Subtract points from account and ignore return status
                                        subtractPoints('primera_payout', getMemberId(), postRequestParameter('amount'));
 
                                        // Update primera nickname
@@ -163,21 +163,21 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                                array(postRequestParameter('primera_nickname'), getMemberId()), __FILE__, __LINE__);
 
                                        // All done!
-                                       loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_PAYOUT_DONE--}');
+                                       displayMessage('{--MEMBER_PRIMERA_PAYOUT_DONE--}');
                                        return;
                                } elseif ((GET_PRIMERA_ERROR_CODE() == 'user_failed') || (GET_PRIMERA_ERROR_CODE() == 'own_failed') || (GET_PRIMERA_ERROR_CODE() == 'amount_failed') || (GET_PRIMERA_ERROR_CODE() == 'api_amount_failed')) {
                                        // Wrong login data
-                                       loadTemplate('admin_settings_saved', false, GET_PRIMERA_ERROR_MESSAGE());
+                                       displayMessage(GET_PRIMERA_ERROR_MESSAGE());
                                } else {
                                        // Something went wrong
-                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_PRIMERA_PAYOUT_FAILED', GET_PRIMERA_ERROR_MESSAGE()));
+                                       displayMessage('{%message,MEMBER_PRIMERA_PAYOUT_FAILED=' . GET_PRIMERA_ERROR_MESSAGE() . '%}');
                                }
                        }
                        break;
 
                default: // Invalid mode!
                        logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode')));
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_PRIMERA_MODE_INVALID', getRequestParameter('mode')));
+                       displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestParameter('mode') . '%}');
                        return;
        }
 } // END - if