Security fix: include path

diff --git a/includes/DatabaseFunctions.php b/includes/DatabaseFunctions.php
index 3c1ce5a..d753a01 100644 (file)
--- a/includes/DatabaseFunctions.php
+++ b/includes/DatabaseFunctions.php
@@ -1,7 +1,6 @@
 <?
-global $IP;
-include_once( "$IP/FulltextStoplist.php" );
-include_once( "$IP/CacheManager.php" );
+include_once( "FulltextStoplist.php" );
+include_once( "CacheManager.php" );
 
 define( "DB_READ", -1 );
 define( "DB_WRITE", -2 );

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 0d05f41..390db76 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -5,10 +5,9 @@ $wgNumberOfArticles = -1; # Unset
 $wgTotalViews = -1;
 $wgTotalEdits = -1;
 
-global $IP;
-include_once( "$IP/DatabaseFunctions.php" );
-include_once( "$IP/UpdateClasses.php" );
-include_once( "$IP/LogPage.php" );
+include_once( "DatabaseFunctions.php" );
+include_once( "UpdateClasses.php" );
+include_once( "LogPage.php" );
 
 /*
  * Compatibility functions

diff --git a/includes/Setup.php b/includes/Setup.php
index 16cc547..c4c1de0 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -5,13 +5,11 @@
 # setting up a few globals.
 #
 
-global $IP;
-
 if( !isset( $wgProfiling ) )
        $wgProfiling = false;
 
 if ( $wgProfiling ) {
-       include_once( "$IP/Profiling.php" );
+       include_once( "Profiling.php" );
 } else {
        function wfProfileIn( $fn ) {}
        function wfProfileOut( $fn = "" ) {}
@@ -25,19 +23,19 @@ wfProfileIn( "$fname-includes" );
 
 # Only files which are used on every invocation should be included here
 # Otherwise, include them conditionally [TS]
-include_once( "$IP/GlobalFunctions.php" );
-include_once( "$IP/Namespace.php" );
-include_once( "$IP/Skin.php" );
-include_once( "$IP/OutputPage.php" );
-include_once( "$IP/User.php" );
-include_once( "$IP/LinkCache.php" );
-include_once( "$IP/Title.php" );
-include_once( "$IP/Article.php" );
-include_once( "$IP/MagicWord.php" );
-include_once( "$IP/MemCachedClient.inc.php" );
-include_once( "$IP/Block.php" );
-include_once( "$IP/SearchEngine.php" );
-include_once( "$IP/DifferenceEngine.php" );
+include_once( "GlobalFunctions.php" );
+include_once( "Namespace.php" );
+include_once( "Skin.php" );
+include_once( "OutputPage.php" );
+include_once( "User.php" );
+include_once( "LinkCache.php" );
+include_once( "Title.php" );
+include_once( "Article.php" );
+include_once( "MagicWord.php" );
+include_once( "MemCachedClient.inc.php" );
+include_once( "Block.php" );
+include_once( "SearchEngine.php" );
+include_once( "DifferenceEngine.php" );
 
 wfProfileOut( "$fname-includes" );
 wfProfileIn( "$fname-memcached" );
@@ -66,21 +64,21 @@ if( $wgUseMemCached ) {
 wfProfileOut( "$fname-memcached" );
 wfProfileIn( "$fname-misc" );
 
-include_once( "$IP/Language.php" );
+include_once( "Language.php" );
 
 $wgOut = new OutputPage();
 wfDebug( "\n\n" );
 
 $wgLangClass = "Language" . ucfirst( $wgLanguageCode );
 if( ! class_exists( $wgLangClass ) ) {
-       include_once( "$IP/LanguageUtf8.php" );
+       include_once( "LanguageUtf8.php" );
        $wgLangClass = "LanguageUtf8";
 }
 $wgLang = new $wgLangClass();
 
 if( !$wgCommandLineMode ) {
        if( $wgSessionsInMemcached ) {
-               include_once( "$IP/MemcachedSessions.php" );
+               include_once( "MemcachedSessions.php" );
        }
        session_set_cookie_params( 0, $wgCookiePath, $wgCookieDomain );
        session_cache_limiter( "private, must-revalidate" );

diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index e2b1d3a..458cfe6 100644 (file)
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -1,6 +1,5 @@
 <?
-global $IP;
-include_once( "$IP/SpecialRecentchanges.php" );
+include_once( "SpecialRecentchanges.php" );
 
 function wfSpecialRecentchangeslinked( $par = NULL )
 {

diff --git a/includes/UpdateClasses.php b/includes/UpdateClasses.php
index ed80289..8e2e17c 100644 (file)
--- a/includes/UpdateClasses.php
+++ b/includes/UpdateClasses.php
@@ -1,11 +1,10 @@
 <?
 # See deferred.doc
-global $IP;
-include_once( "$IP/UserUpdate.php" );
-include_once( "$IP/ViewCountUpdate.php" );
-include_once( "$IP/SiteStatsUpdate.php" );
-include_once( "$IP/LinksUpdate.php" );
-include_once( "$IP/SearchUpdate.php" );
-include_once( "$IP/UserTalkUpdate.php" );
+include_once( "UserUpdate.php" );
+include_once( "ViewCountUpdate.php" );
+include_once( "SiteStatsUpdate.php" );
+include_once( "LinksUpdate.php" );
+include_once( "SearchUpdate.php" );
+include_once( "UserTalkUpdate.php" );
 
 ?>

diff --git a/languages/Language.php b/languages/Language.php
index f162d33..f54a5a6 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1650,7 +1650,6 @@ class Language {
        }
 }
 
-global $IP;
-include_once( "{$IP}/Language" . ucfirst( $wgLanguageCode ) . ".php" );
+include_once( "Language" . ucfirst( $wgLanguageCode ) . ".php" );
 
 ?>

diff --git a/languages/LanguagePl.php b/languages/LanguagePl.php
index 9180e5c..76a2ffc 100644 (file)
--- a/languages/LanguagePl.php
+++ b/languages/LanguagePl.php
@@ -1,6 +1,5 @@
 <?
-global $IP;
-include_once("{$IP}/LanguageUtf8.php");
+include_once("LanguageUtf8.php");
 
 # NOTE: To turn off "Current Events" in the sidebar,
 # set "currentevents" => "-"

diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index 629e921..c9dabcb 100644 (file)
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -1,6 +1,6 @@
 <?
 
-include_once("$IP/LanguageUtf8.php");
+include_once("LanguageUtf8.php");
 
 # Tu môžete meniť názvy "namespaces" (no proste, rôznych častí encyklopédie),
 # ale čísla nechajte tak, ako sú! Program to tak vyžaduje...

diff --git a/languages/LanguageUtf8.php b/languages/LanguageUtf8.php
index 5106512..a0b622f 100644 (file)
--- a/languages/LanguageUtf8.php
+++ b/languages/LanguageUtf8.php
@@ -7,7 +7,7 @@ $wikiUpperChars = $wgMemc->get( $key1 = "$wgDBname:utf8:upper" );
 $wikiLowerChars = $wgMemc->get( $key2 = "$wgDBname:utf8:lower" );
 
 if(($wikiUpperChars === false) || ($wikiLowerChars === false)) {
-       include_once("$IP/Utf8Case.php");
+       include_once( "Utf8Case.php" );
        $wgMemc->set( $key1, $wikiUpperChars );
        $wgMemc->set( $key2, $wikiLowerChars );
 }

diff --git a/texvc.phtml b/texvc.phtml
index eefb444..4dfd732 100644 (file)
--- a/texvc.phtml
+++ b/texvc.phtml
@@ -1,7 +1,6 @@
 <?
-global $IP;
 include( "./LocalSettings.php" );
-include( "$IP/Setup.php" );
+include( "Setup.php" );
 header( "Content-type: text/xml; charset={$wgInputEncoding}" );
 print "<";
 print "?xml version=\"1.0\" encoding=\"utf-8\"?";

diff --git a/wiki.phtml b/wiki.phtml
index 1c61640..2ab801a 100644 (file)
--- a/wiki.phtml
+++ b/wiki.phtml
@@ -10,9 +10,16 @@ session_register( "wsUserName" );
 session_register( "wsUserPassword" );
 session_register( "wsUploadFiles" );
 
-global $IP;
+unset( $IP );
+ini_set( "allow_url_fopen", 0 ); # For security...
 include_once( "./LocalSettings.php" );
-include_once( "$IP/Setup.php" );
+
+$include_path = ini_get( "include_path" );
+# Windows requires ';' as separator, ':' for Unix
+if( strchr( $include_path, ";" ) ) $sep = ";"; else $sep = ":";
+ini_set( "include_path", $IP . $sep . ini_get( "include_path" ) );
+
+include_once( "Setup.php" );
 
 wfProfileIn( "main-misc-setup" );
 OutputPage::setEncodings(); # Not really used yet
@@ -64,7 +71,7 @@ if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
        
        switch( $wgTitle->getNamespace() ) {
        case 6:
-               include_once( "$IP/ImagePage.php" );
+               include_once( "ImagePage.php" );
                $wgArticle = new ImagePage( $wgTitle );
                break;
        default:
@@ -88,7 +95,7 @@ if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
                        break;
                case "edit":
                case "submit":
-                       include_once( "$IP/EditPage.php" );
+                       include_once( "EditPage.php" );
                        $editor = new EditPage( $wgArticle );
                        $editor->$action();
                        break;