From 0ec30e2f98b1cf1c6cfd7da8ac6bdfd4f207e920 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 3 Dec 2004 10:57:19 +0000
Subject: [PATCH] Add some conditional die()s to suppress fatal error messages
 if certain files are run directly from the web. On a server concerned about
 path disclosure, display_errors should be off, but we can play nice anyway.

---
 includes/CategoryPage.php        | 5 ++++-
 includes/ImagePage.php           | 3 +++
 includes/SpecialMakesysop.php    | 2 +-
 includes/SpecialPreferences.php  | 3 +++
 includes/templates/Userlogin.php | 2 ++
 skins/CologneBlue.php            | 3 +++
 skins/MonoBook.php               | 3 +++
 skins/MySkin.php                 | 3 +++
 skins/Nostalgia.php              | 3 +++
 skins/Standard.php               | 3 +++
 skins/disabled/Amethyst.php      | 3 +++
 skins/disabled/Chick.php         | 3 +++
 skins/disabled/MonoBookTal.php   | 3 +++
 skins/disabled/WikimediaWiki.php | 3 +++
 14 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 42dae594c5..cb749cf4f3 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -5,8 +5,11 @@
  *
  * @package MediaWiki
  */
+ 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
 
-if ( $wgCategoryMagicGallery ) 
+if( $wgCategoryMagicGallery ) 
 	require_once('ImageGallery.php');
 
 /**
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index d29a431180..0a28e55f94 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -6,6 +6,9 @@
 /**
  *
  */
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 require_once( 'Image.php' );
 
 /**
diff --git a/includes/SpecialMakesysop.php b/includes/SpecialMakesysop.php
index 57eb11ba30..bc6dcf5b1f 100644
--- a/includes/SpecialMakesysop.php
+++ b/includes/SpecialMakesysop.php
@@ -6,7 +6,7 @@
  * @deprecated
  */
 
-wfDebugDieBacktrace('Use SpecialUserlevels instead !!'); // [av]
+die('Use SpecialUserlevels instead !!'); // [av]
 
 
 /**
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 6d9e60219a..dbb452d356 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -5,6 +5,9 @@
  * @subpackage SpecialPage
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /* to get a list of languages in setting user's language preference */
 require_once('languages/Names.php');
 
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 05da76a101..0fcc73e105 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -1,5 +1,7 @@
 <?php
 
+if( !defined( 'MEDIAWIKI' ) ) die();
+
 /**
  * HTML template for Special:Userlogin form
  * @package MediaWiki
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 729739b276..20ed3b4a08 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /**
  * @todo document
  * @package MediaWiki
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 978ce43860..ccdeefcba2 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -10,6 +10,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinTemplate.php');
 
diff --git a/skins/MySkin.php b/skins/MySkin.php
index 22fd1e97a6..2f551b4606 100644
--- a/skins/MySkin.php
+++ b/skins/MySkin.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('MonoBook.php');
 
diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index 0b914bdc86..d29aaf8f65 100644
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /**
  * @todo document
  * @package MediaWiki
diff --git a/skins/Standard.php b/skins/Standard.php
index 6698cf2a4d..155331d6fe 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /**
  * @todo document
  * @package MediaWiki
diff --git a/skins/disabled/Amethyst.php b/skins/disabled/Amethyst.php
index 3bfaa18f99..f387f20779 100644
--- a/skins/disabled/Amethyst.php
+++ b/skins/disabled/Amethyst.php
@@ -12,6 +12,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinPHPTal.php');
 if( class_exists( 'SkinPHPTal' ) ) {
diff --git a/skins/disabled/Chick.php b/skins/disabled/Chick.php
index ee28850a10..205feb6700 100644
--- a/skins/disabled/Chick.php
+++ b/skins/disabled/Chick.php
@@ -7,6 +7,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinPHPTal.php');
 if( class_exists( 'SkinPHPTal' ) ) {
diff --git a/skins/disabled/MonoBookTal.php b/skins/disabled/MonoBookTal.php
index bc0f1215c7..876150ce22 100644
--- a/skins/disabled/MonoBookTal.php
+++ b/skins/disabled/MonoBookTal.php
@@ -14,6 +14,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 require_once('includes/SkinPHPTal.php');
 
diff --git a/skins/disabled/WikimediaWiki.php b/skins/disabled/WikimediaWiki.php
index 608c8b80ec..87564df04f 100644
--- a/skins/disabled/WikimediaWiki.php
+++ b/skins/disabled/WikimediaWiki.php
@@ -6,6 +6,9 @@
  * @subpackage Skins
  */
 
+if( !defined( 'MEDIAWIKI' ) )
+	die();
+
 /** */
 
 require_once('includes/SkinPHPTal.php');
-- 
2.20.1