Version 5.0.0 beta 1
This commit is contained in:
Neo committed
1 parent
25ddeb65d6
commit
15c7beabc5
6736 files changed
+627902
-497943
No files matched your search
@@ -11,31 +11,53 @@
|
||||
namespace IPS\core\modules\admin\members;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
|
||||
use BadFunctionCallException;
|
||||
use DateInterval;
|
||||
use Exception;
|
||||
use IPS\Api\OAuthClient;
|
||||
use IPS\DateTime;
|
||||
use IPS\Db;
|
||||
use IPS\Dispatcher;
|
||||
use IPS\Dispatcher\Controller;
|
||||
use IPS\GeoLocation;
|
||||
use IPS\Http\Url;
|
||||
use IPS\Http\UserAgent;
|
||||
use IPS\Member;
|
||||
use IPS\Member\Device;
|
||||
use IPS\Output;
|
||||
use IPS\Request;
|
||||
use IPS\Session;
|
||||
use IPS\Session\Store;
|
||||
use IPS\Theme;
|
||||
use OutOfRangeException;
|
||||
use function defined;
|
||||
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Device Tools
|
||||
*/
|
||||
class _devices extends \IPS\Dispatcher\Controller
|
||||
class devices extends Controller
|
||||
{
|
||||
/**
|
||||
* @brief Has been CSRF-protected
|
||||
*/
|
||||
public static $csrfProtected = TRUE;
|
||||
public static bool $csrfProtected = TRUE;
|
||||
|
||||
/**
|
||||
* Execute
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function execute()
|
||||
public function execute() : void
|
||||
{
|
||||
\IPS\Dispatcher::i()->checkAcpPermission( 'membertools_ip' );
|
||||
return parent::execute();
|
||||
Dispatcher::i()->checkAcpPermission( 'membertools_ip' );
|
||||
parent::execute();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -43,42 +65,42 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function device()
|
||||
protected function device() : void
|
||||
{
|
||||
/* Load */
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->member );
|
||||
$member = Member::load( Request::i()->member );
|
||||
try
|
||||
{
|
||||
$device = \IPS\Member\Device::loadAndAuthenticate( \IPS\Request::i()->key, $member );
|
||||
$device = Device::loadAndAuthenticate( Request::i()->key, $member );
|
||||
}
|
||||
catch ( \OutOfRangeException $e )
|
||||
catch ( OutOfRangeException $e )
|
||||
{
|
||||
\IPS\Output::i()->error( 'node_error', '2C355/1', 404, '' );
|
||||
Output::i()->error( 'node_error', '2C355/1', 404, '' );
|
||||
}
|
||||
$url = \IPS\Http\Url::internal( "app=core&module=members&controller=devices&do=device&key={$device->device_key}&member={$member->member_id}" );
|
||||
$url = Url::internal( "app=core&module=members&controller=devices&do=device&key={$device->device_key}&member={$member->member_id}" );
|
||||
|
||||
/* Set title and breadcrumb */
|
||||
$userAgent = $device->userAgent();
|
||||
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack( 'member_names_device', FALSE, array( 'sprintf' => array( $member->name, $userAgent->platform ) ) );
|
||||
\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( "app=core&module=members&controller=members" ), 'members' );
|
||||
\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( "app=core&module=members&controller=members&do=view&id={$member->member_id}" ), $member->name );
|
||||
\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( "app=core&module=members&controller=devices&do=member&id={$member->member_id}" ), 'members_devices' );
|
||||
\IPS\Output::i()->breadcrumb[] = array( NULL, $userAgent );
|
||||
Output::i()->title = Member::loggedIn()->language()->addToStack( 'member_names_device', FALSE, array( 'sprintf' => array( $member->name, $userAgent->platform ) ) );
|
||||
Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=members&controller=members" ), 'members' );
|
||||
Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=members&controller=members&do=view&id={$member->member_id}" ), $member->name );
|
||||
Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=members&controller=devices&do=member&id={$member->member_id}" ), 'members_devices' );
|
||||
Output::i()->breadcrumb[] = array( NULL, $userAgent );
|
||||
|
||||
/* Define table */
|
||||
$activeTabContents = '';
|
||||
$tabs = array(
|
||||
'info' => 'device_info',
|
||||
'member' => \IPS\Member::loggedIn()->language()->addToStack( 'device_ips_from_member', FALSE, array( 'sprintf' => array( $member->name ) ) ),
|
||||
'member' => Member::loggedIn()->language()->addToStack( 'device_ips_from_member', FALSE, array( 'sprintf' => array( $member->name ) ) ),
|
||||
'others' => 'device_other_members'
|
||||
);
|
||||
$activeTab = ( isset( \IPS\Request::i()->tab ) and array_key_exists( \IPS\Request::i()->tab, $tabs ) ) ? \IPS\Request::i()->tab : 'info';
|
||||
$activeTab = ( isset( Request::i()->tab ) and array_key_exists( Request::i()->tab, $tabs ) ) ? Request::i()->tab : 'info';
|
||||
|
||||
if ( $activeTab === 'info' )
|
||||
{
|
||||
$oauthClients = \IPS\Api\OAuthClient::roots();
|
||||
$oauthClients = OAuthClient::roots();
|
||||
$apps = array();
|
||||
foreach ( \IPS\Db::i()->select( '*', 'core_oauth_server_access_tokens', array( 'member_id=? AND device_key=?', $member->member_id, $device->device_key ), 'issued DESC' ) as $accessToken )
|
||||
foreach ( Db::i()->select( '*', 'core_oauth_server_access_tokens', array( 'member_id=? AND device_key=?', $member->member_id, $device->device_key ), 'issued DESC' ) as $accessToken )
|
||||
{
|
||||
if ( isset( $oauthClients[ $accessToken['client_id'] ] ) )
|
||||
{
|
||||
@@ -86,7 +108,7 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
}
|
||||
|
||||
$activeTabContents = \IPS\Theme::i()->getTemplate( 'members' )->deviceInfo( $device, $apps, $oauthClients );
|
||||
$activeTabContents = Theme::i()->getTemplate( 'members' )->deviceInfo( $device, $apps, $oauthClients );
|
||||
}
|
||||
elseif ( $activeTab === 'member' )
|
||||
{
|
||||
@@ -98,19 +120,19 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
'location' => function( $val, $row ) {
|
||||
try
|
||||
{
|
||||
return \IPS\GeoLocation::getByIp( $row['ip_address'] );
|
||||
return GeoLocation::getByIp( $row['ip_address'] );
|
||||
}
|
||||
catch ( \BadFunctionCallException $e )
|
||||
catch ( BadFunctionCallException $e )
|
||||
{
|
||||
return \IPS\Member::loggedIn()->language()->addToStack('geolocation_enable_service');
|
||||
return Member::loggedIn()->language()->addToStack('geolocation_enable_service');
|
||||
}
|
||||
catch ( \Exception $e )
|
||||
catch ( Exception $e )
|
||||
{
|
||||
return \IPS\Member::loggedIn()->language()->addToStack('unknown');
|
||||
return Member::loggedIn()->language()->addToStack('unknown');
|
||||
}
|
||||
},
|
||||
'last_seen' => function( $val ) {
|
||||
return \IPS\DateTime::ts( $val );
|
||||
return DateTime::ts( $val );
|
||||
}
|
||||
);
|
||||
$table->rowButtons = function( $row ) {
|
||||
@@ -118,12 +140,12 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
'view' => array(
|
||||
'title' => 'view',
|
||||
'icon' => 'search',
|
||||
'link' => \IPS\Http\Url::internal( 'app=core&module=members&controller=ip' )->setQueryString( 'ip', $row['ip_address'] ),
|
||||
'link' => Url::internal( 'app=core&module=members&controller=ip' )->setQueryString( 'ip', $row['ip_address'] ),
|
||||
),
|
||||
);
|
||||
};
|
||||
|
||||
$activeTabContents = \IPS\Theme::i()->getTemplate( 'forms' )->blurb( \IPS\Member::loggedIn()->language()->addToStack( 'device_ips_from_member_info', FALSE, array( 'sprintf' => array( $member->name, \IPS\Http\Url::internal( "app=core&module=members&controller=members&do=ip&id={$member->member_id}" ) ) ) ), TRUE, TRUE ) . $table . \IPS\Theme::i()->getTemplate( 'members' )->geoipDisclaimer();
|
||||
$activeTabContents = Theme::i()->getTemplate( 'forms' )->blurb( Member::loggedIn()->language()->addToStack( 'device_ips_from_member_info', FALSE, array( 'sprintf' => array( $member->name, Url::internal( "app=core&module=members&controller=members&do=ip&id={$member->member_id}" ) ) ) ), TRUE, TRUE ) . $table . Theme::i()->getTemplate( 'members' )->geoipDisclaimer();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -133,18 +155,18 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
$table->sortBy = $table->sortBy ?: 'last_seen';
|
||||
$table->parsers = array(
|
||||
'member_id' => function( $val ) {
|
||||
$member = \IPS\Member::load( $val );
|
||||
$member = Member::load( $val );
|
||||
if ( $member->member_id )
|
||||
{
|
||||
return \IPS\Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . \IPS\Theme::i()->getTemplate( 'global', 'core' )->userLink( $member, 'tiny' );
|
||||
return Theme::i()->getTemplate( 'global', 'core' )->userPhoto( $member, 'tiny' ) . Theme::i()->getTemplate( 'global', 'core' )->userLink( $member, 'tiny' );
|
||||
}
|
||||
else
|
||||
{
|
||||
return \IPS\Member::loggedIn()->language()->addToStack('deleted_member');
|
||||
return Member::loggedIn()->language()->addToStack('deleted_member');
|
||||
}
|
||||
},
|
||||
'last_seen' => function( $val ) {
|
||||
return \IPS\DateTime::ts( $val );
|
||||
return DateTime::ts( $val );
|
||||
}
|
||||
);
|
||||
$table->rowButtons = function( $row ) {
|
||||
@@ -152,30 +174,30 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
'view' => array(
|
||||
'title' => 'view',
|
||||
'icon' => 'search',
|
||||
'link' => \IPS\Http\Url::internal( 'app=core&module=members&controller=members&do=view' )->setQueryString( 'id', $row['member_id'] ),
|
||||
'link' => Url::internal( 'app=core&module=members&controller=members&do=view' )->setQueryString( 'id', $row['member_id'] ),
|
||||
),
|
||||
);
|
||||
};
|
||||
|
||||
$activeTabContents = \IPS\Theme::i()->getTemplate( 'forms' )->blurb( 'device_other_members_info', TRUE, TRUE ) . $table;
|
||||
$activeTabContents = Theme::i()->getTemplate( 'forms' )->blurb( 'device_other_members_info', TRUE, TRUE ) . $table;
|
||||
}
|
||||
|
||||
if( \IPS\Request::i()->isAjax() )
|
||||
if( Request::i()->isAjax() )
|
||||
{
|
||||
\IPS\Output::i()->output = $activeTabContents;
|
||||
Output::i()->output = $activeTabContents;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( $device->login_key )
|
||||
{
|
||||
\IPS\Output::i()->sidebar['actions']['deauthorize'] = array(
|
||||
Output::i()->sidebar['actions']['deauthorize'] = array(
|
||||
'icon' => 'times',
|
||||
'title' => 'sign_out',
|
||||
'link' => \IPS\Http\Url::internal( "app=core&module=members&controller=devices&do=deauthorize" )->setQueryString( array( 'device' => $device->device_key, 'member' => $member->member_id, 'r' => 'device' ) )->csrf()
|
||||
'link' => Url::internal( "app=core&module=members&controller=devices&do=deauthorize" )->setQueryString( array( 'device' => $device->device_key, 'member' => $member->member_id, 'r' => 'device' ) )->csrf()
|
||||
);
|
||||
}
|
||||
|
||||
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global' )->tabs( $tabs, $activeTab, $activeTabContents, $url );
|
||||
Output::i()->output = Theme::i()->getTemplate( 'global' )->tabs( $tabs, $activeTab, $activeTabContents, $url );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,38 +206,38 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function member()
|
||||
protected function member() : void
|
||||
{
|
||||
/* Load */
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->id );
|
||||
$member = Member::load( Request::i()->id );
|
||||
if ( !$member->member_id )
|
||||
{
|
||||
\IPS\Output::i()->error( 'node_error', '2C355/1', 404, '' );
|
||||
Output::i()->error( 'node_error', '2C355/1', 404, '' );
|
||||
}
|
||||
|
||||
/* Build table */
|
||||
$table = new \IPS\Helpers\Table\Db( 'core_members_known_devices', \IPS\Http\Url::internal("app=core&module=members&controller=devices&do=member&id={$member->member_id}"), array( 'member_id=?', $member->member_id ) );
|
||||
$table = new \IPS\Helpers\Table\Db( 'core_members_known_devices', Url::internal("app=core&module=members&controller=devices&do=member&id={$member->member_id}"), array( 'member_id=?', $member->member_id ) );
|
||||
$table->langPrefix = 'device_table_';
|
||||
$table->include = array( 'user_agent', 'login_key', 'login_handler', 'last_seen', 'other_members' );
|
||||
$table->noSort = array( 'login_key', 'other_members' );
|
||||
$table->sortBy = $table->sortBy ?: 'last_seen';
|
||||
$table->parsers = array(
|
||||
'user_agent' => function( $val ) {
|
||||
return (string) \IPS\Http\UserAgent::parse( $val );
|
||||
return (string) UserAgent::parse( $val );
|
||||
},
|
||||
'login_key' => function( $val, $row ) {
|
||||
return \IPS\Theme::i()->getTemplate('members')->deviceAuthorization( (bool) $val, $row['last_seen'] >= ( new \IPS\DateTime )->sub( new \DateInterval( \IPS\Member\Device::LOGIN_KEY_VALIDITY ) )->getTimestamp(), $row['anonymous'] );
|
||||
return Theme::i()->getTemplate('members')->deviceAuthorization( (bool) $val, $row['last_seen'] >= ( new DateTime )->sub( new DateInterval( Device::LOGIN_KEY_VALIDITY ) )->getTimestamp(), $row['anonymous'] );
|
||||
},
|
||||
'login_handler' => function( $val, $row ) {
|
||||
return \IPS\Theme::i()->getTemplate('members')->deviceHandler( $val );
|
||||
return Theme::i()->getTemplate('members')->deviceHandler( $val );
|
||||
},
|
||||
'last_seen' => function( $val ) {
|
||||
return \IPS\DateTime::ts( $val );
|
||||
return DateTime::ts( $val );
|
||||
},
|
||||
'other_members' => function( $val, $row ) {
|
||||
if ( \IPS\Db::i()->select( 'COUNT(*)', 'core_members_known_devices', array( 'device_key=? AND member_id<>?', $row['device_key'], $row['member_id'] ) )->first() )
|
||||
if ( Db::i()->select( 'COUNT(*)', 'core_members_known_devices', array( 'device_key=? AND member_id<>?', $row['device_key'], $row['member_id'] ) )->first() )
|
||||
{
|
||||
return \IPS\Theme::i()->getTemplate('members')->deviceDuplicate();
|
||||
return Theme::i()->getTemplate('members')->deviceDuplicate();
|
||||
}
|
||||
return '';
|
||||
},
|
||||
@@ -226,7 +248,7 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
'view' => array(
|
||||
'title' => 'view',
|
||||
'icon' => 'search',
|
||||
'link' => \IPS\Http\Url::internal( 'app=core&module=members&controller=devices&do=device' )->setQueryString( 'key', $row['device_key'] )->setQueryString( 'member', $row['member_id'] ),
|
||||
'link' => Url::internal( 'app=core&module=members&controller=devices&do=device' )->setQueryString( 'key', $row['device_key'] )->setQueryString( 'member', $row['member_id'] ),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -235,7 +257,7 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
$return['deauthorize'] = array(
|
||||
'title' => 'sign_out',
|
||||
'icon' => 'times',
|
||||
'link' => \IPS\Http\Url::internal( 'app=core&module=members&controller=devices&do=deauthorize' )->setQueryString( array(
|
||||
'link' => Url::internal( 'app=core&module=members&controller=devices&do=deauthorize' )->setQueryString( array(
|
||||
'device' => $row['device_key'],
|
||||
'member' => $row['member_id']
|
||||
) )->csrf(),
|
||||
@@ -246,11 +268,11 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
};
|
||||
|
||||
/* Output */
|
||||
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'members' )->deviceTable( $table );
|
||||
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack( 'member_names_devices', FALSE, array( 'sprintf' => array( $member->name ) ) );
|
||||
\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( "app=core&module=members&controller=members" ), 'members' );
|
||||
\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( "app=core&module=members&controller=members&do=view&id={$member->member_id}" ), $member->name );
|
||||
\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( "app=core&module=members&controller=devices&do=member&id={$member->member_id}" ), 'members_devices' );
|
||||
Output::i()->output = Theme::i()->getTemplate( 'members' )->deviceTable( $table );
|
||||
Output::i()->title = Member::loggedIn()->language()->addToStack( 'member_names_devices', FALSE, array( 'sprintf' => array( $member->name ) ) );
|
||||
Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=members&controller=members" ), 'members' );
|
||||
Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=members&controller=members&do=view&id={$member->member_id}" ), $member->name );
|
||||
Output::i()->breadcrumb[] = array( Url::internal( "app=core&module=members&controller=devices&do=member&id={$member->member_id}" ), 'members_devices' );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -258,33 +280,33 @@ class _devices extends \IPS\Dispatcher\Controller
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function deauthorize()
|
||||
protected function deauthorize() : void
|
||||
{
|
||||
\IPS\Session::i()->csrfCheck();
|
||||
Session::i()->csrfCheck();
|
||||
|
||||
try
|
||||
{
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->member );
|
||||
$device = \IPS\Member\Device::loadAndAuthenticate( \IPS\Request::i()->device, $member );
|
||||
$member = Member::load( Request::i()->member );
|
||||
$device = Device::loadAndAuthenticate( Request::i()->device, $member );
|
||||
$device->login_key = NULL;
|
||||
$device->save();
|
||||
|
||||
\IPS\Db::i()->update( 'core_oauth_server_access_tokens', array( 'status' => 'revoked' ), array( 'member_id=? AND device_key=?', $device->member_id, $device->device_key ) );
|
||||
Db::i()->update( 'core_oauth_server_access_tokens', array( 'status' => 'revoked' ), array( 'member_id=? AND device_key=?', $device->member_id, $device->device_key ) );
|
||||
|
||||
$member->logHistory( 'core', 'login', array( 'type' => 'logout', 'device' => $device->device_key ) );
|
||||
\IPS\Session::i()->log( 'acplog__members_disabled_autologin', array( $member->name => FALSE ) );
|
||||
Session::i()->log( 'acplog__members_disabled_autologin', array( $member->name => FALSE ) );
|
||||
|
||||
\IPS\Session\Store::i()->deleteByMember( $device->member_id, $device->user_agent );
|
||||
Store::i()->deleteByMember( $device->member_id, $device->user_agent );
|
||||
}
|
||||
catch ( \Exception $e ) { }
|
||||
catch ( Exception $e ) { }
|
||||
|
||||
if ( isset( \IPS\Request::i()->r ) and \IPS\Request::i()->r === 'device' )
|
||||
if ( isset( Request::i()->r ) and Request::i()->r === 'device' )
|
||||
{
|
||||
\IPS\Output::i()->redirect( \IPS\Http\Url::internal("app=core&module=members&controller=devices&do=device")->setQueryString( array( 'key' => \IPS\Request::i()->device, 'member' => \IPS\Request::i()->member ) ) );
|
||||
Output::i()->redirect( Url::internal("app=core&module=members&controller=devices&do=device")->setQueryString( array( 'key' => Request::i()->device, 'member' => Request::i()->member ) ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
\IPS\Output::i()->redirect( \IPS\Http\Url::internal("app=core&module=members&controller=devices&do=member")->setQueryString( 'id', \IPS\Request::i()->member ) );
|
||||
Output::i()->redirect( Url::internal("app=core&module=members&controller=devices&do=member")->setQueryString( 'id', Request::i()->member ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user