We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | if (!$this->doc->ready) { |
161 | 161 | // Destroy the incomplete object. |
162 | 162 | $this->doc = NULL; |
163 | - Helper::devLog('Failed to load document with UID ' . $this->piVars['id'], DEVLOG_SEVERITY_WARNING); |
|
163 | + Helper::devLog('Failed to load document with UID '.$this->piVars['id'], DEVLOG_SEVERITY_WARNING); |
|
164 | 164 | } |
165 | 165 | } elseif (!empty($this->piVars['recordId'])) { |
166 | 166 | /** @var QueryBuilder $queryBuilder */ |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | // Try to load document. |
188 | 188 | $this->loadDocument(); |
189 | 189 | } else { |
190 | - Helper::devLog('Failed to load document with record ID "' . $this->piVars['recordId'] . '"', DEVLOG_SEVERITY_WARNING); |
|
190 | + Helper::devLog('Failed to load document with record ID "'.$this->piVars['recordId'].'"', DEVLOG_SEVERITY_WARNING); |
|
191 | 191 | } |
192 | 192 | } |
193 | 193 | } |
@@ -25,8 +25,7 @@ discard block |
||
25 | 25 | * @subpackage dlf |
26 | 26 | * @access public |
27 | 27 | */ |
28 | -class DocumentTypeCheck |
|
29 | -{ |
|
28 | +class DocumentTypeCheck { |
|
30 | 29 | /** |
31 | 30 | * This holds the current document |
32 | 31 | * |
@@ -67,8 +66,7 @@ discard block |
||
67 | 66 | * |
68 | 67 | * @return string The type of the current document |
69 | 68 | */ |
70 | - public function getDocType() |
|
71 | - { |
|
69 | + public function getDocType() { |
|
72 | 70 | // Load current document. |
73 | 71 | $this->loadDocument(); |
74 | 72 | if ($this->doc === NULL) { |
@@ -151,8 +149,7 @@ discard block |
||
151 | 149 | * |
152 | 150 | * @return void |
153 | 151 | */ |
154 | - protected function loadDocument() |
|
155 | - { |
|
152 | + protected function loadDocument() { |
|
156 | 153 | // Check for required variable. |
157 | 154 | if (!empty($this->piVars['id'])) { |
158 | 155 | // Get instance of \Kitodo\Dlf\Common\Document. |
@@ -199,8 +196,7 @@ discard block |
||
199 | 196 | * |
200 | 197 | * @return void |
201 | 198 | */ |
202 | - public function __construct() |
|
203 | - { |
|
199 | + public function __construct() { |
|
204 | 200 | // Load current plugin parameters. |
205 | 201 | $this->piVars = GeneralUtility::_GPmerged($this->prefixId); |
206 | 202 | } |
@@ -21,8 +21,7 @@ |
||
21 | 21 | * @access public |
22 | 22 | * @abstract |
23 | 23 | */ |
24 | -interface MetadataInterface |
|
25 | -{ |
|
24 | +interface MetadataInterface { |
|
26 | 25 | /** |
27 | 26 | * This extracts metadata from XML |
28 | 27 | * |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | // Get the root element's name as text format. |
650 | 650 | $textFormat = strtoupper($rawTextXml->getName()); |
651 | 651 | } else { |
652 | - Helper::devLog('Invalid structure node @ID "' . $id . '"', DEVLOG_SEVERITY_WARNING); |
|
652 | + Helper::devLog('Invalid structure node @ID "'.$id.'"', DEVLOG_SEVERITY_WARNING); |
|
653 | 653 | return $rawText; |
654 | 654 | } |
655 | 655 | // Is this text format supported? |
@@ -664,11 +664,11 @@ discard block |
||
664 | 664 | $rawText = $obj->getRawText($rawTextXml); |
665 | 665 | $this->rawTextArray[$id] = $rawText; |
666 | 666 | } else { |
667 | - Helper::devLog('Invalid class/method "' . $class . '->getRawText()" for text format "' . $textFormat . '"', DEVLOG_SEVERITY_WARNING); |
|
667 | + Helper::devLog('Invalid class/method "'.$class.'->getRawText()" for text format "'.$textFormat.'"', DEVLOG_SEVERITY_WARNING); |
|
668 | 668 | } |
669 | 669 | } |
670 | 670 | } else { |
671 | - Helper::devLog('Unsupported text format "' . $textFormat . '" in physical node with @ID "' . $id . '"', DEVLOG_SEVERITY_WARNING); |
|
671 | + Helper::devLog('Unsupported text format "'.$textFormat.'" in physical node with @ID "'.$id.'"', DEVLOG_SEVERITY_WARNING); |
|
672 | 672 | } |
673 | 673 | return $rawText; |
674 | 674 | } |
@@ -722,10 +722,10 @@ discard block |
||
722 | 722 | $title = self::getTitle($partof, TRUE); |
723 | 723 | } |
724 | 724 | } else { |
725 | - Helper::devLog('No document with UID ' . $uid . ' found or document not accessible', DEVLOG_SEVERITY_WARNING); |
|
725 | + Helper::devLog('No document with UID '.$uid.' found or document not accessible', DEVLOG_SEVERITY_WARNING); |
|
726 | 726 | } |
727 | 727 | } else { |
728 | - Helper::devLog('Invalid UID ' . $uid . ' for document', DEVLOG_SEVERITY_ERROR); |
|
728 | + Helper::devLog('Invalid UID '.$uid.' for document', DEVLOG_SEVERITY_ERROR); |
|
729 | 729 | } |
730 | 730 | return $title; |
731 | 731 | } |
@@ -858,7 +858,7 @@ discard block |
||
858 | 858 | // the actual loading is format specific |
859 | 859 | return $this->loadLocation($location); |
860 | 860 | } else { |
861 | - Helper::devLog('Invalid file location "' . $location . '" for document loading', DEVLOG_SEVERITY_ERROR); |
|
861 | + Helper::devLog('Invalid file location "'.$location.'" for document loading', DEVLOG_SEVERITY_ERROR); |
|
862 | 862 | } |
863 | 863 | return FALSE; |
864 | 864 | } |
@@ -969,7 +969,7 @@ discard block |
||
969 | 969 | // Retain current PID. |
970 | 970 | $pid = $this->pid; |
971 | 971 | } elseif (!$pid) { |
972 | - Helper::devLog('Invalid PID ' . $pid . ' for document saving', DEVLOG_SEVERITY_ERROR); |
|
972 | + Helper::devLog('Invalid PID '.$pid.' for document saving', DEVLOG_SEVERITY_ERROR); |
|
973 | 973 | return FALSE; |
974 | 974 | } |
975 | 975 | // Set PID for metadata definitions. |
@@ -1007,7 +1007,7 @@ discard block |
||
1007 | 1007 | if ($resArray = $result->fetch()) { |
1008 | 1008 | $structure = $resArray['uid']; |
1009 | 1009 | } else { |
1010 | - Helper::devLog('Could not identify document/structure type "' . $queryBuilder->expr()->literal($metadata['type'][0]) . '"', DEVLOG_SEVERITY_ERROR); |
|
1010 | + Helper::devLog('Could not identify document/structure type "'.$queryBuilder->expr()->literal($metadata['type'][0]).'"', DEVLOG_SEVERITY_ERROR); |
|
1011 | 1011 | return FALSE; |
1012 | 1012 | } |
1013 | 1013 | $metadata['type'][0] = $structure; |
@@ -1244,7 +1244,7 @@ discard block |
||
1244 | 1244 | if ($core) { |
1245 | 1245 | Indexer::add($this, $core); |
1246 | 1246 | } else { |
1247 | - Helper::devLog('Invalid UID "' . $core . '" for Solr core', DEVLOG_SEVERITY_NOTICE); |
|
1247 | + Helper::devLog('Invalid UID "'.$core.'" for Solr core', DEVLOG_SEVERITY_NOTICE); |
|
1248 | 1248 | } |
1249 | 1249 | return TRUE; |
1250 | 1250 | } |
@@ -1310,7 +1310,7 @@ discard block |
||
1310 | 1310 | // Set metadata definitions' PID. |
1311 | 1311 | $cPid = ($this->cPid ? $this->cPid : $this->pid); |
1312 | 1312 | if (!$cPid) { |
1313 | - Helper::devLog('Invalid PID ' . $cPid . ' for metadata definitions', DEVLOG_SEVERITY_ERROR); |
|
1313 | + Helper::devLog('Invalid PID '.$cPid.' for metadata definitions', DEVLOG_SEVERITY_ERROR); |
|
1314 | 1314 | return []; |
1315 | 1315 | } |
1316 | 1316 | if ( |
@@ -1638,7 +1638,7 @@ discard block |
||
1638 | 1638 | // Document ready! |
1639 | 1639 | $this->ready = TRUE; |
1640 | 1640 | } else { |
1641 | - Helper::devLog('No document with UID ' . $uid . ' found or document not accessible', DEVLOG_SEVERITY_ERROR); |
|
1641 | + Helper::devLog('No document with UID '.$uid.' found or document not accessible', DEVLOG_SEVERITY_ERROR); |
|
1642 | 1642 | } |
1643 | 1643 | } |
1644 | 1644 | |
@@ -1653,12 +1653,12 @@ discard block |
||
1653 | 1653 | */ |
1654 | 1654 | public function __get($var) |
1655 | 1655 | { |
1656 | - $method = '_get' . ucfirst($var); |
|
1656 | + $method = '_get'.ucfirst($var); |
|
1657 | 1657 | if ( |
1658 | 1658 | !property_exists($this, $var) |
1659 | 1659 | || !method_exists($this, $method) |
1660 | 1660 | ) { |
1661 | - Helper::devLog('There is no getter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING); |
|
1661 | + Helper::devLog('There is no getter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING); |
|
1662 | 1662 | return; |
1663 | 1663 | } else { |
1664 | 1664 | return $this->$method(); |
@@ -1677,12 +1677,12 @@ discard block |
||
1677 | 1677 | */ |
1678 | 1678 | public function __set($var, $value) |
1679 | 1679 | { |
1680 | - $method = '_set' . ucfirst($var); |
|
1680 | + $method = '_set'.ucfirst($var); |
|
1681 | 1681 | if ( |
1682 | 1682 | !property_exists($this, $var) |
1683 | 1683 | || !method_exists($this, $method) |
1684 | 1684 | ) { |
1685 | - Helper::devLog('There is no setter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING); |
|
1685 | + Helper::devLog('There is no setter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING); |
|
1686 | 1686 | } else { |
1687 | 1687 | $this->$method($value); |
1688 | 1688 | } |
@@ -29,8 +29,7 @@ discard block |
||
29 | 29 | * @access public |
30 | 30 | * @abstract |
31 | 31 | */ |
32 | -abstract class Document |
|
33 | -{ |
|
32 | +abstract class Document { |
|
34 | 33 | /** |
35 | 34 | * This holds the PID for the configuration |
36 | 35 | * |
@@ -305,8 +304,7 @@ discard block |
||
305 | 304 | * |
306 | 305 | * @return void |
307 | 306 | */ |
308 | - public static function clearRegistry() |
|
309 | - { |
|
307 | + public static function clearRegistry() { |
|
310 | 308 | // Reset registry array. |
311 | 309 | self::$registry = []; |
312 | 310 | } |
@@ -576,8 +574,7 @@ discard block |
||
576 | 574 | * |
577 | 575 | * @return integer The physical page number |
578 | 576 | */ |
579 | - public function getPhysicalPage($logicalPage) |
|
580 | - { |
|
577 | + public function getPhysicalPage($logicalPage) { |
|
581 | 578 | if ( |
582 | 579 | !empty($this->lastSearchedPhysicalPage['logicalPage']) |
583 | 580 | && $this->lastSearchedPhysicalPage['logicalPage'] == $logicalPage |
@@ -624,8 +621,7 @@ discard block |
||
624 | 621 | * |
625 | 622 | * @return string The physical structure node's / IIIF resource's raw text from XML |
626 | 623 | */ |
627 | - protected function getRawTextFromXml($id) |
|
628 | - { |
|
624 | + protected function getRawTextFromXml($id) { |
|
629 | 625 | $rawText = ''; |
630 | 626 | // Load available text formats, ... |
631 | 627 | $this->loadFormats(); |
@@ -685,8 +681,7 @@ discard block |
||
685 | 681 | * |
686 | 682 | * @return string The title of the document itself or a parent document |
687 | 683 | */ |
688 | - public static function getTitle($uid, $recursive = FALSE) |
|
689 | - { |
|
684 | + public static function getTitle($uid, $recursive = FALSE) { |
|
690 | 685 | $title = ''; |
691 | 686 | // Sanitize input. |
692 | 687 | $uid = max(intval($uid), 0); |
@@ -739,8 +734,7 @@ discard block |
||
739 | 734 | * |
740 | 735 | * @return array The logical structure node's / resource's parsed metadata array |
741 | 736 | */ |
742 | - public function getTitledata($cPid = 0) |
|
743 | - { |
|
737 | + public function getTitledata($cPid = 0) { |
|
744 | 738 | $titledata = $this->getMetadata($this->_getToplevelId(), $cPid); |
745 | 739 | // Add information from METS structural map to titledata array. |
746 | 740 | if ($this instanceof MetsDocument) { |
@@ -773,8 +767,7 @@ discard block |
||
773 | 767 | * @return integer|boolean: FALSE if structure with $logId is not a child of this substructure, |
774 | 768 | * or the actual depth. |
775 | 769 | */ |
776 | - protected function getTreeDepth($structure, $depth, $logId) |
|
777 | - { |
|
770 | + protected function getTreeDepth($structure, $depth, $logId) { |
|
778 | 771 | foreach ($structure as $element) { |
779 | 772 | if ($element['id'] == $logId) { |
780 | 773 | return $depth; |
@@ -796,8 +789,7 @@ discard block |
||
796 | 789 | * @param string $logId: The id of the logical structure element whose depth is requested |
797 | 790 | * @return number|boolean tree depth as integer or FALSE if no element with $logId exists within the TOC. |
798 | 791 | */ |
799 | - public function getStructureDepth($logId) |
|
800 | - { |
|
792 | + public function getStructureDepth($logId) { |
|
801 | 793 | return $this->getTreeDepth($this->_getTableOfContents(), 1, $logId); |
802 | 794 | } |
803 | 795 | |
@@ -845,8 +837,7 @@ discard block |
||
845 | 837 | * |
846 | 838 | * @return boolean TRUE on success or FALSE on failure |
847 | 839 | */ |
848 | - protected function load($location) |
|
849 | - { |
|
840 | + protected function load($location) { |
|
850 | 841 | // Load XML / JSON-LD file. |
851 | 842 | if (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($location)) { |
852 | 843 | // Load extension configuration |
@@ -879,8 +870,7 @@ discard block |
||
879 | 870 | * |
880 | 871 | * @return void |
881 | 872 | */ |
882 | - protected function loadFormats() |
|
883 | - { |
|
873 | + protected function loadFormats() { |
|
884 | 874 | if (!$this->formatsLoaded) { |
885 | 875 | /** @var QueryBuilder $queryBuilder */ |
886 | 876 | $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) |
@@ -922,8 +912,7 @@ discard block |
||
922 | 912 | * |
923 | 913 | * @return void |
924 | 914 | */ |
925 | - public function registerNamespaces(&$obj) |
|
926 | - { |
|
915 | + public function registerNamespaces(&$obj) { |
|
927 | 916 | // TODO Check usage. XML specific method does not seem to be used anywhere outside this class within the project, but it is public and may be used by extensions. |
928 | 917 | $this->loadFormats(); |
929 | 918 | // Do we have a \SimpleXMLElement or \DOMXPath object? |
@@ -951,8 +940,7 @@ discard block |
||
951 | 940 | * |
952 | 941 | * @return boolean TRUE on success or FALSE on failure |
953 | 942 | */ |
954 | - public function save($pid = 0, $core = 0) |
|
955 | - { |
|
943 | + public function save($pid = 0, $core = 0) { |
|
956 | 944 | if (TYPO3_MODE !== 'BE') { |
957 | 945 | Helper::devLog('Saving a document is only allowed in the backend', DEVLOG_SEVERITY_ERROR); |
958 | 946 | return FALSE; |
@@ -1269,8 +1257,7 @@ discard block |
||
1269 | 1257 | * |
1270 | 1258 | * @return boolean Are there any fulltext files available? |
1271 | 1259 | */ |
1272 | - protected function _getHasFulltext() |
|
1273 | - { |
|
1260 | + protected function _getHasFulltext() { |
|
1274 | 1261 | $this->ensureHasFulltextIsSet(); |
1275 | 1262 | return $this->hasFulltext; |
1276 | 1263 | } |
@@ -1282,8 +1269,7 @@ discard block |
||
1282 | 1269 | * |
1283 | 1270 | * @return string The location of the document |
1284 | 1271 | */ |
1285 | - protected function _getLocation() |
|
1286 | - { |
|
1272 | + protected function _getLocation() { |
|
1287 | 1273 | return $this->location; |
1288 | 1274 | } |
1289 | 1275 | |
@@ -1305,8 +1291,7 @@ discard block |
||
1305 | 1291 | * |
1306 | 1292 | * @return array Array of metadata with their corresponding logical structure node ID as key |
1307 | 1293 | */ |
1308 | - protected function _getMetadataArray() |
|
1309 | - { |
|
1294 | + protected function _getMetadataArray() { |
|
1310 | 1295 | // Set metadata definitions' PID. |
1311 | 1296 | $cPid = ($this->cPid ? $this->cPid : $this->pid); |
1312 | 1297 | if (!$cPid) { |
@@ -1331,8 +1316,7 @@ discard block |
||
1331 | 1316 | * |
1332 | 1317 | * @return integer The total number of pages and/or tracks |
1333 | 1318 | */ |
1334 | - protected function _getNumPages() |
|
1335 | - { |
|
1319 | + protected function _getNumPages() { |
|
1336 | 1320 | $this->_getPhysicalStructure(); |
1337 | 1321 | return $this->numPages; |
1338 | 1322 | } |
@@ -1344,8 +1328,7 @@ discard block |
||
1344 | 1328 | * |
1345 | 1329 | * @return integer The UID of the parent document or zero if not applicable |
1346 | 1330 | */ |
1347 | - protected function _getParentId() |
|
1348 | - { |
|
1331 | + protected function _getParentId() { |
|
1349 | 1332 | return $this->parentId; |
1350 | 1333 | } |
1351 | 1334 | |
@@ -1368,8 +1351,7 @@ discard block |
||
1368 | 1351 | * |
1369 | 1352 | * @return array Array of elements' type, label and file representations ordered by @ID attribute / Canvas order |
1370 | 1353 | */ |
1371 | - protected function _getPhysicalStructureInfo() |
|
1372 | - { |
|
1354 | + protected function _getPhysicalStructureInfo() { |
|
1373 | 1355 | // Is there no physical structure array yet? |
1374 | 1356 | if (!$this->physicalStructureLoaded) { |
1375 | 1357 | // Build physical structure array. |
@@ -1385,8 +1367,7 @@ discard block |
||
1385 | 1367 | * |
1386 | 1368 | * @return integer The PID of the document or zero if not in database |
1387 | 1369 | */ |
1388 | - protected function _getPid() |
|
1389 | - { |
|
1370 | + protected function _getPid() { |
|
1390 | 1371 | return $this->pid; |
1391 | 1372 | } |
1392 | 1373 | |
@@ -1397,8 +1378,7 @@ discard block |
||
1397 | 1378 | * |
1398 | 1379 | * @return boolean Is the document instantiated successfully? |
1399 | 1380 | */ |
1400 | - protected function _getReady() |
|
1401 | - { |
|
1381 | + protected function _getReady() { |
|
1402 | 1382 | return $this->ready; |
1403 | 1383 | } |
1404 | 1384 | |
@@ -1409,8 +1389,7 @@ discard block |
||
1409 | 1389 | * |
1410 | 1390 | * @return mixed The METS file's / IIIF manifest's record identifier |
1411 | 1391 | */ |
1412 | - protected function _getRecordId() |
|
1413 | - { |
|
1392 | + protected function _getRecordId() { |
|
1414 | 1393 | return $this->recordId; |
1415 | 1394 | } |
1416 | 1395 | |
@@ -1421,8 +1400,7 @@ discard block |
||
1421 | 1400 | * |
1422 | 1401 | * @return integer The UID of the root document or zero if not applicable |
1423 | 1402 | */ |
1424 | - protected function _getRootId() |
|
1425 | - { |
|
1403 | + protected function _getRootId() { |
|
1426 | 1404 | if (!$this->rootIdLoaded) { |
1427 | 1405 | if ($this->parentId) { |
1428 | 1406 | $parent = self::getInstance($this->parentId, $this->pid); |
@@ -1452,8 +1430,7 @@ discard block |
||
1452 | 1430 | * |
1453 | 1431 | * @return array Array of structure nodes' id, label, type and physical page indexes/mptr / Canvas link with original hierarchy preserved |
1454 | 1432 | */ |
1455 | - protected function _getTableOfContents() |
|
1456 | - { |
|
1433 | + protected function _getTableOfContents() { |
|
1457 | 1434 | // Is there no logical structure array yet? |
1458 | 1435 | if (!$this->tableOfContentsLoaded) { |
1459 | 1436 | // Get all logical structures. |
@@ -1494,8 +1471,7 @@ discard block |
||
1494 | 1471 | * |
1495 | 1472 | * @return mixed The UID or the URL of the document |
1496 | 1473 | */ |
1497 | - protected function _getUid() |
|
1498 | - { |
|
1474 | + protected function _getUid() { |
|
1499 | 1475 | return $this->uid; |
1500 | 1476 | } |
1501 | 1477 | |
@@ -1508,8 +1484,7 @@ discard block |
||
1508 | 1484 | * |
1509 | 1485 | * @return void |
1510 | 1486 | */ |
1511 | - protected function _setCPid($value) |
|
1512 | - { |
|
1487 | + protected function _setCPid($value) { |
|
1513 | 1488 | $this->cPid = max(intval($value), 0); |
1514 | 1489 | } |
1515 | 1490 | |
@@ -1537,8 +1512,7 @@ discard block |
||
1537 | 1512 | * |
1538 | 1513 | * @return void |
1539 | 1514 | */ |
1540 | - protected function __construct($uid, $pid, $preloadedDocument) |
|
1541 | - { |
|
1515 | + protected function __construct($uid, $pid, $preloadedDocument) { |
|
1542 | 1516 | /** @var QueryBuilder $queryBuilder */ |
1543 | 1517 | $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) |
1544 | 1518 | ->getQueryBuilderForTable('tx_dlf_documents'); |
@@ -1651,8 +1625,7 @@ discard block |
||
1651 | 1625 | * |
1652 | 1626 | * @return mixed Value of $this->$var |
1653 | 1627 | */ |
1654 | - public function __get($var) |
|
1655 | - { |
|
1628 | + public function __get($var) { |
|
1656 | 1629 | $method = '_get' . ucfirst($var); |
1657 | 1630 | if ( |
1658 | 1631 | !property_exists($this, $var) |
@@ -1675,8 +1648,7 @@ discard block |
||
1675 | 1648 | * |
1676 | 1649 | * @return void |
1677 | 1650 | */ |
1678 | - public function __set($var, $value) |
|
1679 | - { |
|
1651 | + public function __set($var, $value) { |
|
1680 | 1652 | $method = '_set' . ucfirst($var); |
1681 | 1653 | if ( |
1682 | 1654 | !property_exists($this, $var) |
@@ -21,8 +21,7 @@ |
||
21 | 21 | * @access public |
22 | 22 | * @abstract |
23 | 23 | */ |
24 | -interface FulltextInterface |
|
25 | -{ |
|
24 | +interface FulltextInterface { |
|
26 | 25 | /** |
27 | 26 | * This extracts raw fulltext data from XML |
28 | 27 | * |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | if ($this->valid()) { |
133 | 133 | return $this->getRecord($this->elements[$this->position]); |
134 | 134 | } else { |
135 | - Helper::devLog('Invalid position "' . $this->position . '" for list element', DEVLOG_SEVERITY_NOTICE); |
|
135 | + Helper::devLog('Invalid position "'.$this->position.'" for list element', DEVLOG_SEVERITY_NOTICE); |
|
136 | 136 | return; |
137 | 137 | } |
138 | 138 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | // Restrict the fields to the required ones |
238 | 238 | $params['fields'] = 'uid,id,toplevel,thumbnail,page'; |
239 | 239 | foreach ($this->solrConfig as $solr_name) { |
240 | - $params['fields'] .= ',' . $solr_name; |
|
240 | + $params['fields'] .= ','.$solr_name; |
|
241 | 241 | } |
242 | 242 | // If it is a fulltext search, enable highlighting. |
243 | 243 | if ($this->metadata['fulltextSearch']) { |
@@ -259,15 +259,15 @@ discard block |
||
259 | 259 | // Extend filter query to get all documents with the same UID. |
260 | 260 | foreach ($params['filterquery'] as $key => $value) { |
261 | 261 | if (isset($value['query'])) { |
262 | - $params['filterquery'][$key]['query'] = $value['query'] . ' OR toplevel:true'; |
|
262 | + $params['filterquery'][$key]['query'] = $value['query'].' OR toplevel:true'; |
|
263 | 263 | } |
264 | 264 | } |
265 | 265 | // Add filter query to get all documents with the required uid. |
266 | - $params['filterquery'][] = ['query' => 'uid:' . Solr::escapeQuery($record['uid'])]; |
|
266 | + $params['filterquery'][] = ['query' => 'uid:'.Solr::escapeQuery($record['uid'])]; |
|
267 | 267 | // Add sorting. |
268 | 268 | $params['sort'] = $this->metadata['options']['params']['sort']; |
269 | 269 | // Set query. |
270 | - $params['query'] = $this->metadata['options']['select'] . ' OR toplevel:true'; |
|
270 | + $params['query'] = $this->metadata['options']['select'].' OR toplevel:true'; |
|
271 | 271 | // Perform search for all documents with the same uid that either fit to the search or marked as toplevel. |
272 | 272 | $selectQuery = $this->solr->service->createSelect($params); |
273 | 273 | $result = $this->solr->service->select($selectQuery); |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | $position < 0 |
343 | 343 | || $position >= $this->count |
344 | 344 | ) { |
345 | - Helper::devLog('Invalid position "' . $position . '" for element moving', DEVLOG_SEVERITY_WARNING); |
|
345 | + Helper::devLog('Invalid position "'.$position.'" for element moving', DEVLOG_SEVERITY_WARNING); |
|
346 | 346 | return; |
347 | 347 | } |
348 | 348 | $steps = intval($steps); |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | if (($position + $steps) < 0 |
351 | 351 | || ($position + $steps) >= $this->count |
352 | 352 | ) { |
353 | - Helper::devLog('Invalid steps "' . $steps . '" for moving element at position "' . $position . '"', DEVLOG_SEVERITY_WARNING); |
|
353 | + Helper::devLog('Invalid steps "'.$steps.'" for moving element at position "'.$position.'"', DEVLOG_SEVERITY_WARNING); |
|
354 | 354 | return; |
355 | 355 | } |
356 | 356 | $element = $this->remove($position); |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | if ($this->offsetExists($offset)) { |
429 | 429 | return $this->getRecord($this->elements[$offset]); |
430 | 430 | } else { |
431 | - Helper::devLog('Invalid offset "' . $offset . '" for list element', DEVLOG_SEVERITY_NOTICE); |
|
431 | + Helper::devLog('Invalid offset "'.$offset.'" for list element', DEVLOG_SEVERITY_NOTICE); |
|
432 | 432 | return; |
433 | 433 | } |
434 | 434 | } |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | $position < 0 |
473 | 473 | || $position >= $this->count |
474 | 474 | ) { |
475 | - Helper::devLog('Invalid position "' . $position . '" for element removing', DEVLOG_SEVERITY_WARNING); |
|
475 | + Helper::devLog('Invalid position "'.$position.'" for element removing', DEVLOG_SEVERITY_WARNING); |
|
476 | 476 | return; |
477 | 477 | } |
478 | 478 | $removed = array_splice($this->elements, $position, 1); |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | $position < 0 |
498 | 498 | || $position >= $this->count |
499 | 499 | ) { |
500 | - Helper::devLog('Invalid position "' . $position . '" for element removing', DEVLOG_SEVERITY_WARNING); |
|
500 | + Helper::devLog('Invalid position "'.$position.'" for element removing', DEVLOG_SEVERITY_WARNING); |
|
501 | 501 | return; |
502 | 502 | } |
503 | 503 | $removed = array_splice($this->elements, $position, $length); |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | ->execute(); |
589 | 589 | |
590 | 590 | while ($resArray = $result->fetch()) { |
591 | - $this->solrConfig[$resArray['index_name']] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . 's' . ($resArray['index_indexed'] ? 'i' : 'u'); |
|
591 | + $this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['index_indexed'] ? 'i' : 'u'); |
|
592 | 592 | } |
593 | 593 | // Add static fields. |
594 | 594 | $this->solrConfig['type'] = 'type'; |
@@ -616,7 +616,7 @@ discard block |
||
616 | 616 | foreach ($this->elements as $num => $element) { |
617 | 617 | // Is this element sortable? |
618 | 618 | if (!empty($element['s'][$by])) { |
619 | - $newOrder[$element['s'][$by] . str_pad($num, 6, '0', STR_PAD_LEFT)] = $element; |
|
619 | + $newOrder[$element['s'][$by].str_pad($num, 6, '0', STR_PAD_LEFT)] = $element; |
|
620 | 620 | } else { |
621 | 621 | $nonSortable[] = $element; |
622 | 622 | } |
@@ -752,12 +752,12 @@ discard block |
||
752 | 752 | */ |
753 | 753 | public function __get($var) |
754 | 754 | { |
755 | - $method = '_get' . ucfirst($var); |
|
755 | + $method = '_get'.ucfirst($var); |
|
756 | 756 | if ( |
757 | 757 | !property_exists($this, $var) |
758 | 758 | || !method_exists($this, $method) |
759 | 759 | ) { |
760 | - Helper::devLog('There is no getter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING); |
|
760 | + Helper::devLog('There is no getter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING); |
|
761 | 761 | return; |
762 | 762 | } else { |
763 | 763 | return $this->$method(); |
@@ -776,12 +776,12 @@ discard block |
||
776 | 776 | */ |
777 | 777 | public function __set($var, $value) |
778 | 778 | { |
779 | - $method = '_set' . ucfirst($var); |
|
779 | + $method = '_set'.ucfirst($var); |
|
780 | 780 | if ( |
781 | 781 | !property_exists($this, $var) |
782 | 782 | || !method_exists($this, $method) |
783 | 783 | ) { |
784 | - Helper::devLog('There is no setter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING); |
|
784 | + Helper::devLog('There is no setter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING); |
|
785 | 785 | } else { |
786 | 786 | $this->$method($value); |
787 | 787 | } |
@@ -97,8 +97,7 @@ discard block |
||
97 | 97 | * |
98 | 98 | * @return void |
99 | 99 | */ |
100 | - public function add(array $elements, $position = -1) |
|
101 | - { |
|
100 | + public function add(array $elements, $position = -1) { |
|
102 | 101 | $position = MathUtility::forceIntegerInRange($position, 0, $this->count, $this->count); |
103 | 102 | if (!empty($elements)) { |
104 | 103 | array_splice($this->elements, $position, 0, $elements); |
@@ -114,8 +113,7 @@ discard block |
||
114 | 113 | * |
115 | 114 | * @return integer The number of elements in the list |
116 | 115 | */ |
117 | - public function count() |
|
118 | - { |
|
116 | + public function count() { |
|
119 | 117 | return $this->count; |
120 | 118 | } |
121 | 119 | |
@@ -127,8 +125,7 @@ discard block |
||
127 | 125 | * |
128 | 126 | * @return array The current element |
129 | 127 | */ |
130 | - public function current() |
|
131 | - { |
|
128 | + public function current() { |
|
132 | 129 | if ($this->valid()) { |
133 | 130 | return $this->getRecord($this->elements[$this->position]); |
134 | 131 | } else { |
@@ -146,8 +143,7 @@ discard block |
||
146 | 143 | * |
147 | 144 | * @return mixed The element's full record |
148 | 145 | */ |
149 | - protected function getRecord($element) |
|
150 | - { |
|
146 | + protected function getRecord($element) { |
|
151 | 147 | if ( |
152 | 148 | is_array($element) |
153 | 149 | && array_keys($element) == ['u', 'h', 's', 'p'] |
@@ -319,8 +315,7 @@ discard block |
||
319 | 315 | * |
320 | 316 | * @return integer The current position |
321 | 317 | */ |
322 | - public function key() |
|
323 | - { |
|
318 | + public function key() { |
|
324 | 319 | return $this->position; |
325 | 320 | } |
326 | 321 | |
@@ -334,8 +329,7 @@ discard block |
||
334 | 329 | * |
335 | 330 | * @return void |
336 | 331 | */ |
337 | - public function move($position, $steps) |
|
338 | - { |
|
332 | + public function move($position, $steps) { |
|
339 | 333 | $position = intval($position); |
340 | 334 | // Check if list position is valid. |
341 | 335 | if ( |
@@ -366,8 +360,7 @@ discard block |
||
366 | 360 | * |
367 | 361 | * @return void |
368 | 362 | */ |
369 | - public function moveUp($position) |
|
370 | - { |
|
363 | + public function moveUp($position) { |
|
371 | 364 | $this->move($position, -1); |
372 | 365 | } |
373 | 366 | |
@@ -380,8 +373,7 @@ discard block |
||
380 | 373 | * |
381 | 374 | * @return void |
382 | 375 | */ |
383 | - public function moveDown($position) |
|
384 | - { |
|
376 | + public function moveDown($position) { |
|
385 | 377 | $this->move($position, 1); |
386 | 378 | } |
387 | 379 | |
@@ -393,8 +385,7 @@ discard block |
||
393 | 385 | * |
394 | 386 | * @return void |
395 | 387 | */ |
396 | - public function next() |
|
397 | - { |
|
388 | + public function next() { |
|
398 | 389 | $this->position++; |
399 | 390 | } |
400 | 391 | |
@@ -408,8 +399,7 @@ discard block |
||
408 | 399 | * |
409 | 400 | * @return boolean Does the given offset exist? |
410 | 401 | */ |
411 | - public function offsetExists($offset) |
|
412 | - { |
|
402 | + public function offsetExists($offset) { |
|
413 | 403 | return isset($this->elements[$offset]); |
414 | 404 | } |
415 | 405 | |
@@ -423,8 +413,7 @@ discard block |
||
423 | 413 | * |
424 | 414 | * @return array The element at the given offset |
425 | 415 | */ |
426 | - public function offsetGet($offset) |
|
427 | - { |
|
416 | + public function offsetGet($offset) { |
|
428 | 417 | if ($this->offsetExists($offset)) { |
429 | 418 | return $this->getRecord($this->elements[$offset]); |
430 | 419 | } else { |
@@ -444,8 +433,7 @@ discard block |
||
444 | 433 | * |
445 | 434 | * @return void |
446 | 435 | */ |
447 | - public function offsetSet($offset, $value) |
|
448 | - { |
|
436 | + public function offsetSet($offset, $value) { |
|
449 | 437 | if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($offset)) { |
450 | 438 | $this->elements[$offset] = $value; |
451 | 439 | } else { |
@@ -465,8 +453,7 @@ discard block |
||
465 | 453 | * |
466 | 454 | * @return array The removed element |
467 | 455 | */ |
468 | - public function remove($position) |
|
469 | - { |
|
456 | + public function remove($position) { |
|
470 | 457 | $position = intval($position); |
471 | 458 | if ( |
472 | 459 | $position < 0 |
@@ -490,8 +477,7 @@ discard block |
||
490 | 477 | * |
491 | 478 | * @return array The indizes of the removed elements |
492 | 479 | */ |
493 | - public function removeRange($position, $length) |
|
494 | - { |
|
480 | + public function removeRange($position, $length) { |
|
495 | 481 | $position = intval($position); |
496 | 482 | if ( |
497 | 483 | $position < 0 |
@@ -512,8 +498,7 @@ discard block |
||
512 | 498 | * |
513 | 499 | * @return void |
514 | 500 | */ |
515 | - public function reset() |
|
516 | - { |
|
501 | + public function reset() { |
|
517 | 502 | $this->elements = []; |
518 | 503 | $this->records = []; |
519 | 504 | $this->metadata = []; |
@@ -529,8 +514,7 @@ discard block |
||
529 | 514 | * |
530 | 515 | * @return void |
531 | 516 | */ |
532 | - public function rewind() |
|
533 | - { |
|
517 | + public function rewind() { |
|
534 | 518 | $this->position = 0; |
535 | 519 | } |
536 | 520 | |
@@ -543,8 +527,7 @@ discard block |
||
543 | 527 | * |
544 | 528 | * @return void |
545 | 529 | */ |
546 | - public function save($pid = 0) |
|
547 | - { |
|
530 | + public function save($pid = 0) { |
|
548 | 531 | $pid = max(intval($pid), 0); |
549 | 532 | // If no PID is given, save to the user's session instead |
550 | 533 | if ($pid > 0) { |
@@ -561,8 +544,7 @@ discard block |
||
561 | 544 | * |
562 | 545 | * @return boolean TRUE on success or FALSE on failure |
563 | 546 | */ |
564 | - protected function solrConnect() |
|
565 | - { |
|
547 | + protected function solrConnect() { |
|
566 | 548 | // Get Solr instance. |
567 | 549 | if (!$this->solr) { |
568 | 550 | // Connect to Solr server. |
@@ -609,8 +591,7 @@ discard block |
||
609 | 591 | * |
610 | 592 | * @return void |
611 | 593 | */ |
612 | - public function sort($by, $asc = TRUE) |
|
613 | - { |
|
594 | + public function sort($by, $asc = TRUE) { |
|
614 | 595 | $newOrder = []; |
615 | 596 | $nonSortable = []; |
616 | 597 | foreach ($this->elements as $num => $element) { |
@@ -647,8 +628,7 @@ discard block |
||
647 | 628 | * |
648 | 629 | * @return void |
649 | 630 | */ |
650 | - public function offsetUnset($offset) |
|
651 | - { |
|
631 | + public function offsetUnset($offset) { |
|
652 | 632 | unset($this->elements[$offset]); |
653 | 633 | // Re-number the elements. |
654 | 634 | $this->elements = array_values($this->elements); |
@@ -663,8 +643,7 @@ discard block |
||
663 | 643 | * |
664 | 644 | * @return boolean Is the current list position valid? |
665 | 645 | */ |
666 | - public function valid() |
|
667 | - { |
|
646 | + public function valid() { |
|
668 | 647 | return isset($this->elements[$this->position]); |
669 | 648 | } |
670 | 649 | |
@@ -675,8 +654,7 @@ discard block |
||
675 | 654 | * |
676 | 655 | * @return array The list's metadata |
677 | 656 | */ |
678 | - protected function _getMetadata() |
|
679 | - { |
|
657 | + protected function _getMetadata() { |
|
680 | 658 | return $this->metadata; |
681 | 659 | } |
682 | 660 | |
@@ -689,8 +667,7 @@ discard block |
||
689 | 667 | * |
690 | 668 | * @return void |
691 | 669 | */ |
692 | - protected function _setMetadata(array $metadata = []) |
|
693 | - { |
|
670 | + protected function _setMetadata(array $metadata = []) { |
|
694 | 671 | $this->metadata = $metadata; |
695 | 672 | } |
696 | 673 | |
@@ -704,8 +681,7 @@ discard block |
||
704 | 681 | * |
705 | 682 | * @return void |
706 | 683 | */ |
707 | - public function __construct(array $elements = [], array $metadata = []) |
|
708 | - { |
|
684 | + public function __construct(array $elements = [], array $metadata = []) { |
|
709 | 685 | if ( |
710 | 686 | empty($elements) |
711 | 687 | && empty($metadata) |
@@ -750,8 +726,7 @@ discard block |
||
750 | 726 | * |
751 | 727 | * @return mixed Value of $this->$var |
752 | 728 | */ |
753 | - public function __get($var) |
|
754 | - { |
|
729 | + public function __get($var) { |
|
755 | 730 | $method = '_get' . ucfirst($var); |
756 | 731 | if ( |
757 | 732 | !property_exists($this, $var) |
@@ -774,8 +749,7 @@ discard block |
||
774 | 749 | * |
775 | 750 | * @return void |
776 | 751 | */ |
777 | - public function __set($var, $value) |
|
778 | - { |
|
752 | + public function __set($var, $value) { |
|
779 | 753 | $method = '_set' . ucfirst($var); |
780 | 754 | if ( |
781 | 755 | !property_exists($this, $var) |
@@ -795,8 +769,7 @@ discard block |
||
795 | 769 | * |
796 | 770 | * @return array Properties to be serialized |
797 | 771 | */ |
798 | - public function __sleep() |
|
799 | - { |
|
772 | + public function __sleep() { |
|
800 | 773 | return ['elements', 'metadata']; |
801 | 774 | } |
802 | 775 | |
@@ -808,8 +781,7 @@ discard block |
||
808 | 781 | * |
809 | 782 | * @return void |
810 | 783 | */ |
811 | - public function __wakeup() |
|
812 | - { |
|
784 | + public function __wakeup() { |
|
813 | 785 | $this->count = count($this->elements); |
814 | 786 | } |
815 | 787 | } |
@@ -98,9 +98,9 @@ discard block |
||
98 | 98 | protected function printContent() |
99 | 99 | { |
100 | 100 | $this->doc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class); |
101 | - $this->doc->setModuleTemplate('EXT:' . $this->extKey . '/Resources/Private/Templates/' . Helper::getUnqualifiedClassName(get_class($this)) . '.tmpl'); |
|
101 | + $this->doc->setModuleTemplate('EXT:'.$this->extKey.'/Resources/Private/Templates/'.Helper::getUnqualifiedClassName(get_class($this)).'.tmpl'); |
|
102 | 102 | $this->doc->backPath = $GLOBALS['BACK_PATH']; |
103 | - $this->doc->bodyTagAdditions = 'class="ext-' . $this->extKey . '-modules"'; |
|
103 | + $this->doc->bodyTagAdditions = 'class="ext-'.$this->extKey.'-modules"'; |
|
104 | 104 | $this->doc->form = '<form action="" method="post" enctype="multipart/form-data">'; |
105 | 105 | // Add Javascript for function menu. |
106 | 106 | $this->doc->JScode .= '<script type="text/javascript">script_ended = 0;function jumpToUrl(URL) { document.location = URL; }</script>'; |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $this->content .= $this->doc->startPage($GLOBALS['LANG']->getLL('title')); |
111 | 111 | // Set defaults for menu. |
112 | 112 | if (empty($this->markerArray['CSH'])) { |
113 | - $this->markerArray['CSH'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_' . $GLOBALS['MCONF']['name'], 'csh', $GLOBALS['BACK_PATH'], '', TRUE); |
|
113 | + $this->markerArray['CSH'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_'.$GLOBALS['MCONF']['name'], 'csh', $GLOBALS['BACK_PATH'], '', TRUE); |
|
114 | 114 | } |
115 | 115 | if (empty($this->markerArray['MOD_MENU'])) { |
116 | 116 | $this->markerArray['MOD_MENU'] = \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']); |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function __construct() |
131 | 131 | { |
132 | - $GLOBALS['LANG']->includeLLFile('EXT:' . $this->extKey . '/Resources/Private/Language/' . Helper::getUnqualifiedClassName(get_class($this)) . '.xml'); |
|
132 | + $GLOBALS['LANG']->includeLLFile('EXT:'.$this->extKey.'/Resources/Private/Language/'.Helper::getUnqualifiedClassName(get_class($this)).'.xml'); |
|
133 | 133 | $this->conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]); |
134 | 134 | $this->data = \TYPO3\CMS\Core\Utility\GeneralUtility::_GPmerged($this->prefixId); |
135 | 135 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | * @access public |
22 | 22 | * @abstract |
23 | 23 | */ |
24 | -abstract class AbstractModule extends \TYPO3\CMS\Backend\Module\BaseScriptClass |
|
25 | -{ |
|
24 | +abstract class AbstractModule extends \TYPO3\CMS\Backend\Module\BaseScriptClass { |
|
26 | 25 | public $extKey = 'dlf'; |
27 | 26 | public $prefixId = 'tx_dlf'; |
28 | 27 | |
@@ -95,8 +94,7 @@ discard block |
||
95 | 94 | * |
96 | 95 | * @return void |
97 | 96 | */ |
98 | - protected function printContent() |
|
99 | - { |
|
97 | + protected function printContent() { |
|
100 | 98 | $this->doc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class); |
101 | 99 | $this->doc->setModuleTemplate('EXT:' . $this->extKey . '/Resources/Private/Templates/' . Helper::getUnqualifiedClassName(get_class($this)) . '.tmpl'); |
102 | 100 | $this->doc->backPath = $GLOBALS['BACK_PATH']; |
@@ -127,8 +125,7 @@ discard block |
||
127 | 125 | * |
128 | 126 | * @return void |
129 | 127 | */ |
130 | - public function __construct() |
|
131 | - { |
|
128 | + public function __construct() { |
|
132 | 129 | $GLOBALS['LANG']->includeLLFile('EXT:' . $this->extKey . '/Resources/Private/Language/' . Helper::getUnqualifiedClassName(get_class($this)) . '.xml'); |
133 | 130 | $this->conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]); |
134 | 131 | $this->data = \TYPO3\CMS\Core\Utility\GeneralUtility::_GPmerged($this->prefixId); |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $templateFile = $this->conf['templateFile']; |
77 | 77 | } else { |
78 | 78 | // Load default template from extension. |
79 | - $templateFile = 'EXT:' . $this->extKey . '/Resources/Private/Templates/' . Helper::getUnqualifiedClassName(get_class($this)) . '.tmpl'; |
|
79 | + $templateFile = 'EXT:'.$this->extKey.'/Resources/Private/Templates/'.Helper::getUnqualifiedClassName(get_class($this)).'.tmpl'; |
|
80 | 80 | } |
81 | 81 | $this->template = $this->templateService->getSubpart($this->cObj->fileResource($templateFile), $part); |
82 | 82 | } |
@@ -100,12 +100,12 @@ discard block |
||
100 | 100 | $conf = Helper::mergeRecursiveWithOverrule($flexFormConf, $conf); |
101 | 101 | } |
102 | 102 | // Read plugin TS configuration. |
103 | - $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dlf_' . strtolower(Helper::getUnqualifiedClassName(get_class($this))) . '.']; |
|
103 | + $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dlf_'.strtolower(Helper::getUnqualifiedClassName(get_class($this))).'.']; |
|
104 | 104 | if (is_array($pluginConf)) { |
105 | 105 | $conf = Helper::mergeRecursiveWithOverrule($pluginConf, $conf); |
106 | 106 | } |
107 | 107 | // Read general TS configuration. |
108 | - $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId . '.']; |
|
108 | + $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId.'.']; |
|
109 | 109 | if (is_array($generalConf)) { |
110 | 110 | $conf = Helper::mergeRecursiveWithOverrule($generalConf, $conf); |
111 | 111 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | // Set default plugin variables. |
124 | 124 | $this->pi_setPiVarDefaults(); |
125 | 125 | // Load translation files. |
126 | - $this->pi_loadLL('EXT:' . $this->extKey . '/Resources/Private/Language/' . Helper::getUnqualifiedClassName(get_class($this)) . '.xml'); |
|
126 | + $this->pi_loadLL('EXT:'.$this->extKey.'/Resources/Private/Language/'.Helper::getUnqualifiedClassName(get_class($this)).'.xml'); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | if (!$this->doc->ready) { |
148 | 148 | // Destroy the incomplete object. |
149 | 149 | $this->doc = NULL; |
150 | - Helper::devLog('Failed to load document with UID ' . $this->piVars['id'], DEVLOG_SEVERITY_ERROR); |
|
150 | + Helper::devLog('Failed to load document with UID '.$this->piVars['id'], DEVLOG_SEVERITY_ERROR); |
|
151 | 151 | } else { |
152 | 152 | // Set configuration PID. |
153 | 153 | $this->doc->cPid = $this->conf['pages']; |
@@ -176,10 +176,10 @@ discard block |
||
176 | 176 | // Try to load document. |
177 | 177 | $this->loadDocument(); |
178 | 178 | } else { |
179 | - Helper::devLog('Failed to load document with record ID "' . $this->piVars['recordId'] . '"', DEVLOG_SEVERITY_ERROR); |
|
179 | + Helper::devLog('Failed to load document with record ID "'.$this->piVars['recordId'].'"', DEVLOG_SEVERITY_ERROR); |
|
180 | 180 | } |
181 | 181 | } else { |
182 | - Helper::devLog('Invalid UID ' . $this->piVars['id'] . ' or PID ' . $this->conf['pages'] . ' for document loading', DEVLOG_SEVERITY_ERROR); |
|
182 | + Helper::devLog('Invalid UID '.$this->piVars['id'].' or PID '.$this->conf['pages'].' for document loading', DEVLOG_SEVERITY_ERROR); |
|
183 | 183 | } |
184 | 184 | } |
185 | 185 | |
@@ -210,9 +210,9 @@ discard block |
||
210 | 210 | { |
211 | 211 | if (!$GLOBALS['TSFE']->config['config']['disableWrapInBaseClass']) { |
212 | 212 | // Use class name instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins. |
213 | - $content = '<div class="tx-dlf-' . Helper::getUnqualifiedClassName(get_class($this)) . '">' . $content . '</div>'; |
|
213 | + $content = '<div class="tx-dlf-'.Helper::getUnqualifiedClassName(get_class($this)).'">'.$content.'</div>'; |
|
214 | 214 | if (!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) { |
215 | - $content = "\n\n<!-- BEGIN: Content of extension '" . $this->extKey . "', plugin '" . Helper::getUnqualifiedClassName(get_class($this)) . "' -->\n\n" . $content . "\n\n<!-- END: Content of extension '" . $this->extKey . "', plugin '" . Helper::getUnqualifiedClassName(get_class($this)) . "' -->\n\n"; |
|
215 | + $content = "\n\n<!-- BEGIN: Content of extension '".$this->extKey."', plugin '".Helper::getUnqualifiedClassName(get_class($this))."' -->\n\n".$content."\n\n<!-- END: Content of extension '".$this->extKey."', plugin '".Helper::getUnqualifiedClassName(get_class($this))."' -->\n\n"; |
|
216 | 216 | } |
217 | 217 | } |
218 | 218 | return $content; |
@@ -26,8 +26,7 @@ discard block |
||
26 | 26 | * @access public |
27 | 27 | * @abstract |
28 | 28 | */ |
29 | -abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin |
|
30 | -{ |
|
29 | +abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin { |
|
31 | 30 | public $extKey = 'dlf'; |
32 | 31 | public $prefixId = 'tx_dlf'; |
33 | 32 | public $scriptRelPath = 'Classes/Common/AbstractPlugin.php'; |
@@ -68,8 +67,7 @@ discard block |
||
68 | 67 | * |
69 | 68 | * @return void |
70 | 69 | */ |
71 | - protected function getTemplate($part = '###TEMPLATE###') |
|
72 | - { |
|
70 | + protected function getTemplate($part = '###TEMPLATE###') { |
|
73 | 71 | $this->templateService = GeneralUtility::makeInstance(MarkerBasedTemplateService::class); |
74 | 72 | if (!empty($this->conf['templateFile'])) { |
75 | 73 | // Load template file from configuration. |
@@ -91,8 +89,7 @@ discard block |
||
91 | 89 | * |
92 | 90 | * @return void |
93 | 91 | */ |
94 | - protected function init(array $conf) |
|
95 | - { |
|
92 | + protected function init(array $conf) { |
|
96 | 93 | // Read FlexForm configuration. |
97 | 94 | $flexFormConf = []; |
98 | 95 | $this->cObj->readFlexformIntoConf($this->cObj->data['pi_flexform'], $flexFormConf); |
@@ -133,8 +130,7 @@ discard block |
||
133 | 130 | * |
134 | 131 | * @return void |
135 | 132 | */ |
136 | - protected function loadDocument() |
|
137 | - { |
|
133 | + protected function loadDocument() { |
|
138 | 134 | // Check for required variable. |
139 | 135 | if ( |
140 | 136 | !empty($this->piVars['id']) |
@@ -206,8 +202,7 @@ discard block |
||
206 | 202 | * |
207 | 203 | * @return string HTML content wrapped, ready to return to the parent object. |
208 | 204 | */ |
209 | - public function pi_wrapInBaseClass($content) |
|
210 | - { |
|
205 | + public function pi_wrapInBaseClass($content) { |
|
211 | 206 | if (!$GLOBALS['TSFE']->config['config']['disableWrapInBaseClass']) { |
212 | 207 | // Use class name instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins. |
213 | 208 | $content = '<div class="tx-dlf-' . Helper::getUnqualifiedClassName(get_class($this)) . '">' . $content . '</div>'; |
@@ -227,8 +222,7 @@ discard block |
||
227 | 222 | * |
228 | 223 | * @return array The resulting typoscript array |
229 | 224 | */ |
230 | - protected function parseTS($string = '') |
|
231 | - { |
|
225 | + protected function parseTS($string = '') { |
|
232 | 226 | $parser = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::class); |
233 | 227 | $parser->parse($string); |
234 | 228 | return $parser->setup; |
@@ -243,8 +237,7 @@ discard block |
||
243 | 237 | * |
244 | 238 | * @return void |
245 | 239 | */ |
246 | - protected function setCache($cache = TRUE) |
|
247 | - { |
|
240 | + protected function setCache($cache = TRUE) { |
|
248 | 241 | if ($cache) { |
249 | 242 | // Set cObject type to "USER" (default). |
250 | 243 | $this->pi_USER_INT_obj = FALSE; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | protected function cmdAddMetadata() |
44 | 44 | { |
45 | 45 | // Include metadata definition file. |
46 | - include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey) . 'Resources/Private/Data/MetadataDefaults.php'); |
|
46 | + include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'Resources/Private/Data/MetadataDefaults.php'); |
|
47 | 47 | $i = 0; |
48 | 48 | // Build data array. |
49 | 49 | foreach ($metadataDefaults as $index_name => $values) { |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | // Build data array. |
104 | 104 | $data['tx_dlf_solrcores'][uniqid('NEW')] = [ |
105 | 105 | 'pid' => intval($this->id), |
106 | - 'label' => $GLOBALS['LANG']->getLL('solrcore') . ' (PID ' . $this->id . ')', |
|
106 | + 'label' => $GLOBALS['LANG']->getLL('solrcore').' (PID '.$this->id.')', |
|
107 | 107 | 'index_name' => '', |
108 | 108 | ]; |
109 | 109 | $_ids = Helper::processDBasAdmin($data); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | protected function cmdAddStructure() |
136 | 136 | { |
137 | 137 | // Include structure definition file. |
138 | - include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey) . 'Resources/Private/Data/StructureDefaults.php'); |
|
138 | + include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'Resources/Private/Data/StructureDefaults.php'); |
|
139 | 139 | // Build data array. |
140 | 140 | foreach ($structureDefaults as $index_name => $values) { |
141 | 141 | $data['tx_dlf_structures'][uniqid('NEW')] = [ |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | // Should we do something? |
205 | 205 | if (!empty($this->CMD)) { |
206 | 206 | // Sanitize input... |
207 | - $_method = 'cmd' . ucfirst($this->CMD); |
|
207 | + $_method = 'cmd'.ucfirst($this->CMD); |
|
208 | 208 | // ...and unset to prevent infinite looping. |
209 | 209 | unset($this->CMD); |
210 | 210 | if (method_exists($this, $_method)) { |
@@ -25,8 +25,7 @@ discard block |
||
25 | 25 | * @subpackage dlf |
26 | 26 | * @access public |
27 | 27 | */ |
28 | -class NewTenant extends \Kitodo\Dlf\Common\AbstractModule |
|
29 | -{ |
|
28 | +class NewTenant extends \Kitodo\Dlf\Common\AbstractModule { |
|
30 | 29 | protected $markerArray = [ |
31 | 30 | 'CSH' => '', |
32 | 31 | 'MOD_MENU' => '', |
@@ -40,8 +39,7 @@ discard block |
||
40 | 39 | * |
41 | 40 | * @return void |
42 | 41 | */ |
43 | - protected function cmdAddMetadata() |
|
44 | - { |
|
42 | + protected function cmdAddMetadata() { |
|
45 | 43 | // Include metadata definition file. |
46 | 44 | include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey) . 'Resources/Private/Data/MetadataDefaults.php'); |
47 | 45 | $i = 0; |
@@ -98,8 +96,7 @@ discard block |
||
98 | 96 | * |
99 | 97 | * @return void |
100 | 98 | */ |
101 | - protected function cmdAddSolrCore() |
|
102 | - { |
|
99 | + protected function cmdAddSolrCore() { |
|
103 | 100 | // Build data array. |
104 | 101 | $data['tx_dlf_solrcores'][uniqid('NEW')] = [ |
105 | 102 | 'pid' => intval($this->id), |
@@ -132,8 +129,7 @@ discard block |
||
132 | 129 | * |
133 | 130 | * @return void |
134 | 131 | */ |
135 | - protected function cmdAddStructure() |
|
136 | - { |
|
132 | + protected function cmdAddStructure() { |
|
137 | 133 | // Include structure definition file. |
138 | 134 | include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey) . 'Resources/Private/Data/StructureDefaults.php'); |
139 | 135 | // Build data array. |
@@ -176,8 +172,7 @@ discard block |
||
176 | 172 | * |
177 | 173 | * @return \Psr\Http\Message\ResponseInterface The response object |
178 | 174 | */ |
179 | - public function main(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response) |
|
180 | - { |
|
175 | + public function main(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response) { |
|
181 | 176 | $this->response = $response; |
182 | 177 | // Initialize module. |
183 | 178 | $this->MCONF = [ |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | public function displayThumbnail(&$params, &$pObj) |
38 | 38 | { |
39 | 39 | // Simulate TCA field type "passthrough". |
40 | - $output = '<input type="hidden" name="' . $params['itemFormElName'] . '" value="' . $params['itemFormElValue'] . '" />'; |
|
40 | + $output = '<input type="hidden" name="'.$params['itemFormElName'].'" value="'.$params['itemFormElValue'].'" />'; |
|
41 | 41 | if (!empty($params['itemFormElValue'])) { |
42 | - $output .= '<img alt="" src="' . $params['itemFormElValue'] . '" />'; |
|
42 | + $output .= '<img alt="" src="'.$params['itemFormElValue'].'" />'; |
|
43 | 43 | } |
44 | 44 | return $output; |
45 | 45 | } |
@@ -132,8 +132,8 @@ discard block |
||
132 | 132 | $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery( |
133 | 133 | $fields, |
134 | 134 | $table, |
135 | - '(' . $table . '.pid=' . intval($page['uid']) . ' ' . $where . ')' |
|
136 | - . ($localize ? ' AND (' . $table . '.sys_language_uid IN (-1,0) OR ' . $table . '.l18n_parent=0)' : '') |
|
135 | + '('.$table.'.pid='.intval($page['uid']).' '.$where.')' |
|
136 | + . ($localize ? ' AND ('.$table.'.sys_language_uid IN (-1,0) OR '.$table.'.l18n_parent=0)' : '') |
|
137 | 137 | . Helper::whereClause($table), |
138 | 138 | '', |
139 | 139 | $sorting |
@@ -22,8 +22,7 @@ discard block |
||
22 | 22 | * @subpackage dlf |
23 | 23 | * @access public |
24 | 24 | */ |
25 | -class FormEngine |
|
26 | -{ |
|
25 | +class FormEngine { |
|
27 | 26 | /** |
28 | 27 | * Helper to display document's thumbnail for table "tx_dlf_documents" |
29 | 28 | * |
@@ -34,8 +33,7 @@ discard block |
||
34 | 33 | * |
35 | 34 | * @return string HTML <img> tag for thumbnail |
36 | 35 | */ |
37 | - public function displayThumbnail(&$params, &$pObj) |
|
38 | - { |
|
36 | + public function displayThumbnail(&$params, &$pObj) { |
|
39 | 37 | // Simulate TCA field type "passthrough". |
40 | 38 | $output = '<input type="hidden" name="' . $params['itemFormElName'] . '" value="' . $params['itemFormElValue'] . '" />'; |
41 | 39 | if (!empty($params['itemFormElValue'])) { |
@@ -54,8 +52,7 @@ discard block |
||
54 | 52 | * |
55 | 53 | * @return void |
56 | 54 | */ |
57 | - public function itemsProcFunc_collectionList(&$params, &$pObj) |
|
58 | - { |
|
55 | + public function itemsProcFunc_collectionList(&$params, &$pObj) { |
|
59 | 56 | $this->itemsProcFunc_generateList( |
60 | 57 | $params, |
61 | 58 | 'label,uid', |
@@ -74,8 +71,7 @@ discard block |
||
74 | 71 | * |
75 | 72 | * @return void |
76 | 73 | */ |
77 | - public function itemsProcFunc_extendedSearchList(&$params, &$pObj) |
|
78 | - { |
|
74 | + public function itemsProcFunc_extendedSearchList(&$params, &$pObj) { |
|
79 | 75 | $this->itemsProcFunc_generateList( |
80 | 76 | $params, |
81 | 77 | 'label,index_name', |
@@ -95,8 +91,7 @@ discard block |
||
95 | 91 | * |
96 | 92 | * @return void |
97 | 93 | */ |
98 | - public function itemsProcFunc_facetsList(&$params, &$pObj) |
|
99 | - { |
|
94 | + public function itemsProcFunc_facetsList(&$params, &$pObj) { |
|
100 | 95 | $this->itemsProcFunc_generateList( |
101 | 96 | $params, |
102 | 97 | 'label,index_name', |
@@ -120,8 +115,7 @@ discard block |
||
120 | 115 | * |
121 | 116 | * @return void |
122 | 117 | */ |
123 | - protected function itemsProcFunc_generateList(&$params, $fields, $table, $sorting, $where = '', $localize = TRUE) |
|
124 | - { |
|
118 | + protected function itemsProcFunc_generateList(&$params, $fields, $table, $sorting, $where = '', $localize = TRUE) { |
|
125 | 119 | $pages = $params['row']['pages']; |
126 | 120 | if (!empty($pages)) { |
127 | 121 | if (!is_array($pages)) { |
@@ -158,8 +152,7 @@ discard block |
||
158 | 152 | * |
159 | 153 | * @return void |
160 | 154 | */ |
161 | - public function itemsProcFunc_libraryList(&$params, &$pObj) |
|
162 | - { |
|
155 | + public function itemsProcFunc_libraryList(&$params, &$pObj) { |
|
163 | 156 | $this->itemsProcFunc_generateList( |
164 | 157 | $params, |
165 | 158 | 'label,uid', |
@@ -178,8 +171,7 @@ discard block |
||
178 | 171 | * |
179 | 172 | * @return void |
180 | 173 | */ |
181 | - public function itemsProcFunc_solrList(&$params, &$pObj) |
|
182 | - { |
|
174 | + public function itemsProcFunc_solrList(&$params, &$pObj) { |
|
183 | 175 | $this->itemsProcFunc_generateList( |
184 | 176 | $params, |
185 | 177 | 'label,uid', |
@@ -200,8 +192,7 @@ discard block |
||
200 | 192 | * |
201 | 193 | * @return void |
202 | 194 | */ |
203 | - public function itemsProcFunc_toolList(&$params, &$pObj) |
|
204 | - { |
|
195 | + public function itemsProcFunc_toolList(&$params, &$pObj) { |
|
205 | 196 | foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] as $class => $label) { |
206 | 197 | $params['items'][] = [$GLOBALS['LANG']->sL($label), $class]; |
207 | 198 | } |