A lot CSS classes rewritten, please update all your themes.

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 2c3a85df5b552df4d8ba8e5325694228610bd84b..df3a61d2e1332d79cc6db03b22193adcc3f89305 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Sets a status message and code
 function WERNIS_STATUS_MESSAGE ($message, $status) {
@@ -58,7 +58,7 @@ function GET_WERNIS_ERROR_MESSAGE () {
                return getMaskedMessage('WERNIS_ERROR_STATUS', $GLOBALS['wernis_data']['status']);
        } else {
                // Something bad happend
-               return getMessage('WERNIS_UNKNOWN_ERROR');
+               return '{--WERNIS_UNKNOWN_ERROR--}';
        }
 }
 
@@ -69,7 +69,7 @@ function GET_WERNIS_ERROR_CODE () {
                return $GLOBALS['wernis_data']['status'];
        } else {
                // Something bad happend
-               return getMessage('WERNIS_UNKNOWN_ERROR');
+               return '{--WERNIS_UNKNOWN_ERROR--}';
        }
 }
 
@@ -97,6 +97,15 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        $requestData['api_id']  = getConfig('wernis_api_id');
        $requestData['api_key'] = getConfig('wernis_api_md5');
 
+       // Is a purpose there?
+       if (isset($requestData['purpose'])) {
+               // Eval the purpose
+               eval('$purpose = "' . doFinalCompilation($requestData['purpose'], false) . '";');
+
+               // Prepare the purpose, it needs encoding
+               $requestData['purpose'] = encodeString($purpose);
+       } // END - if
+
        // Construct the request string
        $requestString = getConfig('wernis_api_url') . $scriptName;
 
@@ -210,6 +219,7 @@ function WERNIS_TEST_API () {
        // Return the result from the lower functions
        $return = WERNIS_SEND_REQUEST('balance.php');
 
+       // Did it went smoothly?
        if ($return['status'] == 'OK') {
                // All fine!
                $result = true;
@@ -238,9 +248,6 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        // Default is failed attempt
        $result = false;
 
-       // Prepare the purpose
-       eval('$purpose = "' . preCompileCode(getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId())) . '";');
-
        // Prepare the request data
        $requestData = array(
                'sub_request' => 'receive',
@@ -248,7 +255,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
                't_md5'       => $userMd5,
                'r_uid'       => getConfig('wernis_refid'),
                'amount'      => bigintval($amount),
-               'purpose'     => encodeString($purpose, false)
+               'purpose'     => getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId())
        );
 
        // Return the result from the lower functions
@@ -278,9 +285,6 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
        // Default is failed attempt
        $result = false;
 
-       // Prepare the purpose
-       eval('$purpose = "' . preCompileCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId())) . '";');
-
        // Prepare the request data
        $requestData = array(
                'sub_request' => 'send',
@@ -288,7 +292,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
                't_md5'       => getConfig('wernis_pass_md5'),
                'r_uid'       => bigintval($wdsId),
                'amount'      => bigintval($amount),
-               'purpose'     => encodeString($purpose, false)
+               'purpose'     => getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId())
        );
 
        // Return the result from the lower functions
@@ -313,7 +317,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
 }
 
 // Translate the status IN/OUT
-function WERNIS_TRANSFER_STATUS ($status) {
+function translateWernisTransferStatus ($status) {
        // Default status
        $return = getMaskedMessage('WERNIS_STATUS_UNKNWOWN', $status);
        switch ($status) {
@@ -389,22 +393,5 @@ function WERNIS_ADD_WITHDRAW_FEE ($points) {
        return $points;
 }
 
-// Add all fees to the array
-function WERNIS_ADD_FEES_TO_ARRAY (&$array) {
-       // Is the array an array? ;-)
-       if (!is_array($array)) {
-               // Log error and return
-               logDebugMessage(__FUNCTION__, __LINE__, 'Type ' . gettype($array) . ' != array.');
-               return;
-       } // END - if
-
-       // Add both factors
-       $array['withdraw_factor']      = translateComma(getConfig('wernis_withdraw_factor'));
-
-       // Add all fees
-       $array['withdraw_fee_percent'] = translateComma(getConfig('wernis_withdraw_fee_percent'));
-       $array['withdraw_fee_fix']     = translateComma(getConfig('wernis_withdraw_fee_fix'));
-}
-
 // [EOF]
 ?>