MXCHANGE_OPEN() rewritten to GET_URL(), POST_URL() and SEND_RAW_REQUEST()

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index e665277234890a9f6feb7218f93b080a7049c9c1..4114845e9cdbc75227cfd28a2c180e353228fd21 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -82,7 +82,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                        'status'  => "failed_general",
                        'message' => WERNIS_API_REQUEST_DATA_INVALID
                );
-       }
+       } // END - if
 
        // Is the API id and MD5 hash there?
        if ((empty($_CONFIG['wernis_api_id'])) || (empty($_CONFIG['wernis_api_md5']))) {
@@ -91,16 +91,17 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                        'status'  => "failed_general",
                        'message' => WERNIS_API_REQUEST_DATA_MISSING
                );
-       }
+       } // END - if
+
+       // Add more request data
+       $requestData['api_id']  = bigintval($_CONFIG['wernis_api_id']);
+       $requestData['api_key'] = $_CONFIG['wernis_api_key'];
 
        // Construct the request string
-       $requestString = $_CONFIG['wernis_api_url'] . $scriptName."?api_id=".$_CONFIG['wernis_api_id']."&api_key=".$_CONFIG['wernis_api_md5'];
-       foreach ($requestData as $key=>$value) {
-               $requestString .= "&".$key."=".$value;
-       }
+       $requestString = $_CONFIG['wernis_api_url'] . $scriptName;
 
        // Get the raw response from the lower function
-       $response = MXCHANGE_OPEN($requestString);
+       $response = POST_URL($requestString, $requestData);
 
        // Check the response header if all is fine
        if (strpos($response[0], "200") === false) {
@@ -109,7 +110,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                        'status'  => "request_error",
                        'message' => sprintf(WERNIS_API_REQUEST_ERROR, $response[0])
                );
-       }
+       } // END - if
 
        // All (maybe) fine so remove the response header from server
        $response = $response[(count($response) - 1)];
@@ -118,7 +119,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        if (substr($response, 0, 1) == "&") {
                // Remove the leading & (which can be used in Flash)
                $response = substr($response, 1);
-       }
+       } // END - if
 
        // Bring back the response
        $data = explode("=", $response);