Erikmitk / kitodo-presentation

Classes/Plugin/Statistics.php

Spacing +2 added lines, -2 removed lines

@@ -180,8 +180,8 @@
                 '###VOLUMES###'
             ],
             'value' => [
-                $countTitles . ($countTitles > 1 ? htmlspecialchars($this->pi_getLL('titles', '')) : htmlspecialchars($this->pi_getLL('title', ''))),
-                $countVolumes . ($countVolumes > 1 ? htmlspecialchars($this->pi_getLL('volumes', '')) : htmlspecialchars($this->pi_getLL('volume', '')))
+                $countTitles.($countTitles > 1 ? htmlspecialchars($this->pi_getLL('titles', '')) : htmlspecialchars($this->pi_getLL('title', ''))),
+                $countVolumes.($countVolumes > 1 ? htmlspecialchars($this->pi_getLL('volumes', '')) : htmlspecialchars($this->pi_getLL('volume', '')))
             ]
         ];
         // Apply replacements.

Classes/Plugin/Tools/AnnotationTool.php

Spacing +2 added lines, -2 removed lines

@@ -84,9 +84,9 @@
             $annotationContainers != null
             && sizeof($annotationContainers) > 0
         ) {
-            $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:' . htmlspecialchars($this->pi_getLL('annotations-on', '')) . ';annotations-off:' . htmlspecialchars($this->pi_getLL('annotations-off', '')) . '">&nbsp;</a>';
+            $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:'.htmlspecialchars($this->pi_getLL('annotations-on', '')).';annotations-off:'.htmlspecialchars($this->pi_getLL('annotations-off', '')).'">&nbsp;</a>';
         } else {
-            $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">' . htmlspecialchars($this->pi_getLL('annotations-not-available', '')) . '</span>';
+            $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">'.htmlspecialchars($this->pi_getLL('annotations-not-available', '')).'</span>';
         }
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);

Classes/Plugin/Tools/ImageManipulationTool.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         $parentContainer = !empty($this->conf['parentContainer']) ? $this->conf['parentContainer'] : '.tx-dlf-imagemanipulationtool';
         // Load template file.
         $this->getTemplate();
-        $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:' . htmlspecialchars($this->pi_getLL('imagemanipulation-on', '')) . ';imagemanipulation-off:' . htmlspecialchars($this->pi_getLL('imagemanipulation-off', '')) . ';reset:' . htmlspecialchars($this->pi_getLL('reset', '')) . ';saturation:' . htmlspecialchars($this->pi_getLL('saturation', '')) . ';hue:' . htmlspecialchars($this->pi_getLL('hue', '')) . ';contrast:' . htmlspecialchars($this->pi_getLL('contrast', '')) . ';brightness:' . htmlspecialchars($this->pi_getLL('brightness', '')) . ';invert:' . htmlspecialchars($this->pi_getLL('invert', '')) . ';parentContainer:' . $parentContainer . '" title="' . htmlspecialchars($this->pi_getLL('no-support', '')) . '"></span>';
+        $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:'.htmlspecialchars($this->pi_getLL('imagemanipulation-on', '')).';imagemanipulation-off:'.htmlspecialchars($this->pi_getLL('imagemanipulation-off', '')).';reset:'.htmlspecialchars($this->pi_getLL('reset', '')).';saturation:'.htmlspecialchars($this->pi_getLL('saturation', '')).';hue:'.htmlspecialchars($this->pi_getLL('hue', '')).';contrast:'.htmlspecialchars($this->pi_getLL('contrast', '')).';brightness:'.htmlspecialchars($this->pi_getLL('brightness', '')).';invert:'.htmlspecialchars($this->pi_getLL('invert', '')).';parentContainer:'.$parentContainer.'" title="'.htmlspecialchars($this->pi_getLL('no-support', '')).'"></span>';
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);
     }

Classes/Plugin/Basket.php

Spacing +43 added lines, -43 removed lines

@@ -164,9 +164,9 @@ 
 
         if ($resultMail->rowCount() > 0) {
             $mailForm = '<select name="tx_dlf[mail_action]">';
-            $mailForm .= '<option value="">' . htmlspecialchars($this->pi_getLL('chooseMail', '')) . '</option>';
+            $mailForm .= '<option value="">'.htmlspecialchars($this->pi_getLL('chooseMail', '')).'</option>';
             while ($row = $resultMail->fetch()) {
-                $mailForm .= '<option value="' . $row['uid'] . '">' . htmlspecialchars($row['name']) . ' (' . htmlspecialchars($row['mail']) . ')</option>';
+                $mailForm .= '<option value="'.$row['uid'].'">'.htmlspecialchars($row['name']).' ('.htmlspecialchars($row['mail']).')</option>';
             }
             $mailForm .= '</select><input type="submit">';
         }
@@ -175,9 +175,9 @@ 
         // remove action form
         $markerArray['###REMOVEACTION###'] = '
    <select name="tx_dlf[basket_action]">
-    <option value="">' . htmlspecialchars($this->pi_getLL('chooseAction', '')) . '</option>
-    <option value="open">' . htmlspecialchars($this->pi_getLL('download', '')) . '</option>
-    <option value="remove">' . htmlspecialchars($this->pi_getLL('remove', '')) . '</option>
+    <option value="">' . htmlspecialchars($this->pi_getLL('chooseAction', '')).'</option>
+    <option value="open">' . htmlspecialchars($this->pi_getLL('download', '')).'</option>
+    <option value="remove">' . htmlspecialchars($this->pi_getLL('remove', '')).'</option>
    </select>
    <input type="submit">
   ';
@@ -198,9 +198,9 @@ 
         $printForm = '';
         if ($resultPrinter->rowCount() > 0) {
             $printForm = '<select name="tx_dlf[print_action]">';
-            $printForm .= '<option value="">' . htmlspecialchars($this->pi_getLL('choosePrinter', '')) . '</option>';
+            $printForm .= '<option value="">'.htmlspecialchars($this->pi_getLL('choosePrinter', '')).'</option>';
             while ($row = $resultPrinter->fetch()) {
-                $printForm .= '<option value="' . $row['uid'] . '">' . htmlspecialchars($row['label']) . '</option>';
+                $printForm .= '<option value="'.$row['uid'].'">'.htmlspecialchars($row['label']).'</option>';
             }
             $printForm .= '</select><input type="submit" />';
         }
@@ -257,23 +257,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;
@@ -329,12 +329,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)) {
@@ -353,14 +353,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() {
        });
       });
@@ -398,12 +398,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]);
@@ -442,10 +442,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;
     }
@@ -479,7 +479,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', '');
@@ -488,15 +488,15 @@ 
             $info = '';
             if ($data['startX'] != '' && $data['endX'] != '') {
                 // cutout
-                $info .= htmlspecialchars($this->pi_getLL('cutout', '')) . ' ';
+                $info .= htmlspecialchars($this->pi_getLL('cutout', '')).' ';
             }
             if ($data['startpage'] == $data['endpage']) {
                 // One page
-                $info .= htmlspecialchars($this->pi_getLL('page', '')) . ' ' . $data['startpage'];
+                $info .= htmlspecialchars($this->pi_getLL('page', '')).' '.$data['startpage'];
             } else {
-                $info .= htmlspecialchars($this->pi_getLL('page', '')) . ' ' . $data['startpage'] . '-' . $data['endpage'];
+                $info .= htmlspecialchars($this->pi_getLL('page', '')).' '.$data['startpage'].'-'.$data['endpage'];
             }
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')';
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')';
             if ($data['startpage'] == $data['endpage']) {
                 $pageNums = 1;
             } else {
@@ -541,7 +541,7 @@ 
 
         $allResults = $resultMail->fetchAll();
         $mailData = $allResults[0];
-        $mailText = htmlspecialchars($this->pi_getLL('mailBody', '')) . "\n";
+        $mailText = htmlspecialchars($this->pi_getLL('mailBody', ''))."\n";
         $numberOfPages = 0;
         $pdfUrl = $this->conf['pdfdownload'];
         // prepare links
@@ -549,7 +549,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;
@@ -560,7 +560,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.
@@ -593,12 +593,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
         GeneralUtility::makeInstance(ConnectionPool::class)
@@ -623,7 +623,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'];
             }
         }
@@ -654,7 +654,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'];
                 }
             }
@@ -671,12 +671,12 @@ 
             // 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
         GeneralUtility::makeInstance(ConnectionPool::class)
@@ -685,7 +685,7 @@ 
                 'tx_dlf_actionlog',
                 $insertArray
             );
-        header('Location: ' . $pdfUrl);
+        header('Location: '.$pdfUrl);
         ob_end_flush();
         exit;
     }

Classes/Plugin/Navigation.php

Spacing +17 added lines, -17 removed lines

@@ -69,18 +69,18 @@ 
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http']
         ];
-        $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 . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />';
+                $output .= '<input type="hidden" name="'.$this->prefixId.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />';
             }
         }
         // Add page selector.
-        $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)) . '-');
-        $output .= '<label for="' . $uniqId . '">' . htmlspecialchars($this->pi_getLL('selectPage', '')) . '</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.'">'.htmlspecialchars($this->pi_getLL('selectPage', '')).'</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;
@@ -138,53 +138,53 @@ 
         if ($this->piVars['page'] > 1) {
             $markerArray['###FIRST###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('firstPage', '')), ['page' => 1]);
         } else {
-            $markerArray['###FIRST###'] = '<span title="' . htmlspecialchars($this->pi_getLL('firstPage', '')) . '">' . htmlspecialchars($this->pi_getLL('firstPage', '')) . '</span>';
+            $markerArray['###FIRST###'] = '<span title="'.htmlspecialchars($this->pi_getLL('firstPage', '')).'">'.htmlspecialchars($this->pi_getLL('firstPage', '')).'</span>';
         }
         // Link back X pages.
         if ($this->piVars['page'] > $pageSteps) {
             $markerArray['###BACK###'] = $this->makeLink(htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)), ['page' => $this->piVars['page'] - $pageSteps]);
         } else {
-            $markerArray['###BACK###'] = '<span title="' . htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)) . '">' . htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)) . '</span>';
+            $markerArray['###BACK###'] = '<span title="'.htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)).'">'.htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)).'</span>';
         }
         // Link to previous page.
         if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
             $markerArray['###PREVIOUS###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('prevPage', '')), ['page' => $this->piVars['page'] - (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###PREVIOUS###'] = '<span title="' . htmlspecialchars($this->pi_getLL('prevPage', '')) . '">' . htmlspecialchars($this->pi_getLL('prevPage', '')) . '</span>';
+            $markerArray['###PREVIOUS###'] = '<span title="'.htmlspecialchars($this->pi_getLL('prevPage', '')).'">'.htmlspecialchars($this->pi_getLL('prevPage', '')).'</span>';
         }
         // Link to next page.
         if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
             $markerArray['###NEXT###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('nextPage', '')), ['page' => $this->piVars['page'] + (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###NEXT###'] = '<span title="' . htmlspecialchars($this->pi_getLL('nextPage', '')) . '">' . htmlspecialchars($this->pi_getLL('nextPage', '')) . '</span>';
+            $markerArray['###NEXT###'] = '<span title="'.htmlspecialchars($this->pi_getLL('nextPage', '')).'">'.htmlspecialchars($this->pi_getLL('nextPage', '')).'</span>';
         }
         // Link forward X pages.
         if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
             $markerArray['###FORWARD###'] = $this->makeLink(htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)), ['page' => $this->piVars['page'] + $pageSteps]);
         } else {
-            $markerArray['###FORWARD###'] = '<span title="' . htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)) . '">' . htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)) . '</span>';
+            $markerArray['###FORWARD###'] = '<span title="'.htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)).'">'.htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)).'</span>';
         }
         // Link to last page.
         if ($this->piVars['page'] < $this->doc->numPages) {
             $markerArray['###LAST###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('lastPage', '')), ['page' => $this->doc->numPages]);
         } else {
-            $markerArray['###LAST###'] = '<span title="' . htmlspecialchars($this->pi_getLL('lastPage', '')) . '">' . htmlspecialchars($this->pi_getLL('lastPage', '')) . '</span>';
+            $markerArray['###LAST###'] = '<span title="'.htmlspecialchars($this->pi_getLL('lastPage', '')).'">'.htmlspecialchars($this->pi_getLL('lastPage', '')).'</span>';
         }
         // Add double page switcher.
         if ($this->doc->numPages > 0) {
             if (!$this->piVars['double']) {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOn', '')), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOn', '')), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'"');
             } else {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOff', '')), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="' . htmlspecialchars($this->pi_getLL('doublePageOff', '')) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOff', '')), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="'.htmlspecialchars($this->pi_getLL('doublePageOff', '')).'"');
             }
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
-                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePage+1', '')), ['page' => $this->piVars['page'] + 1], 'title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '"');
+                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePage+1', '')), ['page' => $this->piVars['page'] + 1], 'title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'"');
             } else {
-                $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'">'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'</span>';
             }
         } else {
-            $markerArray['###DOUBLEPAGE###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '</span>';
-            $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'">'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'">'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'</span>';
         }
         // Add page selector.
         $markerArray['###PAGESELECT###'] = $this->getPageSelector();

ext_localconf.php

Spacing +10 added lines, -10 removed lines

@@ -205,21 +205,21 @@
 );
 // Register tools for toolbox plugin.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] = [];
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltexttool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.annotationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltextdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagedownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagemanipulationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.pdfdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.searchindocumenttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltexttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.annotationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltextdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagedownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagemanipulationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.pdfdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.searchindocumenttool';
 // Register hooks.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Common/MetsDocument.php']['hookClass'][] = \Kitodo\Dlf\Hooks\KitodoProductionHacks::class;
 // Register AJAX eID handlers.
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Plugin\Eid\SearchSuggest::class . '::main';
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Plugin\Eid\SearchInDocument::class . '::main';
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Plugin\Eid\PageViewProxy::class . '::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Plugin\Eid\SearchSuggest::class.'::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Plugin\Eid\SearchInDocument::class.'::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Plugin\Eid\PageViewProxy::class.'::main';
 // Use Caching Framework for Solr queries
 if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) {
     $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'] = [];

Classes/Hooks/Form/FieldInformation/SolrCoreStatus.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
                     $uptimeInSeconds = floor($response->getUptime() / 1000);
                     $dateTimeFrom = new \DateTime('@0');
                     $dateTimeTo = new \DateTime("@$uptimeInSeconds");
-                    $uptime = $dateTimeFrom->diff($dateTimeTo)->format('%a ' . $GLOBALS['LANG']->getLL('flash.days') . ', %H:%I:%S');
+                    $uptime = $dateTimeFrom->diff($dateTimeTo)->format('%a '.$GLOBALS['LANG']->getLL('flash.days').', %H:%I:%S');
                     $numDocuments = $response->getNumberOfDocuments();
                     $startTime = $response->getStartTime() ? strftime('%c', $response->getStartTime()->getTimestamp()) : 'N/A';
                     $lastModified = $response->getLastModified() ? strftime('%c', $response->getLastModified()->getTimestamp()) : 'N/A';

Classes/Plugin/Tools/FulltextDownloadTool.php

Spacing +2 added lines, -2 removed lines

@@ -83,9 +83,9 @@
             }
         }
         if (!empty($fullTextFile)) {
-            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<a href="#" id="tx-dlf-tools-fulltextdownload" title="' . htmlspecialchars($this->pi_getLL('download-current-page', '')) . '">' . htmlspecialchars($this->pi_getLL('download-current-page', '')) . '</a>';
+            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<a href="#" id="tx-dlf-tools-fulltextdownload" title="'.htmlspecialchars($this->pi_getLL('download-current-page', '')).'">'.htmlspecialchars($this->pi_getLL('download-current-page', '')).'</a>';
         } else {
-            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<span class="no-fulltext">' . htmlspecialchars($this->pi_getLL('fulltext-not-available', '')) . '</span>';
+            $markerArray['###FULLTEXT_DOWNLOAD###'] = '<span class="no-fulltext">'.htmlspecialchars($this->pi_getLL('fulltext-not-available', '')).'</span>';
         }
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);

Classes/Plugin/AudioPlayer.php

Spacing +4 added lines, -4 removed lines

@@ -55,12 +55,12 @@
             $(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: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
+                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath($this->extKey)).'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
                 });
             });
         ';