Major fixes in filters/extensions, other improvements:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ec8d7ce688784133eef930093d2069c7b3ff6714..45f3a8ec42fbef38bd554009f49d106693d4bfc7 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -656,52 +656,6 @@ function IS_MEMBER()
        return $ret;
 }
 //
-function UPDATE_LOGIN_DATA () {
-       global $LAST, $_CONFIG;
-       if (!is_array($LAST)) $LAST = array();
-
-       // Recheck if logged in
-       if (!IS_MEMBER()) return false;
-
-       // Secure user ID
-       $GLOBALS['userid'] = bigintval(get_session('userid'));
-
-       // Extract last online time (life) and how long is auto-login valid (time)
-       $newl = time() + bigintval(get_session('lifetime'));
-
-       // 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__);
-       if (SQL_NUMROWS($result) == 1) {
-               // Load last module and online time
-               list($mod, $onl) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
-
-               // Maybe first login time?
-               if (empty($mod)) $mod = "login";
-
-               if (set_session("userid", $GLOBALS['userid'], $newl, COOKIE_PATH) && set_session("u_hash", get_session('u_hash'), $newl, COOKIE_PATH) && set_session("lifetime", bigintval(get_session('lifetime')), $newl, COOKIE_PATH)) {
-                       // This will be displayed on welcome page! :-)
-                       if (empty($LAST['module'])) {
-                               $LAST['module'] = $mod; $LAST['online'] = $onl;
-                       } // END - if
-
-                       // "what" not set?
-                       if (empty($GLOBALS['what'])) {
-                               // Fix it to default
-                               $GLOBALS['what'] = "welcome";
-                               if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
-                       } // END - if
-
-                       // Update last module / online time
-                       $result = 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($GLOBALS['what'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__);
-               }
-       }  else {
-               // Destroy session, we cannot update!
-               destroy_user_session();
-       }
-}
-//
 function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
 {
        $ret = false;
@@ -1329,75 +1283,7 @@ function UPDATE_REF_COUNTER ($uid) {
                UPDATE_REFBACK_TABLE($uid);
        } // END - if
 }
-// Updates/extends the online list
-function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht) {
-       global $_CONFIG;
 
-       // Do not update online list when extension is deactivated
-       if (!EXT_IS_ACTIVE("online", true)) return;
-
-       // Empty session?
-       if (empty($SID)) {
-               // This is invalid here!
-               print "Invalid session. Backtrace:<pre>";
-               debug_print_backtrace();
-               die("</pre>");
-       } // END - if
-
-       // Initialize variables
-       $uid = 0; $rid = 0; $MEM = "N"; $ADMIN = "N";
-
-       // Valid userid?
-       if ((!empty($GLOBALS['userid'])) && ($GLOBALS['userid'] > 0) && (IS_MEMBER())) {
-               // Is valid user
-               $uid = bigintval($GLOBALS['userid']);
-               $MEM = "Y";
-       } // END - if
-
-       if (IS_ADMIN()) {
-               // Is administrator
-               $ADMIN = "Y";
-       } // END - if
-
-       if (isSessionVariableSet('refid')) {
-               // Check cookie
-               if (get_session('refid') > 0) $rid = bigintval($GLOBALS['refid']);
-       } // END - if
-
-       // Now search for the user
-       $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_online
-WHERE sid='%s' LIMIT 1",
- array($SID), __FILE__, __LINE__);
-
-       // Entry found?
-       if (SQL_NUMROWS($result) == 1) {
-               // Then update it
-               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_online SET
-module='%s',
-action='%s',
-what='%s',
-userid=%s,
-refid=%s,
-is_member='%s',
-is_admin='%s',
-timestamp=UNIX_TIMESTAMP()
-WHERE sid='%s' LIMIT 1",
-                       array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID), __FILE__, __LINE__
-               );
-       } else {
-               // No entry does exists so we simply add it!
-               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",
-                       array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID, GET_REMOTE_ADDR()), __FILE__, __LINE__
-               );
-       }
-
-       // Free result
-       SQL_FREERESULT($result);
-
-       // Purge old entries
-       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
-        array(getConfig('online_timeout')), __FILE__, __LINE__);
-}
 // OBSOLETE: Sends out mail to all administrators
 function SEND_ADMIN_EMAILS ($subj, $msg) {
        // Load all admin email addresses
@@ -1412,6 +1298,7 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
 
        // Really simple... ;-)
 }
+
 // Get ID number from administrator's login name
 function GET_ADMIN_ID ($login) {
        global $cacheArray, $_CONFIG;