Erikmitk / kitodo-presentation

Classes/Controller/StatisticsController.php

Spacing +2 added lines, -2 removed lines

@@ -34,13 +34,13 @@
         $countVolumes = $this->documentRepository->countAllVolumes($this->settings);
 
         // Set replacements.
-        $args['###TITLES###'] = $countTitles . ' ' . htmlspecialchars(
+        $args['###TITLES###'] = $countTitles.' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($countTitles > 1 ? 'titles' : 'title'), 'dlf'
             )
         );
 
-        $args['###VOLUMES###'] = $countVolumes . ' ' . htmlspecialchars(
+        $args['###VOLUMES###'] = $countVolumes.' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($countTitles > 1 ? 'volumes' : 'volume'), 'dlf'
             )

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
  * @subpackage dlf
  * @access public
  */
-class StatisticsController extends AbstractController
-{
+class StatisticsController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $countTitles = $this->documentRepository->countAllTitles($this->settings);
         $countVolumes = $this->documentRepository->countAllVolumes($this->settings);
 

Classes/Controller/SearchController.php

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -77,7 +77,7 @@ 
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
         // output is done by main action
-        $this->forward('main', null, null, ['searchParameter' => $this->searchParams]);
+        $this->forward('main', NULL, NULL, ['searchParameter' => $this->searchParams]);
     }
 
     /**
@@ -89,7 +89,7 @@ 
      */
     public function mainAction()
     {
-        $listViewSearch = false;
+        $listViewSearch = FALSE;
         // Quit without doing anything if required variables are not set.
         if (empty($this->settings['solrcore'])) {
             $this->logger->warning('Incomplete plugin configuration');
@@ -103,7 +103,7 @@ 
 
         if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) {
             $this->searchParams = array_merge($this->searchParams ? : [], $listRequestData['searchParameter']);
-            $listViewSearch = true;
+            $listViewSearch = TRUE;
         }
 
         // Pagination of Results: Pass the currentPage to the fluid template to calculate current index of search result.
@@ -114,7 +114,7 @@ 
 
         // If a targetPid is given, the results will be shown by ListView on the target page.
         if (!empty($this->settings['targetPid']) && !empty($this->searchParams) && !$listViewSearch) {
-            $this->redirect('main', 'ListView', null,
+            $this->redirect('main', 'ListView', NULL,
                 [
                     'searchParameter' => $this->searchParams,
                     'widgetPage' => $widgetPage
@@ -125,15 +125,15 @@ 
         // If no search has been executed, no variables habe to be prepared. An empty form will be shown.
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
             // get all sortable metadata records
-            $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+            $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
             // get all metadata records to be shown in results
-            $listedMetadata = $this->metadataRepository->findByIsListed(true);
+            $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
             $solrResults = [];
             // Do not execute the Solr search if used together with ListView plugin.
             if (!$listViewSearch) {
-                $solrResults = $this->documentRepository->findSolrByCollection(null, $this->settings, $this->searchParams, $listedMetadata);
+                $solrResults = $this->documentRepository->findSolrByCollection(NULL, $this->settings, $this->searchParams, $listedMetadata);
             }
 
             $documents = $solrResults['documents'] ? : [];
@@ -181,7 +181,7 @@ 
 
         // Get facets from plugin configuration.
         $facets = [];
-        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
+        foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], TRUE) as $facet) {
             $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
         }
 
@@ -379,7 +379,7 @@ 
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
         $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
-        if ($index !== false) {
+        if ($index !== FALSE) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
             $queryColumn = array_values($queryColumn);
@@ -387,7 +387,7 @@ 
             $state = 'ACTIFSUB';
             // Reset facets
             if ($this->settings['resetFacets']) {
-                $entryArray['resetFacet'] = true;
+                $entryArray['resetFacet'] = TRUE;
                 $entryArray['queryColumn'] = $queryColumn;
             }
         } else {
@@ -418,7 +418,7 @@ 
         }
 
         // Get field selector options.
-        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], true);
+        $searchFields = GeneralUtility::trimExplode(',', $this->settings['extendedFields'], TRUE);
 
         $slotCountArray = [];
         for ($i = 0; $i < $this->settings['extendedSlotCount']; $i++) {

Spacing +8 added lines, -8 removed lines

@@ -161,7 +161,7 @@ 
 
         // Add uHash parameter to suggest parameter to make a basic protection of this form.
         if ($this->settings['suggest']) {
-            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'));
+            $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'));
         }
 
         $this->view->assign('viewData', $this->viewData);
@@ -184,7 +184,7 @@ 
         // Get facets from plugin configuration.
         $facets = [];
         foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) {
-            $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
+            $facets[$facet.'_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']);
         }
 
         $this->view->assign('facetsMenu', $this->makeFacetsMenuArray($facets));
@@ -226,13 +226,13 @@ 
         $searchParams = $this->searchParams;
         if (
             (!empty($searchParams['fulltext']))
-            || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($searchParams['query']), $matches)
+            || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($searchParams['query']), $matches)
         ) {
             // If the query already is a fulltext query e.g using the facets
             $searchParams['query'] = empty($matches[1]) ? $searchParams['query'] : $matches[1];
             // Search in fulltext field if applicable. Query must not be empty!
             if (!empty($this->searchParams['query'])) {
-                $search['query'] = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($searchParams['query'])) . ')';
+                $search['query'] = $fields['fulltext'].':('.Solr::escapeQuery(trim($searchParams['query'])).')';
             }
         } else {
             // Retain given search field if valid.
@@ -256,9 +256,9 @@ 
                         in_array($searchParams['extOperator'][$i], $allowedOperators)
                     ) {
                         if (!empty($search['query'])) {
-                            $search['query'] .= ' ' . $searchParams['extOperator'][$i] . ' ';
+                            $search['query'] .= ' '.$searchParams['extOperator'][$i].' ';
                         }
-                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']) . ':(' . Solr::escapeQuery($searchParams['extQuery'][$i]) . ')';
+                        $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']).':('.Solr::escapeQuery($searchParams['extQuery'][$i]).')';
                     }
                 }
             }
@@ -383,7 +383,7 @@ 
         $entryArray['doNotLinkIt'] = 0;
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
-        $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
+        $index = array_search($field.':("'.Solr::escapeQuery($value).'")', $queryColumn);
         if ($index !== false) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
@@ -397,7 +397,7 @@ 
             }
         } else {
             // Facet is not selected, thus add it to filter.
-            $queryColumn[] = $field . ':("' . Solr::escapeQuery($value) . '")';
+            $queryColumn[] = $field.':("'.Solr::escapeQuery($value).'")';
             $entryArray['ITEM_STATE'] = 'NO';
         }
         $entryArray['queryColumn'] = $queryColumn;

Braces +9 added lines, -18 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'])) {
@@ -174,8 +169,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 '';
@@ -200,8 +194,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($facets)
-    {
+    public function makeFacetsMenuArray($facets) {
         $menuArray = [];
         // Set default value for facet search.
         $search = [
@@ -360,8 +353,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') {
@@ -412,8 +404,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/CollectionController.php

Spacing +4 added lines, -4 removed lines

@@ -96,14 +96,14 @@
         foreach ($collections as $collection) {
             $solr_query = '';
             if ($collection->getIndexSearch() != '') {
-                $solr_query .= '(' . $collection->getIndexSearch() . ')';
+                $solr_query .= '('.$collection->getIndexSearch().')';
             } else {
-                $solr_query .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")';
+                $solr_query .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")';
             }
-            $params['query'] = $solr_query . ' AND partof:0 AND toplevel:true';
+            $params['query'] = $solr_query.' AND partof:0 AND toplevel:true';
             $partOfNothing = $solr->search_raw($params);
 
-            $params['query'] = $solr_query . ' AND NOT partof:0 AND toplevel:true';
+            $params['query'] = $solr_query.' AND NOT partof:0 AND toplevel:true';
             $partOfSomething = $solr->search_raw($params);
             // Titles are all documents that are "root" elements i.e. partof == 0
             $collectionInfo['titles'] = [];

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class CollectionController extends AbstractController
-{
+class CollectionController 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;
     }
 
@@ -62,8 +59,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $solr = Solr::getInstance($this->settings['solrcore']);
 
         if (!$solr->ready) {
@@ -146,8 +142,7 @@ 
      *
      * @return void
      */
-    public function showAction(\Kitodo\Dlf\Domain\Model\Collection $collection)
-    {
+    public function showAction(\Kitodo\Dlf\Domain\Model\Collection $collection) {
         $searchParams = $this->getParametersSafely('searchParameter');
 
         // Instaniate the Solr. Without Solr present, we can't do anything.
@@ -199,8 +194,7 @@ 
      *
      * @return void
      */
-    public function showSortedAction()
-    {
+    public function showSortedAction() {
         // if search was triggered, get search parameters from POST variables
         $searchParams = $this->getParametersSafely('searchParameter');
 

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -87,7 +87,7 @@ 
         }
 
         if (count($collections) == 1 && empty($this->settings['dont_show_single']) && is_array($collections)) {
-            $this->forward('show', null, null, ['collection' => array_pop($collections)]);
+            $this->forward('show', NULL, NULL, ['collection' => array_pop($collections)]);
         }
 
         $processedCollections = [];
@@ -166,7 +166,7 @@ 
         $searchParams['collection'] = $collection;
         // If a targetPid is given, the results will be shown by ListView on the target page.
         if (!empty($this->settings['targetPid'])) {
-            $this->redirect('main', 'ListView', null,
+            $this->redirect('main', 'ListView', NULL,
                 [
                     'searchParameter' => $searchParams,
                     'widgetPage' => $widgetPage
@@ -175,10 +175,10 @@ 
         }
 
         // get all metadata records to be shown in results
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
         // get all sortable metadata records
-        $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+        $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
         // get all documents of given collection
         $documents = $this->documentRepository->findSolrByCollection($collection, $this->settings, $searchParams, $listedMetadata);
@@ -204,13 +204,13 @@ 
         // if search was triggered, get search parameters from POST variables
         $searchParams = $this->getParametersSafely('searchParameter');
 
-        $collection = null;
+        $collection = NULL;
         if ($searchParams['collection']['__identity'] && MathUtility::canBeInterpretedAsInteger($searchParams['collection']['__identity'])) {
             $collection = $this->collectionRepository->findByUid($searchParams['collection']['__identity']);
         }
 
         // output is done by show action
-        $this->forward('show', null, null, ['searchParameter' => $searchParams, 'collection' => $collection]);
+        $this->forward('show', NULL, NULL, ['searchParameter' => $searchParams, 'collection' => $collection]);
 
     }
 }

Classes/Controller/AudioPlayerController.php

Spacing +4 added lines, -4 removed lines

@@ -52,12 +52,12 @@
             $(document).ready(function() {
                 AudioPlayer = new dlfAudioPlayer({
                     audio: {
-                        mimeType: "' . $this->audio['mimetype'] . '",
-                        title: "' . $this->audio['label'] . '",
-                        url:  "' . $this->audio['url'] . '"
+                        mimeType: "' . $this->audio['mimetype'].'",
+                        title: "' . $this->audio['label'].'",
+                        url:  "' . $this->audio['url'].'"
                     },
                     parentElId: "tx-dlf-audio",
-                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')) . 'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
+                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')).'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
                 });
             });
         ';

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 (

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -77,8 +77,8 @@
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
             || $this->document->getDoc()->numPages < 1
         ) {
             // Quit without doing anything if required variables are not set.

Classes/Controller/MetadataController.php

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
             array_unshift($metadata, $data);
         }
         if (empty($metadata)) {
-            $this->logger->warning('No metadata found for document with UID ' . $this->document->getUid());
+            $this->logger->warning('No metadata found for document with UID '.$this->document->getUid());
             return '';
         }
         ksort($metadata);
@@ -255,7 +255,7 @@ 
                         if (empty($metadataValue) && $this->settings['getTitle'] && $this->document->getDoc()->parentId) {
                             $superiorTitle = Doc::getTitle($this->document->getPartof(), true);
                             if (!empty($superiorTitle)) {
-                                $metadataArray[$i][$metadataName] = ['[' . $superiorTitle . ']'];
+                                $metadataArray[$i][$metadataName] = ['['.$superiorTitle.']'];
                             }
                         }
                         if (!empty($metadataValue)) {

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -80,8 +80,8 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return '';
@@ -180,7 +180,7 @@ 
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false)
+    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = FALSE)
     {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
@@ -198,14 +198,14 @@ 
                             $iiifData[$key] = [
                                 'label' => $key,
                                 'value' => $group,
-                                'buildUrl' => true,
+                                'buildUrl' => TRUE,
                             ];
                         } else {
                             // Data output
                             $iiifData[$key] = [
                                 'label' => $key,
                                 'value' => $group,
-                                'buildUrl' => false,
+                                'buildUrl' => FALSE,
                             ];
                         }
                     } else {
@@ -222,18 +222,18 @@ 
                                 $iiifData[$key]['data'][] = [
                                     'label' => $nolabel ? '' : $label,
                                     'value' => $value,
-                                    'buildUrl' => true,
+                                    'buildUrl' => TRUE,
                                 ];
                             } else {
                                 $iiifData[$key]['data'][] = [
                                     'label' => $label,
                                     'value' => $value,
-                                    'buildUrl' => false,
+                                    'buildUrl' => FALSE,
                                 ];
                             }
                         }
                     }
-                    $this->view->assign('useIiif', true);
+                    $this->view->assign('useIiif', TRUE);
                     $this->view->assign('iiifData', $iiifData);
                 }
             }
@@ -253,7 +253,7 @@ 
                     if ($metadataName == 'title') {
                         // Get title of parent document if needed.
                         if (empty($metadataValue) && $this->settings['getTitle'] && $this->document->getDoc()->parentId) {
-                            $superiorTitle = Doc::getTitle($this->document->getPartof(), true);
+                            $superiorTitle = Doc::getTitle($this->document->getPartof(), TRUE);
                             if (!empty($superiorTitle)) {
                                 $metadataArray[$i][$metadataName] = ['[' . $superiorTitle . ']'];
                             }

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 $metadataArray, $useOriginalIiifManifestMetadata = false)
-    {
+    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false) {
         if ($useOriginalIiifManifestMetadata) {
             $iiifData = [];
             foreach ($metadataArray as $metadata) {
@@ -250,8 +244,7 @@ 
                     }
 
                     if (is_array($metadataArray[$i][$metadataName])) {
-                        $metadataArray[$i][$metadataName] = array_values(array_filter($metadataArray[$i][$metadataName], function($value)
-                        {
+                        $metadataArray[$i][$metadataName] = array_values(array_filter($metadataArray[$i][$metadataName], function($value) {
                             return !empty($value);
                         }));
                     }
@@ -273,8 +266,7 @@ 
      *
      * @return array metadata
      */
-    private function getMetadata()
-    {
+    private function getMetadata() {
         $metadata = [];
         if ($this->settings['rootline'] < 2) {
             // Get current structure's @ID.
@@ -312,8 +304,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/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');
 
         $collection = null;

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
     {
         $this->searchParams = $this->getParametersSafely('searchParameter');
 
-        $collection = null;
+        $collection = NULL;
         if ($this->searchParams['collection'] && MathUtility::canBeInterpretedAsInteger($this->searchParams['collection'])) {
             $collection = $this->collectionRepository->findByUid($this->searchParams['collection']);
         }
@@ -83,14 +83,14 @@ 
         }
 
         // get all sortable metadata records
-        $sortableMetadata = $this->metadataRepository->findByIsSortable(true);
+        $sortableMetadata = $this->metadataRepository->findByIsSortable(TRUE);
 
         // get all metadata records to be shown in results
-        $listedMetadata = $this->metadataRepository->findByIsListed(true);
+        $listedMetadata = $this->metadataRepository->findByIsListed(TRUE);
 
         $solrResults = [];
         if (is_array($this->searchParams) && !empty($this->searchParams)) {
-            $solrResults = $this->documentRepository->findSolrByCollection($collection ? : null, $this->settings, $this->searchParams, $listedMetadata);
+            $solrResults = $this->documentRepository->findSolrByCollection($collection ? : NULL, $this->settings, $this->searchParams, $listedMetadata);
         }
 
         $this->view->assign('viewData', $this->viewData);

Classes/Controller/PageGridController.php

Braces +3 added lines, -6 removed lines

@@ -22,15 +22,13 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageGridController extends AbstractController
-{
+class PageGridController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->loadDocument($this->requestData);
         if (
             $this->document === null
@@ -65,8 +63,7 @@ 
      *
      * @return array The rendered entry ready for fluid
      */
-    protected function getEntry($number, $fileGrpThumbs)
-    {
+    protected function getEntry($number, $fileGrpThumbs) {
         // Set pagination.
         $entry['pagination'] = htmlspecialchars($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$number]]['orderlabel']);
         $entry['page'] = $number;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     {
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
+            $this->document === NULL
             || $this->document->getDoc()->numPages < 1
             || empty($this->extConf['fileGrpThumbs'])
         ) {

Classes/Controller/ToolboxController.php

Spacing +3 added lines, -3 removed lines

@@ -253,7 +253,7 @@ 
                 $image['mimetypeLabel'] = $mimetypeLabel;
                 break;
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $image;
@@ -344,7 +344,7 @@ 
             empty($page1Link)
             && empty($page2Link)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['fileGrpDownload'].'"');
         }
 
         if (!empty($page1Link)) {
@@ -383,7 +383,7 @@ 
         if (!empty($workLink)) {
             $workLink = $workLink;
         } else {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['fileGrpDownload'].'"');
         }
         return $workLink;
     }

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->document === null
             || $this->document->getDoc()->numPages < 1
@@ -94,8 +91,7 @@ 
      *
      * @return void
      */
-    public function fulltextdownloadtool()
-    {
+    public function fulltextdownloadtool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -140,8 +136,7 @@ 
      *
      * @return void
      */
-    public function fulltexttool()
-    {
+    public function fulltexttool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -186,8 +181,7 @@ 
      *
      * @return void
      */
-    public function imagedownloadtool()
-    {
+    public function imagedownloadtool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -230,8 +224,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']);
@@ -264,8 +257,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';
 
@@ -278,8 +270,7 @@ 
      *
      * @return void
      */
-    public function pdfdownloadtool()
-    {
+    public function pdfdownloadtool() {
         if (
             $this->document === null
             || $this->document->getDoc() === null
@@ -318,8 +309,7 @@ 
      *
      * @return array Link to downloadable page
      */
-    protected function getPageLink()
-    {
+    protected function getPageLink() {
         $page1Link = '';
         $page2Link = '';
         $pageLinkArray = [];
@@ -363,8 +353,7 @@ 
      *
      * @return string Link to downloadable work
      */
-    protected function getWorkLink()
-    {
+    protected function getWorkLink() {
         $workLink = '';
         $fileGrpsDownload = GeneralUtility::trimExplode(',', $this->extConf['fileGrpDownload']);
         // Get work link.
@@ -393,8 +382,7 @@ 
      *
      * @return void
      */
-    public function searchindocumenttool()
-    {
+    public function searchindocumenttool() {
         if (
             $this->document === null
             || $this->document->getDoc()->numPages < 1
@@ -457,8 +445,7 @@ 
      *
      * @return string with current document id
      */
-    protected function getCurrentDocumentId()
-    {
+    protected function getCurrentDocumentId() {
         $id = $this->document->getUid();
 
         if ($id !== null && $id > 0) {
@@ -493,8 +480,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.

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -43,7 +43,7 @@ 
         foreach ($tools as $tool) {
             $tool = trim(str_replace('tx_dlf_', '', $tool));
             $this->$tool();
-            $this->view->assign($tool, true);
+            $this->view->assign($tool, TRUE);
         }
     }
 
@@ -55,7 +55,7 @@ 
     public function annotationtool()
     {
         if (
-            $this->document === null
+            $this->document === NULL
             || $this->document->getDoc()->numPages < 1
         ) {
             // Quit without doing anything if required variables are not set.
@@ -80,12 +80,12 @@ 
 
         $annotationContainers = $this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$this->requestData['page']]]['annotationContainers'];
         if (
-            $annotationContainers != null
+            $annotationContainers != NULL
             && sizeof($annotationContainers) > 0
         ) {
-            $this->view->assign('annotationTool', true);
+            $this->view->assign('annotationTool', TRUE);
         } else {
-            $this->view->assign('annotationTool', false);
+            $this->view->assign('annotationTool', FALSE);
         }
     }
 
@@ -97,7 +97,7 @@ 
     public function fulltextdownloadtool()
     {
         if (
-            $this->document === null
+            $this->document === NULL
             || $this->document->getDoc()->numPages < 1
             || empty($this->extConf['fileGrpFulltext'])
         ) {
@@ -129,9 +129,9 @@ 
             }
         }
         if (!empty($fullTextFile)) {
-            $this->view->assign('fulltextDownload', true);
+            $this->view->assign('fulltextDownload', TRUE);
         } else {
-            $this->view->assign('fulltextDownload', false);
+            $this->view->assign('fulltextDownload', FALSE);
         }
     }
 
@@ -143,7 +143,7 @@ 
     public function fulltexttool()
     {
         if (
-            $this->document === null
+            $this->document === NULL
             || $this->document->getDoc()->numPages < 1
             || empty($this->extConf['fileGrpFulltext'])
         ) {
@@ -174,10 +174,10 @@ 
             }
         }
         if (!empty($fullTextFile)) {
-            $this->view->assign('fulltext', true);
+            $this->view->assign('fulltext', TRUE);
             $this->view->assign('activateFullTextInitially', MathUtility::forceIntegerInRange($this->settings['activateFullTextInitially'], 0, 1, 0));
         } else {
-            $this->view->assign('fulltext', false);
+            $this->view->assign('fulltext', FALSE);
         }
     }
 
@@ -189,7 +189,7 @@ 
     public function imagedownloadtool()
     {
         if (
-            $this->document === null
+            $this->document === NULL
             || $this->document->getDoc()->numPages < 1
             || empty($this->settings['fileGrpsImageDownload'])
         ) {
@@ -269,7 +269,7 @@ 
         // Set parent element for initialization.
         $parentContainer = !empty($this->settings['parentContainer']) ? $this->settings['parentContainer'] : '.tx-dlf-imagemanipulationtool';
 
-        $this->view->assign('imageManipulation', true);
+        $this->view->assign('imageManipulation', TRUE);
         $this->view->assign('parentContainer', $parentContainer);
     }
 
@@ -281,8 +281,8 @@ 
     public function pdfdownloadtool()
     {
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
             || $this->document->getDoc()->numPages < 1
             || empty($this->extConf['fileGrpDownload'])
         ) {
@@ -396,7 +396,7 @@ 
     public function searchindocumenttool()
     {
         if (
-            $this->document === null
+            $this->document === NULL
             || $this->document->getDoc()->numPages < 1
             || empty($this->extConf['fileGrpFulltext'])
             || empty($this->settings['solrcore'])
@@ -461,7 +461,7 @@ 
     {
         $id = $this->document->getUid();
 
-        if ($id !== null && $id > 0) {
+        if ($id !== NULL && $id > 0) {
             // we found the document uid
             return (string) $id;
         } else {

Classes/Controller/NavigationController.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 
         $pageOptions = [];
         for ($i = 1; $i <= $this->document->getDoc()->numPages; $i++) {
-            $pageOptions[$i] = '[' . $i . ']' . ($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel']) : '');
+            $pageOptions[$i] = '['.$i.']'.($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$i]]['orderlabel']) : '');
         }
         $this->view->assign('pageOptions', $pageOptions);
 

Braces +2 added lines, -4 removed lines

@@ -23,15 +23,13 @@
  * @subpackage dlf
  * @access public
  */
-class NavigationController extends AbstractController
-{
+class NavigationController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -35,8 +35,8 @@ 
         // Load current document.
         $this->loadDocument($this->requestData);
         if (
-            $this->document === null
-            || $this->document->getDoc() === null
+            $this->document === NULL
+            || $this->document->getDoc() === NULL
         ) {
             // Quit without doing anything if required variables are not set.
             return;
@@ -81,7 +81,7 @@ 
         // prepare feature array for fluid
         $features = [];
         foreach (explode(',', $this->settings['features']) as $feature) {
-            $features[$feature] = true;
+            $features[$feature] = TRUE;
         }
         $this->view->assign('features', $features);
     }