X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fwernis_functions.php;h=df3a61d2e1332d79cc6db03b22193adcc3f89305;hb=91d298e5ec7193849a92bd4902abc02ffab8305b;hp=6e37a974bfdacf815b282fcd4070aef0904a86c1;hpb=1bf7c189fda17ce6c702f600c0eb084b681a307b;p=mailer.git diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 6e37a974bf..df3a61d2e1 100644 --- 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) { @@ -54,10 +55,10 @@ 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'); + 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 @@ -96,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; @@ -107,7 +117,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 @@ -147,7 +157,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 +166,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; @@ -185,7 +195,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; } @@ -209,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; @@ -237,9 +248,6 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) { // Default is failed attempt $result = false; - // Prepare the purpose - eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getMemberId()))."\";"); - // Prepare the request data $requestData = array( 'sub_request' => 'receive', @@ -247,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 @@ -277,9 +285,6 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) { // Default is failed attempt $result = false; - // Prepare the purpose - eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getMemberId()))."\";"); - // Prepare the request data $requestData = array( 'sub_request' => 'send', @@ -287,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 @@ -312,20 +317,20 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) { } // Translate the status IN/OUT -function WERNIS_TRANSFER_STATUS ($status) { +function translateWernisTransferStatus ($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'); + $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 +348,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}
"); + //* 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 +374,7 @@ function WERNIS_TAKE_FEE ($points, $mode) { } // Return value - //* DEBUG: */ outputHtml("mode={$mode},points={$points}
"); + //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points); return $points; } @@ -388,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] ?>