@@ -52,12 +52,12 @@ |
||
| 52 | 52 | $(document).ready(function() { |
| 53 | 53 | AudioPlayer = new dlfAudioPlayer({ |
| 54 | 54 | audio: { |
| 55 | - mimeType: "' . $this->audio['mimetype'] . '", |
|
| 56 | - title: "' . $this->audio['label'] . '", |
|
| 57 | - url: "' . $this->audio['url'] . '" |
|
| 55 | + mimeType: "' . $this->audio['mimetype'].'", |
|
| 56 | + title: "' . $this->audio['label'].'", |
|
| 57 | + url: "' . $this->audio['url'].'" |
|
| 58 | 58 | }, |
| 59 | 59 | parentElId: "tx-dlf-audio", |
| 60 | - swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')) . 'Resources/Public/JavaScript/jPlayer/jquery.jplayer.swf" |
|
| 60 | + swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('dlf')).'Resources/Public/JavaScript/jPlayer/jquery.jplayer.swf" |
|
| 61 | 61 | }); |
| 62 | 62 | }); |
| 63 | 63 | '; |
@@ -129,7 +129,7 @@ |
||
| 129 | 129 | $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details'); |
| 130 | 130 | $givenNames = $this->raw->xpath('./personal-details:name/personal-details:given-names'); |
| 131 | 131 | $familyName = $this->raw->xpath('./personal-details:name/personal-details:family-name'); |
| 132 | - return (string) $givenNames[0] . ' ' . (string) $familyName[0]; |
|
| 132 | + return (string) $givenNames[0].' '.(string) $familyName[0]; |
|
| 133 | 133 | } else { |
| 134 | 134 | $this->logger->warning('No name found for given ORCID'); |
| 135 | 135 | return false; |
@@ -15,10 +15,10 @@ |
||
| 15 | 15 | preg_match("@.*/(?:acceptance|functional-[a-z\d]+)@", $_SERVER['REQUEST_URI'], $matches); |
| 16 | 16 | |
| 17 | 17 | if (!empty($matches)) { |
| 18 | - $root = realpath($_SERVER['DOCUMENT_ROOT'] . $matches[0]); |
|
| 18 | + $root = realpath($_SERVER['DOCUMENT_ROOT'].$matches[0]); |
|
| 19 | 19 | if ($root !== false) { |
| 20 | - putenv('TYPO3_PATH_ROOT=' . $root); |
|
| 21 | - putenv('TYPO3_PATH_APP=' . $root); |
|
| 20 | + putenv('TYPO3_PATH_ROOT='.$root); |
|
| 21 | + putenv('TYPO3_PATH_APP='.$root); |
|
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | } |
| 58 | 58 | $dmdIds = explode(' ', $id); |
| 59 | 59 | foreach ($dmdIds as $dmdId) { |
| 60 | - $recordIds = $xml->xpath('//mets:dmdSec[@ID="' . $dmdId . '"]//mods:mods/mods:recordInfo/mods:recordIdentifier'); |
|
| 60 | + $recordIds = $xml->xpath('//mets:dmdSec[@ID="'.$dmdId.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier'); |
|
| 61 | 61 | if (!empty($recordIds)) { |
| 62 | 62 | $recordId = (string) $recordIds[0]; |
| 63 | 63 | break; |
@@ -190,9 +190,9 @@ discard block |
||
| 190 | 190 | $queryBuilder->createNamedParameter('', \PDO::PARAM_STR) |
| 191 | 191 | ), |
| 192 | 192 | $queryBuilder->expr()->comparison( |
| 193 | - 'CAST(CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS DECIMAL) AS CHAR)', |
|
| 193 | + 'CAST(CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS DECIMAL) AS CHAR)', |
|
| 194 | 194 | ExpressionBuilder::NEQ, |
| 195 | - 'CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS CHAR)' |
|
| 195 | + 'CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS CHAR)' |
|
| 196 | 196 | ) |
| 197 | 197 | ) |
| 198 | 198 | ->orderBy('uid') |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | } |
| 206 | 206 | } catch (Exception $e) { |
| 207 | 207 | throw new \RuntimeException( |
| 208 | - 'Database query failed. Error was: ' . $e->getPrevious()->getMessage(), |
|
| 208 | + 'Database query failed. Error was: '.$e->getPrevious()->getMessage(), |
|
| 209 | 209 | 1511950673 |
| 210 | 210 | ); |
| 211 | 211 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class); |
| 272 | 272 | |
| 273 | 273 | $fileUid = null; |
| 274 | - $sourcePath = Environment::getPublicPath() . '/' . $fieldItem; |
|
| 274 | + $sourcePath = Environment::getPublicPath().'/'.$fieldItem; |
|
| 275 | 275 | |
| 276 | 276 | // maybe the file was already moved, so check if the original file still exists |
| 277 | 277 | if (file_exists($sourcePath)) { |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | if ($this->document) { |
| 182 | 182 | $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true); |
| 183 | 183 | } else { |
| 184 | - $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading'); |
|
| 184 | + $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$pid.'" for document loading'); |
|
| 185 | 185 | } |
| 186 | 186 | } else if (GeneralUtility::isValidUrl($requestData['id'])) { |
| 187 | 187 | |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | $this->document->setLocation($requestData['id']); |
| 201 | 201 | } else { |
| 202 | - $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading'); |
|
| 202 | + $this->logger->error('Invalid location given "'.$requestData['id'].'" for document loading'); |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |
@@ -216,11 +216,11 @@ discard block |
||
| 216 | 216 | if ($doc !== null) { |
| 217 | 217 | $this->document->setCurrentDocument($doc); |
| 218 | 218 | } else { |
| 219 | - $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"'); |
|
| 219 | + $this->logger->error('Failed to load document with record ID "'.$requestData['recordId'].'"'); |
|
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | } else { |
| 223 | - $this->logger->error('Empty UID or invalid PID "' . $pid . '" for document loading'); |
|
| 223 | + $this->logger->error('Empty UID or invalid PID "'.$pid.'" for document loading'); |
|
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | 226 | } |
@@ -145,11 +145,11 @@ discard block |
||
| 145 | 145 | if ($doc !== null) { |
| 146 | 146 | $this->document->setCurrentDocument($doc); |
| 147 | 147 | } else { |
| 148 | - $this->logger->error('Failed to load document with record ID "' . $this->requestData['recordId'] . '"'); |
|
| 148 | + $this->logger->error('Failed to load document with record ID "'.$this->requestData['recordId'].'"'); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | } else { |
| 152 | - $this->logger->error('Invalid ID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading'); |
|
| 152 | + $this->logger->error('Invalid ID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading'); |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | && !MathUtility::canBeInterpretedAsInteger($this->requestData['id']) |
| 246 | 246 | && !GeneralUtility::isValidUrl($this->requestData['id']) |
| 247 | 247 | ) { |
| 248 | - $this->logger->warning('Invalid ID or URI "' . $this->requestData['id'] . '" for document loading'); |
|
| 248 | + $this->logger->warning('Invalid ID or URI "'.$this->requestData['id'].'" for document loading'); |
|
| 249 | 249 | unset($this->requestData['id']); |
| 250 | 250 | } |
| 251 | 251 | |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $pages = []; |
| 332 | 332 | $pagesSect = []; |
| 333 | 333 | $aRange = []; |
| 334 | - $nRange = 5; // ToDo: should be made configurable |
|
| 334 | + $nRange = 5; // ToDo: should be made configurable |
|
| 335 | 335 | |
| 336 | 336 | // lower limit of the range |
| 337 | 337 | $nBottom = $currentPageNumber - $nRange; |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | |
| 347 | 347 | // check whether the first screen page is > 1, if yes then points must be added |
| 348 | 348 | if ($aRange[0] > 1) { |
| 349 | - array_push($pagesSect, ['label' => '...','startRecordNumber' => '...']); |
|
| 349 | + array_push($pagesSect, ['label' => '...', 'startRecordNumber' => '...']); |
|
| 350 | 350 | }; |
| 351 | 351 | $lastStartRecordNumberGrid = 0; // due to validity outside the loop |
| 352 | 352 | foreach (range($firstPage, $lastPage) as $i) { |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | |
| 390 | 390 | // Check if screen page is in range |
| 391 | 391 | if (in_array($i, $aRange)) { |
| 392 | - array_push($pagesSect, ['label' => $i,'startRecordNumber' => $startRecordNumber]); |
|
| 392 | + array_push($pagesSect, ['label' => $i, 'startRecordNumber' => $startRecordNumber]); |
|
| 393 | 393 | }; |
| 394 | 394 | }; |
| 395 | 395 | }; |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | if ($this->document) { |
| 452 | 452 | $doc = AbstractDocument::getInstance($this->document->getLocation(), $this->settings, true); |
| 453 | 453 | } else { |
| 454 | - $this->logger->error('Invalid UID "' . $documentId . '" or PID "' . $this->settings['storagePid'] . '" for document loading'); |
|
| 454 | + $this->logger->error('Invalid UID "'.$documentId.'" or PID "'.$this->settings['storagePid'].'" for document loading'); |
|
| 455 | 455 | } |
| 456 | 456 | |
| 457 | 457 | return $doc; |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | |
| 490 | 490 | $this->document->setLocation($documentId); |
| 491 | 491 | } else { |
| 492 | - $this->logger->error('Invalid location given "' . $documentId . '" for document loading'); |
|
| 492 | + $this->logger->error('Invalid location given "'.$documentId.'" for document loading'); |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | return $doc; |
@@ -250,10 +250,10 @@ discard block |
||
| 250 | 250 | if ($root->item(0) instanceof \DOMNode) { |
| 251 | 251 | $mets = $xml->saveXML($root->item(0)); |
| 252 | 252 | } else { |
| 253 | - $this->logger->error('No METS part found in document with location "' . $record['location'] . '"'); |
|
| 253 | + $this->logger->error('No METS part found in document with location "'.$record['location'].'"'); |
|
| 254 | 254 | } |
| 255 | 255 | } else { |
| 256 | - $this->logger->error('Could not load XML file from "' . $record['location'] . '"'); |
|
| 256 | + $this->logger->error('Could not load XML file from "'.$record['location'].'"'); |
|
| 257 | 257 | } |
| 258 | 258 | return $mets; |
| 259 | 259 | } |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | $pageSettings = $this->configurationManager->getConfiguration($this->configurationManager::CONFIGURATION_TYPE_FULL_TYPOSCRIPT); |
| 422 | 422 | $storagePid = $pageSettings["plugin."]["tx_dlf."]["persistence."]["storagePid"]; |
| 423 | 423 | if ($storagePid > 0) { |
| 424 | - $this->logger->notice('No records found with PID ' . $storagePid); |
|
| 424 | + $this->logger->notice('No records found with PID '.$storagePid); |
|
| 425 | 425 | } else { |
| 426 | 426 | $this->logger->notice('No records found'); |
| 427 | 427 | } |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | if (!empty($resArray)) { |
| 505 | 505 | // check, if all required fields are available for a given identifier |
| 506 | 506 | foreach ($details['requiredFields'] as $required) { |
| 507 | - $methodName = 'get' . GeneralUtility::underscoredToUpperCamelCase($required); |
|
| 507 | + $methodName = 'get'.GeneralUtility::underscoredToUpperCamelCase($required); |
|
| 508 | 508 | if (empty($resArray->$methodName())) { |
| 509 | 509 | // Skip metadata formats whose requirements are not met. |
| 510 | 510 | continue 2; |
@@ -610,9 +610,9 @@ discard block |
||
| 610 | 610 | $resArray = $result->fetchAssociative(); |
| 611 | 611 | if ($resArray) { |
| 612 | 612 | if ($resArray['index_query'] != "") { |
| 613 | - $solrQuery .= '(' . $resArray['index_query'] . ')'; |
|
| 613 | + $solrQuery .= '('.$resArray['index_query'].')'; |
|
| 614 | 614 | } else { |
| 615 | - $solrQuery .= 'collection:' . '"' . $resArray['index_name'] . '"'; |
|
| 615 | + $solrQuery .= 'collection:'.'"'.$resArray['index_name'].'"'; |
|
| 616 | 616 | } |
| 617 | 617 | } else { |
| 618 | 618 | $this->error = 'noSetHierarchy'; |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | } |
| 625 | 625 | // Check for required fields. |
| 626 | 626 | foreach ($this->formats[$this->parameters['metadataPrefix']]['requiredFields'] as $required) { |
| 627 | - $solrQuery .= ' NOT ' . $required . ':""'; |
|
| 627 | + $solrQuery .= ' NOT '.$required.':""'; |
|
| 628 | 628 | } |
| 629 | 629 | // toplevel="true" is always required |
| 630 | 630 | $solrQuery .= ' AND toplevel:true'; |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | return $documentSet; |
| 639 | 639 | } |
| 640 | 640 | |
| 641 | - $solrQuery .= ' AND timestamp:[' . $from . ' TO ' . $until . ']'; |
|
| 641 | + $solrQuery .= ' AND timestamp:['.$from.' TO '.$until.']'; |
|
| 642 | 642 | |
| 643 | 643 | $solr = Solr::getInstance($this->settings['solrcore']); |
| 644 | 644 | if (!$solr->ready) { |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | */ |
| 730 | 730 | private function getDate(string $dateType) |
| 731 | 731 | { |
| 732 | - return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ?: strptime($this->parameters[$dateType], '%Y-%m-%d'); |
|
| 732 | + return strptime($this->parameters[$dateType], '%Y-%m-%dT%H:%M:%SZ') ? : strptime($this->parameters[$dateType], '%Y-%m-%d'); |
|
| 733 | 733 | } |
| 734 | 734 | |
| 735 | 735 | /** |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | $date['tm_mday'], |
| 753 | 753 | $date['tm_year'] + 1900 |
| 754 | 754 | ); |
| 755 | - return date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . $end; |
|
| 755 | + return date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).$end; |
|
| 756 | 756 | } |
| 757 | 757 | |
| 758 | 758 | /** |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | $resumptionTokenInfo['cursor'] = $currentCursor; |
| 866 | 866 | $resumptionTokenInfo['completeListSize'] = $documentListSet['metadata']['completeListSize']; |
| 867 | 867 | $expireDateTime = new \DateTime(); |
| 868 | - $expireDateTime->add(new \DateInterval('PT' . $this->settings['expired'] . 'S')); |
|
| 868 | + $expireDateTime->add(new \DateInterval('PT'.$this->settings['expired'].'S')); |
|
| 869 | 869 | $resumptionTokenInfo['expired'] = $expireDateTime; |
| 870 | 870 | |
| 871 | 871 | $omitResumptionToken = $currentCursor === 0 && $numShownDocuments >= $documentListSet['metadata']['completeListSize']; |
@@ -104,7 +104,7 @@ |
||
| 104 | 104 | $pageOptions = []; |
| 105 | 105 | for ($i = 1; $i <= $this->document->getCurrentDocument()->numPages; $i++) { |
| 106 | 106 | $orderLabel = $this->document->getCurrentDocument()->physicalStructureInfo[$this->document->getCurrentDocument()->physicalStructure[$i]]['orderlabel']; |
| 107 | - $pageOptions[$i] = '[' . $i . ']' . ($orderLabel ? ' - ' . htmlspecialchars($orderLabel) : ''); |
|
| 107 | + $pageOptions[$i] = '['.$i.']'.($orderLabel ? ' - '.htmlspecialchars($orderLabel) : ''); |
|
| 108 | 108 | } |
| 109 | 109 | $this->view->assign('pageOptions', $pageOptions); |
| 110 | 110 | |