Cache path changed and compileRawCode() introduced

[mailer.git] / inc / libs / wernis_functions.php

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 101c5b360685eee3db2c825f1b6fe70c5c6dc136..be5acd5de2d79c2d2405fe5103f5072f99e28fff 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -112,22 +112,29 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        } // 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], htmlentities($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'), getUserId()))."\";");
 
        // 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'), getUserId()))."\";");
 
        // 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)
        );