X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fwernis_functions.php;h=b8c92ccd09a2ab12a38f7e13a4af4185fa042798;hb=62d8f6d89c35bebe15b8f716a5629f14d95f3078;hp=5107b398590bbb718cc79ecec373b69a37c7418c;hpb=06d179ae45f3f049003e6fe213249842b2a630fe;p=mailer.git
diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 5107b39859..b8c92ccd09 100644
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -14,10 +14,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * 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 +38,7 @@
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-}
+} // END - if
// Sets a status message and code
function WERNIS_STATUS_MESSAGE ($message, $status) {
@@ -57,7 +56,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 +67,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 +78,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 +87,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 +95,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;
@@ -147,7 +155,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 +164,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;
@@ -209,6 +217,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 +246,6 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
// Default is failed attempt
$result = false;
- // Prepare the purpose
- eval("\$purpose = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId()))."\";");
-
// Prepare the request data
$requestData = array(
'sub_request' => 'receive',
@@ -247,7 +253,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 +283,6 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
// Default is failed attempt
$result = false;
- // Prepare the purpose
- eval("\$purpose = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId()))."\";");
-
// Prepare the request data
$requestData = array(
'sub_request' => 'send',
@@ -287,7 +290,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,22 +315,24 @@ 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);
+
+ // Which 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;
- }
+ } // END - switch
// Return the status
return $return;
@@ -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]
?>