bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not accept invalid codes for setlang

Browse Source 
Related to bug 37459, but this is not about uselang.

Change-Id: Icfa371d25697ee01c6bc262de968cfd2a1543154
This commit is contained in:
Santhosh Thottingal
2012-08-27 10:59:36 +05:30
parent 8056b037aa
commit 7a5f3dd91d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
UniversalLanguageSelector.hooks.php
View File

@@ -53,7 +53,7 @@ class UniversalLanguageSelectorHooks {
*/ */
static function addTrigger( array &$personal_urls, &$title ) { static function addTrigger( array &$personal_urls, &$title ) {
global $wgLang; global $wgLang;
$personal_urls = array( 'uls'=> array( $personal_urls = array( 'uls' => array(
'text' => $wgLang->getLanguageName( $wgLang->getCode() ), 'text' => $wgLang->getLanguageName( $wgLang->getCode() ),
'href' => '#', 'href' => '#',
'class' => 'uls-trigger', 'class' => 'uls-trigger',
@@ -69,12 +69,18 @@ class UniversalLanguageSelectorHooks {
* @return bool * @return bool
*/ */
public static function getLanguage( $user, &$code ) { public static function getLanguage( $user, &$code ) {
global $wgRequest; global $wgRequest, $wgLanguageCode;
if ( $wgRequest->getVal( 'uselang' ) ) { if ( $wgRequest->getVal( 'uselang' ) ) {
// uselang can be used for temporary override of language preference // uselang can be used for temporary override of language preference
return true; return true;
} }
$setlang = $wgRequest->getVal( 'setlang' ); $setlang = $wgRequest->getVal( 'setlang' );
$setlang = RequestContext::sanitizeLangCode( $setlang );
$validMWLanguages = Language::fetchLanguageNames( $wgLanguageCode, null, 'mwfile' );
if ( !array_key_exists( $setlang, $validLanguages ) ) {
wfDebug( "Invalid user language code\n" );
return true;
}
if ( $setlang ) { if ( $setlang ) {
if ( $user->isAnon() ) { if ( $user->isAnon() ) {
$wgRequest->response()->setcookie( 'language', $setlang ); $wgRequest->response()->setcookie( 'language', $setlang );
@@ -90,7 +96,6 @@ class UniversalLanguageSelectorHooks {
$code = $user->getOption( 'language' ); $code = $user->getOption( 'language' );
} }
} }
$code = RequestContext::sanitizeLangCode( $code );
return true; return true;
} }
@@ -101,7 +106,7 @@ class UniversalLanguageSelectorHooks {
*/ */
public static function addConfig( &$vars ) { public static function addConfig( &$vars ) {
global $wgContLang; global $wgContLang;
$vars['wgULSLanguages'] = Language::fetchLanguageNames( $wgContLang->getCode() ); $vars['wgULSLanguages'] = Language::fetchLanguageNames( $wgContLang->getCode(), null, 'mwfile' );
return true; return true;
} }
} }