kitodo / kitodo-presentation

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

@@ -390,10 +390,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;
     }
 
     /**

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 {

Braces +18 added lines, -36 removed lines

@@ -37,8 +37,7 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-final class IiifManifest extends Document
-{
+final class IiifManifest extends Document {
     /**
      * This holds the manifest file as string for serialization purposes
      * @see __sleep() / __wakeup()
@@ -99,8 +98,7 @@ 
      * {@inheritDoc}
      * @see Document::establishRecordId()
      */
-    protected function establishRecordId($pid)
-    {
+    protected function establishRecordId($pid) {
         if ($this->iiif !== null) {
             /*
              *  FIXME This will not consistently work because we can not be sure to have the pid at hand. It may miss
@@ -141,8 +139,7 @@ 
      * {@inheritDoc}
      * @see Document::getDocument()
      */
-    protected function getDocument()
-    {
+    protected function getDocument() {
         return $this->iiif;
     }
 
@@ -196,8 +193,7 @@ 
      *
      * @return array|string
      */
-    protected function getUseGroups($use)
-    {
+    protected function getUseGroups($use) {
         if (!$this->useGrpsLoaded) {
             // Get configured USE attributes.
             $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
@@ -224,8 +220,7 @@ 
      * {@inheritDoc}
      * @see Document::_getPhysicalStructure()
      */
-    protected function _getPhysicalStructure()
-    {
+    protected function _getPhysicalStructure() {
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
             if ($this->iiif == null || !($this->iiif instanceof ManifestInterface)) {
@@ -359,8 +354,7 @@ 
      * {@inheritDoc}
      * @see Document::getFileLocation()
      */
-    public function getFileLocation($id)
-    {
+    public function getFileLocation($id) {
         if ($id == null) {
             return null;
         }
@@ -384,8 +378,7 @@ 
      * {@inheritDoc}
      * @see Document::getFileMimeType()
      */
-    public function getFileMimeType($id)
-    {
+    public function getFileMimeType($id) {
         $fileResource = $this->iiif->getContainedResourceById($id);
         if ($fileResource instanceof CanvasInterface) {
             $format = "application/vnd.kitodo.iiif";
@@ -410,8 +403,7 @@ 
      * {@inheritDoc}
      * @see Document::getLogicalStructure()
      */
-    public function getLogicalStructure($id, $recursive = FALSE)
-    {
+    public function getLogicalStructure($id, $recursive = FALSE) {
         $details = array ();
         if (!$recursive && !empty($this->logicalUnits[$id])) {
             return $this->logicalUnits[$id];
@@ -580,8 +572,7 @@ 
      * {@inheritDoc}
      * @see Document::getMetadata()
      */
-    public function getMetadata($id, $cPid = 0)
-    {
+    public function getMetadata($id, $cPid = 0) {
         if (!empty($this->metadataArray[$id]) && $this->metadataArray[0] == $cPid) {
             return $this->metadataArray[$id];
         }
@@ -704,8 +695,7 @@ 
      * @param CanvasInterface $canvas
      * @param IiifResourceInterface $resource
      */
-    private function smLinkCanvasToResource(CanvasInterface $canvas, IiifResourceInterface $resource)
-    {
+    private function smLinkCanvasToResource(CanvasInterface $canvas, IiifResourceInterface $resource) {
         $this->smLinks['l2p'][$resource->getId()][] = $canvas->getId();
         if (!is_array($this->smLinks['p2l'][$canvas->getId()]) || !in_array($resource->getId(), $this->smLinks['p2l'][$canvas->getId()])) {
             $this->smLinks['p2l'][$canvas->getId()][] = $resource->getId();
@@ -720,8 +710,7 @@ 
      *
      * @see Document::getParentDocumentUidForSaving()
      */
-    protected function getParentDocumentUidForSaving($pid, $core)
-    {
+    protected function getParentDocumentUidForSaving($pid, $core) {
         // Do nothing.
     }
 
@@ -780,8 +769,7 @@ 
      *
      * @return IiifResourceInterface
      */
-    public function getIiif()
-    {
+    public function getIiif() {
         return $this->iiif;
     }
 
@@ -789,8 +777,7 @@ 
      * {@inheritDoc}
      * @see Document::init()
      */
-    protected function init()
-    {
+    protected function init() {
         // Nothing to do here, at the moment
     }
 
@@ -798,8 +785,7 @@ 
      * {@inheritDoc}
      * @see Document::loadLocation()
      */
-    protected function loadLocation($location)
-    {
+    protected function loadLocation($location) {
         $content = GeneralUtility::getUrl($location);
         $conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
         IiifHelper::setUrlReader(IiifUrlReader::getInstance());
@@ -820,8 +806,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Document::prepareMetadataArray()
      */
-    protected function prepareMetadataArray($cPid)
-    {
+    protected function prepareMetadataArray($cPid) {
         $id = $this->iiif->getId();
         $this->metadataArray[(string) $id] = $this->getMetadata((string) $id, $cPid);
     }
@@ -842,8 +827,7 @@ 
      * {@inheritDoc}
      * @see Document::ensureHasFulltextIsSet()
      */
-    protected function ensureHasFulltextIsSet()
-    {
+    protected function ensureHasFulltextIsSet() {
         /*
          *  TODO Check annotations and annotation lists of canvas for ALTO documents.
          *  Example:
@@ -885,8 +869,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Document::_getThumbnail()
      */
-    protected function _getThumbnail($forceReload = FALSE)
-    {
+    protected function _getThumbnail($forceReload = FALSE) {
         return $this->iiif->getThumbnailUrl();
     }
 
@@ -894,8 +877,7 @@ 
      * {@inheritDoc}
      * @see \Kitodo\Dlf\Common\Document::_getToplevelId()
      */
-    protected function _getToplevelId()
-    {
+    protected function _getToplevelId() {
         if (empty($this->toplevelId)) {
             if (isset($this->iiif)) {
                 $this->toplevelId = $this->iiif->getId();

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

@@ -68,7 +68,7 @@ 
      * @var boolean
      * @access protected
      */
-    protected $hasFulltextSet = false;
+    protected $hasFulltextSet = FALSE;
 
     /**
      * This holds the original manifest's parsed metadata array with their corresponding
@@ -101,7 +101,7 @@ 
      */
     protected function establishRecordId($pid)
     {
-        if ($this->iiif !== null) {
+        if ($this->iiif !== NULL) {
             /*
              *  FIXME This will not consistently work because we can not be sure to have the pid at hand. It may miss
              *  if the plugin that actually loads the manifest allows content from other pages.
@@ -228,8 +228,8 @@ 
     {
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
-            if ($this->iiif == null || !($this->iiif instanceof ManifestInterface)) {
-                return null;
+            if ($this->iiif == NULL || !($this->iiif instanceof ManifestInterface)) {
+                return NULL;
             }
             $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
             $iiifId = $this->iiif->getId();
@@ -239,7 +239,7 @@ 
             $this->physicalStructureInfo[$physSeq[0]]['label'] = $this->iiif->getLabelForDisplay();
             $this->physicalStructureInfo[$physSeq[0]]['orderlabel'] = $this->iiif->getLabelForDisplay();
             $this->physicalStructureInfo[$physSeq[0]]['type'] = 'physSequence';
-            $this->physicalStructureInfo[$physSeq[0]]['contentIds'] = null;
+            $this->physicalStructureInfo[$physSeq[0]]['contentIds'] = NULL;
             $fileUseDownload = $this->getUseGroups('fileGrpDownload');
             $fileUseFulltext = $this->getUseGroups('fileGrpFulltext');
             $fileUseThumbs = $this->getUseGroups('fileGrpThumbs');
@@ -253,14 +253,14 @@ 
             if (isset($fileUseFulltext)) {
                 $iiifAlto = $this->iiif->getSeeAlsoUrlsForFormat("application/alto+xml");
                 if (empty($iiifAlto)) {
-                    $iiifAlto = $this->iiif->getSeeAlsoUrlsForProfile("http://www.loc.gov/standards/alto/", true);
+                    $iiifAlto = $this->iiif->getSeeAlsoUrlsForProfile("http://www.loc.gov/standards/alto/", TRUE);
                 }
                 if (!empty($iiifAlto)) {
                     // TODO use multiple possible alto files?
                     $this->mimeTypes[$iiifAlto[0]] = "application/alto+xml";
                     $this->physicalStructureInfo[$physSeq[0]]['files'][$fileUseFulltext] = $iiifAlto[0];
-                    $this->hasFulltext = true;
-                    $this->hasFulltextSet = true;
+                    $this->hasFulltext = TRUE;
+                    $this->hasFulltextSet = TRUE;
                 }
             }
             if (!empty($this->iiif->getDefaultCanvases())) {
@@ -277,7 +277,7 @@ 
                     // put images in all non specific filegroups
                     if (isset($fileUses)) {
                         foreach ($fileUses as $fileUse) {
-                            if ($image->getBody() != null && $image->getBody() instanceof ContentResourceInterface) {
+                            if ($image->getBody() != NULL && $image->getBody() instanceof ContentResourceInterface) {
                                 $this->physicalStructureInfo[$physSeq[0]]['files'][$fileUse] = $image->getBody()->getId();
                             }
                         }
@@ -285,40 +285,40 @@ 
                     // 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]]['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]]['annotationContainers'] = null;
+                    $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();
                         foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
                             $this->physicalStructureInfo[$elements[$canvasOrder]]['annotationContainers'][] = $annotationContainer->getId();
                             if ($extConf['indexAnnotations']) {
-                                $this->hasFulltext = true;
-                                $this->hasFulltextSet = true;
+                                $this->hasFulltext = TRUE;
+                                $this->hasFulltextSet = TRUE;
                             }
                         }
                     }
                     if (isset($fileUseFulltext)) {
                         $alto = $canvas->getSeeAlsoUrlsForFormat("application/alto+xml");
                         if (empty($alto)) {
-                            $alto = $canvas->getSeeAlsoUrlsForProfile("http://www.loc.gov/standards/alto/", true);
+                            $alto = $canvas->getSeeAlsoUrlsForProfile("http://www.loc.gov/standards/alto/", TRUE);
                         }
                         if (!empty($alto)) {
                             // TODO use all possible alto files?
                             $this->mimeTypes[$alto[0]] = "application/alto+xml";
                             $this->physicalStructureInfo[$elements[$canvasOrder]]['files'][$fileUseFulltext] = $alto[0];
-                            $this->hasFulltext = true;
-                            $this->hasFulltextSet = true;
+                            $this->hasFulltext = TRUE;
+                            $this->hasFulltextSet = TRUE;
                         }
                     }
                     if (isset($fileUses)) {
                         foreach ($fileUses as $fileUse) {
-                            if ($image->getBody() != null && $image->getBody() instanceof ContentResourceInterface) {
+                            if ($image->getBody() != NULL && $image->getBody() instanceof ContentResourceInterface) {
                                 $this->physicalStructureInfo[$elements[$canvasOrder]]['files'][$fileUse] = $image->getBody()->getId();
                             }
                         }
@@ -361,15 +361,15 @@ 
      */
     public function getFileLocation($id)
     {
-        if ($id == null) {
-            return null;
+        if ($id == NULL) {
+            return NULL;
         }
         $resource = $this->iiif->getContainedResourceById($id);
         if (isset($resource)) {
             if ($resource instanceof CanvasInterface) {
-                return (!empty($resource->getImageAnnotations()) && $resource->getImageAnnotations()->getSingleService() != null) ? $resource->getImageAnnotations()[0]->getSingleService()->getId() : $id;
+                return (!empty($resource->getImageAnnotations()) && $resource->getImageAnnotations()->getSingleService() != NULL) ? $resource->getImageAnnotations()[0]->getSingleService()->getId() : $id;
             } elseif ($resource instanceof ContentResourceInterface) {
-                return $resource->getSingleService() != null && $resource->getSingleService() instanceof Service ? $resource->getSingleService()->getId() : $id;
+                return $resource->getSingleService() != NULL && $resource->getSingleService() instanceof Service ? $resource->getSingleService()->getId() : $id;
             } elseif ($resource instanceof AbstractImageService) {
                 return $resource->getId();
             } elseif ($resource instanceof AnnotationContainerInterface) {
@@ -392,7 +392,7 @@ 
         } elseif ($fileResource instanceof AnnotationInterface) {
             $format = "application/vnd.kitodo.iiif";
         } elseif ($fileResource instanceof ContentResourceInterface) {
-            if ($fileResource->isText() || $fileResource->isImage() && ($fileResource->getSingleService() == null || !($fileResource->getSingleService() instanceof AbstractImageService))) {
+            if ($fileResource->isText() || $fileResource->isImage() && ($fileResource->getSingleService() == NULL || !($fileResource->getSingleService() instanceof AbstractImageService))) {
                 // Support static images without an image service
                 return $fileResource->getFormat();
             }
@@ -427,7 +427,7 @@ 
                 // cache the ranges - they might occure multiple times in the structures "tree" - with full data as well as referenced as id
                 $processedStructures = array();
                 foreach ($logUnits as $logUnit) {
-                    if (array_search($logUnit->getId(), $processedStructures) == false) {
+                    if (array_search($logUnit->getId(), $processedStructures) == FALSE) {
                         $this->tableOfContents[] = $this->getLogicalStructureInfo($logUnit, TRUE, $processedStructures);
                     }
                 }
@@ -446,12 +446,12 @@ 
      * @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'] = '';
-        $details['label'] = $resource->getLabelForDisplay() !== null ? $resource->getLabelForDisplay() : '';
-        $details['orderlabel'] = $resource->getLabelForDisplay() !== null ? $resource->getLabelForDisplay() : '';
+        $details['label'] = $resource->getLabelForDisplay() !== NULL ? $resource->getLabelForDisplay() : '';
+        $details['orderlabel'] = $resource->getLabelForDisplay() !== NULL ? $resource->getLabelForDisplay() : '';
         $details['contentIds'] = '';
         $details['volume'] = '';
         $details['pagination'] = '';
@@ -476,10 +476,10 @@ 
             $startCanvas = $resource->getStartCanvasOrFirstCanvas();
             $canvases = $resource->getAllCanvases();
         }
-        if ($startCanvas != null) {
+        if ($startCanvas != NULL) {
             $details['pagination'] = $startCanvas->getLabel();
             $startCanvasIndex = array_search($startCanvas, $this->iiif->getDefaultCanvases());
-            if ($startCanvasIndex!==false) {
+            if ($startCanvasIndex!==FALSE) {
                 $details['points'] = $startCanvasIndex + 1;
             }
         }
@@ -493,7 +493,7 @@ 
         if ($recursive) {
             $processedStructures[] = $resource->getId();
             $details['children'] = array ();
-            if ($resource instanceof ManifestInterface && $resource->getRootRanges() != null) {
+            if ($resource instanceof ManifestInterface && $resource->getRootRanges() != NULL) {
                 $rangesToAdd = [];
                 $rootRanges = [];
                 if (sizeof($this->iiif->getRootRanges()) == 1 && $this->iiif->getRootRanges()[0]->isTopRange()) {
@@ -505,14 +505,14 @@ 
                     $rootRanges[] = $range;
                 }
                 foreach ($rootRanges as $range) {
-                    if ((array_search($range->getId(), $processedStructures) == false)) {
+                    if ((array_search($range->getId(), $processedStructures) == FALSE)) {
                         $details['children'][] = $this->getLogicalStructureInfo($range, TRUE, $processedStructures);
                     }
                 }
             } elseif ($resource instanceof RangeInterface) {
                 if (!empty($resource->getAllRanges())) {
                     foreach ($resource->getAllRanges() as $range) {
-                        if ((array_search($range->getId(), $processedStructures) == false)) {
+                        if ((array_search($range->getId(), $processedStructures) == FALSE)) {
                             $details['children'][] = $this->getLogicalStructureInfo($range, TRUE, $processedStructures);
                         }
                     }
@@ -538,14 +538,14 @@ 
      *
      * @todo This method is still in experimental; the method signature may change.
      */
-    public function getManifestMetadata($id, $cPid = 0, $withDescription = true, $withRights = true, $withRelated = true) {
+    public function getManifestMetadata($id, $cPid = 0, $withDescription = TRUE, $withRights = TRUE, $withRelated = TRUE) {
         if (!empty($this->originalMetadataArray[$id])) {
             return $this->originalMetadataArray[$id];
         }
         $iiifResource = $this->iiif->getContainedResourceById($id);
         $result = array();
-        if ($iiifResource != null) {
-            if ($iiifResource->getLabel()!=null && $iiifResource->getLabel() != "") {
+        if ($iiifResource != NULL) {
+            if ($iiifResource->getLabel()!=NULL && $iiifResource->getLabel() != "") {
                 $result['label'] = $iiifResource->getLabel();
             }
             if (!empty($iiifResource->getMetadata())) {
@@ -618,7 +618,7 @@ 
         $iiifResource = $this->iiif->getContainedResourceById($id);
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
             // Set metadata field's value(s).
-            if ($resArray['format'] > 0 && !empty($resArray['xpath']) && ($values = $iiifResource->jsonPath($resArray['xpath'])) != null) {
+            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 ) {
@@ -635,7 +635,7 @@ 
             // Set sorting value if applicable.
             if (!empty($metadata[$resArray['index_name']]) && $resArray['is_sortable']) {
                 if ($resArray['format'] > 0 && !empty($resArray['xpath_sorting'])
-                    && ($values = $iiifResource->jsonPath($resArray['xpath_sorting']) != null)) {
+                    && ($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 )) {
@@ -669,7 +669,7 @@ 
                     $this->smLinkRangeCanvasesRecursively($range);
                 }
             }
-            $this->smLinksLoaded = true;
+            $this->smLinksLoaded = TRUE;
         }
         return $this->smLinks;
     }
@@ -756,7 +756,7 @@ 
                             /* @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,10 +806,10 @@ 
         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;
+                return TRUE;
             }
         } else {
             Helper::devLog('Could not load IIIF manifest from "'.$location.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
@@ -833,9 +833,9 @@ 
     protected function setPreloadedDocument($preloadedDocument) {
         if ($preloadedDocument instanceof ManifestInterface) {
             $this->iiif = $preloadedDocument;
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -856,20 +856,20 @@ 
             foreach ($canvases as $canvas) {
                 if (!empty($canvas->getSeeAlsoUrlsForFormat("application/alto+xml")) ||
                     !empty($canvas->getSeeAlsoUrlsForProfile("http://www.loc.gov/standards/alto/"))) {
-                    $this->hasFulltextSet = true;
-                    $this->hasFulltext = true;
+                    $this->hasFulltextSet = TRUE;
+                    $this->hasFulltext = TRUE;
                     return;
                 }
                 $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
                 if ($extConf['indexAnnotations'] == 1 && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                     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() != null &&
+                                if ($annotation->getBody() != NULL &&
                                     $annotation->getBody()->getFormat() == "text/plain" &&
-                                    $annotation->getBody()->getChars() != null) {
-                                    $this->hasFulltextSet = true;
-                                    $this->hasFulltext = true;
+                                    $annotation->getBody()->getChars() != NULL) {
+                                    $this->hasFulltextSet = TRUE;
+                                    $this->hasFulltext = TRUE;
                                     return;
                                 }
                             }
@@ -877,7 +877,7 @@ 
                     }
                 }
             }
-            $this->hasFulltextSet = true;
+            $this->hasFulltextSet = TRUE;
         }
     }
 
@@ -918,7 +918,7 @@ 
         IiifHelper::setMaxThumbnailHeight($conf['iiifThumbnailHeight']);
         IiifHelper::setMaxThumbnailWidth($conf['iiifThumbnailWidth']);
         $resource = IiifHelper::loadIiifResource($this->asJson);
-        if ($resource != null && $resource instanceof ManifestInterface) {
+        if ($resource != NULL && $resource instanceof ManifestInterface) {
             $this->asJson='';
             $this->iiif = $resource;
             $this->init();