Erikmitk / kitodo-presentation

Classes/Task/BaseAdditionalFieldProvider.php

Spacing +14 added lines, -14 removed lines

@@ -62,7 +62,7 @@ 
 
         if (isset($submittedData['doc']) && empty($submittedData['doc'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.doc') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.doc').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -73,7 +73,7 @@ 
 
         if ((isset($submittedData['pid']) && (int) $submittedData['pid'] <= 0) || !isset($submittedData['pid'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.pid') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.pid').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -89,7 +89,7 @@ 
 
         if ((isset($submittedData['lib']) && (int) $submittedData['lib'] <= 0)) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.lib').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -100,7 +100,7 @@ 
 
         if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) {
             Helper::addMessage(
-                Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'),
+                Helper::getLanguageService()->getLL('additionalFields.solr').' '.Helper::getLanguageService()->getLL('additionalFields.valid'),
                 $messageTitle,
                 $messageSeverity,
                 true,
@@ -178,8 +178,8 @@ 
     protected function getDryRunField(bool $dryRun): array
     {
         $fieldName = 'dryRun';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($dryRun ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($dryRun ? ' checked="checked"' : '').'>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.dryRun',
@@ -201,15 +201,15 @@ 
     protected function getSolrField(int $solr, int $pid): array
     {
         $fieldName = 'solr';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $allSolrCores = $this->getSolrCores($pid);
         $options = [];
         $options[] = '<option value="-1"></option>';
         foreach ($allSolrCores as $label => $uid) {
-            $options[] = '<option value="' . $uid . '" ' . ($solr == $uid ? 'selected' : '') . ' >' . $label . '</option>';
+            $options[] = '<option value="'.$uid.'" '.($solr == $uid ? 'selected' : '').' >'.$label.'</option>';
         };
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.solr',
@@ -230,7 +230,7 @@ 
     protected function getPidField(int $pid): array
     {
         $fieldName = 'pid';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
 
         $pageRepository = GeneralUtility::makeInstance(PageTreeRepository::class);
         $pages = $pageRepository->getTree(0);
@@ -238,11 +238,11 @@ 
         $options = [];
         foreach ($pages['_children'] as $page) {
             if ($page['doktype'] == 254) {
-                $options[] = '<option value="' . $page['uid'] . '" ' . ($pid == $page['uid'] ? 'selected' : '') . ' >' . $page['title'] . '</option>';
+                $options[] = '<option value="'.$page['uid'].'" '.($pid == $page['uid'] ? 'selected' : '').' >'.$page['title'].'</option>';
             }
         }
 
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.pid',
@@ -263,8 +263,8 @@ 
     protected function getOwnerField(string $owner): array
     {
         $fieldName = 'owner';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $owner . '" >';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$owner.'" >';
         return [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.owner',

Classes/Task/ReindexAdditionalFieldProvider.php

Spacing +6 added lines, -6 removed lines

@@ -63,10 +63,10 @@ 
 
         // Select for collection(s)
         $fieldName = 'coll';
-        $fieldId = 'task_' . $fieldName;
+        $fieldId = 'task_'.$fieldName;
         $options = $this->getCollOptions($taskInfo['coll'], $taskInfo['pid']);
         ;
-        $fieldHtml = '<select name="tx_scheduler[' . $fieldName . '][]" id="' . $fieldId . '" size="10" multiple="multiple">' . implode("\n", $options) . '</select>';
+        $fieldHtml = '<select name="tx_scheduler['.$fieldName.'][]" id="'.$fieldId.'" size="10" multiple="multiple">'.implode("\n", $options).'</select>';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.coll',
@@ -85,9 +85,9 @@ 
 
         // Checkbox for all
         $fieldName = 'all';
-        $fieldId = 'task_' . $fieldName;
-        $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' .
-            ($taskInfo['all'] ? ' checked="checked"' : '') . '>';
+        $fieldId = 'task_'.$fieldName;
+        $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.
+            ($taskInfo['all'] ? ' checked="checked"' : '').'>';
         $additionalFields[$fieldId] = [
             'code' => $fieldHtml,
             'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.all',
@@ -111,7 +111,7 @@ 
         $options = [];
         $collections = $this->getCollections($pid);
         foreach ($collections as $label => $uid) {
-            $options[] = '<option value="' . $uid . '" ' . (in_array($uid, $coll) ? 'selected' : '') . ' >' . $label . '</option>';
+            $options[] = '<option value="'.$uid.'" '.(in_array($uid, $coll) ? 'selected' : '').' >'.$label.'</option>';
         }
         return $options;
     }

Classes/Controller/View3DController.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
             $this->view->assign('is3DViewer', $this->is3dViewer($this->requestData['model']));
             $embedded3DViewerUrl = $this->buildEmbedded3dViewerUrl($this->requestData['model']);
             if (!empty($this->requestData['viewer'])) {
-                $embedded3DViewerUrl .= '&viewer=' . $this->requestData['viewer'];
+                $embedded3DViewerUrl .= '&viewer='.$this->requestData['viewer'];
             }
             $this->view->assign('embedded3DViewerUrl', $embedded3DViewerUrl);
             return;
@@ -72,7 +72,7 @@ 
      */
     public function buildEmbedded3dViewerUrl(string $model): string
     {
-        return self::MIDDLEWARE_DLF_EMBEDDED_3D_VIEWER_PREFIX . '&model=' . $model;
+        return self::MIDDLEWARE_DLF_EMBEDDED_3D_VIEWER_PREFIX.'&model='.$model;
     }
 
 

Classes/Middleware/Embedded3DViewer.php

Spacing +8 added lines, -8 removed lines

@@ -69,7 +69,7 @@ 
         $modelInfo = PathUtility::pathinfo($parameters['model']);
         $modelFormat = $modelInfo["extension"];
         if (empty($modelFormat)) {
-            return $this->warningResponse('Model path "' . $parameters['model'] . '" has no extension format', $request);
+            return $this->warningResponse('Model path "'.$parameters['model'].'" has no extension format', $request);
         }
 
         if (empty($parameters['viewer'])) {
@@ -88,30 +88,30 @@ 
         $defaultStorage = $storageRepository->getDefaultStorage();
 
         if (!$defaultStorage->hasFolder(self::VIEWER_FOLDER)) {
-            return $this->errorResponse('Required folder "' . self::VIEWER_FOLDER . '" was not found in the default storage "' . $defaultStorage->getName() . '"', $request);
+            return $this->errorResponse('Required folder "'.self::VIEWER_FOLDER.'" was not found in the default storage "'.$defaultStorage->getName().'"', $request);
         }
 
         $viewerModules = $defaultStorage->getFolder(self::VIEWER_FOLDER);
         if (!$viewerModules->hasFolder($viewer)) {
-            return $this->errorResponse('Viewer folder "' . $viewer . '" was not found under the folder "' . self::VIEWER_FOLDER . '"', $request);
+            return $this->errorResponse('Viewer folder "'.$viewer.'" was not found under the folder "'.self::VIEWER_FOLDER.'"', $request);
         }
 
         $viewerFolder = $viewerModules->getSubfolder($viewer);
         if (!$viewerFolder->hasFile(self::VIEWER_CONFIG_YML)) {
-            return $this->errorResponse('Viewer folder "' . $viewer . '" does not contain a file named "' . self::VIEWER_CONFIG_YML . '"', $request);
+            return $this->errorResponse('Viewer folder "'.$viewer.'" does not contain a file named "'.self::VIEWER_CONFIG_YML.'"', $request);
         }
 
         /** @var YamlFileLoader $yamlFileLoader */
         $yamlFileLoader = GeneralUtility::makeInstance(YamlFileLoader::class);
-        $viewerConfigPath = $defaultStorage->getName() . "/" . self::VIEWER_FOLDER . "/" . $viewer . "/";
-        $config = $yamlFileLoader->load($viewerConfigPath . self::VIEWER_CONFIG_YML)["viewer"];
+        $viewerConfigPath = $defaultStorage->getName()."/".self::VIEWER_FOLDER."/".$viewer."/";
+        $config = $yamlFileLoader->load($viewerConfigPath.self::VIEWER_CONFIG_YML)["viewer"];
 
         if (!isset($config["supportedModelFormats"]) || empty($config["supportedModelFormats"])) {
-            return $this->errorResponse('Required key "supportedModelFormats" does not exist in the file "' . self::VIEWER_CONFIG_YML . '" of viewer "' . $viewer . '" or has no value', $request);
+            return $this->errorResponse('Required key "supportedModelFormats" does not exist in the file "'.self::VIEWER_CONFIG_YML.'" of viewer "'.$viewer.'" or has no value', $request);
         }
 
         if (array_search(strtolower($modelFormat), array_map('strtolower', $config["supportedModelFormats"])) === false) {
-            return $this->warningResponse('Viewer "' . $viewer . '" does not support the model format "' . $modelFormat . '"', $request);
+            return $this->warningResponse('Viewer "'.$viewer.'" does not support the model format "'.$modelFormat.'"', $request);
         }
 
         $html = $this->getViewerHtml($config, $viewerConfigPath, $viewerFolder, $parameters['model'], $modelInfo);

Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php

Spacing +4 added lines, -4 removed lines

@@ -177,7 +177,7 @@ 
                 if ($this->document) {
                     $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
                 } else {
-                    $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
+                    $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$pid.'" for document loading');
                 }
             } elseif (GeneralUtility::isValidUrl($requestData['id'])) {
                 $doc = AbstractDocument::getInstance($requestData['id'], ['storagePid' => $pid], true);
@@ -191,7 +191,7 @@ 
                     }
                     $this->document->setLocation($requestData['id']);
                 } else {
-                    $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading');
+                    $this->logger->error('Invalid location given "'.$requestData['id'].'" for document loading');
                 }
             }
             if ($this->document !== null && $doc !== null) {
@@ -204,11 +204,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Empty UID or invalid PID "' . $pid . '" for document loading');
+            $this->logger->error('Empty UID or invalid PID "'.$pid.'" for document loading');
         }
     }
 }

Classes/Controller/NavigationController.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
         $pageOptions = [];
         for ($i = 1; $i <= $this->document->getCurrentDocument()->numPages; $i++) {
             $orderLabel = $this->document->getCurrentDocument()->physicalStructureInfo[$this->document->getCurrentDocument()->physicalStructure[$i]]['orderlabel'];
-            $pageOptions[$i] = '[' . $i . ']' . ($orderLabel ? ' - ' . htmlspecialchars($orderLabel) : '');
+            $pageOptions[$i] = '['.$i.']'.($orderLabel ? ' - '.htmlspecialchars($orderLabel) : '');
         }
 
         $this->view->assign('pageOptions', $pageOptions);
@@ -122,7 +122,7 @@ 
                 $measureOptions = [];
                 $measurePages = [];
                 for ($i = 1; $i <= $this->document->getCurrentDocument()->numMeasures; $i++) {
-                    $measureOptions[$i] = '[' . $i . ']' . ($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructure[$i]['measureid']]['orderlabel'] ? ' - ' . htmlspecialchars($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructureInfo[$i]]['orderlabel']) : '');
+                    $measureOptions[$i] = '['.$i.']'.($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructure[$i]['measureid']]['orderlabel'] ? ' - '.htmlspecialchars($this->document->getCurrentDocument()->musicalStructureInfo[$this->document->getCurrentDocument()->musicalStructureInfo[$i]]['orderlabel']) : '');
                     $measurePages[$i] = $this->document->getCurrentDocument()->musicalStructure[$i]['page'];
                 }
 

Classes/Controller/ToolboxController.php

Spacing +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
                         $this->renderToolByName('renderScoreTool');
                         break;
                     default:
-                        $this->logger->warning('Incorrect tool configuration: "' . $this->settings['tools'] . '". Tool "' . $tool . '" does not exist.');
+                        $this->logger->warning('Incorrect tool configuration: "'.$this->settings['tools'].'". Tool "'.$tool.'" does not exist.');
                 }
             }
         }
@@ -301,7 +301,7 @@ 
                 }
                 break;
             } else {
-                $this->logger->warning('File not found in fileGrp "' . $fileGrp . '"');
+                $this->logger->warning('File not found in fileGrp "'.$fileGrp.'"');
             }
         }
         return $image;
@@ -385,7 +385,7 @@ 
             empty($firstPageLink)
             && empty($secondPageLink)
         ) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
 
         if (!empty($firstPageLink)) {
@@ -423,7 +423,7 @@ 
             }
         }
         if (empty($workLink)) {
-            $this->logger->warning('File not found in fileGrps "' . $this->extConf['files']['fileGrpDownload'] . '"');
+            $this->logger->warning('File not found in fileGrps "'.$this->extConf['files']['fileGrpDownload'].'"');
         }
         return $workLink;
     }

Classes/Controller/AbstractController.php

Spacing +9 added lines, -9 removed lines

@@ -158,11 +158,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$this->requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Invalid ID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid ID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
     }
 
@@ -259,7 +259,7 @@ 
             && !MathUtility::canBeInterpretedAsInteger($this->requestData['id'])
             && !GeneralUtility::isValidUrl($this->requestData['id'])
         ) {
-            $this->logger->warning('Invalid ID or URI "' . $this->requestData['id'] . '" for document loading');
+            $this->logger->warning('Invalid ID or URI "'.$this->requestData['id'].'" for document loading');
             unset($this->requestData['id']);
         }
 
@@ -355,7 +355,7 @@ 
         $pages = [];
         $pagesSect = [];
         $aRange = [];
-        $nRange = 5;    // ToDo: should be made configurable
+        $nRange = 5; // ToDo: should be made configurable
 
         // lower limit of the range
         $nBottom = $currentPageNumber - $nRange;
@@ -370,7 +370,7 @@ 
 
         // check whether the first screen page is > 1, if yes then points must be added
         if ($aRange[0] > 1) {
-            array_push($pagesSect, ['label' => '...','startRecordNumber' => '...']);
+            array_push($pagesSect, ['label' => '...', 'startRecordNumber' => '...']);
         };
         $lastStartRecordNumberGrid = 0; // due to validity outside the loop
         foreach (range($firstPage, $lastPage) as $i) {
@@ -413,7 +413,7 @@ 
 
                 // Check if screen page is in range
                 if (in_array($i, $aRange)) {
-                    array_push($pagesSect, ['label' => $i,'startRecordNumber' => $startRecordNumber]);
+                    array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $startRecordNumber]);
                 };
             };
         };
@@ -476,7 +476,7 @@ 
         if ($this->document) {
             $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true);
         } else {
-            $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading');
+            $this->logger->error('Invalid UID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading');
         }
 
         return $doc;
@@ -514,7 +514,7 @@ 
             foreach ($this->requestData['multipleSource'] as $location) {
                 $document = AbstractDocument::getInstance($location, $this->settings, true);
                 if ($document !== null) {
-                    $this->documentArray['extra_' . $i] = $document;
+                    $this->documentArray['extra_'.$i] = $document;
                 }
                 $i++;
             }
@@ -538,7 +538,7 @@ 
 
             $this->document->setLocation($documentId);
         } else {
-            $this->logger->error('Invalid location given "' . $documentId . '" for document loading');
+            $this->logger->error('Invalid location given "'.$documentId.'" for document loading');
         }
 
         return $doc;

Classes/Controller/PageViewController.php

Spacing +43 added lines, -43 removed lines

@@ -181,18 +181,18 @@ 
             }
 
             $navigationArray[$i]['next'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
             ];
             $navigationArray[$i]['prev'] = [
-                'tx_dlf[docPage][' . $i . ']' =>
+                'tx_dlf[docPage]['.$i.']' =>
                     MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
             ];
 
             $navigateAllPageNext = array_merge(
                 $navigateAllPageNext,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] + 1, 1, $document->numPages, 1)
                 ]
             );
@@ -200,7 +200,7 @@ 
             $navigateAllPagePrev = array_merge(
                 $navigateAllPagePrev,
                 [
-                    'tx_dlf[docPage][' . $i . ']' =>
+                    'tx_dlf[docPage]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docPage'][$i] - 1, 1, $document->numPages, 1)
                 ]
             );
@@ -208,7 +208,7 @@ 
             $navigateAllMeasureNext = array_merge(
                 $navigateAllMeasureNext,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ]
             );
@@ -216,19 +216,19 @@ 
             $navigateAllMeasurePrev = array_merge(
                 $navigateAllMeasurePrev,
                 [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ]
             );
 
             if ($document->numMeasures > 0) {
                 $navigationMeasureArray[$i]['next'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] + 1, 1, $document->numMeasures, 1)
                 ];
 
                 $navigationMeasureArray[$i]['prev'] = [
-                    'tx_dlf[docMeasure][' . $i . ']' =>
+                    'tx_dlf[docMeasure]['.$i.']' =>
                         MathUtility::forceIntegerInRange((int) $this->requestData['docMeasure'][$i] - 1, 1, $document->numMeasures, 1)
                 ];
             }
@@ -282,7 +282,7 @@ 
             }
             $params = array_merge(
                 ['tx_dlf' => $this->requestData],
-                ['tx_dlf[multipleSource][' . $nextMultipleSourceKey . ']' => $formAddDocument->getLocation()],
+                ['tx_dlf[multipleSource]['.$nextMultipleSourceKey.']' => $formAddDocument->getLocation()],
                 ['tx_dlf[multiview]' => 1]
             );
             $uriBuilder = $this->uriBuilder;
@@ -329,7 +329,7 @@ 
                             // build link for each measure
                             $params = [
                                 'tx_dlf' => $this->requestData,
-                                'tx_dlf[docMeasure][' . $docNumber . ']' => $i
+                                'tx_dlf[docMeasure]['.$docNumber.']' => $i
                             ];
                         } else {
                             // build link for each measure
@@ -413,7 +413,7 @@ 
         }
 
         if (empty($score)) {
-            $this->logger->notice('No score file found for page "' . $page . '" in fileGrps "' . $this->settings['fileGrpScore'] . '"');
+            $this->logger->notice('No score file found for page "'.$page.'" in fileGrps "'.$this->settings['fileGrpScore'].'"');
         }
         return $score;
     }
@@ -444,11 +444,11 @@ 
                 $fulltext['mimetype'] = $file['mimeType'];
                 break;
             } else {
-                $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrp "' . $fileGrpFulltext . '"');
+                $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrp "'.$fileGrpFulltext.'"');
             }
         }
         if (empty($fulltext)) {
-            $this->logger->notice('No full-text file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpFulltext'] . '"');
+            $this->logger->notice('No full-text file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpFulltext'].'"');
         }
         return $fulltext;
     }
@@ -493,19 +493,19 @@ 
                         $currentMeasureId = $docMeasures['measureCounterToMeasureId'][$this->requestData['docMeasure'][$i]];
                     }
 
-                    $jsViewer .= 'tx_dlf_viewer[' . $i . '] = new dlfViewer({
-                                controls: ["' . implode('", "', $this->controls) . '"],
-                                div: "tx-dfgviewer-map-' . $i . '",
-                                progressElementId: "' . $this->settings['progressElementId'] . '",
-                                counter: "' . $i . '",
-                                images: ' . json_encode($docImage) . ',
-                                fulltexts: ' . json_encode($docFulltext) . ',
-                                score: ' . json_encode($docScore) . ',
-                                annotationContainers: ' . json_encode($docAnnotationContainers) . ',
-                                measureCoords: ' . json_encode($docMeasures['measureCoordsCurrentSite']) . ',
-                                useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0) . ',
-                                currentMeasureId: "' . $currentMeasureId . '",
-                                measureIdLinks: ' . json_encode($docMeasures['measureLinks']) . '
+                    $jsViewer .= 'tx_dlf_viewer['.$i.'] = new dlfViewer({
+                                controls: ["' . implode('", "', $this->controls).'"],
+                                div: "tx-dfgviewer-map-' . $i.'",
+                                progressElementId: "' . $this->settings['progressElementId'].'",
+                                counter: "' . $i.'",
+                                images: ' . json_encode($docImage).',
+                                fulltexts: ' . json_encode($docFulltext).',
+                                score: ' . json_encode($docScore).',
+                                annotationContainers: ' . json_encode($docAnnotationContainers).',
+                                measureCoords: ' . json_encode($docMeasures['measureCoordsCurrentSite']).',
+                                useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).',
+                                currentMeasureId: "' . $currentMeasureId.'",
+                                measureIdLinks: ' . json_encode($docMeasures['measureLinks']).'
                             });
                             ';
                     $i++;
@@ -515,8 +515,8 @@ 
             // Viewer configuration.
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
-                        ' . $jsViewer . '
-                        viewerCount = ' . ($i - 1) . ';
+                        ' . $jsViewer.'
+                        viewerCount = ' . ($i - 1).';
                     }
                 });';
         } else {
@@ -532,18 +532,18 @@ 
             $viewerConfiguration = '$(document).ready(function() {
                     if (dlfUtils.exists(dlfViewer)) {
                         tx_dlf_viewer = new dlfViewer({
-                            controls: ["' . implode('", "', $this->controls) . '"],
-                            div: "' . $this->settings['elementId'] . '",
-                            progressElementId: "' . $this->settings['progressElementId'] . '",
-                            images: ' . json_encode($this->images) . ',
-                            fulltexts: ' . json_encode($this->fulltexts) . ',
-                            score: ' . json_encode($this->scores) . ',
-                            annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                            measureCoords: ' . json_encode($docMeasures['measureCoordsCurrentSite']) . ',
-                            useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0) . ',
-                            verovioAnnotations: ' . json_encode($this->verovioAnnotations) . ',
-                            currentMeasureId: "' . $currentMeasureId . '",
-                            measureIdLinks: ' . json_encode($docMeasures['measureLinks']) . '
+                            controls: ["' . implode('", "', $this->controls).'"],
+                            div: "' . $this->settings['elementId'].'",
+                            progressElementId: "' . $this->settings['progressElementId'].'",
+                            images: ' . json_encode($this->images).',
+                            fulltexts: ' . json_encode($this->fulltexts).',
+                            score: ' . json_encode($this->scores).',
+                            annotationContainers: ' . json_encode($this->annotationContainers).',
+                            measureCoords: ' . json_encode($docMeasures['measureCoordsCurrentSite']).',
+                            useInternalProxy: ' . ($this->settings['useInternalProxy'] ? 1 : 0).',
+                            verovioAnnotations: ' . json_encode($this->verovioAnnotations).',
+                            currentMeasureId: "' . $currentMeasureId.'",
+                            measureIdLinks: ' . json_encode($docMeasures['measureLinks']).'
                         });
                     }
                 });';
@@ -640,7 +640,7 @@ 
                     }
                     break;
                 } else {
-                    $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                    $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
                 }
 
             } else {
@@ -660,12 +660,12 @@ 
                     }
                     break;
                 } else {
-                    $this->logger->notice('No image file found for page "' . $page . '" in fileGrp "' . $fileGrpImages . '"');
+                    $this->logger->notice('No image file found for page "'.$page.'" in fileGrp "'.$fileGrpImages.'"');
                 }
             }
         }
         if (empty($image)) {
-            $this->logger->warning('No image file found for page "' . $page . '" in fileGrps "' . $this->extConf['files']['fileGrpImages'] . '"');
+            $this->logger->warning('No image file found for page "'.$page.'" in fileGrps "'.$this->extConf['files']['fileGrpImages'].'"');
         }
         return $image;
     }