Erikmitk / kitodo-presentation

Classes/Plugin/Search.php

Braces +12 added lines, -24 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Search extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Search extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Search.php';
 
     /**
@@ -42,8 +41,7 @@ 
      *
      * @return void
      */
-    protected function addAutocompleteJS()
-    {
+    protected function addAutocompleteJS() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
 
@@ -74,8 +72,7 @@ 
      *
      * @return string HTML input fields with current document's UID and parent ID
      */
-    protected function addCurrentCollection()
-    {
+    protected function addCurrentCollection() {
         // Load current collection.
         $list = GeneralUtility::makeInstance(DocumentList::class);
         if (
@@ -107,8 +104,7 @@ 
      *
      * @return string HTML input fields with current document's UID and parent ID
      */
-    protected function addCurrentDocument()
-    {
+    protected function addCurrentDocument() {
         // Load current list object.
         $list = GeneralUtility::makeInstance(DocumentList::class);
         // Load current document.
@@ -141,8 +137,7 @@ 
      *
      * @return string HTML input fields with encrypted core name and hash
      */
-    protected function addEncryptedCoreName()
-    {
+    protected function addEncryptedCoreName() {
         // Get core name.
         $name = Helper::getIndexNameFromUid($this->conf['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.
@@ -164,8 +159,7 @@ 
      *
      * @return string The extended search form or an empty string
      */
-    protected function addExtendedSearch()
-    {
+    protected function addExtendedSearch() {
         $extendedSearch = '';
         // Quit without doing anything if no fields for extended search are selected.
         if (
@@ -203,8 +197,7 @@ 
      *
      * @return string HTML output of facets menu
      */
-    protected function addFacetsMenu()
-    {
+    protected function addFacetsMenu() {
         // Check for typoscript configuration to prevent fatal error.
         if (empty($this->conf['facetsConf.'])) {
             Helper::devLog('Incomplete plugin configuration', DEVLOG_SEVERITY_WARNING);
@@ -238,8 +231,7 @@ 
      *
      * @return string HTML output of fulltext switch
      */
-    protected function addFulltextSwitch($isFulltextSearch = 0)
-    {
+    protected function addFulltextSwitch($isFulltextSearch = 0) {
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['fulltext'])) {
@@ -258,8 +250,7 @@ 
      *
      * @return string HTML output of logical page field
      */
-    protected function addLogicalPage()
-    {
+    protected function addLogicalPage() {
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['showLogicalPageField'])) {
@@ -282,8 +273,7 @@ 
      *
      * @return array The array for the facet's menu entry
      */
-    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state)
-    {
+    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
         $entryArray = [];
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -339,8 +329,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Disable caching for this plugin.
         $this->setCache(false);
@@ -540,8 +529,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($content, $conf)
-    {
+    public function makeFacetsMenuArray($content, $conf) {
         $this->init($conf);
         $menuArray = [];
         // Set default value for facet search.

Spacing +29 added lines, -29 removed lines

@@ -61,7 +61,7 @@ 
 
         if ($result->rowCount() == 1) {
             $pageRenderer = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
-            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/Search/Suggester.js');
+            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/Search/Suggester.js');
         } else {
             Helper::devLog('No metadata fields configured for search suggestions', DEVLOG_SEVERITY_WARNING);
         }
@@ -83,7 +83,7 @@ 
             && $list->metadata['options']['source'] == 'collection'
         ) {
             // Get collection's UID.
-            return '<input type="hidden" name="' . $this->prefixId . '[collection]" value="' . $list->metadata['options']['select'] . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$list->metadata['options']['select'].'" />';
         } elseif (!empty($list->metadata['options']['params']['filterquery'])) {
             // Get collection's UID from search metadata.
             foreach ($list->metadata['options']['params']['filterquery'] as $facet) {
@@ -95,7 +95,7 @@ 
                     $collectionId = Helper::getUidFromIndexName(trim($facetKeyVal[1], '(")'), 'tx_dlf_collections');
                 }
             }
-            return '<input type="hidden" name="' . $this->prefixId . '[collection]" value="' . $collectionId . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$collectionId.'" />';
         }
         return '';
     }
@@ -119,7 +119,7 @@ 
             $this->loadDocument();
             // Get document's UID or parent ID.
             if ($this->doc->ready) {
-                return '<input type="hidden" name="' . $this->prefixId . '[id]" value="' . ($this->doc->parentId > 0 ? $this->doc->parentId : $this->doc->uid) . '" />';
+                return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.($this->doc->parentId > 0 ? $this->doc->parentId : $this->doc->uid).'" />';
             }
         } elseif (!empty($list->metadata['options']['params']['filterquery'])) {
             // Get document's UID from search metadata.
@@ -129,7 +129,7 @@ 
                     $documentId = (int) substr($facetKeyVal[1], 1, strpos($facetKeyVal[1], ')'));
                 }
             }
-            return '<input type="hidden" name="' . $this->prefixId . '[id]" value="' . $documentId . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.$documentId.'" />';
         }
         return '';
     }
@@ -151,7 +151,7 @@ 
         }
         // Add encrypted fields to search form.
         if (is_array($name)) {
-            return '<input type="hidden" name="' . $this->prefixId . '[encrypted]" value="' . $name['encrypted'] . '" /><input type="hidden" name="' . $this->prefixId . '[hashed]" value="' . $name['hash'] . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[encrypted]" value="'.$name['encrypted'].'" /><input type="hidden" name="'.$this->prefixId.'[hashed]" value="'.$name['hash'].'" />';
         } else {
             return '';
         }
@@ -177,19 +177,19 @@ 
         // Get operator options.
         $operatorOptions = '';
         foreach (['AND', 'OR', 'NOT'] as $operator) {
-            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-' . $operator . '" value="' . $operator . '">' . $this->pi_getLL($operator, '', true) . '</option>';
+            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-'.$operator.'" value="'.$operator.'">'.$this->pi_getLL($operator, '', true).'</option>';
         }
         // Get field selector options.
         $fieldSelectorOptions = '';
         $searchFields = GeneralUtility::trimExplode(',', $this->conf['extendedFields'], true);
         foreach ($searchFields as $searchField) {
-            $fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-' . $searchField . '" value="' . $searchField . '">' . Helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']) . '</option>';
+            $fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-'.$searchField.'" value="'.$searchField.'">'.Helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']).'</option>';
         }
         for ($i = 0; $i < $this->conf['extendedSlotCount']; $i++) {
             $markerArray = [
-                '###EXT_SEARCH_OPERATOR###' => '<select class="tx-dlf-search-operator tx-dlf-search-operator-' . $i . '" name="' . $this->prefixId . '[extOperator][' . $i . ']">' . $operatorOptions . '</select>',
-                '###EXT_SEARCH_FIELDSELECTOR###' => '<select class="tx-dlf-search-field tx-dlf-search-field-' . $i . '" name="' . $this->prefixId . '[extField][' . $i . ']">' . $fieldSelectorOptions . '</select>',
-                '###EXT_SEARCH_FIELDQUERY###' => '<input class="tx-dlf-search-query tx-dlf-search-query-' . $i . '" type="text" name="' . $this->prefixId . '[extQuery][' . $i . ']" />'
+                '###EXT_SEARCH_OPERATOR###' => '<select class="tx-dlf-search-operator tx-dlf-search-operator-'.$i.'" name="'.$this->prefixId.'[extOperator]['.$i.']">'.$operatorOptions.'</select>',
+                '###EXT_SEARCH_FIELDSELECTOR###' => '<select class="tx-dlf-search-field tx-dlf-search-field-'.$i.'" name="'.$this->prefixId.'[extField]['.$i.']">'.$fieldSelectorOptions.'</select>',
+                '###EXT_SEARCH_FIELDQUERY###' => '<input class="tx-dlf-search-query tx-dlf-search-query-'.$i.'" type="text" name="'.$this->prefixId.'[extQuery]['.$i.']" />'
             ];
             $extendedSearch .= $this->templateService->substituteMarkerArray($this->templateService->getSubpart($this->template, '###EXT_SEARCH_ENTRY###'), $markerArray);
         }
@@ -217,12 +217,12 @@ 
         // Get facets from plugin configuration.
         $facets = [];
         foreach (GeneralUtility::trimExplode(',', $this->conf['facets'], true) as $facet) {
-            $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
+            $facets[$facet.'_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
         }
         // Render facets menu.
         $TSconfig = [];
         $TSconfig['special'] = 'userfunction';
-        $TSconfig['special.']['userFunc'] = \Kitodo\Dlf\Plugin\Search::class . '->makeFacetsMenuArray';
+        $TSconfig['special.']['userFunc'] = \Kitodo\Dlf\Plugin\Search::class.'->makeFacetsMenuArray';
         $TSconfig['special.']['facets'] = $facets;
         $TSconfig['special.']['limit'] = max(intval($this->conf['limitFacets']), 1);
         $TSconfig = Helper::mergeRecursiveWithOverrule($this->conf['facetsConf.'], $TSconfig);
@@ -243,10 +243,10 @@ 
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['fulltext'])) {
-            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-no" type="radio" name="' . $this->prefixId . '[fulltext]" value="0" ' . ($isFulltextSearch == 0 ? 'checked="checked"' : '') . ' />';
-            $output .= ' <label for="tx-dlf-search-fulltext-no">' . $this->pi_getLL('label.inMetadata', '') . '</label>';
-            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-yes" type="radio" name="' . $this->prefixId . '[fulltext]" value="1" ' . ($isFulltextSearch == 1 ? 'checked="checked"' : '') . '/>';
-            $output .= ' <label for="tx-dlf-search-fulltext-yes">' . $this->pi_getLL('label.inFulltext', '') . '</label>';
+            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-no" type="radio" name="'.$this->prefixId.'[fulltext]" value="0" '.($isFulltextSearch == 0 ? 'checked="checked"' : '').' />';
+            $output .= ' <label for="tx-dlf-search-fulltext-no">'.$this->pi_getLL('label.inMetadata', '').'</label>';
+            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-yes" type="radio" name="'.$this->prefixId.'[fulltext]" value="1" '.($isFulltextSearch == 1 ? 'checked="checked"' : '').'/>';
+            $output .= ' <label for="tx-dlf-search-fulltext-yes">'.$this->pi_getLL('label.inFulltext', '').'</label>';
         }
         return $output;
     }
@@ -263,8 +263,8 @@ 
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['showLogicalPageField'])) {
-            $output .= ' <label for="tx-dlf-search-logical-page">' . $this->pi_getLL('label.logicalPage', '') . ': </label>';
-            $output .= ' <input class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" type="text" name="' . $this->prefixId . '[logicalPage]" />';
+            $output .= ' <label for="tx-dlf-search-logical-page">'.$this->pi_getLL('label.logicalPage', '').': </label>';
+            $output .= ' <input class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" type="text" name="'.$this->prefixId.'[logicalPage]" />';
         }
         return $output;
     }
@@ -305,7 +305,7 @@ 
         $entryArray['doNotLinkIt'] = 0;
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
-        $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
+        $index = array_search($field.':("'.Solr::escapeQuery($value).'")', $queryColumn);
         if ($index !== false) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
@@ -322,7 +322,7 @@ 
             }
         } else {
             // Facet is not selected, thus add it to filter.
-            $queryColumn[] = $field . ':("' . Solr::escapeQuery($value) . '")';
+            $queryColumn[] = $field.':("'.Solr::escapeQuery($value).'")';
             $entryArray['ITEM_STATE'] = 'NO';
         }
         $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(['query' => $search['query'], 'fq' => $queryColumn]);
@@ -378,7 +378,7 @@ 
                 '###ACTION_URL###' => $this->cObj->typoLink_URL($linkConf),
                 '###LABEL_QUERY###' => (!empty($search['query']) ? htmlspecialchars($search['query']) : $this->pi_getLL('label.query')),
                 '###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),
-                '###FIELD_QUERY###' => $this->prefixId . '[query]',
+                '###FIELD_QUERY###' => $this->prefixId.'[query]',
                 '###QUERY###' => (!empty($search['query']) ? htmlspecialchars($search['query']) : ''),
                 '###FULLTEXTSWITCH###' => $this->addFulltextSwitch($list->metadata['fulltextSearch']),
                 '###FIELD_DOC###' => ($this->conf['searchIn'] == 'document' || $this->conf['searchIn'] == 'all' ? $this->addCurrentDocument() : ''),
@@ -410,7 +410,7 @@ 
                 $this->piVars['query'] = empty($matches[1]) ? $this->piVars['query'] : $matches[1];
                 // Search in fulltext field if applicable. Query must not be empty!
                 if (!empty($this->piVars['query'])) {
-                    $query = 'fulltext:(' . Solr::escapeQuery(trim($this->piVars['query'])) . ')';
+                    $query = 'fulltext:('.Solr::escapeQuery(trim($this->piVars['query'])).')';
                 }
             } else {
                 // Retain given search field if valid.
@@ -431,9 +431,9 @@ 
                             && in_array($this->piVars['extField'][$i], $allowedFields)
                         ) {
                             if (!empty($query)) {
-                                $query .= ' ' . $this->piVars['extOperator'][$i] . ' ';
+                                $query .= ' '.$this->piVars['extOperator'][$i].' ';
                             }
-                            $query .= Indexer::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']) . ':(' . Solr::escapeQuery($this->piVars['extQuery'][$i]) . ')';
+                            $query .= Indexer::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']).':('.Solr::escapeQuery($this->piVars['extQuery'][$i]).')';
                         }
                     }
                 }
@@ -453,7 +453,7 @@ 
                     !empty($this->piVars['id'])
                     && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['id'])
                 ) {
-                    $params['filterquery'][]['query'] = 'uid:(' . $this->piVars['id'] . ') OR partof:(' . $this->piVars['id'] . ')';
+                    $params['filterquery'][]['query'] = 'uid:('.$this->piVars['id'].') OR partof:('.$this->piVars['id'].')';
                     $label .= htmlspecialchars(sprintf($this->pi_getLL('in', ''), Document::getTitle($this->piVars['id'])));
                 }
             }
@@ -467,7 +467,7 @@ 
                     && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['collection'])
                 ) {
                     $index_name = Helper::getIndexNameFromUid($this->piVars['collection'], 'tx_dlf_collections', $this->conf['pages']);
-                    $params['filterquery'][]['query'] = 'collection_faceting:("' . Solr::escapeQuery($index_name) . '")';
+                    $params['filterquery'][]['query'] = 'collection_faceting:("'.Solr::escapeQuery($index_name).'")';
                     $label .= sprintf($this->pi_getLL('in', '', true), Helper::translate($index_name, 'tx_dlf_collections', $this->conf['pages']));
                 }
             }
@@ -479,7 +479,7 @@ 
                     $collIndexNames[] = Solr::escapeQuery(Helper::getIndexNameFromUid(intval($collId), 'tx_dlf_collections', $this->conf['pages']));
                 }
                 // Last value is fake and used for distinction in $this->addCurrentCollection()
-                $params['filterquery'][]['query'] = 'collection_faceting:("' . implode('" OR "', $collIndexNames) . '" OR "FakeValueForDistinction")';
+                $params['filterquery'][]['query'] = 'collection_faceting:("'.implode('" OR "', $collIndexNames).'" OR "FakeValueForDistinction")';
             }
             // Set some query parameters.
             $params['query'] = !empty($query) ? $query : '*';
@@ -529,7 +529,7 @@ 
             $linkConf['forceAbsoluteUrl.']['scheme'] = !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http';
             $linkConf['additionalParams'] = GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false);
             // Send headers.
-            header('Location: ' . GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
+            header('Location: '.GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
             exit;
         }
     }

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -177,11 +177,11 @@ 
         // Get operator options.
         $operatorOptions = '';
         foreach (['AND', 'OR', 'NOT'] as $operator) {
-            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-' . $operator . '" value="' . $operator . '">' . $this->pi_getLL($operator, '', true) . '</option>';
+            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-' . $operator . '" value="' . $operator . '">' . $this->pi_getLL($operator, '', TRUE) . '</option>';
         }
         // Get field selector options.
         $fieldSelectorOptions = '';
-        $searchFields = GeneralUtility::trimExplode(',', $this->conf['extendedFields'], true);
+        $searchFields = GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
         foreach ($searchFields as $searchField) {
             $fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-' . $searchField . '" value="' . $searchField . '">' . Helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']) . '</option>';
         }
@@ -216,7 +216,7 @@ 
         }
         // Get facets from plugin configuration.
         $facets = [];
-        foreach (GeneralUtility::trimExplode(',', $this->conf['facets'], true) as $facet) {
+        foreach (GeneralUtility::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
             $facets[$facet . '_faceting'] = Helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
         }
         // Render facets menu.
@@ -306,7 +306,7 @@ 
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
         $index = array_search($field . ':("' . Solr::escapeQuery($value) . '")', $queryColumn);
-        if ($index !== false) {
+        if ($index !== FALSE) {
             // Facet is selected, thus remove it from filter.
             unset($queryColumn[$index]);
             $queryColumn = array_values($queryColumn);
@@ -315,7 +315,7 @@ 
             //Reset facets
             if ($this->conf['resetFacets']) {
                 //remove ($count) for selected facet in template
-                $entryArray['count'] = false;
+                $entryArray['count'] = FALSE;
                 //build link to delete selected facet
                 $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(['query' => $search['query'], 'fq' => $queryColumn]);
                 $entryArray['title'] = sprintf($this->pi_getLL('resetFacet', ''), $entryArray['title']);
@@ -343,7 +343,7 @@ 
     {
         $this->init($conf);
         // Disable caching for this plugin.
-        $this->setCache(false);
+        $this->setCache(FALSE);
         // Quit without doing anything if required variables are not set.
         if (empty($this->conf['solrcore'])) {
             Helper::devLog('Incomplete plugin configuration', DEVLOG_SEVERITY_WARNING);
@@ -394,7 +394,7 @@ 
             return $this->pi_wrapInBaseClass($content);
         } else {
             // Build label for result list.
-            $label = $this->pi_getLL('search', '', true);
+            $label = $this->pi_getLL('search', '', TRUE);
             if (!empty($this->piVars['query'])) {
                 $label .= htmlspecialchars(sprintf($this->pi_getLL('for', ''), trim($this->piVars['query'])));
             }
@@ -422,7 +422,7 @@ 
                 && is_array($this->piVars['extQuery'])
             ) {
                 $allowedOperators = ['AND', 'OR', 'NOT'];
-                $allowedFields = GeneralUtility::trimExplode(',', $this->conf['extendedFields'], true);
+                $allowedFields = GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
                 $numberOfExtQueries = count($this->piVars['extQuery']);
                 for ($i = 0; $i < $numberOfExtQueries; $i++) {
                     if (!empty($this->piVars['extQuery'][$i])) {
@@ -468,7 +468,7 @@ 
                 ) {
                     $index_name = Helper::getIndexNameFromUid($this->piVars['collection'], 'tx_dlf_collections', $this->conf['pages']);
                     $params['filterquery'][]['query'] = 'collection_faceting:("' . Solr::escapeQuery($index_name) . '")';
-                    $label .= sprintf($this->pi_getLL('in', '', true), Helper::translate($index_name, 'tx_dlf_collections', $this->conf['pages']));
+                    $label .= sprintf($this->pi_getLL('in', '', TRUE), Helper::translate($index_name, 'tx_dlf_collections', $this->conf['pages']));
                 }
             }
             // Add filter query for collection restrictions.
@@ -527,7 +527,7 @@ 
             }
             $linkConf['forceAbsoluteUrl'] = !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0;
             $linkConf['forceAbsoluteUrl.']['scheme'] = !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http';
-            $linkConf['additionalParams'] = GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false);
+            $linkConf['additionalParams'] = GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE);
             // Send headers.
             header('Location: ' . GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
             exit;

Classes/Plugin/ListView.php

Spacing +25 added lines, -25 removed lines

@@ -81,12 +81,12 @@ 
             return '';
         }
         // Get separator.
-        $separator = '<span class="separator">' . $this->pi_getLL('separator', ' - ', true) . '</span>';
+        $separator = '<span class="separator">'.$this->pi_getLL('separator', ' - ', true).'</span>';
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', true), ['pointer' => $this->piVars['pointer'] - 1], true) . $separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', true), ['pointer' => $this->piVars['pointer'] - 1], true).$separator;
         } else {
-            $output = '<span>' . $this->pi_getLL('prevPage', '&lt;', true) . '</span>' . $separator;
+            $output = '<span>'.$this->pi_getLL('prevPage', '&lt;', true).'</span>'.$separator;
         }
         $i = 0;
         $skip = null;
@@ -94,13 +94,13 @@ 
         while ($i < $maxPages) {
             if ($i < 3 || ($i > $this->piVars['pointer'] - 3 && $i < $this->piVars['pointer'] + 3) || $i > $maxPages - 4) {
                 if ($this->piVars['pointer'] != $i) {
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', true), $i + 1), ['pointer' => $i], true) . $separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', true), $i + 1), ['pointer' => $i], true).$separator;
                 } else {
-                    $output .= '<span class="active">' . sprintf($this->pi_getLL('page', '%d', true), $i + 1) . '</span>' . $separator;
+                    $output .= '<span class="active">'.sprintf($this->pi_getLL('page', '%d', true), $i + 1).'</span>'.$separator;
                 }
                 $skip = true;
             } elseif ($skip === true) {
-                $output .= '<span class="skip">' . $this->pi_getLL('skip', '...', true) . '</span>' . $separator;
+                $output .= '<span class="skip">'.$this->pi_getLL('skip', '...', true).'</span>'.$separator;
                 $skip = false;
             }
             $i++;
@@ -109,7 +109,7 @@ 
         if ($this->piVars['pointer'] < $maxPages - 1) {
             $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', true), ['pointer' => $this->piVars['pointer'] + 1], true);
         } else {
-            $output .= '<span>' . $this->pi_getLL('nextPage', '&gt;', true) . '</span>';
+            $output .= '<span>'.$this->pi_getLL('nextPage', '&gt;', true).'</span>';
         }
         return $output;
     }
@@ -146,7 +146,7 @@ 
                         if (empty($value) && $this->conf['getTitle']) {
                             $superiorTitle = Document::getTitle($this->list[$number]['uid'], true);
                             if (!empty($superiorTitle)) {
-                                $value = '[' . $superiorTitle . ']';
+                                $value = '['.$superiorTitle.']';
                             }
                         }
                         // Set fake title if still not present.
@@ -193,7 +193,7 @@ 
         }
         // Add thumbnail.
         if (!empty($this->list[$number]['thumbnail'])) {
-            $markerArray['###THUMBNAIL###'] = '<img alt="' . $imgAlt . '" src="' . $this->list[$number]['thumbnail'] . '" />';
+            $markerArray['###THUMBNAIL###'] = '<img alt="'.$imgAlt.'" src="'.$this->list[$number]['thumbnail'].'" />';
         }
         // Add preview.
         if (!empty($this->list[$number]['preview'])) {
@@ -259,28 +259,28 @@ 
             $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, ['logicalPage' => $this->piVars['logicalPage']], '', true, false);
         }
         // Build HTML form.
-        $sorting = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />';
+        $sorting = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
         foreach ($this->piVars as $piVar => $value) {
             if ($piVar != 'order' && $piVar != 'DATA' && !empty($value)) {
-                $sorting .= '<input type="hidden" name="' . $this->prefixId . '[' . $piVar . ']" value="' . $value . '" />';
+                $sorting .= '<input type="hidden" name="'.$this->prefixId.'['.$piVar.']" value="'.$value.'" />';
             }
         }
         // Select sort field.
-        $uniqId = uniqid($prefix . '-');
-        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('orderBy', '', true) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[order]" onchange="javascript:this.form.submit();">';
+        $uniqId = uniqid($prefix.'-');
+        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('orderBy', '', true).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[order]" onchange="javascript:this.form.submit();">';
         // Add relevance sorting if this is a search result list.
         if ($this->list->metadata['options']['source'] == 'search') {
-            $sorting .= '<option value="score"' . (($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '') . '>' . $this->pi_getLL('relevance', '', true) . '</option>';
+            $sorting .= '<option value="score"'.(($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '').'>'.$this->pi_getLL('relevance', '', true).'</option>';
         }
         foreach ($this->sortables as $index_name => $label) {
-            $sorting .= '<option value="' . $index_name . '"' . (($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
+            $sorting .= '<option value="'.$index_name.'"'.(($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '').'>'.htmlspecialchars($label).'</option>';
         }
         $sorting .= '</select>';
         // Select sort direction.
-        $uniqId = uniqid($prefix . '-');
-        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('direction', '', true) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[asc]" onchange="javascript:this.form.submit();">';
-        $sorting .= '<option value="1" ' . ($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.asc', '', true) . '</option>';
-        $sorting .= '<option value="0" ' . (!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.desc', '', true) . '</option>';
+        $uniqId = uniqid($prefix.'-');
+        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('direction', '', true).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[asc]" onchange="javascript:this.form.submit();">';
+        $sorting .= '<option value="1" '.($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.asc', '', true).'</option>';
+        $sorting .= '<option value="0" '.(!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.desc', '', true).'</option>';
         $sorting .= '</select></div></form>';
         return $sorting;
     }
@@ -316,7 +316,7 @@ 
                         if (empty($value) && $this->conf['getTitle']) {
                             $superiorTitle = Document::getTitle($subpart['uid'], true);
                             if (!empty($superiorTitle)) {
-                                $value = '[' . $superiorTitle . ']';
+                                $value = '['.$superiorTitle.']';
                             }
                         }
                         // Set fake title if still not present.
@@ -348,7 +348,7 @@ 
                         $value = htmlspecialchars(Helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
                         // Add page number for single pages.
                         if ($_value == 'page') {
-                            $value .= ' ' . intval($subpart['page']);
+                            $value .= ' '.intval($subpart['page']);
                         }
                     } elseif ($index_name == 'language' && !empty($value)) {
                         // Translate ISO 639 language code.
@@ -369,7 +369,7 @@ 
             }
             // Add thumbnail.
             if (!empty($subpart['thumbnail'])) {
-                $markerArray['###SUBTHUMBNAIL###'] = '<img alt="' . $imgAlt . '" src="' . $subpart['thumbnail'] . '" />';
+                $markerArray['###SUBTHUMBNAIL###'] = '<img alt="'.$imgAlt.'" src="'.$subpart['thumbnail'].'" />';
             }
             // Add preview.
             if (!empty($subpart['preview'])) {
@@ -481,7 +481,7 @@ 
                 || (isset($this->piVars['asc']) && $this->piVars['asc'] != $listMetadata['options']['order.asc'])
             ) {
                 // Update list's metadata.
-                $listMetadata['options']['params']['sort'] = [$this->piVars['order'] . "_sorting" => (bool) $this->piVars['asc'] ? 'asc' : 'desc'];
+                $listMetadata['options']['params']['sort'] = [$this->piVars['order']."_sorting" => (bool) $this->piVars['asc'] ? 'asc' : 'desc'];
                 $listMetadata['options']['order'] = $this->piVars['order'];
                 $listMetadata['options']['order.asc'] = (bool) $this->piVars['asc'];
                 // Reset pointer.
@@ -505,7 +505,7 @@ 
                 $this->list = $solr->search();
             }
             // Add list description
-            $listMetadata['description'] = '<p class="tx-dlf-search-numHits">' . htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $this->list->metadata['options']['numberOfHits'], $this->list->metadata['options']['numberOfToplevelHits'])) . '</p>';
+            $listMetadata['description'] = '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $this->list->metadata['options']['numberOfHits'], $this->list->metadata['options']['numberOfToplevelHits'])).'</p>';
             $this->list->metadata = $listMetadata;
             // Save updated list.
             $this->list->save();
@@ -534,7 +534,7 @@ 
         $markerArray['###LISTTITLE###'] = $this->list->metadata['label'];
         $markerArray['###LISTDESCRIPTION###'] = $this->list->metadata['description'];
         if (!empty($this->list->metadata['thumbnail'])) {
-            $markerArray['###LISTTHUMBNAIL###'] = '<img alt="" src="' . $this->list->metadata['thumbnail'] . '" />';
+            $markerArray['###LISTTHUMBNAIL###'] = '<img alt="" src="'.$this->list->metadata['thumbnail'].'" />';
         } else {
             $markerArray['###LISTTHUMBNAIL###'] = '';
         }

Braces +8 added lines, -16 removed lines

@@ -29,8 +29,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ListView extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class ListView extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/ListView.php';
 
     /**
@@ -72,8 +71,7 @@ 
      *
      * @return string The rendered page browser ready for output
      */
-    protected function getPageBrowser()
-    {
+    protected function getPageBrowser() {
         // Get overall number of pages.
         $maxPages = intval(ceil($this->list->metadata['options']['numberOfToplevelHits'] / $this->conf['limit']));
         // Return empty pagebrowser if there is just one page.
@@ -124,8 +122,7 @@ 
      *
      * @return string The rendered entry ready for output
      */
-    protected function getEntry($number, $template)
-    {
+    protected function getEntry($number, $template) {
         $markerArray['###NUMBER###'] = ($this->piVars['pointer'] * $this->conf['limit']) + $number + 1;
         $markerArray['###METADATA###'] = '';
         $markerArray['###THUMBNAIL###'] = '';
@@ -227,8 +224,7 @@ 
      *
      * @return array The parsed fieldwrap
      */
-    private function getFieldWrap($index_name, $wrap)
-    {
+    private function getFieldWrap($index_name, $wrap) {
         if (isset($this->fieldwrap[$index_name])) {
             return $this->fieldwrap[$index_name];
         } else {
@@ -243,8 +239,7 @@ 
      *
      * @return string The rendered sorting dialog ready for output
      */
-    protected function getSortingForm()
-    {
+    protected function getSortingForm() {
         // Return nothing if there are no sortable metadata fields.
         if (!count($this->sortables)) {
             return '';
@@ -295,8 +290,7 @@ 
      *
      * @return string The rendered entries ready for output
      */
-    protected function getSubEntries($number, $template)
-    {
+    protected function getSubEntries($number, $template) {
         $content = '';
         $noTitle = $this->pi_getLL('noTitle');
         $highlight_word = preg_replace('/\s\s+/', ';', $this->list->metadata['searchString']);
@@ -399,8 +393,7 @@ 
      *
      * @return void
      */
-    protected function loadConfig()
-    {
+    protected function loadConfig() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_metadata');
 
@@ -446,8 +439,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Don't cache the output.
         $this->setCache(false);

Upper-Lower-Casing +31 added lines, -31 removed lines

@@ -81,35 +81,35 @@ 
             return '';
         }
         // Get separator.
-        $separator = '<span class="separator">' . $this->pi_getLL('separator', ' - ', true) . '</span>';
+        $separator = '<span class="separator">' . $this->pi_getLL('separator', ' - ', TRUE) . '</span>';
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', true), ['pointer' => $this->piVars['pointer'] - 1], true) . $separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), ['pointer' => $this->piVars['pointer'] - 1], TRUE) . $separator;
         } else {
-            $output = '<span>' . $this->pi_getLL('prevPage', '&lt;', true) . '</span>' . $separator;
+            $output = '<span>' . $this->pi_getLL('prevPage', '&lt;', TRUE) . '</span>' . $separator;
         }
         $i = 0;
-        $skip = null;
+        $skip = NULL;
         // Add links to pages.
         while ($i < $maxPages) {
             if ($i < 3 || ($i > $this->piVars['pointer'] - 3 && $i < $this->piVars['pointer'] + 3) || $i > $maxPages - 4) {
                 if ($this->piVars['pointer'] != $i) {
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', true), $i + 1), ['pointer' => $i], true) . $separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), ['pointer' => $i], TRUE) . $separator;
                 } else {
-                    $output .= '<span class="active">' . sprintf($this->pi_getLL('page', '%d', true), $i + 1) . '</span>' . $separator;
+                    $output .= '<span class="active">' . sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1) . '</span>' . $separator;
                 }
-                $skip = true;
-            } elseif ($skip === true) {
-                $output .= '<span class="skip">' . $this->pi_getLL('skip', '...', true) . '</span>' . $separator;
-                $skip = false;
+                $skip = TRUE;
+            } elseif ($skip === TRUE) {
+                $output .= '<span class="skip">' . $this->pi_getLL('skip', '...', TRUE) . '</span>' . $separator;
+                $skip = FALSE;
             }
             $i++;
         }
         // Add link to next page.
         if ($this->piVars['pointer'] < $maxPages - 1) {
-            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', true), ['pointer' => $this->piVars['pointer'] + 1], true);
+            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), ['pointer' => $this->piVars['pointer'] + 1], TRUE);
         } else {
-            $output .= '<span>' . $this->pi_getLL('nextPage', '&gt;', true) . '</span>';
+            $output .= '<span>' . $this->pi_getLL('nextPage', '&gt;', TRUE) . '</span>';
         }
         return $output;
     }
@@ -144,7 +144,7 @@ 
                     if ($index_name == 'title') {
                         // Get title of parent document if needed.
                         if (empty($value) && $this->conf['getTitle']) {
-                            $superiorTitle = Document::getTitle($this->list[$number]['uid'], true);
+                            $superiorTitle = Document::getTitle($this->list[$number]['uid'], TRUE);
                             if (!empty($superiorTitle)) {
                                 $value = '[' . $superiorTitle . ']';
                             }
@@ -166,7 +166,7 @@ 
                             'parameter' => $this->conf['targetPid'],
                             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
+                            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
                         ];
                         $value = $this->cObj->typoLink(htmlspecialchars($value), $conf);
                     } elseif ($index_name == 'owner' && !empty($value)) {
@@ -213,12 +213,12 @@ 
                 'parameter' => $this->conf['targetBasket'],
                 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
+                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
             ];
-            $link = $this->cObj->typoLink($this->pi_getLL('addBasket', '', true), $conf);
+            $link = $this->cObj->typoLink($this->pi_getLL('addBasket', '', TRUE), $conf);
             $markerArray['###BASKETBUTTON###'] = $link;
         }
-        return $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($template['entry'], '###SUBTEMPLATE###', $subpart, true), $markerArray);
+        return $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($template['entry'], '###SUBTEMPLATE###', $subpart, TRUE), $markerArray);
     }
 
     /**
@@ -262,7 +262,7 @@ 
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http']
         ];
         if (!empty($this->piVars['logicalPage'])) {
-            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, ['logicalPage' => $this->piVars['logicalPage']], '', true, false);
+            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, ['logicalPage' => $this->piVars['logicalPage']], '', TRUE, FALSE);
         }
         // Build HTML form.
         $sorting = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />';
@@ -273,10 +273,10 @@ 
         }
         // Select sort field.
         $uniqId = uniqid($prefix . '-');
-        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('orderBy', '', true) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[order]" onchange="javascript:this.form.submit();">';
+        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('orderBy', '', TRUE) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[order]" onchange="javascript:this.form.submit();">';
         // Add relevance sorting if this is a search result list.
         if ($this->list->metadata['options']['source'] == 'search') {
-            $sorting .= '<option value="score"' . (($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '') . '>' . $this->pi_getLL('relevance', '', true) . '</option>';
+            $sorting .= '<option value="score"' . (($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '') . '>' . $this->pi_getLL('relevance', '', TRUE) . '</option>';
         }
         foreach ($this->sortables as $index_name => $label) {
             $sorting .= '<option value="' . $index_name . '"' . (($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
@@ -284,9 +284,9 @@ 
         $sorting .= '</select>';
         // Select sort direction.
         $uniqId = uniqid($prefix . '-');
-        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('direction', '', true) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[asc]" onchange="javascript:this.form.submit();">';
-        $sorting .= '<option value="1" ' . ($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.asc', '', true) . '</option>';
-        $sorting .= '<option value="0" ' . (!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.desc', '', true) . '</option>';
+        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('direction', '', TRUE) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[asc]" onchange="javascript:this.form.submit();">';
+        $sorting .= '<option value="1" ' . ($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.asc', '', TRUE) . '</option>';
+        $sorting .= '<option value="0" ' . (!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.desc', '', TRUE) . '</option>';
         $sorting .= '</select></div></form>';
         return $sorting;
     }
@@ -320,7 +320,7 @@ 
                     if ($index_name == 'title') {
                         // Get title of parent document if needed.
                         if (empty($value) && $this->conf['getTitle']) {
-                            $superiorTitle = Document::getTitle($subpart['uid'], true);
+                            $superiorTitle = Document::getTitle($subpart['uid'], TRUE);
                             if (!empty($superiorTitle)) {
                                 $value = '[' . $superiorTitle . ']';
                             }
@@ -344,7 +344,7 @@ 
                             'parameter' => $this->conf['targetPid'],
                             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
+                            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
                         ];
                         $value = $this->cObj->typoLink(htmlspecialchars($value), $conf);
                     } elseif ($index_name == 'owner' && !empty($value)) {
@@ -392,14 +392,14 @@ 
                     'parameter' => $this->conf['targetBasket'],
                     'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                     'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                    'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
+                    'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
                 ];
-                $link = $this->cObj->typoLink($this->pi_getLL('addBasket', '', true), $conf);
+                $link = $this->cObj->typoLink($this->pi_getLL('addBasket', '', TRUE), $conf);
                 $markerArray['###SUBBASKETBUTTON###'] = $link;
             }
             $content .= $this->templateService->substituteMarkerArray($template['subentry'], $markerArray);
         }
-        return $this->templateService->substituteSubpart($this->templateService->getSubpart($this->template, '###SUBTEMPLATE###'), '###SUBENTRY###', $content, true);
+        return $this->templateService->substituteSubpart($this->templateService->getSubpart($this->template, '###SUBTEMPLATE###'), '###SUBENTRY###', $content, TRUE);
     }
 
     /**
@@ -460,7 +460,7 @@ 
     {
         $this->init($conf);
         // Don't cache the output.
-        $this->setCache(false);
+        $this->setCache(FALSE);
         // Load the list.
         $this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(DocumentList::class);
         $currentEntry = $this->piVars['pointer'] * $this->conf['limit'];
@@ -553,11 +553,11 @@ 
             $lastEntry = ($this->piVars['pointer'] * $this->conf['limit']) + $this->conf['limit'];
             $markerArray['###COUNT###'] = htmlspecialchars(sprintf($this->pi_getLL('count'), $currentEntry, $lastEntry < $this->list->metadata['options']['numberOfToplevelHits'] ? $lastEntry : $this->list->metadata['options']['numberOfToplevelHits'], $this->list->metadata['options']['numberOfToplevelHits']));
         } else {
-            $markerArray['###COUNT###'] = $this->pi_getLL('nohits', '', true);
+            $markerArray['###COUNT###'] = $this->pi_getLL('nohits', '', TRUE);
         }
         $markerArray['###PAGEBROWSER###'] = $this->getPageBrowser();
         $markerArray['###SORTING###'] = $this->getSortingForm();
-        $content = $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($this->template, '###ENTRY###', $content, true), $markerArray);
+        $content = $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($this->template, '###ENTRY###', $content, TRUE), $markerArray);
         return $this->pi_wrapInBaseClass($content);
     }
 }

Classes/Plugin/PageView.php

Braces +8 added lines, -16 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageView extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class PageView extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/PageView.php';
 
     /**
@@ -68,8 +67,7 @@ 
      *
      * @return void
      */
-    protected function addViewerJS()
-    {
+    protected function addViewerJS() {
 
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
         // Add OpenLayers library.
@@ -114,8 +112,7 @@ 
      *
      * @return array Marker array
      */
-    protected function addInteraction()
-    {
+    protected function addInteraction() {
         $markerArray = [];
         if ($this->piVars['id']) {
             if ($this->conf['crop']) {
@@ -141,8 +138,7 @@ 
      *
      * @return array Marker array
      */
-    protected function addBasketForm()
-    {
+    protected function addBasketForm() {
         $markerArray = [];
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
@@ -188,8 +184,7 @@ 
      *
      * @return array URL and MIME type of image file
      */
-    protected function getImage($page)
-    {
+    protected function getImage($page) {
         $image = [];
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrps']);
@@ -223,8 +218,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getFulltext($page)
-    {
+    protected function getFulltext($page) {
         $fulltext = [];
         // Get fulltext link.
         if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']])) {
@@ -253,8 +247,7 @@ 
      * @return array An array containing the IRIs of the AnnotationLists / AnnotationPages as well as
      *               some information about the canvas.
      */
-    protected function getAnnotationContainers($page)
-    {
+    protected function getAnnotationContainers($page) {
         if ($this->doc instanceof IiifManifest) {
             $canvasId = $this->doc->physicalStructure[$page];
             $iiif = $this->doc->getIiif();
@@ -311,8 +304,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Load current document.
         $this->loadDocument();

Spacing +30 added lines, -30 removed lines

@@ -73,33 +73,33 @@ 
 
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
         // Add OpenLayers library.
-        $pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/OpenLayers/ol3.css');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/OpenLayers/glif.min.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/OpenLayers/ol3-dlf.js');
+        $pageRenderer->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/OpenLayers/ol3.css');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/OpenLayers/glif.min.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/OpenLayers/ol3-dlf.js');
         // Add viewer library.
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/Utility.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/OL3.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/OL3Styles.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/OL3Sources.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/AltoParser.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/ImageManipulationControl.js');
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/FulltextControl.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/Utility.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/OL3.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/OL3Styles.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/OL3Sources.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/AltoParser.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/ImageManipulationControl.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/FulltextControl.js');
         if ($this->doc instanceof IiifManifest) {
-            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/AnnotationParser.js');
-            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/AnnotationControl.js');
+            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/AnnotationParser.js');
+            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/AnnotationControl.js');
         }
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/PageView/PageView.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/PageView/PageView.js');
         // Add viewer configuration.
         $viewerConfiguration = '
             $(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->conf['elementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->conf['elementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });
@@ -119,14 +119,14 @@ 
         $markerArray = [];
         if ($this->piVars['id']) {
             if ($this->conf['crop']) {
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="' . $this->pi_getLL('editMode', '', true) . '">' . $this->pi_getLL('editMode', '', true) . '</a>';
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="' . $this->pi_getLL('editRemove', '', true) . '">' . $this->pi_getLL('editRemove', '', true) . '</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="'.$this->pi_getLL('editMode', '', true).'">'.$this->pi_getLL('editMode', '', true).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="'.$this->pi_getLL('editRemove', '', true).'">'.$this->pi_getLL('editRemove', '', true).'</a>';
             } else {
                 $markerArray['###EDITBUTTON###'] = '';
                 $markerArray['###EDITREMOVE###'] = '';
             }
             if ($this->conf['magnifier']) {
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="' . $this->pi_getLL('magnifier', '', true) . '">' . $this->pi_getLL('magnifier', '', true) . '</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="'.$this->pi_getLL('magnifier', '', true).'">'.$this->pi_getLL('magnifier', '', true).'</a>';
             } else {
                 $markerArray['###MAGNIFIER###'] = '';
             }
@@ -161,15 +161,15 @@ 
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', true, false),
                 'title' => $label
             ];
-            $output = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="' . $this->piVars['page'] . '">';
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="' . $this->piVars['page'] . '">';
+            $output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
+            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.$this->piVars['page'].'">';
+            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.$this->piVars['page'].'">';
             $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
             $output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
             $output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
             $output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
             $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
-            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">' . $label . '</button>';
+            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
             $output .= '</form>';
             $output .= '<script>';
             $output .= '$(document).ready(function() { $("#submitBasketForm").click(function() { $("#addToBasketForm").submit(); }); });';
@@ -205,14 +205,14 @@ 
                         'parameter' => $GLOBALS['TSFE']->id,
                         'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                         'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($image['url']),
+                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($image['url']),
                     ];
                     $image['url'] = $this->cObj->typoLink_URL($linkConf);
                 }
                 $image['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp]);
                 break;
             } else {
-                Helper::devLog('File not found in fileGrp "' . $fileGrp . '"', DEVLOG_SEVERITY_WARNING);
+                Helper::devLog('File not found in fileGrp "'.$fileGrp.'"', DEVLOG_SEVERITY_WARNING);
             }
         }
         return $image;
@@ -239,13 +239,13 @@ 
                     'parameter' => $GLOBALS['TSFE']->id,
                     'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                     'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                    'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($fulltext['url']),
+                    'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($fulltext['url']),
                 ];
                 $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
             }
             $fulltext['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
         } else {
-            Helper::devLog('File not found in fileGrp "' . $this->conf['fileGrpFulltext'] . '"', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', DEVLOG_SEVERITY_WARNING);
         }
         return $fulltext;
     }

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -119,14 +119,14 @@ 
         $markerArray = [];
         if ($this->piVars['id']) {
             if ($this->conf['crop']) {
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="' . $this->pi_getLL('editMode', '', true) . '">' . $this->pi_getLL('editMode', '', true) . '</a>';
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="' . $this->pi_getLL('editRemove', '', true) . '">' . $this->pi_getLL('editRemove', '', true) . '</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="' . $this->pi_getLL('editMode', '', TRUE) . '">' . $this->pi_getLL('editMode', '', TRUE) . '</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="' . $this->pi_getLL('editRemove', '', TRUE) . '">' . $this->pi_getLL('editRemove', '', TRUE) . '</a>';
             } else {
                 $markerArray['###EDITBUTTON###'] = '';
                 $markerArray['###EDITREMOVE###'] = '';
             }
             if ($this->conf['magnifier']) {
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="' . $this->pi_getLL('magnifier', '', true) . '">' . $this->pi_getLL('magnifier', '', true) . '</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="' . $this->pi_getLL('magnifier', '', TRUE) . '">' . $this->pi_getLL('magnifier', '', TRUE) . '</a>';
             } else {
                 $markerArray['###MAGNIFIER###'] = '';
             }
@@ -146,10 +146,10 @@ 
         $markerArray = [];
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
-            $label = $this->pi_getLL('addBasket', '', true);
+            $label = $this->pi_getLL('addBasket', '', TRUE);
             $params = [
                 'id' => $this->piVars['id'],
-                'addToBasket' => true
+                'addToBasket' => TRUE
             ];
             if (empty($this->piVars['page'])) {
                 $params['page'] = 1;
@@ -158,7 +158,7 @@ 
                 'parameter' => $this->conf['targetBasket'],
                 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', true, false),
+                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
                 'title' => $label
             ];
             $output = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
@@ -267,7 +267,7 @@ 
             if ($iiif instanceof ManifestInterface) {
                 $canvas = $iiif->getContainedResourceById($canvasId);
                 /* @var $canvas \Ubl\Iiif\Presentation\Common\Model\Resources\CanvasInterface */
-                if ($canvas != null && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
+                if ($canvas != NULL && !empty($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING))) {
                     $annotationContainers = [];
                     /*
                      *  TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
@@ -277,11 +277,11 @@ 
                      *  On the other hand, server connections are potentially better than client connections. Downloading annotation lists
                      */
                     foreach ($canvas->getPossibleTextAnnotationContainers(Motivation::PAINTING) as $annotationContainer) {
-                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != null) {
+                        if (($textAnnotations = $annotationContainer->getTextAnnotations(Motivation::PAINTING)) != NULL) {
                             foreach ($textAnnotations as $annotation) {
                                 if (
                                     $annotation->getBody()->getFormat() == 'text/plain'
-                                    && $annotation->getBody()->getChars() != null
+                                    && $annotation->getBody()->getChars() != NULL
                                 ) {
                                     $annotationListData = [];
                                     $annotationListData['uri'] = $annotationContainer->getId();
@@ -323,7 +323,7 @@ 
         // Load current document.
         $this->loadDocument();
         if (
-            $this->doc === null
+            $this->doc === NULL
             || $this->doc->numPages < 1
         ) {
             // Quit without doing anything if required variables are not set.

Classes/Plugin/Navigation.php

Spacing +17 added lines, -17 removed lines

@@ -69,18 +69,18 @@ 
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http']
         ];
-        $output = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />';
+        $output = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
         // Add plugin variables.
         foreach ($this->piVars as $piVar => $value) {
             if ($piVar != 'page' && $piVar != 'DATA' && !empty($value)) {
-                $output .= '<input type="hidden" name="' . $this->prefixId . '[' . $piVar . ']" value="' . $value . '" />';
+                $output .= '<input type="hidden" name="'.$this->prefixId.'['.$piVar.']" value="'.$value.'" />';
             }
         }
         // Add page selector.
-        $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)) . '-');
-        $output .= '<label for="' . $uniqId . '">' . $this->pi_getLL('selectPage', '', true) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[page]" onchange="javascript:this.form.submit();"' . ($this->doc->numPages < 1 ? ' disabled="disabled"' : '') . '>';
+        $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)).'-');
+        $output .= '<label for="'.$uniqId.'">'.$this->pi_getLL('selectPage', '', true).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
         for ($i = 1; $i <= $this->doc->numPages; $i++) {
-            $output .= '<option value="' . $i . '"' . ($this->piVars['page'] == $i ? ' selected="selected"' : '') . '>[' . $i . ']' . ($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '') . '</option>';
+            $output .= '<option value="'.$i.'"'.($this->piVars['page'] == $i ? ' selected="selected"' : '').'>['.$i.']'.($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '').'</option>';
         }
         $output .= '</select></div></form>';
         return $output;
@@ -138,53 +138,53 @@ 
         if ($this->piVars['page'] > 1) {
             $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', true), ['page' => 1]);
         } else {
-            $markerArray['###FIRST###'] = '<span title="' . $this->pi_getLL('firstPage', '', true) . '">' . $this->pi_getLL('firstPage', '', true) . '</span>';
+            $markerArray['###FIRST###'] = '<span title="'.$this->pi_getLL('firstPage', '', true).'">'.$this->pi_getLL('firstPage', '', true).'</span>';
         }
         // Link back X pages.
         if ($this->piVars['page'] > $pageSteps) {
             $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', true), $pageSteps), ['page' => $this->piVars['page'] - $pageSteps]);
         } else {
-            $markerArray['###BACK###'] = '<span title="' . sprintf($this->pi_getLL('backXPages', '', true), $pageSteps) . '">' . sprintf($this->pi_getLL('backXPages', '', true), $pageSteps) . '</span>';
+            $markerArray['###BACK###'] = '<span title="'.sprintf($this->pi_getLL('backXPages', '', true), $pageSteps).'">'.sprintf($this->pi_getLL('backXPages', '', true), $pageSteps).'</span>';
         }
         // Link to previous page.
         if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
             $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', true), ['page' => $this->piVars['page'] - (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###PREVIOUS###'] = '<span title="' . $this->pi_getLL('prevPage', '', true) . '">' . $this->pi_getLL('prevPage', '', true) . '</span>';
+            $markerArray['###PREVIOUS###'] = '<span title="'.$this->pi_getLL('prevPage', '', true).'">'.$this->pi_getLL('prevPage', '', true).'</span>';
         }
         // Link to next page.
         if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
             $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', true), ['page' => $this->piVars['page'] + (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###NEXT###'] = '<span title="' . $this->pi_getLL('nextPage', '', true) . '">' . $this->pi_getLL('nextPage', '', true) . '</span>';
+            $markerArray['###NEXT###'] = '<span title="'.$this->pi_getLL('nextPage', '', true).'">'.$this->pi_getLL('nextPage', '', true).'</span>';
         }
         // Link forward X pages.
         if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
             $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps), ['page' => $this->piVars['page'] + $pageSteps]);
         } else {
-            $markerArray['###FORWARD###'] = '<span title="' . sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps) . '">' . sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps) . '</span>';
+            $markerArray['###FORWARD###'] = '<span title="'.sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps).'">'.sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps).'</span>';
         }
         // Link to last page.
         if ($this->piVars['page'] < $this->doc->numPages) {
             $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', true), ['page' => $this->doc->numPages]);
         } else {
-            $markerArray['###LAST###'] = '<span title="' . $this->pi_getLL('lastPage', '', true) . '">' . $this->pi_getLL('lastPage', '', true) . '</span>';
+            $markerArray['###LAST###'] = '<span title="'.$this->pi_getLL('lastPage', '', true).'">'.$this->pi_getLL('lastPage', '', true).'</span>';
         }
         // Add double page switcher.
         if ($this->doc->numPages > 0) {
             if (!$this->piVars['double']) {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', true), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="' . $this->pi_getLL('doublePageOn', '', true) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', true), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="'.$this->pi_getLL('doublePageOn', '', true).'"');
             } else {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', true), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="' . $this->pi_getLL('doublePageOff', '', true) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', true), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="'.$this->pi_getLL('doublePageOff', '', true).'"');
             }
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
-                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', true), ['page' => $this->piVars['page'] + 1], 'title="' . $this->pi_getLL('doublePage+1', '', true) . '"');
+                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', true), ['page' => $this->piVars['page'] + 1], 'title="'.$this->pi_getLL('doublePage+1', '', true).'"');
             } else {
-                $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . $this->pi_getLL('doublePage+1', '', true) . '">' . $this->pi_getLL('doublePage+1', '', true) . '</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.$this->pi_getLL('doublePage+1', '', true).'">'.$this->pi_getLL('doublePage+1', '', true).'</span>';
             }
         } else {
-            $markerArray['###DOUBLEPAGE###'] = '<span title="' . $this->pi_getLL('doublePageOn', '', true) . '">' . $this->pi_getLL('doublePageOn', '', true) . '</span>';
-            $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . $this->pi_getLL('doublePage+1', '', true) . '">' . $this->pi_getLL('doublePage+1', '', true) . '</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span title="'.$this->pi_getLL('doublePageOn', '', true).'">'.$this->pi_getLL('doublePageOn', '', true).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.$this->pi_getLL('doublePage+1', '', true).'">'.$this->pi_getLL('doublePage+1', '', true).'</span>';
         }
         // Add page selector.
         $markerArray['###PAGESELECT###'] = $this->getPageSelector();

Braces +5 added lines, -10 removed lines

@@ -23,8 +23,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Navigation extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Navigation extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Navigation.php';
 
     /**
@@ -34,8 +33,7 @@ 
      *
      * @return string Link to the list view ready to output
      */
-    protected function getLinkToListview()
-    {
+    protected function getLinkToListview() {
         if (!empty($this->conf['targetPid'])) {
             // Load the list.
             $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(DocumentList::class);
@@ -61,8 +59,7 @@ 
      *
      * @return string Page selector ready to output
      */
-    protected function getPageSelector()
-    {
+    protected function getPageSelector() {
         // Configure @action URL for form.
         $linkConf = [
             'parameter' => $GLOBALS['TSFE']->id,
@@ -96,8 +93,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Turn cache on.
         $this->setCache(true);
@@ -212,8 +208,7 @@ 
      *
      * @return string Typolink ready to output
      */
-    protected function makeLink($label, array $overrulePIvars = [], $aTagParams = '')
-    {
+    protected function makeLink($label, array $overrulePIvars = [], $aTagParams = '') {
         // Merge plugin variables with new set of values.
         if (is_array($this->piVars)) {
             $piVars = $this->piVars;

Upper-Lower-Casing +30 added lines, -30 removed lines

@@ -46,9 +46,9 @@ 
                     'parameter' => $this->conf['targetPid'],
                     'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                     'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                    'title' => $this->pi_getLL('linkToList', '', true)
+                    'title' => $this->pi_getLL('linkToList', '', TRUE)
                 ];
-                return $this->cObj->typoLink($this->pi_getLL('linkToList', '', true), $conf);
+                return $this->cObj->typoLink($this->pi_getLL('linkToList', '', TRUE), $conf);
             }
         }
         return '';
@@ -78,7 +78,7 @@ 
         }
         // Add page selector.
         $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)) . '-');
-        $output .= '<label for="' . $uniqId . '">' . $this->pi_getLL('selectPage', '', true) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[page]" onchange="javascript:this.form.submit();"' . ($this->doc->numPages < 1 ? ' disabled="disabled"' : '') . '>';
+        $output .= '<label for="' . $uniqId . '">' . $this->pi_getLL('selectPage', '', TRUE) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[page]" onchange="javascript:this.form.submit();"' . ($this->doc->numPages < 1 ? ' disabled="disabled"' : '') . '>';
         for ($i = 1; $i <= $this->doc->numPages; $i++) {
             $output .= '<option value="' . $i . '"' . ($this->piVars['page'] == $i ? ' selected="selected"' : '') . '>[' . $i . ']' . ($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '') . '</option>';
         }
@@ -100,10 +100,10 @@ 
     {
         $this->init($conf);
         // Turn cache on.
-        $this->setCache(true);
+        $this->setCache(TRUE);
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null) {
+        if ($this->doc === NULL) {
             // Quit without doing anything if required variables are not set.
             return $content;
         } else {
@@ -136,67 +136,67 @@ 
         $pageSteps = $this->conf['pageStep'] * ($this->piVars['double'] + 1);
         // Link to first page.
         if ($this->piVars['page'] > 1) {
-            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', true), ['page' => 1]);
+            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), ['page' => 1]);
         } else {
-            $markerArray['###FIRST###'] = '<span title="' . $this->pi_getLL('firstPage', '', true) . '">' . $this->pi_getLL('firstPage', '', true) . '</span>';
+            $markerArray['###FIRST###'] = '<span title="' . $this->pi_getLL('firstPage', '', TRUE) . '">' . $this->pi_getLL('firstPage', '', TRUE) . '</span>';
         }
         // Link back X pages.
         if ($this->piVars['page'] > $pageSteps) {
-            $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', true), $pageSteps), ['page' => $this->piVars['page'] - $pageSteps]);
+            $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), ['page' => $this->piVars['page'] - $pageSteps]);
         } else {
-            $markerArray['###BACK###'] = '<span title="' . sprintf($this->pi_getLL('backXPages', '', true), $pageSteps) . '">' . sprintf($this->pi_getLL('backXPages', '', true), $pageSteps) . '</span>';
+            $markerArray['###BACK###'] = '<span title="' . sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps) . '">' . sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps) . '</span>';
         }
         // Link to previous page.
         if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
-            $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', true), ['page' => $this->piVars['page'] - (1 + $this->piVars['double'])]);
+            $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), ['page' => $this->piVars['page'] - (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###PREVIOUS###'] = '<span title="' . $this->pi_getLL('prevPage', '', true) . '">' . $this->pi_getLL('prevPage', '', true) . '</span>';
+            $markerArray['###PREVIOUS###'] = '<span title="' . $this->pi_getLL('prevPage', '', TRUE) . '">' . $this->pi_getLL('prevPage', '', TRUE) . '</span>';
         }
         // Link to next page.
         if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
-            $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', true), ['page' => $this->piVars['page'] + (1 + $this->piVars['double'])]);
+            $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), ['page' => $this->piVars['page'] + (1 + $this->piVars['double'])]);
         } else {
-            $markerArray['###NEXT###'] = '<span title="' . $this->pi_getLL('nextPage', '', true) . '">' . $this->pi_getLL('nextPage', '', true) . '</span>';
+            $markerArray['###NEXT###'] = '<span title="' . $this->pi_getLL('nextPage', '', TRUE) . '">' . $this->pi_getLL('nextPage', '', TRUE) . '</span>';
         }
         // Link forward X pages.
         if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
-            $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps), ['page' => $this->piVars['page'] + $pageSteps]);
+            $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), ['page' => $this->piVars['page'] + $pageSteps]);
         } else {
-            $markerArray['###FORWARD###'] = '<span title="' . sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps) . '">' . sprintf($this->pi_getLL('forwardXPages', '', true), $pageSteps) . '</span>';
+            $markerArray['###FORWARD###'] = '<span title="' . sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps) . '">' . sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps) . '</span>';
         }
         // Link to last page.
         if ($this->piVars['page'] < $this->doc->numPages) {
-            $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', true), ['page' => $this->doc->numPages]);
+            $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), ['page' => $this->doc->numPages]);
         } else {
-            $markerArray['###LAST###'] = '<span title="' . $this->pi_getLL('lastPage', '', true) . '">' . $this->pi_getLL('lastPage', '', true) . '</span>';
+            $markerArray['###LAST###'] = '<span title="' . $this->pi_getLL('lastPage', '', TRUE) . '">' . $this->pi_getLL('lastPage', '', TRUE) . '</span>';
         }
         // Add double page switcher.
         if ($this->doc->numPages > 0) {
             if (!$this->piVars['double']) {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', true), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="' . $this->pi_getLL('doublePageOn', '', true) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="' . $this->pi_getLL('doublePageOn', '', TRUE) . '"');
             } else {
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', true), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="' . $this->pi_getLL('doublePageOff', '', true) . '"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="' . $this->pi_getLL('doublePageOff', '', TRUE) . '"');
             }
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
-                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', true), ['page' => $this->piVars['page'] + 1], 'title="' . $this->pi_getLL('doublePage+1', '', true) . '"');
+                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), ['page' => $this->piVars['page'] + 1], 'title="' . $this->pi_getLL('doublePage+1', '', TRUE) . '"');
             } else {
-                $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . $this->pi_getLL('doublePage+1', '', true) . '">' . $this->pi_getLL('doublePage+1', '', true) . '</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . $this->pi_getLL('doublePage+1', '', TRUE) . '">' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
             }
         } else {
-            $markerArray['###DOUBLEPAGE###'] = '<span title="' . $this->pi_getLL('doublePageOn', '', true) . '">' . $this->pi_getLL('doublePageOn', '', true) . '</span>';
-            $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . $this->pi_getLL('doublePage+1', '', true) . '">' . $this->pi_getLL('doublePage+1', '', true) . '</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span title="' . $this->pi_getLL('doublePageOn', '', TRUE) . '">' . $this->pi_getLL('doublePageOn', '', TRUE) . '</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . $this->pi_getLL('doublePage+1', '', TRUE) . '">' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
         }
         // Add page selector.
         $markerArray['###PAGESELECT###'] = $this->getPageSelector();
         // Add link to listview if applicable.
         $markerArray['###LINKLISTVIEW###'] = $this->getLinkToListview();
         // Fill some language labels if available.
-        $markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', true);
-        $markerArray['###ZOOM_OUT###'] = $this->pi_getLL('zoom-out', '', true);
-        $markerArray['###ZOOM_FULLSCREEN###'] = $this->pi_getLL('zoom-fullscreen', '', true);
-        $markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', true);
-        $markerArray['###ROTATE_RIGHT###'] = $this->pi_getLL('rotate-right', '', true);
-        $markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', true);
+        $markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', TRUE);
+        $markerArray['###ZOOM_OUT###'] = $this->pi_getLL('zoom-out', '', TRUE);
+        $markerArray['###ZOOM_FULLSCREEN###'] = $this->pi_getLL('zoom-fullscreen', '', TRUE);
+        $markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', TRUE);
+        $markerArray['###ROTATE_RIGHT###'] = $this->pi_getLL('rotate-right', '', TRUE);
+        $markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', TRUE);
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);
     }
@@ -227,7 +227,7 @@ 
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
             'ATagParams' => $aTagParams,
-            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', true, false),
+            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', TRUE, FALSE),
             'title' => $label
         ];
         return $this->cObj->typoLink($label, $conf);

Classes/Common/AbstractPlugin.php

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
             $templateFile = $this->conf['templateFile'];
         } else {
             // Load default template from extension.
-            $templateFile = 'EXT:' . $this->extKey . '/Resources/Private/Templates/' . Helper::getUnqualifiedClassName(get_class($this)) . '.tmpl';
+            $templateFile = 'EXT:'.$this->extKey.'/Resources/Private/Templates/'.Helper::getUnqualifiedClassName(get_class($this)).'.tmpl';
         }
         // Substitute strings like "EXT:" in given template file location.
         $fileResource = $GLOBALS['TSFE']->tmpl->getFileName($templateFile);
@@ -102,12 +102,12 @@ 
             $conf = Helper::mergeRecursiveWithOverrule($flexFormConf, $conf);
         }
         // Read plugin TS configuration.
-        $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dlf_' . strtolower(Helper::getUnqualifiedClassName(get_class($this))) . '.'];
+        $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dlf_'.strtolower(Helper::getUnqualifiedClassName(get_class($this))).'.'];
         if (is_array($pluginConf)) {
             $conf = Helper::mergeRecursiveWithOverrule($pluginConf, $conf);
         }
         // Read general TS configuration.
-        $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId . '.'];
+        $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId.'.'];
         if (is_array($generalConf)) {
             $conf = Helper::mergeRecursiveWithOverrule($generalConf, $conf);
         }
@@ -125,7 +125,7 @@ 
         // Set default plugin variables.
         $this->pi_setPiVarDefaults();
         // Load translation files.
-        $this->pi_loadLL('EXT:' . $this->extKey . '/Resources/Private/Language/' . Helper::getUnqualifiedClassName(get_class($this)) . '.xml');
+        $this->pi_loadLL('EXT:'.$this->extKey.'/Resources/Private/Language/'.Helper::getUnqualifiedClassName(get_class($this)).'.xml');
     }
 
     /**
@@ -149,7 +149,7 @@ 
             if (!$this->doc->ready) {
                 // Destroy the incomplete object.
                 $this->doc = null;
-                Helper::devLog('Failed to load document with UID ' . $this->piVars['id'], DEVLOG_SEVERITY_ERROR);
+                Helper::devLog('Failed to load document with UID '.$this->piVars['id'], DEVLOG_SEVERITY_ERROR);
             } else {
                 // Set configuration PID.
                 $this->doc->cPid = $this->conf['pages'];
@@ -177,10 +177,10 @@ 
                 // Try to load document.
                 $this->loadDocument();
             } else {
-                Helper::devLog('Failed to load document with record ID "' . $this->piVars['recordId'] . '"', DEVLOG_SEVERITY_ERROR);
+                Helper::devLog('Failed to load document with record ID "'.$this->piVars['recordId'].'"', DEVLOG_SEVERITY_ERROR);
             }
         } else {
-            Helper::devLog('Invalid UID ' . $this->piVars['id'] . ' or PID ' . $this->conf['pages'] . ' for document loading', DEVLOG_SEVERITY_ERROR);
+            Helper::devLog('Invalid UID '.$this->piVars['id'].' or PID '.$this->conf['pages'].' for document loading', DEVLOG_SEVERITY_ERROR);
         }
     }
 
@@ -233,8 +233,8 @@ 
         if (!$cache) {
             $conf['no_cache'] = true;
         }
-        $conf['parameter'] = $altPageId ?: ($this->pi_tmpPageId ?: 'current');
-        $conf['additionalParams'] = $this->conf['parent.']['addParams'] . HttpUtility::buildQueryString($urlParameters, '&', true) . $this->pi_moreParams;
+        $conf['parameter'] = $altPageId ? : ($this->pi_tmpPageId ? : 'current');
+        $conf['additionalParams'] = $this->conf['parent.']['addParams'].HttpUtility::buildQueryString($urlParameters, '&', true).$this->pi_moreParams;
         // Add additional configuration for absolute URLs.
         $conf['forceAbsoluteUrl'] = !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0;
         $conf['forceAbsoluteUrl.']['scheme'] = !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http';
@@ -255,9 +255,9 @@ 
     {
         if (!$this->frontendController->config['config']['disableWrapInBaseClass']) {
             // Use class name instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins.
-            $content = '<div class="tx-dlf-' . strtolower(Helper::getUnqualifiedClassName(get_class($this))) . '">' . $content . '</div>';
+            $content = '<div class="tx-dlf-'.strtolower(Helper::getUnqualifiedClassName(get_class($this))).'">'.$content.'</div>';
             if (!$this->frontendController->config['config']['disablePrefixComment']) {
-                $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";
+                $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";
             }
         }
         return $content;

Braces +8 added lines, -16 removed lines

@@ -26,8 +26,7 @@ 
  * @access public
  * @abstract
  */
-abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
-{
+abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
     public $extKey = 'dlf';
     public $prefixId = 'tx_dlf';
     public $scriptRelPath = 'Classes/Common/AbstractPlugin.php';
@@ -68,8 +67,7 @@ 
      *
      * @return void
      */
-    protected function getTemplate($part = '###TEMPLATE###')
-    {
+    protected function getTemplate($part = '###TEMPLATE###') {
         $this->templateService = GeneralUtility::makeInstance(MarkerBasedTemplateService::class);
         if (!empty($this->conf['templateFile'])) {
             // Load template file from configuration.
@@ -93,8 +91,7 @@ 
      *
      * @return void
      */
-    protected function init(array $conf)
-    {
+    protected function init(array $conf) {
         // Read FlexForm configuration.
         $flexFormConf = [];
         $this->cObj->readFlexformIntoConf($this->cObj->data['pi_flexform'], $flexFormConf);
@@ -135,8 +132,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument()
-    {
+    protected function loadDocument() {
         // Check for required variable.
         if (
             !empty($this->piVars['id'])
@@ -207,8 +203,7 @@ 
      *
      * @return array The resulting typoscript array
      */
-    protected function parseTS($string = '')
-    {
+    protected function parseTS($string = '') {
         $parser = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::class);
         $parser->parse($string);
         return $parser->setup;
@@ -227,8 +222,7 @@ 
      *
      * @return string The input string wrapped in <a> tags
      */
-    public function pi_linkTP($str, $urlParameters = [], $cache = false, $altPageId = 0)
-    {
+    public function pi_linkTP($str, $urlParameters = [], $cache = false, $altPageId = 0) {
         $conf = [];
         if (!$cache) {
             $conf['no_cache'] = true;
@@ -251,8 +245,7 @@ 
      *
      * @return string HTML content wrapped, ready to return to the parent object.
      */
-    public function pi_wrapInBaseClass($content)
-    {
+    public function pi_wrapInBaseClass($content) {
         if (!$this->frontendController->config['config']['disableWrapInBaseClass']) {
             // Use class name instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins.
             $content = '<div class="tx-dlf-' . strtolower(Helper::getUnqualifiedClassName(get_class($this))) . '">' . $content . '</div>';
@@ -272,8 +265,7 @@ 
      *
      * @return void
      */
-    protected function setCache($cache = true)
-    {
+    protected function setCache($cache = true) {
         if ($cache) {
             // Set cObject type to "USER" (default).
             $this->pi_USER_INT_obj = false;

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -32,8 +32,8 @@ 
     public $prefixId = 'tx_dlf';
     public $scriptRelPath = 'Classes/Common/AbstractPlugin.php';
     // Plugins are cached by default (@see setCache()).
-    public $pi_USER_INT_obj = false;
-    public $pi_checkCHash = true;
+    public $pi_USER_INT_obj = FALSE;
+    public $pi_checkCHash = TRUE;
 
     /**
      * This holds the current document
@@ -148,7 +148,7 @@ 
             $this->doc = Document::getInstance($this->piVars['id'], $pid);
             if (!$this->doc->ready) {
                 // Destroy the incomplete object.
-                $this->doc = null;
+                $this->doc = NULL;
                 Helper::devLog('Failed to load document with UID ' . $this->piVars['id'], DEVLOG_SEVERITY_ERROR);
             } else {
                 // Set configuration PID.
@@ -227,14 +227,14 @@ 
      *
      * @return string The input string wrapped in <a> tags
      */
-    public function pi_linkTP($str, $urlParameters = [], $cache = false, $altPageId = 0)
+    public function pi_linkTP($str, $urlParameters = [], $cache = FALSE, $altPageId = 0)
     {
         $conf = [];
         if (!$cache) {
-            $conf['no_cache'] = true;
+            $conf['no_cache'] = TRUE;
         }
         $conf['parameter'] = $altPageId ?: ($this->pi_tmpPageId ?: 'current');
-        $conf['additionalParams'] = $this->conf['parent.']['addParams'] . HttpUtility::buildQueryString($urlParameters, '&', true) . $this->pi_moreParams;
+        $conf['additionalParams'] = $this->conf['parent.']['addParams'] . HttpUtility::buildQueryString($urlParameters, '&', TRUE) . $this->pi_moreParams;
         // Add additional configuration for absolute URLs.
         $conf['forceAbsoluteUrl'] = !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0;
         $conf['forceAbsoluteUrl.']['scheme'] = !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http';
@@ -272,20 +272,20 @@ 
      *
      * @return void
      */
-    protected function setCache($cache = true)
+    protected function setCache($cache = TRUE)
     {
         if ($cache) {
             // Set cObject type to "USER" (default).
-            $this->pi_USER_INT_obj = false;
-            $this->pi_checkCHash = true;
+            $this->pi_USER_INT_obj = FALSE;
+            $this->pi_checkCHash = TRUE;
             if (count($this->piVars)) {
                 // Check cHash or disable caching.
                 $GLOBALS['TSFE']->reqCHash();
             }
         } else {
             // Set cObject type to "USER_INT".
-            $this->pi_USER_INT_obj = true;
-            $this->pi_checkCHash = false;
+            $this->pi_USER_INT_obj = TRUE;
+            $this->pi_checkCHash = FALSE;
             // Plugins are of type "USER" by default, so convert it to "USER_INT".
             $this->cObj->convertToUserIntObject();
         }