sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 5.0.6

Browse Source
This commit is contained in:
Neo committed 2025-12-19 18:55:49 -08:00
1 parent a3a4a9ccbd
commit b89858b2ff
1214 files changed
+92828 -14859
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/widgets/activeUsers.php
+19 -10
View File
@@ -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 */
applications/core/widgets/stream.php
+1 -1
View File
@@ -64,7 +64,7 @@ class stream extends PermissionCache
/* Necessary CSS/JS */
Output::i()->jsFiles = array_merge( Output::i()->jsFiles, Output::i()->js('front_streams.js', 'core' ) );
Output::i()->cssFiles = array_merge( Output::i()->cssFiles, Theme::i()->css( 'styles/streams.css' ) );
Output::i()->cssFiles = array_merge( Output::i()->cssFiles, Theme::i()->css( 'styles/streams.css', 'core' ) );
$apps = array();
if( isset( $this->configuration['content'] ) and strstr( $this->configuration['content'], ',' ) )
applications/core/widgets/whosOnline.php
+13 -9
View File
@@ -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;
}