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 {

Braces +12 added lines, -6 removed lines

@@ -161,11 +161,14 @@ 
                             'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
                         ];
                         $value = $this->cObj->typoLink(htmlspecialchars($value), $conf);
-                    } elseif ($index_name == 'owner' && !empty($value)) { // Translate name of holding library.
+                    } elseif ($index_name == 'owner' && !empty($value)) {
+// Translate name of holding library.
                         $value = htmlspecialchars(Helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
-                    } elseif ($index_name == 'type' && !empty($value)) { // Translate document type.
+                    } elseif ($index_name == 'type' && !empty($value)) {
+// Translate document type.
                         $value = htmlspecialchars(Helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
-                    } elseif ($index_name == 'language' && !empty($value)) { // Translate ISO 639 language code.
+                    } elseif ($index_name == 'language' && !empty($value)) {
+// Translate ISO 639 language code.
                         $value = htmlspecialchars(Helper::getLanguageName($value));
                     } elseif (!empty($value)) {
                         $value = htmlspecialchars($value);
@@ -328,16 +331,19 @@ 
                                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
                             ];
                             $value = $this->cObj->typoLink(htmlspecialchars($value), $conf);
-                        } elseif ($index_name == 'owner' && !empty($value)) { // Translate name of holding library.
+                        } elseif ($index_name == 'owner' && !empty($value)) {
+// Translate name of holding library.
                             $value = htmlspecialchars(Helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
-                        } elseif ($index_name == 'type' && !empty($value)) { // Translate document type.
+                        } elseif ($index_name == 'type' && !empty($value)) {
+// Translate document type.
                             $_value = $value;
                             $value = htmlspecialchars(Helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
                             // Add page number for single pages.
                             if ($_value == 'page') {
                                 $value .= ' '.intval($subpart['page']);
                             }
-                        } elseif ($index_name == 'language' && !empty($value)) { // Translate ISO 639 language code.
+                        } elseif ($index_name == 'language' && !empty($value)) {
+// Translate ISO 639 language code.
                             $value = htmlspecialchars(Helper::getLanguageName($value));
                         } elseif (!empty($value)) {
                             $value = htmlspecialchars($value);

Classes/Common/Helper.php

Indentation +12 added lines, -12 removed lines

@@ -580,18 +580,18 @@
         return $original;
     }
 
-     /**
-     * Process a data and/or command map with TYPO3 core engine as admin.
-     *
-     * @access public
-     *
-     * @param array $data: Data map
-     * @param array $cmd: Command map
-     * @param boolean $reverseOrder: Should the data map be reversed?
-     * @param boolean $cmdFirst: Should the command map be processed first?
-     *
-     * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
-     */
+        /**
+         * Process a data and/or command map with TYPO3 core engine as admin.
+         *
+         * @access public
+         *
+         * @param array $data: Data map
+         * @param array $cmd: Command map
+         * @param boolean $reverseOrder: Should the data map be reversed?
+         * @param boolean $cmdFirst: Should the command map be processed first?
+         *
+         * @return array Array of substituted "NEW..." identifiers and their actual UIDs.
+         */
     public static function processDBasAdmin(array $data = [], array $cmd = [], $reverseOrder = FALSE, $cmdFirst = FALSE) {
         if (TYPO3_MODE === 'BE'
             && $GLOBALS['BE_USER']->isAdmin()) {

class.ext_update.php

Indentation +1 added lines, -1 removed lines

@@ -422,7 +422,7 @@
                 $GLOBALS['LANG']->getLL('update.documentSetFormatForOldEntriesOkay', TRUE),
                 $GLOBALS['LANG']->getLL('update.documentSetFormatForOldEntries', TRUE),
                 \TYPO3\CMS\Core\Messaging\FlashMessage::OK
-               );
+                );
         } else {
             Helper::addMessage(
                 $GLOBALS['LANG']->getLL('update.documentSetFormatForOldEntriesNotOkay', TRUE),

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

@@ -364,10 +364,10 @@
         );
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
             if ($resArray['COLUMN_NAME'] == 'document_format') {
-                return false;
+                return FALSE;
             }
         }
-        return true;
+        return TRUE;
     }
 
     protected function updateDocumentAddFormat() {

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']);

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

@@ -138,11 +138,11 @@ 
             IiifHelper::setMaxThumbnailHeight($conf['iiifThumbnailHeight']);
             IiifHelper::setMaxThumbnailWidth($conf['iiifThumbnailWidth']);
             $service = IiifHelper::loadIiifResource($fileLocation);
-            if ($service != null && $service instanceof AbstractImageService) {
+            if ($service != NULL && $service instanceof AbstractImageService) {
                 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";
         }
@@ -580,9 +580,9 @@ 
         
         if ($preloadedDocument instanceof \SimpleXMLElement) {
             $this->xml = $preloadedDocument;
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**

Braces +7 added lines, -8 removed lines

@@ -23,8 +23,7 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-final class MetsDocument extends Document
-{
+final class MetsDocument extends Document {
     /**
      * This holds the whole XML file as string for serialization purposes
      * @see __sleep() / __wakeup()
@@ -259,14 +258,16 @@ 
             // Yes. Get the file reference.
             $details['points'] = (string) $structure->children('http://www.loc.gov/METS/')->mptr[0]->attributes('http://www.w3.org/1999/xlink')->href;
         } elseif (!empty($this->physicalStructure)
-            && array_key_exists($details['id'], $this->smLinks['l2p'])) { // Are there any physical elements and is this logical unit linked to at least one of them?
+            && array_key_exists($details['id'], $this->smLinks['l2p'])) {
+// Are there any physical elements and is this logical unit linked to at least one of them?
             $details['points'] = max(intval(array_search($this->smLinks['l2p'][$details['id']][0], $this->physicalStructure, TRUE)), 1);
             if (!empty($this->physicalStructureInfo[$this->smLinks['l2p'][$details['id']][0]]['files'][$extConf['fileGrpThumbs']])) {
                 $details['thumbnailId'] = $this->physicalStructureInfo[$this->smLinks['l2p'][$details['id']][0]]['files'][$extConf['fileGrpThumbs']];
             }
             // Get page/track number of the first page/track related to this structure element.
             $details['pagination'] = $this->physicalStructureInfo[$this->smLinks['l2p'][$details['id']][0]]['orderlabel'];
-        } elseif ($details['id'] == $this->_getToplevelId()) { // Is this the toplevel structure element?
+        } elseif ($details['id'] == $this->_getToplevelId()) {
+// Is this the toplevel structure element?
             // Yes. Point to itself.
             $details['points'] = 1;
             if (!empty($this->physicalStructure)
@@ -491,8 +492,7 @@ 
      * {@inheritDoc}
      * @see Document::getStructureDepth()
      */
-    public function getStructureDepth($logId)
-    {
+    public function getStructureDepth($logId) {
         return count($this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$logId.'"]/ancestor::*'));
     }
 
@@ -551,8 +551,7 @@ 
      * {@inheritDoc}
      * @see Document::getParentDocumentUid()
      */
-    protected function getParentDocumentUidForSaving($pid, $core)
-    {
+    protected function getParentDocumentUidForSaving($pid, $core) {
         $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');

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>';

Upper-Lower-Casing +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>';

Classes/Plugin/Metadata.php

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

@@ -150,7 +150,7 @@
      *
      * @return string The metadata array ready for output
      */
-    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false) {
+    protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = FALSE) {
         // Load template file.
         $this->getTemplate();
         $output = '';

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/Plugin/PageView.php

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

@@ -247,7 +247,7 @@ 
             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))) {
+                if ($canvas!=NULL && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                     $annotationContainers = array();
                     /*
                      *  TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
@@ -257,10 +257,10 @@ 
                      *  On the other hand, server connections are potentially better than client connections. Downloading annotation lists
                      */
                     foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
-                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != null) {
+                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != NULL) {
                             foreach ($textAnnotations as $annotation) {
                                 if ($annotation->getBody()->getFormat() == "text/plain"
-                                    && $annotation->getBody()->getChars() != null) {
+                                    && $annotation->getBody()->getChars() != NULL) {
                                     $annotationListData = [];
                                     $annotationListData["uri"] = $annotationContainer->getId();
                                     $annotationListData["label"] = $annotationContainer->getLabelForDisplay();

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 ();
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -242,8 +242,7 @@
      * @return array     An array containing the IRIs of the AnnotationLists / AnnotationPages as well as
      *                   some information about the canvas.
      */
-    protected function getAnnotationContainers($page)
-    {
+    protected function getAnnotationContainers($page) {
         if ($this->doc instanceof IiifManifest) {
             $canvasId = $this->doc->physicalStructure[$page];
             $iiif = $this->doc->getIiif();

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

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

@@ -411,9 +411,9 @@ 
             }
         }
         // Create new instance depending on format (METS or IIIF) ...
-        $documentFormat = null;
-        $xml = null;
-        $iiif = null;
+        $documentFormat = NULL;
+        $xml = NULL;
+        $iiif = NULL;
         // Try to get document format from database
         if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($uid)) {
             $whereClause = 'tx_dlf_documents.uid='.intval($uid).Helper::whereClause('tx_dlf_documents');
@@ -460,15 +460,15 @@ 
                 libxml_disable_entity_loader($previousValueOfEntityLoader);
                 // Reset libxml's error logging.
                 libxml_use_internal_errors($libxmlErrors);
-                if ($xml !== false) {
+                if ($xml !== FALSE) {
                     /* @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);
-                    if ($contentAsJsonArray !== null) {
+                    $contentAsJsonArray = json_decode($content, TRUE);
+                    if ($contentAsJsonArray !== NULL) {
                         // Load plugin configuration.
                         $conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
                         IiifHelper::setUrlReader(IiifUrlReader::getInstance());
@@ -722,12 +722,12 @@ 
                 return $depth;
             } elseif (array_key_exists('children', $element)) {
                 $foundInChildren = $this->getTreeDepth($element['children'], $depth + 1, $logId);
-                if ($foundInChildren!==false) {
+                if ($foundInChildren!==FALSE) {
                     return $foundInChildren;
                 }
             }
         }
-        return false;
+        return FALSE;
     }
 
     /**