diocloid/LinkTitles
1
0
Fork 0
mirror of https://github.com/diocloid/LinkTitles.git synced 2025-07-13 09:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change nameSpace to all lowercase everywhere.

Browse Source 
Makes it consistent with MW's spelling of the term.
This commit is contained in:
Daniel Kraus
2017-08-31 13:56:42 +02:00
parent 352add204f
commit 6bf1d3f072
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/Config.php
View File

@ -70,9 +70,9 @@ class Config {
/** /**
* Array of those name spaces (integer constants) whose pages may be linked. * Array of those name spaces (integer constants) whose pages may be linked.
* @var Array $nameSpaces * @var Array $namespaces
*/ */
public $nameSpaces; public $namespaces;
/** /**
* Indicates whether to add a link to the first occurrence of a page title * Indicates whether to add a link to the first occurrence of a page title
@ -186,7 +186,7 @@ class Config {
$this->preferShortTitles = $wgLinkTitlesPreferShortTitles; $this->preferShortTitles = $wgLinkTitlesPreferShortTitles;
$this->minimumTitleLength = $wgLinkTitlesMinimumTitleLength; $this->minimumTitleLength = $wgLinkTitlesMinimumTitleLength;
$this->blackList = $wgLinkTitlesBlackList; $this->blackList = $wgLinkTitlesBlackList;
$this->nameSpaces = $wgLinkTitlesNamespaces; $this->namespaces = $wgLinkTitlesNamespaces;
$this->firstOnly = $wgLinkTitlesFirstOnly; $this->firstOnly = $wgLinkTitlesFirstOnly;
$this->smartMode = $wgLinkTitlesSmartMode; $this->smartMode = $wgLinkTitlesSmartMode;
$this->capitalLinks = $wgCapitalLinks; // MediaWiki global variable $this->capitalLinks = $wgCapitalLinks; // MediaWiki global variable

4
includes/Extension.php
View File

@ -39,7 +39,7 @@ class Extension {
// Only process if page is in one of our namespaces we want to link // Only process if page is in one of our namespaces we want to link
// Fixes ugly autolinking of sidebar pages // Fixes ugly autolinking of sidebar pages
if ( in_array( $title->getNamespace(), $config->nameSpaces )) { if ( in_array( $title->getNamespace(), $config->namespaces )) {
$text = $content->getContentHandler()->serializeContent( $content ); $text = $content->getContentHandler()->serializeContent( $content );
if ( !\MagicWord::get( 'MAG_LINKTITLES_NOAUTOLINKS' )->match( $text ) ) { if ( !\MagicWord::get( 'MAG_LINKTITLES_NOAUTOLINKS' )->match( $text ) ) {
$linker = new Linker( $config ); $linker = new Linker( $config );
@ -65,7 +65,7 @@ class Extension {
// If the page contains the magic word '__NOAUTOLINKS__', do not parse it. // If the page contains the magic word '__NOAUTOLINKS__', do not parse it.
// Only process if page is in one of our namespaces we want to link // Only process if page is in one of our namespaces we want to link
if ( !\MagicWord::get( 'MAG_LINKTITLES_NOAUTOLINKS' )->match( $text ) && if ( !\MagicWord::get( 'MAG_LINKTITLES_NOAUTOLINKS' )->match( $text ) &&
in_array( $title->getNamespace(), $config->nameSpaces ) ) { in_array( $title->getNamespace(), $config->namespaces ) ) {
$linker = new Linker( $config ); $linker = new Linker( $config );
$text = $linker->linkContent( $title, $text ); $text = $linker->linkContent( $title, $text );
} }

2
includes/Special.php
View File

@ -97,7 +97,7 @@ class Special extends \SpecialPage {
*/ */
private function process( \WebRequest &$request, \OutputPage &$output) { private function process( \WebRequest &$request, \OutputPage &$output) {
// get our Namespaces // get our Namespaces
$namespacesClause = str_replace( '_', ' ','(' . implode( ', ',$this->config->nameSpaces ) . ')' ); $namespacesClause = str_replace( '_', ' ','(' . implode( ', ',$this->config->namespaces ) . ')' );
// Start the stopwatch // Start the stopwatch
$startTime = microtime( true ); $startTime = microtime( true );

8
includes/Target.php
View File

@ -69,12 +69,12 @@ class Target {
* *
* The parameters may be taken from database rows, for example. * The parameters may be taken from database rows, for example.
* *
* @param Int $nameSpace Name space of the target page * @param Int $namespace Name space of the target page
* @param String &$title Title of the target page * @param String &$title Title of the target page
*/ */
public function __construct( $nameSpace, $title, Config &$config ) { public function __construct( $namespace, $title, Config &$config ) {
// print "\n>>>nameSpace=$nameSpace;title=$title<<<\n"; // print "\n>>>namespace=$namespace;title=$title<<<\n";
$this->title = \Title::makeTitleSafe( $nameSpace, $title ); $this->title = \Title::makeTitleSafe( $namespace, $title );
$this->titleValue = $this->title->getTitleValue(); $this->titleValue = $this->title->getTitleValue();
$this->config = $config; $this->config = $config;

26
includes/Targets.php
View File

@ -34,14 +34,14 @@ class Targets {
* potential target page titles. * potential target page titles.
* *
* The subset of pages that may serve as target pages depends on the * The subset of pages that may serve as target pages depends on the
* name space of the source page. Therefore, if the $nameSpace differs from * name space of the source page. Therefore, if the $namespace differs from
* the cached name space, the database is queried again. * the cached name space, the database is queried again.
* *
* @param String $nameSpace The namespace of the current page. * @param String $namespace The namespace of the current page.
* @param Config $config LinkTitles configuration. * @param Config $config LinkTitles configuration.
*/ */
public static function default( \Title $title, Config $config ) { public static function default( \Title $title, Config $config ) {
if ( ( self::$instance === null ) || ( self::$instance->nameSpace != $title->getNamespace() ) ) { if ( ( self::$instance === null ) || ( self::$instance->namespace != $title->getNamespace() ) ) {
self::$instance = new Targets( $title, $config ); self::$instance = new Targets( $title, $config );
} }
return self::$instance; return self::$instance;
@ -67,9 +67,9 @@ class Targets {
/** /**
* Holds the name space (integer) for which the list of target pages was built. * Holds the name space (integer) for which the list of target pages was built.
* @var Int $nameSpace * @var Int $namespace
*/ */
public $nameSpace; public $namespace;
private $config; private $config;
@ -79,7 +79,7 @@ class Targets {
*/ */
private function __construct( \Title $title, Config $config) { private function __construct( \Title $title, Config $config) {
$this->config = $config; $this->config = $config;
$this->nameSpace = $title->getNameSpace(); $this->namespace = $title->getNamespace();
$this->fetch(); $this->fetch();
} }
@ -101,18 +101,18 @@ class Targets {
} }
// Build our weight list. Make sure current namespace is first element // Build our weight list. Make sure current namespace is first element
$nameSpaces = array_diff( $this->config->nameSpaces, [ $this->nameSpace ] ); $namespaces = array_diff( $this->config->namespaces, [ $this->namespace ] );
array_unshift( $nameSpaces, $this->nameSpace ); array_unshift( $namespaces, $this->namespace );
// No need for sanitiy check. we are sure that we have at least one element in the array // No need for sanitiy check. we are sure that we have at least one element in the array
$weightSelect = "CASE page_namespace "; $weightSelect = "CASE page_namespace ";
$currentWeight = 0; $currentWeight = 0;
foreach ($nameSpaces as &$nameSpaceValue) { foreach ($namespaces as &$namespaceValue) {
$currentWeight = $currentWeight + 100; $currentWeight = $currentWeight + 100;
$weightSelect = $weightSelect . " WHEN " . $nameSpaceValue . " THEN " . $currentWeight . PHP_EOL; $weightSelect = $weightSelect . " WHEN " . $namespaceValue . " THEN " . $currentWeight . PHP_EOL;
} }
$weightSelect = $weightSelect . " END "; $weightSelect = $weightSelect . " END ";
$nameSpacesClause = '(' . implode( ', ', $nameSpaces ) . ')'; $namespacesClause = '(' . implode( ', ', $namespaces ) . ')';
// Build an SQL query and fetch all page titles ordered by length from // Build an SQL query and fetch all page titles ordered by length from
// shortest to longest. Only titles from 'normal' pages (namespace uid // shortest to longest. Only titles from 'normal' pages (namespace uid
@ -125,7 +125,7 @@ class Targets {
array( 'page_title', 'page_namespace' , "weight" => $weightSelect), array( 'page_title', 'page_namespace' , "weight" => $weightSelect),
array_filter( array_filter(
array( array(
'page_namespace IN ' . $nameSpacesClause, 'page_namespace IN ' . $namespacesClause,
'CHAR_LENGTH(page_title) >= ' . $this->config->minimumTitleLength, 'CHAR_LENGTH(page_title) >= ' . $this->config->minimumTitleLength,
$blackList, $blackList,
) )
@ -139,7 +139,7 @@ class Targets {
array( 'page_title', 'page_namespace' , "weight" => $weightSelect ), array( 'page_title', 'page_namespace' , "weight" => $weightSelect ),
array_filter( array_filter(
array( array(
'page_namespace IN ' . $nameSpacesClause, 'page_namespace IN ' . $namespacesClause,
'LENGTH(page_title) >= ' . $this->config->minimumTitleLength, 'LENGTH(page_title) >= ' . $this->config->minimumTitleLength,
$blackList, $blackList,
) )

4
linktitles-cli.php
View File

@ -155,12 +155,12 @@ class Cli extends \Maintenance {
// Retrieve page names from the database. // Retrieve page names from the database.
$dbr = $this->getDB( DB_SLAVE ); $dbr = $this->getDB( DB_SLAVE );
$nameSpacesClause = str_replace( '_', ' ','(' . implode( ', ', $config->nameSpaces ) . ')' ); $namespacesClause = str_replace( '_', ' ','(' . implode( ', ', $config->namespaces ) . ')' );
$res = $dbr->select( $res = $dbr->select(
'page', 'page',
array( 'page_title', 'page_namespace' ), array( 'page_title', 'page_namespace' ),
array( array(
'page_namespace IN ' . $nameSpacesClause, 'page_namespace IN ' . $namespacesClause,
), ),
__METHOD__, __METHOD__,
array( array(