Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor ImagePage::checkSharedConflict()

Browse source
This commit is contained in:
Victor Vasiliev 2008-05-01 22:16:23 +00:00
parent 40da2bd661
commit c6e6dd0764
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
includes/ImagePage.php
View file

@ -376,19 +376,21 @@ EOT
} }
function checkSharedConflict() { function checkSharedConflict() {
global $wgOut, $wgUser, $wgUseSharedUploads; global $wgOut, $wgUser;
if( !$wgUseSharedUploads ) { $repoGroup = RepoGroup::singleton();
if( !$repoGroup->hasForeignRepos() ) {
return; return;
} }
if( $this->repo->getName() != 'local' ) { if( !$this->img->isLocal() ) {
return; return;
} }
$repo = RepoGroup::singleton()->getRepoByName( 'shared' ); $this->dupFile = null;
$dupfile = $repo->newFile( $this->img->getTitle() ); $repoGroup->forEachForeignRepo( array( $this, 'checkSharedConflictCallback' ) );
if( !$dupfile->exists() ) {
if( !$this->dupFile )
return; return;
} $dupfile = $this->dupFile;
$same = ( $same = (
($this->img->getSha1() == $dupfile->getSha1()) && ($this->img->getSha1() == $dupfile->getSha1()) &&
($this->img->getSize() == $dupfile->getSize()) ($this->img->getSize() == $dupfile->getSize())
@ -405,6 +407,13 @@ EOT
} }
} }
function checkSharedConflictCallback( $repo ) {
$dupfile = $repo->newFile( $this->img->getTitle() );
if( $dupfile->exists() )
$this->dupFile = $dupfile;
return $dupfile->exists();
}
function getUploadUrl() { function getUploadUrl() {
$uploadTitle = SpecialPage::getTitleFor( 'Upload' ); $uploadTitle = SpecialPage::getTitleFor( 'Upload' );
return $uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) ); return $uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) );

14
includes/filerepo/RepoGroup.php
View file

@ -134,6 +134,20 @@ class RepoGroup {
return $this->getRepo( 'local' ); return $this->getRepo( 'local' );
} }
function forEachForeignRepo( $callback, $params = array() ) {
foreach( $this->foreignRepos as $repo ) {
$args = array_merge( array( $repo ), $params );
if( call_user_func_array( $callback, $args ) ) {
return true;
}
}
return false;
}
function hasForeignRepos() {
return !empty( $this->foreignRepos );
}
/** /**
* Initialise the $repos array * Initialise the $repos array
*/ */