@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | foreach ($this->requestData['selected'] as $docValue) { |
| 134 | 134 | if ($docValue['id']) { |
| 135 | 135 | $docData = $this->getDocumentData((int) $docValue['id'], $docValue); |
| 136 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 136 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 137 | 137 | $this->redirectToUri($pdfUrl); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | if ($allMails->count() > 0) { |
| 201 | 201 | $mailSelect[0] = htmlspecialchars(LocalizationUtility::translate('basket.chooseMail', 'dlf')); |
| 202 | 202 | foreach ($allMails as $mail) { |
| 203 | - $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()) . ' (' . htmlspecialchars($mail->getMail()) . ')'; |
|
| 203 | + $mailSelect[$mail->getUid()] = htmlspecialchars($mail->getName()).' ('.htmlspecialchars($mail->getMail()).')'; |
|
| 204 | 204 | } |
| 205 | 205 | $this->view->assign('mailSelect', $mailSelect); |
| 206 | 206 | } |
@@ -292,12 +292,12 @@ discard block |
||
| 292 | 292 | |
| 293 | 293 | $entryArray['BASKETDATA'] = $docData; |
| 294 | 294 | |
| 295 | - $entryKey = $id . '_' . $startpage; |
|
| 295 | + $entryKey = $id.'_'.$startpage; |
|
| 296 | 296 | if (!empty($startX)) { |
| 297 | - $entryKey .= '_' . $startX; |
|
| 297 | + $entryKey .= '_'.$startX; |
|
| 298 | 298 | } |
| 299 | 299 | if (!empty($endX)) { |
| 300 | - $entryKey .= '_' . $endX; |
|
| 300 | + $entryKey .= '_'.$endX; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | $entryArray['id'] = $id; |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : (int) $data['endY'], $urlParams); |
| 354 | 354 | $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : (int) $data['rotation'], $urlParams); |
| 355 | 355 | |
| 356 | - $downloadUrl = $this->settings['pdfgenerate'] . $urlParams; |
|
| 356 | + $downloadUrl = $this->settings['pdfgenerate'].$urlParams; |
|
| 357 | 357 | |
| 358 | 358 | $title = $this->document->getTitle(); |
| 359 | 359 | if (empty($title)) { |
@@ -364,15 +364,15 @@ discard block |
||
| 364 | 364 | $info = ''; |
| 365 | 365 | if ($data['startX'] != '' && $data['endX'] != '') { |
| 366 | 366 | // cutout |
| 367 | - $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')) . ' '; |
|
| 367 | + $info .= htmlspecialchars(LocalizationUtility::translate('basket.cutout', 'dlf')).' '; |
|
| 368 | 368 | } |
| 369 | 369 | if ($data['startpage'] == $data['endpage']) { |
| 370 | 370 | // One page |
| 371 | - $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage']; |
|
| 371 | + $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage']; |
|
| 372 | 372 | } else { |
| 373 | - $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')) . ' ' . $data['startpage'] . '-' . $data['endpage']; |
|
| 373 | + $info .= htmlspecialchars(LocalizationUtility::translate('page', 'dlf')).' '.$data['startpage'].'-'.$data['endpage']; |
|
| 374 | 374 | } |
| 375 | - $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')'; |
|
| 375 | + $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')'; |
|
| 376 | 376 | if ($data['startpage'] == $data['endpage']) { |
| 377 | 377 | $pageNums = 1; |
| 378 | 378 | } else { |
@@ -445,12 +445,12 @@ discard block |
||
| 445 | 445 | if ($piVars['addToBasket'] == 'list') { |
| 446 | 446 | $documentItem['endpage'] = $this->document->getCurrentDocument()->numPages; |
| 447 | 447 | } |
| 448 | - $arrayKey = $documentItem['id'] . '_' . $page; |
|
| 448 | + $arrayKey = $documentItem['id'].'_'.$page; |
|
| 449 | 449 | if (!empty($documentItem['startX'])) { |
| 450 | - $arrayKey .= '_' . $documentItem['startX']; |
|
| 450 | + $arrayKey .= '_'.$documentItem['startX']; |
|
| 451 | 451 | } |
| 452 | 452 | if (!empty($documentItem['endX'])) { |
| 453 | - $arrayKey .= '_' . $documentItem['endX']; |
|
| 453 | + $arrayKey .= '_'.$documentItem['endX']; |
|
| 454 | 454 | } |
| 455 | 455 | // do not add more than one identical object |
| 456 | 456 | if (!in_array($arrayKey, $items)) { |
@@ -471,14 +471,14 @@ discard block |
||
| 471 | 471 | // remove parameter endpage |
| 472 | 472 | $pdfParams = str_replace(",##endpage##", '', $pdfParams); |
| 473 | 473 | } |
| 474 | - $pdfGenerateUrl = $this->settings['pdfgenerate'] . $pdfParams; |
|
| 474 | + $pdfGenerateUrl = $this->settings['pdfgenerate'].$pdfParams; |
|
| 475 | 475 | if ($this->settings['pregeneration']) { |
| 476 | 476 | // send ajax request to webapp |
| 477 | 477 | $output .= ' |
| 478 | 478 | <script> |
| 479 | 479 | $(document).ready(function(){ |
| 480 | 480 | $.ajax({ |
| 481 | - url: "' . $pdfGenerateUrl . '", |
|
| 481 | + url: "' . $pdfGenerateUrl.'", |
|
| 482 | 482 | }).done(function() { |
| 483 | 483 | }); |
| 484 | 484 | }); |
@@ -516,12 +516,12 @@ discard block |
||
| 516 | 516 | } |
| 517 | 517 | foreach ($piVars['selected'] as $value) { |
| 518 | 518 | if (isset($value['id'])) { |
| 519 | - $arrayKey = $value['id'] . '_' . $value['startpage']; |
|
| 519 | + $arrayKey = $value['id'].'_'.$value['startpage']; |
|
| 520 | 520 | if (!empty($value['startX'])) { |
| 521 | - $arrayKey .= '_' . $value['startX']; |
|
| 521 | + $arrayKey .= '_'.$value['startX']; |
|
| 522 | 522 | } |
| 523 | 523 | if (!empty($value['endX'])) { |
| 524 | - $arrayKey .= '_' . $value['endX']; |
|
| 524 | + $arrayKey .= '_'.$value['endX']; |
|
| 525 | 525 | } |
| 526 | 526 | if (isset($items[$arrayKey])) { |
| 527 | 527 | unset($items[$arrayKey]); |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | |
| 555 | 555 | $mailObject = $this->mailRepository->findByUid(intval($mailId))->getFirst(); |
| 556 | 556 | |
| 557 | - $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf')) . "\n"; |
|
| 557 | + $mailText = htmlspecialchars(LocalizationUtility::translate('basket.mailBody', 'dlf'))."\n"; |
|
| 558 | 558 | $numberOfPages = 0; |
| 559 | 559 | $pdfUrl = $this->settings['pdfdownload']; |
| 560 | 560 | // prepare links |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | if ($docValue['id']) { |
| 563 | 563 | $explodeId = explode("_", $docValue['id']); |
| 564 | 564 | $docData = $this->getDocumentData((int) $explodeId[0], $docValue); |
| 565 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 565 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 566 | 566 | $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage']))); |
| 567 | 567 | if ($pages === 0) { |
| 568 | 568 | $numberOfPages = $numberOfPages + 1; |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | } |
| 574 | 574 | // Remove leading/tailing pdfparamseperator |
| 575 | 575 | $pdfUrl = trim($pdfUrl, $this->settings['pdfparamseparator']); |
| 576 | - $mailBody = $mailText . $pdfUrl; |
|
| 576 | + $mailBody = $mailText.$pdfUrl; |
|
| 577 | 577 | // Get hook objects. |
| 578 | 578 | $hookObjects = Helper::getHookObjects('Classes/Controller/BasketController.php'); |
| 579 | 579 | // Hook for getting a customized mail body. |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | $newActionLog = GeneralUtility::makeInstance(ActionLog::class); |
| 601 | 601 | $newActionLog->setFileName($pdfUrl); |
| 602 | 602 | $newActionLog->setCountPages($numberOfPages); |
| 603 | - $newActionLog->setLabel('Mail: ' . $mailObject->getMail()); |
|
| 603 | + $newActionLog->setLabel('Mail: '.$mailObject->getMail()); |
|
| 604 | 604 | |
| 605 | 605 | if ($GLOBALS["TSFE"]->loginUser) { |
| 606 | 606 | // internal user |
@@ -631,7 +631,7 @@ discard block |
||
| 631 | 631 | foreach ($this->requestData['selected'] as $docId => $docValue) { |
| 632 | 632 | if ($docValue['id']) { |
| 633 | 633 | $docData = $this->getDocumentData((int) $docValue['id'], $docValue); |
| 634 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 634 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 635 | 635 | $numberOfPages += $docData['pageNums']; |
| 636 | 636 | } |
| 637 | 637 | } |
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | if ($docValue['id']) { |
| 650 | 650 | $explodeId = explode("_", $docId); |
| 651 | 651 | $docData = $this->getDocumentData((int) $explodeId[0], $docValue); |
| 652 | - $pdfUrl .= $docData['urlParams'] . $this->settings['pdfparamseparator']; |
|
| 652 | + $pdfUrl .= $docData['urlParams'].$this->settings['pdfparamseparator']; |
|
| 653 | 653 | $numberOfPages += $docData['pageNums']; |
| 654 | 654 | } |
| 655 | 655 | } |
@@ -666,12 +666,12 @@ discard block |
||
| 666 | 666 | // internal user |
| 667 | 667 | $actionLog->setUserId($GLOBALS["TSFE"]->fe_user->user['uid']); |
| 668 | 668 | $actionLog->setName($GLOBALS["TSFE"]->fe_user->user['username']); |
| 669 | - $actionLog->setLabel('Print: ' . $printer->getLabel()); |
|
| 669 | + $actionLog->setLabel('Print: '.$printer->getLabel()); |
|
| 670 | 670 | } else { |
| 671 | 671 | // external user |
| 672 | 672 | $actionLog->setUserId(0); |
| 673 | 673 | $actionLog->setName('n/a'); |
| 674 | - $actionLog->setLabel('Print: ' . $printer->getLabel()); |
|
| 674 | + $actionLog->setLabel('Print: '.$printer->getLabel()); |
|
| 675 | 675 | } |
| 676 | 676 | // add action to protocol |
| 677 | 677 | $this->actionLogRepository->add($actionLog); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $simplePagination = new SimplePagination($solrPaginator); |
| 168 | 168 | |
| 169 | 169 | $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator); |
| 170 | - $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]); |
|
| 170 | + $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | $this->view->assign('viewData', $this->viewData); |
@@ -219,20 +219,20 @@ discard block |
||
| 219 | 219 | foreach ($collections as $collection) { |
| 220 | 220 | $solr_query = ''; |
| 221 | 221 | if ($collection->getIndexSearch() != '') { |
| 222 | - $solr_query .= '(' . $collection->getIndexSearch() . ')'; |
|
| 222 | + $solr_query .= '('.$collection->getIndexSearch().')'; |
|
| 223 | 223 | } else { |
| 224 | - $solr_query .= 'collection:("' . Solr::escapeQuery($collection->getIndexName()) . '")'; |
|
| 224 | + $solr_query .= 'collection:("'.Solr::escapeQuery($collection->getIndexName()).'")'; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | // virtual collection might yield documents, that are not toplevel true or partof anything |
| 228 | 228 | if ($collection->getIndexSearch()) { |
| 229 | 229 | $params['query'] = $solr_query; |
| 230 | 230 | } else { |
| 231 | - $params['query'] = $solr_query . ' AND partof:0 AND toplevel:true'; |
|
| 231 | + $params['query'] = $solr_query.' AND partof:0 AND toplevel:true'; |
|
| 232 | 232 | } |
| 233 | 233 | $partOfNothing = $solr->searchRaw($params); |
| 234 | 234 | |
| 235 | - $params['query'] = $solr_query . ' AND NOT partof:0 AND toplevel:true'; |
|
| 235 | + $params['query'] = $solr_query.' AND NOT partof:0 AND toplevel:true'; |
|
| 236 | 236 | $partOfSomething = $solr->searchRaw($params); |
| 237 | 237 | |
| 238 | 238 | $collectionInfo = []; |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $listRequestData = GeneralUtility::_GPmerged('tx_dlf_listview'); |
| 118 | 118 | |
| 119 | 119 | if (isset($listRequestData['searchParameter']) && is_array($listRequestData['searchParameter'])) { |
| 120 | - $this->searchParams = array_merge($this->searchParams ?: [], $listRequestData['searchParameter']); |
|
| 120 | + $this->searchParams = array_merge($this->searchParams ? : [], $listRequestData['searchParameter']); |
|
| 121 | 121 | $listViewSearch = true; |
| 122 | 122 | $GLOBALS['TSFE']->fe_user->setKey('ses', 'search', $this->searchParams); |
| 123 | 123 | } |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $simplePagination = new SimplePagination($solrPaginator); |
| 179 | 179 | |
| 180 | 180 | $pagination = $this->buildSimplePagination($simplePagination, $solrPaginator); |
| 181 | - $this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]); |
|
| 181 | + $this->view->assignMultiple(['pagination' => $pagination, 'paginator' => $solrPaginator]); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | $this->view->assign('documents', !empty($solrResults) ? $solrResults : []); |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | |
| 204 | 204 | // Add uHash parameter to suggest parameter to make a basic protection of this form. |
| 205 | 205 | if ($this->settings['suggest']) { |
| 206 | - $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest')); |
|
| 206 | + $this->view->assign('uHash', GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest')); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | $this->view->assign('viewData', $this->viewData); |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | // Get facets from plugin configuration. |
| 225 | 225 | $facets = []; |
| 226 | 226 | foreach (GeneralUtility::trimExplode(',', $this->settings['facets'], true) as $facet) { |
| 227 | - $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']); |
|
| 227 | + $facets[$facet.'_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->settings['storagePid']); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | $this->view->assign('facetsMenu', $this->makeFacetsMenuArray($facets)); |
@@ -260,13 +260,13 @@ discard block |
||
| 260 | 260 | $searchParams = $this->searchParams; |
| 261 | 261 | if ( |
| 262 | 262 | (!empty($searchParams['fulltext'])) |
| 263 | - || preg_match('/' . $fields['fulltext'] . ':\((.*)\)/', trim($searchParams['query']), $matches) |
|
| 263 | + || preg_match('/'.$fields['fulltext'].':\((.*)\)/', trim($searchParams['query']), $matches) |
|
| 264 | 264 | ) { |
| 265 | 265 | // If the query already is a fulltext query e.g using the facets |
| 266 | 266 | $searchParams['query'] = empty($matches[1]) ? $searchParams['query'] : $matches[1]; |
| 267 | 267 | // Search in fulltext field if applicable. Query must not be empty! |
| 268 | 268 | if (!empty($searchParams['query'])) { |
| 269 | - $search['query'] = $fields['fulltext'] . ':(' . Solr::escapeQuery(trim($searchParams['query'])) . ')'; |
|
| 269 | + $search['query'] = $fields['fulltext'].':('.Solr::escapeQuery(trim($searchParams['query'])).')'; |
|
| 270 | 270 | } |
| 271 | 271 | } else { |
| 272 | 272 | // Retain given search field if valid. |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | // add filter query for date search |
| 284 | 284 | if (!empty($this->searchParams['dateFrom']) && !empty($this->searchParams['dateTo'])) { |
| 285 | 285 | // combine dateFrom and dateTo into filterquery as range search |
| 286 | - $search['params']['filterquery'][]['query'] = '{!join from=' . $fields['uid'] . ' to=' . $fields['uid'] . '}' . $fields['date'] . ':[' . $this->searchParams['dateFrom'] . ' TO ' . $this->searchParams['dateTo'] . ']'; |
|
| 286 | + $search['params']['filterquery'][]['query'] = '{!join from='.$fields['uid'].' to='.$fields['uid'].'}'.$fields['date'].':['.$this->searchParams['dateFrom'].' TO '.$this->searchParams['dateTo'].']'; |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | // Add extended search query. |
@@ -301,9 +301,9 @@ discard block |
||
| 301 | 301 | in_array($searchParams['extOperator'][$i], $allowedOperators) |
| 302 | 302 | ) { |
| 303 | 303 | if (!empty($search['query'])) { |
| 304 | - $search['query'] .= ' ' . $searchParams['extOperator'][$i] . ' '; |
|
| 304 | + $search['query'] .= ' '.$searchParams['extOperator'][$i].' '; |
|
| 305 | 305 | } |
| 306 | - $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']) . ':(' . Solr::escapeQuery($searchParams['extQuery'][$i]) . ')'; |
|
| 306 | + $search['query'] .= Indexer::getIndexFieldName($searchParams['extField'][$i], $this->settings['storagePid']).':('.Solr::escapeQuery($searchParams['extQuery'][$i]).')'; |
|
| 307 | 307 | } |
| 308 | 308 | } |
| 309 | 309 | } |
@@ -392,24 +392,24 @@ discard block |
||
| 392 | 392 | foreach ($collections as $collectionEntry) { |
| 393 | 393 | // check for virtual collections query string |
| 394 | 394 | if ($collectionEntry->getIndexSearch()) { |
| 395 | - $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '(' . $collectionEntry->getIndexSearch() . ')' : ' OR (' . $collectionEntry->getIndexSearch() . ')'; |
|
| 395 | + $virtualCollectionsQueryString .= empty($virtualCollectionsQueryString) ? '('.$collectionEntry->getIndexSearch().')' : ' OR ('.$collectionEntry->getIndexSearch().')'; |
|
| 396 | 396 | } else { |
| 397 | - $collectionsQueryString .= empty($collectionsQueryString) ? '"' . $collectionEntry->getIndexName() . '"' : ' OR "' . $collectionEntry->getIndexName() . '"'; |
|
| 397 | + $collectionsQueryString .= empty($collectionsQueryString) ? '"'.$collectionEntry->getIndexName().'"' : ' OR "'.$collectionEntry->getIndexName().'"'; |
|
| 398 | 398 | } |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | // distinguish between simple collection browsing and actual searching within the collection(s) |
| 402 | 402 | if (!empty($collectionsQueryString)) { |
| 403 | 403 | if (empty($query)) { |
| 404 | - $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . ') AND toplevel:true AND partof:0)'; |
|
| 404 | + $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.') AND toplevel:true AND partof:0)'; |
|
| 405 | 405 | } else { |
| 406 | - $collectionsQueryString = '(collection_faceting:(' . $collectionsQueryString . '))'; |
|
| 406 | + $collectionsQueryString = '(collection_faceting:('.$collectionsQueryString.'))'; |
|
| 407 | 407 | } |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | // virtual collections might query documents that are neither toplevel:true nor partof:0 and need to be searched separately |
| 411 | 411 | if (!empty($virtualCollectionsQueryString)) { |
| 412 | - $virtualCollectionsQueryString = '(' . $virtualCollectionsQueryString . ')'; |
|
| 412 | + $virtualCollectionsQueryString = '('.$virtualCollectionsQueryString.')'; |
|
| 413 | 413 | } |
| 414 | 414 | |
| 415 | 415 | // combine both querystrings into a single filterquery via OR if both are given, otherwise pass either of those |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | $entryArray['doNotLinkIt'] = 0; |
| 440 | 440 | // Check if facet is already selected. |
| 441 | 441 | $queryColumn = array_column($search['params']['filterquery'], 'query'); |
| 442 | - $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn); |
|
| 442 | + $index = array_search($field.':("'.Solr::escapeQuery($value).'")', $queryColumn); |
|
| 443 | 443 | if ($index !== false) { |
| 444 | 444 | // Facet is selected, thus remove it from filter. |
| 445 | 445 | unset($queryColumn[$index]); |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | } |
| 454 | 454 | } else { |
| 455 | 455 | // Facet is not selected, thus add it to filter. |
| 456 | - $queryColumn[] = $field . ':("' . Solr::escapeQuery($value) . '")'; |
|
| 456 | + $queryColumn[] = $field.':("'.Solr::escapeQuery($value).'")'; |
|
| 457 | 457 | $entryArray['ITEM_STATE'] = 'NO'; |
| 458 | 458 | } |
| 459 | 459 | $entryArray['queryColumn'] = $queryColumn; |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | $metadata['video_duration'] = [$videoDuration]; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - $metadata['duration'] = $metadata['video_duration'] ?: $metadata['audio_duration'] ?: []; |
|
| 56 | + $metadata['duration'] = $metadata['video_duration'] ? : $metadata['audio_duration'] ? : []; |
|
| 57 | 57 | |
| 58 | 58 | if ($useExternalApis) { |
| 59 | 59 | // TODO? |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | return ' '; |
| 125 | 125 | } |
| 126 | - return htmlspecialchars((string) $attributes['CONTENT']) . ' '; |
|
| 126 | + return htmlspecialchars((string) $attributes['CONTENT']).' '; |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | */ |
| 138 | 138 | private function getCoordinates(\SimpleXMLElement $attributes): string |
| 139 | 139 | { |
| 140 | - return (string) $attributes['HPOS'] . ' ' . (string) $attributes['VPOS'] . ' ' . (string) $attributes['WIDTH'] . ' ' . (string) $attributes['HEIGHT']; |
|
| 140 | + return (string) $attributes['HPOS'].' '.(string) $attributes['VPOS'].' '.(string) $attributes['WIDTH'].' '.(string) $attributes['HEIGHT']; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | if (!empty($name)) { |
| 120 | 120 | $this->metadata['author'][$i] = [ |
| 121 | 121 | 'name' => $name, |
| 122 | - 'url' => 'https://orcid.org/' . $orcidId |
|
| 122 | + 'url' => 'https://orcid.org/'.$orcidId |
|
| 123 | 123 | ]; |
| 124 | 124 | } else { |
| 125 | 125 | //fallback into display form |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | // Append "valueURI" to name using Unicode unit separator. |
| 179 | 179 | if (isset($authors[$i]['valueURI'])) { |
| 180 | - $this->metadata['author'][$i] .= pack('C', 31) . (string) $authors[$i]['valueURI']; |
|
| 180 | + $this->metadata['author'][$i] .= pack('C', 31).(string) $authors[$i]['valueURI']; |
|
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | if (!empty($name)) { |
| 243 | 243 | $this->metadata['holder'][$i] = [ |
| 244 | 244 | 'name' => $name, |
| 245 | - 'url' => 'http://viaf.org/viaf/' . $viafId |
|
| 245 | + 'url' => 'http://viaf.org/viaf/'.$viafId |
|
| 246 | 246 | ]; |
| 247 | 247 | } else { |
| 248 | 248 | //fallback into display form |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | $this->getHolderFromXmlDisplayForm($holders, $i); |
| 266 | 266 | // Append "valueURI" to name using Unicode unit separator. |
| 267 | 267 | if (isset($holders[$i]['valueURI'])) { |
| 268 | - $this->metadata['holder'][$i] .= pack('C', 31) . (string) $holders[$i]['valueURI']; |
|
| 268 | + $this->metadata['holder'][$i] .= pack('C', 31).(string) $holders[$i]['valueURI']; |
|
| 269 | 269 | } |
| 270 | 270 | } |
| 271 | 271 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | public function __construct(string $viaf, RequestFactory $requestFactory) |
| 66 | 66 | { |
| 67 | 67 | $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class); |
| 68 | - $this->viafUrl = 'http://viaf.org/viaf/' . $viaf; |
|
| 68 | + $this->viafUrl = 'http://viaf.org/viaf/'.$viaf; |
|
| 69 | 69 | $this->requestFactory = $requestFactory; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | try { |
| 96 | 96 | $response = $this->requestFactory->request($url); |
| 97 | 97 | } catch (\Exception $e) { |
| 98 | - $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.'); |
|
| 98 | + $this->logger->warning('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.'); |
|
| 99 | 99 | return false; |
| 100 | 100 | } |
| 101 | 101 | return $response->getBody()->getContents(); |
@@ -110,6 +110,6 @@ discard block |
||
| 110 | 110 | **/ |
| 111 | 111 | private function getApiEndpoint(): string |
| 112 | 112 | { |
| 113 | - return $this->viafUrl . '/' . $this->endpoint; |
|
| 113 | + return $this->viafUrl.'/'.$this->endpoint; |
|
| 114 | 114 | } |
| 115 | 115 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | try { |
| 112 | 112 | $response = $this->requestFactory->request($url); |
| 113 | 113 | } catch (\Exception $e) { |
| 114 | - $this->logger->warning('Could not fetch data from URL "' . $url . '". Error: ' . $e->getMessage() . '.'); |
|
| 114 | + $this->logger->warning('Could not fetch data from URL "'.$url.'". Error: '.$e->getMessage().'.'); |
|
| 115 | 115 | return false; |
| 116 | 116 | } |
| 117 | 117 | return $response->getBody()->getContents(); |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | **/ |
| 127 | 127 | private function getApiEndpoint(): string |
| 128 | 128 | { |
| 129 | - $url = 'https://' . $this->level . '.' . self::HOSTNAME; |
|
| 130 | - $url .= '/v' . self::VERSION . '/'; |
|
| 129 | + $url = 'https://'.$this->level.'.'.self::HOSTNAME; |
|
| 130 | + $url .= '/v'.self::VERSION.'/'; |
|
| 131 | 131 | $url .= $this->orcid; |
| 132 | - $url .= '/' . $this->endpoint; |
|
| 132 | + $url .= '/'.$this->endpoint; |
|
| 133 | 133 | return $url; |
| 134 | 134 | } |
| 135 | 135 | } |
@@ -653,16 +653,16 @@ discard block |
||
| 653 | 653 | if ($resArray['format'] > 0 && !empty($resArray['xpath_sorting'])) { |
| 654 | 654 | $values = $iiifResource->jsonPath($resArray['xpath_sorting']); |
| 655 | 655 | if (is_string($values)) { |
| 656 | - $metadata[$resArray['index_name'] . '_sorting'][0] = [trim((string) $values)]; |
|
| 656 | + $metadata[$resArray['index_name'].'_sorting'][0] = [trim((string) $values)]; |
|
| 657 | 657 | } elseif ($values instanceof JSONPath && is_array($values->data()) && count($values->data()) > 1) { |
| 658 | 658 | $metadata[$resArray['index_name']] = []; |
| 659 | 659 | foreach ($values->data() as $value) { |
| 660 | - $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $value); |
|
| 660 | + $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $value); |
|
| 661 | 661 | } |
| 662 | 662 | } |
| 663 | 663 | } |
| 664 | - if (empty($metadata[$resArray['index_name'] . '_sorting'][0])) { |
|
| 665 | - $metadata[$resArray['index_name'] . '_sorting'][0] = $metadata[$resArray['index_name']][0]; |
|
| 664 | + if (empty($metadata[$resArray['index_name'].'_sorting'][0])) { |
|
| 665 | + $metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0]; |
|
| 666 | 666 | } |
| 667 | 667 | } |
| 668 | 668 | } |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | } |
| 773 | 773 | } |
| 774 | 774 | } else { |
| 775 | - $this->logger->warning('Invalid structure resource @id "' . $id . '"'); |
|
| 775 | + $this->logger->warning('Invalid structure resource @id "'.$id.'"'); |
|
| 776 | 776 | return $rawText; |
| 777 | 777 | } |
| 778 | 778 | $this->rawTextArray[$id] = $rawText; |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | return true; |
| 818 | 818 | } |
| 819 | 819 | } |
| 820 | - $this->logger->error('Could not load IIIF manifest from "' . $location . '"'); |
|
| 820 | + $this->logger->error('Could not load IIIF manifest from "'.$location.'"'); |
|
| 821 | 821 | return false; |
| 822 | 822 | } |
| 823 | 823 | |