New wrapper function introduced, more EL rewrites:

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 5107b398590bbb718cc79ecec373b69a37c7418c..ffc792f40f0e7ff315c2951ebb73152ecdbb5af9 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.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 *
@@ -39,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Sets a status message and code
 function WERNIS_STATUS_MESSAGE ($message, $status) {
@@ -57,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--}';
        }
 }
 
@@ -68,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--}';
        }
 }
 
@@ -79,7 +80,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                // Then abort here!
                return array(
                        'status'  => 'failed_general',
-                       'message' => getMessage('WERNIS_API_REQUEST_DATA_INVALID')
+                       'message' => '{--WERNIS_API_REQUEST_DATA_INVALID--}'
                );
        } // END - if
 
@@ -88,7 +89,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                // Abort here...
                return array(
                        'status'  => 'failed_general',
-                       'message' => getMessage('WERNIS_API_REQUEST_DATA_MISSING')
+                       'message' => '{--WERNIS_API_REQUEST_DATA_MISSING--}'
                );
        } // END - if
 
@@ -147,7 +148,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                        case 'AUTH': // Authorization has failed
                                $return = array(
                                        'status'  => 'auth_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_AUTH')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_AUTH--}'
                                );
                                break;
 
@@ -156,28 +157,28 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                        case 'USER': // Missing account or invalid password
                                $return = array(
                                        'status'  => 'user_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_USER')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_USER--}'
                                );
                                break;
 
                        case 'OWN': // Transfer to own account
                                $return = array(
                                        'status'  => 'own_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_OWN')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_OWN--}'
                                );
                                break;
 
                        case 'AMOUNT': // Amount is depleted
                                $return = array(
                                        'status'  => 'amount_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_AMOUNT')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_AMOUNT--}'
                                );
                                break;
 
                        case 'AMOUNT-SEND': // API amount is depleted
                                $return = array(
                                        'status'  => 'api_amount_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_API_AMOUNT')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_API_AMOUNT--}'
                                );
                                break;
 
@@ -238,7 +239,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
        $result = false;
 
        // Prepare the purpose
-       eval("\$purpose = \"".compileRawCode(getMaskedMessage('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(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId()))."\";");
+       eval('$purpose = "' . preCompileCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId())) . '";');
 
        // Prepare the request data
        $requestData = array(
@@ -312,20 +313,20 @@ 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) {
                case 'IN': // Withdraw
-                       $return = getMessage('WERNIS_STATUS_WITHDRAW');
+                       $return = '{--WERNIS_STATUS_WITHDRAW--}';
                        break;
 
                case 'OUT': // Payout
-                       $return = getMessage('WERNIS_STATUS_PAYOUT');
+                       $return = '{--WERNIS_STATUS_PAYOUT--}';
                        break;
 
                case 'FAILED': // Payout
-                       $return = getMessage('WERNIS_STATUS_FAILED');
+                       $return = '{--WERNIS_STATUS_FAILED--}';
                        break;
        }
 
@@ -343,7 +344,7 @@ function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = '',
 // Take fees and factor
 function WERNIS_TAKE_FEE ($points, $mode) {
        // Payout or withdraw are allowed modes!
-       //* DEBUG: */ outputHtml("mode={$mode},points={$points}<br />");
+       //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points);
        if (!in_array($mode, array('payout', 'withdraw'))) {
                // Log error and abort
                logDebugMessage(__FUNCTION__, __LINE__, "userid={getMemberId()},mode={$mode},points={$points}");
@@ -369,7 +370,7 @@ function WERNIS_TAKE_FEE ($points, $mode) {
        }
 
        // Return value
-       //* DEBUG: */ outputHtml("mode={$mode},points={$points}<br />");
+       //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points);
        return $points;
 }
 
@@ -388,22 +389,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]
 ?>