Some fixes/improvements:

- Fixed missing array elements for what=active in guest menu
- 'Today Online' below action=online is only shown when ext-active and
  ext-online are activated
- Fixed user's last activity in clicking on paidmails. It is now no longer
  updated if an administrator is logged in

diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index fd513fe0cc7ef2c884489a6a497a1784cf8f020e..1e34115ce70e50179f92cae818c34cefae415696 100644 (file)
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -124,7 +124,7 @@ KEY `admin_member` (`is_admin`,`is_member`)
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Hinzufügen des Menüpunktes "Jetzt Online" wird nun von dieser Erweiterung erledigt. Filter hinzugefügt.");
                                break;
-               }
+               } // END - switch
                break;
 
        case 'modify': // When the extension got modified
@@ -139,7 +139,7 @@ KEY `admin_member` (`is_admin`,`is_member`)
        default: // Unknown extension mode
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;
-}
+} // END - switch
 
 // [EOF]
 ?>

diff --git a/inc/libs/active_functions.php b/inc/libs/active_functions.php
index 124ed344612d5675449b6f12d46fca63e3868c9b..302480e265ec4b21762fb20b881275d48922a613 100644 (file)
--- a/inc/libs/active_functions.php
+++ b/inc/libs/active_functions.php
@@ -44,12 +44,14 @@ if (!defined('__SECURITY')) {
 
 // Filter for adding link to "active list"
 function FILTER_ADD_LINK_ACTIVE_LIST () {
-       // Are the extensions online and active there?
-       if (isExtensionActive('online')) {
-               // Init content
+       // Is ext-active/online there?
+       if ((isExtensionActive('active')) && (isExtensionActive('online'))) {
+               // Init fake-content because there is no `what`='active' in database
                $content = array(
-                       'menu' => '<a class="menu_blur" href="{%url=modules.php?module=index&amp;what=active%}">{%config=menu_blur_spacer%}{--GUEST_ACTIVE_LINK--}</a>',
-                       'what' => 'active'
+                       'menu'    => '<a class="menu_blur" href="{%url=modules.php?module=index&amp;what=active%}">{%config=menu_blur_spacer%}{--GUEST_ACTIVE_LINK--}</a>',
+                       'what'    => 'active',
+                       'visible' => 'Y',
+                       'locked'  => 'N'
                );
 
                // Add link to "we were active today" page

diff --git a/mailid.php b/mailid.php
index eff588330e67242a4e93435612586fb22e485e5e..b7447325826d6cec8971dd3ab737fb681676cd61 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -129,7 +129,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                // Status must be CONFIRMED
                                if (getUserData('status') == 'CONFIRMED') {
                                        // Update last activity if not admin
-                                       updateLastActivity($url_userid);
+                                       if (!isAdmin()) {
+                                               // Is not admin, so update last activity
+                                               updateLastActivity($url_userid);
+                                       } // END - if
 
                                        // User has confirmed his account so we can procede...
                                        // @TODO Rewrite this to a filter