kitodo / kitodo-presentation

Configuration/TCA/tx_dlf_collections.php

Spacing +68 added lines, -68 removed lines

@@ -9,8 +9,8 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-return array (
-    'ctrl' => array (
+return array(
+    'ctrl' => array(
         'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections',
         'label'     => 'label',
         'tstamp'    => 'tstamp',
@@ -23,7 +23,7 @@ 
         'transOrigDiffSourceField' => 'l18n_diffsource',
         'default_sortby' => 'ORDER BY label',
         'delete'	=> 'deleted',
-        'enablecolumns' => array (
+        'enablecolumns' => array(
             'disabled' => 'hidden',
             'fe_group' => 'fe_group',
         ),
@@ -33,65 +33,65 @@ 
         'dividers2tabs' => 2,
         'searchFields' => 'label,index_name,oai_name,fe_cruser_id',
     ),
-    'feInterface' => array (
+    'feInterface' => array(
         'fe_admin_fieldList' => 'label,description,thumbnail,documents',
     ),
-    'interface' => array (
+    'interface' => array(
         'showRecordFieldList' => 'label,index_name,oai_name,fe_cruser_id',
     ),
-    'columns' => array (
-        'sys_language_uid' => array (
+    'columns' => array(
+        'sys_language_uid' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
-                'items' => array (
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1),
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0),
+                'items' => array(
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1),
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0),
                 ),
                 'default' => 0,
             ),
         ),
-        'l18n_parent' => array (
+        'l18n_parent' => array(
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('', 0),
+                'items' => array(
+                    array('', 0),
                 ),
                 'foreign_table' => 'tx_dlf_collections',
                 'foreign_table_where' => 'AND tx_dlf_collections.pid=###CURRENT_PID### AND tx_dlf_collections.sys_language_uid IN (-1,0)',
             ),
         ),
-        'l18n_diffsource' => array (
-            'config' => array (
+        'l18n_diffsource' => array(
+            'config' => array(
                 'type' => 'passthrough'
             ),
         ),
-        'hidden' => array (
+        'hidden' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
-            'config' => array (
+            'config' => array(
                 'type' => 'check',
                 'default' => 0,
             ),
         ),
-        'fe_group' => array (
+        'fe_group' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.fe_group',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
-                'items' => array (
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.hide_at_login', -1),
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.any_login', -2),
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.usergroups', '--div--'),
+                'items' => array(
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.hide_at_login', -1),
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.any_login', -2),
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.usergroups', '--div--'),
                 ),
                 'foreign_table' => 'fe_groups',
                 'size' => 5,
@@ -101,54 +101,54 @@ 
                 'exclusiveKeys' => '-1,-2',
             ),
         ),
-        'label' => array (
+        'label' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.label',
-            'config' => array (
+            'config' => array(
                 'type' => 'input',
                 'size' => 30,
                 'max' => 255,
                 'eval' => 'required,trim',
             ),
         ),
-        'index_name' => array (
+        'index_name' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.index_name',
-            'config' => array (
+            'config' => array(
                 'type' => 'none',
                 'size' => 30,
                 'max' => 255,
                 'eval' => 'required,uniqueInPid',
             ),
         ),
-        'index_search' => array (
+        'index_search' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.index_search',
-            'config' => array (
+            'config' => array(
                 'type' => 'text',
                 'size' => 30,
                 'rows' => 5,
                 'eval' => 'trim',
             ),
         ),
-        'oai_name' => array (
+        'oai_name' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.oai_name',
-            'config' => array (
+            'config' => array(
                 'type' => 'input',
                 'size' => 30,
                 'max' => 255,
                 'eval' => 'nospace,alphanum_x,uniqueInPid',
             ),
         ),
-        'description' => array (
+        'description' => array(
             'exclude' => 1,
             'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.description',
-            'config' => array (
+            'config' => array(
                 'type' => 'text',
                 'cols' => 30,
                 'rows' => 10,
@@ -156,11 +156,11 @@ 
             ),
             'defaultExtras' => 'richtext[undo,redo,cut,copy,paste,link,image,line,acronym,chMode,blockstylelabel,formatblock,blockstyle,textstylelabel,textstyle,bold,italic,unorderedlist,orderedlist]:rte_transform[mode=ts_css]',
         ),
-        'thumbnail' => array (
+        'thumbnail' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.thumbnail',
-            'config' => array (
+            'config' => array(
                 'type' => 'group',
                 'internal_type' => 'file_reference',
                 'allowed' => 'gif,jpg,png',
@@ -169,19 +169,19 @@ 
                 'maxitems' => 1,
             ),
         ),
-        'priority' => array (
+        'priority' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.priority',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('1', 1),
-                    array ('2', 2),
-                    array ('3', 3),
-                    array ('4', 4),
-                    array ('5', 5),
+                'items' => array(
+                    array('1', 1),
+                    array('2', 2),
+                    array('3', 3),
+                    array('4', 4),
+                    array('5', 5),
                 ),
                 'size' => 1,
                 'minitems' => 1,
@@ -189,11 +189,11 @@ 
                 'default' => 3,
             ),
         ),
-        'documents' => array (
+        'documents' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.documents',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingleBox',
                 'foreign_table' => 'tx_dlf_documents',
@@ -203,21 +203,21 @@ 
                 'minitems' => 0,
                 'maxitems' => 1048576,
                 'MM' => 'tx_dlf_relations',
-                'MM_match_fields' => array (
+                'MM_match_fields' => array(
                     'ident' => 'docs_colls',
                 ),
                 'MM_opposite_field' => 'collections',
             ),
         ),
-        'owner' => array (
+        'owner' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner.none', 0),
+                'items' => array(
+                    array('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner.none', 0),
                 ),
                 'foreign_table' => 'tx_dlf_libraries',
                 'foreign_table_where' => 'AND tx_dlf_libraries.sys_language_uid IN (-1,0) ORDER BY tx_dlf_libraries.label',
@@ -226,15 +226,15 @@ 
                 'maxitems' => 1,
             ),
         ),
-        'fe_cruser_id' => array (
+        'fe_cruser_id' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id.none', 0),
+                'items' => array(
+                    array('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id.none', 0),
                 ),
                 'foreign_table' => 'fe_users',
                 'foreign_table_where' => 'ORDER BY fe_users.username',
@@ -243,24 +243,24 @@ 
                 'maxitems' => 1,
             ),
         ),
-        'fe_admin_lock' => array (
+        'fe_admin_lock' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_admin_lock',
-            'config' => array (
+            'config' => array(
                 'type' => 'check',
                 'default' => 0,
             ),
         ),
-        'status' => array (
+        'status' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status.default', 0),
+                'items' => array(
+                    array('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status.default', 0),
                 ),
                 'size' => 1,
                 'minitems' => 1,
@@ -269,12 +269,12 @@ 
             ),
         ),
     ),
-    'types' => array (
-        '0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab1, label,--palette--;;1;;1-1-1, description,--palette--;;2;;2-2-2, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4, fe_cruser_id,--palette--;;3'),
+    'types' => array(
+        '0' => array('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab1, label,--palette--;;1;;1-1-1, description,--palette--;;2;;2-2-2, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4, fe_cruser_id,--palette--;;3'),
     ),
-    'palettes' => array (
-        '1' => array ('showitem' => 'index_name, --linebreak--, index_search, --linebreak--, oai_name', 'canNotCollapse' => 1),
-        '2' => array ('showitem' => 'thumbnail, priority', 'canNotCollapse' => 1),
-        '3' => array ('showitem' => 'fe_admin_lock', 'canNotCollapse' => 1),
+    'palettes' => array(
+        '1' => array('showitem' => 'index_name, --linebreak--, index_search, --linebreak--, oai_name', 'canNotCollapse' => 1),
+        '2' => array('showitem' => 'thumbnail, priority', 'canNotCollapse' => 1),
+        '3' => array('showitem' => 'fe_admin_lock', 'canNotCollapse' => 1),
     ),
 );

ext_localconf.php

Spacing +13 added lines, -13 removed lines

@@ -48,38 +48,38 @@
 
 // Register tools for toolbox plugin.
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php', '_toolsFulltext', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsFulltext'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsFulltext';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsFulltext'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsFulltext';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php', '_toolsImagemanipulation', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsImagemanipulation'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagemanipulation';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsImagemanipulation'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagemanipulation';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php', '_toolsPdf', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsPdf'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsPdf';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsPdf'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsPdf';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php', '_toolsImagedownload', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsImagedownload'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagedownload';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsImagedownload'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagedownload';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/searchindocument/class.tx_dlf_toolsSearchindocument.php', '_toolsSearchindocument', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsSearchindocument'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsSearchindocument';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsSearchindocument'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsSearchindocument';
 
 // Register hooks.
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'EXT:' . $_EXTKEY . '/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = 'EXT:' . $_EXTKEY . '/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_hacks.php:tx_dlf_hacks';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'][] = 'EXT:' . $_EXTKEY . '/hooks/class.tx_dlf_hacks.php:tx_dlf_hacks';
 
 // Register command line scripts.
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array ('EXT:'.$_EXTKEY.'/cli/class.tx_dlf_cli.php', '_CLI_dlf');
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array('EXT:' . $_EXTKEY . '/cli/class.tx_dlf_cli.php', '_CLI_dlf');
 
 // Register AJAX eID handlers.
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = 'EXT:'.$_EXTKEY.'/plugins/search/class.tx_dlf_search_suggest.php';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = 'EXT:' . $_EXTKEY . '/plugins/search/class.tx_dlf_search_suggest.php';
 
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_geturl_eid'] = 'EXT:'.$_EXTKEY.'/plugins/pageview/class.tx_dlf_geturl_eid.php';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_geturl_eid'] = 'EXT:' . $_EXTKEY . '/plugins/pageview/class.tx_dlf_geturl_eid.php';
 
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_geturl_eid'] = 'EXT:'.$_EXTKEY.'/plugins/pageview/class.tx_dlf_geturl_eid.php';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_geturl_eid'] = 'EXT:' . $_EXTKEY . '/plugins/pageview/class.tx_dlf_geturl_eid.php';
 
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document_eid'] = 'EXT:'.$_EXTKEY.'/plugins/toolbox/tools/searchindocument/class.tx_dlf_search_in_document_eid.php';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document_eid'] = 'EXT:' . $_EXTKEY . '/plugins/toolbox/tools/searchindocument/class.tx_dlf_search_in_document_eid.php';
 
 // add caching framework for Solr queries
 if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) {

plugins/collection/class.tx_dlf_collection.php

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();

plugins/search/class.tx_dlf_search.php

Spacing +59 added lines, -59 removed lines

@@ -36,7 +36,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_metadata.*',
             'tx_dlf_metadata',
-            'tx_dlf_metadata.index_autocomplete=1 AND tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+            'tx_dlf_metadata.index_autocomplete=1 AND tx_dlf_metadata.pid=' . intval($this->conf['pages']) . tx_dlf_helper::whereClause('tx_dlf_metadata'),
             '',
             '',
             '1'
@@ -44,7 +44,7 @@ 
 
         if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-            $GLOBALS['TSFE']->additionalHeaderData[$this->prefixId.'_search_suggest'] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/search/tx_dlf_search_suggest.js"></script>';
+            $GLOBALS['TSFE']->additionalHeaderData[$this->prefixId . '_search_suggest'] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/search/tx_dlf_search_suggest.js"></script>';
 
         } else {
 
@@ -73,7 +73,7 @@ 
         if (!empty($list->metadata['options']['source']) && $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'])) {
 
@@ -90,7 +90,7 @@ 
 
             }
 
-            return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$collectionId.'" />';
+            return '<input type="hidden" name="' . $this->prefixId . '[collection]" value="' . $collectionId . '" />';
 
         }
 
@@ -118,7 +118,7 @@ 
             // 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) . '" />';
 
             }
 
@@ -137,7 +137,7 @@ 
 
             }
 
-            return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.$documentId.'" />';
+            return '<input type="hidden" name="' . $this->prefixId . '[id]" value="' . $documentId . '" />';
 
         }
 
@@ -167,7 +167,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 {
 
@@ -198,9 +198,9 @@ 
         // Get operator options.
         $operatorOptions = '';
 
-        foreach (array ('AND', 'OR', 'NOT') as $operator) {
+        foreach (array('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>';
 
         }
 
@@ -211,16 +211,16 @@ 
 
         foreach ($searchFields as $searchField) {
 
-            $fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-'.$searchField.'" value="'.$searchField.'">'.tx_dlf_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 . '">' . tx_dlf_helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']) . '</option>';
 
         }
 
         for ($i = 0; $i < $this->conf['extendedSlotCount']; $i++) {
 
-            $markerArray = array (
-                '###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.']" />'
+            $markerArray = array(
+                '###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->cObj->substituteMarkerArray($this->cObj->getSubpart($this->template, '###EXT_SEARCH_ENTRY###'), $markerArray);
@@ -261,16 +261,16 @@ 
         }
 
         // Get facets from plugin configuration.
-        $facets = array ();
+        $facets = array();
 
         foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
 
-            $facets[$facet.'_faceting'] = tx_dlf_helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
+            $facets[$facet . '_faceting'] = tx_dlf_helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
 
         }
 
         // Render facets menu.
-        $TSconfig = array ();
+        $TSconfig = array();
 
         $TSconfig['special'] = 'userfunction';
 
@@ -302,13 +302,13 @@ 
         // 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 .= ' <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 .= ' <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 .= ' <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 .= ' <label for="tx-dlf-search-fulltext-yes">' . $this->pi_getLL('label.inFulltext', '') . '</label>';
 
         }
 
@@ -330,9 +330,9 @@ 
         // Check for plugin configuration.
         if (!empty($this->conf['showLogicalPageField'])) {
 
-            $output .= ' <label for="tx-dlf-search-logical-page">'.$this->pi_getLL('label.logicalPage', '').': </label>';
+            $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 .= ' <input class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" type="text" name="' . $this->prefixId . '[logicalPage]" />';
 
         }
 
@@ -353,7 +353,7 @@ 
      */
     protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
 
-        $entryArray = array ();
+        $entryArray = array();
 
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -388,7 +388,7 @@ 
 
         // Check if facet is already selected.
         $queryColumn = array_column($search['params']['filterquery'], 'query');
-        $index = array_search($field.':("'.tx_dlf_solr::escapeQuery($value).'")', $queryColumn);
+        $index = array_search($field . ':("' . tx_dlf_solr::escapeQuery($value) . '")', $queryColumn);
 
         if ($index !== FALSE) {
 
@@ -406,20 +406,20 @@ 
                 //remove ($count) for selected facet in template
                 $entryArray['count'] = FALSE;
                 //build link to delete selected facet
-                $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $queryColumn));
+                $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('query' => $search['query'], 'fq' => $queryColumn));
                 $entryArray['title'] = sprintf($this->pi_getLL('resetFacet', ''), $entryArray['title']);
             }
 
         } else {
 
             // Facet is not selected, thus add it to filter.
-            $queryColumn[] = $field.':("'.tx_dlf_solr::escapeQuery($value).'")';
+            $queryColumn[] = $field . ':("' . tx_dlf_solr::escapeQuery($value) . '")';
 
             $entryArray['ITEM_STATE'] = 'NO';
 
         }
 
-        $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $queryColumn));
+        $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('query' => $search['query'], 'fq' => $queryColumn));
 
         return $entryArray;
 
@@ -447,7 +447,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main(' . $content . ', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
             }
 
@@ -491,16 +491,16 @@ 
             }
 
             // Configure @action URL for form.
-            $linkConf = array (
+            $linkConf = array(
                 'parameter' => $GLOBALS['TSFE']->id
             );
 
             // Fill markers.
-            $markerArray = array (
+            $markerArray = array(
                 '###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']) ? $search['query'] : ''),
                 '###FULLTEXTSWITCH###' => $this->addFulltextSwitch($list->metadata['fulltextSearch']),
                 '###FIELD_DOC###' => ($this->conf['searchIn'] == 'document' || $this->conf['searchIn'] == 'all' ? $this->addCurrentDocument() : ''),
@@ -527,7 +527,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main(' . $content . ', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
 
                 }
 
@@ -545,9 +545,9 @@ 
             }
 
             // Prepare query parameters.
-            $params = array ();
+            $params = array();
 
-            $matches = array ();
+            $matches = array();
 
             // Set search query.
             if ((!empty($this->conf['fulltext']) && !empty($this->piVars['fulltext'])) || preg_match('/fulltext:\((.*)\)/', $this->piVars['query'], $matches)) {
@@ -558,7 +558,7 @@ 
                 // Search in fulltext field if applicable. Query must not be empty!
                 if (!empty($this->piVars['query'])) {
 
-                    $query = 'fulltext:('.tx_dlf_solr::escapeQuery($this->piVars['query']).')';
+                    $query = 'fulltext:(' . tx_dlf_solr::escapeQuery($this->piVars['query']) . ')';
 
                 }
 
@@ -571,7 +571,7 @@ 
             // Add extended search query.
             if (!empty($this->piVars['extQuery']) && is_array($this->piVars['extQuery'])) {
 
-                $allowedOperators = array ('AND', 'OR', 'NOT');
+                $allowedOperators = array('AND', 'OR', 'NOT');
 
                 $allowedFields = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
 
@@ -583,11 +583,11 @@ 
 
                             if (!empty($query)) {
 
-                                $query .= ' '.$this->piVars['extOperator'][$i].' ';
+                                $query .= ' ' . $this->piVars['extOperator'][$i] . ' ';
 
                             }
 
-                            $query .= tx_dlf_indexing::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']).':('.tx_dlf_solr::escapeQuery($this->piVars['extQuery'][$i]).')';
+                            $query .= tx_dlf_indexing::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']) . ':(' . tx_dlf_solr::escapeQuery($this->piVars['extQuery'][$i]) . ')';
 
                         }
 
@@ -613,7 +613,7 @@ 
 
                 if (!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', ''), tx_dlf_document::getTitle($this->piVars['id'])));
 
@@ -628,7 +628,7 @@ 
 
                     $index_name = tx_dlf_helper::getIndexName($this->piVars['collection'], 'tx_dlf_collections', $this->conf['pages']);
 
-                    $params['filterquery'][]['query'] = 'collection_faceting:("'.tx_dlf_solr::escapeQuery($index_name).'")';
+                    $params['filterquery'][]['query'] = 'collection_faceting:("' . tx_dlf_solr::escapeQuery($index_name) . '")';
 
                     $label .= sprintf($this->pi_getLL('in', '', TRUE), tx_dlf_helper::translate($index_name, 'tx_dlf_collections', $this->conf['pages']));
 
@@ -641,7 +641,7 @@ 
 
                 $collIds = explode(',', $this->conf['collections']);
 
-                $collIndexNames = array ();
+                $collIndexNames = array();
 
                 foreach ($collIds as $collId) {
 
@@ -650,7 +650,7 @@ 
                 }
 
                 // 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")';
 
             }
 
@@ -658,7 +658,7 @@ 
             $params['query'] = !empty($query) ? $query : '*';
             $params['start'] = 0;
             $params['rows'] = 0;
-            $params['sort'] = array ('score' => 'desc');
+            $params['sort'] = array('score' => 'desc');
 
             // Instantiate search object.
             $solr = tx_dlf_solr::getInstance($this->conf['solrcore']);
@@ -667,7 +667,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main(' . $content . ', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
 
                 }
 
@@ -682,7 +682,7 @@ 
             // Perform search.
             $list = $solr->search();
 
-            $list->metadata = array (
+            $list->metadata = array(
                 'label' => $label,
                 'thumbnail' => '',
                 'searchString' => $this->piVars['query'],
@@ -695,7 +695,7 @@ 
             // Clean output buffer.
             \TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
 
-            $additionalParams = array ();
+            $additionalParams = array();
 
             if (!empty($this->piVars['logicalPage'])) {
 
@@ -729,7 +729,7 @@ 
             $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE);
 
             // Send headers.
-            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)));
 
             // Flush output buffer and end script processing.
             ob_end_flush();
@@ -754,15 +754,15 @@ 
 
         $this->init($conf);
 
-        $menuArray = array ();
+        $menuArray = array();
 
         // Set default value for facet search.
-        $search = array (
+        $search = array(
             'query' => '*',
-            'params' => array (
-                'component' => array (
-                    'facetset' => array (
-                        'facet' => array ()
+            'params' => array(
+                'component' => array(
+                    'facetset' => array(
+                        'facet' => array()
                     )
                 )
             )
@@ -790,24 +790,24 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->makeFacetsMenuArray('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->makeFacetsMenuArray(' . $content . ', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
 
             }
 
-            return array ();
+            return array();
 
         }
 
         // Set needed parameters for facet search.
         if (empty($search['params']['filterquery'])) {
 
-            $search['params']['filterquery'] = array ();
+            $search['params']['filterquery'] = array();
 
         }
 
         foreach ($this->conf['facets'] as $field => $name) {
 
-            $search['params']['component']['facetset']['facet'][] = array (
+            $search['params']['component']['facetset']['facet'][] = array(
                 'type' => 'field',
                 'key' => $field,
                 'field' => $field,
@@ -832,7 +832,7 @@ 
         // Process results.
         foreach ($facet as $field => $values) {
 
-            $entryArray = array ();
+            $entryArray = array();
 
             $entryArray['title'] = htmlspecialchars($this->conf['facets'][$field]);
 

common/class.tx_dlf_indexing.php

Spacing +32 added lines, -32 removed lines

@@ -34,14 +34,14 @@ 
      * @var	array
      * @access protected
      */
-    protected static $fields = array (
-        'autocomplete' => array (),
-        'facets' => array (),
-        'sortables' => array (),
-        'indexed' => array (),
-        'stored' => array (),
-        'tokenized' => array (),
-        'fieldboost' => array ()
+    protected static $fields = array(
+        'autocomplete' => array(),
+        'facets' => array(),
+        'sortables' => array(),
+        'indexed' => array(),
+        'stored' => array(),
+        'tokenized' => array(),
+        'fieldboost' => array()
     );
 
     /**
@@ -59,7 +59,7 @@ 
      * @var	array
      * @access protected
      */
-    protected static $processedDocs = array ();
+    protected static $processedDocs = array();
 
     /**
      * Instance of tx_dlf_solr class
@@ -102,7 +102,7 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not load parent document with UID "'.$doc->parentId.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add([' . $doc->uid . '], ' . $core . ')] Could not load parent document with UID "' . $doc->parentId . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                     }
 
@@ -119,7 +119,7 @@ 
 
                 // Delete old Solr documents.
                 $updateQuery = self::$solr->service->createUpdate();
-                $updateQuery->addDeleteQuery('uid:'.$doc->uid);
+                $updateQuery->addDeleteQuery('uid:' . $doc->uid);
                 self::$solr->service->update($updateQuery);
 
                 // Index every logical unit as separate Solr document.
@@ -165,7 +165,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'tx_dlf_documents.title AS title',
                     'tx_dlf_documents',
-                    'tx_dlf_documents.uid='.intval($doc->uid).tx_dlf_helper::whereClause('tx_dlf_documents'),
+                    'tx_dlf_documents.uid=' . intval($doc->uid) . tx_dlf_helper::whereClause('tx_dlf_documents'),
                     '',
                     '',
                     '1'
@@ -209,7 +209,7 @@ 
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                         tx_dlf_helper::getLL('flash.error', TRUE),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                         TRUE
@@ -221,7 +221,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add([' . $doc->uid . '], ' . $core . ')] Apache Solr threw exception: "' . $e->getMessage() . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -247,7 +247,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add([' . $doc->uid . '], ' . $core . ')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -278,7 +278,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_solrcores.uid AS uid,tx_dlf_documents.title AS title',
             'tx_dlf_solrcores,tx_dlf_documents',
-            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.$uid.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid=' . $uid . tx_dlf_helper::whereClause('tx_dlf_solrcores'),
             '',
             '',
             '1'
@@ -295,7 +295,7 @@ 
 
                     // Delete Solr document.
                     $updateQuery = self::$solr->service->createUpdate();
-                    $updateQuery->addDeleteQuery('uid:'.$uid);
+                    $updateQuery->addDeleteQuery('uid:' . $uid);
                     $updateQuery->addCommit();
                     self::$solr->service->update($updateQuery);
 
@@ -305,7 +305,7 @@ 
 
                         $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                             'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                            tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                             tx_dlf_helper::getLL('flash.error', TRUE),
                             \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                             TRUE
@@ -317,7 +317,7 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete(' . $_uid . ')] Apache Solr threw exception: "' . $e->getMessage() . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                     }
 
@@ -343,7 +343,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete(' . $_uid . ')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -371,7 +371,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Invalid UID "'.$uid.'" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete(' . $_uid . ')] Invalid UID "' . $uid . '" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -403,7 +403,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName('.$index_name.', '.$_pid.')] Invalid PID "'.$pid.'" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName(' . $index_name . ', ' . $_pid . ')] Invalid PID "' . $pid . '" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -421,7 +421,7 @@ 
 
         $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
 
-        $index_name .= '_'.$suffix;
+        $index_name .= '_' . $suffix;
 
         return $index_name;
 
@@ -444,7 +444,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.index_indexed AS index_indexed,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.is_facet AS is_facet,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.index_autocomplete AS index_autocomplete,tx_dlf_metadata.index_boost AS index_boost',
                 'tx_dlf_metadata',
-                'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                'tx_dlf_metadata.pid=' . intval($pid) . tx_dlf_helper::whereClause('tx_dlf_metadata'),
                 '',
                 '',
                 ''
@@ -538,7 +538,7 @@ 
             $solrDoc = $updateQuery->createDocument();
 
             // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid.$logicalUnit['id']);
+            $solrDoc->setField('id', $doc->uid . $logicalUnit['id']);
 
             $solrDoc->setField('uid', $doc->uid);
 
@@ -585,7 +585,7 @@ 
 
             $solrDoc->setField('collection', $doc->metadataArray[$doc->toplevelId]['collection']);
 
-            $autocomplete = array ();
+            $autocomplete = array();
 
             foreach ($metadata as $index_name => $data) {
 
@@ -596,14 +596,14 @@ 
                     if (in_array($index_name, self::$fields['sortables'])) {
 
                         // Add sortable fields to index.
-                        $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
+                        $solrDoc->setField($index_name . '_sorting', $metadata[$index_name . '_sorting'][0]);
 
                     }
 
                     if (in_array($index_name, self::$fields['facets'])) {
 
                         // Add facets to index.
-                        $solrDoc->setField($index_name.'_faceting', $data);
+                        $solrDoc->setField($index_name . '_faceting', $data);
 
                     }
 
@@ -644,7 +644,7 @@ 
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                         tx_dlf_helper::getLL('flash.error', TRUE),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                         TRUE
@@ -748,7 +748,7 @@ 
             $solrDoc = $updateQuery->createDocument();
 
             // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid.$physicalUnit['id']);
+            $solrDoc->setField('id', $doc->uid . $physicalUnit['id']);
 
             $solrDoc->setField('uid', $doc->uid);
 
@@ -792,7 +792,7 @@ 
                         }
 
                         // Add facets to index.
-                        $solrDoc->setField($index_name.'_faceting', $data);
+                        $solrDoc->setField($index_name . '_faceting', $data);
 
                     }
 
@@ -819,7 +819,7 @@ 
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                         tx_dlf_helper::getLL('flash.error', TRUE),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                         TRUE

plugins/pageview/class.tx_dlf_pageview.php

Spacing +40 added lines, -40 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $controls = array ();
+    protected $controls = array();
 
     /**
      * Holds the current images' URLs and MIME types
@@ -35,7 +35,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $images = array ();
+    protected $images = array();
 
     /**
      * Holds the current fulltexts' URLs
@@ -43,7 +43,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $fulltexts = array ();
+    protected $fulltexts = array();
 
     /**
      * Adds Viewer javascript
@@ -54,31 +54,31 @@ 
      */
     protected function addViewerJS() {
 
-        $output = array ();
+        $output = array();
 
         // Add OpenLayers library.
-        $output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3.css">';
+        $output[] = '<link type="text/css" rel="stylesheet" href="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/ol3.css">';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/glif.min.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/glif.min.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3-dlf.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/ol3-dlf.js"></script>';
 
         // Add viewer library.
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_utils.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_utils.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_source.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3_source.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_altoparser.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_altoparser.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview.js"></script>';
 
         // Add viewer configuration.
         $output[] = '
@@ -86,11 +86,11 @@ 
 			window.onload = 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).',
-						useInternalProxy: '.($this->conf['useInternalProxy'] ? 1 : 0).'
+						controls: ["'.implode('", "', $this->controls) . '"],
+						div: "'.$this->conf['elementId'] . '",
+						images: '.json_encode($this->images) . ',
+						fulltexts: '.json_encode($this->fulltexts) . ',
+						useInternalProxy: '.($this->conf['useInternalProxy'] ? 1 : 0) . '
 					})
 				}
 			}
@@ -109,7 +109,7 @@ 
      */
     protected function addInteraction() {
 
-        $markerArray = array ();
+        $markerArray = array();
 
         if ($this->piVars['id']) {
 
@@ -121,9 +121,9 @@ 
 
             if ($this->conf['crop']) {
 
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">' . $this->pi_getLL('editMode', '', TRUE) . '</a>';
 
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">' . $this->pi_getLL('editRemove', '', TRUE) . '</a>';
 
             } else {
 
@@ -135,7 +135,7 @@ 
 
             if ($this->conf['magnifier']) {
 
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">' . $this->pi_getLL('magnifier', '', TRUE) . '</a>';
 
             } else {
 
@@ -157,14 +157,14 @@ 
      */
     protected function addBasketForm() {
 
-        $markerArray = array ();
+        $markerArray = array();
 
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
 
             $label = $this->pi_getLL('addBasket', '', TRUE);
 
-            $params = array (
+            $params = array(
                 'id' => $this->piVars['id'],
                 'addToBasket' => TRUE
             );
@@ -175,17 +175,17 @@ 
 
             }
 
-            $basketConf = array (
+            $basketConf = array(
                 'parameter' => $this->conf['targetBasket'],
                 '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 = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
 
             $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
 
@@ -197,7 +197,7 @@ 
 
             $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>';
 
@@ -234,7 +234,7 @@ 
      */
     protected function getImage($page) {
 
-        $image = array ();
+        $image = array();
 
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrps']);
@@ -248,9 +248,9 @@ 
 
                 if ($this->conf['useInternalProxy']) {
                     // Configure @action URL for form.
-                    $linkConf = array (
+                    $linkConf = array(
                         'parameter' => $GLOBALS['TSFE']->id,
-                        'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($image['url']),
+                        'additionalParams' => '&eID=tx_dlf_geturl_eid&url=' . urlencode($image['url']),
                     );
 
                     $image['url'] = $this->cObj->typoLink_URL($linkConf);
@@ -264,7 +264,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage('.$page.')] File not found in fileGrp "'.$fileGrp.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage(' . $page . ')] File not found in fileGrp "' . $fileGrp . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -287,7 +287,7 @@ 
      */
     protected function getFulltext($page) {
 
-        $fulltext = array ();
+        $fulltext = array();
 
         // Get fulltext link.
         if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']])) {
@@ -295,9 +295,9 @@ 
             $fulltext['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
 
             // Configure @action URL for form.
-            $linkConf = array (
+            $linkConf = array(
                 'parameter' => $GLOBALS['TSFE']->id,
-                'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($fulltext['url']),
+                'additionalParams' => '&eID=tx_dlf_geturl_eid&url=' . urlencode($fulltext['url']),
             );
 
             $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
@@ -308,7 +308,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext('.$page.')] File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext(' . $page . ')] File not found in fileGrp "' . $this->conf['fileGrpFulltext'] . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -392,7 +392,7 @@ 
         $this->controls = explode(',', $this->conf['features']);
 
         // Fill in the template markers.
-        $markerArray = array (
+        $markerArray = array(
             '###VIEWER_JS###' => $this->addViewerJS()
         );
 

ext_emconf.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-$EM_CONF[$_EXTKEY] = array (
+$EM_CONF[$_EXTKEY] = array(
     'title' => 'Kitodo.Presentation',
     'description' => 'Base plugins, modules, services and API of the Digital Library Framework. It is part of the community-based Kitodo Digitization Suite.',
     'category' => 'fe',
@@ -22,18 +22,18 @@ 
     'createDirs' => '',
     'clearCacheOnLoad' => FALSE,
     'version' => '2.3.1',
-    'constraints' => array (
-        'depends' => array (
+    'constraints' => array(
+        'depends' => array(
             'php' => '7.0.0-',
             'typo3' => '7.6.0-',
         ),
-        'conflicts' => array (
+        'conflicts' => array(
         ),
-        'suggests' => array (
+        'suggests' => array(
         ),
     ),
-    'autoload' => array (
-        'classmap' => array (
+    'autoload' => array(
+        'classmap' => array(
             'vendor/solarium',
             'vendor/symfony/event-dispatcher',
             'cli/class.tx_dlf_cli.php',

plugins/navigation/class.tx_dlf_navigation.php

Spacing +27 added lines, -27 removed lines

@@ -38,7 +38,7 @@ 
             if (count($list) > 0) {
 
                 // Build typolink configuration array.
-                $conf = array (
+                $conf = array(
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetPid'],
                     'title' => $this->pi_getLL('linkToList', '', TRUE)
@@ -64,31 +64,31 @@ 
     protected function getPageSelector() {
 
         // Configure @action URL for form.
-        $linkConf = array (
+        $linkConf = array(
             'parameter' => $GLOBALS['TSFE']->id
         );
 
-        $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' && $piVars != 'DATA' && !empty($value)) {
 
-                $output .= '<input type="hidden" name="'.$this->prefixId.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />';
+                $output .= '<input type="hidden" name="' . $this->prefixId . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />';
 
             }
 
         }
 
         // Add page selector.
-        $uniqId = uniqid(str_replace('_', '-', get_class($this)).'-');
+        $uniqId = uniqid(str_replace('_', '-', 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>';
+            $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>';
 
         }
 
@@ -177,66 +177,66 @@ 
         // Link to first page.
         if ($this->piVars['page'] > 1) {
 
-            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array ('page' => 1));
+            $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array('page' => 1));
 
         } else {
 
-            $markerArray['###FIRST###'] = '<span>'.$this->pi_getLL('firstPage', '', TRUE).'</span>';
+            $markerArray['###FIRST###'] = '<span>' . $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), array ('page' => $this->piVars['page'] - $pageSteps));
+            $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] - $pageSteps));
 
         } else {
 
-            $markerArray['###BACK###'] = '<span>'.sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###BACK###'] = '<span>' . 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), array ('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
+            $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
 
         } else {
 
-            $markerArray['###PREVIOUS###'] = '<span>'.$this->pi_getLL('prevPage', '', TRUE).'</span>';
+            $markerArray['###PREVIOUS###'] = '<span>' . $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), array ('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
+            $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
 
         } else {
 
-            $markerArray['###NEXT###'] = '<span>'.$this->pi_getLL('nextPage', '', TRUE).'</span>';
+            $markerArray['###NEXT###'] = '<span>' . $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), array ('page' => $this->piVars['page'] + $pageSteps));
+            $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] + $pageSteps));
 
         } else {
 
-            $markerArray['###FORWARD###'] = '<span>'.sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###FORWARD###'] = '<span>' . 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), array ('page' => $this->doc->numPages));
+            $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array('page' => $this->doc->numPages));
 
         } else {
 
-            $markerArray['###LAST###'] = '<span>'.$this->pi_getLL('lastPage', '', TRUE).'</span>';
+            $markerArray['###LAST###'] = '<span>' . $this->pi_getLL('lastPage', '', TRUE) . '</span>';
 
         }
 
@@ -245,29 +245,29 @@ 
 
             if (!$this->piVars['double']) {
 
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array ('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
 
             } else {
 
-                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array ('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
+                $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
 
             }
 
             if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
 
-                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array ('page' => $this->piVars['page'] + 1));
+                $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array('page' => $this->piVars['page'] + 1));
 
             } else {
 
-                $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span>' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
 
             }
 
         } else {
 
-            $markerArray['###DOUBLEPAGE###'] = '<span>'.$this->pi_getLL('doublePageOn', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span>' . $this->pi_getLL('doublePageOn', '', TRUE) . '</span>';
 
-            $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span>' . $this->pi_getLL('doublePage+1', '', TRUE) . '</span>';
 
         }
 
@@ -303,7 +303,7 @@ 
      *
      * @return	string		Typolink ready to output
      */
-    protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '') {
+    protected function makeLink($label, array $overrulePIvars = array(), $aTagParams = '') {
 
         // Merge plugin variables with new set of values.
         if (is_array($this->piVars)) {
@@ -317,7 +317,7 @@ 
         }
 
         // Build typolink configuration array.
-        $conf = array (
+        $conf = array(
             'useCacheHash' => 1,
             'parameter' => $GLOBALS['TSFE']->id,
             'ATagParams' => $aTagParams,

plugins/listview/class.tx_dlf_listview.php

Spacing +42 added lines, -42 removed lines

@@ -29,7 +29,7 @@ 
      * @var	array
      * @access	private
      */
-    private $fieldwrap = array ();
+    private $fieldwrap = array();
 
     /**
      * This holds the list
@@ -45,7 +45,7 @@ 
      * @var	array
      * @access	protected
      */
-    protected $metadata = array ();
+    protected $metadata = array();
 
     /**
      * Array of sortable metadata
@@ -53,7 +53,7 @@ 
      * @var	array
      * @access	protected
      */
-    protected $sortables = array ();
+    protected $sortables = array();
 
     /**
      * Renders the page browser
@@ -80,11 +80,11 @@ 
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
 
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array ('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array('pointer' => $this->piVars['pointer'] - 1), TRUE) . $separator;
 
         } else {
 
-            $output = $this->pi_getLL('prevPage', '<', TRUE).$separator;
+            $output = $this->pi_getLL('prevPage', '<', TRUE) . $separator;
 
         }
 
@@ -99,11 +99,11 @@ 
 
                 if ($this->piVars['pointer'] != $i) {
 
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i), TRUE).$separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array('pointer' => $i), TRUE) . $separator;
 
                 } else {
 
-                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1).$separator;
+                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1) . $separator;
 
                 }
 
@@ -111,7 +111,7 @@ 
 
             } elseif ($skip === TRUE) {
 
-                $output .= $this->pi_getLL('skip', '...', TRUE).$separator;
+                $output .= $this->pi_getLL('skip', '...', TRUE) . $separator;
 
                 $skip = FALSE;
 
@@ -124,7 +124,7 @@ 
         // Add link to next page.
         if ($this->piVars['pointer'] < $maxPages - 1) {
 
-            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array ('pointer' => $this->piVars['pointer'] + 1), TRUE);
+            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array('pointer' => $this->piVars['pointer'] + 1), TRUE);
 
         } else {
 
@@ -184,7 +184,7 @@ 
 
                         if (!empty($superiorTitle)) {
 
-                            $value = '['.$superiorTitle.']';
+                            $value = '[' . $superiorTitle . ']';
 
                         }
 
@@ -199,7 +199,7 @@ 
 
                     $imgAlt = htmlspecialchars($value);
 
-                    $additionalParams = array (
+                    $additionalParams = array(
                         'id' => $this->list[$number]['uid'],
                         'page' => $this->list[$number]['page']
                     );
@@ -210,7 +210,7 @@ 
 
                     }
 
-                    $conf = array (
+                    $conf = array(
                         'useCacheHash' => 1,
                         'parameter' => $this->conf['targetPid'],
                         'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -264,7 +264,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'] . '" />';
 
         }
 
@@ -286,9 +286,9 @@ 
 
         if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
 
-            $additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
+            $additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
 
-            $conf = array (
+            $conf = array(
                 'useCacheHash' => 1,
                 'parameter' => $this->conf['targetBasket'],
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -348,57 +348,57 @@ 
         $prefix = str_replace('_', '-', get_class($this));
 
         // Configure @action URL for form.
-        $linkConf = array (
+        $linkConf = array(
             'parameter' => $GLOBALS['TSFE']->id
         );
 
         if (!empty($this->piVars['logicalPage'])) {
 
-            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array ('logicalPage' => $this->piVars['logicalPage']), '', TRUE, FALSE);
+            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array('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.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />';
+                $sorting .= '<input type="hidden" name="' . $this->prefixId . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />';
 
             }
 
         }
 
         // Select sort field.
-        $uniqId = uniqid($prefix.'-');
+        $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="'.htmlspecialchars($index_name).'"'.(($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '').'>'.htmlspecialchars($label).'</option>';
+            $sorting .= '<option value="' . htmlspecialchars($index_name) . '"' . (($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
 
         }
 
         $sorting .= '</select>';
 
         // Select sort direction.
-        $uniqId = uniqid($prefix.'-');
+        $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 .= '<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="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 .= '<option value="0" ' . (!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.desc', '', TRUE) . '</option>';
 
         $sorting .= '</select></div></form>';
 
@@ -454,7 +454,7 @@ 
 
                             if (!empty($superiorTitle)) {
 
-                                $value = '['.$superiorTitle.']';
+                                $value = '[' . $superiorTitle . ']';
 
                             }
 
@@ -469,7 +469,7 @@ 
 
                         $imgAlt = htmlspecialchars($value);
 
-                        $additionalParams = array (
+                        $additionalParams = array(
                             'id' => $subpart['uid'],
                             'page' => $subpart['page'],
                             'highlight_word' => $highlight_word
@@ -481,7 +481,7 @@ 
 
                         }
 
-                        $conf = array (
+                        $conf = array(
                             // we don't want cHash in case of search parameters
                             'useCacheHash' => empty($this->list->metadata['searchString']) ? 1 : 0,
                             'parameter' => $this->conf['targetPid'],
@@ -505,7 +505,7 @@ 
                         // Add page number for single pages.
                         if ($_value == 'page') {
 
-                            $value .= ' '.intval($subpart['page']);
+                            $value .= ' ' . intval($subpart['page']);
 
                         }
 
@@ -545,7 +545,7 @@ 
             // Add thumbnail.
             if (!empty($subpart['thumbnail'])) {
 
-                $markerArray['###SUBTHUMBNAIL###'] = '<img alt="'.$imgAlt.'" src="'.$subpart['thumbnail'].'" />';
+                $markerArray['###SUBTHUMBNAIL###'] = '<img alt="' . $imgAlt . '" src="' . $subpart['thumbnail'] . '" />';
 
             }
 
@@ -561,9 +561,9 @@ 
 
             if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
 
-                $additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
+                $additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
 
-                $conf = array (
+                $conf = array(
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetBasket'],
                     'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -595,7 +595,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.wrap AS wrap,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.is_sortable AS is_sortable',
             'tx_dlf_metadata',
-            '(tx_dlf_metadata.is_listed=1 OR tx_dlf_metadata.is_sortable=1) AND tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+            '(tx_dlf_metadata.is_listed=1 OR tx_dlf_metadata.is_sortable=1) AND tx_dlf_metadata.pid=' . intval($this->conf['pages']) . tx_dlf_helper::whereClause('tx_dlf_metadata'),
             '',
             'tx_dlf_metadata.sorting ASC',
             ''
@@ -605,7 +605,7 @@ 
 
             if ($resArray['is_listed']) {
 
-                $this->metadata[$resArray['index_name']] = array (
+                $this->metadata[$resArray['index_name']] = array(
                     'wrap' => $resArray['wrap'],
                     'label' => tx_dlf_helper::translate($resArray['index_name'], 'tx_dlf_metadata', $this->conf['pages'])
                 );
@@ -678,7 +678,7 @@ 
                 || (isset($this->piVars['asc']) && $this->piVars['asc'] != $listMetadata['options']['order.asc'])) {
 
                 // Update list's metadata.
-                $listMetadata['options']['params']['sort'] = array ($this->piVars['order']."_sorting" => (boolean) $this->piVars['asc']?'asc':'desc');
+                $listMetadata['options']['params']['sort'] = array($this->piVars['order'] . "_sorting" => (boolean) $this->piVars['asc'] ? 'asc' : 'desc');
 
                 $listMetadata['options']['order'] = $this->piVars['order'];
                 $listMetadata['options']['order.asc'] = (boolean) $this->piVars['asc'];
@@ -702,7 +702,7 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_listview->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_listview->main(' . $content . ', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
 
                     }
 
@@ -711,7 +711,7 @@ 
                 }
 
                 // Set search parameters.
-                $solr->cPid =  $listMetadata['options']['pid'];
+                $solr->cPid = $listMetadata['options']['pid'];
                 $solr->params = $listMetadata['options']['params'];
 
                 // Perform search.
@@ -720,7 +720,7 @@ 
             }
 
             // 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.
@@ -780,7 +780,7 @@ 
 
         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 {
 
@@ -790,7 +790,7 @@ 
 
         if ($currentEntry) {
 
-            $currentEntry =  ($this->piVars['pointer'] * $this->conf['limit']) + 1;
+            $currentEntry = ($this->piVars['pointer'] * $this->conf['limit']) + 1;
             $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']));