IS_LOGGED_IN() renamed to IS_MEMBER(), some HTML fixes

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index e7d9adeccac4ac36ac963462518fc9dbf8ee4e7e..6710c1c6f633069abf5d35c46e9c1a0361bc3cc5 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -132,13 +132,13 @@ function CHECK_MODULE($mod) {
        // Check returned values against current access permissions
        //
        //  Admin access            ----- Guest access -----           --- Guest   or   member? ---
-       if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_LOGGED_IN())))) {
+       if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_MEMBER())))) {
                // If you are admin you are welcome for everything!
                $ret = "done";
        } elseif ($locked == "Y") {
                // Module is locked
                $ret = "locked";
-       } elseif (($mem == "Y") && (!IS_LOGGED_IN())) {
+       } elseif (($mem == "Y") && (!IS_MEMBER())) {
                // You have to login first!
                $ret = "mem_only";
        } elseif (($admin == "Y") && (!IS_ADMIN())) {
@@ -538,7 +538,7 @@ function WHAT_IS_VALID($act, $wht, $type="guest")
        }
 }
 //
-function IS_LOGGED_IN()
+function IS_MEMBER()
 {
        global $status, $LAST;
        if (!is_array($LAST)) $LAST = array();
@@ -617,7 +617,7 @@ function UPDATE_LOGIN_DATA ($UPDATE=true) {
        $newl = time() + bigintval(get_session('lifetime'));
 
        // Recheck if logged in
-       if (!IS_LOGGED_IN()) return false;
+       if (!IS_MEMBER()) return false;
 
        // Load last module and last online time
        $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
@@ -1204,7 +1204,7 @@ function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht)
        if (!empty($GLOBALS['userid']))
        {
                // Update member status only when userid is valid
-               if (($GLOBALS['userid'] > 0) && (IS_LOGGED_IN()))
+               if (($GLOBALS['userid'] > 0) && (IS_MEMBER()))
                {
                        // Is valid user
                        $uid = $GLOBALS['userid'];