Erikmitk / kitodo-presentation

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()) {

Classes/Plugin/ListView.php

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

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),

Classes/Common/MetsDocument.php

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

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();

Classes/Common/IiifManifest.php

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();