if ( $checkUserBlock && ( ( $processed % $checkUserBlock ) == 0 ) ) {
$user->clearInstanceCache( 'name' ); // reload from DB!
- if ( $user->isBlocked() ) {
+ // @TODO Use PermissionManager::isBlockedFrom() instead.
+ if ( $user->getBlock() ) {
$this->output( $user->getName() . " was blocked! Aborting.\n" );
break;
}
$files = [];
while ( ( $file = readdir( $dhl ) ) !== false ) {
if ( is_file( $dir . '/' . $file ) ) {
- list( /* $name */, $ext ) = $this->splitFilename( $dir . '/' . $file );
+ $ext = pathinfo( $file, PATHINFO_EXTENSION );
if ( array_search( strtolower( $ext ), $exts ) !== false ) {
$files[] = $dir . '/' . $file;
}
}
}
- /**
- * Split a filename into filename and extension
- *
- * @param string $filename
- * @return array
- */
- private function splitFilename( $filename ) {
- $parts = explode( '.', $filename );
- $ext = $parts[count( $parts ) - 1];
- unset( $parts[count( $parts ) - 1] );
- $fname = implode( '.', $parts );
-
- return [ $fname, $ext ];
- }
-
/**
* Find an auxilliary file with the given extension, matching
* the give base file path. $maxStrip determines how many extensions