Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -82,22 +82,18 @@ class _activeUsers extends \IPS\Widget
|
||||
|
||||
if( \IPS\Member::loggedIn()->member_id )
|
||||
{
|
||||
if( !\IPS\Member::loggedIn()->group['g_hide_online_list'] )
|
||||
if( !isset( $members[ \IPS\Member::loggedIn()->member_id ] ) )
|
||||
{
|
||||
if( !isset( $members[ \IPS\Member::loggedIn()->member_id ] ) )
|
||||
{
|
||||
$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,
|
||||
'in_editor' => 0
|
||||
) ), $members );
|
||||
|
||||
$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,
|
||||
'in_editor' => 0
|
||||
) ), $members );
|
||||
}
|
||||
|
||||
/* Display */
|
||||
|
||||
@@ -120,7 +120,7 @@ class _members extends \IPS\Widget\StaticCache
|
||||
*/
|
||||
public function render()
|
||||
{
|
||||
$where = array();
|
||||
$where = array( array( '(name<>? and email<>?)', '', '' ) );
|
||||
$joins = array();
|
||||
|
||||
if ( ! empty( $this->configuration['widget_member_groups'] ) AND $this->configuration['widget_member_groups'] !== '*' )
|
||||
|
||||
@@ -102,19 +102,7 @@ class _stats extends \IPS\Widget\StaticCache
|
||||
$stats['most_online'] = $mostOnline;
|
||||
|
||||
/* Last Registered Member */
|
||||
$exclude = array();
|
||||
$where = array( array( "name IS NOT NULL AND name != '' AND temp_ban != -1 AND email != ''" ) );
|
||||
foreach( \IPS\Member\Group::groups() as $id => $group )
|
||||
{
|
||||
if ( $group->g_hide_online_list )
|
||||
{
|
||||
$exclude[] = $group->g_id;
|
||||
}
|
||||
}
|
||||
if ( count( $exclude ) )
|
||||
{
|
||||
$where[] = array( '( ! ( ' . \IPS\Db::i()->in( 'member_group_id', $exclude ) . ' ) )' );
|
||||
}
|
||||
$where[] = array( '( ! ' . \IPS\Db::i()->bitwiseWhere( \IPS\Member::$bitOptions['members_bitoptions'], 'bw_is_spammer' ) . ' )' );
|
||||
$where[] = array( 'member_id NOT IN(?)', \IPS\Db::i()->select( 'member_id', 'core_validating', array( 'new_reg=1' ) ) );
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ class _whosOnline extends \IPS\Widget
|
||||
$guests = 0;
|
||||
$anonymous = 0;
|
||||
|
||||
$users = \IPS\Session\Store::i()->getOnlineUsers();
|
||||
$users = \IPS\Session\Store::i()->getOnlineUsers( 0, 'desc', NULL, NULL, TRUE );
|
||||
foreach( $users as $row )
|
||||
{
|
||||
switch ( $row['login_type'] )
|
||||
@@ -97,7 +97,7 @@ class _whosOnline extends \IPS\Widget
|
||||
}
|
||||
|
||||
/* Add ourselves at the top of the list */
|
||||
if( \IPS\Member::loggedIn()->member_id and !\IPS\Member::loggedIn()->group['g_hide_online_list'] )
|
||||
if( \IPS\Member::loggedIn()->member_id )
|
||||
{
|
||||
$memberCount++;
|
||||
|
||||
|
||||
Reference in new issue
Block a user