diff options
Diffstat (limited to 'includes/api/ApiImageRotate.php')
-rw-r--r-- | includes/api/ApiImageRotate.php | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php index b2d75825..7a60e831 100644 --- a/includes/api/ApiImageRotate.php +++ b/includes/api/ApiImageRotate.php @@ -22,7 +22,6 @@ */ class ApiImageRotate extends ApiBase { - private $mPageSet = null; public function __construct( $main, $action ) { @@ -38,32 +37,29 @@ class ApiImageRotate extends ApiBase { */ private static function addValues( array &$result, $values, $flag = null, $name = null ) { foreach ( $values as $val ) { - if( $val instanceof Title ) { + if ( $val instanceof Title ) { $v = array(); ApiQueryBase::addTitleInfo( $v, $val ); - } elseif( $name !== null ) { + } elseif ( $name !== null ) { $v = array( $name => $val ); } else { $v = $val; } - if( $flag !== null ) { + if ( $flag !== null ) { $v[$flag] = ''; } $result[] = $v; } } - public function execute() { $params = $this->extractRequestParams(); - $rotation = $params[ 'rotation' ]; - $user = $this->getUser(); + $rotation = $params['rotation']; $pageSet = $this->getPageSet(); $pageSet->execute(); $result = array(); - $result = array(); self::addValues( $result, $pageSet->getInvalidTitles(), 'invalid', 'title' ); self::addValues( $result, $pageSet->getSpecialTitles(), 'special', 'title' ); @@ -111,15 +107,17 @@ class ApiImageRotate extends ApiBase { continue; } $ext = strtolower( pathinfo( "$srcPath", PATHINFO_EXTENSION ) ); - $tmpFile = TempFSFile::factory( 'rotate_', $ext); + $tmpFile = TempFSFile::factory( 'rotate_', $ext ); $dstPath = $tmpFile->getPath(); $err = $handler->rotate( $file, array( "srcPath" => $srcPath, "dstPath" => $dstPath, - "rotation"=> $rotation + "rotation" => $rotation ) ); if ( !$err ) { - $comment = wfMessage( 'rotate-comment' )->numParams( $rotation )->text(); + $comment = wfMessage( + 'rotate-comment' + )->numParams( $rotation )->inContentLanguage()->text(); $status = $file->upload( $dstPath, $comment, $comment, 0, false, false, $this->getUser() ); if ( $status->isGood() ) { @@ -152,13 +150,14 @@ class ApiImageRotate extends ApiBase { /** * Checks that the user has permissions to perform rotations. - * @param $user User The user to check. + * @param User $user The user to check + * @param Title $title * @return string|null Permission error message, or null if there is no error */ protected function checkPermissions( $user, $title ) { $permissionErrors = array_merge( - $title->getUserPermissionsErrors( 'edit' , $user ), - $title->getUserPermissionsErrors( 'upload' , $user ) + $title->getUserPermissionsErrors( 'edit', $user ), + $title->getUserPermissionsErrors( 'upload', $user ) ); if ( $permissionErrors ) { @@ -179,7 +178,6 @@ class ApiImageRotate extends ApiBase { } public function getAllowedParams( $flags = 0 ) { - $pageSet = $this->getPageSet(); $result = array( 'rotation' => array( ApiBase::PARAM_TYPE => array( '90', '180', '270' ), @@ -198,7 +196,7 @@ class ApiImageRotate extends ApiBase { public function getParamDescription() { $pageSet = $this->getPageSet(); - return $pageSet->getParamDescription() + array( + return $pageSet->getFinalParamDescription() + array( 'rotation' => 'Degrees to rotate image clockwise', 'token' => 'Edit token. You can get one of these through action=tokens', ); @@ -220,7 +218,7 @@ class ApiImageRotate extends ApiBase { $pageSet = $this->getPageSet(); return array_merge( parent::getPossibleErrors(), - $pageSet->getPossibleErrors() + $pageSet->getFinalPossibleErrors() ); } |