Erikmitk / kitodo-presentation

Classes/Controller/MetadataController.php

Braces +9 added lines, -18 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class MetadataController extends AbstractController
-{
+class MetadataController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -39,8 +38,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -52,8 +50,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -65,16 +62,14 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
     /**
      * @return string|void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->cObj = $this->configurationManager->getContentObject();
 
         // Load current document.
@@ -130,8 +125,7 @@ 
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadata, $useOriginalIiifManifestMetadata = false)
-    {
+    protected function printMetadata(array $metadata, $useOriginalIiifManifestMetadata = false) {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
             foreach ($metadata as $row) {
@@ -269,8 +263,7 @@ 
                     }
 
                     if (is_array($metadata[$i][$name])) {
-                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function($metadataValue)
-                        {
+                        $metadata[$i][$name] = array_values(array_filter($metadata[$i][$name], function($metadataValue) {
                             return !empty($metadataValue);
                         }));
                     }
@@ -294,8 +287,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadata()
-    {
+    private function getMetadata() {
         $metadata = [];
         if ($this->settings['rootline'] < 2) {
             // Get current structure's @ID.
@@ -333,8 +325,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadataForIds($id, $metadata)
-    {
+    private function getMetadataForIds($id, $metadata) {
         $useOriginalIiifManifestMetadata = $this->settings['originalIiifMetadata'] == 1 && $this->document->getDoc() instanceof IiifManifest;
         foreach ($id as $sid) {
             if ($useOriginalIiifManifestMetadata) {

Classes/Common/MetsDocument.php

Braces +32 added lines, -64 removed lines

@@ -50,8 +50,7 @@ 
  * @property-read string $toplevelId This holds the toplevel structure's @ID (METS) or the manifest's @id (IIIF)
  * @property-read string $parentHref URL of the parent document (determined via mptr element), or empty string if none is available
  */
-final class MetsDocument extends Doc
-{
+final class MetsDocument extends Doc {
     /**
      * Subsections / tags that may occur within `<mets:amdSec>`.
      *
@@ -176,8 +175,7 @@ 
      *
      * @return  void
      */
-    public function addMetadataFromMets(&$metadata, $id)
-    {
+    public function addMetadataFromMets(&$metadata, $id) {
         $details = $this->getLogicalStructure($id);
         if (!empty($details)) {
             $metadata['mets_order'][0] = $details['order'];
@@ -191,8 +189,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::establishRecordId()
      */
-    protected function establishRecordId($pid)
-    {
+    protected function establishRecordId($pid) {
         // Check for METS object @ID.
         if (!empty($this->mets['OBJID'])) {
             $this->recordId = (string) $this->mets['OBJID'];
@@ -212,8 +209,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getDownloadLocation()
      */
-    public function getDownloadLocation($id)
-    {
+    public function getDownloadLocation($id) {
         $fileMimeType = $this->getFileMimeType($id);
         $fileLocation = $this->getFileLocation($id);
         if ($fileMimeType === 'application/vnd.kitodo.iiif') {
@@ -238,8 +234,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getFileLocation()
      */
-    public function getFileLocation($id)
-    {
+    public function getFileLocation($id) {
         $location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/mets:FLocat[@LOCTYPE="URL"]');
         if (
             !empty($id)
@@ -256,8 +251,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getFileMimeType()
      */
-    public function getFileMimeType($id)
-    {
+    public function getFileMimeType($id) {
         $mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/@MIMETYPE');
         if (
             !empty($id)
@@ -274,8 +268,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getLogicalStructure()
      */
-    public function getLogicalStructure($id, $recursive = false)
-    {
+    public function getLogicalStructure($id, $recursive = false) {
         $details = [];
         // Is the requested logical unit already loaded?
         if (
@@ -315,8 +308,7 @@ 
      *
      * @return array Array of the element's id, label, type and physical page indexes/mptr link
      */
-    protected function getLogicalStructureInfo(\SimpleXMLElement $structure, $recursive = false)
-    {
+    protected function getLogicalStructureInfo(\SimpleXMLElement $structure, $recursive = false) {
         // Get attributes.
         foreach ($structure->attributes() as $attribute => $value) {
             $attributes[$attribute] = (string) $value;
@@ -420,8 +412,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getMetadata()
      */
-    public function getMetadata($id, $cPid = 0)
-    {
+    public function getMetadata($id, $cPid = 0) {
         // Make sure $cPid is a non-negative integer.
         $cPid = max(intval($cPid), 0);
         // If $cPid is not given, try to get it elsewhere.
@@ -675,8 +666,7 @@ 
      * @param string $id: The "@ID" attribute of the file node
      * @return void
      */
-    protected function getMetadataIds($id)
-    {
+    protected function getMetadataIds($id) {
         // Load amdSecChildIds concordance
         $this->_getMdSec();
         $this->_getFileInfos();
@@ -723,8 +713,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::getFullText()
      */
-    public function getFullText($id)
-    {
+    public function getFullText($id) {
         $fullText = '';
 
         // Load fileGrps and check for full text files.
@@ -739,8 +728,7 @@ 
      * {@inheritDoc}
      * @see Doc::getStructureDepth()
      */
-    public function getStructureDepth($logId)
-    {
+    public function getStructureDepth($logId) {
         $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $logId . '"]/ancestor::*');
         if (!empty($ancestors)) {
             return count($ancestors);
@@ -753,8 +741,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::init()
      */
-    protected function init($location)
-    {
+    protected function init($location) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(get_class($this));
         // Get METS node from XML file.
         $this->registerNamespaces($this->xml);
@@ -778,8 +765,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::loadLocation()
      */
-    protected function loadLocation($location)
-    {
+    protected function loadLocation($location) {
         $fileResource = Helper::getUrl($location);
         if ($fileResource !== false) {
             $xml = Helper::getXmlFileAsString($fileResource);
@@ -797,8 +783,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::ensureHasFulltextIsSet()
      */
-    protected function ensureHasFulltextIsSet()
-    {
+    protected function ensureHasFulltextIsSet() {
         // Are the fileGrps already loaded?
         if (!$this->fileGrpsLoaded) {
             $this->_getFileGrps();
@@ -809,8 +794,7 @@ 
      * {@inheritDoc}
      * @see Doc::setPreloadedDocument()
      */
-    protected function setPreloadedDocument($preloadedDocument)
-    {
+    protected function setPreloadedDocument($preloadedDocument) {
 
         if ($preloadedDocument instanceof \SimpleXMLElement) {
             $this->xml = $preloadedDocument;
@@ -823,8 +807,7 @@ 
      * {@inheritDoc}
      * @see Doc::getDocument()
      */
-    protected function getDocument()
-    {
+    protected function getDocument() {
         return $this->mets;
     }
 
@@ -835,8 +818,7 @@ 
      *
      * @return array Array of metadata sections with their IDs as array key
      */
-    protected function _getMdSec()
-    {
+    protected function _getMdSec() {
         if (!$this->mdSecLoaded) {
             $this->loadFormats();
 
@@ -878,8 +860,7 @@ 
         return $this->mdSec;
     }
 
-    protected function _getDmdSec()
-    {
+    protected function _getDmdSec() {
         $this->_getMdSec();
         return $this->dmdSec;
     }
@@ -893,8 +874,7 @@ 
      *
      * @return array|null The processed metadata section
      */
-    protected function processMdSec($element)
-    {
+    protected function processMdSec($element) {
         $mdId = (string) $element->attributes()->ID;
         if (empty($mdId)) {
             return null;
@@ -934,8 +914,7 @@ 
      *
      * @return array Array of file use groups with file IDs
      */
-    protected function _getFileGrps()
-    {
+    protected function _getFileGrps() {
         if (!$this->fileGrpsLoaded) {
             // Get configured USE attributes.
             $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
@@ -987,8 +966,7 @@ 
      * @access protected
      * @return array
      */
-    protected function _getFileInfos()
-    {
+    protected function _getFileInfos() {
         $this->_getFileGrps();
         return $this->fileInfos;
     }
@@ -997,8 +975,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::prepareMetadataArray()
      */
-    protected function prepareMetadataArray($cPid)
-    {
+    protected function prepareMetadataArray($cPid) {
         $ids = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID]/@ID');
         // Get all logical structure nodes with metadata.
         if (!empty($ids)) {
@@ -1016,8 +993,7 @@ 
      *
      * @return \SimpleXMLElement The XML's METS part as \SimpleXMLElement object
      */
-    protected function _getMets()
-    {
+    protected function _getMets() {
         return $this->mets;
     }
 
@@ -1025,8 +1001,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getPhysicalStructure()
      */
-    protected function _getPhysicalStructure()
-    {
+    protected function _getPhysicalStructure() {
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
             // Does the document have a structMap node of type "PHYSICAL"?
@@ -1088,8 +1063,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getSmLinks()
      */
-    protected function _getSmLinks()
-    {
+    protected function _getSmLinks() {
         if (!$this->smLinksLoaded) {
             $smLinks = $this->mets->xpath('./mets:structLink/mets:smLink');
             if (!empty($smLinks)) {
@@ -1107,8 +1081,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getThumbnail()
      */
-    protected function _getThumbnail($forceReload = false)
-    {
+    protected function _getThumbnail($forceReload = false) {
         if (
             !$this->thumbnailLoaded
             || $forceReload
@@ -1187,8 +1160,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Doc::_getToplevelId()
      */
-    protected function _getToplevelId()
-    {
+    protected function _getToplevelId() {
         if (empty($this->toplevelId)) {
             // Get all logical structure nodes with metadata, but without associated METS-Pointers.
             $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID and not(./mets:mptr)]');
@@ -1217,8 +1189,7 @@ 
      *
      * @return string|null
      */
-    public function _getParentHref()
-    {
+    public function _getParentHref() {
         if ($this->parentHref === null) {
             $this->parentHref = '';
 
@@ -1240,8 +1211,7 @@ 
      *
      * @return array Properties to be serialized
      */
-    public function __sleep()
-    {
+    public function __sleep() {
         // \SimpleXMLElement objects can't be serialized, thus save the XML as string for serialization
         $this->asXML = $this->xml->asXML();
         return ['uid', 'pid', 'recordId', 'parentId', 'asXML'];
@@ -1254,8 +1224,7 @@ 
      *
      * @return string String representing the METS object
      */
-    public function __toString()
-    {
+    public function __toString() {
         $xml = new \DOMDocument('1.0', 'utf-8');
         $xml->appendChild($xml->importNode(dom_import_simplexml($this->mets), true));
         $xml->formatOutput = true;
@@ -1270,8 +1239,7 @@ 
      *
      * @return void
      */
-    public function __wakeup()
-    {
+    public function __wakeup() {
         $xml = Helper::getXmlFileAsString($this->asXML);
         if ($xml !== false) {
             $this->asXML = '';

Classes/Controller/SearchController.php

Braces +10 added lines, -20 removed lines

@@ -32,8 +32,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class SearchController extends AbstractController
-{
+class SearchController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -42,8 +41,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -55,8 +53,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -71,8 +68,7 @@ 
      *
      * @return void
      */
-    public function searchAction()
-    {
+    public function searchAction() {
         // if search was triggered, get search parameters from POST variables
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
@@ -87,8 +83,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $listViewSearch = false;
         // Quit without doing anything if required variables are not set.
         if (empty($this->settings['solrcore'])) {
@@ -188,8 +183,7 @@ 
      *
      * @return string HTML output of facets menu
      */
-    protected function addFacetsMenu()
-    {
+    protected function addFacetsMenu() {
         // Quit without doing anything if no facets are configured.
         if (empty($this->settings['facets']) && empty($this->settings['facetCollections'])) {
             return '';
@@ -214,8 +208,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($facets)
-    {
+    public function makeFacetsMenuArray($facets) {
         $menuArray = [];
         // Set default value for facet search.
         $search = [
@@ -271,8 +264,7 @@ 
                 // check for virtual collections query string
                 if($collectionEntry->getIndexSearch()) {
                     $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR ('. $collectionEntry->getIndexSearch() . ')' ;
-                }
-                else {
+                } else {
                     $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"';
                 }
             }
@@ -421,8 +413,7 @@ 
      *
      * @return array The array for the facet's menu entry
      */
-    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state)
-    {
+    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
         $entryArray = [];
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -473,8 +464,7 @@ 
      *
      * @return string The extended search form or an empty string
      */
-    protected function addExtendedSearch()
-    {
+    protected function addExtendedSearch() {
         // Quit without doing anything if no fields for extended search are selected.
         if (
             empty($this->settings['extendedSlotCount'])

Classes/Controller/ListViewController.php

Braces +4 added lines, -8 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ListViewController extends AbstractController
-{
+class ListViewController extends AbstractController {
     /**
      * @var CollectionRepository
      */
@@ -39,8 +38,7 @@ 
     /**
      * @param CollectionRepository $collectionRepository
      */
-    public function injectCollectionRepository(CollectionRepository $collectionRepository)
-    {
+    public function injectCollectionRepository(CollectionRepository $collectionRepository) {
         $this->collectionRepository = $collectionRepository;
     }
 
@@ -52,8 +50,7 @@ 
     /**
      * @param MetadataRepository $metadataRepository
      */
-    public function injectMetadataRepository(MetadataRepository $metadataRepository)
-    {
+    public function injectMetadataRepository(MetadataRepository $metadataRepository) {
         $this->metadataRepository = $metadataRepository;
     }
 
@@ -68,8 +65,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
         // extract collection(s) from collection parameter

Classes/Controller/NavigationController.php

Braces +2 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class NavigationController extends AbstractController
-{
+class NavigationController extends AbstractController {
     /**
      * Method to get the page select values and use them with chash
      * @param \Kitodo\Dlf\Domain\Model\PageSelectForm|NULL $pageSelectForm
@@ -53,8 +52,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if ($this->isDocMissing()) {

Classes/Controller/ToolboxController.php

Braces +14 added lines, -28 removed lines

@@ -23,15 +23,13 @@ 
  * @subpackage dlf
  * @access public
  */
-class ToolboxController extends AbstractController
-{
+class ToolboxController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
 
@@ -52,8 +50,7 @@ 
      *
      * @return void
      */
-    public function annotationtool()
-    {
+    public function annotationtool() {
         if ($this->isDocMissingOrEmpty()) {
             // Quit without doing anything if required variables are not set.
             return '';
@@ -91,8 +88,7 @@ 
      *
      * @return void
      */
-    public function fulltextdownloadtool()
-    {
+    public function fulltextdownloadtool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpFulltext'])
@@ -136,8 +132,7 @@ 
      *
      * @return void
      */
-    public function fulltexttool()
-    {
+    public function fulltexttool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpFulltext'])
@@ -181,8 +176,7 @@ 
      *
      * @return void
      */
-    public function imagedownloadtool()
-    {
+    public function imagedownloadtool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->settings['fileGrpsImageDownload'])
@@ -224,8 +218,7 @@ 
      *
      * @return array Array of image links and image format information
      */
-    protected function getImage($page)
-    {
+    protected function getImage($page) {
         $image = [];
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->settings['fileGrpsImageDownload']);
@@ -258,8 +251,7 @@ 
      *
      * @return void
      */
-    public function imagemanipulationtool()
-    {
+    public function imagemanipulationtool() {
         // Set parent element for initialization.
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
 
@@ -272,8 +264,7 @@ 
      *
      * @return void
      */
-    public function pdfdownloadtool()
-    {
+    public function pdfdownloadtool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpDownload'])
@@ -310,8 +301,7 @@ 
      *
      * @return array Link to downloadable page
      */
-    protected function getPageLink()
-    {
+    protected function getPageLink() {
         $page1Link = '';
         $page2Link = '';
         $pageLinkArray = [];
@@ -355,8 +345,7 @@ 
      *
      * @return string Link to downloadable work
      */
-    protected function getWorkLink()
-    {
+    protected function getWorkLink() {
         $workLink = '';
         $fileGrpsDownload = GeneralUtility::trimExplode(',', $this->extConf['fileGrpDownload']);
         // Get work link.
@@ -385,8 +374,7 @@ 
      *
      * @return void
      */
-    public function searchindocumenttool()
-    {
+    public function searchindocumenttool() {
         if (
             $this->isDocMissingOrEmpty()
             || empty($this->extConf['fileGrpFulltext'])
@@ -448,8 +436,7 @@ 
      *
      * @return string with current document id
      */
-    protected function getCurrentDocumentId()
-    {
+    protected function getCurrentDocumentId() {
         $id = $this->document->getUid();
 
         if ($id !== null && $id > 0) {
@@ -484,8 +471,7 @@ 
      *
      * @return string with encrypted core name
      */
-    protected function getEncryptedCoreName()
-    {
+    protected function getEncryptedCoreName() {
         // Get core name.
         $name = Helper::getIndexNameFromUid($this->settings['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.

Classes/Controller/AudioPlayerController.php

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class AudioplayerController extends AbstractController
-{
+class AudioplayerController extends AbstractController {
     /**
      * Holds the current audio file's URL, MIME type and optional label
      *
@@ -42,8 +41,7 @@ 
      *
      * @return void
      */
-    protected function addPlayerJS()
-    {
+    protected function addPlayerJS() {
         // Inline CSS.
         $inlineCSS = '#tx-dlf-audio { width: 100px; height: 100px; }';
 
@@ -72,8 +70,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if ($this->isDocMissingOrEmpty()) {

Classes/Controller/AbstractController.php

Braces +7 added lines, -14 removed lines

@@ -44,8 +44,7 @@ 
     /**
      * @param DocumentRepository $documentRepository
      */
-    public function injectDocumentRepository(DocumentRepository $documentRepository)
-    {
+    public function injectDocumentRepository(DocumentRepository $documentRepository) {
         $this->documentRepository = $documentRepository;
     }
 
@@ -85,8 +84,7 @@ 
      * @access protected
      * @return void
      */
-    protected function initialize()
-    {
+    protected function initialize() {
         $this->requestData = GeneralUtility::_GPmerged('tx_dlf');
         if (empty($this->requestData['page'])) {
             $this->requestData['page'] = 1;
@@ -112,8 +110,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument($requestData)
-    {
+    protected function loadDocument($requestData) {
         // Try to get document format from database
         if (!empty($requestData['id'])) {
 
@@ -178,8 +175,7 @@ 
      *
      * @return boolean
      */
-    protected function isDocMissingOrEmpty()
-    {
+    protected function isDocMissingOrEmpty() {
         return $this->isDocMissing() || $this->document->getDoc()->numPages < 1;
     }
 
@@ -188,8 +184,7 @@ 
      *
      * @return boolean
      */
-    protected function isDocMissing()
-    {
+    protected function isDocMissing() {
         return $this->document === null || $this->document->getDoc() === null;
     }
 
@@ -211,8 +206,7 @@ 
      *
      * @return null|string|array
      */
-    protected function getParametersSafely($parameterName)
-    {
+    protected function getParametersSafely($parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->request->getArgument($parameterName);
         }
@@ -226,8 +220,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->initialize();
     }
 }

Classes/Controller/TableOfContentsController.php

Braces +5 added lines, -10 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class TableOfContentsController extends AbstractController
-{
+class TableOfContentsController extends AbstractController {
     /**
      * This holds the active entries according to the currently selected page
      *
@@ -39,8 +38,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if ($this->isDocMissing()) {
@@ -63,8 +61,7 @@ 
      * @access protected
      * @return array HMENU array
      */
-    protected function makeMenuArray()
-    {
+    protected function makeMenuArray() {
         // Set default values for page if not set.
         // $this->requestData['page'] may be integer or string (physical structure @ID)
         if (
@@ -140,8 +137,7 @@ 
      *
      * @return array HMENU array for menu entry
      */
-    protected function getMenuEntry(array $entry, $recursive = false)
-    {
+    protected function getMenuEntry(array $entry, $recursive = false) {
         $entry = $this->resolveMenuEntry($entry);
 
         $entryArray = [];
@@ -235,8 +231,7 @@ 
      * @param array $entry
      * @return array
      */
-    protected function resolveMenuEntry($entry)
-    {
+    protected function resolveMenuEntry($entry) {
         // If the menu entry points to the parent document,
         // resolve to the parent UID set on indexation.
         $doc = $this->document->getDoc();