@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | if ($this->document) { |
180 | 180 | $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true); |
181 | 181 | } else { |
182 | - $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading'); |
|
182 | + $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$pid.'" for document loading'); |
|
183 | 183 | } |
184 | 184 | } elseif (GeneralUtility::isValidUrl($requestData['id'])) { |
185 | 185 | $doc = AbstractDocument::getInstance($requestData['id'], ['storagePid' => $pid], true); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } |
194 | 194 | $this->document->setLocation($requestData['id']); |
195 | 195 | } else { |
196 | - $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading'); |
|
196 | + $this->logger->error('Invalid location given "'.$requestData['id'].'" for document loading'); |
|
197 | 197 | } |
198 | 198 | } |
199 | 199 | if ($this->document !== null && $doc !== null) { |
@@ -206,11 +206,11 @@ discard block |
||
206 | 206 | if ($doc !== null) { |
207 | 207 | $this->document->setCurrentDocument($doc); |
208 | 208 | } else { |
209 | - $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"'); |
|
209 | + $this->logger->error('Failed to load document with record ID "'.$requestData['recordId'].'"'); |
|
210 | 210 | } |
211 | 211 | } |
212 | 212 | } else { |
213 | - $this->logger->error('Empty UID or invalid PID "' . $pid . '" for document loading'); |
|
213 | + $this->logger->error('Empty UID or invalid PID "'.$pid.'" for document loading'); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | if (!empty($model)) { |
70 | - $embedded3dViewerUrl .= '&model=' . $model; |
|
70 | + $embedded3dViewerUrl .= '&model='.$model; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | if (!empty($this->requestData['viewer'])) { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | if (!empty($viewer)) { |
80 | - $embedded3dViewerUrl .= '&viewer=' . $viewer; |
|
80 | + $embedded3dViewerUrl .= '&viewer='.$viewer; |
|
81 | 81 | } |
82 | 82 | return $embedded3dViewerUrl; |
83 | 83 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $modelInfo = PathUtility::pathinfo($parameters['model']); |
70 | 70 | $modelFormat = $modelInfo["extension"]; |
71 | 71 | if (empty($modelFormat)) { |
72 | - return $this->warningResponse('Model path "' . $parameters['model'] . '" has no extension format', $request); |
|
72 | + return $this->warningResponse('Model path "'.$parameters['model'].'" has no extension format', $request); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | if (empty($parameters['viewer'])) { |
@@ -88,30 +88,30 @@ discard block |
||
88 | 88 | $defaultStorage = $storageRepository->getDefaultStorage(); |
89 | 89 | |
90 | 90 | if (!$defaultStorage->hasFolder(self::VIEWER_FOLDER)) { |
91 | - return $this->errorResponse('Required folder "' . self::VIEWER_FOLDER . '" was not found in the default storage "' . $defaultStorage->getName() . '"', $request); |
|
91 | + return $this->errorResponse('Required folder "'.self::VIEWER_FOLDER.'" was not found in the default storage "'.$defaultStorage->getName().'"', $request); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | $viewerModules = $defaultStorage->getFolder(self::VIEWER_FOLDER); |
95 | 95 | if (!$viewerModules->hasFolder($viewer)) { |
96 | - return $this->errorResponse('Viewer folder "' . $viewer . '" was not found under the folder "' . self::VIEWER_FOLDER . '"', $request); |
|
96 | + return $this->errorResponse('Viewer folder "'.$viewer.'" was not found under the folder "'.self::VIEWER_FOLDER.'"', $request); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $viewerFolder = $viewerModules->getSubfolder($viewer); |
100 | 100 | if (!$viewerFolder->hasFile(self::VIEWER_CONFIG_YML)) { |
101 | - return $this->errorResponse('Viewer folder "' . $viewer . '" does not contain a file named "' . self::VIEWER_CONFIG_YML . '"', $request); |
|
101 | + return $this->errorResponse('Viewer folder "'.$viewer.'" does not contain a file named "'.self::VIEWER_CONFIG_YML.'"', $request); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** @var YamlFileLoader $yamlFileLoader */ |
105 | 105 | $yamlFileLoader = GeneralUtility::makeInstance(YamlFileLoader::class); |
106 | - $viewerConfigPath = $defaultStorage->getName() . "/" . self::VIEWER_FOLDER . "/" . $viewer . "/"; |
|
107 | - $config = $yamlFileLoader->load($viewerConfigPath . self::VIEWER_CONFIG_YML)["viewer"]; |
|
106 | + $viewerConfigPath = $defaultStorage->getName()."/".self::VIEWER_FOLDER."/".$viewer."/"; |
|
107 | + $config = $yamlFileLoader->load($viewerConfigPath.self::VIEWER_CONFIG_YML)["viewer"]; |
|
108 | 108 | |
109 | 109 | if (!isset($config["supportedModelFormats"]) || empty($config["supportedModelFormats"])) { |
110 | - return $this->errorResponse('Required key "supportedModelFormats" does not exist in the file "' . self::VIEWER_CONFIG_YML . '" of viewer "' . $viewer . '" or has no value', $request); |
|
110 | + return $this->errorResponse('Required key "supportedModelFormats" does not exist in the file "'.self::VIEWER_CONFIG_YML.'" of viewer "'.$viewer.'" or has no value', $request); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | if (array_search(strtolower($modelFormat), array_map('strtolower', $config["supportedModelFormats"])) === false) { |
114 | - return $this->warningResponse('Viewer "' . $viewer . '" does not support the model format "' . $modelFormat . '"', $request); |
|
114 | + return $this->warningResponse('Viewer "'.$viewer.'" does not support the model format "'.$modelFormat.'"', $request); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | $html = $this->getViewerHtml($config, $viewerConfigPath, $viewerFolder, $parameters['model'], $modelInfo); |
@@ -16,67 +16,67 @@ |
||
16 | 16 | // Plugin "audioplayer". |
17 | 17 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_audioplayer'] = 'layout,select_key,pages,recursive'; |
18 | 18 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_audioplayer'] = 'pi_flexform'; |
19 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/AudioPlayer.xml'); |
|
19 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:'.'dlf/Configuration/FlexForms/AudioPlayer.xml'); |
|
20 | 20 | // Plugin "basket". |
21 | 21 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_basket'] = 'layout,select_key,pages,recursive'; |
22 | 22 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_basket'] = 'pi_flexform'; |
23 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Basket.xml'); |
|
23 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Basket.xml'); |
|
24 | 24 | // Plugin "calendar". |
25 | 25 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_calendar'] = 'layout,select_key,pages,recursive'; |
26 | 26 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_calendar'] = 'pi_flexform'; |
27 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Calendar.xml'); |
|
27 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Calendar.xml'); |
|
28 | 28 | // Plugin "collection". |
29 | 29 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_collection'] = 'layout,select_key,pages,recursive'; |
30 | 30 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_collection'] = 'pi_flexform'; |
31 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Collection.xml'); |
|
31 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Collection.xml'); |
|
32 | 32 | // Plugin "feeds". |
33 | 33 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_feeds'] = 'layout,select_key,pages,recursive'; |
34 | 34 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_feeds'] = 'pi_flexform'; |
35 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Feeds.xml'); |
|
35 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Feeds.xml'); |
|
36 | 36 | // Plugin "listview". |
37 | 37 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_listview'] = 'layout,select_key,pages,recursive'; |
38 | 38 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_listview'] = 'pi_flexform'; |
39 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/ListView.xml'); |
|
39 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:'.'dlf/Configuration/FlexForms/ListView.xml'); |
|
40 | 40 | // Plugin "metadata". |
41 | 41 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_metadata'] = 'layout,select_key,pages,recursive'; |
42 | 42 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_metadata'] = 'pi_flexform'; |
43 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Metadata.xml'); |
|
43 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Metadata.xml'); |
|
44 | 44 | // Plugin "navigation". |
45 | 45 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_navigation'] = 'layout,select_key,pages,recursive'; |
46 | 46 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_navigation'] = 'pi_flexform'; |
47 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Navigation.xml'); |
|
47 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Navigation.xml'); |
|
48 | 48 | // Plugin "oaipmh". |
49 | 49 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_oaipmh'] = 'layout,select_key,pages,recursive'; |
50 | 50 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_oaipmh'] = 'pi_flexform'; |
51 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/OaiPmh.xml'); |
|
51 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:'.'dlf/Configuration/FlexForms/OaiPmh.xml'); |
|
52 | 52 | // Plugin "pagegrid". |
53 | 53 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pagegrid'] = 'layout,select_key,pages,recursive'; |
54 | 54 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pagegrid'] = 'pi_flexform'; |
55 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/PageGrid.xml'); |
|
55 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:'.'dlf/Configuration/FlexForms/PageGrid.xml'); |
|
56 | 56 | // Plugin "pageview". |
57 | 57 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pageview'] = 'layout,select_key,pages,recursive'; |
58 | 58 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pageview'] = 'pi_flexform'; |
59 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/PageView.xml'); |
|
59 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:'.'dlf/Configuration/FlexForms/PageView.xml'); |
|
60 | 60 | // Plugin "search". |
61 | 61 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_search'] = 'layout,select_key,pages,recursive'; |
62 | 62 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_search'] = 'pi_flexform'; |
63 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Search.xml'); |
|
63 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Search.xml'); |
|
64 | 64 | // Plugin "statistics". |
65 | 65 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_statistics'] = 'layout,select_key,pages,recursive'; |
66 | 66 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_statistics'] = 'pi_flexform'; |
67 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Statistics.xml'); |
|
67 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Statistics.xml'); |
|
68 | 68 | // Plugin "tableofcontents". |
69 | 69 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_tableofcontents'] = 'layout,select_key,pages,recursive'; |
70 | 70 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_tableofcontents'] = 'pi_flexform'; |
71 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/TableOfContents.xml'); |
|
71 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:'.'dlf/Configuration/FlexForms/TableOfContents.xml'); |
|
72 | 72 | // Plugin "toolbox". |
73 | 73 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_toolbox'] = 'layout,select_key,pages,recursive'; |
74 | 74 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_toolbox'] = 'pi_flexform'; |
75 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Toolbox.xml'); |
|
75 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Toolbox.xml'); |
|
76 | 76 | // Plugin "embedded3dviewer". |
77 | 77 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_embedded3dviewer'] = 'layout,select_key,pages,recursive'; |
78 | 78 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_embedded3dviewer'] = 'pi_flexform'; |
79 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_embedded3dviewer', 'FILE:EXT:' . 'dlf/Configuration/FlexForms/Embedded3dViewer.xml'); |
|
79 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_embedded3dviewer', 'FILE:EXT:'.'dlf/Configuration/FlexForms/Embedded3dViewer.xml'); |
|
80 | 80 | |
81 | 81 | \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( |
82 | 82 | 'Dlf', |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $parent->setCurrentDocument($doc); |
115 | 115 | $success = self::add($parent, $documentRepository); |
116 | 116 | } else { |
117 | - Helper::log('Could not load parent document with UID ' . $document->getCurrentDocument()->parentId, LOG_SEVERITY_ERROR); |
|
117 | + Helper::log('Could not load parent document with UID '.$document->getCurrentDocument()->parentId, LOG_SEVERITY_ERROR); |
|
118 | 118 | return false; |
119 | 119 | } |
120 | 120 | } |
@@ -200,19 +200,19 @@ discard block |
||
200 | 200 | } catch (\Exception $e) { |
201 | 201 | if (!(Environment::isCli())) { |
202 | 202 | Helper::addMessage( |
203 | - Helper::getLanguageService()->getLL('flash.solrException') . ' ' . htmlspecialchars($e->getMessage()), |
|
203 | + Helper::getLanguageService()->getLL('flash.solrException').' '.htmlspecialchars($e->getMessage()), |
|
204 | 204 | Helper::getLanguageService()->getLL('flash.error'), |
205 | 205 | FlashMessage::ERROR, |
206 | 206 | true, |
207 | 207 | 'core.template.flashMessages' |
208 | 208 | ); |
209 | 209 | } |
210 | - Helper::log('Apache Solr threw exception: "' . $e->getMessage() . '"', LOG_SEVERITY_ERROR); |
|
210 | + Helper::log('Apache Solr threw exception: "'.$e->getMessage().'"', LOG_SEVERITY_ERROR); |
|
211 | 211 | return false; |
212 | 212 | } |
213 | 213 | } |
214 | 214 | |
215 | - Helper::log('Document not deleted from SOLR - problem with the connection to the SOLR core ' . $solrCoreUid, LOG_SEVERITY_ERROR); |
|
215 | + Helper::log('Document not deleted from SOLR - problem with the connection to the SOLR core '.$solrCoreUid, LOG_SEVERITY_ERROR); |
|
216 | 216 | return false; |
217 | 217 | } |
218 | 218 | |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | // Sanitize input. |
234 | 234 | $pid = max((int) $pid, 0); |
235 | 235 | if (!$pid) { |
236 | - Helper::log('Invalid PID ' . $pid . ' for metadata configuration', LOG_SEVERITY_ERROR); |
|
236 | + Helper::log('Invalid PID '.$pid.' for metadata configuration', LOG_SEVERITY_ERROR); |
|
237 | 237 | return ''; |
238 | 238 | } |
239 | 239 | // Load metadata configuration. |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | $suffix = (in_array($indexName, self::$fields['tokenized']) ? 't' : 'u'); |
243 | 243 | $suffix .= (in_array($indexName, self::$fields['stored']) ? 's' : 'u'); |
244 | 244 | $suffix .= (in_array($indexName, self::$fields['indexed']) ? 'i' : 'u'); |
245 | - $indexName .= '_' . $suffix; |
|
245 | + $indexName .= '_'.$suffix; |
|
246 | 246 | return $indexName; |
247 | 247 | } |
248 | 248 | |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | $solrDoc->setField('title', $metadata['title'][0]); |
359 | 359 | $solrDoc->setField('volume', $metadata['volume'][0]); |
360 | 360 | // verify date formatting |
361 | - if(strtotime($metadata['date'][0])) { |
|
361 | + if (strtotime($metadata['date'][0])) { |
|
362 | 362 | $solrDoc->setField('date', self::getFormattedDate($metadata['date'][0])); |
363 | 363 | } |
364 | 364 | $solrDoc->setField('record_id', $metadata['record_id'][0]); |
@@ -522,11 +522,11 @@ discard block |
||
522 | 522 | $solrDoc->setField(self::getIndexFieldName($indexName, $document->getPid()), $data); |
523 | 523 | if (in_array($indexName, self::$fields['sortables'])) { |
524 | 524 | // Add sortable fields to index. |
525 | - $solrDoc->setField($indexName . '_sorting', $metadata[$indexName . '_sorting'][0]); |
|
525 | + $solrDoc->setField($indexName.'_sorting', $metadata[$indexName.'_sorting'][0]); |
|
526 | 526 | } |
527 | 527 | if (in_array($indexName, self::$fields['facets'])) { |
528 | 528 | // Add facets to index. |
529 | - $solrDoc->setField($indexName . '_faceting', $data); |
|
529 | + $solrDoc->setField($indexName.'_faceting', $data); |
|
530 | 530 | } |
531 | 531 | if (in_array($indexName, self::$fields['autocomplete'])) { |
532 | 532 | $autocomplete = array_merge($autocomplete, $data); |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | $data = self::removeAppendsFromAuthor($data); |
564 | 564 | } |
565 | 565 | // Add facets to index. |
566 | - $solrDoc->setField($indexName . '_faceting', $data); |
|
566 | + $solrDoc->setField($indexName.'_faceting', $data); |
|
567 | 567 | } |
568 | 568 | } |
569 | 569 | // Add sorting information to physical sub-elements if applicable. |
@@ -594,9 +594,9 @@ discard block |
||
594 | 594 | $update = self::$solr->service->createUpdate(); |
595 | 595 | $query = ""; |
596 | 596 | if ($field == 'uid' || $field == 'partof') { |
597 | - $query = $field . ':' . $value; |
|
597 | + $query = $field.':'.$value; |
|
598 | 598 | } else { |
599 | - $query = $field . ':"' . $value . '"'; |
|
599 | + $query = $field.':"'.$value.'"'; |
|
600 | 600 | } |
601 | 601 | $update->addDeleteQuery($query); |
602 | 602 | $update->addCommit($softCommit); |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | { |
622 | 622 | $solrDoc = $updateQuery->createDocument(); |
623 | 623 | // Create unique identifier from document's UID and unit's XML ID. |
624 | - $solrDoc->setField('id', $document->getUid() . $unit['id']); |
|
624 | + $solrDoc->setField('id', $document->getUid().$unit['id']); |
|
625 | 625 | $solrDoc->setField('uid', $document->getUid()); |
626 | 626 | $solrDoc->setField('pid', $document->getPid()); |
627 | 627 | $solrDoc->setField('partof', $document->getPartof()); |
@@ -700,9 +700,9 @@ discard block |
||
700 | 700 | private static function handleException(string $errorMessage): void |
701 | 701 | { |
702 | 702 | if (!(Environment::isCli())) { |
703 | - self::addErrorMessage(Helper::getLanguageService()->getLL('flash.solrException') . '<br />' . htmlspecialchars($errorMessage)); |
|
703 | + self::addErrorMessage(Helper::getLanguageService()->getLL('flash.solrException').'<br />'.htmlspecialchars($errorMessage)); |
|
704 | 704 | } |
705 | - Helper::log('Apache Solr threw exception: "' . $errorMessage . '"', LOG_SEVERITY_ERROR); |
|
705 | + Helper::log('Apache Solr threw exception: "'.$errorMessage.'"', LOG_SEVERITY_ERROR); |
|
706 | 706 | } |
707 | 707 | |
708 | 708 | /** |
@@ -91,12 +91,12 @@ |
||
91 | 91 | $solr = Solr::getInstance($input->getOption('solr')); |
92 | 92 | // Connect to Solr server. |
93 | 93 | if (!$solr->ready) { |
94 | - $io->error('ERROR: Connection to Solr core ("' . $input->getOption('solr') . '") not possible \n'); |
|
94 | + $io->error('ERROR: Connection to Solr core ("'.$input->getOption('solr').'") not possible \n'); |
|
95 | 95 | return BaseCommand::FAILURE; |
96 | 96 | } |
97 | 97 | |
98 | 98 | if (!$solr->optimize($input->getOption('commit'), $input->getOption('optimize'))) { |
99 | - $io->error('ERROR: Optimizing the Solr core ("' . $input->getOption('solr') . '") not possible \n'); |
|
99 | + $io->error('ERROR: Optimizing the Solr core ("'.$input->getOption('solr').'") not possible \n'); |
|
100 | 100 | return BaseCommand::FAILURE; |
101 | 101 | } |
102 | 102 |
@@ -149,10 +149,10 @@ discard block |
||
149 | 149 | ) { |
150 | 150 | // Get current configuration. |
151 | 151 | $result = $queryBuilder |
152 | - ->select($table . '.is_listed AS is_listed') |
|
152 | + ->select($table.'.is_listed AS is_listed') |
|
153 | 153 | ->from($table) |
154 | 154 | ->where( |
155 | - $queryBuilder->expr()->eq($table . '.uid', (int) $id), |
|
155 | + $queryBuilder->expr()->eq($table.'.uid', (int) $id), |
|
156 | 156 | Helper::whereExpression($table) |
157 | 157 | ) |
158 | 158 | ->setMaxResults(1) |
@@ -175,10 +175,10 @@ discard block |
||
175 | 175 | ) { |
176 | 176 | // Get current configuration. |
177 | 177 | $result = $queryBuilder |
178 | - ->select($table . '.index_autocomplete AS index_autocomplete') |
|
178 | + ->select($table.'.index_autocomplete AS index_autocomplete') |
|
179 | 179 | ->from($table) |
180 | 180 | ->where( |
181 | - $queryBuilder->expr()->eq($table . '.uid', (int) $id), |
|
181 | + $queryBuilder->expr()->eq($table.'.uid', (int) $id), |
|
182 | 182 | Helper::whereExpression($table) |
183 | 183 | ) |
184 | 184 | ->setMaxResults(1) |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | if ($solr->ready) { |
349 | 349 | // Delete Solr document. |
350 | 350 | $updateQuery = $solr->service->createUpdate(); |
351 | - $updateQuery->addDeleteQuery('uid:' . (int) $id); |
|
351 | + $updateQuery->addDeleteQuery('uid:'.(int) $id); |
|
352 | 352 | $updateQuery->addCommit(false); |
353 | 353 | $solr->service->update($updateQuery); |
354 | 354 | } |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | $document->setCurrentDocument($doc); |
372 | 372 | Indexer::add($document, $this->getDocumentRepository()); |
373 | 373 | } else { |
374 | - $this->logger->error('Failed to re-index document with UID ' . (string) $id); |
|
374 | + $this->logger->error('Failed to re-index document with UID '.(string) $id); |
|
375 | 375 | } |
376 | 376 | } |
377 | 377 | |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | try { |
423 | 423 | $response = $solr->service->coreAdmin($query); |
424 | 424 | if ($response->getWasSuccessful() == false) { |
425 | - $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr'); |
|
425 | + $this->logger->warning('Core '.$resArray['core'].' could not be deleted from Apache Solr'); |
|
426 | 426 | } |
427 | 427 | } catch (\Exception $e) { |
428 | 428 | $this->logger->warning($e->getMessage()); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | if (isset($submittedData['doc']) && empty($submittedData['doc'])) { |
64 | 64 | Helper::addMessage( |
65 | - Helper::getLanguageService()->getLL('additionalFields.doc') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
65 | + Helper::getLanguageService()->getLL('additionalFields.doc').' '.Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
66 | 66 | $messageTitle, |
67 | 67 | $messageSeverity, |
68 | 68 | true, |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | if ((isset($submittedData['pid']) && (int) $submittedData['pid'] <= 0)) { |
75 | 75 | Helper::addMessage( |
76 | - Helper::getLanguageService()->getLL('additionalFields.pid') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
76 | + Helper::getLanguageService()->getLL('additionalFields.pid').' '.Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
77 | 77 | $messageTitle, |
78 | 78 | $messageSeverity, |
79 | 79 | true, |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | if ((isset($submittedData['lib']) && (int) $submittedData['lib'] <= 0)) { |
102 | 102 | Helper::addMessage( |
103 | - Helper::getLanguageService()->getLL('additionalFields.lib') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
103 | + Helper::getLanguageService()->getLL('additionalFields.lib').' '.Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
104 | 104 | $messageTitle, |
105 | 105 | $messageSeverity, |
106 | 106 | true, |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | |
112 | 112 | if ((isset($submittedData['solr']) && (int) $submittedData['solr'] <= 0) || !isset($submittedData['solr'])) { |
113 | 113 | Helper::addMessage( |
114 | - Helper::getLanguageService()->getLL('additionalFields.solr') . ' ' . Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
114 | + Helper::getLanguageService()->getLL('additionalFields.solr').' '.Helper::getLanguageService()->getLL('additionalFields.valid'), |
|
115 | 115 | $messageTitle, |
116 | 116 | $messageSeverity, |
117 | 117 | true, |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | protected function getDryRunField(bool $dryRun): array |
193 | 193 | { |
194 | 194 | $fieldName = 'dryRun'; |
195 | - $fieldId = 'task_' . $fieldName; |
|
196 | - $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($dryRun ? ' checked="checked"' : '') . '>'; |
|
195 | + $fieldId = 'task_'.$fieldName; |
|
196 | + $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($dryRun ? ' checked="checked"' : '').'>'; |
|
197 | 197 | return [ |
198 | 198 | 'code' => $fieldHtml, |
199 | 199 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.dryRun', |
@@ -215,15 +215,15 @@ discard block |
||
215 | 215 | protected function getSolrField(int $solr, int $pid = null): array |
216 | 216 | { |
217 | 217 | $fieldName = 'solr'; |
218 | - $fieldId = 'task_' . $fieldName; |
|
218 | + $fieldId = 'task_'.$fieldName; |
|
219 | 219 | |
220 | 220 | $allSolrCores = $this->getSolrCores($pid); |
221 | 221 | $options = []; |
222 | 222 | $options[] = '<option value="-1"></option>'; |
223 | 223 | foreach ($allSolrCores as $label => $uid) { |
224 | - $options[] = '<option value="' . $uid . '" ' . ($solr == $uid ? 'selected' : '') . ' >' . $label . '</option>'; |
|
224 | + $options[] = '<option value="'.$uid.'" '.($solr == $uid ? 'selected' : '').' >'.$label.'</option>'; |
|
225 | 225 | }; |
226 | - $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>'; |
|
226 | + $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>'; |
|
227 | 227 | return [ |
228 | 228 | 'code' => $fieldHtml, |
229 | 229 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.solr', |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | protected function getPidField(int $pid): array |
245 | 245 | { |
246 | 246 | $fieldName = 'pid'; |
247 | - $fieldId = 'task_' . $fieldName; |
|
247 | + $fieldId = 'task_'.$fieldName; |
|
248 | 248 | |
249 | 249 | $pageRepository = GeneralUtility::makeInstance(PageTreeRepository::class); |
250 | 250 | $pages = $pageRepository->getTree(0); |
@@ -252,11 +252,11 @@ discard block |
||
252 | 252 | $options = []; |
253 | 253 | foreach ($pages['_children'] as $page) { |
254 | 254 | if ($page['doktype'] == 254) { |
255 | - $options[] = '<option value="' . $page['uid'] . '" ' . ($pid == $page['uid'] ? 'selected' : '') . ' >' . $page['title'] . '</option>'; |
|
255 | + $options[] = '<option value="'.$page['uid'].'" '.($pid == $page['uid'] ? 'selected' : '').' >'.$page['title'].'</option>'; |
|
256 | 256 | } |
257 | 257 | } |
258 | 258 | |
259 | - $fieldHtml = '<select name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '">' . implode("\n", $options) . '</select>'; |
|
259 | + $fieldHtml = '<select name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'">'.implode("\n", $options).'</select>'; |
|
260 | 260 | return [ |
261 | 261 | 'code' => $fieldHtml, |
262 | 262 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.pid', |
@@ -277,8 +277,8 @@ discard block |
||
277 | 277 | protected function getOwnerField(string $owner): array |
278 | 278 | { |
279 | 279 | $fieldName = 'owner'; |
280 | - $fieldId = 'task_' . $fieldName; |
|
281 | - $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $owner . '" >'; |
|
280 | + $fieldId = 'task_'.$fieldName; |
|
281 | + $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$owner.'" >'; |
|
282 | 282 | return [ |
283 | 283 | 'code' => $fieldHtml, |
284 | 284 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.owner', |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $result = $queryBuilder->execute(); |
313 | 313 | |
314 | 314 | while ($record = $result->fetchAssociative()) { |
315 | - $solrCores[$record['label'] . ' (' . $record['index_name'] . ')'] = $record['uid']; |
|
315 | + $solrCores[$record['label'].' ('.$record['index_name'].')'] = $record['uid']; |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | return $solrCores; |
@@ -330,8 +330,8 @@ discard block |
||
330 | 330 | protected function getSoftCommitField(bool $softCommit): array |
331 | 331 | { |
332 | 332 | $fieldName = 'softCommit'; |
333 | - $fieldId = 'task_' . $fieldName; |
|
334 | - $fieldHtml = '<input type="checkbox" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="1"' . ($softCommit ? ' checked="checked"' : '') . '>'; |
|
333 | + $fieldId = 'task_'.$fieldName; |
|
334 | + $fieldHtml = '<input type="checkbox" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="1"'.($softCommit ? ' checked="checked"' : '').'>'; |
|
335 | 335 | return [ |
336 | 336 | 'code' => $fieldHtml, |
337 | 337 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.softCommit', |
@@ -59,8 +59,8 @@ |
||
59 | 59 | |
60 | 60 | // Text field for document URL |
61 | 61 | $fieldName = 'doc'; |
62 | - $fieldId = 'task_' . $fieldName; |
|
63 | - $fieldHtml = '<input type="text" name="tx_scheduler[' . $fieldName . ']" id="' . $fieldId . '" value="' . $taskInfo[$fieldName] . '" >'; |
|
62 | + $fieldId = 'task_'.$fieldName; |
|
63 | + $fieldHtml = '<input type="text" name="tx_scheduler['.$fieldName.']" id="'.$fieldId.'" value="'.$taskInfo[$fieldName].'" >'; |
|
64 | 64 | $additionalFields[$fieldId] = [ |
65 | 65 | 'code' => $fieldHtml, |
66 | 66 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/locallang_tasks.xlf:additionalFields.doc', |