More globals rewritten, see #100

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 0cb27530e046cbb8c623a0283a358daf1c706524..ba46ef374fcaab059f03b4188a1a1956b5ca22c4 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;