Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* @brief whosOnline Widget
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @package IPS Community Suite
|
||||
* @since 28 Jul 2014
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -50,51 +50,83 @@ class _whosOnline extends \IPS\Widget
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
$where = array(
|
||||
array( 'core_sessions.running_time>' . \IPS\DateTime::create()->sub( new \DateInterval( 'PT30M' ) )->getTimeStamp() ),
|
||||
array( 'core_groups.g_hide_online_list=0' )
|
||||
);
|
||||
|
||||
|
||||
/* Init */
|
||||
$members = array();
|
||||
$memberCount = 0;
|
||||
$guests = 0;
|
||||
$anonymous = 0;
|
||||
|
||||
foreach( \IPS\Db::i()->select( 'core_sessions.member_id,core_sessions.member_name,core_sessions.seo_name,core_sessions.member_group,core_sessions.login_type', 'core_sessions', $where, 'core_sessions.running_time DESC', $this->orientation === 'horizontal' ? NULL : 60 )->join( 'core_groups', 'core_sessions.member_group=core_groups.g_id' ) as $row )
|
||||
$notInMyName = array();
|
||||
foreach( \IPS\Member\Group::groups() as $group )
|
||||
{
|
||||
if ( $group->g_hide_online_list )
|
||||
{
|
||||
$notInMyName[] = $group->g_id;
|
||||
}
|
||||
}
|
||||
|
||||
/* Query */
|
||||
$where = array(
|
||||
array( 'core_sessions.running_time>?', \IPS\DateTime::create()->sub( new \DateInterval( 'PT30M' ) )->getTimeStamp() ),
|
||||
array( "core_sessions.login_type!=?", \IPS\Session\Front::LOGIN_TYPE_SPIDER )
|
||||
);
|
||||
|
||||
if ( count( $notInMyName ) )
|
||||
{
|
||||
$where[] = array( \IPS\Db::i()->in( 'core_sessions.member_group', $notInMyName, TRUE ) );
|
||||
}
|
||||
|
||||
foreach( \IPS\Db::i()->select( 'core_sessions.member_id,core_sessions.member_name,core_sessions.seo_name,core_sessions.member_group,core_sessions.login_type', 'core_sessions', $where, 'core_sessions.running_time DESC' ) as $row )
|
||||
{
|
||||
switch ( $row['login_type'] )
|
||||
{
|
||||
/* Not-anonymous Member */
|
||||
case \IPS\Session\Front::LOGIN_TYPE_MEMBER:
|
||||
$members[ $row['member_id'] ] = $row;
|
||||
if ( $row['member_id'] != \IPS\Member::loggedIn()->member_id ) // We add them manually to make sure they go at the top of the list
|
||||
{
|
||||
if ( $row['member_name'] )
|
||||
{
|
||||
$members[ $row['member_id'] ] = $row;
|
||||
}
|
||||
else
|
||||
{
|
||||
$guests += 1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
/* Anonymous member */
|
||||
case \IPS\Session\Front::LOGIN_TYPE_ANONYMOUS:
|
||||
$anonymous += 1;
|
||||
break;
|
||||
|
||||
/* Guest */
|
||||
case \IPS\Session\Front::LOGIN_TYPE_GUEST:
|
||||
case \IPS\Session\Front::LOGIN_TYPE_INCOMPLETE:
|
||||
$guests += 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$memberCount = count( $members );
|
||||
|
||||
if( \IPS\Member::loggedIn()->member_id )
|
||||
/* 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 */
|
||||
if ( $this->orientation === 'vertical' and count( $members ) >= 60 )
|
||||
{
|
||||
if( !\IPS\Member::loggedIn()->group['g_hide_online_list'] )
|
||||
{
|
||||
if( !isset( $members[ \IPS\Member::loggedIn()->member_id ] ) )
|
||||
{
|
||||
$memberCount++;
|
||||
}
|
||||
|
||||
$members[ \IPS\Member::loggedIn()->member_id ] = array(
|
||||
'member_id' => \IPS\Member::loggedIn()->member_id,
|
||||
'member_name' => \IPS\Member::loggedIn()->name,
|
||||
'seo_name' => \IPS\Member::loggedIn()->members_seo_name,
|
||||
'member_group' => \IPS\Member::loggedIn()->member_group_id
|
||||
);
|
||||
}
|
||||
$members = array_slice( $members, 0, 60 );
|
||||
}
|
||||
|
||||
/* Add ourselves at the top of the list */
|
||||
if( \IPS\Member::loggedIn()->member_id and !\IPS\Member::loggedIn()->group['g_hide_online_list'] )
|
||||
{
|
||||
$memberCount++;
|
||||
|
||||
$members = array_merge( array( \IPS\Member::loggedIn()->member_id => array(
|
||||
'member_id' => \IPS\Member::loggedIn()->member_id,
|
||||
'member_name' => \IPS\Member::loggedIn()->name,
|
||||
'seo_name' => \IPS\Member::loggedIn()->members_seo_name,
|
||||
'member_group' => \IPS\Member::loggedIn()->member_group_id
|
||||
) ), $members );
|
||||
}
|
||||
|
||||
/* Display */
|
||||
|
||||
Reference in new issue
Block a user