kitodo / kitodo-presentation

Classes/Plugin/OaiPmh.php

Spacing +27 added lines, -27 removed lines

@@ -83,7 +83,7 @@ 
         // Delete expired resumption tokens.
         $GLOBALS['TYPO3_DB']->exec_DELETEquery(
             'tx_dlf_tokens',
-            'tx_dlf_tokens.ident="oai" AND tx_dlf_tokens.tstamp<' . intval($GLOBALS['EXEC_TIME'] - $this->conf['expired'])
+            'tx_dlf_tokens.ident="oai" AND tx_dlf_tokens.tstamp<'.intval($GLOBALS['EXEC_TIME'] - $this->conf['expired'])
         );
         if ($GLOBALS['TYPO3_DB']->sql_affected_rows() === -1) {
             // Deletion failed.
@@ -151,13 +151,13 @@ 
         $oai_dc = $this->oai->createElementNS($this->formats['oai_dc']['namespace'], 'oai_dc:dc');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:dc', 'http://purl.org/dc/elements/1.1/');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $oai_dc->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['oai_dc']['namespace'] . ' ' . $this->formats['oai_dc']['schema']);
+        $oai_dc->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['oai_dc']['namespace'].' '.$this->formats['oai_dc']['schema']);
         $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['record_id'], ENT_NOQUOTES, 'UTF-8')));
         if (!empty($metadata['purl'])) {
             $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['purl'], ENT_NOQUOTES, 'UTF-8')));
         }
         if (!empty($metadata['prod_id'])) {
-            $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', 'kitodo:production:' . htmlspecialchars($metadata['prod_id'], ENT_NOQUOTES, 'UTF-8')));
+            $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', 'kitodo:production:'.htmlspecialchars($metadata['prod_id'], ENT_NOQUOTES, 'UTF-8')));
         }
         if (!empty($metadata['urn'])) {
             $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['urn'], ENT_NOQUOTES, 'UTF-8')));
@@ -255,7 +255,7 @@ 
         }
         // Add attributes and build XML tree.
         $epicur->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $epicur->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['epicur']['namespace'] . ' ' . $this->formats['epicur']['schema']);
+        $epicur->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['epicur']['namespace'].' '.$this->formats['epicur']['schema']);
         // Do we update an URN or register a new one?
         if ($metadata['tstamp'] == $metadata['crdate']) {
             $update->setAttribute('type', 'urn_new');
@@ -302,10 +302,10 @@ 
                 // Import node into \DOMDocument.
                 $mets = $this->oai->importNode($root->item(0), TRUE);
             } else {
-                Helper::devLog('No METS part found in document with location "' . $metadata['location'] . '"', DEVLOG_SEVERITY_ERROR);
+                Helper::devLog('No METS part found in document with location "'.$metadata['location'].'"', DEVLOG_SEVERITY_ERROR);
             }
         } else {
-            Helper::devLog('Could not load XML file from "' . $metadata['location'] . '"', DEVLOG_SEVERITY_ERROR);
+            Helper::devLog('Could not load XML file from "'.$metadata['location'].'"', DEVLOG_SEVERITY_ERROR);
         }
         if ($mets === NULL) {
             $mets = $this->oai->createElementNS('http://kitodo.org/', 'kitodo:error', htmlspecialchars($this->pi_getLL('error', 'Error!', FALSE), ENT_NOQUOTES, 'UTF-8'));
@@ -341,15 +341,15 @@ 
             if (substr($this->conf['stylesheet'], 0, 4) == 'EXT:') {
                 list($extKey, $filePath) = explode('/', substr($this->conf['stylesheet'], 4), 2);
                 if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
-                    $this->conf['stylesheet'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extKey) . $filePath;
+                    $this->conf['stylesheet'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extKey).$filePath;
                 }
             }
             $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->conf['stylesheet']);
         } else {
             // Use default stylesheet if no custom stylesheet is given.
-            $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Stylesheets/OaiPmh.xsl');
+            $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Stylesheets/OaiPmh.xsl');
         }
-        $this->oai->appendChild($this->oai->createProcessingInstruction('xml-stylesheet', 'type="text/xsl" href="' . htmlspecialchars($stylesheet, ENT_NOQUOTES, 'UTF-8') . '"'));
+        $this->oai->appendChild($this->oai->createProcessingInstruction('xml-stylesheet', 'type="text/xsl" href="'.htmlspecialchars($stylesheet, ENT_NOQUOTES, 'UTF-8').'"'));
         // Create root element.
         $root = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'OAI-PMH');
         $root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
@@ -399,10 +399,10 @@ 
         // Send headers.
         header('HTTP/1.1 200 OK');
         header('Cache-Control: no-cache');
-        header('Content-Length: ' . strlen($content));
+        header('Content-Length: '.strlen($content));
         header('Content-Type: text/xml; charset=utf-8');
-        header('Date: ' . date('r', $GLOBALS['EXEC_TIME']));
-        header('Expires: ' . date('r', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
+        header('Date: '.date('r', $GLOBALS['EXEC_TIME']));
+        header('Expires: '.date('r', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
         echo $content;
         exit;
     }
@@ -467,10 +467,10 @@ 
             'tx_dlf_documents',
             'tx_dlf_relations',
             'tx_dlf_collections',
-            'AND tx_dlf_documents.record_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['identifier'], 'tx_dlf_documents')
-                . ' AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+            'AND tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['identifier'], 'tx_dlf_documents')
+                . ' AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                 . $where
                 . Helper::whereClause('tx_dlf_collections'),
             '',
@@ -590,7 +590,7 @@ 
             $timestamp = $resArray['tstamp'];
             $earliestDatestamp = gmdate('Y-m-d\TH:i:s\Z', $timestamp);
         } else {
-            Helper::devLog('No records found with PID ' . $this->conf['pages'], DEVLOG_SEVERITY_NOTICE);
+            Helper::devLog('No records found with PID '.$this->conf['pages'], DEVLOG_SEVERITY_NOTICE);
         }
         $linkConf = [
             'parameter' => $GLOBALS['TSFE']->id,
@@ -853,9 +853,9 @@ 
             }
             $resArray = $allResults[0];
             if ($resArray['index_query'] != "") {
-                $solr_query .= '(' . $resArray['index_query'] . ')';
+                $solr_query .= '('.$resArray['index_query'].')';
             } else {
-                $solr_query .= 'collection:' . '"' . $resArray['index_name'] . '"';
+                $solr_query .= 'collection:'.'"'.$resArray['index_name'].'"';
             }
         } else {
             // If no set is specified we have to query for all collections
@@ -863,7 +863,7 @@ 
         }
         // Check for required fields.
         foreach ($this->formats[$this->piVars['metadataPrefix']]['requiredFields'] as $required) {
-            $solr_query .= ' NOT ' . $required . ':""';
+            $solr_query .= ' NOT '.$required.':""';
         }
         // toplevel="true" is always required
         $solr_query .= ' AND toplevel:true';
@@ -876,7 +876,7 @@ 
                 || is_array($date_array = strptime($this->piVars['from'], '%Y-%m-%d'))
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $from = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.000Z';
+                $from = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.000Z';
             } else {
                 throw new \Exception('badArgument');
             }
@@ -890,7 +890,7 @@ 
                 || is_array($date_array = strptime($this->piVars['until'], '%Y-%m-%d'))
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $until = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.999Z';
+                $until = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.999Z';
                 if ($from != "*" && $from > $until) {
                     throw new \Exception('badArgument');
                 }
@@ -907,7 +907,7 @@ 
                 throw new \Exception('badArgument');
             }
         }
-        $solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
+        $solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
         $documentSet = [];
         $solr = Solr::getInstance($this->conf['solrcore']);
         if (intval($this->conf['solr_limit']) > 0) {
@@ -947,10 +947,10 @@ 
             'tx_dlf_documents',
             'tx_dlf_relations',
             'tx_dlf_collections',
-            'AND tx_dlf_documents.uid IN (' . implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)) . ')'
-                . ' AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+            'AND tx_dlf_documents.uid IN ('.implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)).')'
+                . ' AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                 . Helper::whereClause('tx_dlf_collections'),
             'tx_dlf_documents.uid',
             'tx_dlf_documents.tstamp',

Classes/Plugin/PageGrid.php

Spacing +8 added lines, -8 removed lines

@@ -55,9 +55,9 @@ 
         } elseif (!empty($this->conf['placeholder'])) {
             $thumbnailFile = $GLOBALS['TSFE']->tmpl->getFileName($this->conf['placeholder']);
         } else {
-            $thumbnailFile = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Images/PageGridPlaceholder.jpg';
+            $thumbnailFile = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Images/PageGridPlaceholder.jpg';
         }
-        $thumbnail = '<img alt="' . $markerArray['###PAGINATION###'] . '" src="' . $thumbnailFile . '" />';
+        $thumbnail = '<img alt="'.$markerArray['###PAGINATION###'].'" src="'.$thumbnailFile.'" />';
         // Get new plugin variables for typolink.
         $piVars = $this->piVars;
         // Unset no longer needed plugin variables.
@@ -93,22 +93,22 @@ 
         $separator = $this->pi_getLL('separator', ' - ', TRUE);
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), ['pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1], TRUE) . $separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), ['pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1], TRUE).$separator;
         } else {
-            $output = '<span class="prev-page not-active">' . $this->pi_getLL('prevPage', '&lt;', TRUE) . '</span>' . $separator;
+            $output = '<span class="prev-page not-active">'.$this->pi_getLL('prevPage', '&lt;', TRUE).'</span>'.$separator;
         }
         $i = 0;
         // Add links to pages.
         while ($i < $maxPages) {
             if ($i < 3 || ($i > $this->piVars['pointer'] - 3 && $i < $this->piVars['pointer'] + 3) || $i > $maxPages - 4) {
                 if ($this->piVars['pointer'] != $i) {
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), ['pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1], TRUE) . $separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), ['pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1], TRUE).$separator;
                 } else {
-                    $output .= '<span class="active">' . sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1) . '</span>' . $separator;
+                    $output .= '<span class="active">'.sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1).'</span>'.$separator;
                 }
                 $skip = TRUE;
             } elseif ($skip == TRUE) {
-                $output .= '<span class="skipped">' . $this->pi_getLL('skip', '...', TRUE) . '</span>' . $separator;
+                $output .= '<span class="skipped">'.$this->pi_getLL('skip', '...', TRUE).'</span>'.$separator;
                 $skip = FALSE;
             }
             $i++;
@@ -117,7 +117,7 @@ 
         if ($this->piVars['pointer'] < $maxPages - 1) {
             $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), ['pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1], TRUE);
         } else {
-            $output .= '<span class="next-page not-active">' . $this->pi_getLL('nextPage', '&gt;', TRUE) . '</span>';
+            $output .= '<span class="next-page not-active">'.$this->pi_getLL('nextPage', '&gt;', TRUE).'</span>';
         }
         return $output;
     }

Classes/Plugin/Basket.php

Spacing +47 added lines, -47 removed lines

@@ -56,7 +56,7 @@ 
             $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                 '*',
                 'tx_dlf_basket',
-                'tx_dlf_basket.fe_user_id=' . intval($insertArray['fe_user_id'])
+                'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id'])
                     . Helper::whereClause('tx_dlf_basket'),
                 '',
                 '',
@@ -69,7 +69,7 @@ 
             $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                 '*',
                 'tx_dlf_basket',
-                'tx_dlf_basket.session_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket')
+                'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket')
                     . Helper::whereClause('tx_dlf_basket'),
                 '',
                 '',
@@ -159,9 +159,9 @@ 
 
         if ($resultMail->countRow() > 0) {
             $mailForm = '<select name="tx_dlf[mail_action]">';
-            $mailForm .= '<option value="">' . $this->pi_getLL('chooseMail', '', TRUE) . '</option>';
+            $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
             while ($row = $resultMail->fetch()) {
-                $mailForm .= '<option value="' . $row['uid'] . '">' . $row['name'] . ' (' . $row['mail'] . ')</option>';
+                $mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
             }
             $mailForm .= '</select><input type="submit">';
         }
@@ -170,9 +170,9 @@ 
         // remove action form
         $markerArray['###REMOVEACTION###'] = '
    <select name="tx_dlf[basket_action]">
-    <option value="">' . $this->pi_getLL('chooseAction', '', TRUE) . '</option>
-    <option value="open">' . $this->pi_getLL('download', '', TRUE) . '</option>
-    <option value="remove">' . $this->pi_getLL('remove', '', TRUE) . '</option>
+    <option value="">' . $this->pi_getLL('chooseAction', '', TRUE).'</option>
+    <option value="open">' . $this->pi_getLL('download', '', TRUE).'</option>
+    <option value="remove">' . $this->pi_getLL('remove', '', TRUE).'</option>
    </select>
    <input type="submit">
   ';
@@ -193,9 +193,9 @@ 
         $printForm = '';
         if ($resultPrinter->countRow() > 0) {
             $printForm = '<select name="tx_dlf[print_action]">';
-            $printForm .= '<option value="">' . $this->pi_getLL('choosePrinter', '', TRUE) . '</option>';
+            $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
             while ($row = $resultPrinter->fetch()) {
-                $printForm .= '<option value="' . $row['uid'] . '">' . $row['label'] . '</option>';
+                $printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
             }
             $printForm .= '</select><input type="submit" />';
         }
@@ -250,23 +250,23 @@ 
         $rotation = $data['rotation'];
         $docData = $this->getDocumentData($id, $data);
         $markerArray['###BASKETDATA###'] = $docData['downloadLink'];
-        $arrayKey = $id . '_' . $startpage;
+        $arrayKey = $id.'_'.$startpage;
         if (isset($startX)) {
-            $arrayKey .= '_' . $startX;
+            $arrayKey .= '_'.$startX;
         }
         if (isset($endX)) {
-            $arrayKey .= '_' . $endX;
+            $arrayKey .= '_'.$endX;
         }
-        $controlMark = '<input value="' . $id . '" name="tx_dlf[selected][' . $arrayKey . '][id]" type="checkbox">';
-        $controlMark .= '<input value="' . $startpage . '" name="tx_dlf[selected][' . $arrayKey . '][startpage]" type="hidden">';
-        $controlMark .= '<input value="' . $endpage . '" name="tx_dlf[selected][' . $arrayKey . '][endpage]" type="hidden">';
+        $controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
+        $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
+        $controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
         // add hidden fields for detail information
         if ($startX) {
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startX]" value="' . $startX . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startY]"  value="' . $startY . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endX]"  value="' . $endX . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endY]"  value="' . $endY . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][rotation]"  value="' . $rotation . '">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
         }
         // return one entry
         $markerArray['###CONTROLS###'] = $controlMark;
@@ -322,12 +322,12 @@ 
             if ($_piVars['addToBasket'] == 'list') {
                 $documentItem['endpage'] = $document->numPages;
             }
-            $arrayKey = $documentItem['id'] . '_' . $page;
+            $arrayKey = $documentItem['id'].'_'.$page;
             if (!empty($documentItem['startX'])) {
-                $arrayKey .= '_' . $documentItem['startX'];
+                $arrayKey .= '_'.$documentItem['startX'];
             }
             if (!empty($documentItem['endX'])) {
-                $arrayKey .= '_' . $documentItem['endX'];
+                $arrayKey .= '_'.$documentItem['endX'];
             }
             // do not add more than one identical object
             if (!in_array($arrayKey, $items)) {
@@ -346,14 +346,14 @@ 
                     // remove parameter endpage
                     $pdfParams = str_replace(",##endpage##", '', $pdfParams);
                 }
-                $pdfGenerateUrl = $this->conf['pdfgenerate'] . $pdfParams;
+                $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
                 if ($this->conf['pregeneration']) {
                     // send ajax request to webapp
                     $output .= '
      <script>
       $(document).ready(function(){
        $.ajax({
-         url: "' . $pdfGenerateUrl . '",
+         url: "' . $pdfGenerateUrl.'",
        }).done(function() {
        });
       });
@@ -361,7 +361,7 @@ 
                 }
             }
             $update = ['doc_ids' => json_encode($items)];
-            $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid=' . intval($basketData['uid']), $update);
+            $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
             $basketData['doc_ids'] = $items;
         }
         return ['basketData' => $basketData, 'jsOutput' => $output];
@@ -385,12 +385,12 @@ 
         }
         foreach ($_piVars['selected'] as $value) {
             if (isset($value['id'])) {
-                $arrayKey = $value['id'] . '_' . $value['startpage'];
+                $arrayKey = $value['id'].'_'.$value['startpage'];
                 if (isset($value['startX'])) {
-                    $arrayKey .= '_' . $value['startX'];
+                    $arrayKey .= '_'.$value['startX'];
                 }
                 if (isset($value['endX'])) {
-                    $arrayKey .= '_' . $value['endX'];
+                    $arrayKey .= '_'.$value['endX'];
                 }
                 if (isset($items[$arrayKey])) {
                     unset($items[$arrayKey]);
@@ -402,7 +402,7 @@ 
         } else {
             $update = ['doc_ids' => json_encode($items)];
         }
-        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid=' . intval($basketData['uid']), $update);
+        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
         $basketData['doc_ids'] = $items;
         return $basketData;
     }
@@ -423,10 +423,10 @@ 
         foreach ($this->piVars['selected'] as $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
             }
         }
-        header('Location: ' . $pdfUrl);
+        header('Location: '.$pdfUrl);
         ob_end_flush();
         exit;
     }
@@ -460,7 +460,7 @@ 
             $urlParams = str_replace("##endx##", $data['endX'] === "" ? "" : intval($data['endX']), $urlParams);
             $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : intval($data['endY']), $urlParams);
             $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : intval($data['rotation']), $urlParams);
-            $downloadUrl = $this->conf['pdfgenerate'] . $urlParams;
+            $downloadUrl = $this->conf['pdfgenerate'].$urlParams;
             $title = $document->getTitle($id, TRUE);
             if (empty($title)) {
                 $title = $this->pi_getLL('noTitle', '', TRUE);
@@ -469,15 +469,15 @@ 
             $info = '';
             if ($data['startX'] != '' && $data['endX'] != '') {
                 // cutout
-                $info .= $this->pi_getLL('cutout', '', TRUE) . ' ';
+                $info .= $this->pi_getLL('cutout', '', TRUE).' ';
             }
             if ($data['startpage'] == $data['endpage']) {
                 // One page
-                $info .= $this->pi_getLL('page', '', TRUE) . ' ' . $data['startpage'];
+                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
             } else {
-                $info .= $this->pi_getLL('page', '', TRUE) . ' ' . $data['startpage'] . '-' . $data['endpage'];
+                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
             }
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . $title . '</a> (' . $info . ')';
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.$title.'</a> ('.$info.')';
             if ($data['startpage'] == $data['endpage']) {
                 $pageNums = 1;
             } else {
@@ -523,7 +523,7 @@ 
 
         $allResults = $resultMail->fetchAll();
         $mailData = $allResults[0];
-        $mailText = $this->pi_getLL('mailBody', '', TRUE) . "\n";
+        $mailText = $this->pi_getLL('mailBody', '', TRUE)."\n";
         $numberOfPages = 0;
         $pdfUrl = $this->conf['pdfdownload'];
         // prepare links
@@ -531,7 +531,7 @@ 
             if ($docValue['id']) {
                 $explodeId = explode("_", $docValue['id']);
                 $docData = $this->getDocumentData($explodeId[0], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
                 $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
                 if ($pages === 0) {
                     $numberOfPages = $numberOfPages + 1;
@@ -542,7 +542,7 @@ 
         }
         // Remove leading/tailing pdfparamseperator
         $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
-        $mailBody = $mailText . $pdfUrl;
+        $mailBody = $mailText.$pdfUrl;
         // Get hook objects.
         $hookObjects = Helper::getHookObjects($this->scriptRelPath);
         // Hook for getting a customized mail body.
@@ -575,12 +575,12 @@ 
             // internal user
             $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
             $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
-            $insertArray['label'] = 'Mail: ' . $mailData['mail'];
+            $insertArray['label'] = 'Mail: '.$mailData['mail'];
         } else {
             // external user
             $insertArray['user_id'] = 0;
             $insertArray['name'] = 'n/a';
-            $insertArray['label'] = 'Mail: ' . $mailData['mail'];
+            $insertArray['label'] = 'Mail: '.$mailData['mail'];
         }
         // add action to protocol
         $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
@@ -600,7 +600,7 @@ 
         foreach ($this->piVars['selected'] as $docId => $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
                 $numberOfPages += $docData['pageNums'];
             }
         }
@@ -632,7 +632,7 @@ 
                 if ($docValue['id']) {
                     $explodeId = explode("_", $docId);
                     $docData = $this->getDocumentData($explodeId[0], $docValue);
-                    $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
                     $numberOfPages += $docData['pageNums'];
                 }
             }
@@ -649,16 +649,16 @@ 
             // internal user
             $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
             $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
-            $insertArray['label'] = 'Print: ' . $printerData['label'];
+            $insertArray['label'] = 'Print: '.$printerData['label'];
         } else {
             // external user
             $insertArray['user_id'] = 0;
             $insertArray['name'] = 'n/a';
-            $insertArray['label'] = 'Print: ' . $printerData['label'];
+            $insertArray['label'] = 'Print: '.$printerData['label'];
         }
         // add action to protocol
         $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
-        header('Location: ' . $pdfUrl);
+        header('Location: '.$pdfUrl);
         ob_end_flush();
         exit;
     }

Classes/Plugin/Calendar.php

Spacing +15 added lines, -15 removed lines

@@ -120,16 +120,16 @@ 
                 '###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
                 '###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
                 '###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
-                '###MONTHNAME###'  => strftime('%B', strtotime($year . '-' . ($i + 1) . '-1'))
+                '###MONTHNAME###'  => strftime('%B', strtotime($year.'-'.($i + 1).'-1'))
             ];
             // Reset week content of new month.
             $subWeekPartContent = '';
-            $firstOfMonth = strtotime($year . '-' . ($i + 1) . '-1');
+            $firstOfMonth = strtotime($year.'-'.($i + 1).'-1');
             $lastOfMonth = strtotime('last day of', ($firstOfMonth));
             $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
             // There are never more than 6 weeks in a month.
             for ($j = 0; $j <= 5; $j++) {
-                $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
+                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
                 $weekArray = [
                     '###DAYMON###' => '&nbsp;',
                     '###DAYTUE###' => '&nbsp;',
@@ -141,7 +141,7 @@ 
                 ];
                 // Every week has seven days. ;-)
                 for ($k = 0; $k <= 6; $k++) {
-                    $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek);
+                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
                     if (
                         $currentDayTime >= $firstOfMonth
                         && $currentDayTime <= $lastOfMonth
@@ -159,7 +159,7 @@ 
                                         $linkConf = [
                                             'useCacheHash' => 1,
                                             'parameter' => $this->conf['targetPid'],
-                                            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
+                                            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
                                             'ATagParams' => ' class="title"',
                                         ];
                                         $dayLinksText[] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
@@ -171,13 +171,13 @@ 
                             if (!empty($dayLinksText)) {
                                 $dayLinksList = '<ul>';
                                 foreach ($dayLinksText as $link) {
-                                    $dayLinksList .= '<li>' . $link . '</li>';
+                                    $dayLinksList .= '<li>'.$link.'</li>';
                                 }
                                 $dayLinksList .= '</ul>';
                             }
-                            $dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>' . $dayLinksList . '</div></div>';
+                            $dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
                         }
-                        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+                        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
                             case '0':
                                 $weekArray['###DAYSUN###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
                                 break;
@@ -214,14 +214,14 @@ 
         $linkConf = [
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId),
+            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
         ];
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
         // Link to current year.
         $linkConf = [
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
+            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
         ];
         $yearLink = $this->cObj->typoLink($year, $linkConf);
         $subPartContentList = '';
@@ -310,8 +310,8 @@ 
                 $linkConf = [
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetPid'],
-                    'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']),
-                    'title' => $titleAnchor . ': ' . $year['title']
+                    'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
+                    'title' => $titleAnchor.': '.$year['title']
                 ];
                 $yearArray = [
                     '###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf),
@@ -323,9 +323,9 @@ 
         $linkConf = [
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid,
+            'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
         ];
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->uid), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
         // Fill markers.
         $markerArray = [
             '###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),

Classes/Plugin/Statistics.php

Spacing +13 added lines, -13 removed lines

@@ -59,11 +59,11 @@ 
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
+                'AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
                     . ' AND tx_dlf_documents.partof=0'
-                    . ' AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')'
-                    . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+                    . ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')'
+                    . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                     . Helper::whereClause('tx_dlf_documents')
                     . Helper::whereClause('tx_dlf_collections'),
                 'tx_dlf_documents.uid'
@@ -73,11 +73,11 @@ 
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
-                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0' . Helper::whereClause('tx_dlf_documents') . ')'
-                    . ' AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')'
-                    . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+                'AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
+                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.Helper::whereClause('tx_dlf_documents').')'
+                    . ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')'
+                    . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                     . Helper::whereClause('tx_dlf_documents')
                     . Helper::whereClause('tx_dlf_collections'),
                 'tx_dlf_documents.uid'
@@ -101,8 +101,8 @@ 
             $resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.uid AS uid',
                 'tx_dlf_documents',
-                'tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0' . Helper::whereClause('tx_dlf_documents') . ')'
+                'tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.Helper::whereClause('tx_dlf_documents').')'
                     . Helper::whereClause('tx_dlf_documents')
             );
         }
@@ -115,8 +115,8 @@ 
                 '###VOLUMES###'
             ],
             'value' => [
-                $countTitles . ($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
-                $countVolumes . ($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
+                $countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
+                $countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
             ]
         ];
         // Apply replacements.

Classes/Plugin/Feeds.php

Spacing +13 added lines, -13 removed lines

@@ -90,18 +90,18 @@ 
             $additionalWhere = '';
             // Check for pre-selected collections.
             if (!empty($this->piVars['collection'])) {
-                $additionalWhere = ' AND tx_dlf_collections.uid=' . intval($this->piVars['collection']);
+                $additionalWhere = ' AND tx_dlf_collections.uid='.intval($this->piVars['collection']);
             } elseif (!empty($this->conf['collections'])) {
-                $additionalWhere = ' AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')';
+                $additionalWhere = ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
             }
             $result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
                 'tx_dlf_documents.uid AS uid,tx_dlf_documents.partof AS partof,tx_dlf_documents.title AS title,tx_dlf_documents.volume AS volume,tx_dlf_documents.author AS author,tx_dlf_documents.record_id AS guid,tx_dlf_documents.tstamp AS tstamp,tx_dlf_documents.crdate AS crdate',
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
-                    . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
+                'AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+                    . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
                     . $additionalWhere
                     . Helper::whereClause('tx_dlf_documents')
                     . Helper::whereClause('tx_dlf_collections'),
@@ -120,12 +120,12 @@ 
                     ) {
                         $superiorTitle = Document::getTitle($resArray['partof'], TRUE);
                         if (!empty($superiorTitle)) {
-                            $title .= '[' . $superiorTitle . ']';
+                            $title .= '['.$superiorTitle.']';
                         }
                     }
                     // Get title of document.
                     if (!empty($resArray['title'])) {
-                        $title .= ' ' . $resArray['title'];
+                        $title .= ' '.$resArray['title'];
                     }
                     // Set default title if empty.
                     if (empty($title)) {
@@ -133,13 +133,13 @@ 
                     }
                     // Append volume information.
                     if (!empty($resArray['volume'])) {
-                        $title .= ', ' . $this->pi_getLL('volume') . ' ' . $resArray['volume'];
+                        $title .= ', '.$this->pi_getLL('volume').' '.$resArray['volume'];
                     }
                     // Is this document new or updated?
                     if ($resArray['crdate'] == $resArray['tstamp']) {
-                        $title = $this->pi_getLL('new') . ' ' . trim($title);
+                        $title = $this->pi_getLL('new').' '.trim($title);
                     } else {
-                        $title = $this->pi_getLL('update') . ' ' . trim($title);
+                        $title = $this->pi_getLL('update').' '.trim($title);
                     }
                     $item->appendChild($rss->createElement('title', htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8')));
                     // Add link.
@@ -170,10 +170,10 @@ 
         // Send headers.
         header('HTTP/1.1 200 OK');
         header('Cache-Control: no-cache');
-        header('Content-Length: ' . strlen($content));
+        header('Content-Length: '.strlen($content));
         header('Content-Type: application/rss+xml; charset=utf-8');
-        header('Date: ' . date('r', $GLOBALS['EXEC_TIME']));
-        header('Expires: ' . date('r', $GLOBALS['EXEC_TIME']));
+        header('Date: '.date('r', $GLOBALS['EXEC_TIME']));
+        header('Expires: '.date('r', $GLOBALS['EXEC_TIME']));
         echo $content;
         exit;
     }

Classes/Plugin/PageView.php

Spacing +30 added lines, -30 removed lines

@@ -73,33 +73,33 @@ 
 
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
         // Add OpenLayers library.
-        $pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/OpenLayers/ol3.css');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/OpenLayers/glif.min.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/OpenLayers/ol3-dlf.js');
+        $pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/OpenLayers/ol3.css');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/OpenLayers/glif.min.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/OpenLayers/ol3-dlf.js');
         // Add viewer library.
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/Utility.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/OL3.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/OL3Styles.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/OL3Sources.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/AltoParser.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/ImageManipulationControl.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/FulltextControl.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/Utility.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/OL3.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/OL3Styles.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/OL3Sources.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/AltoParser.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/ImageManipulationControl.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/FulltextControl.js');
         if ($this->doc instanceof IiifManifest) {
-            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/AnnotationParser.js');
-            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/AnnotationControl.js');
+            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/AnnotationParser.js');
+            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/AnnotationControl.js');
         }
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/PageView.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/PageView.js');
         // Add viewer configuration.
         $viewerConfiguration = '
             $(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->conf['elementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->conf['elementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });
@@ -119,14 +119,14 @@ 
         $markerArray = [];
         if ($this->piVars['id']) {
             if ($this->conf['crop']) {
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">' . $this->pi_getLL('editMode', '', TRUE) . '</a>';
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">' . $this->pi_getLL('editRemove', '', TRUE) . '</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
             } else {
                 $markerArray['###EDITBUTTON###'] = '';
                 $markerArray['###EDITREMOVE###'] = '';
             }
             if ($this->conf['magnifier']) {
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">' . $this->pi_getLL('magnifier', '', TRUE) . '</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
             } else {
                 $markerArray['###MAGNIFIER###'] = '';
             }
@@ -159,15 +159,15 @@ 
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
                 'title' => $label
             ];
-            $output = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="' . $this->piVars['page'] . '">';
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="' . $this->piVars['page'] . '">';
+            $output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
+            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.$this->piVars['page'].'">';
+            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.$this->piVars['page'].'">';
             $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
             $output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
             $output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
             $output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
             $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
-            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">' . $label . '</button>';
+            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
             $output .= '</form>';
             $output .= '<script>';
             $output .= '$(document).ready(function() { $("#submitBasketForm").click(function() { $("#addToBasketForm").submit(); }); });';
@@ -201,14 +201,14 @@ 
                     // Configure @action URL for form.
                     $linkConf = [
                         'parameter' => $GLOBALS['TSFE']->id,
-                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($image['url']),
+                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($image['url']),
                     ];
                     $image['url'] = $this->cObj->typoLink_URL($linkConf);
                 }
                 $image['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp]);
                 break;
             } else {
-                Helper::devLog('File not found in fileGrp "' . $fileGrp . '"', DEVLOG_SEVERITY_WARNING);
+                Helper::devLog('File not found in fileGrp "'.$fileGrp.'"', DEVLOG_SEVERITY_WARNING);
             }
         }
         return $image;
@@ -232,12 +232,12 @@ 
             // Configure @action URL for form.
             $linkConf = [
                 'parameter' => $GLOBALS['TSFE']->id,
-                'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($fulltext['url']),
+                'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($fulltext['url']),
             ];
             $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
             $fulltext['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
         } else {
-            Helper::devLog('File not found in fileGrp "' . $this->conf['fileGrpFulltext'] . '"', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', DEVLOG_SEVERITY_WARNING);
         }
         return $fulltext;
     }

Classes/Plugin/AudioPlayer.php

Spacing +7 added lines, -7 removed lines

@@ -43,21 +43,21 @@
     {
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
         // Add AudioPlayer library.
-        $pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/jPlayer/blue.monday/css/jplayer.blue.monday.min.css');
+        $pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/jPlayer/blue.monday/css/jplayer.blue.monday.min.css');
         $pageRenderer->addCssInlineBlock('kitodo-audioplayer-configuration', '#tx-dlf-audio { width: 100px; height: 100px; }');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/jPlayer/jquery.jplayer.min.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/AudioPlayer/AudioPlayer.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/jPlayer/jquery.jplayer.min.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/AudioPlayer/AudioPlayer.js');
         // Add AudioPlayer configuration.
         $audioplayerConfiguration = '
                 $(document).ready(function() {
                     AudioPlayer = new dlfAudioPlayer({
                         audio: {
-                            mimeType: "' . $this->audio['mimetype'] . '",
-                            title: "' . $this->audio['label'] . '",
-                            url:  "' . $this->audio['url'] . '"
+                            mimeType: "' . $this->audio['mimetype'].'",
+                            title: "' . $this->audio['label'].'",
+                            url:  "' . $this->audio['url'].'"
                         },
                         parentElId: "tx-dlf-audio",
-                        swfPath: "' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
+                        swfPath: "' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
                     });
                 });
         ';

Classes/Plugin/Navigation.php

Spacing +14 added lines, -14 removed lines

@@ -65,18 +65,18 @@ 
         $linkConf = [
             'parameter' => $GLOBALS['TSFE']->id
         ];
-        $output = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />';
+        $output = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
         // Add plugin variables.
         foreach ($this->piVars as $piVar => $value) {
             if ($piVar != 'page' && $piVar != 'DATA' && !empty($value)) {
-                $output .= '<input type="hidden" name="' . $this->prefixId . '[' . $piVar . ']" value="' . $value . '" />';
+                $output .= '<input type="hidden" name="'.$this->prefixId.'['.$piVar.']" value="'.$value.'" />';
             }
         }
         // Add page selector.
-        $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)) . '-');
-        $output .= '<label for="' . $uniqId . '">' . $this->pi_getLL('selectPage', '', TRUE) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[page]" onchange="javascript:this.form.submit();"' . ($this->doc->numPages < 1 ? ' disabled="disabled"' : '') . '>';
+        $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)).'-');
+        $output .= '<label for="'.$uniqId.'">'.$this->pi_getLL('selectPage', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
         for ($i = 1; $i <= $this->doc->numPages; $i++) {
-            $output .= '<option value="' . $i . '"' . ($this->piVars['page'] == $i ? ' selected="selected"' : '') . '>[' . $i . ']' . ($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '') . '</option>';
+            $output .= '<option value="'.$i.'"'.($this->piVars['page'] == $i ? ' selected="selected"' : '').'>['.$i.']'.($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '').'</option>';
         }
         $output .= '</select></div></form>';
         return $output;
@@ -134,37 +134,37 @@ 
         if ($this->piVars['page'] > 1) {
             $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), ['page' => 1]);
         } else {
-            $markerArray['###FIRST###'] = '<span>' . $this->pi_getLL('firstPage', '', TRUE) . '</span>';
+            $markerArray['###FIRST###'] = '<span>'.$this->pi_getLL('firstPage', '', TRUE).'</span>';
         }
         // Link back X pages.
         if ($this->piVars['page'] > $pageSteps) {
             $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), ['page' => $this->piVars['page'] - $pageSteps]);
         } else {
-            $markerArray['###BACK###'] = '<span>' . sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps) . '</span>';
+            $markerArray['###BACK###'] = '<span>'.sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps).'</span>';
         }
         // Link to previous page.
         if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
             $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), ['page' => $this->piVars['page'] - (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###PREVIOUS###'] = '<span>' . $this->pi_getLL('prevPage', '', TRUE) . '</span>';
+            $markerArray['###PREVIOUS###'] = '<span>'.$this->pi_getLL('prevPage', '', TRUE).'</span>';
         }
         // Link to next page.
         if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
             $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), ['page' => $this->piVars['page'] + (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###NEXT###'] = '<span>' . $this->pi_getLL('nextPage', '', TRUE) . '</span>';
+            $markerArray['###NEXT###'] = '<span>'.$this->pi_getLL('nextPage', '', TRUE).'</span>';
         }
         // Link forward X pages.
         if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
             $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), ['page' => $this->piVars['page'] + $pageSteps]);
         } else {
-            $markerArray['###FORWARD###'] = '<span>' . sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps) . '</span>';
+            $markerArray['###FORWARD###'] = '<span>'.sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps).'</span>';
         }
         // Link to last page.
         if ($this->piVars['page'] < $this->doc->numPages) {
             $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), ['page' => $this->doc->numPages]);
         } else {
-            $markerArray['###LAST###'] = '<span>' . $this->pi_getLL('lastPage', '', TRUE) . '</span>';
+            $markerArray['###LAST###'] = '<span>'.$this->pi_getLL('lastPage', '', TRUE).'</span>';
         }
         // Add double page switcher.
         if ($this->doc->numPages > 0) {
@@ -176,11 +176,11 @@ 
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
                 $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), ['page' => $this->piVars['page'] + 1]);
             } else {
-                $markerArray['###DOUBLEPAGE+1###'] = '<span>' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
             }
         } else {
-            $markerArray['###DOUBLEPAGE###'] = '<span>' . $this->pi_getLL('doublePageOn', '', TRUE) . '</span>';
-            $markerArray['###DOUBLEPAGE+1###'] = '<span>' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span>'.$this->pi_getLL('doublePageOn', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
         }
         // Add page selector.
         $markerArray['###PAGESELECT###'] = $this->getPageSelector();