X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=img_auth.php;h=d7125897c5f9941e629bb361aa961067ec3888ac;hb=a827739fb5e494ad657719d58ca5158247ed632f;hp=7f922c52239190a4591b64e9e7252a442774544f;hpb=5275f9b097cdae5dbab0845e3ea127086e3a6570;p=lhc%2Fweb%2Fwiklou.git

diff --git a/img_auth.php b/img_auth.php
index 7f922c5223..d7125897c5 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Image authorisation script
  *
@@ -22,13 +21,27 @@
  *
  * Your server needs to support PATH_INFO; CGI-based configurations usually don't.
  *
- * @file
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
- **/
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
 
 define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
 if ( isset( $_SERVER['MW_COMPILED'] ) ) {
-	require ( 'phase3/includes/WebStart.php' );
+	require ( 'core/includes/WebStart.php' );
 } else {
 	require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
 }
@@ -43,7 +56,7 @@ wfImageAuthMain();
 wfLogProfilingData();
 
 function wfImageAuthMain() {
-	global $wgImgAuthPublicTest, $wgRequest, $wgUploadDirectory;
+	global $wgImgAuthPublicTest, $wgRequest;
 
 	// See if this is a public Wiki (no protections).
 	if ( $wgImgAuthPublicTest
@@ -56,6 +69,10 @@ function wfImageAuthMain() {
 
 	// Get the requested file path (source file or thumbnail)
 	$matches = WebRequest::getPathInfo();
+	if ( !isset( $matches['title'] ) ) {
+		wfForbidden( 'img-auth-accessdenied', 'img-auth-nopathinfo' );
+		return;
+	}
 	$path = $matches['title'];
 	if ( $path && $path[0] !== '/' ) {
 		// Make sure $path has a leading /
@@ -88,7 +105,7 @@ function wfImageAuthMain() {
 	}
 
 	// Check to see if the file exists
-	if ( !$repo->fileExists( $filename, FileRepo::FILES_ONLY ) ) {
+	if ( !$repo->fileExists( $filename ) ) {
 		wfForbidden( 'img-auth-accessdenied','img-auth-nofile', $filename );
 		return;
 	}
@@ -104,7 +121,7 @@ function wfImageAuthMain() {
 		wfForbidden( $result[0], $result[1], array_slice( $result, 2 ) );
 		return;
 	}
-	
+
 	// Check user authorization for this title
 	// Checks Whitelist too
 	if ( !$title->userCan( 'read' ) ) {