New functions introduced, several rewrites:

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 6e37a974bfdacf815b282fcd4070aef0904a86c1..5107b398590bbb718cc79ecec373b69a37c7418c 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -54,7 +54,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 +107,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 +185,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 +238,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 = \"".compileRawCode(getMaskedMessage('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 = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getMemberId()))."\";");
+       eval("\$purpose = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId()))."\";");
 
        // Prepare the request data
        $requestData = array(
@@ -314,7 +314,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');