X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fwernis_functions.php;h=5107b398590bbb718cc79ecec373b69a37c7418c;hb=5a8c537bc2633402ca515964c9a3a2674f37edc2;hp=7c89782e871897aa927df8c0a76b2e2b19457299;hpb=b8aa17b98b99c27eafbdca0fa090bae63527da9a;p=mailer.git diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 7c89782e87..5107b39859 100644 --- a/inc/libs/wernis_functions.php +++ b/inc/libs/wernis_functions.php @@ -1,7 +1,7 @@ '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 + $responseLine = '*INVALID*'; for ($idx = (count($response) - 1); $idx > 1; $idx--) { $line = trim($response[$idx]); if (!empty($line)) { - $response = $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(); @@ -137,7 +143,7 @@ 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', @@ -176,10 +182,10 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData = array()) { 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; } @@ -187,7 +193,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData = array()) { // All fine here $return = array( 'status' => 'OK', - 'response' => $response + 'response' => $responseLine ); } @@ -219,10 +225,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; } @@ -232,17 +238,16 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) { $result = false; // Prepare the purpose - $eval = "\$purpose = \"".COMPILE_CODE(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getUserId()))."\";"; - eval($eval); + eval("\$purpose = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_WITHDRAW', getMemberId()))."\";"); // 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' => encodeString($purpose, false) ); // Return the result from the lower functions @@ -273,17 +278,16 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) { $result = false; // Prepare the purpose - $eval = "\$purpose = \"".COMPILE_CODE(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getUserId()))."\";"; - eval($eval); + eval("\$purpose = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId()))."\";"); // 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' => encodeString($purpose, false) ); // Return the result from the lower functions @@ -310,7 +314,7 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) { // Translate the status IN/OUT function WERNIS_TRANSFER_STATUS ($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'); @@ -332,17 +336,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: */ outputHtml("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 @@ -365,7 +369,7 @@ function WERNIS_TAKE_FEE ($points, $mode) { } // Return value - //* DEBUG: */ echo "mode={$mode},points={$points}
\n"; + //* DEBUG: */ outputHtml("mode={$mode},points={$points}
"); return $points; } @@ -389,20 +393,17 @@ 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.'); + logDebugMessage(__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] ?>