Code style tweaks per brion's suggestions on Wikitech-l

[lhc/web/wiklou.git] / includes / Namespace.php

diff --git a/includes/Namespace.php b/includes/Namespace.php
index d1d06ac..73dc296 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -3,13 +3,7 @@
  * Provide things related to namespaces
  * @package MediaWiki
  */
- 
-/**
- * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
- */
-if( defined( 'MEDIAWIKI' ) ) {
 
- 
 /**
  * Definitions of the NS_ constants are in Defines.php
  * @private
@@ -30,7 +24,7 @@ $wgCanonicalNamespaceNames = array(
        NS_TEMPLATE_TALK    => 'Template_talk',
        NS_HELP             => 'Help',
        NS_HELP_TALK        => 'Help_talk',
-       NS_CATEGORY         => 'Category',
+       NS_CATEGORY             => 'Category',
        NS_CATEGORY_TALK    => 'Category_talk',
 );
 
@@ -55,32 +49,31 @@ class Namespace {
         * Check if the given namespace might be moved
         * @return bool
         */
-       function isMovable( $index ) {
-               if ( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY ) { 
-                       return false; 
-               }
-               return true;
+       static function isMovable( $index ) {
+               return !( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY );
+       }
+
+       /**
+        * Check if the given namespace is not a talk page
+        * @return bool
+        */
+       static function isMain( $index ) {
+               return ! Namespace::isTalk( $index );
        }
 
        /**
         * Check if the give namespace is a talk page
         * @return bool
         */
-       function isTalk( $index ) {
-               global $wgExtraNamespaces;
-               return ( $index == NS_TALK           || $index == NS_USER_TALK     ||
-                                $index == NS_PROJECT_TALK   || $index == NS_IMAGE_TALK    ||
-                                $index == NS_MEDIAWIKI_TALK || $index == NS_TEMPLATE_TALK ||
-                                $index == NS_HELP_TALK      || $index == NS_CATEGORY_TALK 
-                                ||  ( (isset($wgExtraNamespaces) && $index % 2) )
-                                );
-               
+       static function isTalk( $index ) {
+               return ($index > NS_MAIN)  // Special namespaces are negative
+                       && ($index % 2); // Talk namespaces are odd-numbered
        }
 
        /**
         * Get the talk namespace corresponding to the given index
         */
-       function getTalk( $index ) {
+       static function getTalk( $index ) {
                if ( Namespace::isTalk( $index ) ) {
                        return $index;
                } else {
@@ -89,7 +82,7 @@ class Namespace {
                }
        }
 
-       function getSubject( $index ) {
+       static function getSubject( $index ) {
                if ( Namespace::isTalk( $index ) ) {
                        return $index - 1;
                } else {
@@ -100,7 +93,7 @@ class Namespace {
        /**
         * Returns the canonical (English Wikipedia) name for a given index
         */
-       function getCanonicalName( $index ) {
+       static function getCanonicalName( $index ) {
                global $wgCanonicalNamespaceNames;
                return $wgCanonicalNamespaceNames[$index];
        }
@@ -109,7 +102,7 @@ class Namespace {
         * Returns the index for a given canonical name, or NULL
         * The input *must* be converted to lower case first
         */
-       function getCanonicalIndex( $name ) {
+       static function getCanonicalIndex( $name ) {
                global $wgCanonicalNamespaceNames;
                static $xNamespaces = false;
                if ( $xNamespaces === false ) {
@@ -124,7 +117,13 @@ class Namespace {
                        return NULL;
                }
        }
-}
-
+       
+       /**
+        * Can this namespace ever have a talk namespace?
+        * @param $index Namespace index
+        */
+        static function canTalk( $index ) {
+               return( $index >= NS_MAIN );
+        }
 }
 ?>