wikimedia/mediawiki-extensions-InputBox
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/InputBox synced 2024-11-15 03:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

InputBox:

Browse source 
* instead of checking each namespace if it is given through the parameter, check each given namespace if it is a valid one
* this fixes the inconsistency where 2 namespaces are given but only 1 is valid and that one is shown (normally if there is only 1 given, it is hidden)
* fix bug 22591 (Allow i18n of Main namespace search option label)
* allow namespace aliases as well
* also trim the given namespaces, so spaces do not make them invalid
This commit is contained in:
Robin Pepermans 2011-07-14 03:51:10 +00:00
parent f2a1bb33fc
commit f16ce57a5e
Notes: Robin Pepermans 2011-07-14 03:51:10 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/92138
2 changed files with 61 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
InputBox.classes.php
View file

@ -72,7 +72,7 @@ class InputBox {
* @param $type
*/
public function getSearchForm( $type ) {
global $wgContLang;
global $wgContLang, $wgNamespaceAliases;
// Use button label fallbacks
if ( !$this->mButtonLabel ) {
@ -120,51 +120,70 @@ class InputBox {
$htmlOut .= $this->mBR;
// Determine namespace checkboxes
$namespaces = $wgContLang->getNamespaces();
$namespacesArray = explode( ',', $this->mNamespaces );
if ( $this->mNamespaces ) {
foreach ( $namespacesArray as $userNamespace ) {
$namespaces = $wgContLang->getNamespaces();
$nsAliases = array_merge( $wgContLang->getNamespaceAliases(), $wgNamespaceAliases );
$showNamespaces = array();
# Check for valid namespaces
foreach ( $namespacesArray as $userNS ) {
$userNS = trim( $userNS ); # no whitespace
$checkedNS = array();
# Namespace needs to be checked if flagged with "**"
if ( strstr( $userNS, '**' ) ) {
$userNS = str_replace( '**', '', $userNS );
$checkedNS[$userNS] = true;
}
$mainMsg = wfMsgForContent( 'inputbox-ns-main' );
if( $userNS == 'Main' || $userNS == $mainMsg ) {
$i = 0;
} elseif( array_search( $userNS, $namespaces ) ) {
$i = array_search( $userNS, $namespaces );
} elseif ( isset( $nsAliases[$userNS] ) ) {
$i = $nsAliases[$userNS];
} else {
continue; # Namespace not recognised, skip
}
$showNamespaces[$i] = $userNS;
if( isset( $checkedNS[$userNS] ) && $checkedNS[$userNS] ) {
$checkedNS[$i] = true;
}
}
# Show valid namespaces
foreach( $showNamespaces as $i => $name ) {
$checked = array();
// Namespace needs to be checked if flagged with "**" or if it's the only one
if ( strstr( $userNamespace, '**' ) || count( $namespacesArray ) == 1 ) {
$userNamespace = str_replace( '**', '', $userNamespace );
// Namespace flagged with "**" or if it's the only one
if ( ( isset( $checkedNS[$i] ) && $checkedNS[$i] ) || count( $showNamespaces ) == 1 ) {
$checked = array( 'checked' => 'checked' );
}
// Namespace checkboxes
foreach ( $namespaces as $i => $name ) {
if ( $i < 0 ) {
continue;
} elseif ( $i == 0 ) {
$name = 'Main';
}
if ( $userNamespace == $name ) {
if ( count( $namespacesArray ) == 1 ) {
// Checkbox
$htmlOut .= Xml::element( 'input',
array(
'type' => 'hidden',
'name' => 'ns' . $i,
'value' => 1,
'id' => 'mw-inputbox-ns' . $i
) + $checked
);
} else {
// Checkbox
$htmlOut .= ' <div class="inputbox-element" style="display: inline; white-space: nowrap;">';
$htmlOut .= Xml::element( 'input',
array(
'type' => 'checkbox',
'name' => 'ns' . $i,
'value' => 1,
'id' => 'mw-inputbox-ns' . $i
) + $checked
);
// Label
$htmlOut .= '&#160;' . Xml::label( $userNamespace, 'mw-inputbox-ns' . $i );
$htmlOut .= '</div> ';
}
}
if ( count( $showNamespaces ) == 1 ) {
// Checkbox
$htmlOut .= Xml::element( 'input',
array(
'type' => 'hidden',
'name' => 'ns' . $i,
'value' => 1,
'id' => 'mw-inputbox-ns' . $i
) + $checked
);
} else {
// Checkbox
$htmlOut .= ' <div class="inputbox-element" style="display: inline; white-space: nowrap;">';
$htmlOut .= Xml::element( 'input',
array(
'type' => 'checkbox',
'name' => 'ns' . $i,
'value' => 1,
'id' => 'mw-inputbox-ns' . $i
) + $checked
);
// Label
$htmlOut .= '&#160;' . Xml::label( $name, 'mw-inputbox-ns' . $i );
$htmlOut .= '</div> ';
}
}

2
InputBox.i18n.php
View file

@ -22,6 +22,7 @@ Please specify "create", "comment", "search", "search2" or "fulltext".',
'tryexact' => 'Try exact match',
'searchfulltext' => 'Search full text',
'createarticle' => 'Create page',
'inputbox-ns-main' => 'Main',
);
/** Message documentation (Message documentation)
@ -1221,6 +1222,7 @@ Gebruik "create", "comment", "search", "search2" of "fulltext".',
'tryexact' => 'Zoeken op exacte overeenkomst',
'searchfulltext' => 'Volledige tekst doorzoeken',
'createarticle' => 'Pagina aanmaken',
'inputbox-ns-main' => 'Hoofdnaamruimte',
);
/** Norwegian Nynorsk (‪Norsk (nynorsk)‬)