Complete rewrite of and , wrapper functions added, see bug #101

[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 4219cca7ff65cd62d41bcde809a62e4470f61781..648eefb27d8761dd32b46d6ee73d7c71ab85cbfe 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("primera")) && (!IS_ADMIN())) {
        // Extension "primera" is not activated
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "primera");
        return;
 }
 
@@ -50,7 +50,7 @@ ADD_DESCR("member", __FILE__);
 // Check if the admin has entered the data
 if ((getConfig('primera_api_name') == "") || (getConfig('primera_api_md5') == "")) {
        // Something important is missing...
-       LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_API_DATA_MISSING);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PRIMERA_MEMBER_API_DATA_MISSING'));
        return;
 }
 
@@ -58,7 +58,7 @@ if ((getConfig('primera_api_name') == "") || (getConfig('primera_api_md5') == ""
 $content = array(); $points = false;
 
 // Is the mode set (payout only)
-if (!isset($_GET['mode'])) {
+if (!REQUEST_ISSET_GET(('mode'))) {
        // Get referal id
        $content['refid'] = bigintval(getConfig('primera_refid'));
 
@@ -76,9 +76,9 @@ if (!isset($_GET['mode'])) {
        SQL_FREERESULT($result);
 
        // Is there an ID?
-       if ((!empty($content['primera_nickname'])) && (!isset($_GET['mode']))) {
+       if ((!empty($content['primera_nickname'])) && (!REQUEST_ISSET_GET(('mode')))) {
                // Then use an other "mode"
-               $_GET['mode'] = "list";
+               REQUEST_SET_GET('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,10 +106,10 @@ if (!isset($_GET['mode'])) {
                SQL_FREERESULT($result);
        } else {
                // Mode pay
-               $_GET['mode'] = "pay";
+               REQUEST_SET_GET('mode', "pay");
        }
 } // END - if
-if ($_GET['mode'] == "pay") {
+if (REQUEST_GET('mode') == "pay") {
        // Get total points and check if the user can request a payout
        $points = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
 
@@ -146,43 +146,37 @@ if ($_GET['mode'] == "pay") {
        SQL_FREERESULT($result);
 } else {
        // Invalid mode!
-       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_MODE_INVALID, SQL_ESCAPE($_GET['mode'])));
+       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_MODE_INVALID, SQL_ESCAPE(REQUEST_GET('mode'))));
        return;
 }
 
 // Is the formular sent?
-if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
+if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('mode')))) {
        // Check input data depending on the mode and execute the requested mode
-       switch ($_GET['mode']) {
+       switch (REQUEST_GET('mode')) {
                case "pay": // Payout this exchange -> Primus
                        // Is the user ID and password set?
-                       if (empty($_POST['primera_nickname'])) {
+                       if (!REQUEST_ISSET_POST(('primera_nickname'))) {
                                // Nothing entered in Primus nickname
                                LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_EMPTY_USERNAME);
-                               OUTPUT_HTML("<br />");
-                       } elseif (empty($_POST['primera_password'])) {
+                       } elseif (!REQUEST_ISSET_POST(('primera_password'))) {
                                // Nothing entered in Primera password
                                LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_EMPTY_PASSWORD);
-                               OUTPUT_HTML("<br />");
-                       } elseif (empty($_POST['amount'])) {
+                       } elseif (!REQUEST_ISSET_POST(('amount'))) {
                                // Nothing entered in amount
                                LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_EMPTY_AMOUNT);
-                               OUTPUT_HTML("<br />");
-                       } elseif ($_POST['amount'] != bigintval($_POST['amount'])) {
+                       } elseif (REQUEST_POST('amount') != bigintval(REQUEST_POST('amount'))) {
                                // Only numbers in amount!
                                LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_INVALID_AMOUNT);
-                               OUTPUT_HTML("<br />");
-                       } elseif ($_POST['amount'] < getConfig('primera_min_payout')) {
+                       } elseif (REQUEST_POST('amount') < getConfig('primera_min_payout')) {
                                // Not enougth entered!
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_AMOUNT_SMALLER_MIN, bigintval(getConfig('primera_min_payout'))));
-                               OUTPUT_HTML("<br />");
-                       } elseif ($_POST['amount'] > $points) {
+                       } elseif (REQUEST_POST('amount') > $points) {
                                // Not enougth points left!
-                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_PAYOUT_POINTS_DEPLETED, bigintval($_POST['amount']), bigintval($points)));
-                               OUTPUT_HTML("<br />");
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_PAYOUT_POINTS_DEPLETED, bigintval(REQUEST_POST('amount')), bigintval($points)));
                        } else {
                                // All is fine here so do the payout
-                               $success = PRIMERA_EXECUTE_PAYOUT($_POST['primera_nickname'], md5($_POST['primera_password']), $_POST['amount']);
+                               $success = PRIMERA_EXECUTE_PAYOUT(REQUEST_POST('primera_nickname'), md5(REQUEST_POST('primera_password')), REQUEST_POST('amount'));
                                if ($success) {
                                        // Default is locked!
                                        $locked = true;
@@ -194,11 +188,11 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                        } // END - if
 
                                        // Remove points from account
-                                       SUB_POINTS("primera_payout", $GLOBALS['userid'], $_POST['amount']);
+                                       SUB_POINTS("primera_payout", $GLOBALS['userid'], REQUEST_POST('amount'));
 
                                        // Update primera nickname
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `primera_userid`=%s WHERE userid=%s LIMIT 1",
-                                               array($_POST['primera_nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
+                                               array(REQUEST_POST('primera_nickname'), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                        // All done!
                                        LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_PAYOUT_DONE);
@@ -206,24 +200,22 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                } 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
                                        LOAD_TEMPLATE("admin_settings_saved", false, GET_PRIMERA_ERROR_MESSAGE());
-                                       OUTPUT_HTML("<br />");
                                } else {
                                        // Something went wrong
                                        LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_PAYOUT_FAILED, GET_PRIMERA_ERROR_MESSAGE()));
-                                       OUTPUT_HTML("<br />");
                                }
                        }
                        break;
 
                default: // Invalid mode!
-                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", $_GET['mode']));
-                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_MODE_INVALID, SQL_ESCAPE($_GET['mode'])));
+                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", REQUEST_GET('mode')));
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_MODE_INVALID, SQL_ESCAPE(REQUEST_GET('mode'))));
                        return;
        }
 } // END - if
 
 // Prepare mode for template name
-$mode = sprintf("member_primera_mode_%s", SQL_ESCAPE($_GET['mode']));
+$mode = sprintf("member_primera_mode_%s", SQL_ESCAPE(REQUEST_GET('mode')));
 
 // Load the template
 LOAD_TEMPLATE($mode, false, $content);