X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fwernis_functions.php;h=9105d95f170aca49e7da6ef2592ab699d5ada8f2;hb=80539a22f89c2a5e4e765a886ad5081c5fc33dc2;hp=4d86960d3ca9bd12bbc2030d05b6bb1c44c8548d;hpb=e6d0294f587cab6b74f689ecdf2ebb3cf2b09e25;p=mailer.git

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 4d86960d3c..9105d95f17 100644
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/19/2003 *
- * ===============                              Last change: 08/12/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/19/2003 *
+ * ===================                          Last change: 08/12/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-points.php                                  *
@@ -18,6 +18,7 @@
  * 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 *
@@ -54,7 +55,7 @@ function GET_WERNIS_ERROR_MESSAGE () {
 		return $GLOBALS['wernis_data']['message'];
 	} elseif (isset($GLOBALS['wernis_data']['status'])) {
 		// Fall-back to status
-		return sprintf(getMessage('WERNIS_ERROR_STATUS'), $GLOBALS['wernis_data']['status']);
+		return getMaskedMessage('WERNIS_ERROR_STATUS', $GLOBALS['wernis_data']['status']);
 	} else {
 		// Something bad happend
 		return getMessage('WERNIS_UNKNOWN_ERROR');
@@ -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,7 +144,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',
@@ -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 = \"".compileRawCode(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 = \"".compileRawCode(getMaskedMessage('WERNIS_API_PURPOSE_PAYOUT', getMemberId()))."\";");
 
 	// Prepare the request data
 	$requestData = array(
@@ -314,7 +315,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');
@@ -337,7 +338,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
@@ -346,7 +347,7 @@ function WERNIS_TAKE_FEE ($points, $mode) {
 	//* DEBUG: */ outputHtml("mode={$mode},points={$points}<br />");
 	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
 
@@ -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]
 ?>