* The copyright confirmation box at Special:Upload can now be turned off by setting

[lhc/web/wiklou.git] / includes / SpecialUpload.php

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 93ae71f..b88b098 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -99,8 +99,7 @@ class UploadForm {
                }
 
                /** Various rights checks */
-               if( ( $wgUser->isAnon() )
-                        OR $wgUser->isBlocked() ) {
+               if( !$wgUser->isAllowed( 'upload' ) || $wgUser->isBlocked() ) {
                        $wgOut->errorpage( 'uploadnologin', 'uploadnologintext' );
                        return;
                }
@@ -134,7 +133,7 @@ class UploadForm {
         */
        function processUpload() {
                global $wgUser, $wgOut, $wgLang, $wgContLang;
-               global $wgUploadDirectory;
+               global $wgUploadDirectory, $wgCopyrightAffirmation;
                global $wgUseCopyrightUpload, $wgCheckCopyrightUpload;
 
                /**
@@ -143,7 +142,9 @@ class UploadForm {
                if( trim( $this->mOname ) == '' || empty( $this->mUploadSize ) ) {
                        return $this->mainUploadForm('<li>'.wfMsg( 'emptyfile' ).'</li>');
                }
-               
+
+               if ( !$wgCopyrightAffirmation )
+                       $this->mUploadAffirm = true;
                /**
                 * When using detailed copyright, if user filled field, assume he
                 * confirmed the upload
@@ -532,7 +533,7 @@ class UploadForm {
         */
        function mainUploadForm( $msg='' ) {
                global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest;
-               global $wgUseCopyrightUpload;
+               global $wgUseCopyrightUpload, $wgCopyrightAffirmation;
                
                $cols = intval($wgUser->getOption( 'cols' ));
                $ew = $wgUser->getOption( 'editwidth' );
@@ -563,12 +564,15 @@ class UploadForm {
                $action = $titleObj->escapeLocalURL();
 
                $encDestFile = htmlspecialchars( $this->mDestFile );
+               $source = null;
 
+               if ( $wgCopyrightAffirmation ) {
                $source = "
        <td align='right'>
        <input tabindex='3' type='checkbox' name='wpUploadAffirm' value='1' id='wpUploadAffirm' />
        </td><td align='left'><label for='wpUploadAffirm'>{$ca}</label></td>
        " ;
+               }
                if ( $wgUseCopyrightUpload )
                  {
                        $source = "