More improved SQL queries

[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 0dcc0efc0ba00e5344290df90291724c2f986574..3a3e730f1bbaa62c7eeafbebdb25519083d18efd 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -40,15 +40,15 @@ if (!defined('__SECURITY')) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("primera")) && (!IS_ADMIN())) {
        // Extension "primera" is not activated
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 // Check if the admin has entered the data
-if ((empty($_CONFIG['primera_api_name'])) || (empty($_CONFIG['primera_api_md5']))) {
+if ((getConfig('primera_api_name') == "") || (getConfig('primera_api_md5') == "")) {
        // Something important is missing...
        LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_API_DATA_MISSING);
        return;
@@ -60,28 +60,28 @@ $content = array(); $points = false;
 // Is the mode set (payout only)
 if (!isset($_GET['mode'])) {
        // Get referal id
-       $content['refid'] = bigintval($_CONFIG['primera_refid']);
+       $content['refid'] = bigintval(getConfig('primera_refid'));
 
        // Get Primus id
-       $result = SQL_QUERY_ESC("SELECT primera_userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?
        if (SQL_NUMROWS($result) == 1) {
                // Fetch ID
-               list($content['primus_nickname']) = SQL_FETCHROW($result);
+               list($content['primera_nickname']) = SQL_FETCHROW($result);
        } // END - if
 
        // Free result
        SQL_FREERESULT($result);
 
        // Is there an ID?
-       if ((!empty($content['primus_nickname'])) && (!isset($_GET['mode']))) {
+       if ((!empty($content['primera_nickname'])) && (!isset($_GET['mode']))) {
                // Then use an other "mode"
                $_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",
+               $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",
                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Load all rows
@@ -118,28 +118,28 @@ if ($_GET['mode'] == "pay") {
        $points = bigintval($points[0]);
 
        // Remove the registration fee
-       $points = $points - $_CONFIG['points_register'];
+       $points = $points - getConfig('points_register');
 
        // Is this enougth for a payout?
-       if ($points < $_CONFIG['primera_min_payout']) {
+       if ($points < getConfig('primera_min_payout')) {
                // No, then abort here
-               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT, TRANSLATE_COMMA($_CONFIG['primera_min_payout'])));
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT, TRANSLATE_COMMA(getConfig('primera_min_payout'))));
                return;
        }
 
        // Add points to content array
        $content['points']              = $points;
-       $content['min_points']  = TRANSLATE_COMMA($_CONFIG['primera_min_payout']);
+       $content['min_points']  = TRANSLATE_COMMA(getConfig('primera_min_payout'));
 
        // Get Primera id
-       $content['primus_nickname'] = "";
-       $result = SQL_QUERY_ESC("SELECT primera_userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+       $content['primera_nickname'] = "";
+       $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?
        if (SQL_NUMROWS($result) == 1) {
                // Fetch ID
-               list($content['primus_nickname']) = SQL_FETCHROW($result);
+               list($content['primera_nickname']) = SQL_FETCHROW($result);
        }
 
        // Free result
@@ -156,49 +156,43 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
        switch ($_GET['mode']) {
                case "pay": // Payout this exchange -> Primus
                        // Is the user ID and password set?
-                       if (empty($_POST['primus_nickname'])) {
+                       if (empty($_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'])) {
                                // Nothing entered in Primera password
                                LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_EMPTY_PASSWORD);
-                               OUTPUT_HTML("<br />");
                        } elseif (empty($_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'])) {
                                // Only numbers in amount!
                                LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_INVALID_AMOUNT);
-                               OUTPUT_HTML("<br />");
-                       } elseif ($_POST['amount'] < $_CONFIG['primera_min_payout']) {
+                       } elseif ($_POST['amount'] < getConfig('primera_min_payout')) {
                                // Not enougth entered!
-                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_AMOUNT_SMALLER_MIN, bigintval($_CONFIG['primera_min_payout'])));
-                               OUTPUT_HTML("<br />");
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_AMOUNT_SMALLER_MIN, bigintval(getConfig('primera_min_payout'))));
                        } elseif ($_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 />");
                        } else {
                                // All is fine here so do the payout
-                               $success = PRIMERA_EXECUTE_PAYOUT($_POST['primus_nickname'], md5($_POST['primera_password']), $_POST['amount']);
+                               $success = PRIMERA_EXECUTE_PAYOUT($_POST['primera_nickname'], md5($_POST['primera_password']), $_POST['amount']);
                                if ($success) {
                                        // Default is locked!
                                        $locked = true;
 
                                        // Shall I "pay" the referal points imidiately?
-                                       if ($_CONFIG['ref_payout'] == "0") {
+                                       if (getConfig('ref_payout') == "0") {
                                                // Yes, "pay" it now
                                                $locked = false;
                                        } // END - if
 
                                        // Remove points from account
-                                       SUB_POINTS($GLOBALS['userid'], $_POST['amount']);
+                                       SUB_POINTS("primera_payout", $GLOBALS['userid'], $_POST['amount']);
 
                                        // Update primera nickname
-                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `primera_userid`=%s WHERE userid=%s LIMIT 1",
-                                               array($_POST['primus_nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
+                                       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__);
 
                                        // All done!
                                        LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_PAYOUT_DONE);
@@ -206,20 +200,19 @@ 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'])));
                        return;
        }
-}
+} // END - if
 
 // Prepare mode for template name
 $mode = sprintf("member_primera_mode_%s", SQL_ESCAPE($_GET['mode']));