Made two new global variables for checking file extensions. The list of

extensions is now configurable, and you can turn on and off file extension
checking. There isn't yet a "hard" check, though.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ed08e9b..e5ae725 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -152,6 +152,16 @@ $wgDisableAnonTalk = false;
 # Requires zlib support enabled in PHP.
 $wgUseGzip = false;
 
+# This is the list of preferred extensions for uploading files. Uploading
+# files with extensions not in this list will trigger a warning.
+
+$wgFileExtensions = array( "png", "jpg", "jpeg", "ogg" );
+
+# This is a flag to determine whether or not to check file extensions on
+# upload.
+
+$wgCheckFileExtensions = true;
+
 $wgPasswordSalt = true; # For compatibility with old installations set to false
 
 # Which namespaces should support subpages?

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 16ab982..03041de 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -39,7 +39,8 @@ function processUpload()
        global $wpUploadSaveName, $wpUploadTempName, $wpUploadSize;
        global $wgSavedFile, $wgUploadOldVersion, $wpUploadOldVersion;
        global $wgUseCopyrightUpload , $wpUploadCopyStatus , $wpUploadSource ;
-
+        global $wgCheckFileExtensions, $wgFileExtensions;
+      
        if ( $wgUseCopyrightUpload )
          {
            $wpUploadAffirm = 1 ;
@@ -86,10 +87,12 @@ function processUpload()
                  ( 0 != strcmp( ucfirst( $basename ), $wpUploadSaveName ) ) ) {
                        return uploadWarning( wfMsg( "badfilename", $wpUploadSaveName ) );
                }
-               $extensions = array( "png", "jpg", "jpeg", "ogg" ); 
-               if ( ( ! $wpIgnoreWarning ) &&
-                 ( ! in_array( strtolower( $ext ), $extensions ) ) ) {
+           
+               if ( $wgCheckFileExtensions ) {
+                   if ( ( ! $wpIgnoreWarning ) &&
+                        ( ! in_array( strtolower( $ext ), $wgFileExtensions ) ) ) {
                        return uploadWarning( wfMsg( "badfiletype", $ext ) );
+                   }
                }
                if ( ( ! $wpIgnoreWarning ) && ( $wpUploadSize > 150000 ) ) {
                        return uploadWarning( WfMsg( "largefile" ) );