A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 0cb27530e046cbb8c623a0283a358daf1c706524..49dcaa861183b006e31fcd24cde2be89885025b7 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -39,20 +39,18 @@ if (!defined('__SECURITY')) {
 
 // Sets a status message and code
 function WERNIS_STATUS_MESSAGE ($msg, $status) {
-       global $WERNIS;
-       $WERNIS['message'] = $msg;
-       $WERNIS['status'] = $status;
+       $GLOBALS['wernis_data']['message'] = $msg;
+       $GLOBALS['wernis_data']['status'] = $status;
 }
 
 // Get the status message
 function GET_WERNIS_ERROR_MESSAGE () {
-       global $WERNIS;
-       if (isset($WERNIS['message'])) {
+       if (isset($GLOBALS['wernis_data']['message'])) {
                // Use raw message
-               return $WERNIS['message'];
-       } elseif (isset($WERNIS['status'])) {
+               return $GLOBALS['wernis_data']['message'];
+       } elseif (isset($GLOBALS['wernis_data']['status'])) {
                // Fall-back to status
-               return sprintf(WERNIS_ERROR_STATUS, $WERNIS['status']);
+               return sprintf(WERNIS_ERROR_STATUS, $GLOBALS['wernis_data']['status']);
        } else {
                // Something bad happend
                return WERNIS_UNKNOWN_ERROR;
@@ -61,10 +59,9 @@ function GET_WERNIS_ERROR_MESSAGE () {
 
 // Get the status code
 function GET_WERNIS_ERROR_CODE () {
-       global $WERNIS;
-       if (isset($WERNIS['status'])) {
+       if (isset($GLOBALS['wernis_data']['status'])) {
                // Use raw message
-               return $WERNIS['status'];
+               return $GLOBALS['wernis_data']['status'];
        } else {
                // Something bad happend
                return WERNIS_UNKNOWN_ERROR;
@@ -92,7 +89,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
        } // END - if
 
        // Add more request data
-       $requestData['api_id']  = bigintval(getConfig('wernis_api_id'));
+       $requestData['api_id']  = getConfig(('wernis_api_id'));
        $requestData['api_key'] = getConfig('wernis_api_md5');
 
        // Construct the request string
@@ -325,7 +322,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($GLOBALS['userid'], bigintval($wdsId), bigintval($amount), $type, $message, $status), __FILE__, __LINE__);
+               array($GLOBALS['userid'], bigintval($wdsId), bigintval($amount), $type, $message, $status), __FUNCTION__, __LINE__);
 }
 
 // Take fees and factor