Inspection of "Another round of spaces to tabs" - Erikmitk/kitodo-presentation - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Branch — oai_solr (423cc8)

by Erik

created 2017-12-21 13:59 UTC

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -216,7 +216,7 @@  discard block
 block discarded – undo
 
             $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 @@  discard block
 block discarded – undo
 
             $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 @@  discard block
 block discarded – undo
 
             $label = $this->pi_getLL('goBasket', '', TRUE);
 
-            $basketConf = array (
+            $basketConf = array(
                 'parameter' => $this->conf['targetBasket'],
                 'title' => $label
             );
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
             }
 
             // 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 @@  discard block
 block discarded – undo
     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) {
 

Please login to merge, or discard this patch.

dlf/plugins/feeds/class.tx_dlf_feeds.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -164,10 +164,10 @@
 block discarded – undo
 					$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')));

Please login to merge, or discard this patch.

dlf/plugins/oai/class.tx_dlf_oai.php 1 patch

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -43,21 +43,21 @@  discard block
 block discarded – undo
 	 * @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'),
 		)
 	);
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 
 		if ($GLOBALS['TYPO3_DB']->sql_affected_rows() === -1) {
 			// Deletion failed.
-			$this->devLog('[tx_dlf_oai->deleteExpiredTokens()] Could not delete expired resumption tokens',SYSLOG_SEVERITY_WARNING);
+			$this->devLog('[tx_dlf_oai->deleteExpiredTokens()] Could not delete expired resumption tokens', SYSLOG_SEVERITY_WARNING);
 		}
 	}
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
 	 */
 	protected function getUrlParams() {
 
-		$allowedParams = array (
+		$allowedParams = array(
 			'verb',
 			'identifier',
 			'metadataPrefix',
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
 		);
 
 		// Clear plugin variables.
-		$this->piVars = array ();
+		$this->piVars = array();
 
 		// Set only allowed parameters.
 		foreach ($allowedParams as $param) {
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
 		}
 
 		// Add request.
-		$linkConf = array (
+		$linkConf = array(
 			'parameter' => $GLOBALS['TSFE']->id,
 			'forceAbsoluteUrl' => 1
 		);
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
 		$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'
@@ -641,10 +641,10 @@  discard block
 block discarded – undo
 			list ($timestamp) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 			$earliestDatestamp = gmdate('Y-m-d\TH:i:s\Z', $timestamp);
 		} else {
-			$this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "' . $this->conf['pages'] . '"',SYSLOG_SEVERITY_NOTICE);
+			$this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "'.$this->conf['pages'].'"', SYSLOG_SEVERITY_NOTICE);
 		}
 
-		$linkConf = array (
+		$linkConf = array(
 			'parameter' => $GLOBALS['TSFE']->id,
 			'forceAbsoluteUrl' => 1
 		);
@@ -653,12 +653,12 @@  discard block
 block discarded – undo
 		// Add identification node.
 		$Identify = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'Identify');
 		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'repositoryName', $repositoryName));
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','baseURL', $baseURL));
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','protocolVersion', '2.0'));
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','adminEmail', $adminEmail));
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','earliestDatestamp', $earliestDatestamp));
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','deletedRecord', 'transient'));
-		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','granularity', 'YYYY-MM-DDThh:mm:ssZ'));
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'baseURL', $baseURL));
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'protocolVersion', '2.0'));
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'adminEmail', $adminEmail));
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'earliestDatestamp', $earliestDatestamp));
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'deletedRecord', 'transient'));
+		$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'granularity', 'YYYY-MM-DDThh:mm:ssZ'));
 
 		return $Identify;
 	}
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
 
 		$resultSet->reset();
 		$resultSet->add($documentSet);
-		$resultSet->metadata = array (
+		$resultSet->metadata = array(
 			'completeListSize' => count($documentSet),
 			'metadataPrefix' => $this->piVars['metadataPrefix'],
 		);
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
 	 */
 	protected function verbListMetadataFormats() {
 
-		$resArray = array ();
+		$resArray = array();
 
 		// Check for invalid arguments.
 		if (count($this->piVars) > 1) {
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
 
 		$resultSet->reset();
 		$resultSet->add($documentSet);
-		$resultSet->metadata = array (
+		$resultSet->metadata = array(
 			'completeListSize' => count($documentSet),
 			'metadataPrefix' => $this->piVars['metadataPrefix'],
 		);
@@ -892,8 +892,8 @@  discard block
 block discarded – undo
 			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 				'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.uid AS uid, tx_dlf_collections.index_search as index_query ',
 				'tx_dlf_collections',
-				'tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.oai_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
-					'tx_dlf_collections') . $where . tx_dlf_helper::whereClause('tx_dlf_collections'),
+				'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.oai_name='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
+					'tx_dlf_collections').$where.tx_dlf_helper::whereClause('tx_dlf_collections'),
 				'',
 				'',
 				'1'
@@ -905,10 +905,10 @@  discard block
 block discarded – undo
 
 			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-			if($resArray['index_query'] != "") {
-				$solr_query .= '(' . $resArray['index_query'] . ')';
+			if ($resArray['index_query'] != "") {
+				$solr_query .= '('.$resArray['index_query'].')';
 			} else {
-				$solr_query .= 'collection:' . '"' . $resArray['index_name'] . '"';
+				$solr_query .= 'collection:'.'"'.$resArray['index_name'].'"';
 			}
 
 		} else {
@@ -919,7 +919,7 @@  discard block
 block discarded – undo
 
 		// Check for required fields.
 		foreach ($this->formats[$this->piVars['metadataPrefix']]['requiredFields'] as $required) {
-			$solr_query .= ' NOT ' . $required . ':""';
+			$solr_query .= ' NOT '.$required.':""';
 		}
 
 		$from = "*";
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
 				$timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1,
 					$date_array['tm_mday'], $date_array['tm_year'] + 1900);
 
-			   $from = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) .'.000Z';
+			   $from = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.000Z';
 
 			} else {
 				throw new Exception('badArgument');
@@ -951,7 +951,7 @@  discard block
 block discarded – undo
 				$timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1,
 					$date_array['tm_mday'], $date_array['tm_year'] + 1900);
 
-				$until = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.999Z';
+				$until = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.999Z';
 
 				if ($from != "*" && $from > $until) {
 					throw new Exception('badArgument');
@@ -969,7 +969,7 @@  discard block
 block discarded – undo
 			}
 		}
 
-		$solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until .']';
+		$solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
 
 		$documentSet = array();
 
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
 			'tx_dlf_documents',
 			'tx_dlf_relations',
 			'tx_dlf_collections',
-			'AND tx_dlf_documents.uid IN (' . implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)) . ') AND tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations') . tx_dlf_helper::whereClause('tx_dlf_collections'),
+			'AND tx_dlf_documents.uid IN ('.implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)).') AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_collections'),
 			'tx_dlf_documents.uid',
 			'tx_dlf_documents.tstamp',
 			$this->conf['limit']
@@ -1053,7 +1053,7 @@  discard block
 block discarded – undo
 					$metadata = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'metadata');
 
 					$metadataPrefix = $this->piVars['metadataPrefix'];
-					if(!$metadataPrefix) {
+					if (!$metadataPrefix) {
 						// If we resume an action the metadataPrefix is stored with the documentSet
 						$metadataPrefix = $documentListSet->metadata['metadataPrefix'];
 					}
@@ -1108,15 +1108,15 @@  discard block
 block discarded – undo
 				)
 			);
 
-			if($GLOBALS['TYPO3_DB']->sql_affected_rows() == 1) {
+			if ($GLOBALS['TYPO3_DB']->sql_affected_rows() == 1) {
 				$resumptionToken->setAttribute('resumptionToken', htmlspecialchars($token, ENT_NOQUOTES, 'UTF-8'));
 			} else {
-				$this->devLog('[tx_dlf_oai->verb'. $this->piVars['verb'] .'()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
+				$this->devLog('[tx_dlf_oai->verb'.$this->piVars['verb'].'()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
 			}
 		}
 
 		$resumptionToken->setAttribute('cursor', intval($documentListSet->metadata['completeListSize']) - count($documentListSet));
-		$resumptionToken->setAttribute('completeListSize',	$documentListSet->metadata['completeListSize']);
+		$resumptionToken->setAttribute('completeListSize', $documentListSet->metadata['completeListSize']);
 		$resumptionToken->setAttribute('expirationDate', gmdate('Y-m-d\TH:i:s\Z', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
 
 		return $resumptionToken;
@@ -1130,7 +1130,7 @@  discard block
 block discarded – undo
 
 }
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php'])	{
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php']) {
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php']);
 
 }

Please login to merge, or discard this patch.

dlf/plugins/navigation/class.tx_dlf_navigation.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 			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,7 +64,7 @@  discard block
 block discarded – undo
 	protected function getPageSelector() {
 
 		// Configure @action URL for form.
-		$linkConf = array (
+		$linkConf = array(
 			'parameter' => $GLOBALS['TSFE']->id,
 			'forceAbsoluteUrl' => 1
 		);
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
 
 				// Set default values 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 {
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
 		// 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 {
 
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
 		// 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 {
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 		// 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 {
 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
 		// 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 {
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 		// 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 {
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
 		// 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 {
 
@@ -238,17 +238,17 @@  discard block
 block discarded – undo
 
 			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 {
 
@@ -271,11 +271,11 @@  discard block
 block discarded – undo
 		$markerArray['###LINKLISTVIEW###'] = $this->getLinkToListview();
 
 		// fill some language labels if available
-		$markerArray['###ZOOM_IN###'] =  $this->pi_getLL('zoom-in', '', TRUE);
+		$markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', TRUE);
 		$markerArray['###ZOOM_OUT###'] = $this->pi_getLL('zoom-out', '', TRUE);
 		$markerArray['###ZOOM_FULLSCREEN###'] = $this->pi_getLL('zoom-fullscreen', '', TRUE);
 
-		$markerArray['###ROTATE_LEFT###'] =  $this->pi_getLL('rotate-left', '', TRUE);
+		$markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', TRUE);
 		$markerArray['###ROTATE_RIGHT###'] = $this->pi_getLL('rotate-right', '', TRUE);
 		$markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', TRUE);
 
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
 	 *
 	 * @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)) {
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
 		}
 
 		// Build typolink configuration array.
-		$conf = array (
+		$conf = array(
 			'useCacheHash' => 1,
 			'parameter' => $GLOBALS['TSFE']->id,
 			'ATagParams' => $aTagParams,

Please login to merge, or discard this patch.

dlf/plugins/newspaper/class.tx_dlf_newspaper.php 1 patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -89,7 +89,7 @@  discard block
 block discarded – undo
 		// Process results.
 		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-			$issues[] = array (
+			$issues[] = array(
 				'uid' => $resArray['uid'],
 				'title' => $resArray['title'],
 				'year' => $resArray['year']
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
 		}
 
 		// 	We need an array of issues with month number as key.
-		$calendarIssues = array ();
+		$calendarIssues = array();
 
 		foreach ($issues as $issue) {
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
 
 		}
 
-		$allIssues = array ();
+		$allIssues = array();
 
 		// Get subpart templates.
 		$subparts['list'] = $this->cObj->getSubpart($this->template, '###ISSUELIST###');
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
 
 		for ($i = 0; $i <= 11; $i++) {
 
-			$markerArray = array (
+			$markerArray = array(
 				'###DAYMON_NAME###' => strftime('%a', strtotime('last Monday')),
 				'###DAYTUE_NAME###' => strftime('%a', strtotime('last Tuesday')),
 				'###DAYWED_NAME###' => strftime('%a', strtotime('last Wednesday')),
@@ -130,20 +130,20 @@  discard block
 block discarded – undo
 				'###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
 				'###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
 				'###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
-				'###MONTHNAME###' 	=> strftime('%B', strtotime($year . '-' . ($i + 1) . '-1'))
+				'###MONTHNAME###' 	=> strftime('%B', strtotime($year.'-'.($i + 1).'-1'))
 			);
 
 			// Reset week content of new month.
 			$subWeekPartContent = '';
 
-			$firstOfMonth = strtotime($year . '-' . ($i + 1) . '-1');
+			$firstOfMonth = strtotime($year.'-'.($i + 1).'-1');
 			$lastOfMonth = strtotime('last day of', ($firstOfMonth));
 			$firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
 
 			// There are never more than 6 weeks in a month.
 			for ($j = 0; $j <= 5; $j++) {
 
-				$firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
+				$firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
 
 				$weekArray = array(
 					'###DAYMON###' => '&nbsp;',
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
 
 						$dayLinks = '';
 
-						$dayLinksText = array ();
+						$dayLinksText = array();
 
 						$dayLinksList = '';
 
@@ -182,10 +182,10 @@  discard block
 block discarded – undo
 
 										$dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
 
-										$linkConf = array (
+										$linkConf = array(
 											'useCacheHash' => 1,
 											'parameter' => $this->conf['targetPid'],
-											'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
+											'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
 											'ATagParams' => ' class="title"',
 										);
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
 
 							}
 
-							$dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>'.$dayLinksList.'</div></div>';
+							$dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
 						}
 
 						switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
@@ -257,25 +257,25 @@  discard block
 block discarded – undo
 		}
 
 		// Link to years overview
-		$linkConf = array (
+		$linkConf = array(
 			'useCacheHash' => 1,
 			'parameter' => $this->conf['targetPid'],
-			'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId),
+			'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
 		);
 
-		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf);
+		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
 
 		// Link to current year.
-		$linkConf = array (
+		$linkConf = array(
 			'useCacheHash' => 1,
 			'parameter' => $this->conf['targetPid'],
-			'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
+			'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
 		);
 
 		$yearLink = $this->cObj->typoLink($year, $linkConf);
 
 		// Prepare list as alternative of the calendar view.
-		foreach($allIssues as $dayTime => $issues) {
+		foreach ($allIssues as $dayTime => $issues) {
 
 			$markerArrayDay['###DATE_STRING###'] = strftime('%A, %x', $dayTime);
 
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 
 		}
 
-		$markerArray = array (
+		$markerArray = array(
 			'###CALENDARVIEWACTIVE###' => $listViewActive ? '' : 'active',
 			'###LISTVIEWACTIVE###' => $listViewActive ? 'active' : '',
 			'###CALYEAR###' => $yearLink,
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
 		// Process results.
 		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-			$years[] = array (
+			$years[] = array(
 				'title' => $resArray['title'],
 				'uid' => $resArray['uid']
 			);
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
 				$linkConf = array(
 					'useCacheHash' => 1,
 					'parameter' => $this->conf['targetPid'],
-					'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']),
-					'title' => $titleAnchor . ': ' . $year['title']
+					'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
+					'title' => $titleAnchor.': '.$year['title']
 				);
 
 				$yearArray = array(
@@ -402,15 +402,15 @@  discard block
 block discarded – undo
 		}
 
 		// link to years overview (should be itself here)
-		$linkConf = array (
+		$linkConf = array(
 			'useCacheHash' => 1,
 			'parameter' => $this->conf['targetPid'],
-			'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid,
+			'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
 		);
-		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' .$this->doc->getTitle($this->doc->uid), $linkConf);
+		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
 
 		// Fill markers.
-		$markerArray = array (
+		$markerArray = array(
 			'###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),
 			'###CALALLYEARS###' => $allYearsLink
 		);

Please login to merge, or discard this patch.

dlf/plugins/pagegrid/class.tx_dlf_pagegrid.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -77,7 +77,7 @@  discard block
 block discarded – undo
 
 		$piVars['page'] = $number;
 
-		$linkConf = array (
+		$linkConf = array(
 			'useCacheHash' => 1,
 			'parameter' => $this->conf['targetPid'],
 			'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $piVars, '', TRUE, FALSE),
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 		// Add link to previous page.
 		if ($this->piVars['pointer'] > 0) {
 
-			$output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array ('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), TRUE).$separator;
+			$output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), TRUE).$separator;
 
 		} else {
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 
 				if ($this->piVars['pointer'] != $i) {
 
-					$output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), TRUE).$separator;
+					$output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), TRUE).$separator;
 
 				} else {
 
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
 		// 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, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), TRUE);
+			$output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array('pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), TRUE);
 
 		} else {
 
@@ -225,9 +225,9 @@  discard block
 block discarded – undo
 
 		// Set some variable defaults.
 		// $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 {
 

Please login to merge, or discard this patch.

dlf/plugins/listview/class.tx_dlf_listview.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 	 * @var	array
 	 * @access	protected
 	 */
-	protected $metadata = array ();
+	protected $metadata = array();
 
 	/**
 	 * Array of sortable metadata
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 	 * @var	array
 	 * @access	protected
 	 */
-	protected $sortables = array ();
+	protected $sortables = array();
 
 	/**
 	 * Renders the page browser
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 		// Add link to previous page.
 		if ($this->piVars['pointer'] > 0) {
 
-			$output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array ('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
+			$output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), array('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
 
 		} else {
 
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
 
 				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 {
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 		// 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 {
 
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
 
 					$imgAlt = htmlspecialchars($value);
 
-					$additionalParams = array (
+					$additionalParams = array(
 						'id' => $this->list[$number]['uid'],
 						'page' => $this->list[$number]['page']
 					);
 
-					$conf = array (
+					$conf = array(
 						'useCacheHash' => 1,
 						'parameter' => $this->conf['targetPid'],
 						'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
 
 		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)
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
 		$prefix = str_replace('_', '-', get_class($this));
 
 		// Configure @action URL for form.
-		$linkConf = array (
+		$linkConf = array(
 			'parameter' => $GLOBALS['TSFE']->id,
 			'forceAbsoluteUrl' => 1
 		);
@@ -419,13 +419,13 @@  discard block
 block discarded – undo
 
 						$imgAlt = htmlspecialchars($value);
 
-						$additionalParams = array (
+						$additionalParams = array(
 							'id' => $subpart['uid'],
 							'page' => $subpart['page'],
 							'highlight_word' => preg_replace('/\s\s+/', ';', $this->list->metadata['searchString'])
 						);
 
-						$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,9 +505,9 @@  discard block
 block discarded – undo
 
 			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)
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
 
 			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'])
 				);

Please login to merge, or discard this patch.

dlf/plugins/statistics/class.tx_dlf_statistics.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -108,12 +108,12 @@
 block discarded – undo
 		$countVolumes = $GLOBALS['TYPO3_DB']->sql_num_rows($resultVolumes);
 
 		// Set replacements.
-		$replace = array (
-			'key' => array (
+		$replace = array(
+			'key' => array(
 				'###TITLES###',
 				'###VOLUMES###'
 			),
-			'value' => array (
+			'value' => array(
 				$countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
 				$countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
 			)

Please login to merge, or discard this patch.

dlf/plugins/toc/class.tx_dlf_toc.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 	 * @var	array
 	 * @access protected
 	 */
-	protected $activeEntries = array ();
+	protected $activeEntries = array();
 
 	/**
 	 * This builds an array for one menu entry
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 		// 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 @@  discard block
 block discarded – undo
 			// 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 @@  discard block
 block discarded – undo
 
 		}
 
-		$TSconfig = array ();
+		$TSconfig = array();
 
 		$TSconfig['special'] = 'userfunction';
 
@@ -216,15 +216,15 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 
 		}
 
-		$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 @@  discard block
 block discarded – undo
 
 				$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'],

Please login to merge, or discard this patch.

		@@ -216,7 +216,7 @@ discard block
		block discarded – undo
216	216
217	217	$mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
218	218
219		- while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){
	219	+ while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)) {
220	220
221	221	$mails[] = $row;
222	222
		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261
262	262	$printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
263	263
264		- while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){
	264	+ while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)) {
265	265
266	266	$printers[] = $row;
267	267
		@@ -298,7 +298,7 @@ discard block
		block discarded – undo
298	298
299	299	$label = $this->pi_getLL('goBasket', '', TRUE);
300	300
301		- $basketConf = array (
	301	+ $basketConf = array(
302	302	'parameter' => $this->conf['targetBasket'],
303	303	'title' => $label
304	304	);
		@@ -439,7 +439,7 @@ discard block
		block discarded – undo
439	439	}
440	440
441	441	// get document instance to load further information
442		- $document = tx_dlf_document::getInstance($documentItem['id'],0);
	442	+ $document = tx_dlf_document::getInstance($documentItem['id'], 0);
443	443
444	444	// set endpage for toc and subentry based on logid
445	445	if (($_piVars['addToBasket'] == 'subentry') OR ($_piVars['addToBasket'] == 'toc')) {
		@@ -639,7 +639,7 @@ discard block
		block discarded – undo
639	639	public function getDocumentData($id, $data) {
640	640
641	641	// get document instance to load further information
642		- $document = tx_dlf_document::getInstance($id,0);
	642	+ $document = tx_dlf_document::getInstance($id, 0);
643	643
644	644	if ($document) {
645	645

		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77
78	78	$piVars['page'] = $number;
79	79
80		- $linkConf = array (
	80	+ $linkConf = array(
81	81	'useCacheHash' => 1,
82	82	'parameter' => $this->conf['targetPid'],
83	83	'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $piVars, '', TRUE, FALSE),
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	// Add link to previous page.
116	116	if ($this->piVars['pointer'] > 0) {
117	117
118		- $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array ('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), TRUE).$separator;
	118	+ $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array('pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1), TRUE).$separator;
119	119
120	120	} else {
121	121
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132
133	133	if ($this->piVars['pointer'] != $i) {
134	134
135		- $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), TRUE).$separator;
	135	+ $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array('pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1), TRUE).$separator;
136	136
137	137	} else {
138	138
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	// Add link to next page.
158	158	if ($this->piVars['pointer'] < $maxPages - 1) {
159	159
160		- $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '>', TRUE), array ('pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), TRUE);
	160	+ $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '>', TRUE), array('pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1), TRUE);
161	161
162	162	} else {
163	163
		@@ -225,9 +225,9 @@ discard block
		block discarded – undo
225	225
226	226	// Set some variable defaults.
227	227	// $this->piVars['page'] may be integer or string (physical structure @ID)
228		- if ( (int)$this->piVars['page'] > 0 \|\| empty($this->piVars['page'])) {
	228	+ if ((int) $this->piVars['page'] > 0 \|\| empty($this->piVars['page'])) {
229	229
230		- $this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->piVars['page'], 1, $this->doc->numPages, 1);
	230	+ $this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
231	231
232	232	} else {
233	233

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

		@@ -43,21 +43,21 @@ discard block
		block discarded – undo
43	43	* @var array
44	44	* @access protected
45	45	*/
46		- protected $formats = array (
47		- 'oai_dc' => array (
	46	+ protected $formats = array(
	47	+ 'oai_dc' => array(
48	48	'schema' => 'http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
49	49	'namespace' => 'http://www.openarchives.org/OAI/2.0/oai_dc/',
50		- 'requiredFields' => array ('record_id'),
	50	+ 'requiredFields' => array('record_id'),
51	51	),
52		- 'epicur' => array (
	52	+ 'epicur' => array(
53	53	'schema' => 'http://www.persistent-identifier.de/xepicur/version1.0/xepicur.xsd',
54	54	'namespace' => 'urn:nbn:de:1111-2004033116',
55		- 'requiredFields' => array ('purl', 'urn'),
	55	+ 'requiredFields' => array('purl', 'urn'),
56	56	),
57		- 'mets' => array (
	57	+ 'mets' => array(
58	58	'schema' => 'http://www.loc.gov/standards/mets/version17/mets.v1-7.xsd',
59	59	'namespace' => 'http://www.loc.gov/METS/',
60		- 'requiredFields' => array ('location'),
	60	+ 'requiredFields' => array('location'),
61	61	)
62	62	);
63	63
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78
79	79	if ($GLOBALS['TYPO3_DB']->sql_affected_rows() === -1) {
80	80	// Deletion failed.
81		- $this->devLog('[tx_dlf_oai->deleteExpiredTokens()] Could not delete expired resumption tokens',SYSLOG_SEVERITY_WARNING);
	81	+ $this->devLog('[tx_dlf_oai->deleteExpiredTokens()] Could not delete expired resumption tokens', SYSLOG_SEVERITY_WARNING);
82	82	}
83	83	}
84	84
		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	*/
110	110	protected function getUrlParams() {
111	111
112		- $allowedParams = array (
	112	+ $allowedParams = array(
113	113	'verb',
114	114	'identifier',
115	115	'metadataPrefix',
		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120	);
121	121
122	122	// Clear plugin variables.
123		- $this->piVars = array ();
	123	+ $this->piVars = array();
124	124
125	125	// Set only allowed parameters.
126	126	foreach ($allowedParams as $param) {
		@@ -422,7 +422,7 @@ discard block
		block discarded – undo
422	422	}
423	423
424	424	// Add request.
425		- $linkConf = array (
	425	+ $linkConf = array(
426	426	'parameter' => $GLOBALS['TSFE']->id,
427	427	'forceAbsoluteUrl' => 1
428	428	);
		@@ -631,7 +631,7 @@ discard block
		block discarded – undo
631	631	$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
632	632	'tx_dlf_documents.tstamp AS tstamp',
633	633	'tx_dlf_documents',
634		- 'tx_dlf_documents.pid=' . intval($this->conf['pages']),
	634	+ 'tx_dlf_documents.pid='.intval($this->conf['pages']),
635	635	'',
636	636	'tx_dlf_documents.tstamp ASC',
637	637	'1'
		@@ -641,10 +641,10 @@ discard block
		block discarded – undo
641	641	list ($timestamp) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
642	642	$earliestDatestamp = gmdate('Y-m-d\TH:i:s\Z', $timestamp);
643	643	} else {
644		- $this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "' . $this->conf['pages'] . '"',SYSLOG_SEVERITY_NOTICE);
	644	+ $this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "'.$this->conf['pages'].'"', SYSLOG_SEVERITY_NOTICE);
645	645	}
646	646
647		- $linkConf = array (
	647	+ $linkConf = array(
648	648	'parameter' => $GLOBALS['TSFE']->id,
649	649	'forceAbsoluteUrl' => 1
650	650	);
		@@ -653,12 +653,12 @@ discard block
		block discarded – undo
653	653	// Add identification node.
654	654	$Identify = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'Identify');
655	655	$Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'repositoryName', $repositoryName));
656		- $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','baseURL', $baseURL));
657		- $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','protocolVersion', '2.0'));
658		- $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','adminEmail', $adminEmail));
659		- $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','earliestDatestamp', $earliestDatestamp));
660		- $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','deletedRecord', 'transient'));
661		- $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/','granularity', 'YYYY-MM-DDThh:mm:ssZ'));
	656	+ $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'baseURL', $baseURL));
	657	+ $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'protocolVersion', '2.0'));
	658	+ $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'adminEmail', $adminEmail));
	659	+ $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'earliestDatestamp', $earliestDatestamp));
	660	+ $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'deletedRecord', 'transient'));
	661	+ $Identify->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'granularity', 'YYYY-MM-DDThh:mm:ssZ'));
662	662
663	663	return $Identify;
664	664	}
		@@ -701,7 +701,7 @@ discard block
		block discarded – undo
701	701
702	702	$resultSet->reset();
703	703	$resultSet->add($documentSet);
704		- $resultSet->metadata = array (
	704	+ $resultSet->metadata = array(
705	705	'completeListSize' => count($documentSet),
706	706	'metadataPrefix' => $this->piVars['metadataPrefix'],
707	707	);
		@@ -719,7 +719,7 @@ discard block
		block discarded – undo
719	719	*/
720	720	protected function verbListMetadataFormats() {
721	721
722		- $resArray = array ();
	722	+ $resArray = array();
723	723
724	724	// Check for invalid arguments.
725	725	if (count($this->piVars) > 1) {
		@@ -810,7 +810,7 @@ discard block
		block discarded – undo
810	810
811	811	$resultSet->reset();
812	812	$resultSet->add($documentSet);
813		- $resultSet->metadata = array (
	813	+ $resultSet->metadata = array(
814	814	'completeListSize' => count($documentSet),
815	815	'metadataPrefix' => $this->piVars['metadataPrefix'],
816	816	);
		@@ -892,8 +892,8 @@ discard block
		block discarded – undo
892	892	$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
893	893	'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.uid AS uid, tx_dlf_collections.index_search as index_query ',
894	894	'tx_dlf_collections',
895		- 'tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.oai_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
896		- 'tx_dlf_collections') . $where . tx_dlf_helper::whereClause('tx_dlf_collections'),
	895	+ 'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.oai_name='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
	896	+ 'tx_dlf_collections').$where.tx_dlf_helper::whereClause('tx_dlf_collections'),
897	897	'',
898	898	'',
899	899	'1'
		@@ -905,10 +905,10 @@ discard block
		block discarded – undo
905	905
906	906	$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
907	907
908		- if($resArray['index_query'] != "") {
909		- $solr_query .= '(' . $resArray['index_query'] . ')';
	908	+ if ($resArray['index_query'] != "") {
	909	+ $solr_query .= '('.$resArray['index_query'].')';
910	910	} else {
911		- $solr_query .= 'collection:' . '"' . $resArray['index_name'] . '"';
	911	+ $solr_query .= 'collection:'.'"'.$resArray['index_name'].'"';
912	912	}
913	913
914	914	} else {
		@@ -919,7 +919,7 @@ discard block
		block discarded – undo
919	919
920	920	// Check for required fields.
921	921	foreach ($this->formats[$this->piVars['metadataPrefix']]['requiredFields'] as $required) {
922		- $solr_query .= ' NOT ' . $required . ':""';
	922	+ $solr_query .= ' NOT '.$required.':""';
923	923	}
924	924
925	925	$from = "*";
		@@ -933,7 +933,7 @@ discard block
		block discarded – undo
933	933	$timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1,
934	934	$date_array['tm_mday'], $date_array['tm_year'] + 1900);
935	935
936		- $from = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) .'.000Z';
	936	+ $from = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.000Z';
937	937
938	938	} else {
939	939	throw new Exception('badArgument');
		@@ -951,7 +951,7 @@ discard block
		block discarded – undo
951	951	$timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1,
952	952	$date_array['tm_mday'], $date_array['tm_year'] + 1900);
953	953
954		- $until = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.999Z';
	954	+ $until = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.999Z';
955	955
956	956	if ($from != "*" && $from > $until) {
957	957	throw new Exception('badArgument');
		@@ -969,7 +969,7 @@ discard block
		block discarded – undo
969	969	}
970	970	}
971	971
972		- $solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until .']';
	972	+ $solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
973	973
974	974	$documentSet = array();
975	975
		@@ -1005,7 +1005,7 @@ discard block
		block discarded – undo
1005	1005	'tx_dlf_documents',
1006	1006	'tx_dlf_relations',
1007	1007	'tx_dlf_collections',
1008		- 'AND tx_dlf_documents.uid IN (' . implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)) . ') AND tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations') . tx_dlf_helper::whereClause('tx_dlf_collections'),
	1008	+ 'AND tx_dlf_documents.uid IN ('.implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)).') AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_collections'),
1009	1009	'tx_dlf_documents.uid',
1010	1010	'tx_dlf_documents.tstamp',
1011	1011	$this->conf['limit']
		@@ -1053,7 +1053,7 @@ discard block
		block discarded – undo
1053	1053	$metadata = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'metadata');
1054	1054
1055	1055	$metadataPrefix = $this->piVars['metadataPrefix'];
1056		- if(!$metadataPrefix) {
	1056	+ if (!$metadataPrefix) {
1057	1057	// If we resume an action the metadataPrefix is stored with the documentSet
1058	1058	$metadataPrefix = $documentListSet->metadata['metadataPrefix'];
1059	1059	}
		@@ -1108,15 +1108,15 @@ discard block
		block discarded – undo
1108	1108	)
1109	1109	);
1110	1110
1111		- if($GLOBALS['TYPO3_DB']->sql_affected_rows() == 1) {
	1111	+ if ($GLOBALS['TYPO3_DB']->sql_affected_rows() == 1) {
1112	1112	$resumptionToken->setAttribute('resumptionToken', htmlspecialchars($token, ENT_NOQUOTES, 'UTF-8'));
1113	1113	} else {
1114		- $this->devLog('[tx_dlf_oai->verb'. $this->piVars['verb'] .'()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
	1114	+ $this->devLog('[tx_dlf_oai->verb'.$this->piVars['verb'].'()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
1115	1115	}
1116	1116	}
1117	1117
1118	1118	$resumptionToken->setAttribute('cursor', intval($documentListSet->metadata['completeListSize']) - count($documentListSet));
1119		- $resumptionToken->setAttribute('completeListSize', $documentListSet->metadata['completeListSize']);
	1119	+ $resumptionToken->setAttribute('completeListSize', $documentListSet->metadata['completeListSize']);
1120	1120	$resumptionToken->setAttribute('expirationDate', gmdate('Y-m-d\TH:i:s\Z', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
1121	1121
1122	1122	return $resumptionToken;
		@@ -1130,7 +1130,7 @@ discard block
		block discarded – undo
1130	1130
1131	1131	}
1132	1132
1133		-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php']) {
	1133	+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php']) {
1134	1134	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dlf/plugins/oai/class.tx_dlf_oai.php']);
1135	1135
1136	1136	}

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	if (count($list) > 0) {
39	39
40	40	// Build typolink configuration array.
41		- $conf = array (
	41	+ $conf = array(
42	42	'useCacheHash' => 1,
43	43	'parameter' => $this->conf['targetPid'],
44	44	'title' => $this->pi_getLL('linkToList', '', TRUE)
		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	protected function getPageSelector() {
65	65
66	66	// Configure @action URL for form.
67		- $linkConf = array (
	67	+ $linkConf = array(
68	68	'parameter' => $GLOBALS['TSFE']->id,
69	69	'forceAbsoluteUrl' => 1
70	70	);
		@@ -131,9 +131,9 @@ discard block
		block discarded – undo
131	131
132	132	// Set default values if not set.
133	133	// $this->piVars['page'] may be integer or string (physical structure @ID)
134		- if ( (int)$this->piVars['page'] > 0 \|\| empty($this->piVars['page'])) {
	134	+ if ((int) $this->piVars['page'] > 0 \|\| empty($this->piVars['page'])) {
135	135
136		- $this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->piVars['page'], 1, $this->doc->numPages, 1);
	136	+ $this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
137	137
138	138	} else {
139	139
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170	// Link to first page.
171	171	if ($this->piVars['page'] > 1) {
172	172
173		- $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array ('page' => 1));
	173	+ $markerArray['###FIRST###'] = $this->makeLink($this->pi_getLL('firstPage', '', TRUE), array('page' => 1));
174	174
175	175	} else {
176	176
		@@ -181,7 +181,7 @@ discard block
		block discarded – undo
181	181	// Link back X pages.
182	182	if ($this->piVars['page'] > $pageSteps) {
183	183
184		- $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] - $pageSteps));
	184	+ $markerArray['###BACK###'] = $this->makeLink(sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] - $pageSteps));
185	185
186	186	} else {
187	187
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	// Link to previous page.
193	193	if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
194	194
195		- $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array ('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
	195	+ $markerArray['###PREVIOUS###'] = $this->makeLink($this->pi_getLL('prevPage', '', TRUE), array('page' => $this->piVars['page'] - (1 + $this->piVars['double'])));
196	196
197	197	} else {
198	198
		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	// Link to next page.
204	204	if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
205	205
206		- $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array ('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
	206	+ $markerArray['###NEXT###'] = $this->makeLink($this->pi_getLL('nextPage', '', TRUE), array('page' => $this->piVars['page'] + (1 + $this->piVars['double'])));
207	207
208	208	} else {
209	209
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	// Link forward X pages.
215	215	if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
216	216
217		- $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array ('page' => $this->piVars['page'] + $pageSteps));
	217	+ $markerArray['###FORWARD###'] = $this->makeLink(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps), array('page' => $this->piVars['page'] + $pageSteps));
218	218
219	219	} else {
220	220
		@@ -225,7 +225,7 @@ discard block
		block discarded – undo
225	225	// Link to last page.
226	226	if ($this->piVars['page'] < $this->doc->numPages) {
227	227
228		- $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array ('page' => $this->doc->numPages));
	228	+ $markerArray['###LAST###'] = $this->makeLink($this->pi_getLL('lastPage', '', TRUE), array('page' => $this->doc->numPages));
229	229
230	230	} else {
231	231
		@@ -238,17 +238,17 @@ discard block
		block discarded – undo
238	238
239	239	if (!$this->piVars['double']) {
240	240
241		- $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array ('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
	241	+ $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOn', '', TRUE), array('double' => 1), 'class="tx-dlf-navigation-doubleOn"');
242	242
243	243	} else {
244	244
245		- $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array ('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
	245	+ $markerArray['###DOUBLEPAGE###'] = $this->makeLink($this->pi_getLL('doublePageOff', '', TRUE), array('double' => 0), 'class="tx-dlf-navigation-doubleOff"');
246	246
247	247	}
248	248
249	249	if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
250	250
251		- $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array ('page' => $this->piVars['page'] + 1));
	251	+ $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink($this->pi_getLL('doublePage+1', '', TRUE), array('page' => $this->piVars['page'] + 1));
252	252
253	253	} else {
254	254
		@@ -271,11 +271,11 @@ discard block
		block discarded – undo
271	271	$markerArray['###LINKLISTVIEW###'] = $this->getLinkToListview();
272	272
273	273	// fill some language labels if available
274		- $markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', TRUE);
	274	+ $markerArray['###ZOOM_IN###'] = $this->pi_getLL('zoom-in', '', TRUE);
275	275	$markerArray['###ZOOM_OUT###'] = $this->pi_getLL('zoom-out', '', TRUE);
276	276	$markerArray['###ZOOM_FULLSCREEN###'] = $this->pi_getLL('zoom-fullscreen', '', TRUE);
277	277
278		- $markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', TRUE);
	278	+ $markerArray['###ROTATE_LEFT###'] = $this->pi_getLL('rotate-left', '', TRUE);
279	279	$markerArray['###ROTATE_RIGHT###'] = $this->pi_getLL('rotate-right', '', TRUE);
280	280	$markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', TRUE);
281	281
		@@ -296,7 +296,7 @@ discard block
		block discarded – undo
296	296	*
297	297	* @return string Typolink ready to output
298	298	*/
299		- protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '') {
	299	+ protected function makeLink($label, array $overrulePIvars = array(), $aTagParams = '') {
300	300
301	301	// Merge plugin variables with new set of values.
302	302	if (is_array($this->piVars)) {
		@@ -310,7 +310,7 @@ discard block
		block discarded – undo
310	310	}
311	311
312	312	// Build typolink configuration array.
313		- $conf = array (
	313	+ $conf = array(
314	314	'useCacheHash' => 1,
315	315	'parameter' => $GLOBALS['TSFE']->id,
316	316	'ATagParams' => $aTagParams,

		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	// Process results.
90	90	while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
91	91
92		- $issues[] = array (
	92	+ $issues[] = array(
93	93	'uid' => $resArray['uid'],
94	94	'title' => $resArray['title'],
95	95	'year' => $resArray['year']
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	}
99	99
100	100	// We need an array of issues with month number as key.
101		- $calendarIssues = array ();
	101	+ $calendarIssues = array();
102	102
103	103	foreach ($issues as $issue) {
104	104
		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106
107	107	}
108	108
109		- $allIssues = array ();
	109	+ $allIssues = array();
110	110
111	111	// Get subpart templates.
112	112	$subparts['list'] = $this->cObj->getSubpart($this->template, '###ISSUELIST###');
		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122
123	123	for ($i = 0; $i <= 11; $i++) {
124	124
125		- $markerArray = array (
	125	+ $markerArray = array(
126	126	'###DAYMON_NAME###' => strftime('%a', strtotime('last Monday')),
127	127	'###DAYTUE_NAME###' => strftime('%a', strtotime('last Tuesday')),
128	128	'###DAYWED_NAME###' => strftime('%a', strtotime('last Wednesday')),
		@@ -130,20 +130,20 @@ discard block
		block discarded – undo
130	130	'###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
131	131	'###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
132	132	'###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
133		- '###MONTHNAME###' => strftime('%B', strtotime($year . '-' . ($i + 1) . '-1'))
	133	+ '###MONTHNAME###' => strftime('%B', strtotime($year.'-'.($i + 1).'-1'))
134	134	);
135	135
136	136	// Reset week content of new month.
137	137	$subWeekPartContent = '';
138	138
139		- $firstOfMonth = strtotime($year . '-' . ($i + 1) . '-1');
	139	+ $firstOfMonth = strtotime($year.'-'.($i + 1).'-1');
140	140	$lastOfMonth = strtotime('last day of', ($firstOfMonth));
141	141	$firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
142	142
143	143	// There are never more than 6 weeks in a month.
144	144	for ($j = 0; $j <= 5; $j++) {
145	145
146		- $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
	146	+ $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
147	147
148	148	$weekArray = array(
149	149	'###DAYMON###' => ' ',
		@@ -164,7 +164,7 @@ discard block
		block discarded – undo
164	164
165	165	$dayLinks = '';
166	166
167		- $dayLinksText = array ();
	167	+ $dayLinksText = array();
168	168
169	169	$dayLinksList = '';
170	170
		@@ -182,10 +182,10 @@ discard block
		block discarded – undo
182	182
183	183	$dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
184	184
185		- $linkConf = array (
	185	+ $linkConf = array(
186	186	'useCacheHash' => 1,
187	187	'parameter' => $this->conf['targetPid'],
188		- 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
	188	+ 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
189	189	'ATagParams' => ' class="title"',
190	190	);
191	191
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212
213	213	}
214	214
215		- $dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>'.$dayLinksList.'</div></div>';
	215	+ $dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
216	216	}
217	217
218	218	switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
		@@ -257,25 +257,25 @@ discard block
		block discarded – undo
257	257	}
258	258
259	259	// Link to years overview
260		- $linkConf = array (
	260	+ $linkConf = array(
261	261	'useCacheHash' => 1,
262	262	'parameter' => $this->conf['targetPid'],
263		- 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId),
	263	+ 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
264	264	);
265	265
266		- $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf);
	266	+ $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
267	267
268	268	// Link to current year.
269		- $linkConf = array (
	269	+ $linkConf = array(
270	270	'useCacheHash' => 1,
271	271	'parameter' => $this->conf['targetPid'],
272		- 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
	272	+ 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
273	273	);
274	274
275	275	$yearLink = $this->cObj->typoLink($year, $linkConf);
276	276
277	277	// Prepare list as alternative of the calendar view.
278		- foreach($allIssues as $dayTime => $issues) {
	278	+ foreach ($allIssues as $dayTime => $issues) {
279	279
280	280	$markerArrayDay['###DATE_STRING###'] = strftime('%A, %x', $dayTime);
281	281
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303
304	304	}
305	305
306		- $markerArray = array (
	306	+ $markerArray = array(
307	307	'###CALENDARVIEWACTIVE###' => $listViewActive ? '' : 'active',
308	308	'###LISTVIEWACTIVE###' => $listViewActive ? 'active' : '',
309	309	'###CALYEAR###' => $yearLink,
		@@ -372,7 +372,7 @@ discard block
		block discarded – undo
372	372	// Process results.
373	373	while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
374	374
375		- $years[] = array (
	375	+ $years[] = array(
376	376	'title' => $resArray['title'],
377	377	'uid' => $resArray['uid']
378	378	);
		@@ -388,8 +388,8 @@ discard block
		block discarded – undo
388	388	$linkConf = array(
389	389	'useCacheHash' => 1,
390	390	'parameter' => $this->conf['targetPid'],
391		- 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']),
392		- 'title' => $titleAnchor . ': ' . $year['title']
	391	+ 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
	392	+ 'title' => $titleAnchor.': '.$year['title']
393	393	);
394	394
395	395	$yearArray = array(
		@@ -402,15 +402,15 @@ discard block
		block discarded – undo
402	402	}
403	403
404	404	// link to years overview (should be itself here)
405		- $linkConf = array (
	405	+ $linkConf = array(
406	406	'useCacheHash' => 1,
407	407	'parameter' => $this->conf['targetPid'],
408		- 'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid,
	408	+ 'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
409	409	);
410		- $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' .$this->doc->getTitle($this->doc->uid), $linkConf);
	410	+ $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
411	411
412	412	// Fill markers.
413		- $markerArray = array (
	413	+ $markerArray = array(
414	414	'###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),
415	415	'###CALALLYEARS###' => $allYearsLink
416	416	);

		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	* @var array
37	37	* @access protected
38	38	*/
39		- protected $metadata = array ();
	39	+ protected $metadata = array();
40	40
41	41	/**
42	42	* Array of sortable metadata
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	* @var array
45	45	* @access protected
46	46	*/
47		- protected $sortables = array ();
	47	+ protected $sortables = array();
48	48
49	49	/**
50	50	* Renders the page browser
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	// Add link to previous page.
72	72	if ($this->piVars['pointer'] > 0) {
73	73
74		- $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array ('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
	74	+ $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
75	75
76	76	} else {
77	77
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90
91	91	if ($this->piVars['pointer'] != $i) {
92	92
93		- $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i), TRUE).$separator;
	93	+ $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array('pointer' => $i), TRUE).$separator;
94	94
95	95	} else {
96	96
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	// Add link to next page.
116	116	if ($this->piVars['pointer'] < $maxPages - 1) {
117	117
118		- $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '>', TRUE), array ('pointer' => $this->piVars['pointer'] + 1), TRUE);
	118	+ $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '>', TRUE), array('pointer' => $this->piVars['pointer'] + 1), TRUE);
119	119
120	120	} else {
121	121
		@@ -188,12 +188,12 @@ discard block
		block discarded – undo
188	188
189	189	$imgAlt = htmlspecialchars($value);
190	190
191		- $additionalParams = array (
	191	+ $additionalParams = array(
192	192	'id' => $this->list[$number]['uid'],
193	193	'page' => $this->list[$number]['page']
194	194	);
195	195
196		- $conf = array (
	196	+ $conf = array(
197	197	'useCacheHash' => 1,
198	198	'parameter' => $this->conf['targetPid'],
199	199	'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
		@@ -269,9 +269,9 @@ discard block
		block discarded – undo
269	269
270	270	if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
271	271
272		- $additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
	272	+ $additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
273	273
274		- $conf = array (
	274	+ $conf = array(
275	275	'useCacheHash' => 1,
276	276	'parameter' => $this->conf['targetBasket'],
277	277	'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
		@@ -307,7 +307,7 @@ discard block
		block discarded – undo
307	307	$prefix = str_replace('_', '-', get_class($this));
308	308
309	309	// Configure @action URL for form.
310		- $linkConf = array (
	310	+ $linkConf = array(
311	311	'parameter' => $GLOBALS['TSFE']->id,
312	312	'forceAbsoluteUrl' => 1
313	313	);
		@@ -419,13 +419,13 @@ discard block
		block discarded – undo
419	419
420	420	$imgAlt = htmlspecialchars($value);
421	421
422		- $additionalParams = array (
	422	+ $additionalParams = array(
423	423	'id' => $subpart['uid'],
424	424	'page' => $subpart['page'],
425	425	'highlight_word' => preg_replace('/\s\s+/', ';', $this->list->metadata['searchString'])
426	426	);
427	427
428		- $conf = array (
	428	+ $conf = array(
429	429	// we don't want cHash in case of search parameters
430	430	'useCacheHash' => empty($this->list->metadata['searchString']) ? 1 : 0,
431	431	'parameter' => $this->conf['targetPid'],
		@@ -505,9 +505,9 @@ discard block
		block discarded – undo
505	505
506	506	if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
507	507
508		- $additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
	508	+ $additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
509	509
510		- $conf = array (
	510	+ $conf = array(
511	511	'useCacheHash' => 1,
512	512	'parameter' => $this->conf['targetBasket'],
513	513	'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
		@@ -549,7 +549,7 @@ discard block
		block discarded – undo
549	549
550	550	if ($resArray['is_listed']) {
551	551
552		- $this->metadata[$resArray['index_name']] = array (
	552	+ $this->metadata[$resArray['index_name']] = array(
553	553	'wrap' => $resArray['wrap'],
554	554	'label' => tx_dlf_helper::translate($resArray['index_name'], 'tx_dlf_metadata', $this->conf['pages'])
555	555	);

		@@ -108,12 +108,12 @@
		block discarded – undo
108	108	$countVolumes = $GLOBALS['TYPO3_DB']->sql_num_rows($resultVolumes);
109	109
110	110	// Set replacements.
111		- $replace = array (
112		- 'key' => array (
	111	+ $replace = array(
	112	+ 'key' => array(
113	113	'###TITLES###',
114	114	'###VOLUMES###'
115	115	),
116		- 'value' => array (
	116	+ 'value' => array(
117	117	$countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
118	118	$countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
119	119	)

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	* @var array
28	28	* @access protected
29	29	*/
30		- protected $activeEntries = array ();
	30	+ protected $activeEntries = array();
31	31
32	32	/**
33	33	* This builds an array for one menu entry
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	*/
42	42	protected function getMenuEntry(array $entry, $recursive = FALSE) {
43	43
44		- $entryArray = array ();
	44	+ $entryArray = array();
45	45
46	46	// Set "title", "volume", "type" and "pagination" from $entry array.
47	47	$entryArray['title'] = $entry['label'];
		@@ -63,37 +63,37 @@ discard block
		block discarded – undo
63	63	// Build menu links based on the $entry['points'] array.
64	64	if (!empty($entry['points']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($entry['points'])) {
65	65
66		- $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
	66	+ $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('page' => $entry['points']), TRUE, FALSE, $this->conf['targetPid']);
67	67
68	68	$entryArray['doNotLinkIt'] = 0;
69	69
70	70	if ($this->conf['basketButton']) {
71	71
72		- $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>';
	72	+ $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>';
73	73
74	74	}
75	75
76	76	} elseif (!empty($entry['points']) && is_string($entry['points'])) {
77	77
78		- $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
	78	+ $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['points'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
79	79
80	80	$entryArray['doNotLinkIt'] = 0;
81	81
82	82	if ($this->conf['basketButton']) {
83	83
84		- $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>';
	84	+ $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>';
85	85
86	86	}
87	87
88	88	} elseif (!empty($entry['targetUid'])) {
89	89
90		- $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
	90	+ $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('id' => $entry['targetUid'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
91	91
92	92	$entryArray['doNotLinkIt'] = 0;
93	93
94	94	if ($this->conf['basketButton']) {
95	95
96		- $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>';
	96	+ $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>';
97	97
98	98	}
99	99
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	// 4. Current menu node has no corresponding images
117	117	if (!empty($this->conf['menuConf.']['expAll']) \|\| $entryArray['ITEM_STATE'] == 'CUR' \|\| is_string($entry['points']) \|\| empty($this->doc->smLinks['l2p'][$entry['id']])) {
118	118
119		- $entryArray['_SUB_MENU'] = array ();
	119	+ $entryArray['_SUB_MENU'] = array();
120	120
121	121	foreach ($entry['children'] as $child) {
122	122
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180
181	181	}
182	182
183		- $TSconfig = array ();
	183	+ $TSconfig = array();
184	184
185	185	$TSconfig['special'] = 'userfunction';
186	186
		@@ -216,15 +216,15 @@ discard block
		block discarded – undo
216	216	if ($this->doc === NULL) {
217	217
218	218	// Quit without doing anything if required variables are not set.
219		- return array ();
	219	+ return array();
220	220
221	221	} else {
222	222
223	223	// Set default values for page if not set.
224	224	// $this->piVars['page'] may be integer or string (physical structure @ID)
225		- if ( (int)$this->piVars['page'] > 0 \|\| empty($this->piVars['page'])) {
	225	+ if ((int) $this->piVars['page'] > 0 \|\| empty($this->piVars['page'])) {
226	226
227		- $this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->piVars['page'], 1, $this->doc->numPages, 1);
	227	+ $this->piVars['page'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int) $this->piVars['page'], 1, $this->doc->numPages, 1);
228	228
229	229	} else {
230	230
		@@ -236,7 +236,7 @@ discard block
		block discarded – undo
236	236
237	237	}
238	238
239		- $menuArray = array ();
	239	+ $menuArray = array();
240	240
241	241	// Does the document have physical elements or is it an external file?
242	242	if ($this->doc->physicalStructure \|\| !\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->doc->uid)) {
		@@ -293,11 +293,11 @@ discard block
		block discarded – undo
293	293
294	294	$menuArray[0]['ITEM_STATE'] = 'CURIFSUB';
295	295
296		- $menuArray[0]['_SUB_MENU'] = array ();
	296	+ $menuArray[0]['_SUB_MENU'] = array();
297	297
298	298	while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
299	299
300		- $entry = array (
	300	+ $entry = array(
301	301	'label' => $resArray['title'],
302	302	'type' => $resArray['type'],
303	303	'volume' => $resArray['volume'],

Erikmitk / kitodo-presentation

Branch — oai_solr (423cc8)

Category

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch