Use AutoLoader to load classes:

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

diff --git a/includes/Skin.php b/includes/Skin.php
index 5bf36ab..dc0a998 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -8,28 +8,11 @@ if ( ! defined( 'MEDIAWIKI' ) )
  * @subpackage Skins
  */
 
-# See skin.txt
-require_once( 'Linker.php' );
-require_once( 'Image.php' );
-
 # Get a list of available skins
 # Build using the regular expression '^(.*).php$'
 # Array keys are all lower case, array value keep the case used by filename
 #
 
-$skinDir = dir( $wgStyleDirectory );
-
-# while code from www.php.net
-while (false !== ($file = $skinDir->read())) {
-       // Skip non-PHP files, hidden files, and '.dep' includes
-       if(preg_match('/^([^.]*)\.php$/',$file, $matches)) {
-               $aSkin = $matches[1];
-               $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
-       }
-}
-$skinDir->close();
-unset($matches);
-
 /**
  * The main skin class that provide methods and properties for all other skins.
  * This base class is also the "Standard" skin.
@@ -55,9 +38,35 @@ class Skin extends Linker {
         */
        function getSkinNames() {
                global $wgValidSkinNames;
+               if (!is_array($wgValidSkinNames)) {
+                       Skin::initializeSkinNames();
+               }
                return $wgValidSkinNames;
        }
 
+       /** 
+        * Initializes set of available skins.
+        * @return array of strings - skin names
+        * @static
+        */
+       
+       function initializeSkinNames() {
+               global $wgStyleDirectory, $wgValidSkinNames;
+               $skinDir = dir( $wgStyleDirectory );
+
+               # while code from www.php.net
+               while (false !== ($file = $skinDir->read())) {
+                       // Skip non-PHP files, hidden files, and '.dep' includes
+                       if(preg_match('/^([^.]*)\.php$/',$file, $matches)) {
+                               $aSkin = $matches[1];
+                               $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
+                       }
+               }
+               $skinDir->close();
+               unset($matches);
+               
+       }
+
        /**
         * Normalize a skin preference value to a form that can be loaded.
         * If a skin can't be found, it will fall back to the configured
@@ -745,7 +754,7 @@ END;
                $s = '';
                if ( $wgUser->isAnon() ) {
                        if( $wgShowIPinHeader && isset( $_COOKIE[ini_get('session.name')] ) ) {
-                               $n = wfGetIP();
+                               $n = ProxyTools::getIP();
 
                                $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
                                  $wgLang->getNsText( NS_TALK ) );
@@ -896,8 +905,7 @@ END;
                }
 
                if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
-                   require_once('Credits.php');
-                   $s .= ' ' . getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+                   $s .= ' ' . Credits::getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
                } else {
                    $s .= $this->lastModified();
                }
@@ -1015,7 +1023,6 @@ END;
         */
        function specialPagesList() {
                global $wgUser, $wgContLang, $wgServer, $wgRedirectScript, $wgAvailableRights;
-               require_once('SpecialPage.php');
                $a = array();
                $pages = SpecialPage::getPages();