kitodo / kitodo-presentation

dlf/plugins/toolbox/class.tx_dlf_toolbox.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 		}
 
 		// Build data array.
-		$data = array (
+		$data = array(
 			'conf' => $this->conf,
 			'piVars' => $this->piVars,
 		);
@@ -73,7 +73,7 @@ 
 
 			$cObj->data = $data;
 
-			$content .= $this->cObj->substituteMarkerArray($subpart, array ('###TOOL###' => $cObj->cObjGetSingle($GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool], $GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool.'.'])));
+			$content .= $this->cObj->substituteMarkerArray($subpart, array('###TOOL###' => $cObj->cObjGetSingle($GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool], $GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool.'.'])));
 
 		}
 

dlf/plugins/toc/class.tx_dlf_toc.php

Indentation +12 added lines, -12 removed lines

@@ -67,37 +67,37 @@
 
 			$entryArray['doNotLinkIt'] = 0;
 
-            if ($this->conf['basketButton']) {
+			if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+				$entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
 
-            }
+			}
 
-        } elseif (!empty($entry['points']) && is_string($entry['points'])) {
+		} elseif (!empty($entry['points']) && is_string($entry['points'])) {
 
 			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
 
 			$entryArray['doNotLinkIt'] = 0;
 
-            if ($this->conf['basketButton']) {
+			if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+				$entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
 
-            }
+			}
 
-        } elseif (!empty($entry['targetUid'])) {
+		} elseif (!empty($entry['targetUid'])) {
 
 			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
 
 			$entryArray['doNotLinkIt'] = 0;
 
-            if ($this->conf['basketButton']) {
+			if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+				$entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
 
-            }
+			}
 
-        }
+		}
 
 		// Set "ITEM_STATE" to "CUR" if this entry points to current page.
 		if (in_array($entry['id'], $this->activeEntries)) {

Spacing +16 added lines, -16 removed lines

@@ -27,7 +27,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $activeEntries = array ();
+	protected $activeEntries = array();
 
 	/**
 	 * This builds an array for one menu entry
@@ -41,7 +41,7 @@ 
 	 */
 	protected function getMenuEntry(array $entry, $recursive = FALSE) {
 
-		$entryArray = array ();
+		$entryArray = array();
 
 		// Set "title", "volume", "type" and "pagination" from $entry array.
 		$entryArray['title'] = $entry['label'];
@@ -63,37 +63,37 @@ 
 		// Build menu links based on the $entry['points'] array.
 		if (!empty($entry['points']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($entry['points'])) {
 
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
+			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
 
 			$entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
 
             }
 
         } elseif (!empty($entry['points']) && is_string($entry['points'])) {
 
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
 
 			$entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
 
             }
 
         } elseif (!empty($entry['targetUid'])) {
 
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
+			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
 
 			$entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
-                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array ('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
+                $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(array('addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']), TRUE, FALSE, $this->conf['targetBasket']).'">'.$this->pi_getLL('basketButton', '', TRUE).'</a>';
 
             }
 
@@ -116,7 +116,7 @@ 
 			// 4. Current menu node has no corresponding images
 			if (!empty($this->conf['menuConf.']['expAll']) || $entryArray['ITEM_STATE'] == 'CUR' || is_string($entry['points']) || empty($this->doc->smLinks['l2p'][$entry['id']])) {
 
-				$entryArray['_SUB_MENU'] = array ();
+				$entryArray['_SUB_MENU'] = array();
 
 				foreach ($entry['children'] as $child) {
 
@@ -180,7 +180,7 @@ 
 
 		}
 
-		$TSconfig = array ();
+		$TSconfig = array();
 
 		$TSconfig['special'] = 'userfunction';
 
@@ -216,15 +216,15 @@ 
 		if ($this->doc === NULL) {
 
 			// Quit without doing anything if required variables are not set.
-			return array ();
+			return array();
 
 		} else {
 
 			// Set default values for page if not set.
 			// $this->piVars['page'] may be integer or string (physical structure @ID)
-			if ( (int)$this->piVars['page'] > 0 || empty($this->piVars['page'])) {
+			if ((int) $this->piVars['page'] > 0 || empty($this->piVars['page'])) {
 
-				$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->piVars['page'], 1, $this->doc->numPages, 1);
+				$this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
 
 			} else {
 
@@ -236,7 +236,7 @@ 
 
 		}
 
-		$menuArray = array ();
+		$menuArray = array();
 
 		// Does the document have physical elements or is it an external file?
 		if ($this->doc->physicalStructure || !\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->doc->uid)) {
@@ -293,11 +293,11 @@ 
 
 				$menuArray[0]['ITEM_STATE'] = 'CURIFSUB';
 
-				$menuArray[0]['_SUB_MENU'] = array ();
+				$menuArray[0]['_SUB_MENU'] = array();
 
 				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-					$entry = array (
+					$entry = array(
 						'label' => $resArray['title'],
 						'type' => $resArray['type'],
 						'volume' => $resArray['volume'],

dlf/plugins/collection/class.tx_dlf_collection.php

Spacing +15 added lines, -15 removed lines

@@ -27,7 +27,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $hookObjects = array ();
+	protected $hookObjects = array();
 
 	/**
 	 * The main method of the PlugIn
@@ -170,7 +170,7 @@ 
 				''
 			);
 
-			$volumes = array ();
+			$volumes = array();
 
 			while ($resArrayVolumes = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultVolumes)) {
 
@@ -189,7 +189,7 @@ 
 				} while (!empty($markerArray[$_key]));
 
 				// Merge plugin variables with new set of values.
-				$additionalParams = array ('collection' => $resArray['uid']);
+				$additionalParams = array('collection' => $resArray['uid']);
 
 				if (is_array($this->piVars)) {
 
@@ -202,7 +202,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)
@@ -216,7 +216,7 @@ 
 
 					$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' => $resArray['uid'])), FALSE, $this->conf['targetFeed']);
+					$markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array($this->prefixId => array('collection' => $resArray['uid'])), FALSE, $this->conf['targetFeed']);
 
 				} else {
 
@@ -320,26 +320,26 @@ 
 			''
 		);
 
-		$toplevel = array ();
+		$toplevel = array();
 
-		$subparts = array ();
+		$subparts = array();
 
-		$listMetadata = array ();
+		$listMetadata = array();
 
 		// Process results.
 		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
 			if (empty($listMetadata)) {
 
-				$listMetadata = array (
+				$listMetadata = array(
 					'label' => htmlspecialchars($resArray['collLabel']),
 					'description' => $this->pi_RTEcssText($resArray['collDesc']),
 					'thumbnail' => htmlspecialchars($resArray['collThumb']),
-					'options' => array (
+					'options' => array(
 						'source' => 'collection',
 						'select' => $id,
 						'userid' => $resArray['userid'],
-						'params' => array ('fq' => array ('collection_faceting:("'.$resArray['index_name'].'")')),
+						'params' => array('fq' => array('collection_faceting:("'.$resArray['index_name'].'")')),
 						'core' => '',
 						'pid' => $this->conf['pages'],
 						'order' => 'title',
@@ -373,11 +373,11 @@ 
 
 				}
 
-				$toplevel[$resArray['uid']] = array (
+				$toplevel[$resArray['uid']] = array(
 					'u' => $resArray['uid'],
 					'h' => '',
 					's' => $sorting,
-					'p' => array ()
+					'p' => array()
 				);
 
 			} else {
@@ -397,7 +397,7 @@ 
 
 				foreach ($parts as $part) {
 
-					$toplevel[$partof]['p'][] = array ('u' => $part);
+					$toplevel[$partof]['p'][] = array('u' => $part);
 
 				}
 
@@ -420,7 +420,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();

dlf/plugins/search/class.tx_dlf_search.php

Spacing +27 added lines, -27 removed lines

@@ -198,7 +198,7 @@ 
 		// 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>';
 
@@ -217,7 +217,7 @@ 
 
 		for ($i = 0; $i < $this->conf['extendedSlotCount']; $i++) {
 
-			$markerArray = array (
+			$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.']" />'
@@ -261,7 +261,7 @@ 
 		}
 
 		// Get facets from plugin configuration.
-		$facets = array ();
+		$facets = array();
 
 		foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
 
@@ -270,7 +270,7 @@ 
 		}
 
 		// 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>';
 
 		}
 
@@ -381,7 +381,7 @@ 
 				//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' => $search['params']['fq']));
+				$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('query' => $search['query'], 'fq' => $search['params']['fq']));
 				$entryArray['title'] = sprintf($this->pi_getLL('resetFacet', ''), $entryArray['title']);
 			}
 
@@ -394,7 +394,7 @@ 
 
 		}
 
-		$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $search['params']['fq']));
+		$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('query' => $search['query'], 'fq' => $search['params']['fq']));
 
 		return $entryArray;
 
@@ -466,13 +466,13 @@ 
 			}
 
 			// Configure @action URL for form.
-			$linkConf = array (
+			$linkConf = array(
 				'parameter' => $GLOBALS['TSFE']->id,
 				'forceAbsoluteUrl' => 1
 			);
 
 			// Fill markers.
-			$markerArray = array (
+			$markerArray = array(
 				'###ACTION_URL###' => $this->cObj->typoLink_URL($linkConf),
 				'###LABEL_QUERY###' => (!empty($search['query']) ? $search['query'] : $this->pi_getLL('label.query')),
 				'###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),
@@ -520,15 +520,15 @@ 
 			}
 
 			// 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)) {
 
 				// If the query already is a fulltext query e.g using the facets
-				$this->piVars['query'] = empty($matches[1])?$this->piVars['query']:$matches[1];
+				$this->piVars['query'] = empty($matches[1]) ? $this->piVars['query'] : $matches[1];
 
 				// Search in fulltext field if applicable. query must not be empty!
 				if (!empty($this->piVars['query'])) {
@@ -617,7 +617,7 @@ 
 
 				$collIds = explode(',', $this->conf['collections']);
 
-				$collIndexNames = array ();
+				$collIndexNames = array();
 
 				foreach ($collIds as $collId) {
 
@@ -640,7 +640,7 @@ 
 			// Perform search.
 			$results = $solr->search($query);
 
-			$results->metadata = array (
+			$results->metadata = array(
 				'label' => $label,
 				'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $solr->numberOfHits, count($results))).'</p>',
 				'thumbnail' => '',
@@ -655,15 +655,15 @@ 
 			\TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
 
 			// Jump directly to the page view, if there is only one result and it is configured
-			if($results->count() == 1 && !empty($this->conf['showSingleResult'])) {
+			if ($results->count() == 1 && !empty($this->conf['showSingleResult'])) {
 
 				$linkConf['parameter'] = $this->conf['targetPidPageView'];
 
 				$linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId,
-					array (
+					array(
 						'id' => $results->current()['uid'],
 						'highlight_word' => preg_replace('/\s\s+/', ';', $results->metadata['searchString']),
-						'page' => count($results[0]['subparts']) == 1?$results[0]['subparts'][0]['page']:1
+						'page' => count($results[0]['subparts']) == 1 ? $results[0]['subparts'][0]['page'] : 1
 					), '', TRUE, FALSE);
 
 			} else {
@@ -674,7 +674,7 @@ 
 				if (!empty($this->piVars['order'])) {
 
 					$linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId,
-							array (
+							array(
 								'order' => $this->piVars['order'],
 								'asc' => (!empty($this->piVars['asc']) ? '1' : '0')
 							), '', TRUE, FALSE);
@@ -709,12 +709,12 @@ 
 
 		$this->init($conf);
 
-		$menuArray = array ();
+		$menuArray = array();
 
 		// Set default value for facet search.
-		$search = array (
+		$search = array(
 			'query' => '*',
-			'params' => array ()
+			'params' => array()
 		);
 
 		// Extract query and filter from last search.
@@ -743,14 +743,14 @@ 
 
 			}
 
-			return array ();
+			return array();
 
 		}
 
 		// Set needed parameters for facet search.
 		if (empty($search['params']['fq'])) {
 
-			$search['params']['fq'] = array ();
+			$search['params']['fq'] = array();
 
 		}
 
@@ -767,7 +767,7 @@ 
 		// Process results.
 		foreach ($results->facet_counts->facet_fields as $field => $values) {
 
-			$entryArray = array ();
+			$entryArray = array();
 
 			$entryArray['title'] = htmlspecialchars($this->conf['facets'][$field]);
 

dlf/plugins/search/class.tx_dlf_search_suggest.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 *
 	 * @return	void
 	 */
-	public function main($content = '', $conf = array ()) {
+	public function main($content = '', $conf = array()) {
 
 		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted') != '' && \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed') != '') {
 

dlf/plugins/basket/class.tx_dlf_basket.php

Indentation +544 added lines, -544 removed lines

@@ -19,220 +19,220 @@ 
  */
 class tx_dlf_basket extends tx_dlf_plugin {
 
-    public $scriptRelPath = 'plugins/basket/class.tx_dlf_basket.php';
+	public $scriptRelPath = 'plugins/basket/class.tx_dlf_basket.php';
 
-    /**
-     * The main method of the PlugIn
-     *
-     * @access	public
-     *
-     * @param	string		$content: The PlugIn content
-     * @param	array		$conf: The PlugIn configuration
-     *
-     * @return	string		The content that is displayed on the website
-     */
-    public function main($content, $conf) {
+	/**
+	 * The main method of the PlugIn
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$content: The PlugIn content
+	 * @param	array		$conf: The PlugIn configuration
+	 *
+	 * @return	string		The content that is displayed on the website
+	 */
+	public function main($content, $conf) {
 
-        $this->init($conf);
+		$this->init($conf);
 
-        // Don't cache the output.
-        $this->setCache(FALSE);
+		// Don't cache the output.
+		$this->setCache(FALSE);
 
-        // Load template file.
-        if (!empty($this->conf['templateFile'])) {
+		// Load template file.
+		if (!empty($this->conf['templateFile'])) {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
 
-        } else {
+		} else {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/basket/template.tmpl'), '###TEMPLATE###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/basket/template.tmpl'), '###TEMPLATE###');
 
-        }
+		}
 
-        $subpartArray['entry'] = $this->cObj->getSubpart($this->template, '###ENTRY###');
+		$subpartArray['entry'] = $this->cObj->getSubpart($this->template, '###ENTRY###');
 
-        $markerArray['###JS###'] = '';
+		$markerArray['###JS###'] = '';
 
-        // get user session
-        $sessionId = $GLOBALS['TSFE']->fe_user->id;
+		// get user session
+		$sessionId = $GLOBALS['TSFE']->fe_user->id;
 
-        if ($GLOBALS['TSFE']->loginUser) {
+		if ($GLOBALS['TSFE']->loginUser) {
 
-            $insertArray['fe_user_id'] = $GLOBALS['TSFE']->fe_user->user['uid'];
+			$insertArray['fe_user_id'] = $GLOBALS['TSFE']->fe_user->user['uid'];
 
-            $query = $GLOBALS['TYPO3_DB']->SELECTquery(
-                '*',
-                'tx_dlf_basket',
-                'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id']).tx_dlf_helper::whereClause('tx_dlf_basket'),
-                '',
-                '',
-                '1'
-            );
+			$query = $GLOBALS['TYPO3_DB']->SELECTquery(
+				'*',
+				'tx_dlf_basket',
+				'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id']).tx_dlf_helper::whereClause('tx_dlf_basket'),
+				'',
+				'',
+				'1'
+			);
 
-        } else {
+		} else {
 
-            $GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
+			$GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
 
-            $GLOBALS['TSFE']->fe_user->sesData_change = true;
+			$GLOBALS['TSFE']->fe_user->sesData_change = true;
 
-            $GLOBALS['TSFE']->fe_user->storeSessionData();
+			$GLOBALS['TSFE']->fe_user->storeSessionData();
 
-            $query = $GLOBALS['TYPO3_DB']->SELECTquery(
-                '*',
-                'tx_dlf_basket',
-                'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket').tx_dlf_helper::whereClause('tx_dlf_basket'),
-                '',
-                '',
-                '1'
-            );
+			$query = $GLOBALS['TYPO3_DB']->SELECTquery(
+				'*',
+				'tx_dlf_basket',
+				'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket').tx_dlf_helper::whereClause('tx_dlf_basket'),
+				'',
+				'',
+				'1'
+			);
 
-        }
+		}
 
-        $result = $GLOBALS['TYPO3_DB']->sql_query($query);
+		$result = $GLOBALS['TYPO3_DB']->sql_query($query);
 
-        // session already exists
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 0) {
+		// session already exists
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 0) {
 
-            // create new basket in db
-            $insertArray['session_id'] = $sessionId;
-            $insertArray['doc_ids'] = '';
-            $insertArray['label'] = '';
-            $insertArray['l18n_diffsource'] = '';
+			// create new basket in db
+			$insertArray['session_id'] = $sessionId;
+			$insertArray['doc_ids'] = '';
+			$insertArray['label'] = '';
+			$insertArray['l18n_diffsource'] = '';
 
-            $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_basket', $insertArray);
+			$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_basket', $insertArray);
 
-            $result = $GLOBALS['TYPO3_DB']->sql_query($query);
+			$result = $GLOBALS['TYPO3_DB']->sql_query($query);
 
-        }
+		}
 
-        $basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+		$basketData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-        $piVars = $this->piVars;
+		$piVars = $this->piVars;
 
-        // action add to basket
-        if (!empty($this->piVars['id']) && $this->piVars['addToBasket']) {
+		// action add to basket
+		if (!empty($this->piVars['id']) && $this->piVars['addToBasket']) {
 
-            $returnData = $this->addToBasket($this->piVars, $basketData);
+			$returnData = $this->addToBasket($this->piVars, $basketData);
 
-            $basketData = $returnData['basketData'];
+			$basketData = $returnData['basketData'];
 
-            $markerArray['###JS###'] = $returnData['jsOutput'];
+			$markerArray['###JS###'] = $returnData['jsOutput'];
 
-        } else {
+		} else {
 
-            $basketData['doc_ids'] = json_decode($basketData['doc_ids']);
+			$basketData['doc_ids'] = json_decode($basketData['doc_ids']);
 
-        }
+		}
 
-        // action remove from basket
-        if ($this->piVars['basket_action'] == 'remove') {
+		// action remove from basket
+		if ($this->piVars['basket_action'] == 'remove') {
 
-            // remove entry from list
-            unset($piVars['basket_action']);
+			// remove entry from list
+			unset($piVars['basket_action']);
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $basketData = $this->removeFromBasket($piVars, $basketData);
+				$basketData = $this->removeFromBasket($piVars, $basketData);
 
-            }
+			}
 
-        }
+		}
 
-        // action remove from basket
-        if ($this->piVars['basket_action'] == 'open') {
+		// action remove from basket
+		if ($this->piVars['basket_action'] == 'open') {
 
-            // open selected documents
-            unset($piVars['basket_action']);
+			// open selected documents
+			unset($piVars['basket_action']);
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $basketData = $this->openFromBasket($piVars, $basketData);
+				$basketData = $this->openFromBasket($piVars, $basketData);
 
-            }
+			}
 
-        }
+		}
 
-        // action print from basket
-        if ($this->piVars['print_action']) {
+		// action print from basket
+		if ($this->piVars['print_action']) {
 
-            // open selected documents
-            unset($piVars['print_action']);
+			// open selected documents
+			unset($piVars['print_action']);
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $basketData = $this->printDocument($piVars, $basketData);
+				$basketData = $this->printDocument($piVars, $basketData);
 
-            }
+			}
 
-        }
+		}
 
-        // action send mail
-        if ($this->piVars['mail_action']) {
+		// action send mail
+		if ($this->piVars['mail_action']) {
 
-            if (isset($this->piVars['selected'])) {
+			if (isset($this->piVars['selected'])) {
 
-                $this->sendMail($this->piVars);
+				$this->sendMail($this->piVars);
 
-            }
+			}
 
-        }
+		}
 
-        // set marker
-        $markerArray['###ACTION###'] = $this->pi_getPageLink($GLOBALS['TSFE']->id);
+		// set marker
+		$markerArray['###ACTION###'] = $this->pi_getPageLink($GLOBALS['TSFE']->id);
 
-        $markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', TRUE);
+		$markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', TRUE);
 
-        if ($basketData['doc_ids']) {
+		if ($basketData['doc_ids']) {
 
-            if (is_object($basketData['doc_ids'])) {
+			if (is_object($basketData['doc_ids'])) {
 
-                $basketData['doc_ids'] = get_object_vars($basketData['doc_ids']);
+				$basketData['doc_ids'] = get_object_vars($basketData['doc_ids']);
 
-            }
+			}
 
-            $markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), count($basketData['doc_ids']));
+			$markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), count($basketData['doc_ids']));
 
-        } else {
+		} else {
 
-            $markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), 0);
+			$markerArray['###COUNT###'] = sprintf($this->pi_getLL('count'), 0);
 
-        }
+		}
 
-        // get mail addresses
-        $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_mail',
-            '1'.tx_dlf_helper::whereClause('tx_dlf_mail'),
-            '',
-            'tx_dlf_mail.sorting',
-            ''
-        );
+		// get mail addresses
+		$resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_mail',
+			'1'.tx_dlf_helper::whereClause('tx_dlf_mail'),
+			'',
+			'tx_dlf_mail.sorting',
+			''
+		);
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultMail) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultMail) > 0) {
 
-            $mails = array();
+			$mails = array();
 
-            $mailForm = '<select name="tx_dlf[mail_action]">';
+			$mailForm = '<select name="tx_dlf[mail_action]">';
 
-            $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
+			$mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
 
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
+			while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
 
-                $mails[] = $row;
+				$mails[] = $row;
 
-                $mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
+				$mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
 
-            }
+			}
 
-            $mailForm .= '</select><input type="submit">';
+			$mailForm .= '</select><input type="submit">';
 
-        }
+		}
 
-        // mail action form
-        $markerArray['###MAILACTION###'] = $mailForm;
+		// mail action form
+		$markerArray['###MAILACTION###'] = $mailForm;
 
-        // remove action form
-        $markerArray['###REMOVEACTION###'] = '
+		// remove action form
+		$markerArray['###REMOVEACTION###'] = '
 			<select name="tx_dlf[basket_action]">
 				<option value="">'.$this->pi_getLL('chooseAction', '', TRUE).'</option>
 				<option value="open">'.$this->pi_getLL('download', '', TRUE).'</option>
@@ -241,275 +241,275 @@ 
 			<input type="submit">
 		';
 
-        // get mail addresses
-        $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_printer',
-            '1'.tx_dlf_helper::whereClause('tx_dlf_printer'),
-            '',
-            '',
-            ''
-        );
+		// get mail addresses
+		$resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_printer',
+			'1'.tx_dlf_helper::whereClause('tx_dlf_printer'),
+			'',
+			'',
+			''
+		);
 
-        $printForm = '';
+		$printForm = '';
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultPrinter) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultPrinter) > 0) {
 
-            $printers = array();
+			$printers = array();
 
-            $printForm = '<select name="tx_dlf[print_action]">';
+			$printForm = '<select name="tx_dlf[print_action]">';
 
-            $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
+			$printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
 
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
+			while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
 
-                $printers[] = $row;
+				$printers[] = $row;
 
-                $printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
+				$printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
 
-            }
+			}
 
-            $printForm .= '</select><input type="submit" />';
+			$printForm .= '</select><input type="submit" />';
 
-        }
+		}
 
-        // print action form
-        $markerArray['###PRINTACTION###'] = $printForm;
+		// print action form
+		$markerArray['###PRINTACTION###'] = $printForm;
 
-        $entries = '';
+		$entries = '';
 
-        if (isset($basketData['doc_ids'])) {
+		if (isset($basketData['doc_ids'])) {
 
-            // get each entry
-            foreach ($basketData['doc_ids'] as $key => $value) {
+			// get each entry
+			foreach ($basketData['doc_ids'] as $key => $value) {
 
-                $entries .= $this->getEntry($value, $subpartArray);
+				$entries .= $this->getEntry($value, $subpartArray);
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $entries = '';
+			$entries = '';
 
-        }
+		}
 
-        // basket go to
-        if ($this->conf['targetBasket'] && $this->conf['basketGoToButton'] && $this->piVars['id']) {
+		// basket go to
+		if ($this->conf['targetBasket'] && $this->conf['basketGoToButton'] && $this->piVars['id']) {
 
-            $label = $this->pi_getLL('goBasket', '', TRUE);
+			$label = $this->pi_getLL('goBasket', '', TRUE);
 
-            $basketConf = array (
-                'parameter' => $this->conf['targetBasket'],
-                'title' => $label
-            );
+			$basketConf = array (
+				'parameter' => $this->conf['targetBasket'],
+				'title' => $label
+			);
 
-            $markerArray['###BASKET###'] = $this->cObj->typoLink($label, $basketConf);
+			$markerArray['###BASKET###'] = $this->cObj->typoLink($label, $basketConf);
 
-        } else {
+		} else {
 
-            $markerArray['###BASKET###'] = '';
+			$markerArray['###BASKET###'] = '';
 
-        }
+		}
 
-        $content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $entries, TRUE), $markerArray);
+		$content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $entries, TRUE), $markerArray);
 
-        return $this->pi_wrapInBaseClass($content);
+		return $this->pi_wrapInBaseClass($content);
 
-    }
+	}
 
-    /**
-     * Return one basket entry
-     * @param  array $data     DocumentData
-     * @param  array $template Template information
-     * @return Template
-     */
-    public function getEntry($data, $template) {
+	/**
+	 * Return one basket entry
+	 * @param  array $data     DocumentData
+	 * @param  array $template Template information
+	 * @return Template
+	 */
+	public function getEntry($data, $template) {
 
-        if (is_object($data)) {
+		if (is_object($data)) {
 
-            $data = get_object_vars($data);
+			$data = get_object_vars($data);
 
-        }
+		}
 
-        $id = $data['id'];
+		$id = $data['id'];
 
-        $startpage = $data['startpage'];
+		$startpage = $data['startpage'];
 
-        $endpage = $data['endpage'];
+		$endpage = $data['endpage'];
 
-        $startX = $data['startX'];
+		$startX = $data['startX'];
 
-        $startY = $data['startY'];
+		$startY = $data['startY'];
 
-        $endX = $data['endX'];
+		$endX = $data['endX'];
 
-        $endY = $data['endY'];
+		$endY = $data['endY'];
 
-        $rotation = $data['rotation'];
+		$rotation = $data['rotation'];
 
-        $docData = $this->getDocumentData($id, $data);
+		$docData = $this->getDocumentData($id, $data);
 
-        $markerArray['###BASKETDATA###'] = $docData['downloadLink'];
+		$markerArray['###BASKETDATA###'] = $docData['downloadLink'];
 
-        $arrayKey = $id.'_'.$startpage;
+		$arrayKey = $id.'_'.$startpage;
 
-        if (isset($startX)) {
+		if (isset($startX)) {
 
-            $arrayKey .= '_'.$startX;
+			$arrayKey .= '_'.$startX;
 
-        }
+		}
 
-        if (isset($endX)) {
+		if (isset($endX)) {
 
-            $arrayKey .= '_'.$endX;
+			$arrayKey .= '_'.$endX;
 
-        }
+		}
 
-        $controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
+		$controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
 
-        $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
+		$controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
 
-        $controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
+		$controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
 
-        // add hidden fields for detail information
-        if ($startX) {
+		// add hidden fields for detail information
+		if ($startX) {
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
+			$controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
 
-        }
+		}
 
-        // return one entry
-        $markerArray['###CONTROLS###'] = $controlMark;
+		// return one entry
+		$markerArray['###CONTROLS###'] = $controlMark;
 
-        $markerArray['###NUMBER###'] = $docData['record_id'];
+		$markerArray['###NUMBER###'] = $docData['record_id'];
 
-        return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###ENTRY###', $subpart, TRUE), $markerArray);
+		return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###ENTRY###', $subpart, TRUE), $markerArray);
 
-    }
+	}
 
-    /**
-     * Adds documents to the basket
-     * @param array $_piVars    piVars
-     * @param array $basketData basket data
-     */
-    public function addToBasket($_piVars, $basketData) {
+	/**
+	 * Adds documents to the basket
+	 * @param array $_piVars    piVars
+	 * @param array $basketData basket data
+	 */
+	public function addToBasket($_piVars, $basketData) {
 
-        if (!$_piVars['startpage']) {
+		if (!$_piVars['startpage']) {
 
-            $page = 0;
+			$page = 0;
 
-        } else {
+		} else {
 
-            $page = intval($_piVars['startpage']);
+			$page = intval($_piVars['startpage']);
 
-        }
+		}
 
-        if ($page != null || $_piVars['addToBasket'] == 'list') {
+		if ($page != null || $_piVars['addToBasket'] == 'list') {
 
-            $documentItem = array(
-                'id' => intval($_piVars['id']),
-                'startpage' => intval($_piVars['startpage']),
-                'endpage' => intval($_piVars['endpage']),
-                'startX' => intval($_piVars['startX']),
-                'startY' => intval($_piVars['startY']),
-                'endX' => intval($_piVars['endX']),
-                'endY' => intval($_piVars['endY']),
-                'rotation' => intval($_piVars['rotation'])
-            );
+			$documentItem = array(
+				'id' => intval($_piVars['id']),
+				'startpage' => intval($_piVars['startpage']),
+				'endpage' => intval($_piVars['endpage']),
+				'startX' => intval($_piVars['startX']),
+				'startY' => intval($_piVars['startY']),
+				'endX' => intval($_piVars['endX']),
+				'endY' => intval($_piVars['endY']),
+				'rotation' => intval($_piVars['rotation'])
+			);
 
-            // update basket
-            if (!empty($basketData['doc_ids'])) {
+			// update basket
+			if (!empty($basketData['doc_ids'])) {
 
-                $items = json_decode($basketData['doc_ids']);
+				$items = json_decode($basketData['doc_ids']);
 
-                $items = get_object_vars($items);
+				$items = get_object_vars($items);
 
-            } else {
+			} else {
 
-                $items = array();
+				$items = array();
 
-            }
+			}
 
-            // get document instance to load further information
-            $document = tx_dlf_document::getInstance($documentItem['id'],0);
+			// get document instance to load further information
+			$document = tx_dlf_document::getInstance($documentItem['id'],0);
 
-            // set endpage for toc and subentry based on logid
-            if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
+			// set endpage for toc and subentry based on logid
+			if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
 
-                $smLinks = $document->smLinks;
+				$smLinks = $document->smLinks;
 
-                $pageCounter = sizeof($smLinks['l2p'][$_piVars['logId']]);
+				$pageCounter = sizeof($smLinks['l2p'][$_piVars['logId']]);
 
-                $documentItem['endpage'] = ($documentItem['startpage'] + $pageCounter) - 1;
+				$documentItem['endpage'] = ($documentItem['startpage'] + $pageCounter) - 1;
 
-            }
+			}
 
-            // add whole document
-            if ($_piVars['addToBasket'] == 'list') {
+			// add whole document
+			if ($_piVars['addToBasket'] == 'list') {
 
-                $documentItem['endpage'] = $document->numPages;
+				$documentItem['endpage'] = $document->numPages;
 
-            }
+			}
 
-            $arrayKey = $documentItem['id'].'_'.$page;
+			$arrayKey = $documentItem['id'].'_'.$page;
 
-            if (!empty($documentItem['startX'])) {
+			if (!empty($documentItem['startX'])) {
 
-                $arrayKey .= '_'.$documentItem['startX'];
+				$arrayKey .= '_'.$documentItem['startX'];
 
-            }
+			}
 
-            if (!empty($documentItem['endX'])) {
+			if (!empty($documentItem['endX'])) {
 
-                $arrayKey .= '_'.$documentItem['endX'];
+				$arrayKey .= '_'.$documentItem['endX'];
 
-            }
+			}
 
-            // do not add more than one identical object
-            if (!in_array($arrayKey, $items)) {
+			// do not add more than one identical object
+			if (!in_array($arrayKey, $items)) {
 
-                $items[$arrayKey] = $documentItem;
+				$items[$arrayKey] = $documentItem;
 
-                // replace url param placeholder
-                $pdfParams = str_replace("##startpage##", $documentItem['startpage'], $this->conf['pdfparams']);
+				// replace url param placeholder
+				$pdfParams = str_replace("##startpage##", $documentItem['startpage'], $this->conf['pdfparams']);
 
-                $pdfParams = str_replace("##docId##", $document->recordId, $pdfParams);
+				$pdfParams = str_replace("##docId##", $document->recordId, $pdfParams);
 
-                $pdfParams = str_replace("##startx##", $documentItem['startX'], $pdfParams);
+				$pdfParams = str_replace("##startx##", $documentItem['startX'], $pdfParams);
 
-                $pdfParams = str_replace("##starty##", $documentItem['startY'], $pdfParams);
+				$pdfParams = str_replace("##starty##", $documentItem['startY'], $pdfParams);
 
-                $pdfParams = str_replace("##endx##", $documentItem['endX'], $pdfParams);
+				$pdfParams = str_replace("##endx##", $documentItem['endX'], $pdfParams);
 
-                $pdfParams = str_replace("##endy##", $documentItem['endY'], $pdfParams);
+				$pdfParams = str_replace("##endy##", $documentItem['endY'], $pdfParams);
 
-                $pdfParams = str_replace("##rotation##", $documentItem['rotation'], $pdfParams);
+				$pdfParams = str_replace("##rotation##", $documentItem['rotation'], $pdfParams);
 
-                if ($documentItem['startpage'] != $documentItem['endpage']) {
+				if ($documentItem['startpage'] != $documentItem['endpage']) {
 
-                    $pdfParams = str_replace("##endpage##", $documentItem['endpage'], $pdfParams);
+					$pdfParams = str_replace("##endpage##", $documentItem['endpage'], $pdfParams);
 
-                } else {
+				} else {
 
-                    // remove parameter endpage
-                    $pdfParams = str_replace(",##endpage##", '', $pdfParams);
+					// remove parameter endpage
+					$pdfParams = str_replace(",##endpage##", '', $pdfParams);
 
-                }
+				}
 
-                $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
+				$pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
 
-                if ($this->conf['pregeneration']) {
+				if ($this->conf['pregeneration']) {
 
-                    // send ajax request to webapp
-                    $output .= '
+					// send ajax request to webapp
+					$output .= '
 					<script>
 						$(document).ready(function(){
 							$.ajax({
@@ -519,431 +519,431 @@ 
 						});
 					</script>';
 
-                }
+				}
 
-            }
+			}
 
-            $update = array('doc_ids' => json_encode($items));
+			$update = array('doc_ids' => json_encode($items));
 
-            $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
+			$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
 
-            $basketData['doc_ids'] = $items;
+			$basketData['doc_ids'] = $items;
 
-        }
+		}
 
-        return array('basketData' => $basketData, 'jsOutput' => $output);
+		return array('basketData' => $basketData, 'jsOutput' => $output);
 
-    }
+	}
 
-    /**
-     * Removes selected documents from basket
-     * @param  array $_piVars    plugin variables
-     * @param  array $basketData array with document information
-     * @return array             basket data
-     */
-    public function removeFromBasket($_piVars, $basketData) {
+	/**
+	 * Removes selected documents from basket
+	 * @param  array $_piVars    plugin variables
+	 * @param  array $basketData array with document information
+	 * @return array             basket data
+	 */
+	public function removeFromBasket($_piVars, $basketData) {
 
-        if (!empty($basketData['doc_ids'])) {
+		if (!empty($basketData['doc_ids'])) {
 
-            $items = $basketData['doc_ids'];
+			$items = $basketData['doc_ids'];
 
-            $items = get_object_vars($items);
+			$items = get_object_vars($items);
 
-        }
+		}
 
-        foreach ($_piVars['selected'] as $key => $value) {
+		foreach ($_piVars['selected'] as $key => $value) {
 
-            if (isset($value['id'])) {
+			if (isset($value['id'])) {
 
-                $arrayKey = $value['id'].'_'.$value['startpage'];
+				$arrayKey = $value['id'].'_'.$value['startpage'];
 
-                if (isset($value['startX'])) {
+				if (isset($value['startX'])) {
 
-                    $arrayKey .= '_'.$value['startX'];
+					$arrayKey .= '_'.$value['startX'];
 
-                }
+				}
 
-                if (isset($value['endX'])) {
+				if (isset($value['endX'])) {
 
-                    $arrayKey .= '_'.$value['endX'];
+					$arrayKey .= '_'.$value['endX'];
 
-                }
+				}
 
-                if (isset($items[$arrayKey])) {
+				if (isset($items[$arrayKey])) {
 
-                    unset($items[$arrayKey]);
+					unset($items[$arrayKey]);
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        if (empty($items)) {
+		if (empty($items)) {
 
-            $update = array('doc_ids' => '');
+			$update = array('doc_ids' => '');
 
-        } else {
+		} else {
 
-            $update = array('doc_ids' => json_encode($items));
+			$update = array('doc_ids' => json_encode($items));
 
-        }
+		}
 
-        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
+		$GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
 
-        $basketData['doc_ids'] = $items;
+		$basketData['doc_ids'] = $items;
 
-        return $basketData;
+		return $basketData;
 
-    }
+	}
 
-    /**
-     * Open selected documents from basket
-     * @param  array $_piVars    plugin variables
-     * @param  array $basketData array with document information
-     * @return array             basket data
-     */
-    public function openFromBasket($_piVars, $basketData) {
+	/**
+	 * Open selected documents from basket
+	 * @param  array $_piVars    plugin variables
+	 * @param  array $basketData array with document information
+	 * @return array             basket data
+	 */
+	public function openFromBasket($_piVars, $basketData) {
 
-        $pdfUrl = $this->conf['pdfgenerate'];
+		$pdfUrl = $this->conf['pdfgenerate'];
 
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-            if ($docValue['id']) {
+			if ($docValue['id']) {
 
-                $filename .= $docValue['id'].'_';
+				$filename .= $docValue['id'].'_';
 
-                $docData = $this->getDocumentData($docValue['id'], $docValue);
+				$docData = $this->getDocumentData($docValue['id'], $docValue);
 
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                $numberOfPages += $docData['pageNums'];
+				$numberOfPages += $docData['pageNums'];
 
-            }
+			}
 
-        }
+		}
 
-        header('Location: '.$pdfUrl);
+		header('Location: '.$pdfUrl);
 
-        ob_end_flush();
+		ob_end_flush();
 
-        exit;
+		exit;
 
-    }
+	}
 
-    /**
-     * Returns the downloadurl configured in the basket
-     * @param  integer $id Document id
-     * @return mixed     download url or false
-     */
-    public function getDocumentData($id, $data) {
+	/**
+	 * Returns the downloadurl configured in the basket
+	 * @param  integer $id Document id
+	 * @return mixed     download url or false
+	 */
+	public function getDocumentData($id, $data) {
 
-        // get document instance to load further information
-        $document = tx_dlf_document::getInstance($id,0);
+		// get document instance to load further information
+		$document = tx_dlf_document::getInstance($id,0);
 
-        if ($document) {
+		if ($document) {
 
-            // replace url param placeholder
-            $urlParams = str_replace("##page##", intval($data['page']), $this->conf['pdfparams']);
+			// replace url param placeholder
+			$urlParams = str_replace("##page##", intval($data['page']), $this->conf['pdfparams']);
 
-            $urlParams = str_replace("##docId##", $document->recordId, $urlParams);
+			$urlParams = str_replace("##docId##", $document->recordId, $urlParams);
 
-            $urlParams = str_replace("##startpage##", intval($data['startpage']), $urlParams);
+			$urlParams = str_replace("##startpage##", intval($data['startpage']), $urlParams);
 
-            if ($data['startpage'] != $data['endpage']) {
+			if ($data['startpage'] != $data['endpage']) {
 
-                $urlParams = str_replace("##endpage##", intval($data['endpage']), $urlParams);
+				$urlParams = str_replace("##endpage##", intval($data['endpage']), $urlParams);
 
-            } else {
+			} else {
 
-                // remove parameter endpage
-                $urlParams = str_replace(",##endpage##", '', $urlParams);
+				// remove parameter endpage
+				$urlParams = str_replace(",##endpage##", '', $urlParams);
 
-            }
+			}
 
-            $urlParams = str_replace("##startx##", intval($data['startX']), $urlParams);
+			$urlParams = str_replace("##startx##", intval($data['startX']), $urlParams);
 
-            $urlParams = str_replace("##starty##", intval($data['startY']), $urlParams);
+			$urlParams = str_replace("##starty##", intval($data['startY']), $urlParams);
 
-            $urlParams = str_replace("##endx##", intval($data['endX']), $urlParams);
+			$urlParams = str_replace("##endx##", intval($data['endX']), $urlParams);
 
-            $urlParams = str_replace("##endy##", intval($data['endY']), $urlParams);
+			$urlParams = str_replace("##endy##", intval($data['endY']), $urlParams);
 
-            $urlParams = str_replace("##rotation##", intval($data['rotation']), $urlParams);
+			$urlParams = str_replace("##rotation##", intval($data['rotation']), $urlParams);
 
-            $downloadUrl = $this->conf['pdfgenerate'].$urlParams;
+			$downloadUrl = $this->conf['pdfgenerate'].$urlParams;
 
-            $title = $document->getTitle($id, TRUE);
+			$title = $document->getTitle($id, TRUE);
 
-            if (empty($title)) {
+			if (empty($title)) {
 
-                $title = $this->pi_getLL('noTitle', '', TRUE);
+				$title = $this->pi_getLL('noTitle', '', TRUE);
 
-            }
+			}
 
-            // Set page and cutout information
-            $info = '';
+			// Set page and cutout information
+			$info = '';
 
-            if ($data['startX'] != '' && $data['endX'] != '') {
+			if ($data['startX'] != '' && $data['endX'] != '') {
 
-                // cutout
-                $info .= $this->pi_getLL('cutout', '', TRUE).' ';
+				// cutout
+				$info .= $this->pi_getLL('cutout', '', TRUE).' ';
 
-            }
+			}
 
-            if ($data['startpage'] == $data['endpage']) {
+			if ($data['startpage'] == $data['endpage']) {
 
-                // One page
-                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
+				// One page
+				$info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
 
-            } else {
+			} else {
 
-                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
+				$info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
 
-            }
+			}
 
-            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.$title.'</a> ('.$info.')';
+			$downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.$title.'</a> ('.$info.')';
 
-            if ($data['startpage'] == $data['endpage']) {
+			if ($data['startpage'] == $data['endpage']) {
 
-                $pageNums = 1;
+				$pageNums = 1;
 
-            } else {
+			} else {
 
-                $pageNums = $data['endpage'] - $data['startpage'];
+				$pageNums = $data['endpage'] - $data['startpage'];
 
-            }
+			}
 
-            return array(
-                'downloadUrl' => $downloadUrl,
-                'downloadLink' => $downloadLink,
-                'pageNums'	=> $pageNums,
-                'urlParams' => $urlParams,
-                'record_id' => $document->recordId,
-            );
+			return array(
+				'downloadUrl' => $downloadUrl,
+				'downloadLink' => $downloadLink,
+				'pageNums'	=> $pageNums,
+				'urlParams' => $urlParams,
+				'record_id' => $document->recordId,
+			);
 
-        }
+		}
 
-        return false;
+		return false;
 
-    }
+	}
 
-    /**
-     * Send mail with pdf download url
-     */
-    public function sendMail() {
+	/**
+	 * Send mail with pdf download url
+	 */
+	public function sendMail() {
 
-        // send mail
-        $mailId = $this->piVars['mail_action'];
+		// send mail
+		$mailId = $this->piVars['mail_action'];
 
-        // get id from db and send selected doc downloadlink
-        $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_mail',
-            'tx_dlf_mail.uid="'.intval($mailId).'"'.tx_dlf_helper::whereClause('tx_dlf_mail'),
-            '',
-            '',
-            '1'
-        );
+		// get id from db and send selected doc downloadlink
+		$resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_mail',
+			'tx_dlf_mail.uid="'.intval($mailId).'"'.tx_dlf_helper::whereClause('tx_dlf_mail'),
+			'',
+			'',
+			'1'
+		);
 
-        $mailData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail);
+		$mailData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail);
 
-        $body = $this->pi_getLL('mailBody', '', TRUE)."\n";
+		$body = $this->pi_getLL('mailBody', '', TRUE)."\n";
 
-        $numberOfPages = 0;
+		$numberOfPages = 0;
 
-        $pdfUrl = $this->conf['pdfdownload'];
+		$pdfUrl = $this->conf['pdfdownload'];
 
-        // prepare links
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
+		// prepare links
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-            if ($docValue['id']) {
+			if ($docValue['id']) {
 
-                $explodeId = explode("_", $docValue['id']);
+				$explodeId = explode("_", $docValue['id']);
 
-                $docData = $this->getDocumentData($explodeId[0], $docValue);
+				$docData = $this->getDocumentData($explodeId[0], $docValue);
 
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
+				$pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
 
-                if ($pages === 0) {
+				if ($pages === 0) {
 
-                    $numberOfPages = $numberOfPages + 1;
+					$numberOfPages = $numberOfPages + 1;
 
-                } else {
+				} else {
 
-                    $numberOfPages = $numberOfPages + $pages;
+					$numberOfPages = $numberOfPages + $pages;
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        // Remove leading/tailing pdfparamseperator
-        $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
+		// Remove leading/tailing pdfparamseperator
+		$pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
 
-        $body .= $pdfUrl;
+		$body .= $pdfUrl;
 
-        $from = \TYPO3\CMS\Core\Utility\MailUtility::getSystemFrom();
+		$from = \TYPO3\CMS\Core\Utility\MailUtility::getSystemFrom();
 
-        // send mail
-        $mail = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Mail\\MailMessage');
+		// send mail
+		$mail = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Mail\\MailMessage');
 
-        // Prepare and send the message
-        $mail
-            // subject
-            ->setSubject($this->pi_getLL('mailSubject', '', TRUE))
+		// Prepare and send the message
+		$mail
+			// subject
+			->setSubject($this->pi_getLL('mailSubject', '', TRUE))
 
-            // Set the From address with an associative array
-            ->setFrom($from)
+			// Set the From address with an associative array
+			->setFrom($from)
 
-            // Set the To addresses with an associative array
-            ->setTo(array($mailData['mail'] => $mailData['name']))
+			// Set the To addresses with an associative array
+			->setTo(array($mailData['mail'] => $mailData['name']))
 
-            ->setBody($body, 'text/html')
+			->setBody($body, 'text/html')
 
-            ->send()
-        ;
+			->send()
+		;
 
-        // protocol
-        $insertArray = array(
-            'pid' => $this->conf['pages'],
-            'file_name' => $pdfUrl,
-            'count_pages' => $numberOfPages,
-            'crdate' => time(),
-        );
+		// protocol
+		$insertArray = array(
+			'pid' => $this->conf['pages'],
+			'file_name' => $pdfUrl,
+			'count_pages' => $numberOfPages,
+			'crdate' => time(),
+		);
 
-        if ($GLOBALS["TSFE"]->loginUser) {
+		if ($GLOBALS["TSFE"]->loginUser) {
 
-            // internal user
-            $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
+			// internal user
+			$insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
 
-            $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
+			$insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
 
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
+			$insertArray['label'] = 'Mail: '.$mailData['mail'];
 
-        } else {
+		} else {
 
-            // external user
-            $insertArray['user_id'] = 0;
+			// external user
+			$insertArray['user_id'] = 0;
 
-            $insertArray['name'] = 'n/a';
+			$insertArray['name'] = 'n/a';
 
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
+			$insertArray['label'] = 'Mail: '.$mailData['mail'];
 
-        }
+		}
 
-        // add action to protocol
-        $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
+		// add action to protocol
+		$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
 
-    }
+	}
 
-    /**
-     * Sends document information to an external printer (url)
-     */
-    public function printDocument() {
+	/**
+	 * Sends document information to an external printer (url)
+	 */
+	public function printDocument() {
 
-        $pdfUrl = $this->conf['pdfprint'];
+		$pdfUrl = $this->conf['pdfprint'];
 
-        foreach ($this->piVars['selected'] as $docId => $docValue) {
+		foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-            if ($docValue['id']) {
+			if ($docValue['id']) {
 
-                $docData = $this->getDocumentData($docValue['id'], $docValue);
+				$docData = $this->getDocumentData($docValue['id'], $docValue);
 
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+				$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                $numberOfPages += $docData['pageNums'];
+				$numberOfPages += $docData['pageNums'];
 
-            }
+			}
 
-        }
+		}
 
-        // get printer data
-        $printerId = $this->piVars['print_action'];
+		// get printer data
+		$printerId = $this->piVars['print_action'];
 
-        // get id from db and send selected doc downloadlink
-        $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            '*',
-            'tx_dlf_printer',
-            'tx_dlf_printer.uid="'.intval($printerId).'"'.tx_dlf_helper::whereClause('tx_dlf_basket'),
-            '',
-            '',
-            '1'
-        );
+		// get id from db and send selected doc downloadlink
+		$resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'tx_dlf_printer',
+			'tx_dlf_printer.uid="'.intval($printerId).'"'.tx_dlf_helper::whereClause('tx_dlf_basket'),
+			'',
+			'',
+			'1'
+		);
 
-        $printerData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter);
+		$printerData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter);
 
-        // printer is selected
-        if ($printerData) {
+		// printer is selected
+		if ($printerData) {
 
-            $pdfUrl = $printerData['print'];
+			$pdfUrl = $printerData['print'];
 
-            $filename = 'Document_';
+			$filename = 'Document_';
 
-            $numberOfPages = 0;
+			$numberOfPages = 0;
 
-            foreach ($this->piVars['selected'] as $docId => $docValue) {
+			foreach ($this->piVars['selected'] as $docId => $docValue) {
 
-                if ($docValue['id']) {
+				if ($docValue['id']) {
 
-                    $filename .= $docValue['id'].'_';
+					$filename .= $docValue['id'].'_';
 
-                    $explodeId = explode("_", $docId);
+					$explodeId = explode("_", $docId);
 
-                    $docData = $this->getDocumentData($explodeId[0], $docValue);
+					$docData = $this->getDocumentData($explodeId[0], $docValue);
 
-                    $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+					$pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
 
-                    $numberOfPages += $docData['pageNums'];
+					$numberOfPages += $docData['pageNums'];
 
-                }
+				}
 
-            }
+			}
 
-            $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
+			$pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
 
-        }
+		}
 
-        // protocol
-        $insertArray = array(
-            'pid' => $this->conf['pages'],
-            'file_name' => $pdfUrl,
-            'count_pages' => $numberOfPages,
-            'crdate' => time(),
-        );
+		// protocol
+		$insertArray = array(
+			'pid' => $this->conf['pages'],
+			'file_name' => $pdfUrl,
+			'count_pages' => $numberOfPages,
+			'crdate' => time(),
+		);
 
-        if ($GLOBALS["TSFE"]->loginUser) {
+		if ($GLOBALS["TSFE"]->loginUser) {
 
-            // internal user
-            $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
+			// internal user
+			$insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
 
-            $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
+			$insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
 
-            $insertArray['label'] = 'Print: '.$printerData['label'];
+			$insertArray['label'] = 'Print: '.$printerData['label'];
 
-        } else {
+		} else {
 
-            // external user
-            $insertArray['user_id'] = 0;
+			// external user
+			$insertArray['user_id'] = 0;
 
-            $insertArray['name'] = 'n/a';
+			$insertArray['name'] = 'n/a';
 
-            $insertArray['label'] = 'Print: '.$printerData['label'];
+			$insertArray['label'] = 'Print: '.$printerData['label'];
 
-        }
+		}
 
-        // add action to protocol
-        $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
+		// add action to protocol
+		$GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
 
-        header('Location: '.$pdfUrl);
+		header('Location: '.$pdfUrl);
 
-        ob_end_flush();
+		ob_end_flush();
 
-        exit;
+		exit;
 
-    }
+	}
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -216,7 +216,7 @@ 
 
             $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
 
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
+            while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)) {
 
                 $mails[] = $row;
 
@@ -261,7 +261,7 @@ 
 
             $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
 
-            while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
+            while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)) {
 
                 $printers[] = $row;
 
@@ -298,7 +298,7 @@ 
 
             $label = $this->pi_getLL('goBasket', '', TRUE);
 
-            $basketConf = array (
+            $basketConf = array(
                 'parameter' => $this->conf['targetBasket'],
                 'title' => $label
             );
@@ -439,7 +439,7 @@ 
             }
 
             // get document instance to load further information
-            $document = tx_dlf_document::getInstance($documentItem['id'],0);
+            $document = tx_dlf_document::getInstance($documentItem['id'], 0);
 
             // set endpage for toc and subentry based on logid
             if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
@@ -639,7 +639,7 @@ 
     public function getDocumentData($id, $data) {
 
         // get document instance to load further information
-        $document = tx_dlf_document::getInstance($id,0);
+        $document = tx_dlf_document::getInstance($id, 0);
 
         if ($document) {
 

dlf/plugins/oai/class.tx_dlf_oai.php

Spacing +26 added lines, -26 removed lines

@@ -43,21 +43,21 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $formats = array (
-		'oai_dc' => array (
+	protected $formats = array(
+		'oai_dc' => array(
 			'schema' => 'http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
 			'namespace' => 'http://www.openarchives.org/OAI/2.0/oai_dc/',
-			'requiredFields' => array ('record_id'),
+			'requiredFields' => array('record_id'),
 		),
-		'epicur' => array (
+		'epicur' => array(
 			'schema' => 'http://www.persistent-identifier.de/xepicur/version1.0/xepicur.xsd',
 			'namespace' => 'urn:nbn:de:1111-2004033116',
-			'requiredFields' => array ('purl', 'urn'),
+			'requiredFields' => array('purl', 'urn'),
 		),
-		'mets' => array (
+		'mets' => array(
 			'schema' => 'http://www.loc.gov/standards/mets/version17/mets.v1-7.xsd',
 			'namespace' => 'http://www.loc.gov/METS/',
-			'requiredFields' => array ('location'),
+			'requiredFields' => array('location'),
 		)
 	);
 
@@ -119,7 +119,7 @@ 
 	 */
 	protected function getUrlParams() {
 
-		$allowedParams = array (
+		$allowedParams = array(
 			'verb',
 			'identifier',
 			'metadataPrefix',
@@ -130,7 +130,7 @@ 
 		);
 
 		// Clear plugin variables.
-		$this->piVars = array ();
+		$this->piVars = array();
 
 		// Set only allowed parameters.
 		foreach ($allowedParams as $param) {
@@ -516,7 +516,7 @@ 
 		}
 
 		// Add request.
-		$linkConf = array (
+		$linkConf = array(
 			'parameter' => $GLOBALS['TSFE']->id,
 			'forceAbsoluteUrl' => 1
 		);
@@ -600,7 +600,7 @@ 
 
 		$complete = FALSE;
 
-		$todo = array ();
+		$todo = array();
 
 		$resume = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', $this->piVars['verb']);
 
@@ -720,14 +720,14 @@ 
 			// Save result set to database and generate resumption token.
 			$token = uniqid();
 
-			$resultSet->metadata = array (
+			$resultSet->metadata = array(
 				'offset' => intval($resultSet->metadata['offset'] + $this->conf['limit']),
 				'metadataPrefix' => $resultSet->metadata['metadataPrefix'],
 			);
 
 			$result = $GLOBALS['TYPO3_DB']->exec_INSERTquery(
 				'tx_dlf_tokens',
-				array (
+				array(
 					'tstamp' => $GLOBALS['EXEC_TIME'],
 					'token' => $token,
 					'options' => serialize($resultSet),
@@ -955,7 +955,7 @@ 
 		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_documents.tstamp AS tstamp',
 			'tx_dlf_documents',
-			'tx_dlf_documents.pid=' . intval($this->conf['pages']),
+			'tx_dlf_documents.pid='.intval($this->conf['pages']),
 			'',
 			'tx_dlf_documents.tstamp ASC',
 			'1'
@@ -970,14 +970,14 @@ 
 
 			if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "' .
-						  $this->conf['pages'] . '"', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "'.
+						  $this->conf['pages'].'"', $this->extKey, SYSLOG_SEVERITY_NOTICE);
 
 			}
 
 		}
 
-		$linkConf = array (
+		$linkConf = array(
 			'parameter' => $GLOBALS['TSFE']->id,
 			'forceAbsoluteUrl' => 1
 		);
@@ -1164,7 +1164,7 @@ 
 		} else {
 
 			// Build result set.
-			$results = array ();
+			$results = array();
 
 			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
@@ -1181,7 +1181,7 @@ 
 
 			$complete = FALSE;
 
-			$todo = array ();
+			$todo = array();
 
 			$ListIdentifiers = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'ListIdentifiers');
 
@@ -1252,14 +1252,14 @@ 
 				// Save result set to database and generate resumption token.
 				$token = uniqid();
 
-				$resultSet->metadata = array (
+				$resultSet->metadata = array(
 					'offset' => intval($this->conf['limit']),
 					'metadataPrefix' => $this->piVars['metadataPrefix'],
 				);
 
 				$result = $GLOBALS['TYPO3_DB']->exec_INSERTquery(
 					'tx_dlf_tokens',
-					array (
+					array(
 						'tstamp' => $GLOBALS['EXEC_TIME'],
 						'token' => $token,
 						'options' => serialize($resultSet),
@@ -1306,7 +1306,7 @@ 
 	 */
 	protected function verbListMetadataFormats() {
 
-		$resArray = array ();
+		$resArray = array();
 
 		// Check for invalid arguments.
 		if (count($this->piVars) > 1) {
@@ -1540,7 +1540,7 @@ 
 		} else {
 
 			// Build result set.
-			$results = array ();
+			$results = array();
 
 			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
@@ -1551,7 +1551,7 @@ 
 
 			$complete = FALSE;
 
-			$todo = array ();
+			$todo = array();
 
 			$ListRecords = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'ListRecords');
 
@@ -1657,14 +1657,14 @@ 
 				// Save result set to database and generate resumption token.
 				$token = uniqid();
 
-				$resultSet->metadata = array (
+				$resultSet->metadata = array(
 					'offset' => intval($this->conf['limit']),
 					'metadataPrefix' => $this->piVars['metadataPrefix'],
 				);
 
 				$result = $GLOBALS['TYPO3_DB']->exec_INSERTquery(
 					'tx_dlf_tokens',
-					array (
+					array(
 						'tstamp' => $GLOBALS['EXEC_TIME'],
 						'token' => $token,
 						'options' => serialize($resultSet),

dlf/plugins/audioplayer/class.tx_dlf_audioplayer.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 	 * @var	array
 	 * @access protected
 	 */
-	protected $audio = array ();
+	protected $audio = array();
 
 	/**
 	 * Adds Player javascript
@@ -38,7 +38,7 @@ 
 	 */
 	protected function addPlayerJS() {
 
-		$output = array ();
+		$output = array();
 
 		$output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css">';
 
@@ -55,9 +55,9 @@ 
 			$(document).ready(function() {
 				tx_dlf_audioplayer = new dlfAudioPlayer({
 					audio: {
-						mimeType: "' . $this->audio['mimetype'] . '",
-						title: "' . $this->audio['label'] . '",
-						url:  "' . $this->audio['url'] . '"
+						mimeType: "' . $this->audio['mimetype'].'",
+						title: "' . $this->audio['label'].'",
+						url:  "' . $this->audio['url'].'"
 					},
 					parentElId: "tx-dlf-audio",
 					swfPath: "'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/jquery.jplayer.swf"
@@ -138,7 +138,7 @@ 
 		}
 
 		// Fill in the template markers.
-		$markerArray = array (
+		$markerArray = array(
 			'###PLAYER_JS###' => $this->addPlayerJS()
 		);
 

dlf/plugins/feeds/class.tx_dlf_feeds.php

Spacing +2 added lines, -2 removed lines

@@ -164,10 +164,10 @@
 					$item->appendChild($rss->createElement('title', htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8')));
 
 					// Add link.
-					$linkConf = array (
+					$linkConf = array(
 						'parameter' => $this->conf['targetPid'],
 						'forceAbsoluteUrl' => 1,
-						'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array ('id' => $resArray['uid']), '', TRUE, FALSE)
+						'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array('id' => $resArray['uid']), '', TRUE, FALSE)
 					);
 
 					$item->appendChild($rss->createElement('link', htmlspecialchars($this->cObj->typoLink_URL($linkConf), ENT_NOQUOTES, 'UTF-8')));