Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -63,14 +63,6 @@ class whosOnline extends PermissionCache
|
||||
|
||||
$member = Member::loggedIn() ?: new Member;
|
||||
|
||||
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 ) );
|
||||
}
|
||||
|
||||
/* We want to use the user's permissions array which will validate social groups, clubs and groups. But, we need to remove the individual member entry */
|
||||
$member = Member::loggedIn() ?: new Member;
|
||||
$permissions = $member->permissionArray();
|
||||
@@ -106,6 +98,18 @@ class whosOnline extends PermissionCache
|
||||
|
||||
/* Init */
|
||||
$members = array();
|
||||
|
||||
/* Put us first! */
|
||||
if( Member::loggedIn()->member_id and !Member::loggedIn()->isOnlineAnonymously() )
|
||||
{
|
||||
$members[] = [
|
||||
'member_id' => Member::loggedIn()->member_id,
|
||||
'seo_name' => Member::loggedIn()->members_seo_name,
|
||||
'member_name' => Member::loggedIn()->name,
|
||||
'member_group' => Member::loggedIn()->member_group_id
|
||||
];
|
||||
}
|
||||
|
||||
$anonymous = 0;
|
||||
|
||||
$users = Store::i()->getOnlineUsers( Store::ONLINE_MEMBERS, 'desc', NULL, NULL, TRUE );
|
||||
@@ -115,7 +119,7 @@ class whosOnline extends PermissionCache
|
||||
{
|
||||
/* Not-anonymous Member */
|
||||
case Front::LOGIN_TYPE_MEMBER:
|
||||
if ( $row['member_name'] )
|
||||
if ( $row['member_name'] and $row['member_id'] != Member::loggedIn()->member_id )
|
||||
{
|
||||
$members[ $row['member_id'] ] = $row;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user