Erikmitk / kitodo-presentation

Classes/Plugin/Collection.php

Braces +4 added lines, -8 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Collection extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Collection extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Collection.php';
 
     /**
@@ -48,8 +47,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);
@@ -77,8 +75,7 @@ 
      *
      * @return string The list of collections ready to output
      */
-    protected function showCollectionList()
-    {
+    protected function showCollectionList() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_collections');
 
@@ -257,8 +254,7 @@ 
      *
      * @return void
      */
-    protected function showSingleCollection($id)
-    {
+    protected function showSingleCollection($id) {
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_dlf_collections');
 

Spacing +13 added lines, -13 removed lines

@@ -169,12 +169,12 @@ 
         foreach ($collections as $collection) {
             $solr_query = '';
             if ($collection['index_query'] != '') {
-                $solr_query .= '(' . $collection['index_query'] . ')';
+                $solr_query .= '('.$collection['index_query'].')';
             } else {
-                $solr_query .= 'collection:("' . $collection['index_name'] . '")';
+                $solr_query .= 'collection:("'.$collection['index_name'].'")';
             }
-            $partOfNothing = $solr->search_raw($solr_query . ' AND partof:0 AND toplevel:true', $params);
-            $partOfSomething = $solr->search_raw($solr_query . ' AND NOT partof:0 AND toplevel:true', $params);
+            $partOfNothing = $solr->search_raw($solr_query.' AND partof:0 AND toplevel:true', $params);
+            $partOfSomething = $solr->search_raw($solr_query.' AND NOT partof:0 AND toplevel:true', $params);
             // Titles are all documents that are "root" elements i.e. partof == 0
             $collection['titles'] = [];
             foreach ($partOfNothing as $doc) {
@@ -212,14 +212,14 @@ 
             $markerArray[$_key]['###TITLE###'] = $this->cObj->typoLink(htmlspecialchars($collection['label']), $conf);
             // Add feed link if applicable.
             if (!empty($this->conf['targetFeed'])) {
-                $img = '<img src="' . \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Icons/txdlffeeds.png" alt="' . htmlspecialchars($this->pi_getLL('feedAlt', '')) . '" title="' . htmlspecialchars($this->pi_getLL('feedTitle', '')) . '" />';
+                $img = '<img src="'.\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)).'Resources/Public/Icons/txdlffeeds.png" alt="'.htmlspecialchars($this->pi_getLL('feedAlt', '')).'" title="'.htmlspecialchars($this->pi_getLL('feedTitle', '')).'" />';
                 $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, [$this->prefixId => ['collection' => $collection['uid']]], false, $this->conf['targetFeed']);
             } else {
                 $markerArray[$_key]['###FEED###'] = '';
             }
             // Add thumbnail.
             if (!empty($collection['thumbnail'])) {
-                $markerArray[$_key]['###THUMBNAIL###'] = '<img alt="" title="' . htmlspecialchars($collection['label']) . '" src="' . $collection['thumbnail'] . '" />';
+                $markerArray[$_key]['###THUMBNAIL###'] = '<img alt="" title="'.htmlspecialchars($collection['label']).'" src="'.$collection['thumbnail'].'" />';
             } else {
                 $markerArray[$_key]['###THUMBNAIL###'] = '';
             }
@@ -227,9 +227,9 @@ 
             $markerArray[$_key]['###DESCRIPTION###'] = $this->pi_RTEcssText($collection['description']);
             // Build statistic's output.
             $labelTitles = $this->pi_getLL((count($collection['titles']) > 1 ? 'titles' : 'title'), '');
-            $markerArray[$_key]['###COUNT_TITLES###'] = htmlspecialchars(count($collection['titles']) . $labelTitles);
+            $markerArray[$_key]['###COUNT_TITLES###'] = htmlspecialchars(count($collection['titles']).$labelTitles);
             $labelVolumes = $this->pi_getLL((count($collection['volumes']) > 1 ? 'volumes' : 'volume'), '');
-            $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars(count($collection['volumes']) . $labelVolumes);
+            $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars(count($collection['volumes']).$labelVolumes);
         }
         // Randomize sorting?
         if (!empty($this->conf['randomize'])) {
@@ -311,14 +311,14 @@ 
                 $collectionData = $resArray;
             }
         } else {
-            Helper::devLog('No collection with UID ' . $id . ' found.', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('No collection with UID '.$id.' found.', DEVLOG_SEVERITY_WARNING);
             return;
         }
         // Fetch corresponding document UIDs from Solr.
         if ($collectionData['index_search'] != '') {
-            $solr_query = '(' . $collectionData['index_search'] . ')';
+            $solr_query = '('.$collectionData['index_search'].')';
         } else {
-            $solr_query = 'collection:("' . $collectionData['index_name'] . '") AND toplevel:true';
+            $solr_query = 'collection:("'.$collectionData['index_name'].'") AND toplevel:true';
         }
         $solr = Solr::getInstance($this->conf['solrcore']);
         if (!$solr->ready) {
@@ -367,7 +367,7 @@ 
                         'source' => 'collection',
                         'select' => $id,
                         'userid' => $collectionData['userid'],
-                        'params' => ['filterquery' => [['query' => 'collection_faceting:("' . $collectionData['index_name'] . '")']]],
+                        'params' => ['filterquery' => [['query' => 'collection_faceting:("'.$collectionData['index_name'].'")']]],
                         'core' => '',
                         'pid' => $this->conf['pages'],
                         'order' => 'title',
@@ -430,7 +430,7 @@ 
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http']
         ];
-        header('Location: ' . \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
+        header('Location: '.\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
         exit;
     }
 }

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

@@ -52,7 +52,7 @@ 
     {
         $this->init($conf);
         // Turn cache on.
-        $this->setCache(true);
+        $this->setCache(TRUE);
         // Quit without doing anything if required configuration variables are not set.
         if (empty($this->conf['pages'])) {
             Helper::devLog('Incomplete plugin configuration', DEVLOG_SEVERITY_WARNING);
@@ -206,14 +206,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' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
+                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
             ];
             // Link collection's title to list view.
             $markerArray[$_key]['###TITLE###'] = $this->cObj->typoLink(htmlspecialchars($collection['label']), $conf);
             // Add feed link if applicable.
             if (!empty($this->conf['targetFeed'])) {
                 $img = '<img src="' . \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Icons/txdlffeeds.png" alt="' . htmlspecialchars($this->pi_getLL('feedAlt', '')) . '" title="' . htmlspecialchars($this->pi_getLL('feedTitle', '')) . '" />';
-                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, [$this->prefixId => ['collection' => $collection['uid']]], false, $this->conf['targetFeed']);
+                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, [$this->prefixId => ['collection' => $collection['uid']]], FALSE, $this->conf['targetFeed']);
             } else {
                 $markerArray[$_key]['###FEED###'] = '';
             }
@@ -235,7 +235,7 @@ 
         if (!empty($this->conf['randomize'])) {
             ksort($markerArray, SORT_NUMERIC);
             // Don't cache the output.
-            $this->setCache(false);
+            $this->setCache(FALSE);
         }
         $entry = $this->templateService->getSubpart($this->template, '###ENTRY###');
         foreach ($markerArray as $marker) {
@@ -247,7 +247,7 @@ 
                 $hookObj->showCollectionList_getCustomCollectionList($this, $this->conf['templateFile'], $content, $markerArray);
             }
         }
-        return $this->templateService->substituteSubpart($this->template, '###ENTRY###', $content, true);
+        return $this->templateService->substituteSubpart($this->template, '###ENTRY###', $content, TRUE);
     }
 
     /**
@@ -371,7 +371,7 @@ 
                         'core' => '',
                         'pid' => $this->conf['pages'],
                         'order' => 'title',
-                        'order.asc' => true
+                        'order.asc' => TRUE
                     ]
                 ];
             }