Erikmitk / kitodo-presentation

Classes/Controller/ListViewController.php

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,15 +83,15 @@ 
         }
 
         // 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 = [];
         $numResults = 0;
         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);
             $numResults = $solrResults->getNumFound();
         }
 

Classes/Controller/NavigationController.php

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);
     }

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
      *
@@ -44,8 +43,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 = [];
@@ -139,8 +137,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();
@@ -161,8 +158,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->view->assign('toc', $this->makeMenuArray());
     }
 
@@ -172,8 +168,7 @@ 
      * @access public
      * @return array HMENU array
      */
-    public function makeMenuArray()
-    {
+    public function makeMenuArray() {
         // Load current document.
         $this->loadDocument($this->requestData);
         if (

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

@@ -44,7 +44,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);
 
@@ -102,7 +102,7 @@ 
         }
         // Build sub-menu if available and called recursively.
         if (
-            $recursive === true
+            $recursive === TRUE
             && !empty($entry['children'])
         ) {
             // Build sub-menu only if one of the following conditions apply:
@@ -120,7 +120,7 @@ 
                     if (in_array($child['id'], $this->activeEntries)) {
                         $entryArray['ITEM_STATE'] = 'ACT';
                     }
-                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, true);
+                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
@@ -177,8 +177,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 [];
@@ -225,12 +225,12 @@ 
             }
             // Go through table of contents and create all menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, true);
+                $menuArray[] = $this->getMenuEntry($entry, TRUE);
             }
         } else {
             // Go through table of contents and create top-level menu entries.
             foreach ($this->document->getDoc()->tableOfContents as $entry) {
-                $menuArray[] = $this->getMenuEntry($entry, false);
+                $menuArray[] = $this->getMenuEntry($entry, FALSE);
             }
             // Build table of contents from database.
             $result = $this->documentRepository->getTableOfContentsFromDb($this->document->getUid(), $this->document->getPid(), $this->settings);
@@ -249,7 +249,7 @@ 
                         'pagination' => '',
                         'targetUid' => $resArray['uid']
                     ];
-                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, false);
+                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
                 }
             }
         }

Classes/Controller/PageViewController.php

Spacing +11 added lines, -11 removed lines

@@ -146,11 +146,11 @@ 
                 $fulltext['mimetype'] = $this->document->getDoc()->getFileMimeType($this->document->getDoc()->physicalStructureInfo[$this->document->getDoc()->physicalStructure[$page]]['files'][$fileGrpFulltext]);
                 break;
             } else {
-                $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrp "' . $fileGrpFulltext . '"');
+                $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrp "'.$fileGrpFulltext.'"');
             }
         }
         if (empty($fulltext)) {
-            $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrps "' . $this->extConf['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -168,13 +168,13 @@ 
         $viewerConfiguration = '$(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->settings['elementId'] . '",
-                        progressElementId: "' . $this->settings['progressElementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->settings['elementId'].'",
+                        progressElementId: "' . $this->settings['progressElementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });';
@@ -275,11 +275,11 @@ 
                 }
                 break;
             } else {
-                $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
             }
         }
         if (empty($image)) {
-            $this->logger->warning('No image file found for page "' . $page . '" in fileGrps "' . $this->extConf['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['fileGrpImages'].'"');
         }
         return $image;
     }

Classes/Controller/CalendarController.php

Spacing +7 added lines, -7 removed lines

@@ -148,7 +148,7 @@ 
                 $_day = date('j', $dateTimestamp);
                 $calendarIssuesByYear[$_year][$_month][$_day][] = $issue;
             } else {
-                $this->logger->warning('Document with UID ' . $issue['uid'] . 'has no valid date of publication');
+                $this->logger->warning('Document with UID '.$issue['uid'].'has no valid date of publication');
             }
         }
         // Sort by years.
@@ -265,7 +265,7 @@ 
     protected function getCalendarYear(&$calendarData, $calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12)
     {
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
-            $key = $year . '-' . $i;
+            $key = $year.'-'.$i;
 
             $calendarData[$key] = [
                 'DAYMON_NAME' => strftime('%a', strtotime('last Monday')),
@@ -275,16 +275,16 @@ 
                 'DAYFRI_NAME' => strftime('%a', strtotime('last Friday')),
                 'DAYSAT_NAME' => strftime('%a', strtotime('last Saturday')),
                 'DAYSUN_NAME' => strftime('%a', strtotime('last Sunday')),
-                'MONTHNAME'  => strftime('%B', strtotime($year . '-' . $i . '-1')) . ' ' . $year,
+                'MONTHNAME'  => strftime('%B', strtotime($year.'-'.$i.'-1')).' '.$year,
                 'CALYEAR' => ($i == $firstMonth) ? $year : ''
             ];
 
-            $firstOfMonth = strtotime($year . '-' . $i . '-1');
+            $firstOfMonth = strtotime($year.'-'.$i.'-1');
             $lastOfMonth = strtotime('last day of', ($firstOfMonth));
             $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
             // There are never more than 6 weeks in a month.
             for ($j = 0; $j <= 5; $j++) {
-                $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
+                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
 
                 $calendarData[$key]['week'][$j] = [
                     'DAYMON' => ['dayValue' => '&nbsp;'],
@@ -297,7 +297,7 @@ 
                 ];
                 // Every week has seven days. ;-)
                 for ($k = 0; $k <= 6; $k++) {
-                    $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek);
+                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
                     if (
                         $currentDayTime >= $firstOfMonth
                         && $currentDayTime <= $lastOfMonth
@@ -328,7 +328,7 @@ 
                             }
                             $dayLinkDiv = $dayLinksText;
                         }
-                        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+                        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
                             case '0':
                                 $calendarData[$key]['week'][$j]['DAYSUN']['dayValue'] = strftime('%d', $currentDayTime);
                                 if ((int) $dayLinks === (int) date('j', $currentDayTime)) {

Braces +6 added lines, -12 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class CalendarController extends AbstractController
-{
+class CalendarController extends AbstractController {
     /**
      * @var StructureRepository
      */
@@ -36,8 +35,7 @@ 
     /**
      * @param StructureRepository $structureRepository
      */
-    public function injectStructureRepository(StructureRepository $structureRepository)
-    {
+    public function injectStructureRepository(StructureRepository $structureRepository) {
         $this->structureRepository = $structureRepository;
     }
 
@@ -54,8 +52,7 @@ 
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         // Set initial document (anchor or year file) if configured.
         if (empty($this->requestData['id']) && !empty($this->settings['initialDocument'])) {
             $this->requestData['id'] = $this->settings['initialDocument'];
@@ -100,8 +97,7 @@ 
      *
      * @return void
      */
-    public function calendarAction()
-    {
+    public function calendarAction() {
         // access arguments passed by the mainAction()
         $mainrequestData = $this->request->getArguments();
 
@@ -206,8 +202,7 @@ 
      *
      * @return void
      */
-    public function yearsAction()
-    {
+    public function yearsAction() {
         // access arguments passed by the mainAction()
         $mainrequestData = $this->request->getArguments();
 
@@ -262,8 +257,7 @@ 
      *
      * @return string Content for template subpart
      */
-    protected function getCalendarYear(&$calendarData, $calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12)
-    {
+    protected function getCalendarYear(&$calendarData, $calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12) {
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
             $key = $year . '-' . $i;
 

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

@@ -63,7 +63,7 @@ 
 
         // Load current document.
         $this->loadDocument($this->requestData);
-        if ($this->document === null) {
+        if ($this->document === NULL) {
             // Quit without doing anything if required variables are not set.
             return '';
         }
@@ -78,10 +78,10 @@ 
         switch ($type) {
             case 'newspaper':
             case 'ephemera':
-                $this->forward('years', null, null, $this->requestData);
+                $this->forward('years', NULL, NULL, $this->requestData);
                 break;
             case 'year':
-                $this->forward('calendar', null, null, $this->requestData);
+                $this->forward('calendar', NULL, NULL, $this->requestData);
                 break;
             case 'issue':
             default:
@@ -110,7 +110,7 @@ 
 
         // Load current document.
         $this->loadDocument($this->requestData);
-        if ($this->document === null) {
+        if ($this->document === NULL) {
             // Quit without doing anything if required variables are not set.
             return '';
         }
@@ -127,7 +127,7 @@ 
                 $title = $document->getTitle();
             } else {
                 $title = !empty($document->getMetsLabel()) ? $document->getMetsLabel() : $document->getMetsOrderlabel();
-                if (strtotime($title) !== false) {
+                if (strtotime($title) !== FALSE) {
                     $title = strftime('%x', strtotime($title));
                 }
             }
@@ -142,7 +142,7 @@ 
         $calendarIssuesByYear = [];
         foreach ($issues as $issue) {
             $dateTimestamp = strtotime($issue['year']);
-            if ($dateTimestamp !== false) {
+            if ($dateTimestamp !== FALSE) {
                 $_year = date('Y', $dateTimestamp);
                 $_month = date('n', $dateTimestamp);
                 $_day = date('j', $dateTimestamp);
@@ -216,7 +216,7 @@ 
 
         // Load current document.
         $this->loadDocument($this->requestData);
-        if ($this->document === null) {
+        if ($this->document === NULL) {
             // Quit without doing anything if required variables are not set.
             return '';
         }

Classes/Controller/CollectionController.php

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
         $solrResults = $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/View3DController.php

Braces +2 added lines, -4 removed lines

@@ -21,13 +21,11 @@
  * @subpackage dlf
  * @access public
  */
-class View3DController extends AbstractController
-{
+class View3DController extends AbstractController {
     /**
      * @return string|void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $this->cObj = $this->configurationManager->getContentObject();
         // Load current document.
         $this->loadDocument($this->requestData);

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

@@ -32,8 +32,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()->metadataArray['LOG_0001']['type'][0] != 'object'
         ) {
             // Quit without doing anything if required variables are not set.

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,16 +125,16 @@ 
         // 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 = [];
             $numResults = 0;
             // 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);
                 $numResults = $solrResults->getNumFound();
             }
 
@@ -183,7 +183,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']);
         }
 
@@ -384,7 +384,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);
@@ -392,7 +392,7 @@ 
             $state = 'ACTIFSUB';
             // Reset facets
             if ($this->settings['resetFacets']) {
-                $entryArray['resetFacet'] = true;
+                $entryArray['resetFacet'] = TRUE;
                 $entryArray['queryColumn'] = $queryColumn;
             }
         } else {
@@ -423,7 +423,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++) {

Classes/Format/AudioVideoMD.php

Spacing +1 added lines, -1 removed lines

@@ -48,6 +48,6 @@
             $metadata['video_duration'] = [$videoDuration];
         }
 
-        $metadata['duration'] = $metadata['video_duration'] ?: $metadata['audio_duration'] ?: [];
+        $metadata['duration'] = $metadata['video_duration'] ? : $metadata['audio_duration'] ? : [];
     }
 }

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
      *
      * @return void
      */
-    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata)
-    {
+    public function extractMetadata(\SimpleXMLElement $xml, array &$metadata) {
         $xml->registerXPathNamespace('audiomd', 'http://www.loc.gov/audioMD/');
         $xml->registerXPathNamespace('videomd', 'http://www.loc.gov/videoMD/');