X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fwernis_functions.php;h=b8c92ccd09a2ab12a38f7e13a4af4185fa042798;hb=62d8f6d89c35bebe15b8f716a5629f14d95f3078;hp=121dc2871b14db00f4eb30b48e88827273ba7bc5;hpb=f8da178ba4b2f0ed9bfd303d6d32f62b0919a442;p=mailer.git
diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 121dc2871b..b8c92ccd09 100644
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -1,7 +1,7 @@
'failed_general',
- 'message' => getMessage('WERNIS_API_REQUEST_DATA_INVALID')
+ 'message' => '{--WERNIS_API_REQUEST_DATA_INVALID--}'
);
} // END - if
@@ -89,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
@@ -97,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;
@@ -108,21 +115,34 @@ 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
// All (maybe) fine so remove the response header from server
- $response = $response[(count($response) - 1)];
+ $responseLine = '*INVALID*';
+ for ($idx = (count($response) - 1); $idx > 1; $idx--) {
+ $line = trim($response[$idx]);
+ if (!empty($line)) {
+ $responseLine = $line;
+ break;
+ } // END - if
+ } // END - for
- // Prepare the returning result for higher functions
- if (substr($response, 0, 1) == '&') {
- // Remove the leading & (which can be used in Flash)
- $response = substr($response, 1);
+ // Is the response leaded by a & symbol?
+ if (substr($responseLine, 0, 1) != '&') {
+ // Something badly happened on server-side
+ return array(
+ 'status' => 'request_problem',
+ 'message' => sprintf(getMessage('WERNIS_API_REQUEST_PROBLEM'), $response[0], secureString($responseLine))
+ );
} // END - if
+ // Remove the leading & (which can be used in Flash)
+ $responseLine = substr($responseLine, 1);
+
// Bring back the response
- $data = explode('=', $response);
+ $data = explode('=', $responseLine);
// Default return array (should not stay empty)
$return = array();
@@ -131,11 +151,11 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData = array()) {
if ($data[0] === 'error') {
// The request has failed... :(
switch ($data[1]) {
- case '404': // Invalid API ID
+ case '404': // Invalid API id
case 'AUTH': // Authorization has failed
$return = array(
'status' => 'auth_failed',
- 'message' => getMessage('WERNIS_API_REQUEST_FAILED_AUTH')
+ 'message' => '{--WERNIS_API_REQUEST_FAILED_AUTH--}'
);
break;
@@ -144,36 +164,36 @@ 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;
default: // Unknown error (maybe new?)
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error %s from WDS66 API received.", $data[1]));
+ 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;
}
@@ -181,7 +201,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData = array()) {
// All fine here
$return = array(
'status' => 'OK',
- 'response' => $response
+ 'response' => $responseLine
);
}
@@ -197,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;
@@ -213,10 +234,10 @@ function WERNIS_TEST_API () {
function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
// Is the sponsor extension installed?
if (getConfig('wernis_withdraw_active') != 'Y') {
- if (!EXT_IS_ACTIVE('sponsor')) {
+ if (!isExtensionActive('sponsor')) {
// No, abort here
return false;
- } elseif (!IS_SPONSOR()) {
+ } elseif (!isSponsor()) {
// No sponsor, not allowed to withdraw!
return false;
}
@@ -225,18 +246,14 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) {
// Default is failed attempt
$result = false;
- // Prepare the purpose
- $eval = "\$purpose = \"".COMPILE_CODE(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getUserId()))."\";";
- eval($eval);
-
// Prepare the request data
$requestData = array(
- 'sub_request' => 'receive',
- 't_uid' => bigintval($wdsId),
- 't_md5' => $userMd5,
- 'r_uid' => getConfig('wernis_refid'),
- 'amount' => bigintval($amount),
- 'purpose' => encodeString($purpose, false)
+ 'sub_request' => 'receive',
+ 't_uid' => bigintval($wdsId),
+ 't_md5' => $userMd5,
+ 'r_uid' => getConfig('wernis_refid'),
+ 'amount' => bigintval($amount),
+ 'purpose' => getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId())
);
// Return the result from the lower functions
@@ -266,18 +283,14 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
// Default is failed attempt
$result = false;
- // Prepare the purpose
- $eval = "\$purpose = \"".COMPILE_CODE(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getUserId()))."\";";
- eval($eval);
-
// Prepare the request data
$requestData = array(
- 'sub_request' => 'send',
- 't_uid' => getConfig('wernis_refid'),
- 't_md5' => getConfig('wernis_pass_md5'),
- 'r_uid' => bigintval($wdsId),
- 'amount' => bigintval($amount),
- 'purpose' => encodeString($purpose, false)
+ 'sub_request' => 'send',
+ 't_uid' => getConfig('wernis_refid'),
+ 't_md5' => getConfig('wernis_pass_md5'),
+ 'r_uid' => bigintval($wdsId),
+ 'amount' => bigintval($amount),
+ 'purpose' => getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId())
);
// Return the result from the lower functions
@@ -302,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 = sprintf(getMessage('WERNIS_STATUS_UNKNWOWN'), $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;
@@ -326,17 +341,17 @@ function WERNIS_TRANSFER_STATUS ($status) {
// Log the transfer
function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = '', $status = '') {
// Register this wernis movement
- SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_wernis` (`userid`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type`,`wernis_api_message`,`wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
- array(getUserId(), bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_wernis` (`userid`,`wernis_account`,`wernis_amount`,`wernis_timestamp`,`wernis_type`,`wernis_api_message`,`wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
+ array(getMemberId(), bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
}
// Take fees and factor
function WERNIS_TAKE_FEE ($points, $mode) {
// Payout or withdraw are allowed modes!
- //* DEBUG: */ echo "mode={$mode},points={$points}
\n";
+ //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points);
if (!in_array($mode, array('payout', 'withdraw'))) {
// Log error and abort
- DEBUG_LOG(__FUNCTION__, __LINE__, "uid={getUserId()},mode={$mode},points={$points}");
+ logDebugMessage(__FUNCTION__, __LINE__, "userid={getMemberId()},mode={$mode},points={$points}");
return false;
} // END - if
@@ -359,7 +374,7 @@ function WERNIS_TAKE_FEE ($points, $mode) {
}
// Return value
- //* DEBUG: */ echo "mode={$mode},points={$points}
\n";
+ //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points);
return $points;
}
@@ -378,25 +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
- DEBUG_LOG(__FUNCTION__, __LINE__, ' Type '.gettype($array).'!=array.');
- return;
- } // END - if
-
- // Add both factors
- $array['payout_factor'] = translateComma(getConfig('wernis_payout_factor'));
- $array['withdraw_factor'] = translateComma(getConfig('wernis_withdraw_factor'));
-
- // Add all fees
- $array['payout_fee_percent'] = translateComma(getConfig('wernis_payout_fee_percent'));
- $array['withdraw_fee_percent'] = translateComma(getConfig('wernis_withdraw_fee_percent'));
- $array['payout_fee_fix'] = translateComma(getConfig('wernis_payout_fee_fix'));
- $array['withdraw_fee_fix'] = translateComma(getConfig('wernis_withdraw_fee_fix'));
-}
-
-//
+// [EOF]
?>