From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 23 Mar 2004 10:28:28 +0000 (+0000)
Subject: secured command line scripts against web server invocation, plus a minor bug fix
X-Git-Tag: 1.3.0beta1~729
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=e78c7729e25d7fa98e451a921fe0dcac0871d88d;p=lhc%2Fweb%2Fwiklou.git

secured command line scripts against web server invocation, plus a minor bug fix
---

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index dbf1ad8ca8..216ee9c068 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,8 +1,14 @@
 <?php
+
+if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
+	print "This script must be run from the command line\n";
+	exit();
+}
+
 $wgCommandLineMode = true;
 
 $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
-if ( $argv[1] ) {
+if ( @$argv[1] ) {
 	$lang = $argv[1];
 	putenv( "wikilang=$lang");
 	$settingsFile = "/apache/htdocs/{$argv[1]}/w/LocalSettings.php";
@@ -18,11 +24,11 @@ if ( ! is_readable( $settingsFile ) ) {
 	exit();
 }
 
-ini_set( "include_path", "../includes$sep../languages$sep$newpath$IP$sep$include_path" );
 
 $wgCommandLineMode = true;
 $DP = "../includes";
 include_once( $settingsFile );
+ini_set( "include_path", "../includes$sep../languages$sep$newpath$IP$sep$include_path" );
 
 include_once( "Setup.php" );
 include_once( "./InitialiseMessages.inc" );