Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -83,19 +83,11 @@ class activeUsers extends StaticCache
|
||||
|
||||
if ( Settings::i()->htaccess_mod_rewrite )
|
||||
{
|
||||
$this->url = $parts['scheme'] . "://" . $parts['host'] . ( isset( $parts['port'] ) ? ':' . $parts['port'] : '' ) . $parts['path'];
|
||||
$this->url = $parts['scheme'] . "://" . $parts['host'] . ( isset( $parts['port'] ) ? ':' . $parts['port'] : '' ) . ( $parts['path'] ?? '' );
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->url = $parts['scheme'] . "://" . $parts['host'] . ( isset( $parts['port'] ) ? ':' . $parts['port'] : '' ) . $parts['path'] . ( isset( $parts['query'] ) ? '?' . $parts['query'] : '' );
|
||||
}
|
||||
|
||||
if( $member->member_id AND !$member->isOnlineAnonymously() )
|
||||
{
|
||||
Output::i()->jsVars['member_id'] = $member->member_id;
|
||||
Output::i()->jsVars['member_url'] = (string) $member->url();
|
||||
Output::i()->jsVars['member_hovercardUrl'] = (string) $member->url()->setQueryString( 'do', 'hovercard' );
|
||||
Output::i()->jsVars['member_formattedName'] = str_replace( '"', '\\"', Group::load( $member->member_group_id )->formatName( $member->name ) );
|
||||
$this->url = $parts['scheme'] . "://" . $parts['host'] . ( isset( $parts['port'] ) ? ':' . $parts['port'] : '' ) . ( $parts['path'] ?? '' ) . ( isset( $parts['query'] ) ? '?' . $parts['query'] : '' );
|
||||
}
|
||||
|
||||
$theme = $member->skin ?: Theme::defaultTheme();
|
||||
@@ -118,6 +110,23 @@ class activeUsers extends StaticCache
|
||||
|
||||
$members = Store::i()->getOnlineMembersByLocation( Dispatcher::i()->application->directory, Dispatcher::i()->module->key, Dispatcher::i()->controller, Request::i()->id, $this->url );
|
||||
|
||||
/* If the current member is not in the list, add us to the beginning */
|
||||
if( Member::loggedIn()->member_id and !array_key_exists( Member::loggedIn()->member_id, $members ) and !Member::loggedIn()->isOnlineAnonymously() )
|
||||
{
|
||||
$results = $members;
|
||||
$loggedIn = [
|
||||
Member::loggedIn()->member_id => [
|
||||
'member_id' => Member::loggedIn()->member_id,
|
||||
'seo_name' => Member::loggedIn()->members_seo_name,
|
||||
'member_name' => Member::loggedIn()->name,
|
||||
'in_editor' => false,
|
||||
'member_group' => Member::loggedIn()->member_group_id
|
||||
]
|
||||
];
|
||||
|
||||
$members = $loggedIn + $results;
|
||||
}
|
||||
|
||||
$memberCount = count( $members );
|
||||
|
||||
/* If it's on the sidebar (rather than at the bottom), we want to limit it to 60 so we don't take too much space */
|
||||
|
||||
Reference in new issue
Block a user