withdraw != payout and SQL error in wernis extension fixed

[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 c2a1d8bcae8431a332dac7cbe60c55e0b5e5bc2e..13fb648bb4e6a8d1fb28ab82fc0eab1c4947141a 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -116,15 +116,15 @@ if ((!isset($_GET['mode'])) || ($_GET['mode'] == "choose")) {
        $points = bigintval($points[0]);
 
        // Is this enougth for a payout?
-       if ($points < $_CONFIG['wernis_min_amount']) {
+       if ($points < $_CONFIG['wernis_min_payout']) {
                // No, then abort here
-               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(WERNIS_MEMBER_MIN_AMOUNT_PAYOUT, TRANSLATE_COMMA($_CONFIG['wernis_min_amount'])));
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(WERNIS_MEMBER_MIN_PAYOUT_PAYOUT, TRANSLATE_COMMA($_CONFIG['wernis_min_payout'])));
                return;
        }
 
        // Add points to content array
        $content['points']              = $points;
-       $content['min_points']  = TRANSLATE_COMMA($_CONFIG['wernis_min_amount']);
+       $content['min_points']  = TRANSLATE_COMMA($_CONFIG['wernis_min_payout']);
 
        // Get WDS66 id
        $content['wds66_id'] = "";
@@ -145,7 +145,7 @@ if ((!isset($_GET['mode'])) || ($_GET['mode'] == "choose")) {
 
        // Prepare data for the template
        $content['points']              = TRANSLATE_COMMA($points);
-       $content['min_points']  = TRANSLATE_COMMA($_CONFIG['wernis_min_amount']);
+       $content['min_points']  = TRANSLATE_COMMA($_CONFIG['wernis_min_withdraw']);
        $content['wds66_id']    = "";
 
        // Get WDS66 id
@@ -192,9 +192,9 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                // Only numbers in amount!
                                LOAD_TEMPLATE("admin_settings_saved", false, WERNIS_MEMBER_INVALID_AMOUNT);
                                OUTPUT_HTML("<br />");
-                       } elseif ($_POST['amount'] < $_CONFIG['wernis_min_amount']) {
+                       } elseif ($_POST['amount'] < $_CONFIG['wernis_min_withdraw']) {
                                // Not enougth entered!
-                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(WERNIS_MEMBER_AMOUNT_SMALLER_MIN, bigintval($_CONFIG['wernis_min_amount'])));
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(WERNIS_MEMBER_AMOUNT_SMALLER_MIN, bigintval($_CONFIG['wernis_min_withdraw'])));
                                OUTPUT_HTML("<br />");
                        } else {
                                // All is fine here so do the withdraw
@@ -258,9 +258,9 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                // Only numbers in amount!
                                LOAD_TEMPLATE("admin_settings_saved", false, WERNIS_MEMBER_INVALID_AMOUNT);
                                OUTPUT_HTML("<br />");
-                       } elseif ($_POST['amount'] < $_CONFIG['wernis_min_amount']) {
+                       } elseif ($_POST['amount'] < $_CONFIG['wernis_min_payout']) {
                                // Not enougth entered!
-                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(WERNIS_MEMBER_AMOUNT_SMALLER_MIN, bigintval($_CONFIG['wernis_min_amount'])));
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(WERNIS_MEMBER_AMOUNT_SMALLER_MIN, bigintval($_CONFIG['wernis_min_payout'])));
                                OUTPUT_HTML("<br />");
                        } elseif ($_POST['amount'] > $points) {
                                // Not enougth points left!
@@ -280,19 +280,15 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                        }
 
                                        // Remove the points from the account
-                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `points_used` = `points_used` + %d WHERE userid=%d LIMIT 1",
-                                               array(bigintval($_POST['amount']), $GLOBALS['userid']), __FILE__, __LINE__);
+                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `used_points` = `used_points` + %d, `wernis_userid`=%d WHERE userid=%d LIMIT 1",
+                                               array(bigintval($_POST['amount']), bigintval($_POST['wds66_id']), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                        // Register this wernis movement
                                        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_wernis (`userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`) VALUES(%d, %d, %d, UNIX_TIMESTAMP(), 'OUT')",
                                                array($GLOBALS['userid'], bigintval($_POST['wds66_id']), bigintval($_POST['amount'])), __FILE__, __LINE__);
 
-                                       // Update the user data as well..
-                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `wernis_userid`=%d WHERE userid=%d LIMIT 1",
-                                               array(bigintval($_POST['wds66_id']), $GLOBALS['userid']), __FILE__, __LINE__);
-
                                        // All done!
-                                       LOAD_TEMPLATE("admin_settings_saved", false, WERNIS_MEMBER_WITHDRAW_DONE);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, WERNIS_MEMBER_PAYOUT_DONE);
                                        return;
                                } elseif ((GET_WERNIS_ERROR_CODE() == "user_failed") || (GET_WERNIS_ERROR_CODE() == "own_failed") || (GET_WERNIS_ERROR_CODE() == "amount_failed") || (GET_WERNIS_ERROR_CODE() == "api_amount_failed")) {
                                        // Wrong login data