Version 3.2.3
This commit is contained in:
1 parent
ae5c01cc78
commit
78706903a2
2641 files changed
+228363
-201264
No files matched your search
@@ -2,19 +2,19 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.1.4
|
||||
* IP.Board v3.2.3
|
||||
* Online list
|
||||
* Last Updated: $Date: 2010-10-21 09:25:51 -0400 (Thu, 21 Oct 2010) $
|
||||
* Last Updated: $Date: 2011-08-05 20:51:01 -0400 (Fri, 05 Aug 2011) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: ips_terabyte $
|
||||
* @author $Author: bfarber $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/community/board/license.html
|
||||
* @license This is NULLED!
|
||||
* @package IP.Board
|
||||
* @subpackage Members
|
||||
* @link http://www.invisionpower.com
|
||||
* @link http://hatynka.in
|
||||
* @since 12th March 2002
|
||||
* @version $Revision: 7009 $
|
||||
* @version $Revision: 9373 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -50,7 +50,7 @@ class public_members_online_online extends ipsCommand
|
||||
* Class entry point
|
||||
*
|
||||
* @param object Registry reference
|
||||
* @return void [Outputs to screen/redirects]
|
||||
* @return @e void [Outputs to screen/redirects]
|
||||
*/
|
||||
public function doExecute( ipsRegistry $registry )
|
||||
{
|
||||
@@ -87,8 +87,8 @@ class public_members_online_online extends ipsCommand
|
||||
//-----------------------------------------
|
||||
|
||||
$this->registry->output->addContent( $this->output );
|
||||
$this->registry->output->setTitle( $this->lang->words['page_title'] . ' - ' . ipsRegistry::$settings['board_name']);
|
||||
$this->registry->output->addNavigation( $this->lang->words['page_title'], '' );
|
||||
$this->registry->output->setTitle( $this->lang->words['online_page_title'] . ' - ' . ipsRegistry::$settings['board_name']);
|
||||
$this->registry->output->addNavigation( $this->lang->words['online_page_title'], '' );
|
||||
$this->registry->output->sendOutput();
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ class public_members_online_online extends ipsCommand
|
||||
/**
|
||||
* Show the online list
|
||||
*
|
||||
* @return void [Stores HTML in $this->output]
|
||||
* @return @e void [Stores HTML in $this->output]
|
||||
*/
|
||||
protected function _listAll()
|
||||
{
|
||||
@@ -106,6 +106,7 @@ class public_members_online_online extends ipsCommand
|
||||
|
||||
$this->first = intval($this->request['st']) > 0 ? intval($this->request['st']) : 0;
|
||||
$final = array();
|
||||
$_errors = array();
|
||||
$modules = array();
|
||||
$memberIDs = array();
|
||||
|
||||
@@ -142,19 +143,16 @@ class public_members_online_online extends ipsCommand
|
||||
break;
|
||||
}
|
||||
|
||||
if ( $this->settings['spider_anon'] OR ! $this->settings['spider_active'] )
|
||||
if ( ! $this->settings['spider_active'] AND ! $this->memberData['g_access_cp'] )
|
||||
{
|
||||
if ( ! $this->settings['spider_active'] OR ! $this->memberData['g_access_cp'] )
|
||||
{
|
||||
$wheres[] = $this->DB->buildRight( 'id', 8 ) . " != '_session'";
|
||||
}
|
||||
$wheres[] = $this->DB->buildRight( 'id', 8 ) . " != '_session'";
|
||||
}
|
||||
|
||||
if ( ! $this->settings['disable_anonymous'] AND ! $this->memberData['g_access_cp'] OR $this->settings['disable_admin_anon'] )
|
||||
if ( ! $this->settings['disable_anonymous'] AND !$this->memberData['g_access_cp'] )
|
||||
{
|
||||
$wheres[] = "login_type != 1";
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------
|
||||
// Grab all the current sessions.
|
||||
//-----------------------------------------
|
||||
@@ -186,7 +184,7 @@ class public_members_online_online extends ipsCommand
|
||||
{
|
||||
$r['is_bot'] = 1;
|
||||
}
|
||||
|
||||
|
||||
$r['where_line'] = '';
|
||||
$r['where_link'] = '';
|
||||
|
||||
@@ -211,20 +209,30 @@ class public_members_online_online extends ipsCommand
|
||||
$memberIDs[] = $r['member_id'];
|
||||
}
|
||||
|
||||
$final[ $r['id'] ] = $r;
|
||||
//-----------------------------------------
|
||||
// Don't parse if in an error
|
||||
//-----------------------------------------
|
||||
|
||||
if( $r['in_error'] )
|
||||
{
|
||||
$_errors[ $r['id'] ] = $r;
|
||||
}
|
||||
else
|
||||
{
|
||||
$final[ $r['id'] ] = $r;
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Module?
|
||||
//-----------------------------------------
|
||||
|
||||
$modules[ $r['current_section'] ] = array( 'app' => $r['current_appcomponent'] );
|
||||
|
||||
}
|
||||
|
||||
$links = $this->registry->output->generatePagination( array( 'totalItems' => $max,
|
||||
$links = $this->registry->output->generatePagination( array( 'totalItems' => $max,
|
||||
'itemsPerPage' => $this->perpage,
|
||||
'currentStartValue' => $this->first,
|
||||
'baseUrl' => "app=members&section=online&module=online&sort_key={$defaults['sort_key']}&sort_order={$defaults['sort_order']}&show_mem={$defaults['show_mem']}"
|
||||
'baseUrl' => "app=members&section=online&module=online&sort_key={$defaults['sort_key']}&sort_order={$defaults['sort_order']}&show_mem={$defaults['show_mem']}"
|
||||
) );
|
||||
|
||||
//-----------------------------------------
|
||||
@@ -241,7 +249,7 @@ class public_members_online_online extends ipsCommand
|
||||
|
||||
$filename = IPSLib::getAppDir( $module_array['app'] ) . '/extensions/coreExtensions.php';
|
||||
|
||||
if ( file_exists( $filename ) )
|
||||
if ( is_file( $filename ) )
|
||||
{
|
||||
$classToLoad = IPSLib::loadLibrary( $filename, 'publicSessions__' . $module_array['app'], $module_array['app'] );
|
||||
$loader = new $classToLoad();
|
||||
@@ -254,7 +262,9 @@ class public_members_online_online extends ipsCommand
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$final = array_merge( $final, $_errors );
|
||||
|
||||
//-----------------------------------------
|
||||
// Finally, members...
|
||||
//-----------------------------------------
|
||||
@@ -285,9 +295,22 @@ class public_members_online_online extends ipsCommand
|
||||
}
|
||||
}
|
||||
|
||||
/* Data Hook Location */
|
||||
IPSLib::doDataHooks( $newFinal, 'onlineUsersListData' );
|
||||
|
||||
//-----------------------------------------
|
||||
// Set defaults
|
||||
//-----------------------------------------
|
||||
|
||||
foreach ( array( 'sort_key', 'sort_order', 'show_mem' ) as $k )
|
||||
{
|
||||
if ( !$this->request[ $k ] )
|
||||
{
|
||||
$this->request[ $k ] = $defaults[ $k ];
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------
|
||||
// Output
|
||||
//-----------------------------------------
|
||||
|
||||
$this->output .= $this->registry->getClass('output')->getTemplate('online')->showOnlineList( $newFinal, $links, $defaults );
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user