Erikmitk / kitodo-presentation

Classes/Controller/PageGridController.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         $pageGridPagination = new PageGridPagination($pageGridPaginator);
 
         $pagination = $this->buildSimplePagination($pageGridPagination, $pageGridPaginator);
-        $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $pageGridPaginator ]);
+        $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $pageGridPaginator]);
 
         $this->view->assign('docUid', $this->requestData['id']);
     }

Classes/Controller/TableOfContentsController.php

Spacing +5 added lines, -5 removed lines

@@ -197,7 +197,7 @@ 
                 }
             }
             // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
-            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB');
+            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
         }
         return $entryArray;
     }
@@ -309,9 +309,9 @@ 
                     $title = '';
                     foreach ($fields as $field) {
                         if ($field == 'type') {
-                            $title .= $this->getTranslatedType($entry['type']) . ' ';
+                            $title .= $this->getTranslatedType($entry['type']).' ';
                         } else {
-                            $title .= $entry[$field] . ' ';
+                            $title .= $entry[$field].' ';
                         }
                     }
         
@@ -319,7 +319,7 @@ 
                 }
             }
         }
-        return $entry['label'] ?: $entry['orderlabel'];
+        return $entry['label'] ? : $entry['orderlabel'];
     }
 
     /**
@@ -352,7 +352,7 @@ 
      */
     private function sortSubMenu(array &$menu): void
     {
-        usort($menu[0]['_SUB_MENU'], function ($firstElement, $secondElement) {
+        usort($menu[0]['_SUB_MENU'], function($firstElement, $secondElement) {
             if (!empty($firstElement['orderlabel'])) {
                 return $firstElement['orderlabel'] <=> $secondElement['orderlabel'];
             }

Classes/Controller/FeedsController.php

Spacing +6 added lines, -6 removed lines

@@ -75,7 +75,7 @@ 
         if ($library) {
             $feedMeta['copyright'] = $library->getLabel();
         } else {
-            $this->logger->error('Failed to fetch label of selected library with "' . $this->settings['library'] . '"');
+            $this->logger->error('Failed to fetch label of selected library with "'.$this->settings['library'].'"');
         }
 
         if (
@@ -95,12 +95,12 @@ 
                 ) {
                     $superiorTitle = AbstractDocument::getTitle($document->getPartof(), true);
                     if (!empty($superiorTitle)) {
-                        $title .= '[' . $superiorTitle . ']';
+                        $title .= '['.$superiorTitle.']';
                     }
                 }
                 // Get title of document.
                 if (!empty($document->getTitle())) {
-                    $title .= ' ' . $document->getTitle();
+                    $title .= ' '.$document->getTitle();
                 }
                 // Set default title if empty.
                 if (empty($title)) {
@@ -108,13 +108,13 @@ 
                 }
                 // Append volume information.
                 if (!empty($document->getVolume())) {
-                    $title .= ', ' . LocalizationUtility::translate('volume', 'dlf') . ' ' . $document->getVolume();
+                    $title .= ', '.LocalizationUtility::translate('volume', 'dlf').' '.$document->getVolume();
                 }
                 // Is this document new or updated?
                 if ($document->getCrdate() == $document->getTstamp()) {
-                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.new', 'dlf').' '.trim($title);
                 } else {
-                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf') . ' ' . trim($title);
+                    $title = LocalizationUtility::translate('plugins.feeds.update', 'dlf').' '.trim($title);
                 }
 
                 $document->setTitle($title);

Classes/Controller/CalendarController.php

Spacing +11 added lines, -11 removed lines

@@ -134,8 +134,8 @@ 
         $this->view->assign('calendarData', $calendarData);
         $this->view->assign('documentId', $this->document->getUid());
         $this->view->assign('yearLinkTitle', $yearLinkTitle);
-        $this->view->assign('parentDocumentId', $this->document->getPartof() ?: $this->document->getCurrentDocument()->tableOfContents[0]['points']);
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
+        $this->view->assign('parentDocumentId', $this->document->getPartof() ? : $this->document->getCurrentDocument()->tableOfContents[0]['points']);
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle($this->document->getPartof()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
     }
 
     /**
@@ -220,7 +220,7 @@ 
         }
 
         $this->view->assign('documentId', $this->document->getUid());
-        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ?: $this->document->getCurrentDocument()->tableOfContents[0]['label']);
+        $this->view->assign('allYearDocTitle', $this->document->getCurrentDocument()->getTitle((int) $this->document->getUid()) ? : $this->document->getCurrentDocument()->tableOfContents[0]['label']);
     }
 
     /**
@@ -239,7 +239,7 @@ 
     protected function getCalendarYear(array &$calendarData, array $calendarIssuesByMonth, int $year, int $firstMonth = 1, int $lastMonth = 12): void
     {
         for ($i = $firstMonth; $i <= $lastMonth; $i++) {
-            $key = $year . '-' . $i;
+            $key = $year.'-'.$i;
 
             $calendarData[$key] = [
                 'DAYMON_NAME' => strftime('%a', strtotime('last Monday')),
@@ -249,16 +249,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;'],
@@ -271,7 +271,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
@@ -342,7 +342,7 @@ 
      */
     private function fillCalendar(array &$calendarData, int $currentDayTime, string $dayLinks, array $dayLinkDiv, int $firstDayOfWeek, int $k): void
     {
-        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
             case '0':
                 $this->fillDay($calendarData, $currentDayTime, 'DAYSUN', $dayLinks, $dayLinkDiv);
                 break;
@@ -446,7 +446,7 @@ 
                 $_day = date('j', $dateTimestamp);
                 $issuesByYear[$_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.
@@ -489,7 +489,7 @@ 
             foreach ($year['children'] as $month) {
                 foreach ($month['children'] as $day) {
                     foreach ($day['children'] as $issue) {
-                        $title = $issue['label'] ?: $issue['orderlabel'];
+                        $title = $issue['label'] ? : $issue['orderlabel'];
                         if (strtotime($title) !== false) {
                             $title = strftime('%x', strtotime($title));
                         }

Classes/Controller/BasketController.php

Spacing +26 added lines, -26 removed lines

@@ -133,7 +133,7 @@ 
                 foreach ($this->requestData['selected'] as $docValue) {
                     if ($docValue['id']) {
                         $docData = $this->getDocumentData((int) $docValue['id'], $docValue);
-                        $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                        $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                         $this->redirectToUri($pdfUrl);
                     }
                 }
@@ -200,7 +200,7 @@ 
         if ($allMails->count() > 0) {
             $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf'));
             foreach ($allMails as $mail) {
-                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')';
+                $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')';
             }
             $this->view->assign('mailSelect', $mailSelect);
         }
@@ -292,12 +292,12 @@ 
 
         $entryArray['BASKETDATA'] = $docData;
 
-        $entryKey = $id . '_' . $startpage;
+        $entryKey = $id.'_'.$startpage;
         if (!empty($startX)) {
-            $entryKey .= '_' . $startX;
+            $entryKey .= '_'.$startX;
         }
         if (!empty($endX)) {
-            $entryKey .= '_' . $endX;
+            $entryKey .= '_'.$endX;
         }
 
         $entryArray['id'] = $id;
@@ -353,7 +353,7 @@ 
             $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams);
             $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams);
 
-            $downloadUrl = $this->settings['pdfgenerate'] . $urlParams;
+            $downloadUrl = $this->settings['pdfgenerate'].$urlParams;
 
             $title = $this->document->getTitle();
             if (empty($title)) {
@@ -364,15 +364,15 @@ 
             $info = '';
             if ($data['startX'] != '' && $data['endX'] != '') {
                 // cutout
-                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' ';
+                $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' ';
             }
             if ($data['startpage'] == $data['endpage']) {
                 // One page
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'];
             } else {
-                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage'];
+                $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage'];
             }
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')';
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')';
             if ($data['startpage'] == $data['endpage']) {
                 $pageNums = 1;
             } else {
@@ -445,12 +445,12 @@ 
             if ($piVars['addToBasket'] == 'list') {
                 $documentItem['endpage'] = $this->document->getCurrentDocument()->numPages;
             }
-            $arrayKey = $documentItem['id'] . '_' . $page;
+            $arrayKey = $documentItem['id'].'_'.$page;
             if (!empty($documentItem['startX'])) {
-                $arrayKey .= '_' . $documentItem['startX'];
+                $arrayKey .= '_'.$documentItem['startX'];
             }
             if (!empty($documentItem['endX'])) {
-                $arrayKey .= '_' . $documentItem['endX'];
+                $arrayKey .= '_'.$documentItem['endX'];
             }
             // do not add more than one identical object
             if (!in_array($arrayKey, $items)) {
@@ -471,14 +471,14 @@ 
                     // remove parameter endpage
                     $pdfParams = str_replace(",##endpage##", '', $pdfParams);
                 }
-                $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams;
+                $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams;
                 if ($this->settings['pregeneration']) {
                     // send ajax request to webapp
                     $output .= '
      <script>
       $(document).ready(function(){
        $.ajax({
-         url: "' . $pdfGenerateUrl . '",
+         url: "' . $pdfGenerateUrl.'",
        }).done(function() {
        });
       });
@@ -516,12 +516,12 @@ 
         }
         foreach ($piVars['selected'] as $value) {
             if (isset($value['id'])) {
-                $arrayKey = $value['id'] . '_' . $value['startpage'];
+                $arrayKey = $value['id'].'_'.$value['startpage'];
                 if (!empty($value['startX'])) {
-                    $arrayKey .= '_' . $value['startX'];
+                    $arrayKey .= '_'.$value['startX'];
                 }
                 if (!empty($value['endX'])) {
-                    $arrayKey .= '_' . $value['endX'];
+                    $arrayKey .= '_'.$value['endX'];
                 }
                 if (isset($items[$arrayKey])) {
                     unset($items[$arrayKey]);
@@ -554,7 +554,7 @@ 
 
         $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst();
 
-        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n";
+        $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n";
         $numberOfPages = 0;
         $pdfUrl = $this->settings['pdfdownload'];
         // prepare links
@@ -562,7 +562,7 @@ 
             if ($docValue['id']) {
                 $explodeId = explode("_", $docValue['id']);
                 $docData = $this->getDocumentData((int) $explodeId[0], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
                 if ($pages === 0) {
                     $numberOfPages = $numberOfPages + 1;
@@ -573,7 +573,7 @@ 
         }
         // Remove leading/tailing pdfparamseperator
         $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']);
-        $mailBody = $mailText . $pdfUrl;
+        $mailBody = $mailText.$pdfUrl;
         // Get hook objects.
         $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php');
         // Hook for getting a customized mail body.
@@ -600,7 +600,7 @@ 
         $newActionLog = GeneralUtility::makeInstance(ActionLog::class);
         $newActionLog->setFileName($pdfUrl);
         $newActionLog->setCountPages($numberOfPages);
-        $newActionLog->setLabel('Mail: ' . $mailObject->getMail());
+        $newActionLog->setLabel('Mail: '.$mailObject->getMail());
 
         if ($GLOBALS["TSFE"]->loginUser) {
             // internal user
@@ -631,7 +631,7 @@ 
         foreach ($this->requestData['selected'] as $docId => $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData((int) $docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                 $numberOfPages += $docData['pageNums'];
             }
         }
@@ -649,7 +649,7 @@ 
                 if ($docValue['id']) {
                     $explodeId = explode("_", $docId);
                     $docData = $this->getDocumentData((int) $explodeId[0], $docValue);
-                    $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator'];
                     $numberOfPages += $docData['pageNums'];
                 }
             }
@@ -666,12 +666,12 @@ 
             // internal user
             $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']);
             $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']);
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         } else {
             // external user
             $actionLog->setUserId(0);
             $actionLog->setName('n/a');
-            $actionLog->setLabel('Print: ' . $printer->getLabel());
+            $actionLog->setLabel('Print: '.$printer->getLabel());
         }
         // add action to protocol
         $this->actionLogRepository->add($actionLog);

Classes/Controller/CollectionController.php

Spacing +5 added lines, -5 removed lines

@@ -167,7 +167,7 @@ 
             $simplePagination = new SimplePagination($solrPaginator);
 
             $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator);
-            $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);
+            $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]);
         }
 
         $this->view->assign('viewData', $this->viewData);
@@ -219,20 +219,20 @@ 
         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()).'")';
             }
 
             // virtual collection might yield documents, that are not toplevel true or partof anything
             if ($collection->getIndexSearch()) {
                 $params['query'] = $solr_query;
             } else {
-                $params['query'] = $solr_query . ' AND partof:0 AND toplevel:true';
+                $params['query'] = $solr_query.' AND partof:0 AND toplevel:true';
             }
             $partOfNothing = $solr->searchRaw($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->searchRaw($params);
 
             $collectionInfo = [];

Classes/Format/AudioVideoMD.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             $metadata['video_duration'] = [$videoDuration];
         }
 
-        $metadata['duration'] = $metadata['video_duration'] ?: $metadata['audio_duration'] ?: [];
+        $metadata['duration'] = $metadata['video_duration'] ? : $metadata['audio_duration'] ? : [];
 
         if ($useExternalApis) {
             // TODO?

Classes/Format/Alto.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
             }
             return ' ';
         }
-        return htmlspecialchars((string) $attributes['CONTENT']) . ' ';
+        return htmlspecialchars((string) $attributes['CONTENT']).' ';
     }
 
     /**
@@ -137,7 +137,7 @@ 
      */
     private function getCoordinates(\SimpleXMLElement $attributes): string
     {
-        return (string) $attributes['HPOS'] . ' ' . (string) $attributes['VPOS'] . ' ' . (string) $attributes['WIDTH'] . ' ' . (string) $attributes['HEIGHT'];
+        return (string) $attributes['HPOS'].' '.(string) $attributes['VPOS'].' '.(string) $attributes['WIDTH'].' '.(string) $attributes['HEIGHT'];
     }
 
     /**

Classes/Api/Viaf/Client.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     public function __construct(string $viaf, RequestFactory $requestFactory)
     {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
-        $this->viafUrl = 'http://viaf.org/viaf/' . $viaf;
+        $this->viafUrl = 'http://viaf.org/viaf/'.$viaf;
         $this->requestFactory = $requestFactory;
     }
 
@@ -95,7 +95,7 @@ 
         try {
             $response = $this->requestFactory->request($url);
         } catch (\Exception $e) {
-            $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.');
+            $this->logger->warning('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.');
             return false;
         }
         return $response->getBody()->getContents();
@@ -110,6 +110,6 @@ 
      **/
     private function getApiEndpoint(): string
     {
-        return $this->viafUrl . '/' . $this->endpoint;
+        return $this->viafUrl.'/'.$this->endpoint;
     }
 }