kitodo / kitodo-presentation

dlf/plugins/basket/class.tx_dlf_basket.php

Spacing +16 added lines, -16 removed lines

@@ -210,13 +210,13 @@ 
 
         if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultMail) > 0) {
 
-            $mails = array();
+            $mails = array ();
 
             $mailForm = '<select name="tx_dlf[mail_action]">';
 
             $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;
 
@@ -255,13 +255,13 @@ 
 
         if ($GLOBALS['TYPO3_DB']->sql_num_rows($resultPrinter) > 0) {
 
-            $printers = array();
+            $printers = array ();
 
             $printForm = '<select name="tx_dlf[print_action]">';
 
             $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;
 
@@ -414,7 +414,7 @@ 
 
         if ($page != null || $_piVars['addToBasket'] == 'list') {
 
-            $documentItem = array(
+            $documentItem = array (
                 'id' => intval($_piVars['id']),
                 'startpage' => intval($_piVars['startpage']),
                 'endpage' => intval($_piVars['endpage']),
@@ -434,12 +434,12 @@ 
 
             } else {
 
-                $items = array();
+                $items = array ();
 
             }
 
             // 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')) {
@@ -523,7 +523,7 @@ 
 
             }
 
-            $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);
 
@@ -531,7 +531,7 @@ 
 
         }
 
-        return array('basketData' => $basketData, 'jsOutput' => $output);
+        return array ('basketData' => $basketData, 'jsOutput' => $output);
 
     }
 
@@ -581,11 +581,11 @@ 
 
         if (empty($items)) {
 
-            $update = array('doc_ids' => '');
+            $update = array ('doc_ids' => '');
 
         } else {
 
-            $update = array('doc_ids' => json_encode($items));
+            $update = array ('doc_ids' => json_encode($items));
 
         }
 
@@ -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) {
 
@@ -714,7 +714,7 @@ 
 
             }
 
-            return array(
+            return array (
                 'downloadUrl' => $downloadUrl,
                 'downloadLink' => $downloadLink,
                 'pageNums'	=> $pageNums,
@@ -800,7 +800,7 @@ 
             ->setFrom($from)
 
             // Set the To addresses with an associative array
-            ->setTo(array($mailData['mail'] => $mailData['name']))
+            ->setTo(array ($mailData['mail'] => $mailData['name']))
 
             ->setBody($body, 'text/html')
 
@@ -808,7 +808,7 @@ 
         ;
 
         // protocol
-        $insertArray = array(
+        $insertArray = array (
             'pid' => $this->conf['pages'],
             'file_name' => $pdfUrl,
             'count_pages' => $numberOfPages,
@@ -908,7 +908,7 @@ 
         }
 
         // protocol
-        $insertArray = array(
+        $insertArray = array (
             'pid' => $this->conf['pages'],
             'file_name' => $pdfUrl,
             'count_pages' => $numberOfPages,

Braces +2 added lines, -2 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;
 

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -73,7 +73,7 @@ 
 
             $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();
 
@@ -412,7 +412,7 @@ 
 
         }
 
-        if ($page != null || $_piVars['addToBasket'] == 'list') {
+        if ($page != NULL || $_piVars['addToBasket'] == 'list') {
 
             $documentItem = array(
                 'id' => intval($_piVars['id']),
@@ -442,7 +442,7 @@ 
             $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')) {
+            if (($_piVars['addToBasket'] == 'subentry') or ($_piVars['addToBasket'] == 'toc')) {
 
                 $smLinks = $document->smLinks;
 
@@ -724,7 +724,7 @@ 
 
         }
 
-        return false;
+        return FALSE;
 
     }
 

dlf/plugins/feeds/class.tx_dlf_feeds.php

Indentation +128 added lines, -128 removed lines

@@ -19,210 +19,210 @@
  */
 class tx_dlf_feeds extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/feeds/class.tx_dlf_feeds.php';
+    public $scriptRelPath = 'plugins/feeds/class.tx_dlf_feeds.php';
 
-	/**
-	 * The main method of the PlugIn
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$content: The PlugIn content
-	 * @param	array		$conf: The PlugIn configuration
-	 *
-	 * @return	void
-	 */
-	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	void
+     */
+    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);
 
-		// Create XML document.
-		$rss = new DOMDocument('1.0', 'utf-8');
+        // Create XML document.
+        $rss = new DOMDocument('1.0', 'utf-8');
 
-		// Add mandatory root element.
-		$root = $rss->createElement('rss');
+        // Add mandatory root element.
+        $root = $rss->createElement('rss');
 
-		$root->setAttribute('version', '2.0');
+        $root->setAttribute('version', '2.0');
 
-		// Add channel element.
-		$channel = $rss->createElement('channel');
+        // Add channel element.
+        $channel = $rss->createElement('channel');
 
-		$channel->appendChild($rss->createElement('title', htmlspecialchars($this->conf['title'], ENT_NOQUOTES, 'UTF-8')));
+        $channel->appendChild($rss->createElement('title', htmlspecialchars($this->conf['title'], ENT_NOQUOTES, 'UTF-8')));
 
-		$channel->appendChild($rss->createElement('link', htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->pi_linkTP_keepPIvars_url()), ENT_NOQUOTES, 'UTF-8')));
+        $channel->appendChild($rss->createElement('link', htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->pi_linkTP_keepPIvars_url()), ENT_NOQUOTES, 'UTF-8')));
 
-		if (!empty($this->conf['description'])) {
+        if (!empty($this->conf['description'])) {
 
-			$channel->appendChild($rss->createElement('description', htmlspecialchars($this->conf['description'], ENT_QUOTES, 'UTF-8')));
+            $channel->appendChild($rss->createElement('description', htmlspecialchars($this->conf['description'], ENT_QUOTES, 'UTF-8')));
 
-		}
+        }
 
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_libraries.label AS label',
-			'tx_dlf_libraries',
-			'tx_dlf_libraries.pid='.intval($this->conf['pages']).' AND tx_dlf_libraries.uid='.intval($this->conf['library']).tx_dlf_helper::whereClause('tx_dlf_libraries'),
-			'',
-			'',
-			'1'
-		);
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_libraries.label AS label',
+            'tx_dlf_libraries',
+            'tx_dlf_libraries.pid='.intval($this->conf['pages']).' AND tx_dlf_libraries.uid='.intval($this->conf['library']).tx_dlf_helper::whereClause('tx_dlf_libraries'),
+            '',
+            '',
+            '1'
+        );
 
-		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+            $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-			$channel->appendChild($rss->createElement('copyright', htmlspecialchars($resArray['label'], ENT_NOQUOTES, 'UTF-8')));
+            $channel->appendChild($rss->createElement('copyright', htmlspecialchars($resArray['label'], ENT_NOQUOTES, 'UTF-8')));
 
-		}
+        }
 
-		$channel->appendChild($rss->createElement('pubDate', date('r', $GLOBALS['EXEC_TIME'])));
+        $channel->appendChild($rss->createElement('pubDate', date('r', $GLOBALS['EXEC_TIME'])));
 
-		$channel->appendChild($rss->createElement('generator', htmlspecialchars($this->conf['useragent'], ENT_NOQUOTES, 'UTF-8')));
+        $channel->appendChild($rss->createElement('generator', htmlspecialchars($this->conf['useragent'], ENT_NOQUOTES, 'UTF-8')));
 
-		// Add item elements.
-		if (!$this->conf['excludeOther'] || empty($this->piVars['collection']) || \TYPO3\CMS\Core\Utility\GeneralUtility::inList($this->conf['collections'], $this->piVars['collection'])) {
+        // Add item elements.
+        if (!$this->conf['excludeOther'] || empty($this->piVars['collection']) || \TYPO3\CMS\Core\Utility\GeneralUtility::inList($this->conf['collections'], $this->piVars['collection'])) {
 
-			$additionalWhere = '';
+            $additionalWhere = '';
 
-			// Check for pre-selected collections.
-			if (!empty($this->piVars['collection'])) {
+            // Check for pre-selected collections.
+            if (!empty($this->piVars['collection'])) {
 
-				$additionalWhere = ' AND tx_dlf_collections.uid='.intval($this->piVars['collection']);
+                $additionalWhere = ' AND tx_dlf_collections.uid='.intval($this->piVars['collection']);
 
-			} elseif (!empty($this->conf['collections'])) {
+            } elseif (!empty($this->conf['collections'])) {
 
-				$additionalWhere = ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
+                $additionalWhere = ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
 
-			}
+            }
 
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-				'tx_dlf_documents.uid AS uid,tx_dlf_documents.partof AS partof,tx_dlf_documents.title AS title,tx_dlf_documents.volume AS volume,tx_dlf_documents.author AS author,tx_dlf_documents.record_id AS guid,tx_dlf_documents.tstamp AS tstamp,tx_dlf_documents.crdate AS crdate',
-				'tx_dlf_documents',
-				'tx_dlf_relations',
-				'tx_dlf_collections',
-				'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').' AND tx_dlf_collections.pid='.intval($this->conf['pages']).$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-				'tx_dlf_documents.uid',
-				'tx_dlf_documents.tstamp DESC',
-				intval($this->conf['limit'])
-			);
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+                'tx_dlf_documents.uid AS uid,tx_dlf_documents.partof AS partof,tx_dlf_documents.title AS title,tx_dlf_documents.volume AS volume,tx_dlf_documents.author AS author,tx_dlf_documents.record_id AS guid,tx_dlf_documents.tstamp AS tstamp,tx_dlf_documents.crdate AS crdate',
+                'tx_dlf_documents',
+                'tx_dlf_relations',
+                'tx_dlf_collections',
+                'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').' AND tx_dlf_collections.pid='.intval($this->conf['pages']).$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                'tx_dlf_documents.uid',
+                'tx_dlf_documents.tstamp DESC',
+                intval($this->conf['limit'])
+            );
 
-			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-				// Add each record as item element.
-				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+                // Add each record as item element.
+                while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-					$item = $rss->createElement('item');
+                    $item = $rss->createElement('item');
 
-					$title = '';
+                    $title = '';
 
-					// Get title of superior document.
-					if ((empty($resArray['title']) || !empty($this->conf['prependSuperiorTitle'])) && !empty($resArray['partof'])) {
+                    // Get title of superior document.
+                    if ((empty($resArray['title']) || !empty($this->conf['prependSuperiorTitle'])) && !empty($resArray['partof'])) {
 
-						$superiorTitle = tx_dlf_document::getTitle($resArray['partof'], TRUE);
+                        $superiorTitle = tx_dlf_document::getTitle($resArray['partof'], TRUE);
 
-						if (!empty($superiorTitle)) {
+                        if (!empty($superiorTitle)) {
 
-							$title .= '['.$superiorTitle.']';
+                            $title .= '['.$superiorTitle.']';
 
-						}
+                        }
 
-					}
+                    }
 
-					// Get title of document.
-					if (!empty($resArray['title'])) {
+                    // Get title of document.
+                    if (!empty($resArray['title'])) {
 
-						$title .= ' '.$resArray['title'];
+                        $title .= ' '.$resArray['title'];
 
-					}
+                    }
 
-					// Set default title if empty.
-					if (empty($title)) {
+                    // Set default title if empty.
+                    if (empty($title)) {
 
-						$title = $this->pi_getLL('noTitle');
+                        $title = $this->pi_getLL('noTitle');
 
-					}
+                    }
 
-					// Append volume information.
-					if (!empty($resArray['volume'])) {
+                    // Append volume information.
+                    if (!empty($resArray['volume'])) {
 
-						$title .= ', '.$this->pi_getLL('volume').' '.$resArray['volume'];
+                        $title .= ', '.$this->pi_getLL('volume').' '.$resArray['volume'];
 
-					}
+                    }
 
-					// Is this document new or updated?
-					if ($resArray['crdate'] == $resArray['tstamp']) {
+                    // Is this document new or updated?
+                    if ($resArray['crdate'] == $resArray['tstamp']) {
 
-						$title = $this->pi_getLL('new').' '.trim($title);
+                        $title = $this->pi_getLL('new').' '.trim($title);
 
-					} else {
+                    } else {
 
-						$title = $this->pi_getLL('update').' '.trim($title);
+                        $title = $this->pi_getLL('update').' '.trim($title);
 
-					}
+                    }
 
-					$item->appendChild($rss->createElement('title', htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8')));
+                    $item->appendChild($rss->createElement('title', htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8')));
 
-					// Add link.
-					$linkConf = array (
-						'parameter' => $this->conf['targetPid'],
-						'forceAbsoluteUrl' => 1,
-						'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array ('id' => $resArray['uid']), '', TRUE, FALSE)
-					);
+                    // Add link.
+                    $linkConf = array (
+                        'parameter' => $this->conf['targetPid'],
+                        'forceAbsoluteUrl' => 1,
+                        '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')));
+                    $item->appendChild($rss->createElement('link', htmlspecialchars($this->cObj->typoLink_URL($linkConf), ENT_NOQUOTES, 'UTF-8')));
 
-					// Add author if applicable.
-					if (!empty($resArray['author'])) {
+                    // Add author if applicable.
+                    if (!empty($resArray['author'])) {
 
-						$item->appendChild($rss->createElement('author', htmlspecialchars($resArray['author'], ENT_NOQUOTES, 'UTF-8')));
+                        $item->appendChild($rss->createElement('author', htmlspecialchars($resArray['author'], ENT_NOQUOTES, 'UTF-8')));
 
-					}
+                    }
 
-					// Add online publication date.
-					$item->appendChild($rss->createElement('pubDate', date('r', $resArray['crdate'])));
+                    // Add online publication date.
+                    $item->appendChild($rss->createElement('pubDate', date('r', $resArray['crdate'])));
 
-					// Add internal record identifier.
-					$item->appendChild($rss->createElement('guid', htmlspecialchars($resArray['guid'], ENT_NOQUOTES, 'UTF-8')));
+                    // Add internal record identifier.
+                    $item->appendChild($rss->createElement('guid', htmlspecialchars($resArray['guid'], ENT_NOQUOTES, 'UTF-8')));
 
-					$channel->appendChild($item);
+                    $channel->appendChild($item);
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		$root->appendChild($channel);
+        $root->appendChild($channel);
 
-		// Build XML output.
-		$rss->appendChild($root);
+        // Build XML output.
+        $rss->appendChild($root);
 
-		$content = $rss->saveXML();
+        $content = $rss->saveXML();
 
-		// Clean output buffer.
-		\TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
+        // Clean output buffer.
+        \TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
 
-		// Send headers.
-		header('HTTP/1.1 200 OK');
+        // Send headers.
+        header('HTTP/1.1 200 OK');
 
-		header('Cache-Control: no-cache');
+        header('Cache-Control: no-cache');
 
-		header('Content-Length: '.strlen($content));
+        header('Content-Length: '.strlen($content));
 
-		header('Content-Type: application/rss+xml; charset=utf-8');
+        header('Content-Type: application/rss+xml; charset=utf-8');
 
-		header('Date: '.date('r', $GLOBALS['EXEC_TIME']));
+        header('Date: '.date('r', $GLOBALS['EXEC_TIME']));
 
-		header('Expires: '.date('r', $GLOBALS['EXEC_TIME']));
+        header('Expires: '.date('r', $GLOBALS['EXEC_TIME']));
 
-		echo $content;
+        echo $content;
 
-		// Flush output buffer and end script processing.
-		ob_end_flush();
+        // Flush output buffer and end script processing.
+        ob_end_flush();
 
-		exit;
+        exit;
 
-	}
+    }
 
 }

dlf/plugins/metadata/class.tx_dlf_metadata.php

Indentation +229 added lines, -229 removed lines

@@ -20,391 +20,391 @@
  */
 class tx_dlf_metadata extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/metadata/class.tx_dlf_metadata.php';
+    public $scriptRelPath = 'plugins/metadata/class.tx_dlf_metadata.php';
 
-	/**
-	 * This holds the hook objects
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $hookObjects = array ();
+    /**
+     * This holds the hook objects
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $hookObjects = array ();
 
-	/**
-	 * 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);
 
-		// Turn cache on.
-		$this->setCache(TRUE);
+        // Turn cache on.
+        $this->setCache(TRUE);
 
-		// Load current document.
-		$this->loadDocument();
+        // Load current document.
+        $this->loadDocument();
 
-		if ($this->doc === NULL) {
+        if ($this->doc === NULL) {
 
-			// Quit without doing anything if required variables are not set.
-			return $content;
+            // Quit without doing anything if required variables are not set.
+            return $content;
 
-		} else {
+        } else {
 
-			// Set default values if not set.
-			if (!isset($this->conf['rootline'])) {
+            // Set default values if not set.
+            if (!isset($this->conf['rootline'])) {
 
-				$this->conf['rootline'] = 0;
+                $this->conf['rootline'] = 0;
 
-			}
+            }
 
-		}
+        }
 
-		$metadata = array ();
+        $metadata = array ();
 
-		if ($this->conf['rootline'] < 2) {
+        if ($this->conf['rootline'] < 2) {
 
-			// Get current structure's @ID.
-			$ids = array ();
+            // Get current structure's @ID.
+            $ids = array ();
 
-			if (!empty($this->doc->physicalStructure[$this->piVars['page']]) && !empty($this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page']]])) {
+            if (!empty($this->doc->physicalStructure[$this->piVars['page']]) && !empty($this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page']]])) {
 
-				foreach ($this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page']]] as $logId) {
+                foreach ($this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page']]] as $logId) {
 
-					$count = count($this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$logId.'"]/ancestor::*'));
+                    $count = count($this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$logId.'"]/ancestor::*'));
 
-					$ids[$count][] = $logId;
+                    $ids[$count][] = $logId;
 
-				}
+                }
 
-			}
+            }
 
-			ksort($ids);
+            ksort($ids);
 
-			reset($ids);
+            reset($ids);
 
-			// Check if we should display all metadata up to the root.
-			if ($this->conf['rootline'] == 1) {
+            // Check if we should display all metadata up to the root.
+            if ($this->conf['rootline'] == 1) {
 
-				foreach ($ids as $id) {
+                foreach ($ids as $id) {
 
-					foreach ($id as $sid) {
+                    foreach ($id as $sid) {
 
-						$data = $this->doc->getMetadata($sid, $this->conf['pages']);
+                        $data = $this->doc->getMetadata($sid, $this->conf['pages']);
 
-						if (!empty($data)) {
+                        if (!empty($data)) {
 
-							$data['_id'] = $sid;
+                            $data['_id'] = $sid;
 
-							$metadata[] = $data;
+                            $metadata[] = $data;
 
-						}
+                        }
 
-					}
+                    }
 
-				}
+                }
 
-			} else {
+            } else {
 
-				$id = array_pop($ids);
+                $id = array_pop($ids);
 
-				if (is_array($id)) {
+                if (is_array($id)) {
 
-					foreach ($id as $sid) {
+                    foreach ($id as $sid) {
 
-						$data = $this->doc->getMetadata($sid, $this->conf['pages']);
+                        $data = $this->doc->getMetadata($sid, $this->conf['pages']);
 
-						if (!empty($data)) {
+                        if (!empty($data)) {
 
-							$data['_id'] = $sid;
+                            $data['_id'] = $sid;
 
-							$metadata[] = $data;
+                            $metadata[] = $data;
 
-						}
+                        }
 
-					}
+                    }
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// Get titledata?
-		if (empty($metadata) || ($this->conf['rootline'] == 1 && $metadata[0]['_id'] != $this->doc->toplevelId)) {
+        // Get titledata?
+        if (empty($metadata) || ($this->conf['rootline'] == 1 && $metadata[0]['_id'] != $this->doc->toplevelId)) {
 
-			$data = $this->doc->getTitleData($this->conf['pages']);
+            $data = $this->doc->getTitleData($this->conf['pages']);
 
-			$data['_id'] = $this->doc->toplevelId;
+            $data['_id'] = $this->doc->toplevelId;
 
-			array_unshift($metadata, $data);
+            array_unshift($metadata, $data);
 
-		}
+        }
 
-		if (empty($metadata)) {
+        if (empty($metadata)) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_metadata->main('.$content.', [data])] No metadata found for document with UID "'.$this->doc->uid.'"', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_metadata->main('.$content.', [data])] No metadata found for document with UID "'.$this->doc->uid.'"', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
-			}
+            }
 
-			return $content;
+            return $content;
 
-		}
+        }
 
-		ksort($metadata);
+        ksort($metadata);
 
-		// Get hook objects.
-		$this->hookObjects = tx_dlf_helper::getHookObjects($this->scriptRelPath);
+        // Get hook objects.
+        $this->hookObjects = tx_dlf_helper::getHookObjects($this->scriptRelPath);
 
-		// Hook for getting a customized title bar (requested by SBB).
-		foreach ($this->hookObjects as $hookObj) {
+        // Hook for getting a customized title bar (requested by SBB).
+        foreach ($this->hookObjects as $hookObj) {
 
-			if (method_exists($hookObj, 'main_customizeTitleBarGetCustomTemplate')) {
+            if (method_exists($hookObj, 'main_customizeTitleBarGetCustomTemplate')) {
 
-				$hookObj->main_customizeTitleBarGetCustomTemplate($this, $metadata);
+                $hookObj->main_customizeTitleBarGetCustomTemplate($this, $metadata);
 
-			}
+            }
 
-		}
+        }
 
-		$content .= $this->printMetadata($metadata);
+        $content .= $this->printMetadata($metadata);
 
-		return $this->pi_wrapInBaseClass($content);
+        return $this->pi_wrapInBaseClass($content);
 
-	}
+    }
 
-	/**
-	 * Prepares the metadata array for output
-	 *
-	 * @access	protected
-	 *
-	 * @param	array		$metadataArray: The metadata array
-	 *
-	 * @return	string		The metadata array ready for output
-	 */
-	protected function printMetadata(array $metadataArray) {
+    /**
+     * Prepares the metadata array for output
+     *
+     * @access	protected
+     *
+     * @param	array		$metadataArray: The metadata array
+     *
+     * @return	string		The metadata array ready for output
+     */
+    protected function printMetadata(array $metadataArray) {
 
-		// 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/metadata/template.tmpl'), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/metadata/template.tmpl'), '###TEMPLATE###');
 
-		}
+        }
 
-		$output = '';
+        $output = '';
 
-		$subpart['block'] = $this->cObj->getSubpart($this->template, '###BLOCK###');
+        $subpart['block'] = $this->cObj->getSubpart($this->template, '###BLOCK###');
 
-		// Get list of metadata to show.
-		$metaList = array ();
+        // Get list of metadata to show.
+        $metaList = array ();
 
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.wrap AS wrap',
-			'tx_dlf_metadata',
-			'tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata').' AND (sys_language_uid IN (-1,0) OR (sys_language_uid = ' .$GLOBALS['TSFE']->sys_language_uid. ' AND l18n_parent = 0))',
-			'',
-			'tx_dlf_metadata.sorting',
-			''
-		);
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.wrap AS wrap',
+            'tx_dlf_metadata',
+            'tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata').' AND (sys_language_uid IN (-1,0) OR (sys_language_uid = ' .$GLOBALS['TSFE']->sys_language_uid. ' AND l18n_parent = 0))',
+            '',
+            'tx_dlf_metadata.sorting',
+            ''
+        );
 
-		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-			if (is_array($resArray) && $resArray['sys_language_uid'] != $GLOBALS['TSFE']->sys_language_content && $GLOBALS['TSFE']->sys_language_contentOL) {
+            if (is_array($resArray) && $resArray['sys_language_uid'] != $GLOBALS['TSFE']->sys_language_content && $GLOBALS['TSFE']->sys_language_contentOL) {
 
-					$resArray = $GLOBALS['TSFE']->sys_page->getRecordOverlay('tx_dlf_metadata', $resArray, $GLOBALS['TSFE']->sys_language_content, $GLOBALS['TSFE']->sys_language_contentOL);
+                    $resArray = $GLOBALS['TSFE']->sys_page->getRecordOverlay('tx_dlf_metadata', $resArray, $GLOBALS['TSFE']->sys_language_content, $GLOBALS['TSFE']->sys_language_contentOL);
 
-				}
+                }
 
-				if ($resArray) {
-					// get correct language uid for translated realurl link
-					$link_uid = ($resArray['_LOCALIZED_UID']) ? $resArray['_LOCALIZED_UID'] : $resArray['uid'];
+                if ($resArray) {
+                    // get correct language uid for translated realurl link
+                    $link_uid = ($resArray['_LOCALIZED_UID']) ? $resArray['_LOCALIZED_UID'] : $resArray['uid'];
 
-					// do stuff with the row entry data	like built HTML or prepare further usage
-					if ($this->conf['showFull'] || $resArray['is_listed']) {
+                    // do stuff with the row entry data	like built HTML or prepare further usage
+                    if ($this->conf['showFull'] || $resArray['is_listed']) {
 
-						$metaList[$resArray['index_name']] = array (
-							'wrap' => $resArray['wrap'],
-							'label' => tx_dlf_helper::translate($resArray['index_name'], 'tx_dlf_metadata', $this->conf['pages'])
-						);
+                        $metaList[$resArray['index_name']] = array (
+                            'wrap' => $resArray['wrap'],
+                            'label' => tx_dlf_helper::translate($resArray['index_name'], 'tx_dlf_metadata', $this->conf['pages'])
+                        );
 
-					}
+                    }
 
-				}
+                }
 
-		}
+        }
 
-		// Get list of collections to show.
-		$collList = array ();
+        // Get list of collections to show.
+        $collList = array ();
 
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_collections.index_name AS index_name',
-			'tx_dlf_collections',
-			'tx_dlf_collections.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_collections'),
-			'',
-			'',
-			''
-		);
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_collections.index_name AS index_name',
+            'tx_dlf_collections',
+            'tx_dlf_collections.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_collections'),
+            '',
+            '',
+            ''
+        );
 
-		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-			$collList[] = $resArray['index_name'];
+            $collList[] = $resArray['index_name'];
 
-		}
+        }
 
-		// Save original data array.
-		$cObjData = $this->cObj->data;
+        // Save original data array.
+        $cObjData = $this->cObj->data;
 
-		// Parse the metadata arrays.
-		foreach ($metadataArray as $metadata) {
+        // Parse the metadata arrays.
+        foreach ($metadataArray as $metadata) {
 
-			$markerArray['###METADATA###'] = '';
+            $markerArray['###METADATA###'] = '';
 
-			// Reset content object's data array.
-			$this->cObj->data = $cObjData;
+            // Reset content object's data array.
+            $this->cObj->data = $cObjData;
 
-			// Load all the metadata values into the content object's data array.
-			foreach ($metadata as $index_name => $value) {
+            // Load all the metadata values into the content object's data array.
+            foreach ($metadata as $index_name => $value) {
 
-				if (is_array($value)) {
+                if (is_array($value)) {
 
-					$this->cObj->data[$index_name] = implode($this->conf['separator'], $value);
+                    $this->cObj->data[$index_name] = implode($this->conf['separator'], $value);
 
-				} else {
+                } else {
 
-					$this->cObj->data[$index_name] = $value;
+                    $this->cObj->data[$index_name] = $value;
 
-				}
+                }
 
-			}
+            }
 
-			// Process each metadate.
-			foreach ($metaList as $index_name => $metaConf) {
+            // Process each metadate.
+            foreach ($metaList as $index_name => $metaConf) {
 
-				$parsedValue = '';
+                $parsedValue = '';
 
-				$fieldwrap = $this->parseTS($metaConf['wrap']);
+                $fieldwrap = $this->parseTS($metaConf['wrap']);
 
-				do {
+                do {
 
-					$value = @array_shift($metadata[$index_name]);
+                    $value = @array_shift($metadata[$index_name]);
 
-					if ($index_name == 'title') {
+                    if ($index_name == 'title') {
 
-						// Get title of parent document if needed.
-						if (empty($value) && $this->conf['getTitle'] && $this->doc->parentId) {
+                        // Get title of parent document if needed.
+                        if (empty($value) && $this->conf['getTitle'] && $this->doc->parentId) {
 
-							$superiorTitle = tx_dlf_document::getTitle($this->doc->parentId, TRUE);
+                            $superiorTitle = tx_dlf_document::getTitle($this->doc->parentId, TRUE);
 
-							if (!empty($superiorTitle)) {
+                            if (!empty($superiorTitle)) {
 
-								$value = '['.$superiorTitle.']';
+                                $value = '['.$superiorTitle.']';
 
-							}
+                            }
 
-						}
+                        }
 
-						if (!empty($value)) {
+                        if (!empty($value)) {
 
-							$value = htmlspecialchars($value);
+                            $value = htmlspecialchars($value);
 
-							// Link title to pageview.
-							if ($this->conf['linkTitle'] && $metadata['_id']) {
+                            // Link title to pageview.
+                            if ($this->conf['linkTitle'] && $metadata['_id']) {
 
-								$details = $this->doc->getLogicalStructure($metadata['_id']);
+                                $details = $this->doc->getLogicalStructure($metadata['_id']);
 
-								$value = $this->pi_linkTP($value, array ($this->prefixId => array ('id' => $this->doc->uid, 'page' => (!empty($details['points']) ? intval($details['points']) : 1))), TRUE, $this->conf['targetPid']);
+                                $value = $this->pi_linkTP($value, array ($this->prefixId => array ('id' => $this->doc->uid, 'page' => (!empty($details['points']) ? intval($details['points']) : 1))), TRUE, $this->conf['targetPid']);
 
-							}
+                            }
 
-						}
+                        }
 
-					} elseif ($index_name == 'owner' && !empty($value)) {
+                    } elseif ($index_name == 'owner' && !empty($value)) {
 
-						// Translate name of holding library.
-						$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
+                        // Translate name of holding library.
+                        $value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
 
-					} elseif ($index_name == 'type' && !empty($value)) {
+                    } elseif ($index_name == 'type' && !empty($value)) {
 
-						// Translate document type.
-						$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
+                        // Translate document type.
+                        $value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
 
-					} elseif ($index_name == 'collection' && !empty($value)) {
+                    } elseif ($index_name == 'collection' && !empty($value)) {
 
-						// Check if collections isn't hidden.
-						if (in_array($value, $collList)) {
+                        // Check if collections isn't hidden.
+                        if (in_array($value, $collList)) {
 
-							// Translate collection.
-							$value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_collections', $this->conf['pages']));
+                            // Translate collection.
+                            $value = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_collections', $this->conf['pages']));
 
-						} else {
+                        } else {
 
-							$value = '';
+                            $value = '';
 
-						}
+                        }
 
-					} elseif ($index_name == 'language' && !empty($value)) {
+                    } elseif ($index_name == 'language' && !empty($value)) {
 
-						// Translate ISO 639 language code.
-						$value = htmlspecialchars(tx_dlf_helper::getLanguageName($value));
+                        // Translate ISO 639 language code.
+                        $value = htmlspecialchars(tx_dlf_helper::getLanguageName($value));
 
-					} elseif (!empty($value)) {
+                    } elseif (!empty($value)) {
 
-						// Sanitize value for output.
-						$value = htmlspecialchars($value);
+                        // Sanitize value for output.
+                        $value = htmlspecialchars($value);
 
-					}
+                    }
 
-					// Hook for getting a customized value (requested by SBB).
-					foreach ($this->hookObjects as $hookObj) {
+                    // Hook for getting a customized value (requested by SBB).
+                    foreach ($this->hookObjects as $hookObj) {
 
-						if (method_exists($hookObj, 'printMetadata_customizeMetadata')) {
+                        if (method_exists($hookObj, 'printMetadata_customizeMetadata')) {
 
-							$hookObj->printMetadata_customizeMetadata($value);
+                            $hookObj->printMetadata_customizeMetadata($value);
 
-						}
+                        }
 
-					}
+                    }
 
-					$value = $this->cObj->stdWrap($value, $fieldwrap['value.']);
+                    $value = $this->cObj->stdWrap($value, $fieldwrap['value.']);
 
-					if (!empty($value)) {
+                    if (!empty($value)) {
 
-						$parsedValue .= $value;
+                        $parsedValue .= $value;
 
-					}
+                    }
 
-				} while (count($metadata[$index_name]));
+                } while (count($metadata[$index_name]));
 
-				if (!empty($parsedValue)) {
+                if (!empty($parsedValue)) {
 
-					$field = $this->cObj->stdWrap(htmlspecialchars($metaConf['label']), $fieldwrap['key.']);
+                    $field = $this->cObj->stdWrap(htmlspecialchars($metaConf['label']), $fieldwrap['key.']);
 
-					$field .= $parsedValue;
+                    $field .= $parsedValue;
 
-					$markerArray['###METADATA###'] .= $this->cObj->stdWrap($field, $fieldwrap['all.']);
+                    $markerArray['###METADATA###'] .= $this->cObj->stdWrap($field, $fieldwrap['all.']);
 
-				}
+                }
 
-			}
+            }
 
-			$output .= $this->cObj->substituteMarkerArray($subpart['block'], $markerArray);
+            $output .= $this->cObj->substituteMarkerArray($subpart['block'], $markerArray);
 
-		}
+        }
 
-		return $this->cObj->substituteSubpart($this->template, '###BLOCK###', $output, TRUE);
+        return $this->cObj->substituteSubpart($this->template, '###BLOCK###', $output, TRUE);
 
-	}
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
 		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 			'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.wrap AS wrap',
 			'tx_dlf_metadata',
-			'tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata').' AND (sys_language_uid IN (-1,0) OR (sys_language_uid = ' .$GLOBALS['TSFE']->sys_language_uid. ' AND l18n_parent = 0))',
+			'tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata').' AND (sys_language_uid IN (-1,0) OR (sys_language_uid = '.$GLOBALS['TSFE']->sys_language_uid.' AND l18n_parent = 0))',
 			'',
 			'tx_dlf_metadata.sorting',
 			''

dlf/plugins/toc/class.tx_dlf_toc.php

Spacing +2 added lines, -2 removed lines

@@ -222,9 +222,9 @@
 
 			// 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 {
 

Indentation +178 added lines, -178 removed lines

@@ -19,53 +19,53 @@ 
  */
 class tx_dlf_toc extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/toc/class.tx_dlf_toc.php';
+    public $scriptRelPath = 'plugins/toc/class.tx_dlf_toc.php';
 
-	/**
-	 * This holds the active entries according to the currently selected page
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $activeEntries = array ();
+    /**
+     * This holds the active entries according to the currently selected page
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $activeEntries = array ();
 
-	/**
-	 * This builds an array for one menu entry
-	 *
-	 * @access	protected
-	 *
-	 * @param	array		$entry: The entry's array from tx_dlf_document->getLogicalStructure
-	 * @param	boolean		$recursive: Whether to include the child entries
-	 *
-	 * @return	array		HMENU array for menu entry
-	 */
-	protected function getMenuEntry(array $entry, $recursive = FALSE) {
+    /**
+     * This builds an array for one menu entry
+     *
+     * @access	protected
+     *
+     * @param	array		$entry: The entry's array from tx_dlf_document->getLogicalStructure
+     * @param	boolean		$recursive: Whether to include the child entries
+     *
+     * @return	array		HMENU array for menu entry
+     */
+    protected function getMenuEntry(array $entry, $recursive = FALSE) {
 
-		$entryArray = array ();
+        $entryArray = array ();
 
-		// Set "title", "volume", "type" and "pagination" from $entry array.
-		$entryArray['title'] = $entry['label'];
+        // Set "title", "volume", "type" and "pagination" from $entry array.
+        $entryArray['title'] = $entry['label'];
 
-		$entryArray['volume'] = $entry['volume'];
+        $entryArray['volume'] = $entry['volume'];
 
-		$entryArray['orderlabel'] = $entry['orderlabel'];
+        $entryArray['orderlabel'] = $entry['orderlabel'];
 
-		$entryArray['type'] = tx_dlf_helper::translate($entry['type'], 'tx_dlf_structures', $this->conf['pages']);
+        $entryArray['type'] = tx_dlf_helper::translate($entry['type'], 'tx_dlf_structures', $this->conf['pages']);
 
-		$entryArray['pagination'] = $entry['pagination'];
+        $entryArray['pagination'] = $entry['pagination'];
 
-		$entryArray['_OVERRIDE_HREF'] = '';
+        $entryArray['_OVERRIDE_HREF'] = '';
 
-		$entryArray['doNotLinkIt'] = 1;
+        $entryArray['doNotLinkIt'] = 1;
 
-		$entryArray['ITEM_STATE'] = 'NO';
+        $entryArray['ITEM_STATE'] = 'NO';
 
-		// Build menu links based on the $entry['points'] array.
-		if (!empty($entry['points']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($entry['points'])) {
+        // 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;
+            $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
@@ -75,9 +75,9 @@ 
 
         } 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;
+            $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
@@ -87,9 +87,9 @@ 
 
         } 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;
+            $entryArray['doNotLinkIt'] = 0;
 
             if ($this->conf['basketButton']) {
 
@@ -99,230 +99,230 @@ 
 
         }
 
-		// Set "ITEM_STATE" to "CUR" if this entry points to current page.
-		if (in_array($entry['id'], $this->activeEntries)) {
+        // Set "ITEM_STATE" to "CUR" if this entry points to current page.
+        if (in_array($entry['id'], $this->activeEntries)) {
 
-			$entryArray['ITEM_STATE'] = 'CUR';
+            $entryArray['ITEM_STATE'] = 'CUR';
 
-		}
+        }
 
-		// Build sub-menu if available and called recursively.
-		if ($recursive == TRUE && !empty($entry['children'])) {
+        // Build sub-menu if available and called recursively.
+        if ($recursive == TRUE && !empty($entry['children'])) {
 
-			// Build sub-menu only if one of the following conditions apply:
-			// 1. "expAll" is set for menu
-			// 2. Current menu node is in rootline
-			// 3. Current menu node points to another file
-			// 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']])) {
+            // Build sub-menu only if one of the following conditions apply:
+            // 1. "expAll" is set for menu
+            // 2. Current menu node is in rootline
+            // 3. Current menu node points to another file
+            // 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) {
+                foreach ($entry['children'] as $child) {
 
-					// Set "ITEM_STATE" to "ACT" if this entry points to current page and has sub-entries pointing to the same page.
-					if (in_array($child['id'], $this->activeEntries)) {
+                    // Set "ITEM_STATE" to "ACT" if this entry points to current page and has sub-entries pointing to the same page.
+                    if (in_array($child['id'], $this->activeEntries)) {
 
-						$entryArray['ITEM_STATE'] = 'ACT';
+                        $entryArray['ITEM_STATE'] = 'ACT';
 
-					}
+                    }
 
-					$entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
+                    $entryArray['_SUB_MENU'][] = $this->getMenuEntry($child, TRUE);
 
-				}
+                }
 
-			}
+            }
 
-			// Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
-			$entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
+            // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries.
+            $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB');
 
-		}
+        }
 
-		return $entryArray;
+        return $entryArray;
 
-	}
+    }
 
-	/**
-	 * 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);
 
-		// Check for typoscript configuration to prevent fatal error.
-		if (empty($this->conf['menuConf.'])) {
+        // Check for typoscript configuration to prevent fatal error.
+        if (empty($this->conf['menuConf.'])) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toc->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toc->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
-			}
+            }
 
-			return $content;
+            return $content;
 
-		}
+        }
 
-		// 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/toc/template.tmpl'), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/toc/template.tmpl'), '###TEMPLATE###');
 
-		}
+        }
 
-		$TSconfig = array ();
+        $TSconfig = array ();
 
-		$TSconfig['special'] = 'userfunction';
+        $TSconfig['special'] = 'userfunction';
 
-		$TSconfig['special.']['userFunc'] = 'tx_dlf_toc->makeMenuArray';
+        $TSconfig['special.']['userFunc'] = 'tx_dlf_toc->makeMenuArray';
 
-		$TSconfig = tx_dlf_helper::array_merge_recursive_overrule($this->conf['menuConf.'], $TSconfig);
+        $TSconfig = tx_dlf_helper::array_merge_recursive_overrule($this->conf['menuConf.'], $TSconfig);
 
-		$markerArray['###TOCMENU###'] = $this->cObj->HMENU($TSconfig);
+        $markerArray['###TOCMENU###'] = $this->cObj->HMENU($TSconfig);
 
-		$content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
+        $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-		return $this->pi_wrapInBaseClass($content);
+        return $this->pi_wrapInBaseClass($content);
 
-	}
+    }
 
-	/**
-	 * This builds a menu array for HMENU
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$content: The PlugIn content
-	 * @param	array		$conf: The PlugIn configuration
-	 *
-	 * @return	array		HMENU array
-	 */
-	public function makeMenuArray($content, $conf) {
+    /**
+     * This builds a menu array for HMENU
+     *
+     * @access	public
+     *
+     * @param	string		$content: The PlugIn content
+     * @param	array		$conf: The PlugIn configuration
+     *
+     * @return	array		HMENU array
+     */
+    public function makeMenuArray($content, $conf) {
 
-		$this->init($conf);
+        $this->init($conf);
 
-		// Load current document.
-		$this->loadDocument();
+        // Load current document.
+        $this->loadDocument();
 
-		if ($this->doc === NULL) {
+        if ($this->doc === NULL) {
 
-			// Quit without doing anything if required variables are not set.
-			return array ();
+            // Quit without doing anything if required variables are not set.
+            return array ();
 
-		} else {
+        } else {
 
-			if (!empty($this->piVars['logicalPage'])) {
+            if (!empty($this->piVars['logicalPage'])) {
 
-				$this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
-				// The logical page parameter should not appear again
-				unset($this->piVars['logicalPage']);
+                $this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
+                // The logical page parameter should not appear again
+                unset($this->piVars['logicalPage']);
 
-				}
+                }
 
-			// 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'])) {
+            // 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'])) {
 
-				$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 {
+            } else {
 
-				$this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
+                $this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
 
-			}
+            }
 
-			$this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
+            $this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
 
-		}
+        }
 
-		$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)) {
+        // 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)) {
 
-			// Get all logical units the current page or track is a part of.
-			if (!empty($this->piVars['page']) && $this->doc->physicalStructure) {
+            // Get all logical units the current page or track is a part of.
+            if (!empty($this->piVars['page']) && $this->doc->physicalStructure) {
 
-				$this->activeEntries = array_merge((array) $this->doc->smLinks['p2l'][$this->doc->physicalStructure[0]], (array) $this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page']]]);
+                $this->activeEntries = array_merge((array) $this->doc->smLinks['p2l'][$this->doc->physicalStructure[0]], (array) $this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page']]]);
 
-				if (!empty($this->piVars['double']) && $this->piVars['page'] < $this->doc->numPages) {
+                if (!empty($this->piVars['double']) && $this->piVars['page'] < $this->doc->numPages) {
 
-					$this->activeEntries = array_merge($this->activeEntries, (array) $this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page'] + 1]]);
+                    $this->activeEntries = array_merge($this->activeEntries, (array) $this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page'] + 1]]);
 
-				}
+                }
 
-			}
+            }
 
-			// Go through table of contents and create all menu entries.
-			foreach ($this->doc->tableOfContents as $entry) {
+            // Go through table of contents and create all menu entries.
+            foreach ($this->doc->tableOfContents as $entry) {
 
-				$menuArray[] = $this->getMenuEntry($entry, TRUE);
+                $menuArray[] = $this->getMenuEntry($entry, TRUE);
 
-			}
+            }
 
-		} else {
+        } else {
 
-			// Go through table of contents and create top-level menu entries.
-			foreach ($this->doc->tableOfContents as $entry) {
+            // Go through table of contents and create top-level menu entries.
+            foreach ($this->doc->tableOfContents as $entry) {
 
-				$menuArray[] = $this->getMenuEntry($entry, FALSE);
+                $menuArray[] = $this->getMenuEntry($entry, FALSE);
 
-			}
+            }
 
-			// Get all child documents from database.
-			$whereClause = 'tx_dlf_documents.partof='.intval($this->doc->uid).' AND tx_dlf_documents.structure=tx_dlf_structures.uid AND tx_dlf_structures.pid='.$this->doc->pid.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_structures');
+            // Get all child documents from database.
+            $whereClause = 'tx_dlf_documents.partof='.intval($this->doc->uid).' AND tx_dlf_documents.structure=tx_dlf_structures.uid AND tx_dlf_structures.pid='.$this->doc->pid.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_structures');
 
-			if ($this->conf['excludeOther']) {
+            if ($this->conf['excludeOther']) {
 
-				$whereClause .= ' AND tx_dlf_documents.pid='.intval($this->conf['pages']);
+                $whereClause .= ' AND tx_dlf_documents.pid='.intval($this->conf['pages']);
 
-			}
+            }
 
-			// Build table of contents from database.
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'tx_dlf_documents.uid AS uid,tx_dlf_documents.title AS title,tx_dlf_documents.volume AS volume,tx_dlf_structures.index_name AS type',
-				'tx_dlf_documents,tx_dlf_structures',
-				$whereClause,
-				'',
-				'tx_dlf_documents.volume_sorting',
-				''
-			);
+            // Build table of contents from database.
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'tx_dlf_documents.uid AS uid,tx_dlf_documents.title AS title,tx_dlf_documents.volume AS volume,tx_dlf_structures.index_name AS type',
+                'tx_dlf_documents,tx_dlf_structures',
+                $whereClause,
+                '',
+                'tx_dlf_documents.volume_sorting',
+                ''
+            );
 
-			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-				$menuArray[0]['ITEM_STATE'] = 'CURIFSUB';
+                $menuArray[0]['ITEM_STATE'] = 'CURIFSUB';
 
-				$menuArray[0]['_SUB_MENU'] = array ();
+                $menuArray[0]['_SUB_MENU'] = array ();
 
-				while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+                while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-					$entry = array (
-						'label' => $resArray['title'],
-						'type' => $resArray['type'],
-						'volume' => $resArray['volume'],
-						'pagination' => '',
-						'targetUid' => $resArray['uid']
-					);
+                    $entry = array (
+                        'label' => $resArray['title'],
+                        'type' => $resArray['type'],
+                        'volume' => $resArray['volume'],
+                        'pagination' => '',
+                        'targetUid' => $resArray['uid']
+                    );
 
-					$menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
+                    $menuArray[0]['_SUB_MENU'][] = $this->getMenuEntry($entry, FALSE);
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		return $menuArray;
+        return $menuArray;
 
-	}
+    }
 
 }

dlf/plugins/collection/class.tx_dlf_collection.php

Indentation +261 added lines, -261 removed lines

@@ -19,414 +19,414 @@
  */
 class tx_dlf_collection extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/collection/class.tx_dlf_collection.php';
+    public $scriptRelPath = 'plugins/collection/class.tx_dlf_collection.php';
 
-	/**
-	 * This holds the hook objects
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $hookObjects = array ();
+    /**
+     * This holds the hook objects
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $hookObjects = array ();
 
-	/**
-	 * 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);
 
-		// Turn cache on.
-		$this->setCache(TRUE);
+        // Turn cache on.
+        $this->setCache(TRUE);
 
-		// Quit without doing anything if required configuration variables are not set.
-		if (empty($this->conf['pages'])) {
+        // Quit without doing anything if required configuration variables are not set.
+        if (empty($this->conf['pages'])) {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
-			}
+            }
 
-			return $content;
+            return $content;
 
-		}
+        }
 
-		// 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/collection/template.tmpl'), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/collection/template.tmpl'), '###TEMPLATE###');
 
-		}
+        }
 
-		// Get hook objects.
-		$this->hookObjects = tx_dlf_helper::getHookObjects($this->scriptRelPath);
+        // Get hook objects.
+        $this->hookObjects = tx_dlf_helper::getHookObjects($this->scriptRelPath);
 
-		if (!empty($this->piVars['collection'])) {
+        if (!empty($this->piVars['collection'])) {
 
-			$this->showSingleCollection(intval($this->piVars['collection']));
+            $this->showSingleCollection(intval($this->piVars['collection']));
 
-		} else {
+        } else {
 
-			$content .= $this->showCollectionList();
+            $content .= $this->showCollectionList();
 
-		}
+        }
 
-		return $this->pi_wrapInBaseClass($content);
+        return $this->pi_wrapInBaseClass($content);
 
-	}
+    }
 
-	/**
-	 * Builds a collection list
-	 *
-	 * @access	protected
-	 *
-	 * @return	string		The list of collections ready to output
-	 */
-	protected function showCollectionList() {
+    /**
+     * Builds a collection list
+     *
+     * @access	protected
+     *
+     * @return	string		The list of collections ready to output
+     */
+    protected function showCollectionList() {
 
-		$additionalWhere = '';
+        $additionalWhere = '';
 
-		$orderBy = 'tx_dlf_collections.label';
+        $orderBy = 'tx_dlf_collections.label';
 
-		// Handle collections set by configuration.
-		if ($this->conf['collections']) {
+        // Handle collections set by configuration.
+        if ($this->conf['collections']) {
 
-			if (count(explode(',', $this->conf['collections'])) == 1 && empty($this->conf['dont_show_single'])) {
+            if (count(explode(',', $this->conf['collections'])) == 1 && empty($this->conf['dont_show_single'])) {
 
-				$this->showSingleCollection(intval(trim($this->conf['collections'], ' ,')));
+                $this->showSingleCollection(intval(trim($this->conf['collections'], ' ,')));
 
-			}
+            }
 
-			$additionalWhere .= ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
+            $additionalWhere .= ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
 
-			$orderBy = 'FIELD(tx_dlf_collections.uid, '.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
+            $orderBy = 'FIELD(tx_dlf_collections.uid, '.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
 
-		}
+        }
 
-		// Should user-defined collections be shown?
-		if (empty($this->conf['show_userdefined'])) {
+        // Should user-defined collections be shown?
+        if (empty($this->conf['show_userdefined'])) {
 
-			$additionalWhere .= ' AND tx_dlf_collections.fe_cruser_id=0';
+            $additionalWhere .= ' AND tx_dlf_collections.fe_cruser_id=0';
 
-		} elseif ($this->conf['show_userdefined'] > 0) {
+        } elseif ($this->conf['show_userdefined'] > 0) {
 
-			if (!empty($GLOBALS['TSFE']->fe_user->user['uid'])) {
+            if (!empty($GLOBALS['TSFE']->fe_user->user['uid'])) {
 
-				$additionalWhere .= ' AND tx_dlf_collections.fe_cruser_id='.intval($GLOBALS['TSFE']->fe_user->user['uid']);
+                $additionalWhere .= ' AND tx_dlf_collections.fe_cruser_id='.intval($GLOBALS['TSFE']->fe_user->user['uid']);
 
-			} else {
+            } else {
 
-				$additionalWhere .= ' AND NOT tx_dlf_collections.fe_cruser_id=0';
+                $additionalWhere .= ' AND NOT tx_dlf_collections.fe_cruser_id=0';
 
-			}
+            }
 
-		}
+        }
 
-		// Get collections.
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-			'tx_dlf_collections.uid AS uid,tx_dlf_collections.label AS label,tx_dlf_collections.thumbnail AS thumbnail,tx_dlf_collections.description AS description,tx_dlf_collections.priority AS priority,COUNT(tx_dlf_documents.uid) AS titles',
-			'tx_dlf_documents',
-			'tx_dlf_relations',
-			'tx_dlf_collections',
-			'AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0 AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-			'tx_dlf_collections.uid',
-			$orderBy,
-			''
-		);
+        // Get collections.
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+            'tx_dlf_collections.uid AS uid,tx_dlf_collections.label AS label,tx_dlf_collections.thumbnail AS thumbnail,tx_dlf_collections.description AS description,tx_dlf_collections.priority AS priority,COUNT(tx_dlf_documents.uid) AS titles',
+            'tx_dlf_documents',
+            'tx_dlf_relations',
+            'tx_dlf_collections',
+            'AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0 AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+            'tx_dlf_collections.uid',
+            $orderBy,
+            ''
+        );
 
-		$count = $GLOBALS['TYPO3_DB']->sql_num_rows($result);
+        $count = $GLOBALS['TYPO3_DB']->sql_num_rows($result);
 
-		$content = '';
+        $content = '';
 
-		if ($count == 1 && empty($this->conf['dont_show_single'])) {
+        if ($count == 1 && empty($this->conf['dont_show_single'])) {
 
-			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+            $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-			$this->showSingleCollection(intval($resArray['uid']));
+            $this->showSingleCollection(intval($resArray['uid']));
 
-		} elseif ($count > 0) {
+        } elseif ($count > 0) {
 
-			// Get number of volumes per collection.
-			$resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-				'tx_dlf_collections.uid AS uid,COUNT(tx_dlf_documents.uid) AS volumes',
-				'tx_dlf_documents',
-				'tx_dlf_relations',
-				'tx_dlf_collections',
-				'AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.tx_dlf_helper::whereClause('tx_dlf_documents').') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-				'tx_dlf_collections.uid',
-				'',
-				''
-			);
+            // Get number of volumes per collection.
+            $resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+                'tx_dlf_collections.uid AS uid,COUNT(tx_dlf_documents.uid) AS volumes',
+                'tx_dlf_documents',
+                'tx_dlf_relations',
+                'tx_dlf_collections',
+                'AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.tx_dlf_helper::whereClause('tx_dlf_documents').') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                'tx_dlf_collections.uid',
+                '',
+                ''
+            );
 
-			$volumes = array ();
+            $volumes = array ();
 
-			while ($resArrayVolumes = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultVolumes)) {
+            while ($resArrayVolumes = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultVolumes)) {
 
-				$volumes[$resArrayVolumes['uid']] = $resArrayVolumes['volumes'];
+                $volumes[$resArrayVolumes['uid']] = $resArrayVolumes['volumes'];
 
-			}
+            }
 
-			// Process results.
-			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+            // Process results.
+            while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-				// Generate random but unique array key taking priority into account.
-				do {
+                // Generate random but unique array key taking priority into account.
+                do {
 
-					$_key = ($resArray['priority'] * 1000) + mt_rand(0, 1000);
+                    $_key = ($resArray['priority'] * 1000) + mt_rand(0, 1000);
 
-				} while (!empty($markerArray[$_key]));
+                } while (!empty($markerArray[$_key]));
 
-				// Merge plugin variables with new set of values.
-				$additionalParams = array ('collection' => $resArray['uid']);
+                // Merge plugin variables with new set of values.
+                $additionalParams = array ('collection' => $resArray['uid']);
 
-				if (is_array($this->piVars)) {
+                if (is_array($this->piVars)) {
 
-					$piVars = $this->piVars;
+                    $piVars = $this->piVars;
 
-					unset($piVars['DATA']);
+                    unset($piVars['DATA']);
 
-					$additionalParams = tx_dlf_helper::array_merge_recursive_overrule($piVars, $additionalParams);
+                    $additionalParams = tx_dlf_helper::array_merge_recursive_overrule($piVars, $additionalParams);
 
-				}
+                }
 
-				// Build typolink configuration array.
-				$conf = array (
-					'useCacheHash' => 1,
-					'parameter' => $GLOBALS['TSFE']->id,
-					'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
-				);
+                // Build typolink configuration array.
+                $conf = array (
+                    'useCacheHash' => 1,
+                    'parameter' => $GLOBALS['TSFE']->id,
+                    'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
+                );
 
-				// Link collection's title to list view.
-				$markerArray[$_key]['###TITLE###'] = $this->cObj->typoLink(htmlspecialchars($resArray['label']), $conf);
+                // Link collection's title to list view.
+                $markerArray[$_key]['###TITLE###'] = $this->cObj->typoLink(htmlspecialchars($resArray['label']), $conf);
 
-				// Add feed link if applicable.
-				if (!empty($this->conf['targetFeed'])) {
+                // Add feed link if applicable.
+                if (!empty($this->conf['targetFeed'])) {
 
-					$img = '<img src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', TRUE).'" title="'.$this->pi_getLL('feedTitle', '', TRUE).'" />';
+                    $img = '<img src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', TRUE).'" title="'.$this->pi_getLL('feedTitle', '', TRUE).'" />';
 
-					$markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array ($this->prefixId => array ('collection' => $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 {
+                } else {
 
-					$markerArray[$_key]['###FEED###'] = '';
+                    $markerArray[$_key]['###FEED###'] = '';
 
-				}
+                }
 
-				// Add thumbnail.
-				if (!empty($resArray['thumbnail'])) {
+                // Add thumbnail.
+                if (!empty($resArray['thumbnail'])) {
 
-					$markerArray[$_key]['###THUMBNAIL###'] = '<img alt="" title="'.htmlspecialchars($resArray['label']).'" src="'.$resArray['thumbnail'].'" />';
+                    $markerArray[$_key]['###THUMBNAIL###'] = '<img alt="" title="'.htmlspecialchars($resArray['label']).'" src="'.$resArray['thumbnail'].'" />';
 
-				} else {
+                } else {
 
-					$markerArray[$_key]['###THUMBNAIL###'] = '';
+                    $markerArray[$_key]['###THUMBNAIL###'] = '';
 
-				}
+                }
 
-				// Add description.
-				$markerArray[$_key]['###DESCRIPTION###'] = $this->pi_RTEcssText($resArray['description']);
+                // Add description.
+                $markerArray[$_key]['###DESCRIPTION###'] = $this->pi_RTEcssText($resArray['description']);
 
-				// Build statistic's output.
-				$labelTitles = $this->pi_getLL(($resArray['titles'] > 1 ? 'titles' : 'title'), '', FALSE);
+                // Build statistic's output.
+                $labelTitles = $this->pi_getLL(($resArray['titles'] > 1 ? 'titles' : 'title'), '', FALSE);
 
-				$markerArray[$_key]['###COUNT_TITLES###'] = htmlspecialchars($resArray['titles'].$labelTitles);
+                $markerArray[$_key]['###COUNT_TITLES###'] = htmlspecialchars($resArray['titles'].$labelTitles);
 
-				$labelVolumes = $this->pi_getLL(($volumes[$resArray['uid']] > 1 ? 'volumes' : 'volume'), '', FALSE);
+                $labelVolumes = $this->pi_getLL(($volumes[$resArray['uid']] > 1 ? 'volumes' : 'volume'), '', FALSE);
 
-				$markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars($volumes[$resArray['uid']].$labelVolumes);
+                $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars($volumes[$resArray['uid']].$labelVolumes);
 
-			}
+            }
 
-			// Randomize sorting?
-			if (!empty($this->conf['randomize'])) {
+            // Randomize sorting?
+            if (!empty($this->conf['randomize'])) {
 
-				ksort($markerArray, SORT_NUMERIC);
+                ksort($markerArray, SORT_NUMERIC);
 
-				// Don't cache the output.
-				$this->setCache(FALSE);
+                // Don't cache the output.
+                $this->setCache(FALSE);
 
-			}
+            }
 
-			$entry = $this->cObj->getSubpart($this->template, '###ENTRY###');
+            $entry = $this->cObj->getSubpart($this->template, '###ENTRY###');
 
-			foreach ($markerArray as $marker) {
+            foreach ($markerArray as $marker) {
 
-				$content .= $this->cObj->substituteMarkerArray($entry, $marker);
+                $content .= $this->cObj->substituteMarkerArray($entry, $marker);
 
-			}
+            }
 
-			// Hook for getting custom collection hierarchies/subentries (requested by SBB).
-			foreach ($this->hookObjects as $hookObj) {
+            // Hook for getting custom collection hierarchies/subentries (requested by SBB).
+            foreach ($this->hookObjects as $hookObj) {
 
-				if (method_exists($hookObj, 'showCollectionList_getCustomCollectionList')) {
+                if (method_exists($hookObj, 'showCollectionList_getCustomCollectionList')) {
 
-					$hookObj->showCollectionList_getCustomCollectionList($this, $this->conf['templateFile'], $content, $markerArray);
+                    $hookObj->showCollectionList_getCustomCollectionList($this, $this->conf['templateFile'], $content, $markerArray);
 
-				}
+                }
 
-			}
+            }
 
-			return $this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, TRUE);
+            return $this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, TRUE);
 
-		}
+        }
 
-		return $content;
+        return $content;
 
-	}
+    }
 
-	/**
-	 * Builds a collection's list
-	 *
-	 * @access	protected
-	 *
-	 * @param	integer		$id: The collection's UID
-	 *
-	 * @return	void
-	 */
-	protected function showSingleCollection($id) {
+    /**
+     * Builds a collection's list
+     *
+     * @access	protected
+     *
+     * @param	integer		$id: The collection's UID
+     *
+     * @return	void
+     */
+    protected function showSingleCollection($id) {
 
-		// Should user-defined collections be shown?
-		if (empty($this->conf['show_userdefined'])) {
+        // Should user-defined collections be shown?
+        if (empty($this->conf['show_userdefined'])) {
 
-			$additionalWhere = ' AND tx_dlf_collections.fe_cruser_id=0';
+            $additionalWhere = ' AND tx_dlf_collections.fe_cruser_id=0';
 
-		} elseif ($this->conf['show_userdefined'] > 0) {
+        } elseif ($this->conf['show_userdefined'] > 0) {
 
-			$additionalWhere = ' AND NOT tx_dlf_collections.fe_cruser_id=0';
+            $additionalWhere = ' AND NOT tx_dlf_collections.fe_cruser_id=0';
 
-		}
+        }
 
-		// Get all documents in collection.
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-			'tx_dlf_collections.index_name AS index_name,tx_dlf_collections.label AS collLabel,tx_dlf_collections.description AS collDesc,tx_dlf_collections.thumbnail AS collThumb,tx_dlf_collections.fe_cruser_id AS userid,tx_dlf_documents.uid AS uid,tx_dlf_documents.metadata_sorting AS metadata_sorting,tx_dlf_documents.volume_sorting AS volume_sorting,tx_dlf_documents.partof AS partof',
-			'tx_dlf_documents',
-			'tx_dlf_relations',
-			'tx_dlf_collections',
-			'AND tx_dlf_collections.uid='.intval($id).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-			'',
-			'tx_dlf_documents.title_sorting ASC',
-			''
-		);
+        // Get all documents in collection.
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+            'tx_dlf_collections.index_name AS index_name,tx_dlf_collections.label AS collLabel,tx_dlf_collections.description AS collDesc,tx_dlf_collections.thumbnail AS collThumb,tx_dlf_collections.fe_cruser_id AS userid,tx_dlf_documents.uid AS uid,tx_dlf_documents.metadata_sorting AS metadata_sorting,tx_dlf_documents.volume_sorting AS volume_sorting,tx_dlf_documents.partof AS partof',
+            'tx_dlf_documents',
+            'tx_dlf_relations',
+            'tx_dlf_collections',
+            'AND tx_dlf_collections.uid='.intval($id).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+            '',
+            'tx_dlf_documents.title_sorting ASC',
+            ''
+        );
 
-		$toplevel = array ();
+        $toplevel = array ();
 
-		$subparts = array ();
+        $subparts = array ();
 
-		$listMetadata = array ();
+        $listMetadata = array ();
 
-		// Process results.
-		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+        // Process results.
+        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-			if (empty($listMetadata)) {
+            if (empty($listMetadata)) {
 
-				$listMetadata = array (
-					'label' => htmlspecialchars($resArray['collLabel']),
-					'description' => $this->pi_RTEcssText($resArray['collDesc']),
-					'thumbnail' => htmlspecialchars($resArray['collThumb']),
-					'options' => array (
-						'source' => 'collection',
-						'select' => $id,
-						'userid' => $resArray['userid'],
-						'params' => array ('fq' => array ('collection_faceting:("'.$resArray['index_name'].'")')),
-						'core' => '',
-						'pid' => $this->conf['pages'],
-						'order' => 'title',
-						'order.asc' => TRUE
-					)
-				);
+                $listMetadata = array (
+                    'label' => htmlspecialchars($resArray['collLabel']),
+                    'description' => $this->pi_RTEcssText($resArray['collDesc']),
+                    'thumbnail' => htmlspecialchars($resArray['collThumb']),
+                    'options' => array (
+                        'source' => 'collection',
+                        'select' => $id,
+                        'userid' => $resArray['userid'],
+                        'params' => array ('fq' => array ('collection_faceting:("'.$resArray['index_name'].'")')),
+                        'core' => '',
+                        'pid' => $this->conf['pages'],
+                        'order' => 'title',
+                        'order.asc' => TRUE
+                    )
+                );
 
-			}
+            }
 
-			// Split toplevel documents from volumes.
-			if ($resArray['partof'] == 0) {
+            // Split toplevel documents from volumes.
+            if ($resArray['partof'] == 0) {
 
-				// Prepare document's metadata for sorting.
-				$sorting = unserialize($resArray['metadata_sorting']);
+                // Prepare document's metadata for sorting.
+                $sorting = unserialize($resArray['metadata_sorting']);
 
-				if (!empty($sorting['type']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['type'])) {
+                if (!empty($sorting['type']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['type'])) {
 
-					$sorting['type'] = tx_dlf_helper::getIndexName($sorting['type'], 'tx_dlf_structures', $this->conf['pages']);
+                    $sorting['type'] = tx_dlf_helper::getIndexName($sorting['type'], 'tx_dlf_structures', $this->conf['pages']);
 
-				}
+                }
 
-				if (!empty($sorting['owner']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['owner'])) {
+                if (!empty($sorting['owner']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['owner'])) {
 
-					$sorting['owner'] = tx_dlf_helper::getIndexName($sorting['owner'], 'tx_dlf_libraries', $this->conf['pages']);
+                    $sorting['owner'] = tx_dlf_helper::getIndexName($sorting['owner'], 'tx_dlf_libraries', $this->conf['pages']);
 
-				}
+                }
 
-				if (!empty($sorting['collection']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['collection'])) {
+                if (!empty($sorting['collection']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($sorting['collection'])) {
 
-					$sorting['collection'] = tx_dlf_helper::getIndexName($sorting['collection'], 'tx_dlf_collections', $this->conf['pages']);
+                    $sorting['collection'] = tx_dlf_helper::getIndexName($sorting['collection'], 'tx_dlf_collections', $this->conf['pages']);
 
-				}
+                }
 
-				$toplevel[$resArray['uid']] = array (
-					'u' => $resArray['uid'],
-					'h' => '',
-					's' => $sorting,
-					'p' => array ()
-				);
+                $toplevel[$resArray['uid']] = array (
+                    'u' => $resArray['uid'],
+                    'h' => '',
+                    's' => $sorting,
+                    'p' => array ()
+                );
 
-			} else {
+            } else {
 
-				$subparts[$resArray['partof']][$resArray['volume_sorting']] = $resArray['uid'];
+                $subparts[$resArray['partof']][$resArray['volume_sorting']] = $resArray['uid'];
 
-			}
+            }
 
-		}
+        }
 
-		// Add volumes to the corresponding toplevel documents.
-		foreach ($subparts as $partof => $parts) {
+        // Add volumes to the corresponding toplevel documents.
+        foreach ($subparts as $partof => $parts) {
 
-			if (!empty($toplevel[$partof])) {
+            if (!empty($toplevel[$partof])) {
 
-				ksort($parts);
+                ksort($parts);
 
-				foreach ($parts as $part) {
+                foreach ($parts as $part) {
 
-					$toplevel[$partof]['p'][] = array ('u' => $part);
+                    $toplevel[$partof]['p'][] = array ('u' => $part);
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// Save list of documents.
-		$list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+        // Save list of documents.
+        $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-		$list->reset();
+        $list->reset();
 
-		$list->add(array_values($toplevel));
+        $list->add(array_values($toplevel));
 
-		$list->metadata = $listMetadata;
+        $list->metadata = $listMetadata;
 
-		$list->save();
+        $list->save();
 
-		// Clean output buffer.
-		\TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
+        // Clean output buffer.
+        \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']))));
+        // Send headers.
+        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();
+        // Flush output buffer and end script processing.
+        ob_end_flush();
 
-		exit;
+        exit;
 
-	}
+    }
 
 }

dlf/plugins/navigation/class.tx_dlf_navigation.php

Spacing +4 added lines, -4 removed lines

@@ -131,9 +131,9 @@ 
 
 				// 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 {
 
@@ -271,11 +271,11 @@ 
 		$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);
 

Indentation +195 added lines, -195 removed lines

@@ -19,315 +19,315 @@
  */
 class tx_dlf_navigation extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/navigation/class.tx_dlf_navigation.php';
+    public $scriptRelPath = 'plugins/navigation/class.tx_dlf_navigation.php';
 
-	/**
-	 * Display a link to the list view
-	 *
-	 * @access	protected
-	 *
-	 * @return	string		Link to the list view ready to output
-	 */
-	protected function getLinkToListview() {
+    /**
+     * Display a link to the list view
+     *
+     * @access	protected
+     *
+     * @return	string		Link to the list view ready to output
+     */
+    protected function getLinkToListview() {
 
-		if (!empty($this->conf['targetPid'])) {
+        if (!empty($this->conf['targetPid'])) {
 
-			// Load the list.
-			$list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+            // Load the list.
+            $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-			if (count($list) > 0) {
+            if (count($list) > 0) {
 
-				// Build typolink configuration array.
-				$conf = array (
-					'useCacheHash' => 1,
-					'parameter' => $this->conf['targetPid'],
-					'title' => $this->pi_getLL('linkToList', '', TRUE)
-				);
+                // Build typolink configuration array.
+                $conf = array (
+                    'useCacheHash' => 1,
+                    'parameter' => $this->conf['targetPid'],
+                    'title' => $this->pi_getLL('linkToList', '', TRUE)
+                );
 
-				return $this->cObj->typoLink($this->pi_getLL('linkToList', '', TRUE), $conf);
+                return $this->cObj->typoLink($this->pi_getLL('linkToList', '', TRUE), $conf);
 
-			}
+            }
 
-		}
+        }
 
-		return '';
+        return '';
 
-	}
+    }
 
-	/**
-	 * Display the page selector for the page view
-	 *
-	 * @access	protected
-	 *
-	 * @return	string		Page selector ready to output
-	 */
-	protected function getPageSelector() {
+    /**
+     * Display the page selector for the page view
+     *
+     * @access	protected
+     *
+     * @return	string		Page selector ready to output
+     */
+    protected function getPageSelector() {
 
-		// Configure @action URL for form.
-		$linkConf = array (
-			'parameter' => $GLOBALS['TSFE']->id,
-			'forceAbsoluteUrl' => 1
-		);
+        // Configure @action URL for form.
+        $linkConf = array (
+            'parameter' => $GLOBALS['TSFE']->id,
+            'forceAbsoluteUrl' => 1
+        );
 
-		$output = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
+        $output = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
 
-		// Add plugin variables.
-		foreach ($this->piVars as $piVar => $value) {
+        // Add plugin variables.
+        foreach ($this->piVars as $piVar => $value) {
 
-			if ($piVar != 'page' && $piVars != 'DATA' && !empty($value)) {
+            if ($piVar != 'page' && $piVars != 'DATA' && !empty($value)) {
 
-				$output .= '<input type="hidden" name="'.$this->prefixId.'['.$piVar.']" value="'.$value.'" />';
+                $output .= '<input type="hidden" name="'.$this->prefixId.'['.$piVar.']" value="'.$value.'" />';
 
-			}
+            }
 
-		}
+        }
 
-		// Add page selector.
-		$uniqId = uniqid(str_replace('_', '-', get_class($this)).'-');
+        // Add page selector.
+        $uniqId = uniqid(str_replace('_', '-', get_class($this)).'-');
 
-		$output .= '<label for="'.$uniqId.'">'.$this->pi_getLL('selectPage', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
+        $output .= '<label for="'.$uniqId.'">'.$this->pi_getLL('selectPage', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>';
 
-		for ($i = 1; $i <= $this->doc->numPages; $i++) {
+        for ($i = 1; $i <= $this->doc->numPages; $i++) {
 
-			$output .= '<option value="'.$i.'"'.($this->piVars['page'] == $i ? ' selected="selected"' : '').'>['.$i.']'.($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '').'</option>';
+            $output .= '<option value="'.$i.'"'.($this->piVars['page'] == $i ? ' selected="selected"' : '').'>['.$i.']'.($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '').'</option>';
 
-		}
+        }
 
-		$output .= '</select></div></form>';
+        $output .= '</select></div></form>';
 
-		return $output;
+        return $output;
 
-	}
+    }
 
-	/**
-	 * 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);
 
-		// Turn cache on.
-		$this->setCache(TRUE);
+        // Turn cache on.
+        $this->setCache(TRUE);
 
-		// Load current document.
-		$this->loadDocument();
+        // Load current document.
+        $this->loadDocument();
 
-		if ($this->doc === NULL) {
+        if ($this->doc === NULL) {
 
-			// Quit without doing anything if required variables are not set.
-			return $content;
+            // Quit without doing anything if required variables are not set.
+            return $content;
 
-		} else {
+        } else {
 
-			// Set default values if not set.
-			if ($this->doc->numPages > 0) {
+            // Set default values if not set.
+            if ($this->doc->numPages > 0) {
 
-				if (!empty($this->piVars['logicalPage'])) {
+                if (!empty($this->piVars['logicalPage'])) {
 
-					$this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
-					// The logical page parameter should not appear
-					unset($this->piVars['logicalPage']);
+                    $this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
+                    // The logical page parameter should not appear
+                    unset($this->piVars['logicalPage']);
 
-				}
+                }
 
-				// 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'])) {
+                // 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'])) {
 
-					$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 {
+                } else {
 
-					$this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
+                    $this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
 
-				}
+                }
 
-				$this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
+                $this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
 
-			} else {
+            } else {
 
-				$this->piVars['page'] = 0;
+                $this->piVars['page'] = 0;
 
-				$this->piVars['double'] = 0;
+                $this->piVars['double'] = 0;
 
-			}
+            }
 
-		}
+        }
 
-		// 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/navigation/template.tmpl'), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/navigation/template.tmpl'), '###TEMPLATE###');
 
-		}
+        }
 
-		// Steps for X pages backward / forward. Double page view uses double steps.
-		$pageSteps = $this->conf['pageStep'] * ($this->piVars['double'] + 1);
+        // Steps for X pages backward / forward. Double page view uses double steps.
+        $pageSteps = $this->conf['pageStep'] * ($this->piVars['double'] + 1);
 
-		// Link to first page.
-		if ($this->piVars['page'] > 1) {
+        // 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 {
+        } else {
 
-			$markerArray['###FIRST###'] = '<span>'.$this->pi_getLL('firstPage', '', TRUE).'</span>';
+            $markerArray['###FIRST###'] = '<span>'.$this->pi_getLL('firstPage', '', TRUE).'</span>';
 
-		}
+        }
 
-		// Link back X pages.
-		if ($this->piVars['page'] > $pageSteps) {
+        // 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 {
+        } else {
 
-			$markerArray['###BACK###'] = '<span>'.sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###BACK###'] = '<span>'.sprintf($this->pi_getLL('backXPages', '', TRUE), $pageSteps).'</span>';
 
-		}
+        }
 
-		// Link to previous page.
-		if ($this->piVars['page'] > (1 + $this->piVars['double'])) {
+        // 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 {
+        } else {
 
-			$markerArray['###PREVIOUS###'] = '<span>'.$this->pi_getLL('prevPage', '', TRUE).'</span>';
+            $markerArray['###PREVIOUS###'] = '<span>'.$this->pi_getLL('prevPage', '', TRUE).'</span>';
 
-		}
+        }
 
-		// Link to next page.
-		if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) {
+        // 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 {
+        } else {
 
-			$markerArray['###NEXT###'] = '<span>'.$this->pi_getLL('nextPage', '', TRUE).'</span>';
+            $markerArray['###NEXT###'] = '<span>'.$this->pi_getLL('nextPage', '', TRUE).'</span>';
 
-		}
+        }
 
-		// Link forward X pages.
-		if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) {
+        // 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 {
+        } else {
 
-			$markerArray['###FORWARD###'] = '<span>'.sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps).'</span>';
+            $markerArray['###FORWARD###'] = '<span>'.sprintf($this->pi_getLL('forwardXPages', '', TRUE), $pageSteps).'</span>';
 
-		}
+        }
 
-		// Link to last page.
-		if ($this->piVars['page'] < $this->doc->numPages) {
+        // 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 {
+        } else {
 
-			$markerArray['###LAST###'] = '<span>'.$this->pi_getLL('lastPage', '', TRUE).'</span>';
+            $markerArray['###LAST###'] = '<span>'.$this->pi_getLL('lastPage', '', TRUE).'</span>';
 
-		}
+        }
 
-		// Add double page switcher.
-		if ($this->doc->numPages > 0) {
+        // Add double page switcher.
+        if ($this->doc->numPages > 0) {
 
-			if (!$this->piVars['double']) {
+            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 {
+            } 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) {
+            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 {
+            } else {
 
-				$markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+                $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
 
-			}
+            }
 
-		} else {
+        } else {
 
-			$markerArray['###DOUBLEPAGE###'] = '<span>'.$this->pi_getLL('doublePageOn', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE###'] = '<span>'.$this->pi_getLL('doublePageOn', '', TRUE).'</span>';
 
-			$markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
+            $markerArray['###DOUBLEPAGE+1###'] = '<span>'.$this->pi_getLL('doublePage+1', '', TRUE).'</span>';
 
-		}
+        }
 
-		// Add page selector.
-		$markerArray['###PAGESELECT###'] = $this->getPageSelector();
+        // Add page selector.
+        $markerArray['###PAGESELECT###'] = $this->getPageSelector();
 
-		// Add link to listview if applicable.
-		$markerArray['###LINKLISTVIEW###'] = $this->getLinkToListview();
+        // Add link to listview if applicable.
+        $markerArray['###LINKLISTVIEW###'] = $this->getLinkToListview();
 
-		// fill some language labels if available
-		$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);
+        // fill some language labels if available
+        $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_RIGHT###'] = $this->pi_getLL('rotate-right', '', TRUE);
-		$markerArray['###ROTATE_RESET###'] = $this->pi_getLL('rotate-reset', '', 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);
 
- 		$content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
+            $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-		return $this->pi_wrapInBaseClass($content);
+        return $this->pi_wrapInBaseClass($content);
 
-	}
+    }
 
-	/**
-	 * Generates a navigation link
-	 *
-	 * @access	protected
-	 *
-	 * @param	string		$label: The link's text
-	 * @param	array		$overrulePIvars: The new set of plugin variables
-	 * @param	string		$aTagParams: Additional HTML attributes for link tag
-	 *
-	 * @return	string		Typolink ready to output
-	 */
-	protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '') {
+    /**
+     * Generates a navigation link
+     *
+     * @access	protected
+     *
+     * @param	string		$label: The link's text
+     * @param	array		$overrulePIvars: The new set of plugin variables
+     * @param	string		$aTagParams: Additional HTML attributes for link tag
+     *
+     * @return	string		Typolink ready to output
+     */
+    protected function makeLink($label, array $overrulePIvars = array (), $aTagParams = '') {
 
-		// Merge plugin variables with new set of values.
-		if (is_array($this->piVars)) {
+        // Merge plugin variables with new set of values.
+        if (is_array($this->piVars)) {
 
-			$piVars = $this->piVars;
+            $piVars = $this->piVars;
 
-			unset($piVars['DATA']);
+            unset($piVars['DATA']);
 
-			$overrulePIvars = tx_dlf_helper::array_merge_recursive_overrule($piVars, $overrulePIvars);
+            $overrulePIvars = tx_dlf_helper::array_merge_recursive_overrule($piVars, $overrulePIvars);
 
-		}
+        }
 
-		// Build typolink configuration array.
-		$conf = array (
-			'useCacheHash' => 1,
-			'parameter' => $GLOBALS['TSFE']->id,
-			'ATagParams' => $aTagParams,
-			'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', TRUE, FALSE),
-			'title' => $label
-		);
+        // Build typolink configuration array.
+        $conf = array (
+            'useCacheHash' => 1,
+            'parameter' => $GLOBALS['TSFE']->id,
+            'ATagParams' => $aTagParams,
+            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $overrulePIvars, '', TRUE, FALSE),
+            'title' => $label
+        );
 
-		return $this->cObj->typoLink($label, $conf);
+        return $this->cObj->typoLink($label, $conf);
 
-	}
+    }
 
 }

dlf/plugins/audioplayer/class.tx_dlf_audioplayer.php

Indentation +74 added lines, -74 removed lines

@@ -19,35 +19,35 @@ 
  */
 class tx_dlf_audioplayer extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/audioplayer/class.tx_dlf_audioplayer.php';
+    public $scriptRelPath = 'plugins/audioplayer/class.tx_dlf_audioplayer.php';
 
-	/**
-	 * Holds the current audio file's URL, MIME type and optional label
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $audio = array ();
+    /**
+     * Holds the current audio file's URL, MIME type and optional label
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $audio = array ();
 
-	/**
-	 * Adds Player javascript
-	 *
-	 * @access	protected
-	 *
-	 * @return	string		Player script tags ready for output
-	 */
-	protected function addPlayerJS() {
+    /**
+     * Adds Player javascript
+     *
+     * @access	protected
+     *
+     * @return	string		Player script tags ready for output
+     */
+    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">';
+        $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">';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/jquery.jplayer.min.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/jquery.jplayer.min.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/audioplayer/js/tx_dlf_audioplayer.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/audioplayer/js/tx_dlf_audioplayer.js"></script>';
 
-		// Add player configuration.
-		$output[] = '
+        // Add player configuration.
+        $output[] = '
 		<style>
 			#tx-dlf-audio { width: 100px; height: 100px };
 		</style>
@@ -65,87 +65,87 @@ 
 			});
 		</script>';
 
-		return implode("\n", $output);
+        return implode("\n", $output);
 
-	}
+    }
 
-	/**
-	 * 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);
 
-		// Load current document.
-		$this->loadDocument();
+        // Load current document.
+        $this->loadDocument();
 
-		if ($this->doc === NULL || $this->doc->numPages < 1) {
+        if ($this->doc === NULL || $this->doc->numPages < 1) {
 
-			// Quit without doing anything if required variables are not set.
-			return $content;
+            // Quit without doing anything if required variables are not set.
+            return $content;
 
-		} else {
+        } else {
 
-			// 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'])) {
+            // 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'])) {
 
-				$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 {
+            } else {
 
-				$this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
+                $this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
 
-			}
+            }
 
-			$this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
+            $this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
 
-		}
+        }
 
-		// Check if there are any audio files available.
-		if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpAudio']])) {
+        // Check if there are any audio files available.
+        if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpAudio']])) {
 
-			// Get audio data.
-			$this->audio['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpAudio']]);
+            // Get audio data.
+            $this->audio['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpAudio']]);
 
-			$this->audio['label'] = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['label'];
+            $this->audio['label'] = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['label'];
 
-			$this->audio['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpAudio']]);
+            $this->audio['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['files'][$this->conf['fileGrpAudio']]);
 
-		} else {
+        } else {
 
-			// Quit without doing anything if required variables are not set.
-			return $content;
+            // Quit without doing anything if required variables are not set.
+            return $content;
 
-		}
+        }
 
-		// 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/audioplayer/template.tmpl'), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/audioplayer/template.tmpl'), '###TEMPLATE###');
 
-		}
+        }
 
-		// Fill in the template markers.
-		$markerArray = array (
-			'###PLAYER_JS###' => $this->addPlayerJS()
-		);
+        // Fill in the template markers.
+        $markerArray = array (
+            '###PLAYER_JS###' => $this->addPlayerJS()
+        );
 
-		$content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
+        $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-		return $this->pi_wrapInBaseClass($content);
+        return $this->pi_wrapInBaseClass($content);
 
-	}
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -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"

dlf/plugins/pageview/class.tx_dlf_geturl_eid.php

Indentation +41 added lines, -41 removed lines

@@ -22,65 +22,65 @@
  */
 class tx_dlf_geturl_eid extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 
-	/**
-	 *
-	 */
-	public $cObj;
+    /**
+     *
+     */
+    public $cObj;
 
 
-	/**
-	 * The main method of the eID-Script
-	 *
-	 * @access	public
-	 *
-	 * @param	string		$content: The PlugIn content
-	 * @param	array		$conf: The PlugIn configuration
-	 *
-	 * @return	void
-	 */
-	public function main($content = '', $conf = array ()) {
+    /**
+     * The main method of the eID-Script
+     *
+     * @access	public
+     *
+     * @param	string		$content: The PlugIn content
+     * @param	array		$conf: The PlugIn configuration
+     *
+     * @return	void
+     */
+    public function main($content = '', $conf = array ()) {
 
-		$this->cObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
+        $this->cObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
 
-		$this->extKey = 'dlf';
+        $this->extKey = 'dlf';
 
-		$this->scriptRelPath = 'plugins/pageview/class.tx_dlf_geturl_eid.php';
+        $this->scriptRelPath = 'plugins/pageview/class.tx_dlf_geturl_eid.php';
 
-		$url = GeneralUtility::_GP('url');
+        $url = GeneralUtility::_GP('url');
     $includeHeader = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange(GeneralUtility::_GP('header'), 0, 2, 0);
 
-		// first we fetch header separately
-		$fetchedHeader = GeneralUtility::getUrl($url, 2);
+        // first we fetch header separately
+        $fetchedHeader = GeneralUtility::getUrl($url, 2);
 
-		if ($includeHeader == 0) {
+        if ($includeHeader == 0) {
 
-			$fetchedData = GeneralUtility::getUrl($url, $includeHeader);
+            $fetchedData = GeneralUtility::getUrl($url, $includeHeader);
 
-		} else {
+        } else {
 
-			$fetchedData = $fetchedHeader;
+            $fetchedData = $fetchedHeader;
 
-		}
+        }
 
-		// add some self calculated header tags
-		header('Last-Modified: ' . gmdate( "D, d M Y H:i:s" ) . 'GMT');
-		header('Cache-Control: max-age=3600, must-revalidate');
-		header('Content-Length: '.strlen($fetchedData));
-		$fi = finfo_open(FILEINFO_MIME);
-		header('Content-Type: ' . finfo_buffer($fi, $fetchedData));
+        // add some self calculated header tags
+        header('Last-Modified: ' . gmdate( "D, d M Y H:i:s" ) . 'GMT');
+        header('Cache-Control: max-age=3600, must-revalidate');
+        header('Content-Length: '.strlen($fetchedData));
+        $fi = finfo_open(FILEINFO_MIME);
+        header('Content-Type: ' . finfo_buffer($fi, $fetchedData));
 
-		// take some tags from request header and overwrite in case already set
-		$fetchedHeader = explode("\n", GeneralUtility::getUrl($url, 2));
+        // take some tags from request header and overwrite in case already set
+        $fetchedHeader = explode("\n", GeneralUtility::getUrl($url, 2));
 
-		foreach ($fetchedHeader as $headerline) {
-			if (stripos($headerline, 'Last-Modified:') !== FALSE) {
-				header($headerline);
-			}
-		}
+        foreach ($fetchedHeader as $headerline) {
+            if (stripos($headerline, 'Last-Modified:') !== FALSE) {
+                header($headerline);
+            }
+        }
 
-		echo $fetchedData;
+        echo $fetchedData;
 
-	}
+    }
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -63,11 +63,11 @@
 		}
 
 		// add some self calculated header tags
-		header('Last-Modified: ' . gmdate( "D, d M Y H:i:s" ) . 'GMT');
+		header('Last-Modified: '.gmdate("D, d M Y H:i:s").'GMT');
 		header('Cache-Control: max-age=3600, must-revalidate');
 		header('Content-Length: '.strlen($fetchedData));
 		$fi = finfo_open(FILEINFO_MIME);
-		header('Content-Type: ' . finfo_buffer($fi, $fetchedData));
+		header('Content-Type: '.finfo_buffer($fi, $fetchedData));
 
 		// take some tags from request header and overwrite in case already set
 		$fetchedHeader = explode("\n", GeneralUtility::getUrl($url, 2));

dlf/plugins/pageview/class.tx_dlf_pageview.php

Spacing +10 added lines, -10 removed lines

@@ -86,11 +86,11 @@ 
 			window.onload = function() {
 				if (dlfUtils.exists(dlfViewer)) {
 					tx_dlf_viewer = new dlfViewer({
-						controls: ["' . implode('", "', $this->controls) . '"],
-						div: "' . $this->conf['elementId'] . '",
-						images: ' . json_encode($this->images) . ',
-						fulltexts: '. json_encode($this->fulltexts) . ',
-						useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0) .'
+						controls: ["' . implode('", "', $this->controls).'"],
+						div: "' . $this->conf['elementId'].'",
+						images: ' . json_encode($this->images).',
+						fulltexts: '. json_encode($this->fulltexts).',
+						useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0).'
 					})
 				}
 			}
@@ -109,7 +109,7 @@ 
      */
     protected function addInteraction() {
 
-        $markerArray = array();
+        $markerArray = array ();
 
         if ($this->piVars['id']) {
 
@@ -157,14 +157,14 @@ 
      */
     protected function addBasketForm() {
 
-        $markerArray = array();
+        $markerArray = array ();
 
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
 
             $label = $this->pi_getLL('addBasket', '', TRUE);
 
-            $params = array(
+            $params = array (
                 'id' => $this->piVars['id'],
                 'addToBasket' => true
             );
@@ -344,9 +344,9 @@ 
 
 			// 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 {
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 
             $params = array(
                 'id' => $this->piVars['id'],
-                'addToBasket' => true
+                'addToBasket' => TRUE
             );
 
             if (empty($this->piVars['page'])) {

Indentation +164 added lines, -164 removed lines

@@ -19,69 +19,69 @@ 
  */
 class tx_dlf_pageview extends tx_dlf_plugin {
 
-	public $scriptRelPath = 'plugins/pageview/class.tx_dlf_pageview.php';
+    public $scriptRelPath = 'plugins/pageview/class.tx_dlf_pageview.php';
 
-	/**
-	 * Holds the controls to add to the map
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $controls = array ();
+    /**
+     * Holds the controls to add to the map
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $controls = array ();
 
-	/**
-	 * Holds the current images' URLs and MIME types
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $images = array ();
+    /**
+     * Holds the current images' URLs and MIME types
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $images = array ();
 
-	/**
-	 * Holds the current fulltexts' URLs
-	 *
-	 * @var	array
-	 * @access protected
-	 */
-	protected $fulltexts = array ();
+    /**
+     * Holds the current fulltexts' URLs
+     *
+     * @var	array
+     * @access protected
+     */
+    protected $fulltexts = array ();
 
-	/**
-	 * Adds Viewer javascript
-	 *
-	 * @access	protected
-	 *
-	 * @return	string		Viewer script tags ready for output
-	 */
-	protected function addViewerJS() {
+    /**
+     * Adds Viewer javascript
+     *
+     * @access	protected
+     *
+     * @return	string		Viewer script tags ready for output
+     */
+    protected function addViewerJS() {
 
-		$output = array ();
+        $output = array ();
 
-		// Add OpenLayers library.
-		$output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3.css">';
+        // Add OpenLayers library.
+        $output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3.css">';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/glif.min.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/glif.min.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3-dlf.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3-dlf.js"></script>';
 
-		// Add viewer library.
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_utils.js"></script>';
+        // Add viewer library.
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_utils.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_source.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_source.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_altoparser.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_altoparser.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
 
-		$output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview.js"></script>';
+        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview.js"></script>';
 
-		// Add viewer configuration.
-		$output[] = '
+        // Add viewer configuration.
+        $output[] = '
 		<script id="tx-dlf-pageview-initViewer" type="text/javascript">
 			window.onload = function() {
 				if (dlfUtils.exists(dlfViewer)) {
@@ -96,11 +96,11 @@ 
 			}
 		</script>';
 
-		return implode("\n", $output);
+        return implode("\n", $output);
 
-	}
+    }
 
-	/**
+    /**
      * Adds pageview interaction (crop, magnifier and rotation)
      *
      * @access	protected
@@ -225,183 +225,183 @@ 
 
     /**
      * Get image's URL and MIME type
-	 *
-	 * @access	protected
-	 *
-	 * @param	integer		$page: Page number
-	 *
-	 * @return	array		URL and MIME type of image file
-	 */
-	protected function getImage($page) {
+     *
+     * @access	protected
+     *
+     * @param	integer		$page: Page number
+     *
+     * @return	array		URL and MIME type of image file
+     */
+    protected function getImage($page) {
 
-		$image = array ();
+        $image = array ();
 
-		// Get @USE value of METS fileGrp.
-		$fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrps']);
+        // Get @USE value of METS fileGrp.
+        $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrps']);
 
-		while ($fileGrp = @array_pop($fileGrps)) {
+        while ($fileGrp = @array_pop($fileGrps)) {
 
-			// Get image link.
-			if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp])) {
+            // Get image link.
+            if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp])) {
 
-				$image['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp]);
+                $image['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp]);
 
-				if ($this->conf['useInternalProxy']) {
-					// Configure @action URL for form.
-					$linkConf = array (
-						'parameter' => $GLOBALS['TSFE']->id,
-						'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($image['url']),
-					);
+                if ($this->conf['useInternalProxy']) {
+                    // Configure @action URL for form.
+                    $linkConf = array (
+                        'parameter' => $GLOBALS['TSFE']->id,
+                        'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($image['url']),
+                    );
 
-					$image['url'] = $this->cObj->typoLink_URL($linkConf);
-				}
+                    $image['url'] = $this->cObj->typoLink_URL($linkConf);
+                }
 
-				$image['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp]);
+                $image['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrp]);
 
-				break;
+                break;
 
-			} else {
+            } else {
 
-				if (TYPO3_DLOG) {
+                if (TYPO3_DLOG) {
 
-					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage('.$page.')] File not found in fileGrp "'.$fileGrp.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage('.$page.')] File not found in fileGrp "'.$fileGrp.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		return $image;
+        return $image;
 
-	}
+    }
 
-	/**
-	 * Get fulltext URL and MIME type
-	 *
-	 * @access	protected
-	 *
-	 * @param	integer		$page: Page number
-	 *
-	 * @return	array		URL and MIME type of fulltext file
-	 */
-	protected function getFulltext($page) {
+    /**
+     * Get fulltext URL and MIME type
+     *
+     * @access	protected
+     *
+     * @param	integer		$page: Page number
+     *
+     * @return	array		URL and MIME type of fulltext file
+     */
+    protected function getFulltext($page) {
 
-		$fulltext = array ();
+        $fulltext = array ();
 
-		// Get fulltext link.
-		if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']])) {
+        // Get fulltext link.
+        if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']])) {
 
-			$fulltext['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
+            $fulltext['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
 
-			// Configure @action URL for form.
-			$linkConf = array (
-				'parameter' => $GLOBALS['TSFE']->id,
-				'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($fulltext['url']),
-			);
+            // Configure @action URL for form.
+            $linkConf = array (
+                'parameter' => $GLOBALS['TSFE']->id,
+                'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($fulltext['url']),
+            );
 
-			$fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
+            $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
 
-			$fulltext['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
+            $fulltext['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
 
-		} else {
+        } else {
 
-			if (TYPO3_DLOG) {
+            if (TYPO3_DLOG) {
 
-				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext('.$page.')] File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext('.$page.')] File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-			}
+            }
 
-		}
+        }
 
-		return $fulltext;
+        return $fulltext;
 
-	}
+    }
 
-	/**
-	 * 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);
 
-		// Load current document.
-		$this->loadDocument();
+        // Load current document.
+        $this->loadDocument();
 
-		if ($this->doc === NULL || $this->doc->numPages < 1) {
+        if ($this->doc === NULL || $this->doc->numPages < 1) {
 
-			// Quit without doing anything if required variables are not set.
-			return $content;
+            // Quit without doing anything if required variables are not set.
+            return $content;
 
-		} else {
+        } else {
 
-			if (!empty($this->piVars['logicalPage'])) {
+            if (!empty($this->piVars['logicalPage'])) {
 
-				$this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
-				// The logical page parameter should not appear again
-				unset($this->piVars['logicalPage']);
+                $this->piVars['page'] = $this->doc->getPhysicalPage($this->piVars['logicalPage']);
+                // The logical page parameter should not appear again
+                unset($this->piVars['logicalPage']);
 
-			}
+            }
 
-			// 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'])) {
+            // 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'])) {
 
-				$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 {
+            } else {
 
-				$this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
+                $this->piVars['page'] = array_search($this->piVars['page'], $this->doc->physicalStructure);
 
-			}
+            }
 
-			$this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
+            $this->piVars['double'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->piVars['double'], 0, 1, 0);
 
-		}
+        }
 
-		// 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/pageview/template.tmpl'), '###TEMPLATE###');
+            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/pageview/template.tmpl'), '###TEMPLATE###');
 
-		}
+        }
 
-		// Get image data.
-		$this->images[0] = $this->getImage($this->piVars['page']);
-		$this->fulltexts[0] = $this->getFulltext($this->piVars['page']);
+        // Get image data.
+        $this->images[0] = $this->getImage($this->piVars['page']);
+        $this->fulltexts[0] = $this->getFulltext($this->piVars['page']);
 
-		if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
+        if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) {
 
-			$this->images[1] = $this->getImage($this->piVars['page'] + 1);
-			$this->fulltexts[1] = $this->getFulltext($this->piVars['page'] + 1);
+            $this->images[1] = $this->getImage($this->piVars['page'] + 1);
+            $this->fulltexts[1] = $this->getFulltext($this->piVars['page'] + 1);
 
-		}
+        }
 
-		// Get the controls for the map.
-		$this->controls = explode(',', $this->conf['features']);
+        // Get the controls for the map.
+        $this->controls = explode(',', $this->conf['features']);
 
-		// Fill in the template markers.
-		$markerArray = array (
-			'###VIEWER_JS###' => $this->addViewerJS()
-		);
+        // Fill in the template markers.
+        $markerArray = array (
+            '###VIEWER_JS###' => $this->addViewerJS()
+        );
 
-		$markerArray = array_merge($markerArray, $this->addInteraction(), $this->addBasketForm());
+        $markerArray = array_merge($markerArray, $this->addInteraction(), $this->addBasketForm());
 
         $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-		return $this->pi_wrapInBaseClass($content);
+        return $this->pi_wrapInBaseClass($content);
 
-	}
+    }
 
 }