diff options
Diffstat (limited to 'includes/media/DjVu.php')
-rw-r--r-- | includes/media/DjVu.php | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php index 84672e05..b9e89d9d 100644 --- a/includes/media/DjVu.php +++ b/includes/media/DjVu.php @@ -183,9 +183,9 @@ class DjVuHandler extends ImageHandler { if ( $wgDjvuPostProcessor ) { $cmd .= " | {$wgDjvuPostProcessor}"; } - $cmd .= ' > ' . wfEscapeShellArg($dstPath) . ') 2>&1'; + $cmd .= ' > ' . wfEscapeShellArg( $dstPath ) . ') 2>&1'; wfProfileIn( 'ddjvu' ); - wfDebug( __METHOD__.": $cmd\n" ); + wfDebug( __METHOD__ . ": $cmd\n" ); $retval = ''; $err = wfShellExec( $cmd, $retval ); wfProfileOut( 'ddjvu' ); @@ -194,7 +194,7 @@ class DjVuHandler extends ImageHandler { if ( $retval != 0 || $removed ) { wfDebugLog( 'thumbnail', sprintf( 'thumbnail failed on %s: error %d "%s" from "%s"', - wfHostname(), $retval, trim($err), $cmd ) ); + wfHostname(), $retval, trim( $err ), $cmd ) ); return new MediaTransformError( 'thumbnail_error', $width, $height, $err ); } else { $params = array( @@ -228,7 +228,7 @@ class DjVuHandler extends ImageHandler { * @param $gettext Boolean: DOCUMENT (Default: false) * @return bool */ - function getMetaTree( $image , $gettext = false ) { + function getMetaTree( $image, $gettext = false ) { if ( isset( $image->dejaMetaTree ) ) { return $image->dejaMetaTree; } @@ -246,24 +246,23 @@ class DjVuHandler extends ImageHandler { $image->dejaMetaTree = false; $image->djvuTextTree = false; $tree = new SimpleXMLElement( $metadata ); - if( $tree->getName() == 'mw-djvu' ) { - foreach($tree->children() as $b){ - if( $b->getName() == 'DjVuTxt' ) { + if ( $tree->getName() == 'mw-djvu' ) { + foreach ( $tree->children() as $b ) { + if ( $b->getName() == 'DjVuTxt' ) { $image->djvuTextTree = $b; - } - elseif ( $b->getName() == 'DjVuXML' ) { + } elseif ( $b->getName() == 'DjVuXML' ) { $image->dejaMetaTree = $b; } } } else { $image->dejaMetaTree = $tree; } - } catch( Exception $e ) { + } catch ( Exception $e ) { wfDebug( "Bogus multipage XML metadata on '{$image->getName()}'\n" ); } wfRestoreWarnings(); wfProfileOut( __METHOD__ ); - if( $gettext ) { + if ( $gettext ) { return $image->djvuTextTree; } else { return $image->dejaMetaTree; @@ -294,7 +293,7 @@ class DjVuHandler extends ImageHandler { } function isMetadataValid( $image, $metadata ) { - return !empty( $metadata ) && $metadata != serialize(array()); + return !empty( $metadata ) && $metadata != serialize( array() ); } function pageCount( $image ) { @@ -311,7 +310,7 @@ class DjVuHandler extends ImageHandler { return false; } - $o = $tree->BODY[0]->OBJECT[$page-1]; + $o = $tree->BODY[0]->OBJECT[$page - 1]; if ( $o ) { return array( 'width' => intval( $o['width'] ), @@ -322,13 +321,13 @@ class DjVuHandler extends ImageHandler { } } - function getPageText( $image, $page ){ + function getPageText( $image, $page ) { $tree = $this->getMetaTree( $image, true ); if ( !$tree ) { return false; } - $o = $tree->BODY[0]->PAGE[$page-1]; + $o = $tree->BODY[0]->PAGE[$page - 1]; if ( $o ) { $txt = $o['value']; return $txt; |