@@ -21,9 +21,9 @@ |
||
| 21 | 21 | |
| 22 | 22 | $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 20000); |
| 23 | 23 | |
| 24 | - $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.xml'); |
|
| 25 | - $this->importDataSet(__DIR__ . '/../../Fixtures/Common/pages.xml'); |
|
| 26 | - $this->importDataSet(__DIR__ . '/../../Fixtures/Common/libraries.xml'); |
|
| 24 | + $this->importDataSet(__DIR__.'/../../Fixtures/Common/documents_1.xml'); |
|
| 25 | + $this->importDataSet(__DIR__.'/../../Fixtures/Common/pages.xml'); |
|
| 26 | + $this->importDataSet(__DIR__.'/../../Fixtures/Common/libraries.xml'); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | // There may be a single non-signifying space after the doc-comment asterisk, |
| 185 | 185 | // which is not included. |
| 186 | - $text .= preg_replace('#\\s*/?[*/]*\\s?(.*)$#', '$1', $line) . "\n"; |
|
| 186 | + $text .= preg_replace('#\\s*/?[*/]*\\s?(.*)$#', '$1', $line)."\n"; |
|
| 187 | 187 | } |
| 188 | 188 | $text = trim($text); |
| 189 | 189 | |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | RST); |
| 205 | 205 | |
| 206 | 206 | // Sort tables alphabetically |
| 207 | - usort($tables, function ($lhs, $rhs) { |
|
| 207 | + usort($tables, function($lhs, $rhs) { |
|
| 208 | 208 | return $lhs->name <=> $rhs->name; |
| 209 | 209 | }); |
| 210 | 210 | |
@@ -214,13 +214,13 @@ discard block |
||
| 214 | 214 | // Set header |
| 215 | 215 | $header = $tableInfo->name; |
| 216 | 216 | if (!empty($tableInfo->feComment)) { |
| 217 | - $header .= ': ' . $tableInfo->feComment; |
|
| 217 | + $header .= ': '.$tableInfo->feComment; |
|
| 218 | 218 | } |
| 219 | 219 | $section->setHeader($header); |
| 220 | 220 | |
| 221 | 221 | // Set introductory text of subsection |
| 222 | 222 | if ($tableInfo->modelClass) { |
| 223 | - $section->addText('Extbase domain model: ``' . $tableInfo->modelClass . '``'); |
|
| 223 | + $section->addText('Extbase domain model: ``'.$tableInfo->modelClass.'``'); |
|
| 224 | 224 | } |
| 225 | 225 | $section->addText($tableInfo->classComment); |
| 226 | 226 | $section->addText($tableInfo->sqlComment); |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | 'description' => 'Description', |
| 232 | 232 | ]]; |
| 233 | 233 | |
| 234 | - $rows = array_map(function ($column) use ($page) { |
|
| 234 | + $rows = array_map(function($column) use ($page) { |
|
| 235 | 235 | return [ |
| 236 | 236 | 'field' => ( |
| 237 | 237 | $page->format($column->name, ['bold' => $column->isPrimary]) |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | foreach ($this->requestData['selected'] as $docValue) { |
| 110 | 110 | if ($docValue['id']) { |
| 111 | 111 | $docData = $this->getDocumentData($docValue['id'], $docValue); |
| 112 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 112 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 113 | 113 | $this->redirectToUri($pdfUrl); |
| 114 | 114 | } |
| 115 | 115 | } |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($allMails->count() > 0) { |
| 173 | 173 | $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf')); |
| 174 | 174 | foreach ($allMails as $mail) { |
| 175 | - $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')'; |
|
| 175 | + $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')'; |
|
| 176 | 176 | } |
| 177 | 177 | $this->view->assign('mailSelect', $mailSelect); |
| 178 | 178 | } |
@@ -256,12 +256,12 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | $entryArray['BASKETDATA'] = $docData; |
| 258 | 258 | |
| 259 | - $entryKey = $id . '_' . $startpage; |
|
| 259 | + $entryKey = $id.'_'.$startpage; |
|
| 260 | 260 | if (!empty($startX)) { |
| 261 | - $entryKey .= '_' . $startX; |
|
| 261 | + $entryKey .= '_'.$startX; |
|
| 262 | 262 | } |
| 263 | 263 | if (!empty($endX)) { |
| 264 | - $entryKey .= '_' . $endX; |
|
| 264 | + $entryKey .= '_'.$endX; |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | $entryArray['id'] = $id; |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams); |
| 313 | 313 | $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams); |
| 314 | 314 | |
| 315 | - $downloadUrl = $this->settings['pdfgenerate'] . $urlParams; |
|
| 315 | + $downloadUrl = $this->settings['pdfgenerate'].$urlParams; |
|
| 316 | 316 | |
| 317 | 317 | $title = $this->document->getTitle(); |
| 318 | 318 | if (empty($title)) { |
@@ -323,15 +323,15 @@ discard block |
||
| 323 | 323 | $info = ''; |
| 324 | 324 | if ($data['startX'] != '' && $data['endX'] != '') { |
| 325 | 325 | // cutout |
| 326 | - $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' '; |
|
| 326 | + $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' '; |
|
| 327 | 327 | } |
| 328 | 328 | if ($data['startpage'] == $data['endpage']) { |
| 329 | 329 | // One page |
| 330 | - $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage']; |
|
| 330 | + $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage']; |
|
| 331 | 331 | } else { |
| 332 | - $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage']; |
|
| 332 | + $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage']; |
|
| 333 | 333 | } |
| 334 | - $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')'; |
|
| 334 | + $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')'; |
|
| 335 | 335 | if ($data['startpage'] == $data['endpage']) { |
| 336 | 336 | $pageNums = 1; |
| 337 | 337 | } else { |
@@ -407,12 +407,12 @@ discard block |
||
| 407 | 407 | if ($_piVars['addToBasket'] == 'list') { |
| 408 | 408 | $documentItem['endpage'] = $this->document->getDoc()->numPages; |
| 409 | 409 | } |
| 410 | - $arrayKey = $documentItem['id'] . '_' . $page; |
|
| 410 | + $arrayKey = $documentItem['id'].'_'.$page; |
|
| 411 | 411 | if (!empty($documentItem['startX'])) { |
| 412 | - $arrayKey .= '_' . $documentItem['startX']; |
|
| 412 | + $arrayKey .= '_'.$documentItem['startX']; |
|
| 413 | 413 | } |
| 414 | 414 | if (!empty($documentItem['endX'])) { |
| 415 | - $arrayKey .= '_' . $documentItem['endX']; |
|
| 415 | + $arrayKey .= '_'.$documentItem['endX']; |
|
| 416 | 416 | } |
| 417 | 417 | // do not add more than one identical object |
| 418 | 418 | if (!in_array($arrayKey, $items)) { |
@@ -431,14 +431,14 @@ discard block |
||
| 431 | 431 | // remove parameter endpage |
| 432 | 432 | $pdfParams = str_replace(",##endpage##", '', $pdfParams); |
| 433 | 433 | } |
| 434 | - $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams; |
|
| 434 | + $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams; |
|
| 435 | 435 | if ($this->settings['pregeneration']) { |
| 436 | 436 | // send ajax request to webapp |
| 437 | 437 | $output .= ' |
| 438 | 438 | <script> |
| 439 | 439 | $(document).ready(function(){ |
| 440 | 440 | $.ajax({ |
| 441 | - url: "' . $pdfGenerateUrl . '", |
|
| 441 | + url: "' . $pdfGenerateUrl.'", |
|
| 442 | 442 | }).done(function() { |
| 443 | 443 | }); |
| 444 | 444 | }); |
@@ -476,12 +476,12 @@ discard block |
||
| 476 | 476 | } |
| 477 | 477 | foreach ($_piVars['selected'] as $value) { |
| 478 | 478 | if (isset($value['id'])) { |
| 479 | - $arrayKey = $value['id'] . '_' . $value['startpage']; |
|
| 479 | + $arrayKey = $value['id'].'_'.$value['startpage']; |
|
| 480 | 480 | if (!empty($value['startX'])) { |
| 481 | - $arrayKey .= '_' . $value['startX']; |
|
| 481 | + $arrayKey .= '_'.$value['startX']; |
|
| 482 | 482 | } |
| 483 | 483 | if (!empty($value['endX'])) { |
| 484 | - $arrayKey .= '_' . $value['endX']; |
|
| 484 | + $arrayKey .= '_'.$value['endX']; |
|
| 485 | 485 | } |
| 486 | 486 | if (isset($items[$arrayKey])) { |
| 487 | 487 | unset($items[$arrayKey]); |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | |
| 515 | 515 | $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst(); |
| 516 | 516 | |
| 517 | - $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n"; |
|
| 517 | + $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n"; |
|
| 518 | 518 | $numberOfPages = 0; |
| 519 | 519 | $pdfUrl = $this->settings['pdfdownload']; |
| 520 | 520 | // prepare links |
@@ -522,7 +522,7 @@ discard block |
||
| 522 | 522 | if ($docValue['id']) { |
| 523 | 523 | $explodeId = explode("_", $docValue['id']); |
| 524 | 524 | $docData = $this->getDocumentData($explodeId[0], $docValue); |
| 525 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 525 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 526 | 526 | $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage']))); |
| 527 | 527 | if ($pages === 0) { |
| 528 | 528 | $numberOfPages = $numberOfPages + 1; |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | } |
| 534 | 534 | // Remove leading/tailing pdfparamseperator |
| 535 | 535 | $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']); |
| 536 | - $mailBody = $mailText . $pdfUrl; |
|
| 536 | + $mailBody = $mailText.$pdfUrl; |
|
| 537 | 537 | // Get hook objects. |
| 538 | 538 | $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php'); |
| 539 | 539 | // Hook for getting a customized mail body. |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | $newActionLog = GeneralUtility::makeInstance(ActionLog::class); |
| 561 | 561 | $newActionLog->setFileName($pdfUrl); |
| 562 | 562 | $newActionLog->setCountPages($numberOfPages); |
| 563 | - $newActionLog->setLabel('Mail: ' . $mailObject->getMail()); |
|
| 563 | + $newActionLog->setLabel('Mail: '.$mailObject->getMail()); |
|
| 564 | 564 | |
| 565 | 565 | if ($GLOBALS["TSFE"]->loginUser) { |
| 566 | 566 | // internal user |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | foreach ($this->requestData['selected'] as $docId => $docValue) { |
| 593 | 593 | if ($docValue['id']) { |
| 594 | 594 | $docData = $this->getDocumentData($docValue['id'], $docValue); |
| 595 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 595 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 596 | 596 | $numberOfPages += $docData['pageNums']; |
| 597 | 597 | } |
| 598 | 598 | } |
@@ -610,7 +610,7 @@ discard block |
||
| 610 | 610 | if ($docValue['id']) { |
| 611 | 611 | $explodeId = explode("_", $docId); |
| 612 | 612 | $docData = $this->getDocumentData($explodeId[0], $docValue); |
| 613 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 613 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 614 | 614 | $numberOfPages += $docData['pageNums']; |
| 615 | 615 | } |
| 616 | 616 | } |
@@ -627,12 +627,12 @@ discard block |
||
| 627 | 627 | // internal user |
| 628 | 628 | $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']); |
| 629 | 629 | $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']); |
| 630 | - $actionLog->setLabel('Print: ' . $printer->getLabel()); |
|
| 630 | + $actionLog->setLabel('Print: '.$printer->getLabel()); |
|
| 631 | 631 | } else { |
| 632 | 632 | // external user |
| 633 | 633 | $actionLog->setUserId(0); |
| 634 | 634 | $actionLog->setName('n/a'); |
| 635 | - $actionLog->setLabel('Print: ' . $printer->getLabel()); |
|
| 635 | + $actionLog->setLabel('Print: '.$printer->getLabel()); |
|
| 636 | 636 | } |
| 637 | 637 | // add action to protocol |
| 638 | 638 | $this->actionLogRepository->add($actionLog); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | public function addFormatAction() |
| 159 | 159 | { |
| 160 | 160 | // Include formats definition file. |
| 161 | - $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php'); |
|
| 161 | + $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/FormatDefaults.php'); |
|
| 162 | 162 | |
| 163 | 163 | $frameworkConfiguration = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FRAMEWORK); |
| 164 | 164 | // tx_dlf_formats are stored on PID = 0 |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | public function addMetadataAction() |
| 197 | 197 | { |
| 198 | 198 | // Include metadata definition file. |
| 199 | - $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php'); |
|
| 199 | + $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/MetadataDefaults.php'); |
|
| 200 | 200 | |
| 201 | 201 | $doPersist = false; |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | if ($this->metadataRepository->findOneByIndexName($indexName) === null) { |
| 209 | 209 | |
| 210 | 210 | $newRecord = GeneralUtility::makeInstance(Metadata::class); |
| 211 | - $newRecord->setLabel($this->getLLL('metadata.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels)); |
|
| 211 | + $newRecord->setLabel($this->getLLL('metadata.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $metadataLabels)); |
|
| 212 | 212 | $newRecord->setIndexName($indexName); |
| 213 | 213 | $newRecord->setDefaultValue($values['default_value']); |
| 214 | 214 | $newRecord->setWrap($values['wrap'] ? : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']); |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | $translatedRecord = GeneralUtility::makeInstance(Metadata::class); |
| 244 | 244 | $translatedRecord->setL18nParent($newRecord); |
| 245 | 245 | $translatedRecord->_setProperty('_languageUid', $siteLanguage->getLanguageId()); |
| 246 | - $translatedRecord->setLabel($this->getLLL('metadata.' . $indexName, $siteLanguage->getTypo3Language(), $metadataLabels)); |
|
| 246 | + $translatedRecord->setLabel($this->getLLL('metadata.'.$indexName, $siteLanguage->getTypo3Language(), $metadataLabels)); |
|
| 247 | 247 | $translatedRecord->setIndexName($indexName); |
| 248 | 248 | $translatedRecord->setWrap($newRecord->getWrap()); |
| 249 | 249 | |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | |
| 278 | 278 | if ($this->solrCoreRepository->findOneByPid($this->pid) === null) { |
| 279 | 279 | $newRecord = GeneralUtility::makeInstance(SolrCore::class); |
| 280 | - $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels). ' (PID ' . $this->pid . ')'); |
|
| 280 | + $newRecord->setLabel($this->getLLL('flexform.solrcore', $this->siteLanguages[0]->getTypo3Language(), $beLabels).' (PID '.$this->pid.')'); |
|
| 281 | 281 | $indexName = Solr::createCore(''); |
| 282 | 282 | $newRecord->setIndexName($indexName); |
| 283 | 283 | |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | public function addStructureAction() |
| 302 | 302 | { |
| 303 | 303 | // Include structure definition file. |
| 304 | - $structureDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php'); |
|
| 304 | + $structureDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/StructureDefaults.php'); |
|
| 305 | 305 | |
| 306 | 306 | $doPersist = false; |
| 307 | 307 | |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | // if default format record is not found, add it to the repository |
| 313 | 313 | if ($this->structureRepository->findOneByIndexName($indexName) === null) { |
| 314 | 314 | $newRecord = GeneralUtility::makeInstance(Structure::class); |
| 315 | - $newRecord->setLabel($this->getLLL('structure.' . $indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels)); |
|
| 315 | + $newRecord->setLabel($this->getLLL('structure.'.$indexName, $this->siteLanguages[0]->getTypo3Language(), $structLabels)); |
|
| 316 | 316 | $newRecord->setIndexName($indexName); |
| 317 | 317 | $newRecord->setToplevel($values['toplevel']); |
| 318 | 318 | $newRecord->setOaiName($values['oai_name']); |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | $translatedRecord = GeneralUtility::makeInstance(Structure::class); |
| 327 | 327 | $translatedRecord->setL18nParent($newRecord); |
| 328 | 328 | $translatedRecord->_setProperty('_languageUid', $siteLanguage->getLanguageId()); |
| 329 | - $translatedRecord->setLabel($this->getLLL('structure.' . $indexName, $siteLanguage->getTypo3Language(), $structLabels)); |
|
| 329 | + $translatedRecord->setLabel($this->getLLL('structure.'.$indexName, $siteLanguage->getTypo3Language(), $structLabels)); |
|
| 330 | 330 | $translatedRecord->setIndexName($indexName); |
| 331 | 331 | |
| 332 | 332 | $this->structureRepository->add($translatedRecord); |
@@ -378,15 +378,15 @@ discard block |
||
| 378 | 378 | $this->forward('error'); |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | - $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/FormatDefaults.php'); |
|
| 381 | + $formatsDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/FormatDefaults.php'); |
|
| 382 | 382 | $recordInfos['formats']['numCurrent'] = $this->formatRepository->countAll(); |
| 383 | 383 | $recordInfos['formats']['numDefault'] = count($formatsDefaults); |
| 384 | 384 | |
| 385 | - $structuresDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/StructureDefaults.php'); |
|
| 385 | + $structuresDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/StructureDefaults.php'); |
|
| 386 | 386 | $recordInfos['structures']['numCurrent'] = $this->structureRepository->countByPid($this->pid); |
| 387 | 387 | $recordInfos['structures']['numDefault'] = count($structuresDefaults); |
| 388 | 388 | |
| 389 | - $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf') . 'Resources/Private/Data/MetadataDefaults.php'); |
|
| 389 | + $metadataDefaults = include(ExtensionManagementUtility::extPath('dlf').'Resources/Private/Data/MetadataDefaults.php'); |
|
| 390 | 390 | $recordInfos['metadata']['numCurrent'] = $this->metadataRepository->countByPid($this->pid); |
| 391 | 391 | $recordInfos['metadata']['numDefault'] = count($metadataDefaults); |
| 392 | 392 | |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | */ |
| 121 | 121 | private function getQuery($fields, $parameters) |
| 122 | 122 | { |
| 123 | - return $fields['fulltext'] . ':(' . Solr::escapeQuery((string) $parameters['q']) . ') AND ' . $fields['uid'] . ':' . $this->getUid($parameters['uid']); |
|
| 123 | + return $fields['fulltext'].':('.Solr::escapeQuery((string) $parameters['q']).') AND '.$fields['uid'].':'.$this->getUid($parameters['uid']); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $parameters = $request->getParsedBody(); |
| 46 | 46 | $solrCore = (string) $parameters['solrcore']; |
| 47 | 47 | $uHash = (string) $parameters['uHash']; |
| 48 | - if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) { |
|
| 48 | + if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) { |
|
| 49 | 49 | throw new \InvalidArgumentException('No valid parameter passed!', 1580585079); |
| 50 | 50 | } |
| 51 | 51 | // Perform Solr query. |
@@ -65,22 +65,22 @@ |
||
| 65 | 65 | $_EXTKEY = 'dlf'; |
| 66 | 66 | // Register tools for toolbox plugin. |
| 67 | 67 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] = []; |
| 68 | -$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'; |
|
| 69 | -$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'; |
|
| 70 | -$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'; |
|
| 71 | -$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'; |
|
| 72 | -$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'; |
|
| 73 | -$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'; |
|
| 74 | -$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'; |
|
| 68 | +$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'; |
|
| 69 | +$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'; |
|
| 70 | +$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'; |
|
| 71 | +$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'; |
|
| 72 | +$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'; |
|
| 73 | +$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'; |
|
| 74 | +$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'; |
|
| 75 | 75 | // Register hooks. |
| 76 | 76 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class; |
| 77 | 77 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class; |
| 78 | 78 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Common/MetsDocument.php']['hookClass'][] = \Kitodo\Dlf\Hooks\KitodoProductionHacks::class; |
| 79 | 79 | // Register AJAX eID handlers. |
| 80 | -$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class . '::main'; |
|
| 81 | -$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class . '::main'; |
|
| 80 | +$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class.'::main'; |
|
| 81 | +$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class.'::main'; |
|
| 82 | 82 | if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['enableInternalProxy'] ?? false) { |
| 83 | - $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class . '::main'; |
|
| 83 | + $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class.'::main'; |
|
| 84 | 84 | } |
| 85 | 85 | // Use Caching Framework for Solr queries |
| 86 | 86 | if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) { |
@@ -33,13 +33,13 @@ |
||
| 33 | 33 | $foundNumbers = $this->documentRepository->getStatisticsForSelectedCollection($this->settings); |
| 34 | 34 | |
| 35 | 35 | // Set replacements. |
| 36 | - $args['###TITLES###'] = $foundNumbers['titles'] . ' ' . htmlspecialchars( |
|
| 36 | + $args['###TITLES###'] = $foundNumbers['titles'].' '.htmlspecialchars( |
|
| 37 | 37 | LocalizationUtility::translate( |
| 38 | 38 | ($foundNumbers['titles'] > 1 ? 'titles' : 'title'), 'dlf' |
| 39 | 39 | ) |
| 40 | 40 | ); |
| 41 | 41 | |
| 42 | - $args['###VOLUMES###'] = $foundNumbers['volumes'] . ' ' . htmlspecialchars( |
|
| 42 | + $args['###VOLUMES###'] = $foundNumbers['volumes'].' '.htmlspecialchars( |
|
| 43 | 43 | LocalizationUtility::translate( |
| 44 | 44 | ($foundNumbers['volumes'] > 1 ? 'volumes' : 'volume'), 'dlf' |
| 45 | 45 | ) |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration(); |
| 72 | 72 | |
| 73 | 73 | if ($this->disableJsonWrappedResponse) { |
| 74 | - $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function ($ext) { |
|
| 74 | + $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function($ext) { |
|
| 75 | 75 | return $ext !== 'Resources/Core/Functional/Extensions/json_response'; |
| 76 | 76 | }); |
| 77 | 77 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class); |
| 85 | 85 | |
| 86 | - $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/'; |
|
| 86 | + $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-'.$this->identifier.'/'; |
|
| 87 | 87 | $this->httpClient = new HttpClient([ |
| 88 | 88 | 'base_uri' => $this->baseUrl, |
| 89 | 89 | 'http_errors' => false, |
@@ -127,13 +127,13 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | protected function addSiteConfig($identifier, $baseUrl) |
| 129 | 129 | { |
| 130 | - $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml'); |
|
| 130 | + $siteConfig = Yaml::parseFile(__DIR__.'/../Fixtures/siteconfig.yaml'); |
|
| 131 | 131 | $siteConfig['base'] = $baseUrl; |
| 132 | 132 | $siteConfig['languages'][0]['base'] = $baseUrl; |
| 133 | 133 | |
| 134 | - $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier; |
|
| 134 | + $siteConfigPath = $this->instancePath.'/typo3conf/sites/'.$identifier; |
|
| 135 | 135 | @mkdir($siteConfigPath, 0775, true); |
| 136 | - file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig)); |
|
| 136 | + file_put_contents($siteConfigPath.'/config.yaml', Yaml::dump($siteConfig)); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | protected function initializeRepository(string $className, int $storagePid) |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $jsonDocuments = json_decode(file_get_contents($path), true); |
| 153 | 153 | |
| 154 | 154 | $updateQuery = $solr->service->createUpdate(); |
| 155 | - $documents = array_map(function ($jsonDoc) use ($updateQuery) { |
|
| 155 | + $documents = array_map(function($jsonDoc) use ($updateQuery) { |
|
| 156 | 156 | $document = $updateQuery->createDocument(); |
| 157 | 157 | foreach ($jsonDoc as $key => $value) { |
| 158 | 158 | $document->setField($key, $value); |