Renamed function so it might be more understandable

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 749a368f42e504db7d443c74214e19c48a530eb2..f7238a64a85a8d71b6d5670f1b29f697dcfe2e94 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -72,8 +72,8 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
        return $data['title'];
 }
 
-// Add menu description pending on given file name (without path!)
-function addMenuDescription ($accessLevel, $FQFN, $return = false) {
+// Add link into output stream (or return it) for 'You Are Here' navigation
+function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
        // Use only filename of the FQFN...
        $file = basename($FQFN);
 
@@ -237,7 +237,7 @@ ORDER BY
                        // Do we have some entries?
                        if (!SQL_HASZERONUMS($result_sub)) {
                                // Init counter
-                               $cnt = '0';
+                               $count = '0';
 
                                // Load all sub menus
                                while ($content2 = SQL_FETCHARRAY($result_sub)) {
@@ -279,7 +279,7 @@ ORDER BY
                                        }
 
                                        // Cunt it up
-                                       $cnt++;
+                                       $count++;
 
                                        // Rewrite array
                                        $content = array(
@@ -290,7 +290,7 @@ ORDER BY
                                        );
 
                                        // Add regular menu row or bottom row?
-                                       if ($cnt < SQL_NUMROWS($result_sub)) {
+                                       if ($count < SQL_NUMROWS($result_sub)) {
                                                $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
                                        } else {
                                                $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
@@ -368,58 +368,53 @@ function isMember () {
        // @TODO Try to rewrite this to one or more functions
        if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
 
-       // is the cache entry there?
+       // Is the cache entry there?
        if (isset($GLOBALS[__FUNCTION__])) {
                // Then return it
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS[__FUNCTION__]) . ')');
                return $GLOBALS[__FUNCTION__];
        } elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
-               // No member
+               // Destroy any existing user session data
+               destroyMemberSession();
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
+
+               // Abort further processing
                return false;
-       } else {
-               // Get it secured from session
-               setMemberId(getSession('userid'));
-               setCurrentUserId(getMemberId());
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
        }
 
+       // Get userid secured from session
+       setMemberId(getSession('userid'));
+
+       // ... and set it as currently handled user id
+       setCurrentUserId(getMemberId());
+
        // Init user data array
        initUserData();
 
        // Fix "deleted" cookies first
        fixDeletedCookies(array('userid', 'u_hash'));
 
-       // Are cookies set?
-       if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
-               // Cookies are set with values, but are they valid?
-               if (fetchUserData(getMemberId()) === true) {
-                       // Validate password by created the difference of it and the secret key
-                       $valPass = encodeHashForCookie(getUserData('password'));
+       // Are cookies set and can the member data be loaded?
+       if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+               // Validate password by created the difference of it and the secret key
+               $valPass = encodeHashForCookie(getUserData('password'));
 
+               // So did we now have valid data and an unlocked user?
+               if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
                        // Transfer last module and online time
                        $GLOBALS['last_online']['module'] = getUserData('last_module');
                        $GLOBALS['last_online']['online'] = getUserData('last_online');
 
-                       // So did we now have valid data and an unlocked user?
-                       if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
-                               // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
-                               $ret = true;
-                       } else {
-                               // Maybe got locked etc.
-                               //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status') . ',' . $valPass . '(' . strlen($valPass) . ')/' . getSession('u_hash') . '(' . strlen(getSession('u_hash')) . ')/' . getUserData('password') . '(' . strlen(getUserData('password')) . ')');
-                               destroyMemberSession();
-                       }
-               } else {
-                       // Cookie data is invalid!
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data invalid or user not found.');
-                       destroyMemberSession();
-               }
-       } else {
-               // Cookie data is invalid!
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data not complete.');
+                       // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
+                       $ret = true;
+               } // END - if
+       } // END - if
+
+       // Is $ret still false?
+       if ($ret === false) {
+               // Yes, so destroy the session
                destroyMemberSession();
-       }
+       } // END - if
 
        // Cache status
        $GLOBALS[__FUNCTION__] = $ret;
@@ -1479,18 +1474,16 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
 // Activate exchange
 function FILTER_ACTIVATE_EXCHANGE () {
        // Is the extension 'user' there?
-       if ((!isExtensionActive('user')) || (getConfig('activate_xchange') == '0')) {
+       if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) {
                // Silently abort here
                return false;
        } // END - if
 
        // Check total amount of users
-       if (getTotalConfirmedUser() >= getConfig('activate_xchange')) {
+       if (getTotalConfirmedUser() >= getActivateXchange()) {
                // Activate System
-               setSqlsArray(array(
-                       "UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",
-                       "UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2",
-               ));
+               addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1");
+               addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2");
 
                // Run SQLs
                runFilterChain('run_sqls');