Erikmitk / kitodo-presentation

Classes/Hooks/DataHandler.php

Spacing +9 added lines, -9 removed lines

@@ -123,10 +123,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.is_listed AS is_listed')
+                            ->select($table.'.is_listed AS is_listed')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -148,10 +148,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.index_autocomplete AS index_autocomplete')
+                            ->select($table.'.index_autocomplete AS index_autocomplete')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -229,7 +229,7 @@ 
                                 if ($solr->ready) {
                                     // Delete Solr document.
                                     $updateQuery = $solr->service->createUpdate();
-                                    $updateQuery->addDeleteQuery('uid:' . $id);
+                                    $updateQuery->addDeleteQuery('uid:'.$id);
                                     $updateQuery->addCommit();
                                     $solr->service->update($updateQuery);
                                 }
@@ -239,7 +239,7 @@ 
                                 if ($doc->ready) {
                                     Indexer::add($doc, $resArray['core']);
                                 } else {
-                                    $this->logger->error('Failed to re-index document with UID ' . $id);
+                                    $this->logger->error('Failed to re-index document with UID '.$id);
                                 }
                             }
                         }
@@ -309,7 +309,7 @@ 
                         if ($solr->ready) {
                             // Delete Solr document.
                             $updateQuery = $solr->service->createUpdate();
-                            $updateQuery->addDeleteQuery('uid:' . $id);
+                            $updateQuery->addDeleteQuery('uid:'.$id);
                             $updateQuery->addCommit();
                             $solr->service->update($updateQuery);
                             if ($command == 'delete') {
@@ -322,7 +322,7 @@ 
                         if ($doc->ready) {
                             Indexer::add($doc, $resArray['core']);
                         } else {
-                            $this->logger->error('Failed to re-index document with UID ' . $id);
+                            $this->logger->error('Failed to re-index document with UID '.$id);
                         }
                         break;
                 }
@@ -376,7 +376,7 @@ 
                             // Nothing to do here.
                         }
                     }
-                    $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr');
+                    $this->logger->warning('Core '.$resArray['core'].' could not be deleted from Apache Solr');
                 }
             }
         }

Classes/Plugin/Tools/PdfDownloadTool.php

Spacing +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
             empty($page1Link)
             && empty($page2Link)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->conf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->conf['fileGrpDownload'].'"');
         }
         // Wrap URLs with HTML.
         $linkConf = [
@@ -137,7 +137,7 @@ 
             $linkConf['title'] = $this->pi_getLL('rightPage', '');
             $page2Link = $this->cObj->typoLink($this->pi_getLL('rightPage', ''), $linkConf);
         }
-        return $page1Link . $page2Link;
+        return $page1Link.$page2Link;
     }
 
     /**
@@ -174,7 +174,7 @@ 
             ];
             $workLink = $this->cObj->typoLink($this->pi_getLL('work', ''), $linkConf);
         } else {
-            $this->logger->warning('File not found in fileGrp "' . $this->conf['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrp "'.$this->conf['fileGrpDownload'].'"');
         }
         return $workLink;
     }

Classes/Plugin/Calendar.php

Spacing +17 added lines, -17 removed lines

@@ -157,7 +157,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.
@@ -206,7 +206,7 @@ 
             'parameter' => $GLOBALS['TSFE']->id,
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
+            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
         ];
         $linkTitleData = $this->doc->getTitledata();
         $linkTitle = !empty($linkTitleData['mets_orderlabel'][0]) ? $linkTitleData['mets_orderlabel'][0] : $linkTitleData['mets_label'][0];
@@ -217,9 +217,9 @@ 
             'parameter' => $GLOBALS['TSFE']->id,
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId),
+            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
         ];
-        $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf);
+        $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
         // Fill marker array.
         $markerArray = [
             '###CALENDARVIEWACTIVE###' => count($this->allIssues) > 5 ? 'active' : '',
@@ -260,19 +260,19 @@ 
                 '###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,
-                '###CALYEAR###' => ($i == $firstMonth) ? '<div class="year">' . $year . '</div>' : ''
+                '###MONTHNAME###'  => strftime('%B', strtotime($year.'-'.$i.'-1')).' '.$year,
+                '###CALYEAR###' => ($i == $firstMonth) ? '<div class="year">'.$year.'</div>' : ''
             ];
             // Fill the month markers.
             $subPartContentMonth = $this->templateService->substituteMarkerArray($subParts['month'], $markerArray);
             // Reset week content of new month.
             $subPartContentWeek = '';
-            $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);
                 $weekArray = [
                     '###DAYMON###' => '&nbsp;',
                     '###DAYTUE###' => '&nbsp;',
@@ -284,7 +284,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
@@ -304,7 +304,7 @@ 
                                             'parameter' => $this->conf['targetPid'],
                                             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                                             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                                            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
+                                            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
                                             'ATagParams' => ' class="title"',
                                         ];
                                         $dayLinksText[] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
@@ -316,13 +316,13 @@ 
                             if (!empty($dayLinksText)) {
                                 $dayLinksList = '<ul>';
                                 foreach ($dayLinksText as $link) {
-                                    $dayLinksList .= '<li>' . $link . '</li>';
+                                    $dayLinksList .= '<li>'.$link.'</li>';
                                 }
                                 $dayLinksList .= '</ul>';
                             }
-                            $dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>' . $dayLinksList . '</div></div>';
+                            $dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
                         }
-                        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+                        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
                             case '0':
                                 $weekArray['###DAYSUN###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
                                 break;
@@ -418,8 +418,8 @@ 
                     'parameter' => $GLOBALS['TSFE']->id,
                     'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                     'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                    'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']),
-                    'title' => $titleAnchor . ': ' . $year['title']
+                    'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
+                    'title' => $titleAnchor.': '.$year['title']
                 ];
                 $yearArray = [
                     '###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf),
@@ -433,9 +433,9 @@ 
             'parameter' => $GLOBALS['TSFE']->id,
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid,
+            'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
         ];
-        $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')) . ' ' . $this->doc->getTitle($this->doc->uid), $linkConf);
+        $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
         // Fill markers.
         $markerArray = [
             '###LABEL_CHOOSE_YEAR###' => htmlspecialchars($this->pi_getLL('label.please_choose_year')),

Classes/Plugin/Metadata.php

Spacing +3 added lines, -3 removed lines

@@ -130,7 +130,7 @@ 
             array_unshift($metadata, $data);
         }
         if (empty($metadata)) {
-            $this->logger->warning('No metadata found for document with UID ' . $this->doc->uid);
+            $this->logger->warning('No metadata found for document with UID '.$this->doc->uid);
             return $content;
         }
         ksort($metadata);
@@ -184,7 +184,7 @@ 
             $iiifLink['value.']['wrap'] = '<dd>|</dd>';
             foreach ($metadataArray as $metadata) {
                 foreach ($metadata as $key => $group) {
-                    $markerArray['###METADATA###'] = '<span class="tx-dlf-metadata-group">' . $this->pi_getLL($key) . '</span>';
+                    $markerArray['###METADATA###'] = '<span class="tx-dlf-metadata-group">'.$this->pi_getLL($key).'</span>';
                     // Reset content object's data array.
                     $this->cObj->data = $cObjData;
                     if (!is_array($group)) {
@@ -302,7 +302,7 @@ 
                             if (empty($value) && $this->conf['getTitle'] && $this->doc->parentId) {
                                 $superiorTitle = Document::getTitle($this->doc->parentId, true);
                                 if (!empty($superiorTitle)) {
-                                    $value = '[' . $superiorTitle . ']';
+                                    $value = '['.$superiorTitle.']';
                                 }
                             }
                             if (!empty($value)) {

Classes/Common/MetsDocument.php

Spacing +29 added lines, -29 removed lines

@@ -169,7 +169,7 @@ 
         $fileMimeType = $this->getFileMimeType($id);
         $fileLocation = $this->getFileLocation($id);
         if ($fileMimeType === 'application/vnd.kitodo.iiif') {
-            $fileLocation = (strrpos($fileLocation, 'info.json') === strlen($fileLocation) - 9) ? $fileLocation : (strrpos($fileLocation, '/') === strlen($fileLocation) ? $fileLocation . 'info.json' : $fileLocation . '/info.json');
+            $fileLocation = (strrpos($fileLocation, 'info.json') === strlen($fileLocation) - 9) ? $fileLocation : (strrpos($fileLocation, '/') === strlen($fileLocation) ? $fileLocation.'info.json' : $fileLocation.'/info.json');
             $conf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey);
             IiifHelper::setUrlReader(IiifUrlReader::getInstance());
             IiifHelper::setMaxThumbnailHeight($conf['iiifThumbnailHeight']);
@@ -179,9 +179,9 @@ 
                 return $service->getImageUrl();
             }
         } elseif ($fileMimeType === 'application/vnd.netfpx') {
-            $baseURL = $fileLocation . (strpos($fileLocation, '?') === false ? '?' : '');
+            $baseURL = $fileLocation.(strpos($fileLocation, '?') === false ? '?' : '');
             // TODO CVT is an optional IIP server capability; in theory, capabilities should be determined in the object request with '&obj=IIP-server'
-            return $baseURL . '&CVT=jpeg';
+            return $baseURL.'&CVT=jpeg';
         }
         return $fileLocation;
     }
@@ -192,14 +192,14 @@ 
      */
     public function getFileLocation($id)
     {
-        $location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/mets:FLocat[@LOCTYPE="URL"]');
+        $location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/mets:FLocat[@LOCTYPE="URL"]');
         if (
             !empty($id)
             && !empty($location)
         ) {
             return (string) $location[0]->attributes('http://www.w3.org/1999/xlink')->href;
         } else {
-            $this->logger->warning('There is no file node with @ID "' . $id . '"');
+            $this->logger->warning('There is no file node with @ID "'.$id.'"');
             return '';
         }
     }
@@ -210,14 +210,14 @@ 
      */
     public function getFileMimeType($id)
     {
-        $mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/@MIMETYPE');
+        $mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/@MIMETYPE');
         if (
             !empty($id)
             && !empty($mimetype)
         ) {
             return (string) $mimetype[0];
         } else {
-            $this->logger->warning('There is no file node with @ID "' . $id . '" or no MIME type specified');
+            $this->logger->warning('There is no file node with @ID "'.$id.'" or no MIME type specified');
             return '';
         }
     }
@@ -238,7 +238,7 @@ 
             return $this->logicalUnits[$id];
         } elseif (!empty($id)) {
             // Get specified logical unit.
-            $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]');
+            $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]');
         } else {
             // Get all logical units at top level.
             $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div');
@@ -378,7 +378,7 @@ 
             // Retain current PID.
             $cPid = ($this->cPid ? $this->cPid : $this->pid);
         } elseif (!$cPid) {
-            $this->logger->warning('Invalid PID ' . $cPid . ' for metadata definitions');
+            $this->logger->warning('Invalid PID '.$cPid.' for metadata definitions');
             return [];
         }
         // Get metadata from parsed metadata array if available.
@@ -419,7 +419,7 @@ 
         if (!empty($this->logicalUnits[$id])) {
             $dmdIds = $this->logicalUnits[$id]['dmdId'];
         } else {
-            $dmdIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]/@DMDID');
+            $dmdIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@DMDID');
             $dmdIds = (string) $dmdIds[0];
         }
         if (!empty($dmdIds)) {
@@ -445,11 +445,11 @@ 
                     ) {
                         $obj->extractMetadata($this->dmdSec[$dmdId]['xml'], $metadata);
                     } else {
-                        $this->logger->warning('Invalid class/method "' . $class . '->extractMetadata()" for metadata format "' . $this->dmdSec[$dmdId]['type'] . '"');
+                        $this->logger->warning('Invalid class/method "'.$class.'->extractMetadata()" for metadata format "'.$this->dmdSec[$dmdId]['type'].'"');
                     }
                 }
             } else {
-                $this->logger->notice('Unsupported metadata format "' . $this->dmdSec[$dmdId]['type'] . '" in dmdSec with @ID "' . $dmdId . '"');
+                $this->logger->notice('Unsupported metadata format "'.$this->dmdSec[$dmdId]['type'].'" in dmdSec with @ID "'.$dmdId.'"');
                 // Continue searching for supported metadata with next @DMDID.
                 continue;
             }
@@ -457,7 +457,7 @@ 
             if (!empty($this->logicalUnits[$id])) {
                 $metadata['type'] = [$this->logicalUnits[$id]['type']];
             } else {
-                $struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]/@TYPE');
+                $struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@TYPE');
                 if (!empty($struct)) {
                     $metadata['type'] = [(string) $struct[0]];
                 }
@@ -574,13 +574,13 @@ 
                             $values instanceof \DOMNodeList
                             && $values->length > 0
                         ) {
-                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $values->item(0)->nodeValue);
+                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $values->item(0)->nodeValue);
                         } elseif (!($values instanceof \DOMNodeList)) {
-                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $values);
+                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $values);
                         }
                     }
-                    if (empty($metadata[$resArray['index_name'] . '_sorting'][0])) {
-                        $metadata[$resArray['index_name'] . '_sorting'][0] = $metadata[$resArray['index_name']][0];
+                    if (empty($metadata[$resArray['index_name'].'_sorting'][0])) {
+                        $metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0];
                     }
                 }
             }
@@ -642,7 +642,7 @@ 
         if ($hasSupportedMetadata) {
             return $metadata;
         } else {
-            $this->logger->warning('No supported metadata found for logical structure with @ID "' . $id . '"');
+            $this->logger->warning('No supported metadata found for logical structure with @ID "'.$id.'"');
             return [];
         }
     }
@@ -672,7 +672,7 @@ 
      */
     public function getStructureDepth($logId)
     {
-        $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $logId . '"]/ancestor::*');
+        $ancestors = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$logId.'"]/ancestor::*');
         if (!empty($ancestors)) {
             return count($ancestors);
         } else {
@@ -694,7 +694,7 @@ 
             // Register namespaces.
             $this->registerNamespaces($this->mets);
         } else {
-            $this->logger->error('No METS part found in document with UID ' . $this->uid);
+            $this->logger->error('No METS part found in document with UID '.$this->uid);
         }
     }
 
@@ -722,7 +722,7 @@ 
                 return true;
             }
         }
-        $this->logger->error('Could not load XML file from "' . $location . '"');
+        $this->logger->error('Could not load XML file from "'.$location.'"');
         return false;
     }
 
@@ -746,7 +746,7 @@ 
     {
         $partof = 0;
         // Get the closest ancestor of the current document which has a MPTR child.
-        $parentMptr = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $this->_getToplevelId() . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
+        $parentMptr = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$this->_getToplevelId().'"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
         if (!empty($parentMptr)) {
             $parentLocation = (string) $parentMptr[0]->attributes('http://www.w3.org/1999/xlink')->href;
             if ($parentLocation != $this->location) {
@@ -813,15 +813,15 @@ 
             $dmdIds = $this->mets->xpath('./mets:dmdSec/@ID');
             if (!empty($dmdIds)) {
                 foreach ($dmdIds as $dmdId) {
-                    if ($type = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[not(@MDTYPE="OTHER")]/@MDTYPE')) {
+                    if ($type = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[not(@MDTYPE="OTHER")]/@MDTYPE')) {
                         if (!empty($this->formats[(string) $type[0]])) {
                             $type = (string) $type[0];
-                            $xml = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[@MDTYPE="' . $type . '"]/mets:xmlData/' . strtolower($type) . ':' . $this->formats[$type]['rootElement']);
+                            $xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
                         }
-                    } elseif ($type = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[@MDTYPE="OTHER"]/@OTHERMDTYPE')) {
+                    } elseif ($type = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"]/@OTHERMDTYPE')) {
                         if (!empty($this->formats[(string) $type[0]])) {
                             $type = (string) $type[0];
-                            $xml = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="' . $type . '"]/mets:xmlData/' . strtolower($type) . ':' . $this->formats[$type]['rootElement']);
+                            $xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
                         }
                     }
                     if (!empty($xml)) {
@@ -1006,7 +1006,7 @@ 
             // Retain current PID.
             $cPid = ($this->cPid ? $this->cPid : $this->pid);
             if (!$cPid) {
-                $this->logger->error('Invalid PID ' . $cPid . ' for structure definitions');
+                $this->logger->error('Invalid PID '.$cPid.' for structure definitions');
                 $this->thumbnailLoaded = true;
                 return $this->thumbnail;
             }
@@ -1043,7 +1043,7 @@ 
                 if (!empty($resArray['thumbnail'])) {
                     $strctType = Helper::getIndexNameFromUid($resArray['thumbnail'], 'tx_dlf_structures', $cPid);
                     // Check if this document has a structure element of the desired type.
-                    $strctIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@TYPE="' . $strctType . '"]/@ID');
+                    $strctIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@TYPE="'.$strctType.'"]/@ID');
                     if (!empty($strctIds)) {
                         $strctId = (string) $strctIds[0];
                     }
@@ -1066,7 +1066,7 @@ 
                     }
                 }
             } else {
-                $this->logger->error('No structure of type "' . $metadata['type'][0] . '" found in database');
+                $this->logger->error('No structure of type "'.$metadata['type'][0].'" found in database');
             }
             $this->thumbnailLoaded = true;
         }

Classes/Common/IiifManifest.php

Spacing +6 added lines, -6 removed lines

@@ -694,16 +694,16 @@ 
                     && ($values = $iiifResource->jsonPath($resArray['xpath_sorting']) != null)
                 ) {
                     if (is_string($values)) {
-                        $metadata[$resArray['index_name'] . '_sorting'][0] = [trim((string) $values)];
+                        $metadata[$resArray['index_name'].'_sorting'][0] = [trim((string) $values)];
                     } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data()) > 1) {
                         $metadata[$resArray['index_name']] = [];
                         foreach ($values->data() as $value) {
-                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $value);
+                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $value);
                         }
                     }
                 }
-                if (empty($metadata[$resArray['index_name'] . '_sorting'][0])) {
-                    $metadata[$resArray['index_name'] . '_sorting'][0] = $metadata[$resArray['index_name']][0];
+                if (empty($metadata[$resArray['index_name'].'_sorting'][0])) {
+                    $metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0];
                 }
             }
         }
@@ -831,7 +831,7 @@ 
                     }
                 }
             } else {
-                $this->logger->warning('Invalid structure resource @id "' . $id . '"');
+                $this->logger->warning('Invalid structure resource @id "'.$id.'"');
                 return $rawText;
             }
             $this->rawTextArray[$id] = $rawText;
@@ -880,7 +880,7 @@ 
                 }
             }
         }
-        $this->logger->error('Could not load IIIF manifest from "' . $location . '"');
+        $this->logger->error('Could not load IIIF manifest from "'.$location.'"');
         return false;
     }
 

Classes/Plugin/PageView.php

Spacing +19 added lines, -19 removed lines

@@ -78,12 +78,12 @@ 
             $(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->conf['elementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->conf['elementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });
@@ -105,14 +105,14 @@ 
         $markerArray = [];
         if ($this->piVars['id']) {
             if ($this->conf['crop']) {
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="' . htmlspecialchars($this->pi_getLL('editMode', '')) . '">' . htmlspecialchars($this->pi_getLL('editMode', '')) . '</a>';
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="' . htmlspecialchars($this->pi_getLL('editRemove', '')) . '">' . htmlspecialchars($this->pi_getLL('editRemove', '')) . '</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="'.htmlspecialchars($this->pi_getLL('editMode', '')).'">'.htmlspecialchars($this->pi_getLL('editMode', '')).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="'.htmlspecialchars($this->pi_getLL('editRemove', '')).'">'.htmlspecialchars($this->pi_getLL('editRemove', '')).'</a>';
             } else {
                 $markerArray['###EDITBUTTON###'] = '';
                 $markerArray['###EDITREMOVE###'] = '';
             }
             if ($this->conf['magnifier']) {
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="' . htmlspecialchars($this->pi_getLL('magnifier', '')) . '">' . htmlspecialchars($this->pi_getLL('magnifier', '')) . '</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="'.htmlspecialchars($this->pi_getLL('magnifier', '')).'">'.htmlspecialchars($this->pi_getLL('magnifier', '')).'</a>';
             } else {
                 $markerArray['###MAGNIFIER###'] = '';
             }
@@ -147,15 +147,15 @@ 
                 'additionalParams' => GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', true, false),
                 'title' => $label
             ];
-            $output = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
+            $output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
+            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.htmlspecialchars($this->piVars['page']).'">';
             $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
             $output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
             $output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
             $output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
             $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
-            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">' . $label . '</button>';
+            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
             $output .= '</form>';
             $output .= '<script>';
             $output .= '$(document).ready(function() { $("#submitBasketForm").click(function() { $("#addToBasketForm").submit(); }); });';
@@ -191,18 +191,18 @@ 
                         'parameter' => $GLOBALS['TSFE']->id,
                         'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                         'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($image['url']),
+                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($image['url']),
                     ];
                     $image['url'] = $this->cObj->typoLink_URL($linkConf);
                 }
                 $image['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrpImages]);
                 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->conf['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->conf['fileGrpImages'].'"');
         }
         return $image;
     }
@@ -230,18 +230,18 @@ 
                         'parameter' => $GLOBALS['TSFE']->id,
                         'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                         'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($fulltext['url']),
+                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($fulltext['url']),
                     ];
                     $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
                 }
                 $fulltext['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->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->conf['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->conf['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }

Classes/Hooks/UserFunc.php

Spacing +2 added lines, -2 removed lines

@@ -56,9 +56,9 @@
     public function displayThumbnail(&$params)
     {
         // Simulate TCA field type "passthrough".
-        $output = '<input type="hidden" name="' . $params['itemFormElName'] . '" value="' . $params['itemFormElValue'] . '" />';
+        $output = '<input type="hidden" name="'.$params['itemFormElName'].'" value="'.$params['itemFormElValue'].'" />';
         if (!empty($params['itemFormElValue'])) {
-            $output .= '<img alt="Thumbnail" title="' . $params['itemFormElValue'] . '" src="' . $params['itemFormElValue'] . '" />';
+            $output .= '<img alt="Thumbnail" title="'.$params['itemFormElValue'].'" src="'.$params['itemFormElValue'].'" />';
         }
         return $output;
     }

Classes/Plugin/Tools/ImageDownloadTool.php

Spacing +3 added lines, -3 removed lines

@@ -114,14 +114,14 @@
                     'parameter' => $image['url'],
                     'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                     'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                    'title' => $label . $mimetypeLabel,
+                    'title' => $label.$mimetypeLabel,
                     'extTarget' => '_blank',
                     'additionalParams' => '',
                 ];
-                $imageLink = $this->cObj->typoLink($label . $mimetypeLabel, $linkConf);
+                $imageLink = $this->cObj->typoLink($label.$mimetypeLabel, $linkConf);
                 break;
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $imageLink;