kitodo / kitodo-presentation

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.'['.$piVar.']" value="'.htmlspecialchars($value).'" />';
+                $sorting .= '<input type="hidden" name="' . $this->prefixId . '[' . $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']));

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

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.'['.$piVar.']" value="'.htmlspecialchars($value).'" />';
+                $output .= '<input type="hidden" name="' . $this->prefixId . '[' . $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,