Erikmitk / kitodo-presentation

Classes/Plugin/ListView.php

Spacing +3 added lines, -3 removed lines

@@ -447,7 +447,7 @@ 
             if ((!empty($this->piVars['order']) && $this->piVars['order'] != $listMetadata['options']['order'])
                 || (isset($this->piVars['asc']) && $this->piVars['asc'] != $listMetadata['options']['order.asc'])) {
                 // Update list's metadata.
-                $listMetadata['options']['params']['sort'] = [$this->piVars['order']."_sorting" => (boolean) $this->piVars['asc']?'asc':'desc'];
+                $listMetadata['options']['params']['sort'] = [$this->piVars['order']."_sorting" => (boolean) $this->piVars['asc'] ? 'asc' : 'desc'];
                 $listMetadata['options']['order'] = $this->piVars['order'];
                 $listMetadata['options']['order.asc'] = (boolean) $this->piVars['asc'];
                 // Reset pointer.
@@ -465,7 +465,7 @@ 
                     return $content;
                 }
                 // Set search parameters.
-                $solr->cPid =  $listMetadata['options']['pid'];
+                $solr->cPid = $listMetadata['options']['pid'];
                 $solr->params = $listMetadata['options']['params'];
                 // Perform search.
                 $this->list = $solr->search();
@@ -505,7 +505,7 @@ 
             $markerArray['###LISTTHUMBNAIL###'] = '';
         }
         if ($currentEntry) {
-            $currentEntry =  ($this->piVars['pointer'] * $this->conf['limit']) + 1;
+            $currentEntry = ($this->piVars['pointer'] * $this->conf['limit']) + 1;
             $lastEntry = ($this->piVars['pointer'] * $this->conf['limit']) + $this->conf['limit'];
             $markerArray['###COUNT###'] = htmlspecialchars(sprintf($this->pi_getLL('count'), $currentEntry, $lastEntry < $this->list->metadata['options']['numberOfToplevelHits'] ? $lastEntry : $this->list->metadata['options']['numberOfToplevelHits'], $this->list->metadata['options']['numberOfToplevelHits']));
         } else {

Classes/Common/MetsDocument.php

Spacing +1 added lines, -2 removed lines

@@ -131,8 +131,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 = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
             IiifHelper::setUrlReader(IiifUrlReader::getInstance());
             IiifHelper::setMaxThumbnailHeight($conf['iiifThumbnailHeight']);

Classes/Plugin/Tools/AnnotationTool.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         // Load template file.
         $this->getTemplate();
         $annotationContainers = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['annotationContainers'];
-        if ($annotationContainers != null && sizeof($annotationContainers)>0) {
+        if ($annotationContainers != null && sizeof($annotationContainers) > 0) {
             $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:'
                 .$this->pi_getLL('annotations-on', '', TRUE).';annotations-off:'
                     .$this->pi_getLL('annotations-off', '', TRUE).'">&nbsp;</a>';

ext_localconf.php

Spacing +6 added lines, -6 removed lines

@@ -14,19 +14,19 @@ 
 }
 // Define constants.
 if (!defined('DEVLOG_SEVERITY_OK')) {
-    define ('DEVLOG_SEVERITY_OK', -1);
+    define('DEVLOG_SEVERITY_OK', -1);
 }
 if (!defined('DEVLOG_SEVERITY_INFO')) {
-    define ('DEVLOG_SEVERITY_INFO', 0);
+    define('DEVLOG_SEVERITY_INFO', 0);
 }
 if (!defined('DEVLOG_SEVERITY_NOTICE')) {
-    define ('DEVLOG_SEVERITY_NOTICE', 1);
+    define('DEVLOG_SEVERITY_NOTICE', 1);
 }
 if (!defined('DEVLOG_SEVERITY_WARNING')) {
-    define ('DEVLOG_SEVERITY_WARNING', 2);
+    define('DEVLOG_SEVERITY_WARNING', 2);
 }
 if (!defined('DEVLOG_SEVERITY_ERROR')) {
-    define ('DEVLOG_SEVERITY_ERROR', 3);
+    define('DEVLOG_SEVERITY_ERROR', 3);
 }
 // Register plugins.
 \Kitodo\Dlf\Hooks\ExtensionManagementUtility::addPItoST43($_EXTKEY, \Kitodo\Dlf\Plugin\AudioPlayer::class, '_audioplayer', 'list_type', TRUE);
@@ -62,7 +62,7 @@ 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Common/MetsDocument.php']['hookClass'][] = \Kitodo\Dlf\Hooks\KitodoProductionHacks::class;
 // Register command line scripts.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = [
-    function () {
+    function() {
         $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Kitodo\Dlf\Cli\CommandLineIndexer::class);
         $SOBE->main();
     },

Classes/Plugin/Metadata.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
                 $iiifwrap['value.']['required'] = 1;
                 $iiifwrap['value.']['wrap'] = '<dd>|</dd>';
             }
-            $iiifLink=[];
+            $iiifLink = [];
             $iiifLink['key.']['wrap'] = '<dt>|</dt>';
             $iiifLink['value.']['required'] = 1;
             $iiifLink['value.']['setContentToCurrent'] = 1;

Classes/Common/Document.php

Spacing +2 added lines, -2 removed lines

@@ -448,7 +448,7 @@ 
                     /* @var $xml \SimpleXMLElement */
                     $xml->registerXPathNamespace('mets', 'http://www.loc.gov/METS/');
                     $xpathResult = $xml->xpath('//mets:mets');
-                    $documentFormat = ($xpathResult !== false && count($xpathResult)>0) ? 'METS' : null;
+                    $documentFormat = ($xpathResult !== false && count($xpathResult) > 0) ? 'METS' : null;
                 } else {
                     // Try to load file as IIIF resource instead.
                     $contentAsJsonArray = json_decode($content, true);
@@ -682,7 +682,7 @@ 
                 return $depth;
             } elseif (array_key_exists('children', $element)) {
                 $foundInChildren = $this->getTreeDepth($element['children'], $depth + 1, $logId);
-                if ($foundInChildren!==false) {
+                if ($foundInChildren !== false) {
                     return $foundInChildren;
                 }
             }

Classes/Plugin/PageView.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
      * @var array
      * @access protected
      */
-    protected $annotationContainers = array();
+    protected $annotationContainers = array ();
 
     /**
      * Adds Viewer javascript
@@ -250,8 +250,8 @@ 
             if ($iiif instanceof ManifestInterface) {
                 $canvas = $iiif->getContainedResourceById($canvasId);
                 /* @var $canvas \Ubl\Iiif\Presentation\Common\Model\Resources\CanvasInterface */
-                if ($canvas!=null && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
-                    $annotationContainers = array();
+                if ($canvas != null && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
+                    $annotationContainers = array ();
                     /*
                      *  TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
                      *  just to determine wether they contain text annotations for painting. This will take time and lead to a bad user experience.
@@ -285,7 +285,7 @@ 
                 }
             }
         }
-        return array();
+        return array ();
     }
 
     /**

Classes/Common/IiifManifest.php

Spacing +21 added lines, -21 removed lines

@@ -284,17 +284,17 @@ 
                     }
                     // populate structural metadata info
                     $elements[$canvasOrder] = $canvas->getId();
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['id']=$canvas->getId();
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['dmdId']=null;
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['label']=$canvas->getLabelForDisplay();
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['orderlabel']=$canvas->getLabelForDisplay();
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['id'] = $canvas->getId();
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['dmdId'] = null;
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['label'] = $canvas->getLabelForDisplay();
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['orderlabel'] = $canvas->getLabelForDisplay();
                     // assume that a canvas always represents a page
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['type']='page';
-                    $this->physicalStructureInfo[$elements[$canvasOrder]]['contentIds']=null;
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['type'] = 'page';
+                    $this->physicalStructureInfo[$elements[$canvasOrder]]['contentIds'] = null;
                     $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'] = null;
                     if (!empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
-                        $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'] = array();
-                        $this->physicalStructureInfo[$physSeq[0]]['annotationContainers'] = array();
+                        $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'] = array ();
+                        $this->physicalStructureInfo[$physSeq[0]]['annotationContainers'] = array ();
                         foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
                             $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'][] = $annotationContainer->getId();
                             if ($extConf['indexAnnotations']) {
@@ -425,7 +425,7 @@ 
                 $details = $this->getLogicalStructureInfo($logUnits[0]);
             } else {
                 // cache the ranges - they might occure multiple times in the structures "tree" - with full data as well as referenced as id
-                $processedStructures = array();
+                $processedStructures = array ();
                 foreach ($logUnits as $logUnit) {
                     if (array_search($logUnit->getId(), $processedStructures) == false) {
                         $this->tableOfContents[] = $this->getLogicalStructureInfo($logUnit, TRUE, $processedStructures);
@@ -446,7 +446,7 @@ 
      * @param array $processedStructures: IIIF resources that already have been processed
      * @return array Logical structure array
      */
-    protected function getLogicalStructureInfo(IiifResourceInterface $resource, $recursive = false, &$processedStructures = array()) {
+    protected function getLogicalStructureInfo(IiifResourceInterface $resource, $recursive = false, &$processedStructures = array ()) {
         $details = array ();
         $details['id'] = $resource->getId();
         $details['dmdId'] = '';
@@ -468,7 +468,7 @@ 
         $this->_getSmLinks();
         // Load physical structure.
         $this-> _getPhysicalStructure();
-        $canvases = array();
+        $canvases = array ();
         if ($resource instanceof ManifestInterface) {
             $startCanvas = $resource->getStartCanvasOrFirstCanvas();
             $canvases = $resource->getDefaultCanvases();
@@ -479,13 +479,13 @@ 
         if ($startCanvas != null) {
             $details['pagination'] = $startCanvas->getLabel();
             $startCanvasIndex = array_search($startCanvas, $this->iiif->getDefaultCanvases());
-            if ($startCanvasIndex!==false) {
+            if ($startCanvasIndex !== false) {
                 $details['points'] = $startCanvasIndex + 1;
             }
         }
         $useGroups = $this->getUseGroups('fileGrps');
         if (is_string($useGroups)) {
-            $useGroups = array($useGroups);
+            $useGroups = array ($useGroups);
         }
         // Keep for later usage.
         $this->logicalUnits[$details['id']] = $details;
@@ -543,9 +543,9 @@ 
             return $this->originalMetadataArray[$id];
         }
         $iiifResource = $this->iiif->getContainedResourceById($id);
-        $result = array();
+        $result = array ();
         if ($iiifResource != null) {
-            if ($iiifResource->getLabel()!=null && $iiifResource->getLabel() != "") {
+            if ($iiifResource->getLabel() != null && $iiifResource->getLabel() != "") {
                 $result['label'] = $iiifResource->getLabel();
             }
             if (!empty($iiifResource->getMetadata())) {
@@ -621,7 +621,7 @@ 
             if ($resArray['format'] > 0 && !empty($resArray['xpath']) && ($values = $iiifResource->jsonPath($resArray['xpath'])) != null) {
                 if (is_string($values)) {
                     $metadata[$resArray['index_name']] = array (trim((string) $values));
-                } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data())>1 ) {
+                } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data()) > 1) {
                     $metadata[$resArray['index_name']] = array ();
                     foreach ($values->data() as $value) {
                         $metadata[$resArray['index_name']][] = trim((string) $value);
@@ -638,7 +638,7 @@ 
                     && ($values = $iiifResource->jsonPath($resArray['xpath_sorting']) != null)) {
                     if ($values instanceof string) {
                         $metadata[$resArray['index_name'].'_sorting'][0] = array (trim((string) $values));
-                    } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data()>1 )) {
+                    } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data() > 1)) {
                         $metadata[$resArray['index_name']] = array ();
                         foreach ($values->data() as $value) {
                             $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $value);
@@ -750,13 +750,13 @@ 
                     // Get annotation containers
                     $annotationContainerIds = $this->physicalStructureInfo[$id]['annotationContainers'];
                     if (!empty($annotationContainerIds)) {
-                        $annotationTexts = array();
+                        $annotationTexts = array ();
                         foreach ($annotationContainerIds as $annotationListId) {
                             $annotationContainer = $this->iiif->getContainedResourceById($annotationListId);
                             /* @var $annotationContainer \Ubl\Iiif\Presentation\Common\Model\Resources\AnnotationContainerInterface */
                             foreach ($annotationContainer->getTextAnnotations(Motivation::PAINTING) as $annotation) {
                                 if ($annotation->getTargetResourceId() == $iiifResource->getId() &&
-                                    $annotation->getBody()!=null && $annotation->getBody()->getChars()!=null) {
+                                    $annotation->getBody() != null && $annotation->getBody()->getChars() != null) {
                                     $annotationTexts[] = $annotation->getBody()->getChars();
                                 }
                             }
@@ -806,7 +806,7 @@ 
         IiifHelper::setMaxThumbnailHeight($conf['iiifThumbnailHeight']);
         IiifHelper::setMaxThumbnailWidth($conf['iiifThumbnailWidth']);
         $resource = IiifHelper::loadIiifResource($content);
-        if ($resource != null ) {
+        if ($resource != null) {
             if ($resource instanceof ManifestInterface) {
                 $this->iiif = $resource;
                 return true;
@@ -919,7 +919,7 @@ 
         IiifHelper::setMaxThumbnailWidth($conf['iiifThumbnailWidth']);
         $resource = IiifHelper::loadIiifResource($this->asJson);
         if ($resource != null && $resource instanceof ManifestInterface) {
-            $this->asJson='';
+            $this->asJson = '';
             $this->iiif = $resource;
             $this->init();
         } else {

Classes/Plugin/Search.php

Spacing +2 added lines, -2 removed lines

@@ -552,14 +552,14 @@
         $results = $solr->service->select($selectQuery);
         $facet = $results->getFacetSet();
 
-        $facetCollectionArray = array();
+        $facetCollectionArray = array ();
 
         // replace everything expect numbers and comma
         $facetCollections = preg_replace('/[^0-9,]/', '', $this->conf['facetCollections']);
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.index_name AS index_name',
             'tx_dlf_collections',
-            'tx_dlf_collections.uid IN (' . $facetCollections . ')'
+            'tx_dlf_collections.uid IN ('.$facetCollections.')'
                 .Helper::whereClause('tx_dlf_collections')
         );