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 activeUsers 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 19 Nov 2013
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -50,11 +50,31 @@ class _activeUsers extends \IPS\Widget
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
$members = array();
|
||||
$memberCount = 0;
|
||||
|
||||
/* Build WHERE clause */
|
||||
$parts = parse_url( (string) \IPS\Request::i()->url() );
|
||||
$url = $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
|
||||
|
||||
|
||||
if ( \IPS\Settings::i()->htaccess_mod_rewrite )
|
||||
{
|
||||
$url = $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$url = $parts['scheme'] . "://" . $parts['host'] . $parts['path'] . ( isset( $parts['query'] ) ? '?' . $parts['query'] : '' );
|
||||
}
|
||||
|
||||
$notInMyName = array();
|
||||
foreach( \IPS\Member\Group::groups() as $group )
|
||||
{
|
||||
if ( $group->g_hide_online_list )
|
||||
{
|
||||
$notInMyName[] = $group->g_id;
|
||||
}
|
||||
}
|
||||
|
||||
$where = array(
|
||||
array( 'core_sessions.login_type=' . \IPS\Session\Front::LOGIN_TYPE_MEMBER ),
|
||||
array( 'core_sessions.current_appcomponent=?', \IPS\Dispatcher::i()->application->directory ),
|
||||
@@ -62,8 +82,7 @@ class _activeUsers extends \IPS\Widget
|
||||
array( 'core_sessions.current_controller=?', \IPS\Dispatcher::i()->controller ),
|
||||
array( 'core_sessions.running_time>' . \IPS\DateTime::create()->sub( new \DateInterval( 'PT30M' ) )->getTimeStamp() ),
|
||||
array( 'core_sessions.location_url IS NOT NULL AND location_url LIKE ?', "{$url}%" ),
|
||||
array( 'core_sessions.member_id IS NOT NULL' ),
|
||||
array( 'core_groups.g_hide_online_list=0' )
|
||||
array( 'core_sessions.member_id IS NOT NULL' )
|
||||
);
|
||||
|
||||
if( \IPS\Request::i()->id )
|
||||
@@ -71,19 +90,26 @@ class _activeUsers extends \IPS\Widget
|
||||
$where[] = array( 'core_sessions.current_id = ?', \IPS\Request::i()->id );
|
||||
}
|
||||
|
||||
/* Get members */
|
||||
if ( $this->orientation === 'vertical' )
|
||||
if ( count( $notInMyName ) )
|
||||
{
|
||||
$members = \IPS\Db::i()->select( 'core_sessions.member_id,core_sessions.member_name,core_sessions.seo_name,core_sessions.member_group', 'core_sessions', $where, 'core_sessions.running_time DESC', 60, NULL, NULL, \IPS\Db::SELECT_SQL_CALC_FOUND_ROWS )->join( 'core_members', 'core_members.member_id=core_sessions.member_id' )->join( 'core_groups', 'core_members.member_group_id=core_groups.g_id' )->setKeyField( 'member_id' );
|
||||
$memberCount = $members->count( TRUE );
|
||||
$where[] = array( \IPS\Db::i()->in( 'core_sessions.member_group', $notInMyName, TRUE ) );
|
||||
}
|
||||
else
|
||||
|
||||
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 )
|
||||
{
|
||||
$members = \IPS\Db::i()->select( 'core_sessions.member_id,core_sessions.member_name,core_sessions.seo_name,core_sessions.member_group', 'core_sessions', $where, 'core_sessions.running_time DESC' )->join( 'core_members', 'core_members.member_id=core_sessions.member_id' )->join( 'core_groups', 'core_members.member_group_id=core_groups.g_id' )->setKeyField( 'member_id' );
|
||||
$memberCount = $members->count();
|
||||
if( $row['login_type'] == \IPS\Session\Front::LOGIN_TYPE_MEMBER and $row['member_id'] != \IPS\Member::loggedIn()->member_id and $row['member_name'] )
|
||||
{
|
||||
$members[ $row['member_id'] ] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
$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 */
|
||||
if ( $this->orientation === 'vertical' and count( $members ) >= 60 )
|
||||
{
|
||||
$members = array_slice( $members, 0, 60 );
|
||||
}
|
||||
|
||||
$members = iterator_to_array( $members );
|
||||
|
||||
if( \IPS\Member::loggedIn()->member_id )
|
||||
{
|
||||
@@ -93,13 +119,14 @@ class _activeUsers extends \IPS\Widget
|
||||
{
|
||||
$memberCount++;
|
||||
}
|
||||
|
||||
$members[ \IPS\Member::loggedIn()->member_id ] = array(
|
||||
|
||||
$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 );
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user