Even more rewrites/fixes from EL branch (please report any broken part after you...

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index acc613dd53752f644234e40a95430f286543ba6c..adffe64f9037dfa1de06c6a19035e63d76aaf0b9 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                                  *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -54,7 +55,7 @@ function GET_WERNIS_ERROR_MESSAGE () {
                return $GLOBALS['wernis_data']['message'];
        } elseif (isset($GLOBALS['wernis_data']['status'])) {
                // Fall-back to status
-               return sprintf(getMessage('WERNIS_ERROR_STATUS'), $GLOBALS['wernis_data']['status']);
+               return getMaskedMessage('WERNIS_ERROR_STATUS', $GLOBALS['wernis_data']['status']);
        } else {
                // Something bad happend
                return getMessage('WERNIS_UNKNOWN_ERROR');
@@ -107,7 +108,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                // Something bad happend... :(
                return array(
                        'status'  => 'request_error',
-                       'message' => sprintf(getMessage('WERNIS_API_REQUEST_ERROR'), $response[0])
+                       'message' => getMaskedMessage('WERNIS_API_REQUEST_ERROR', $response[0])
                );
        } // END - if
 
@@ -185,7 +186,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown error %s from WDS66 API received.", $data[1]));
                                $return = array(
                                        'status'  => 'request_failed',
-                                       'message' => sprintf(getMessage('WERNIS_API_REQUEST_FAILED'), $data[1])
+                                       'message' => getMaskedMessage('WERNIS_API_REQUEST_FAILED', $data[1])
                                );
                                break;
                }
@@ -238,7 +239,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        $result = false;
 
        // Prepare the purpose
-       eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getMemberId()))."\";");
+       eval('$purpose = "' . preCompileCode(getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId())) . '";');
 
        // Prepare the request data
        $requestData = array(
@@ -278,7 +279,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        $result = false;
 
        // Prepare the purpose
-       eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getMemberId()))."\";");
+       eval('$purpose = "' . preCompileCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId())) . '";');
 
        // Prepare the request data
        $requestData = array(
@@ -314,7 +315,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
 // Translate the status IN/OUT
 function WERNIS_TRANSFER_STATUS ($status) {
        // Default status
-       $return = sprintf(getMessage('WERNIS_STATUS_UNKNWOWN'), $status);
+       $return = getMaskedMessage('WERNIS_STATUS_UNKNWOWN', $status);
        switch ($status) {
                case 'IN': // Withdraw
                        $return = getMessage('WERNIS_STATUS_WITHDRAW');
@@ -398,15 +399,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]
 ?>