X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fwernis_functions.php;h=21c3f2f1478c3e8896d0e69a60f8c690e9d05972;hb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;hp=4d86960d3ca9bd12bbc2030d05b6bb1c44c8548d;hpb=7e500b4e3a3c25881e5d7da8ff77d86344ae4cd7;p=mailer.git diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 4d86960d3c..21c3f2f147 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 @@ -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 @@ -107,7 +108,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 @@ -126,7 +127,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData = array()) { // Something badly happened on server-side return array( 'status' => 'request_problem', - 'message' => sprintf(getMessage('WERNIS_API_REQUEST_PROBLEM'), $response[0], htmlentities($responseLine)) + 'message' => sprintf(getMessage('WERNIS_API_REQUEST_PROBLEM'), $response[0], secureString($responseLine)) ); } // END - if @@ -143,11 +144,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; @@ -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; @@ -185,7 +186,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; } @@ -238,7 +239,7 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) { $result = false; // Prepare the purpose - eval("\$purpose = \"".compileCode(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getUserId()))."\";"); + 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 = \"".compileCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getUserId()))."\";"); + 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 = 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; } @@ -337,16 +338,16 @@ function WERNIS_TRANSFER_STATUS ($status) { 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__); + 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: */ 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={getUserId()},mode={$mode},points={$points}"); + logDebugMessage(__FUNCTION__, __LINE__, "userid={getMemberId()},mode={$mode},points={$points}"); return false; } // END - if @@ -369,7 +370,7 @@ function WERNIS_TAKE_FEE ($points, $mode) { } // Return value - //* DEBUG: */ outputHtml("mode={$mode},points={$points}
"); + //* DEBUG: */ debugOutput('mode='.$mode.',points='.$points); return $points; } @@ -398,15 +399,12 @@ function WERNIS_ADD_FEES_TO_ARRAY (&$array) { } // 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] ?>