Version 4.3.0
This commit is contained in:
1 parent
96997ddd8e
commit
fe1acf984a
1349 files changed
+116159
-67711
No files matched your search
@@ -36,76 +36,43 @@ class _online extends \IPS\Dispatcher\Controller
|
||||
\IPS\Session\Front::i()->setTheme( \IPS\Member::loggedIn()->skin ?: 0 );
|
||||
session_write_close();
|
||||
|
||||
$notInMyName = array();
|
||||
foreach( \IPS\Member\Group::groups() as $group )
|
||||
{
|
||||
if ( $group->g_hide_online_list )
|
||||
{
|
||||
$notInMyName[] = $group->g_id;
|
||||
}
|
||||
}
|
||||
|
||||
/* Initial filters */
|
||||
$subWhere = array(
|
||||
array( "s.running_time>?", \IPS\DateTime::create()->sub( new \DateInterval( 'PT30M' ) )->getTimeStamp() ),
|
||||
array( "s.login_type!=?", \IPS\Session\Front::LOGIN_TYPE_SPIDER )
|
||||
);
|
||||
if ( !\IPS\Member::loggedIn()->isAdmin() )
|
||||
{
|
||||
$subWhere[] = array( "s.login_type!=?", \IPS\Session\Front::LOGIN_TYPE_ANONYMOUS );
|
||||
}
|
||||
|
||||
if ( count( $notInMyName ) )
|
||||
{
|
||||
$subWhere[] = array( \IPS\Db::i()->in( 's.member_group', $notInMyName, TRUE ) );
|
||||
}
|
||||
|
||||
/* Ok, this looks odd, but the ONLY_FULL_GROUP_BY bites us here, so selecting max(id) allows us to return a session ID even though we're grouping on member_id */
|
||||
$where = array( array( "( core_sessions.id IN(?) OR ( core_sessions.member_id IS NULL AND core_sessions.login_type != ? AND core_sessions.running_time > ?) )", \IPS\Db::i()->select( 'MAX(id)', array( 'core_sessions', 's' ), $subWhere, NULL, NULL, 'member_id' ), \IPS\Session\Front::LOGIN_TYPE_SPIDER, \IPS\DateTime::create()->sub( new \DateInterval( 'PT30M' ) )->getTimeStamp() ) );
|
||||
|
||||
if ( count( $notInMyName ) )
|
||||
{
|
||||
$where[] = array( \IPS\Db::i()->in( 'core_sessions.member_group', $notInMyName, TRUE ) );
|
||||
}
|
||||
|
||||
/* Create the table */
|
||||
$table = new \IPS\Helpers\Table\Db( 'core_sessions', \IPS\Http\Url::internal( 'app=core&module=online&controller=online', 'front', 'online' ), $where );
|
||||
$table = new \IPS\core\Online\Table( \IPS\Http\Url::internal( 'app=core&module=online&controller=online', 'front', 'online' ) );
|
||||
$table->tableTemplate = array( \IPS\Theme::i()->getTemplate( 'online', 'core', 'front' ), 'onlineUsersTable' );
|
||||
$table->rowsTemplate = array( \IPS\Theme::i()->getTemplate( 'online', 'core', 'front' ), 'onlineUsersRow' );
|
||||
$table->langPrefix = 'online_users_';
|
||||
$table->include = array( 'photo', 'member_name', 'location_lang', 'running_time', 'ip_address', 'login_type' );
|
||||
$table->limit = 30;
|
||||
$table->noSort = array( 'photo', 'location_lang' );
|
||||
|
||||
/* Custom parsers */
|
||||
$table->parsers = array(
|
||||
'location_lang' => function( $val, $row )
|
||||
'location_lang' => function( $val, $row )
|
||||
{
|
||||
return \IPS\Session\Front::getLocation( $row );
|
||||
},
|
||||
'photo' => function( $val, $row )
|
||||
{
|
||||
return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userPhoto( \IPS\Member::load( $row['member_id'] ), 'mini' );
|
||||
},
|
||||
'running_time' => function( $val, $row )
|
||||
{
|
||||
return \IPS\DateTime::ts( $val )->relative();
|
||||
},
|
||||
'member_name' => function( $val, $row )
|
||||
{
|
||||
if( $row['member_id'] )
|
||||
{
|
||||
return \IPS\Session\Front::getLocation( $row );
|
||||
},
|
||||
'photo' => function( $val, $row )
|
||||
return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userLink( \IPS\Member::load( $row['member_id'] ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userPhoto( \IPS\Member::load( $row['member_id'] ), 'mini' );
|
||||
},
|
||||
'running_time' => function( $val, $row )
|
||||
{
|
||||
return \IPS\DateTime::ts( $val )->relative();
|
||||
},
|
||||
'member_name' => function( $val, $row )
|
||||
{
|
||||
if( $row['member_id'] )
|
||||
{
|
||||
return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userLink( \IPS\Member::load( $row['member_id'] ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
return \IPS\Member::loggedIn()->language()->addToStack( 'guest' );
|
||||
}
|
||||
},
|
||||
return \IPS\Member::loggedIn()->language()->addToStack( 'guest' );
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
$table->filters = array(
|
||||
'filter_loggedin' => 'core_sessions.member_id <> 0',
|
||||
'filter_loggedin' => 'filter_loggedin',
|
||||
);
|
||||
|
||||
foreach ( \IPS\Member\Group::groups( TRUE, TRUE, TRUE ) as $group )
|
||||
@@ -123,29 +90,18 @@ class _online extends \IPS\Dispatcher\Controller
|
||||
|
||||
if( $group->g_id == \IPS\Settings::i()->guest_group )
|
||||
{
|
||||
$table->filters[ 'group_' . $group->g_id ] = 'core_sessions.member_id IS NULL';
|
||||
$table->filters[ 'group_' . $group->g_id ] = $group->g_id;
|
||||
}
|
||||
else
|
||||
{
|
||||
$table->filters[ 'group_' . $group->g_id ] = 'core_sessions.member_group=' . $group->g_id;
|
||||
$table->filters[ 'group_' . $group->g_id ] = $group->g_id;
|
||||
}
|
||||
}
|
||||
|
||||
$table->sortBy = $table->sortBy ?: 'running_time';
|
||||
$table->sortDirection = $table->sortDirection ?: 'desc';
|
||||
|
||||
/* Get the count */
|
||||
$counter = \IPS\Db::i()->select( 'COUNT(*)', 'core_sessions', $where );
|
||||
|
||||
foreach( $table->joins as $join )
|
||||
{
|
||||
$counter = $counter->join( $join['from'], $join['where'] );
|
||||
}
|
||||
|
||||
$totalCount = $counter->first();
|
||||
|
||||
/* Display */
|
||||
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('online_users');
|
||||
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'online', 'core', 'front' )->onlineUsersList( (string) $table, $totalCount );
|
||||
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'online', 'core', 'front' )->onlineUsersList( (string) $table, $table->count );
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user