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

Skin: Factor out functions

Browse source 
Allows for the creation of create account and login urls in SkinVector

Change-Id: Ia841f92c626ca32a9ad437b3d1cff78309c83ed8
This commit is contained in:
bwang 2021-05-13 15:14:32 -05:00
parent b6744c24fb
commit dee771bf8b
1 changed files with 100 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
includes/skins/SkinTemplate.php
View file

@ -490,31 +490,11 @@ class SkinTemplate extends Skin {
$services = MediaWikiServices::getInstance(); $services = MediaWikiServices::getInstance();
$authManager = $services->getAuthManager(); $authManager = $services->getAuthManager();
$permissionManager = $services->getPermissionManager(); $permissionManager = $services->getPermissionManager();
$returnto = $this->getReturnToParam();
/* set up the default links for the personal toolbar */ /* set up the default links for the personal toolbar */
$personal_urls = []; $personal_urls = [];
# Due to T34276, if a user does not have read permissions,
# $this->getTitle() will just give Special:Badtitle, which is
# not especially useful as a returnto parameter. Use the title
# from the request instead, if there was one.
if ( $this->getAuthority()->isAllowed( 'read' ) ) {
$page = $title;
} else {
$page = Title::newFromText( $request->getVal( 'title', '' ) );
}
$page = $request->getVal( 'returnto', $page );
$returnto = [];
if ( strval( $page ) !== '' ) {
$returnto['returnto'] = $page;
$query = $request->getVal( 'returntoquery', $this->thisquery );
$paramsArray = wfCgiToArray( $query );
$query = wfArrayToCgi( $paramsArray );
if ( $query != '' ) {
$returnto['returntoquery'] = $query;
}
}
if ( $this->loggedin ) { if ( $this->loggedin ) {
$personal_urls['userpage'] = $this->buildPersonalPageItem(); $personal_urls['userpage'] = $this->buildPersonalPageItem();
@ -588,26 +568,9 @@ class SkinTemplate extends Skin {
]; ];
} }
} else { } else {
$useCombinedLoginLink = $this->getConfig()->get( 'UseCombinedLoginLink' ); $useCombinedLoginLink = $this->useCombinedLoginLink();
if ( !$authManager->canCreateAccounts() || !$authManager->canAuthenticateNow() ) { $login_url = $this->buildLoginData( $returnto, $useCombinedLoginLink );
// don't show combined login/signup link if one of those is actually not available $createaccount_url = $this->buildCreateAccountData( $returnto );
$useCombinedLoginLink = false;
}
$loginlink = $this->getAuthority()->isAllowed( 'createaccount' )
&& $useCombinedLoginLink ? 'nav-login-createaccount' : 'pt-login';
$login_url = [
'text' => $this->msg( $loginlink )->text(),
'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
'active' => $title->isSpecial( 'Userlogin' )
|| $title->isSpecial( 'CreateAccount' ) && $useCombinedLoginLink,
];
$createaccount_url = [
'text' => $this->msg( 'pt-createaccount' )->text(),
'href' => self::makeSpecialUrl( 'CreateAccount', $returnto ),
'active' => $title->isSpecial( 'CreateAccount' ),
];
// No need to show Talk and Contributions to anons if they can't contribute! // No need to show Talk and Contributions to anons if they can't contribute!
// TODO: easy way to get anon authority! // TODO: easy way to get anon authority!
@ -660,6 +623,102 @@ class SkinTemplate extends Skin {
return $personal_urls; return $personal_urls;
} }
/**
* Builds query params for the page to return to, used when building links
* @unstable
*
* @return string[]
*/
protected function getReturnToParam() {
$title = $this->getTitle();
$request = $this->getRequest();
# Due to T34276, if a user does not have read permissions,
# $this->getTitle() will just give Special:Badtitle, which is
# not especially useful as a returnto parameter. Use the title
# from the request instead, if there was one.
if ( $this->getAuthority()->isAllowed( 'read' ) ) {
$page = $title;
} else {
$page = Title::newFromText( $request->getVal( 'title', '' ) );
}
$page = $request->getVal( 'returnto', $page );
$returnto = [];
if ( strval( $page ) !== '' ) {
$returnto['returnto'] = $page;
$query = $request->getVal( 'returntoquery', $this->thisquery );
$paramsArray = wfCgiToArray( $query );
$query = wfArrayToCgi( $paramsArray );
if ( $query != '' ) {
$returnto['returntoquery'] = $query;
}
}
return $returnto;
}
/**
* Returns if a combined login/signup link will be used
* @unstable
*
* @return bool
*/
protected function useCombinedLoginLink() {
$services = MediaWikiServices::getInstance();
$authManager = $services->getAuthManager();
$useCombinedLoginLink = $this->getConfig()->get( 'UseCombinedLoginLink' );
if ( !$authManager->canCreateAccounts() || !$authManager->canAuthenticateNow() ) {
// don't show combined login/signup link if one of those is actually not available
$useCombinedLoginLink = false;
}
return $useCombinedLoginLink;
}
/**
* Build "Login" link
* @unstable
*
* @param string[] $returnto query params for the page to return to
* @param bool $useCombinedLoginLink when set a single link to login form will be created
* with alternative label.
* @return array
*/
protected function buildLoginData( $returnto, $useCombinedLoginLink ) {
$title = $this->getTitle();
$loginlink = $this->getAuthority()->isAllowed( 'createaccount' )
&& $useCombinedLoginLink ? 'nav-login-createaccount' : 'pt-login';
$login_url = [
'text' => $this->msg( $loginlink )->text(),
'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
'active' => $title->isSpecial( 'Userlogin' )
|| $title->isSpecial( 'CreateAccount' ) && $useCombinedLoginLink,
];
return $login_url;
}
/**
* Build "Create Account" link
* @unstable
*
* @param string[] $returnto query params for the page to return to
* @return array
*/
protected function buildCreateAccountData( $returnto ) {
$title = $this->getTitle();
$createaccount_url = [
'text' => $this->msg( 'pt-createaccount' )->text(),
'href' => self::makeSpecialUrl( 'CreateAccount', $returnto ),
'active' => $title->isSpecial( 'CreateAccount' ),
];
return $createaccount_url;
}
/** /**
* Build a personal page link. * Build a personal page link.
* @return array * @return array