New-line added

[mailer.git] / inc / libs / wernis_functions.php

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 4d86960d3ca9bd12bbc2030d05b6bb1c44c8548d..6e37a974bfdacf815b282fcd4070aef0904a86c1 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/19/2003 *
- * ===============                              Last change: 08/12/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/19/2003 *
+ * ===================                          Last change: 08/12/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-points.php                                  *
@@ -126,7 +126,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                // Something badly happened on server-side
                return array(
                        'status'  => 'request_problem',
-                       'message' => sprintf(getMessage('WERNIS_API_REQUEST_PROBLEM'), $response[0], htmlentities($responseLine))
+                       'message' => sprintf(getMessage('WERNIS_API_REQUEST_PROBLEM'), $response[0], secureString($responseLine))
                );
        } // END - if
 
@@ -143,7 +143,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        if ($data[0] === 'error') {
                // The request has failed... :(
                switch ($data[1]) {
-                       case '404': // Invalid API ID
+                       case '404': // Invalid API id
                        case 'AUTH': // Authorization has failed
                                $return = array(
                                        'status'  => 'auth_failed',
@@ -238,7 +238,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        $result = false;
 
        // Prepare the purpose
-       eval("\$purpose = \"".compileCode(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getUserId()))."\";");
+       eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getMemberId()))."\";");
 
        // Prepare the request data
        $requestData = array(
@@ -278,7 +278,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        $result = false;
 
        // Prepare the purpose
-       eval("\$purpose = \"".compileCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getUserId()))."\";");
+       eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getMemberId()))."\";");
 
        // Prepare the request data
        $requestData = array(
@@ -337,7 +337,7 @@ function WERNIS_TRANSFER_STATUS ($status) {
 function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = '', $status = '') {
        // Register this wernis movement
        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_wernis` (`userid`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type`,`wernis_api_message`,`wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
-               array(getUserId(), bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
+               array(getMemberId(), bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
 }
 
 // Take fees and factor
@@ -346,7 +346,7 @@ function WERNIS_TAKE_FEE ($points, $mode) {
        //* DEBUG: */ outputHtml("mode={$mode},points={$points}<br />");
        if (!in_array($mode, array('payout', 'withdraw'))) {
                // Log error and abort
-               logDebugMessage(__FUNCTION__, __LINE__, "userid={getUserId()},mode={$mode},points={$points}");
+               logDebugMessage(__FUNCTION__, __LINE__, "userid={getMemberId()},mode={$mode},points={$points}");
                return false;
        } // END - if
 
@@ -398,15 +398,12 @@ function WERNIS_ADD_FEES_TO_ARRAY (&$array) {
        } // END - if
 
        // Add both factors
-       $array['payout_factor']        = translateComma(getConfig('wernis_payout_factor'));
        $array['withdraw_factor']      = translateComma(getConfig('wernis_withdraw_factor'));
 
        // Add all fees
-       $array['payout_fee_percent']   = translateComma(getConfig('wernis_payout_fee_percent'));
        $array['withdraw_fee_percent'] = translateComma(getConfig('wernis_withdraw_fee_percent'));
-       $array['payout_fee_fix']       = translateComma(getConfig('wernis_payout_fee_fix'));
        $array['withdraw_fee_fix']     = translateComma(getConfig('wernis_withdraw_fee_fix'));
 }
 
-//
+// [EOF]
 ?>