From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 5 Sep 2005 06:16:48 +0000 (+0000)
Subject: * Add 'reupload' and 'reupload-shared' permission keys to restrict new
X-Git-Tag: 1.6.0~1723
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=22f612045970b00f0574ad43b1345727ee358289;p=lhc%2Fweb%2Fwiklou.git

* Add 'reupload' and 'reupload-shared' permission keys to restrict new
uploads overwriting existing files; default is the old behavior (allowed).
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c58356548f..49441727d1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -82,6 +82,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3306) Document $wgLocalTZoffset
 * (bug 3304) Language file for Croatian (LanguageHr.php)
 * (bug 2143) Update Vietnamese interface
+* Add 'reupload' and 'reupload-shared' permission keys to restrict new uploads
+  overwriting existing files; default is the old behavior (allowed).
 
 
 === Caveats ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 273146a69a..0fbc7ee943 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -710,6 +710,8 @@ $wgGroupPermissions['user' ]['move']            = true;
 $wgGroupPermissions['user' ]['read']            = true;
 $wgGroupPermissions['user' ]['edit']            = true;
 $wgGroupPermissions['user' ]['upload']          = true;
+$wgGroupPermissions['user' ]['reupload']        = true;
+$wgGroupPermissions['user' ]['reupload-shared'] = true;
 
 $wgGroupPermissions['bot'  ]['bot']             = true;
 
@@ -724,6 +726,8 @@ $wgGroupPermissions['sysop']['patrol']          = true;
 $wgGroupPermissions['sysop']['protect']         = true;
 $wgGroupPermissions['sysop']['rollback']        = true;
 $wgGroupPermissions['sysop']['upload']          = true;
+$wgGroupPermissions['sysop']['reupload']        = true;
+$wgGroupPermissions['sysop']['reupload-shared'] = true;
 
 $wgGroupPermissions['bureaucrat']['userrights'] = true;
 // Used by the Special:Renameuser extension
diff --git a/includes/Image.php b/includes/Image.php
index 8076a71f37..674ce74f12 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1484,6 +1484,16 @@ class Image
 			$fname
 		);
 	}
+	
+	/**
+	 * Returns true if the image does not come from the shared
+	 * image repository.
+	 *
+	 * @return bool
+	 */
+	function isLocal() {
+		return !$this->fromSharedDirectory;
+	}
 
 } //class
 
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 4c6cf28c8e..33c3c9cf96 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -286,9 +286,11 @@ END
 			return;
 
 		$sk = $wgUser->getSkin();
-		$wgOut->addHTML( '<br /><ul><li>' );
-		$wgOut->addWikiText( '<div>'. wfMsg( 'uploadnewversion', $this->getUploadUrl() ) .'</div>' );
-		$wgOut->addHTML( '</li><li>' );
+		$wgOut->addHTML( '<br /><ul>' );
+		if( $wgUser->isAllowed( 'reupload' ) ) {	
+			$wgOut->addWikiText( "<li>\n<div>". wfMsg( 'uploadnewversion', $this->getUploadUrl() ) ."</div>\n</li>\n" );
+		}
+		$wgOut->addHTML( '<li>' );
 		$wgOut->addHTML( $sk->makeKnownLinkObj( $this->mTitle,
 			wfMsg( 'edit-externally' ), "action=edit&externaledit=true&mode=file" ) );
 		$wgOut->addWikiText( '<div>' .  wfMsg('edit-externally-help') . '</div>' );
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 951b23b45f..185700f6c0 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -201,6 +201,14 @@ class UploadForm {
 		if( !$nt->userCanEdit() ) {
 			return $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) );
 		}
+		
+		/**
+		 * In some cases we may forbid overwriting of existing files.
+		 */
+		$overwrite = $this->checkOverwrite( $this->mUploadSaveName );
+		if( WikiError::isError( $overwrite ) ) {
+			return $this->uploadError( $overwrite->toString() );
+		}
 
 		/* Don't allow users to override the blacklist (check file extension) */
 		global $wgStrictFileExtensions;
@@ -949,6 +957,45 @@ class UploadForm {
 			unlink( $this->mUploadTempName );
 		}
 	}
+	
+	/**
+	 * Check if there's an overwrite conflict and, if so, if restrictions
+	 * forbid this user from performing the upload.
+	 *
+	 * @return mixed true on success, WikiError on failure
+	 * @access private
+	 */
+	function checkOverwrite( $name ) {
+		$img = Image::newFromName( $name );
+		if( is_null( $img ) ) {
+			// Uh... this shouldn't happen ;)
+			// But if it does, fall through to previous behavior
+			return false;
+		}
+		
+		$error = '';
+		if( $img->exists() ) {
+			global $wgUser, $wgOut;
+			if( $img->isLocal() ) {
+				if( !$wgUser->isAllowed( 'reupload' ) ) {
+					$error = 'fileexists-forbidden';
+				}
+			} else {
+				if( !$wgUser->isAllowed( 'reupload' ) ||
+				    !$wgUser->isAllowed( 'reupload-shared' ) ) {
+					$error = "fileexists-shared-forbidden";
+				}
+			}
+		}
+		
+		if( $error ) {
+			$errorText = wfMsg( $error, wfEscapeWikiText( $img->getName() ) );
+			return new WikiError( $wgOut->parse( $errorText ) );
+		}
+		
+		// Rockin', go ahead and upload
+		return true;
+	}
 
 }
 ?>
diff --git a/languages/Language.php b/languages/Language.php
index 9ac41132a7..f8b19700a8 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1017,6 +1017,8 @@ To include the image in a page, use a link in the form
 'largefileserver' => 'This file is bigger than the server is configured to allow.',
 'emptyfile'		=> 'The file you uploaded seems to be empty. This might be due to a typo in the file name. Please check whether you really want to upload this file.',
 'fileexists'		=> 'A file with this name exists already, please check $1 if you are not sure if you want to change it.',
+'fileexists-forbidden' => 'A file with this name exists already; please go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]',
+'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository; lease go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]',
 'successfulupload' => 'Successful upload',
 'fileuploaded'	=> "File $1 uploaded successfully.
 Please follow this link: $2 to the description page and fill