kitodo / kitodo-presentation

plugins/collection/class.tx_dlf_collection.php

Indentation +4 added lines, -4 removed lines

@@ -487,10 +487,10 @@
             } else {
 
                 $subparts[$resArray['partof']][$resArray['volume_sorting']] = array (
-                   'u' => $resArray['uid'],
-                   'h' => '',
-                   's' => $sorting,
-                   'p' => array ()
+                    'u' => $resArray['uid'],
+                    'h' => '',
+                    's' => $sorting,
+                    'p' => array ()
                 );
 
             }

Spacing +38 added lines, -38 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $hookObjects = array ();
+    protected $hookObjects = array();
 
     /**
      * The main method of the PlugIn
@@ -51,7 +51,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->main(' . $content . ', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
             }
 
@@ -111,9 +111,9 @@ 
 
             }
 
-            $selectedCollections = 'tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
+            $selectedCollections = 'tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')';
 
-            $orderBy = 'FIELD(tx_dlf_collections.uid,'.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
+            $orderBy = 'FIELD(tx_dlf_collections.uid,' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')';
 
         }
 
@@ -126,7 +126,7 @@ 
 
             if (!empty($GLOBALS['TSFE']->fe_user->user['uid'])) {
 
-                $showUserDefinedColls = ' AND tx_dlf_collections.fe_cruser_id='.intval($GLOBALS['TSFE']->fe_user->user['uid']);
+                $showUserDefinedColls = ' AND tx_dlf_collections.fe_cruser_id=' . intval($GLOBALS['TSFE']->fe_user->user['uid']);
 
             } else {
 
@@ -140,7 +140,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.index_name AS index_name,tx_dlf_collections.index_search as index_query,tx_dlf_collections.uid AS uid,tx_dlf_collections.sys_language_uid AS sys_language_uid,tx_dlf_collections.label AS label,tx_dlf_collections.thumbnail AS thumbnail,tx_dlf_collections.description AS description,tx_dlf_collections.priority AS priority',
             'tx_dlf_collections',
-            $selectedCollections.$showUserDefinedColls.' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND (tx_dlf_collections.sys_language_uid IN (-1,0) OR (tx_dlf_collections.sys_language_uid = '.$GLOBALS['TSFE']->sys_language_uid.' AND tx_dlf_collections.l18n_parent = 0))'.tx_dlf_helper::whereClause('tx_dlf_collections'),
+            $selectedCollections . $showUserDefinedColls . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND (tx_dlf_collections.sys_language_uid IN (-1,0) OR (tx_dlf_collections.sys_language_uid = ' . $GLOBALS['TSFE']->sys_language_uid . ' AND tx_dlf_collections.l18n_parent = 0))' . tx_dlf_helper::whereClause('tx_dlf_collections'),
             '',
             $orderBy,
             ''
@@ -162,9 +162,9 @@ 
 
         // We only care about the UID and partOf in the results and want them sorted
         $params['fields'] = 'uid,partof';
-        $params['sort'] = array ('uid' => 'asc');
+        $params['sort'] = array('uid' => 'asc');
 
-        $collections = array ();
+        $collections = array();
 
         while ($collectionData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
@@ -180,7 +180,7 @@ 
 
         }
 
-        $markerArray = array ();
+        $markerArray = array();
 
         // Process results.
         foreach ($collections as $collection) {
@@ -189,20 +189,20 @@ 
 
             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);
+            $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);
+            $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'] = array ();
+            $collection['titles'] = array();
 
             foreach ($partOfNothing as $doc) {
 
@@ -232,7 +232,7 @@ 
             } while (!empty($markerArray[$_key]));
 
             // Merge plugin variables with new set of values.
-            $additionalParams = array ('collection' => $collection['uid']);
+            $additionalParams = array('collection' => $collection['uid']);
 
             if (is_array($this->piVars)) {
 
@@ -245,7 +245,7 @@ 
             }
 
             // Build typolink configuration array.
-            $conf = array (
+            $conf = array(
                 'useCacheHash' => 1,
                 'parameter' => $GLOBALS['TSFE']->id,
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -257,9 +257,9 @@ 
             // Add feed link if applicable.
             if (!empty($this->conf['targetFeed'])) {
 
-                $img = '<img src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', TRUE).'" title="'.$this->pi_getLL('feedTitle', '', TRUE).'" />';
+                $img = '<img src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'res/icons/txdlffeeds.png" alt="' . $this->pi_getLL('feedAlt', '', TRUE) . '" title="' . $this->pi_getLL('feedTitle', '', TRUE) . '" />';
 
-                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array ($this->prefixId => array ('collection' => $collection['uid'])), FALSE, $this->conf['targetFeed']);
+                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array($this->prefixId => array('collection' => $collection['uid'])), FALSE, $this->conf['targetFeed']);
 
             } else {
 
@@ -270,7 +270,7 @@ 
             // 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 {
 
@@ -284,11 +284,11 @@ 
             // Build statistic's output.
             $labelTitles = $this->pi_getLL((count($collection['titles']) > 1 ? 'titles' : 'title'), '', FALSE);
 
-            $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'), '', FALSE);
 
-            $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars(count($collection['volumes']).$labelVolumes);
+            $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars(count($collection['volumes']) . $labelVolumes);
 
         }
 
@@ -353,7 +353,7 @@ 
         $collection = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.index_search as index_query, tx_dlf_collections.label AS collLabel, tx_dlf_collections.description AS collDesc, tx_dlf_collections.thumbnail AS collThumb, tx_dlf_collections.fe_cruser_id',
             'tx_dlf_collections',
-            'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.uid='.intval($id).$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_collections'),
+            'tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.uid=' . intval($id) . $additionalWhere . tx_dlf_helper::whereClause('tx_dlf_collections'),
             '',
             '',
             '1'
@@ -366,11 +366,11 @@ 
 
         if ($collectionData['index_query'] != '') {
 
-            $solr_query .= '('.$collectionData['index_query'].')';
+            $solr_query .= '(' . $collectionData['index_query'] . ')';
 
         } else {
 
-            $solr_query .= 'collection:("'.$collectionData['index_name'].'") AND toplevel:true';
+            $solr_query .= 'collection:("' . $collectionData['index_name'] . '") AND toplevel:true';
 
         }
 
@@ -380,7 +380,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->showSingleCollection('.intval($id).')] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->showSingleCollection(' . intval($id) . ')] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -389,7 +389,7 @@ 
         }
 
         $params['fields'] = 'uid';
-        $params['sort'] = array ('uid' => 'asc');
+        $params['sort'] = array('uid' => 'asc');
 
         $solrResult = $solr->search_raw($solr_query, $params);
 
@@ -412,17 +412,17 @@ 
         $documents = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_documents.uid AS uid, tx_dlf_documents.metadata_sorting AS metadata_sorting, tx_dlf_documents.volume_sorting AS volume_sorting, tx_dlf_documents.partof AS partof',
             'tx_dlf_documents',
-            'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.uid IN ('.implode(',', $documentSet).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+            'tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_documents.uid IN (' . implode(',', $documentSet) . ')' . tx_dlf_helper::whereClause('tx_dlf_documents'),
             '',
             '',
             ''
         );
 
-        $toplevel = array ();
+        $toplevel = array();
 
-        $subparts = array ();
+        $subparts = array();
 
-        $listMetadata = array ();
+        $listMetadata = array();
 
         // Process results.
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($documents)) {
@@ -435,15 +435,15 @@ 
 
             if (empty($listMetadata)) {
 
-                $listMetadata = array (
+                $listMetadata = array(
                     'label' => !empty($l10nOverlay['label']) ? htmlspecialchars($l10nOverlay['label']) : htmlspecialchars($collectionData['collLabel']),
                     'description' => !empty($l10nOverlay['description']) ? $this->pi_RTEcssText($l10nOverlay['description']) : $this->pi_RTEcssText($collectionData['collDesc']),
                     'thumbnail' => htmlspecialchars($collectionData['collThumb']),
-                    'options' => array (
+                    'options' => array(
                         'source' => 'collection',
                         'select' => $id,
                         'userid' => $collectionData['userid'],
-                        'params' => array ('filterquery' => array (array ('query' => 'collection_faceting:("'.$collectionData['index_name'].'")'))),
+                        'params' => array('filterquery' => array(array('query' => 'collection_faceting:("' . $collectionData['index_name'] . '")'))),
                         'core' => '',
                         'pid' => $this->conf['pages'],
                         'order' => 'title',
@@ -477,20 +477,20 @@ 
             // Split toplevel documents from volumes.
             if ($resArray['partof'] == 0) {
 
-                $toplevel[$resArray['uid']] = array (
+                $toplevel[$resArray['uid']] = array(
                     'u' => $resArray['uid'],
                     'h' => '',
                     's' => $sorting,
-                    'p' => array ()
+                    'p' => array()
                 );
 
             } else {
 
-                $subparts[$resArray['partof']][$resArray['volume_sorting']] = array (
+                $subparts[$resArray['partof']][$resArray['volume_sorting']] = array(
                    'u' => $resArray['uid'],
                    'h' => '',
                    's' => $sorting,
-                   'p' => array ()
+                   'p' => array()
                 );
 
             }
@@ -535,7 +535,7 @@ 
         \TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
 
         // Send headers.
-        header('Location: '.\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL(array ('parameter' => $this->conf['targetPid']))));
+        header('Location: ' . \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL(array('parameter' => $this->conf['targetPid']))));
 
         // Flush output buffer and end script processing.
         ob_end_flush();