Superfluous SQL query rewritten to getUserData() call

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 4c79c47eddec8640ebd55b2e57e58125e6d7b7ad..f38e7aec5dae6d6ebb8d025f968a736cc9141ba8 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -163,10 +163,10 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
                        $GLOBALS['nav_depth'] = '0';
 
                        // Run the post-filter chain
-                       $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+                       $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => $OUT));
 
-                       // Add additional content
-                       $OUT .= $ret['content'];
+                       // Get content from filter back
+                       $OUT = $ret['content'];
                } // END - if
        } // END - if
 
@@ -184,7 +184,6 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
 function addMenu ($mode, $action, $what) {
        // Init some variables
        $main_cnt = '0';
-       $ADD = '';
 
        // is the menu action valid?
        if (!isMenuActionValid($mode, $action, $what, true)) {
@@ -192,8 +191,10 @@ function addMenu ($mode, $action, $what) {
        } // END - if
 
        // Non-admin shall not see all menus
-       if (!isAdmin()) {
-               $ADD = " AND `visible`='Y' AND `locked`='N'";
+       $ADD = " AND `visible`='Y' AND `locked`='N'";
+       if (isAdmin()) {
+               // Is admin, so make all visible
+               $ADD = '';
        } // END - if
 
        // Load SQL data and add the menu to the output stream...
@@ -451,10 +452,12 @@ function fetchUserData ($value, $column = 'userid') {
                        debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.');
                } elseif (isUserDataValid()) {
                        // Use cache, so it is fine
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1');
                        return true;
                }
        } elseif (isUserDataValid())  {
                // Using cache is fine
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2');
                return true;
        }
 
@@ -1603,7 +1606,9 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
                        }
 
                        // Reduce this users total received emails?
-                       if ($num === 0) $userids[$data['userid']] = $data['userid'];
+                       if ($num === 0) {
+                               $userids[$data['userid']] = $data['userid'];
+                       } // END - if
                } // END - while
 
                if (count($userids) > 0) {
@@ -1621,7 +1626,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 }
 
 // Creates a new task
-function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '0', $strip = true) {
+function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = '0', $strip = true) {
        // Insert the task data into the database
        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
                array(
@@ -1640,7 +1645,15 @@ function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '
 // @TODO Fix inconsistency between last_module and getWhat()
 function updateLastActivity($userid) {
        // Run the update query
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_data`
+SET
+       `last_module`='%s',
+       `last_online`=UNIX_TIMESTAMP(),
+       `REMOTE_ADDR`='%s'
+WHERE
+       `userid`=%s
+LIMIT 1",
                array(
                        getWhat(),
                        detectRemoteAddr(),