Erikmitk / kitodo-presentation

Classes/Plugin/Search.php

Spacing +31 added lines, -31 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\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Javascript/Search/Suggester.js');
+            $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($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
             if ($this->doc->ready) {
-                return '<input type="hidden" name="' . $this->prefixId . '[id]" value="' . ($this->doc->uid) . '" />';
+                return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.($this->doc->uid).'" />';
             }
         } elseif (!empty($list->metadata['options']['params']['filterquery'])) {
             // Get document's UID from search metadata.
@@ -134,7 +134,7 @@ 
                 }
             }
             if (!empty($documentId)) {
-                return '<input type="hidden" name="' . $this->prefixId . '[id]" value="' . $documentId . '" />';
+                return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.$documentId.'" />';
             }
         }
         return '';
@@ -157,7 +157,7 @@ 
         }
         // Add encrypted fields to search form.
         if ($name !== false) {
-            return '<input type="hidden" name="' . $this->prefixId . '[encrypted]" value="' . $name . '" />';
+            return '<input type="hidden" name="'.$this->prefixId.'[encrypted]" value="'.$name.'" />';
         } else {
             return '';
         }
@@ -183,19 +183,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 . '">' . htmlspecialchars($this->pi_getLL($operator, '')) . '</option>';
+            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-'.$operator.'" value="'.$operator.'">'.htmlspecialchars($this->pi_getLL($operator, '')).'</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);
         }
@@ -223,12 +223,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);
@@ -249,10 +249,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">' . htmlspecialchars($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">' . htmlspecialchars($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">'.htmlspecialchars($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">'.htmlspecialchars($this->pi_getLL('label.inFulltext', '')).'</label>';
         }
         return $output;
     }
@@ -269,8 +269,8 @@ 
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['showLogicalPageField'])) {
-            $output .= ' <label for="tx-dlf-search-logical-page">' . htmlspecialchars($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">'.htmlspecialchars($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;
     }
@@ -311,7 +311,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]);
@@ -328,7 +328,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]);
@@ -384,7 +384,7 @@ 
                 '###ACTION_URL###' => $this->cObj->typoLink_URL($linkConf),
                 '###LABEL_QUERY###' => (!empty($search['query']) ? htmlspecialchars($search['query']) : htmlspecialchars($this->pi_getLL('label.query'))),
                 '###LABEL_SUBMIT###' => htmlspecialchars($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() : ''),
@@ -416,7 +416,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.
@@ -437,9 +437,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]).')';
                         }
                     }
                 }
@@ -460,9 +460,9 @@ 
                     && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['id'])
                 ) {
                     // Search in document and all subordinates (valid for up to three levels of hierarchy).
-                    $params['filterquery'][]['query'] = '_query_:"{!join from=uid to=partof}uid:{!join from=uid to=partof}uid:' . $this->piVars['id'] . '"' .
-                        ' OR {!join from=uid to=partof}uid:' . $this->piVars['id'] .
-                        ' OR uid:' . $this->piVars['id'];
+                    $params['filterquery'][]['query'] = '_query_:"{!join from=uid to=partof}uid:{!join from=uid to=partof}uid:'.$this->piVars['id'].'"'.
+                        ' OR {!join from=uid to=partof}uid:'.$this->piVars['id'].
+                        ' OR uid:'.$this->piVars['id'];
                     $label .= htmlspecialchars(sprintf($this->pi_getLL('in', ''), Document::getTitle($this->piVars['id'])));
                 }
             }
@@ -476,7 +476,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']));
                 }
             }
@@ -488,7 +488,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 : '*';
@@ -538,7 +538,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;
         }
     }

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
      */
-    protected function addCurrentDocument()
-    {
+    protected function addCurrentDocument() {
         // Load current list object.
         $list = GeneralUtility::makeInstance(DocumentList::class);
         // Load current document.
@@ -147,8 +143,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.
@@ -170,8 +165,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 (
@@ -209,8 +203,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);
@@ -244,8 +237,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'])) {
@@ -264,8 +256,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'])) {
@@ -288,8 +279,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') {
@@ -345,8 +335,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);
@@ -553,8 +542,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.

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

@@ -126,7 +126,7 @@ 
             // The string may be e.g. "{!join from=uid to=partof}uid:{!join from=uid to=partof}uid:2" OR {!join from=uid to=partof}uid:2 OR uid:2"
             // or "collection_faceting:("Some Collection Title")"
             foreach ($list->metadata['options']['params']['filterquery'] as $facet) {
-                if (($lastUidPos = strrpos($facet['query'], 'uid:')) !== false) {
+                if (($lastUidPos = strrpos($facet['query'], 'uid:')) !== FALSE) {
                     $facetKeyVal = explode(':', substr($facet['query'], $lastUidPos));
                     if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($facetKeyVal[1])) {
                         $documentId = (int) $facetKeyVal[1];
@@ -156,7 +156,7 @@ 
             $name = Helper::encrypt($name);
         }
         // Add encrypted fields to search form.
-        if ($name !== false) {
+        if ($name !== FALSE) {
             return '<input type="hidden" name="' . $this->prefixId . '[encrypted]" value="' . $name . '" />';
         } else {
             return '';
@@ -187,7 +187,7 @@ 
         }
         // 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>';
         }
@@ -222,7 +222,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.
@@ -312,7 +312,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);
@@ -321,7 +321,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']);
@@ -349,7 +349,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);
@@ -428,7 +428,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])) {
@@ -477,7 +477,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.
@@ -536,7 +536,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/Common/Solr.php

Spacing +12 added lines, -12 removed lines

@@ -128,7 +128,7 @@ 
     {
         // Get next available core name if none given.
         if (empty($core)) {
-            $core = 'dlfCore' . self::getNextCoreNumber();
+            $core = 'dlfCore'.self::getNextCoreNumber();
         }
         // Get Solr service instance.
         $solr = self::getInstance($core);
@@ -224,13 +224,13 @@ 
                 ->execute();
 
             while ($resArray = $result->fetch()) {
-                $fields[] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . ($resArray['index_stored'] ? 's' : 'u') . 'i';
+                $fields[] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').($resArray['index_stored'] ? 's' : 'u').'i';
             }
 
             // Check if queried field is valid.
             $splitQuery = explode(':', $query, 2);
             if (in_array($splitQuery[0], $fields)) {
-                $query = $splitQuery[0] . ':(' . self::escapeQuery(trim($splitQuery[1], '()')) . ')';
+                $query = $splitQuery[0].':('.self::escapeQuery(trim($splitQuery[1], '()')).')';
             } else {
                 $query = self::escapeQuery($query);
             }
@@ -294,7 +294,7 @@ 
     {
         $number = max(intval($number), 0);
         // Check if core already exists.
-        $solr = self::getInstance('dlfCore' . $number);
+        $solr = self::getInstance('dlfCore'.$number);
         if (!$solr->ready) {
             return $number;
         } else {
@@ -335,7 +335,7 @@ 
                 $config['path'] .= 'solr/';
             }
             // Set connection timeout lower than PHP's max_execution_time.
-            $max_execution_time = intval(ini_get('max_execution_time')) ?: 30;
+            $max_execution_time = intval(ini_get('max_execution_time')) ? : 30;
             $config['timeout'] = MathUtility::forceIntegerInRange($conf['solrTimeout'], 1, $max_execution_time, 10);
             $this->config = $config;
         }
@@ -369,7 +369,7 @@ 
         // Set filter query to just get toplevel documents.
         $params['filterquery'][] = ['query' => 'toplevel:true'];
         // Set join query to get all documents with the same uids.
-        $params['query'] = '{!join from=uid to=uid}' . $params['query'];
+        $params['query'] = '{!join from=uid to=uid}'.$params['query'];
         // Perform search to determine the total number of toplevel hits and fetch the required rows.
         $selectQuery = $this->service->createSelect($params);
         $results = $this->service->select($selectQuery);
@@ -426,7 +426,7 @@ 
         // Set query.
         $parameters['query'] = $query;
         // Calculate cache identifier.
-        $cacheIdentifier = Helper::digest($this->core . print_r(array_merge($this->params, $parameters), true));
+        $cacheIdentifier = Helper::digest($this->core.print_r(array_merge($this->params, $parameters), true));
         $cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('tx_dlf_solr');
         $resultSet = [];
         if (($entry = $cache->get($cacheIdentifier)) === false) {
@@ -557,12 +557,12 @@ 
      */
     public function __get($var)
     {
-        $method = '_get' . ucfirst($var);
+        $method = '_get'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            Helper::devLog('There is no getter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('There is no getter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING);
             return;
         } else {
             return $this->$method();
@@ -595,12 +595,12 @@ 
      */
     public function __set($var, $value)
     {
-        $method = '_set' . ucfirst($var);
+        $method = '_set'.ucfirst($var);
         if (
             !property_exists($this, $var)
             || !method_exists($this, $method)
         ) {
-            Helper::devLog('There is no setter function for property "' . $var . '"', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('There is no setter function for property "'.$var.'"', DEVLOG_SEVERITY_WARNING);
         } else {
             $this->$method($value);
         }
@@ -637,7 +637,7 @@ 
                     'scheme' => $this->config['scheme'],
                     'host' => $this->config['host'],
                     'port' => $this->config['port'],
-                    'path' => '/' . $this->config['path'],
+                    'path' => '/'.$this->config['path'],
                     'core' => $core,
                     'username' => $this->config['username'],
                     'password' => $this->config['password'],