More globals rewritten, see ticket #100

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 9daec4f80d97259f60a72dbff68ea501694d0143..e202db15d3e7750537b78684bf6b0ae533f3c5be 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2484,7 +2484,7 @@ function WRITE_FILE ($FQFN, $content) {
 // Generates an error code from given account status
 function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
        // Default error code if unknown account status
-       $ERROR = getCode('UNKNOWN_STATUS');
+       $errorCode = getCode('UNKNOWN_STATUS');
 
        // Generate constant name
        $constantName = sprintf("ID_%s", $status);
@@ -2492,14 +2492,14 @@ function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
        // Is the constant there?
        if (isCodeSet($constantName)) {
                // Then get it!
-               $ERROR = getCode($constantName);
+               $errorCode = getCode($constantName);
        } else {
                // Unknown status
                DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status));
        }
 
        // Return error code
-       return $ERROR;
+       return $errorCode;
 }
 
 // Clears the output buffer. This function does *NOT* backup sent content.
@@ -2832,9 +2832,11 @@ function GENERATE_AID_LINK ($aid) {
        $admin = "<span class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>";
 
        // Zero? = Not assigned
-       if ($aid > 0) {
+       if (bigintval($aid) > 0) {
                // Load admin's login
                $login = GET_ADMIN_LOGIN($aid);
+
+               // Is the login valid?
                if ($login != "***") {
                        // Is the extension there?
                        if (EXT_IS_ACTIVE("admins")) {