X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fwernis_functions.php;h=6e37a974bfdacf815b282fcd4070aef0904a86c1;hb=d897dae9f3b01f17fb59f2b96ba067b1a0f417b0;hp=101c5b360685eee3db2c825f1b6fe70c5c6dc136;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index 101c5b3606..6e37a974bf 100644 --- a/inc/libs/wernis_functions.php +++ b/inc/libs/wernis_functions.php @@ -1,7 +1,7 @@ 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(); @@ -136,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', @@ -186,7 +193,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData = array()) { // All fine here $return = array( 'status' => 'OK', - 'response' => $response + 'response' => $responseLine ); } @@ -231,14 +238,14 @@ function WERNIS_EXECUTE_WITHDRAW ($wdsId, $userMd5, $amount) { $result = false; // Prepare the purpose - eval("\$purpose = \"".compileCode(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getUserId()))."\";"); + eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_WITHDRAW'), getMemberId()))."\";"); // Prepare the request data $requestData = array( 'sub_request' => 'receive', - 't_userid' => bigintval($wdsId), + 't_uid' => bigintval($wdsId), 't_md5' => $userMd5, - 'r_userid' => getConfig('wernis_refid'), + 'r_uid' => getConfig('wernis_refid'), 'amount' => bigintval($amount), 'purpose' => encodeString($purpose, false) ); @@ -271,14 +278,14 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) { $result = false; // Prepare the purpose - eval("\$purpose = \"".compileCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getUserId()))."\";"); + eval("\$purpose = \"".compileRawCode(sprintf(getMessage('WERNIS_API_PURPOSE_PAYOUT'), getMemberId()))."\";"); // Prepare the request data $requestData = array( 'sub_request' => 'send', - 't_userid' => getConfig('wernis_refid'), + 't_uid' => getConfig('wernis_refid'), 't_md5' => getConfig('wernis_pass_md5'), - 'r_userid' => bigintval($wdsId), + 'r_uid' => bigintval($wdsId), 'amount' => bigintval($amount), 'purpose' => encodeString($purpose, false) ); @@ -330,7 +337,7 @@ 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 @@ -339,7 +346,7 @@ function WERNIS_TAKE_FEE ($points, $mode) { //* DEBUG: */ outputHtml("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 @@ -391,15 +398,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] ?>