Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "SpecialCreateAccount: don't reinvent the wheel for restrictions"

Browse source
This commit is contained in:
jenkins-bot 2021-05-27 02:05:25 +00:00 committed by Gerrit Code Review
commit a2ef517228
3 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/specialpage/LoginSignupSpecialPage.php
View file

@ -82,9 +82,9 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
*/ */
abstract protected function logAuthResult( $success, $status = null ); abstract protected function logAuthResult( $success, $status = null );
public function __construct( $name ) { public function __construct( $name, $restriction = '' ) {
global $wgUseMediaWikiUIEverywhere; global $wgUseMediaWikiUIEverywhere;
parent::__construct( $name ); parent::__construct( $name, $restriction );
// Override UseMediaWikiEverywhere to true, to force login and create form to use mw ui // Override UseMediaWikiEverywhere to true, to force login and create form to use mw ui
$wgUseMediaWikiUIEverywhere = true; $wgUseMediaWikiUIEverywhere = true;

1
includes/specialpage/SpecialPageFactory.php
View file

@ -312,7 +312,6 @@ class SpecialPageFactory {
'CreateAccount' => [ 'CreateAccount' => [
'class' => \SpecialCreateAccount::class, 'class' => \SpecialCreateAccount::class,
'services' => [ 'services' => [
'PermissionManager',
'AuthManager', 'AuthManager',
] ]
], ],

18
includes/specials/SpecialCreateAccount.php
View file

@ -23,7 +23,6 @@
use MediaWiki\Auth\AuthManager; use MediaWiki\Auth\AuthManager;
use MediaWiki\Logger\LoggerFactory; use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Permissions\PermissionManager;
/** /**
* Implements Special:CreateAccount * Implements Special:CreateAccount
@ -42,17 +41,12 @@ class SpecialCreateAccount extends LoginSignupSpecialPage {
'authform-wrongtoken' => 'sessionfailure', 'authform-wrongtoken' => 'sessionfailure',
]; ];
/** @var PermissionManager */
private $permManager;
/** /**
* @param PermissionManager $permManager
* @param AuthManager $authManager * @param AuthManager $authManager
*/ */
public function __construct( PermissionManager $permManager, AuthManager $authManager ) { public function __construct( AuthManager $authManager ) {
parent::__construct( 'CreateAccount' ); parent::__construct( 'CreateAccount', 'createaccount' );
$this->permManager = $permManager;
$this->setAuthManager( $authManager ); $this->setAuthManager( $authManager );
} }
@ -60,14 +54,6 @@ class SpecialCreateAccount extends LoginSignupSpecialPage {
return true; return true;
} }
public function isRestricted() {
return !$this->permManager->groupHasPermission( '*', 'createaccount' );
}
public function userCanExecute( User $user ) {
return $this->permManager->userHasRight( $user, 'createaccount' );
}
public function checkPermissions() { public function checkPermissions() {
parent::checkPermissions(); parent::checkPermissions();