Erikmitk / kitodo-presentation

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 +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $hookObjects = array ();
+    protected $hookObjects = array();
 
     /**
      * The main method of the PlugIn
@@ -66,12 +66,12 @@ 
 
         }
 
-        $metadata = array ();
+        $metadata = array();
 
         if ($this->conf['rootline'] < 2) {
 
             // Get current structure's @ID.
-            $ids = array ();
+            $ids = array();
 
             if (!empty($this->doc->physicalStructure[$this->piVars['page']]) && !empty($this->doc->smLinks['p2l'][$this->doc->physicalStructure[$this->piVars['page']]])) {
 
@@ -208,7 +208,7 @@ 
         $subpart['block'] = $this->cObj->getSubpart($this->template, '###BLOCK###');
 
         // Get list of metadata to show.
-        $metaList = array ();
+        $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',
@@ -234,7 +234,7 @@ 
                     // 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 (
+                        $metaList[$resArray['index_name']] = array(
                             'wrap' => $resArray['wrap'],
                             'label' => tx_dlf_helper::translate($resArray['index_name'], 'tx_dlf_metadata', $this->conf['pages'])
                         );
@@ -246,7 +246,7 @@ 
         }
 
         // Get list of collections to show.
-        $collList = array ();
+        $collList = array();
 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.index_name AS index_name',
@@ -324,7 +324,7 @@ 
 
                                 $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']);
 
                             }
 

plugins/statistics/class.tx_dlf_statistics.php

Indentation +106 added lines, -106 removed lines

@@ -19,111 +19,111 @@
  */
 class tx_dlf_statistics extends tx_dlf_plugin {
 
-    public $scriptRelPath = 'plugins/statistics/class.tx_dlf_statistics.php';
-
-    /**
-     * The main method of the PlugIn
-     *
-     * @access	public
-     *
-     * @param	string		$content: The PlugIn content
-     * @param	array		$conf: The PlugIn configuration
-     *
-     * @return	string		The content that is displayed on the website
-     */
-    public function main($content, $conf) {
-
-        $this->init($conf);
-
-        // Turn cache on.
-        $this->setCache(TRUE);
-
-        // Quit without doing anything if required configuration variables are not set.
-        if (empty($this->conf['pages'])) {
-
-            if (TYPO3_DLOG) {
-
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_statistics->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
-
-            }
-
-            return $content;
-
-        }
-
-        // Get description.
-        $content .= $this->pi_RTEcssText($this->conf['description']);
-
-        // Check for selected collections.
-        if ($this->conf['collections']) {
-
-            // Include only selected collections.
-            $resultTitles = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-                'tx_dlf_documents.uid AS uid',
-                'tx_dlf_documents',
-                'tx_dlf_relations',
-                'tx_dlf_collections',
-                'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0 AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-                'tx_dlf_documents.uid',
-                '',
-                ''
-            );
-
-            $resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-                'tx_dlf_documents.uid AS uid',
-                'tx_dlf_documents',
-                'tx_dlf_relations',
-                'tx_dlf_collections',
-                'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' 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_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-                'tx_dlf_documents.uid',
-                '',
-                ''
-            );
-
-        } else {
-
-            // Include all collections.
-            $resultTitles = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'tx_dlf_documents.uid AS uid',
-                'tx_dlf_documents',
-                'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0'.tx_dlf_helper::whereClause('tx_dlf_documents'),
-                '',
-                '',
-                ''
-            );
-
-            $resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'tx_dlf_documents.uid AS uid',
-                'tx_dlf_documents',
-                'tx_dlf_documents.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').')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
-                '',
-                '',
-                ''
-            );
-
-        }
-
-        $countTitles = $GLOBALS['TYPO3_DB']->sql_num_rows($resultTitles);
-
-        $countVolumes = $GLOBALS['TYPO3_DB']->sql_num_rows($resultVolumes);
-
-        // Set replacements.
-        $replace = array (
-            'key' => array (
-                '###TITLES###',
-                '###VOLUMES###'
-            ),
-            'value' => array (
-                $countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
-                $countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
-            )
-        );
-
-        // Apply replacements.
-        $content = str_replace($replace['key'], $replace['value'], $content);
-
-        return $this->pi_wrapInBaseClass($content);
-
-    }
+	public $scriptRelPath = 'plugins/statistics/class.tx_dlf_statistics.php';
+
+	/**
+	 * The main method of the PlugIn
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$content: The PlugIn content
+	 * @param	array		$conf: The PlugIn configuration
+	 *
+	 * @return	string		The content that is displayed on the website
+	 */
+	public function main($content, $conf) {
+
+		$this->init($conf);
+
+		// Turn cache on.
+		$this->setCache(TRUE);
+
+		// Quit without doing anything if required configuration variables are not set.
+		if (empty($this->conf['pages'])) {
+
+			if (TYPO3_DLOG) {
+
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_statistics->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+
+			}
+
+			return $content;
+
+		}
+
+		// Get description.
+		$content .= $this->pi_RTEcssText($this->conf['description']);
+
+		// Check for selected collections.
+		if ($this->conf['collections']) {
+
+			// Include only selected collections.
+			$resultTitles = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+				'tx_dlf_documents.uid AS uid',
+				'tx_dlf_documents',
+				'tx_dlf_relations',
+				'tx_dlf_collections',
+				'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0 AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+				'tx_dlf_documents.uid',
+				'',
+				''
+			);
+
+			$resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+				'tx_dlf_documents.uid AS uid',
+				'tx_dlf_documents',
+				'tx_dlf_relations',
+				'tx_dlf_collections',
+				'AND tx_dlf_documents.pid='.intval($this->conf['pages']).' 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_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).') AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+				'tx_dlf_documents.uid',
+				'',
+				''
+			);
+
+		} else {
+
+			// Include all collections.
+			$resultTitles = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_documents.uid AS uid',
+				'tx_dlf_documents',
+				'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.partof=0'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+				'',
+				'',
+				''
+			);
+
+			$resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_documents.uid AS uid',
+				'tx_dlf_documents',
+				'tx_dlf_documents.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').')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+				'',
+				'',
+				''
+			);
+
+		}
+
+		$countTitles = $GLOBALS['TYPO3_DB']->sql_num_rows($resultTitles);
+
+		$countVolumes = $GLOBALS['TYPO3_DB']->sql_num_rows($resultVolumes);
+
+		// Set replacements.
+		$replace = array (
+			'key' => array (
+				'###TITLES###',
+				'###VOLUMES###'
+			),
+			'value' => array (
+				$countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
+				$countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
+			)
+		);
+
+		// Apply replacements.
+		$content = str_replace($replace['key'], $replace['value'], $content);
+
+		return $this->pi_wrapInBaseClass($content);
+
+	}
 
 }

Spacing +3 added lines, -3 removed lines

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

plugins/pageview/class.tx_dlf_pageview.php

Indentation +237 added lines, -237 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,312 +96,312 @@ 
 			}
 		</script>';
 
-        return implode("\n", $output);
+		return implode("\n", $output);
 
-    }
+	}
 
-    /**
-     * Adds pageview interaction (crop, magnifier and rotation)
-     *
-     * @access	protected
-     *
-     * @return	array		Marker array
-     */
-    protected function addInteraction() {
+	/**
+	 * Adds pageview interaction (crop, magnifier and rotation)
+	 *
+	 * @access	protected
+	 *
+	 * @return	array		Marker array
+	 */
+	protected function addInteraction() {
 
-        $markerArray = array ();
+		$markerArray = array ();
 
-        if ($this->piVars['id']) {
+		if ($this->piVars['id']) {
 
-            if (empty($this->piVars['page'])) {
+			if (empty($this->piVars['page'])) {
 
-                $params['page'] = 1;
+				$params['page'] = 1;
 
-            }
+			}
 
-            if ($this->conf['crop']) {
+			if ($this->conf['crop']) {
 
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
+				$markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
 
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
+				$markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
 
-            } else {
+			} else {
 
-                $markerArray['###EDITBUTTON###'] = '';
+				$markerArray['###EDITBUTTON###'] = '';
 
-                $markerArray['###EDITREMOVE###'] = '';
+				$markerArray['###EDITREMOVE###'] = '';
 
-            }
+			}
 
-            if ($this->conf['magnifier']) {
+			if ($this->conf['magnifier']) {
 
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
+				$markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
 
-            } else {
+			} else {
 
-                $markerArray['###MAGNIFIER###'] = '';
+				$markerArray['###MAGNIFIER###'] = '';
 
-            }
+			}
 
-        }
+		}
 
-        return $markerArray;
-    }
+		return $markerArray;
+	}
 
-    /**
-     * Adds form to save cropping data to basket
-     *
-     * @access	protected
-     *
-     * @return	array		Marker array
-     */
-    protected function addBasketForm() {
+	/**
+	 * Adds form to save cropping data to basket
+	 *
+	 * @access	protected
+	 *
+	 * @return	array		Marker array
+	 */
+	protected function addBasketForm() {
 
-        $markerArray = array ();
+		$markerArray = array ();
 
-        // Add basket button
-        if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
+		// Add basket button
+		if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
 
-            $label = $this->pi_getLL('addBasket', '', TRUE);
+			$label = $this->pi_getLL('addBasket', '', TRUE);
 
-            $params = array (
-                'id' => $this->piVars['id'],
-                'addToBasket' => TRUE
-            );
+			$params = array (
+				'id' => $this->piVars['id'],
+				'addToBasket' => TRUE
+			);
 
-            if (empty($this->piVars['page'])) {
+			if (empty($this->piVars['page'])) {
 
-                $params['page'] = 1;
+				$params['page'] = 1;
 
-            }
+			}
 
-            $basketConf = array (
-                'parameter' => $this->conf['targetBasket'],
-                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
-                'title' => $label
-            );
+			$basketConf = array (
+				'parameter' => $this->conf['targetBasket'],
+				'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
+				'title' => $label
+			);
 
-            $output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
+			$output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.$this->piVars['page'].'">';
+			$output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.$this->piVars['page'].'">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.$this->piVars['page'].'">';
+			$output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.$this->piVars['page'].'">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
+			$output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
+			$output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
+			$output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
+			$output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
 
-            $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
+			$output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
 
-            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
+			$output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
 
-            $output .= '</form>';
+			$output .= '</form>';
 
-            $output .= '<script>';
+			$output .= '<script>';
 
-            $output .= '
+			$output .= '
 			$(document).ready(function() {
 				$("#submitBasketForm").click(function() {
 					$("#addToBasketForm").submit();
 				});
 			});';
 
-            $output .= '</script>';
+			$output .= '</script>';
 
-            $markerArray['###BASKETBUTTON###'] = $output;
+			$markerArray['###BASKETBUTTON###'] = $output;
 
-        } else {
+		} else {
 
-            $markerArray['###BASKETBUTTON###'] = '';
+			$markerArray['###BASKETBUTTON###'] = '';
 
-        }
+		}
 
-        return $markerArray;
-    }
+		return $markerArray;
+	}
 
-    /**
-     * 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) {
+	/**
+	 * 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) {
 
-        $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);
+		$content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-        return $this->pi_wrapInBaseClass($content);
+		return $this->pi_wrapInBaseClass($content);
 
-    }
+	}
 
 }

Spacing +13 added lines, -13 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $controls = array ();
+    protected $controls = array();
 
     /**
      * Holds the current images' URLs and MIME types
@@ -35,7 +35,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $images = array ();
+    protected $images = array();
 
     /**
      * Holds the current fulltexts' URLs
@@ -43,7 +43,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $fulltexts = array ();
+    protected $fulltexts = array();
 
     /**
      * Adds Viewer javascript
@@ -54,7 +54,7 @@ 
      */
     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">';
@@ -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
             );
@@ -175,7 +175,7 @@ 
 
             }
 
-            $basketConf = array (
+            $basketConf = array(
                 'parameter' => $this->conf['targetBasket'],
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
                 'title' => $label
@@ -234,7 +234,7 @@ 
      */
     protected function getImage($page) {
 
-        $image = array ();
+        $image = array();
 
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrps']);
@@ -248,7 +248,7 @@ 
 
                 if ($this->conf['useInternalProxy']) {
                     // Configure @action URL for form.
-                    $linkConf = array (
+                    $linkConf = array(
                         'parameter' => $GLOBALS['TSFE']->id,
                         'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($image['url']),
                     );
@@ -287,7 +287,7 @@ 
      */
     protected function getFulltext($page) {
 
-        $fulltext = array ();
+        $fulltext = array();
 
         // Get fulltext link.
         if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']])) {
@@ -295,7 +295,7 @@ 
             $fulltext['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
 
             // Configure @action URL for form.
-            $linkConf = array (
+            $linkConf = array(
                 'parameter' => $GLOBALS['TSFE']->id,
                 'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($fulltext['url']),
             );
@@ -392,7 +392,7 @@ 
         $this->controls = explode(',', $this->conf['features']);
 
         // Fill in the template markers.
-        $markerArray = array (
+        $markerArray = array(
             '###VIEWER_JS###' => $this->addViewerJS()
         );
 

plugins/pageview/class.tx_dlf_geturl_eid.php

Indentation +42 added lines, -42 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');
-    $includeHeader = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange(GeneralUtility::_GP('header'), 0, 2, 0);
+		$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 +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      *
      * @return	void
      */
-    public function main($content = '', $conf = array ()) {
+    public function main($content = '', $conf = array()) {
 
         $this->cObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
 

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

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $audio = array ();
+    protected $audio = array();
 
     /**
      * Adds Player javascript
@@ -38,7 +38,7 @@ 
      */
     protected function addPlayerJS() {
 
-        $output = array ();
+        $output = array();
 
         $output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css">';
 
@@ -138,7 +138,7 @@ 
         }
 
         // Fill in the template markers.
-        $markerArray = array (
+        $markerArray = array(
             '###PLAYER_JS###' => $this->addPlayerJS()
         );
 

plugins/validator/class.tx_dlf_validator.php

Indentation +40 added lines, -40 removed lines

@@ -19,61 +19,61 @@
  */
 class tx_dlf_validator extends tx_dlf_plugin {
 
-    public $scriptRelPath = 'plugins/validator/class.tx_dlf_validator.php';
+	public $scriptRelPath = 'plugins/validator/class.tx_dlf_validator.php';
 
-    /**
-     * The main method of the PlugIn
-     *
-     * @access	public
-     *
-     * @param	string		$content: The PlugIn content
-     * @param	array		$conf: The PlugIn configuration
-     *
-     * @return	string		The content that is displayed on the website
-     */
-    public function main($content, $conf) {
+	/**
+	 * The main method of the PlugIn
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$content: The PlugIn content
+	 * @param	array		$conf: The PlugIn configuration
+	 *
+	 * @return	string		The content that is displayed on the website
+	 */
+	public function main($content, $conf) {
 
-        $this->init($conf);
+		$this->init($conf);
 
-        // Disable caching for this plugin.
-        $this->setCache(FALSE);
+		// Disable caching for this plugin.
+		$this->setCache(FALSE);
 
-        // Load template file.
-        if (!empty($this->conf['templateFile'])) {
+		// Load template file.
+		if (!empty($this->conf['templateFile'])) {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATE###');
 
-        } else {
+		} else {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/validator/template.tmpl'), '###TEMPLATE###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/validator/template.tmpl'), '###TEMPLATE###');
 
-        }
+		}
 
-        // Load current document.
-        $this->loadDocument();
+		// Load current document.
+		$this->loadDocument();
 
-        if ($this->doc === NULL) {
+		if ($this->doc === NULL) {
 
-            // Document could not be loaded.
-            // Check:
-            // - if document location is valid URL
-            // - if document location is reachable
-            // - if document is well-formed XML
-            // - if document has METS node
+			// Document could not be loaded.
+			// Check:
+			// - if document location is valid URL
+			// - if document location is reachable
+			// - if document is well-formed XML
+			// - if document has METS node
 
-        } else {
+		} else {
 
-            // Document loaded.
-            // Check:
-            // - if document is valid METS document
-            // - if document contains supported metadata schema
-            // - if document's metadata are valid
-            // - if document provides configured mandatory fields
+			// Document loaded.
+			// Check:
+			// - if document is valid METS document
+			// - if document contains supported metadata schema
+			// - if document's metadata are valid
+			// - if document provides configured mandatory fields
 
-        }
+		}
 
-        return $this->pi_wrapInBaseClass($content);
+		return $this->pi_wrapInBaseClass($content);
 
-    }
+	}
 
 }

plugins/search/class.tx_dlf_search.php

Indentation +515 added lines, -515 removed lines

@@ -20,834 +20,834 @@
  */
 class tx_dlf_search extends tx_dlf_plugin {
 
-    public $scriptRelPath = 'plugins/search/class.tx_dlf_search.php';
+	public $scriptRelPath = 'plugins/search/class.tx_dlf_search.php';
 
-    /**
-     * Adds the JS files necessary for search suggestions
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function addAutocompleteJS() {
+	/**
+	 * Adds the JS files necessary for search suggestions
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function addAutocompleteJS() {
 
-        // Check if there are any metadata to suggest.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_metadata.*',
-            'tx_dlf_metadata',
-            'tx_dlf_metadata.index_autocomplete=1 AND tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
-            '',
-            '',
-            '1'
-        );
+		// Check if there are any metadata to suggest.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_metadata.*',
+			'tx_dlf_metadata',
+			'tx_dlf_metadata.index_autocomplete=1 AND tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+			'',
+			'',
+			'1'
+		);
 
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-            $GLOBALS['TSFE']->additionalHeaderData[$this->prefixId.'_search_suggest'] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/search/tx_dlf_search_suggest.js"></script>';
+			$GLOBALS['TSFE']->additionalHeaderData[$this->prefixId.'_search_suggest'] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/search/tx_dlf_search_suggest.js"></script>';
 
-        } else {
+		} else {
 
-            if (TYPO3_DLOG) {
+			if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->addAutocompleteJS()] No metadata fields configured for search suggestions', $this->extKey, SYSLOG_SEVERITY_WARNING);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->addAutocompleteJS()] No metadata fields configured for search suggestions', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Adds the current collection's UID to the search form
-     *
-     * @access	protected
-     *
-     * @return	string		HTML input fields with current document's UID and parent ID
-     */
-    protected function addCurrentCollection() {
+	/**
+	 * Adds the current collection's UID to the search form
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		HTML input fields with current document's UID and parent ID
+	 */
+	protected function addCurrentCollection() {
 
-        // Load current collection.
-        $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+		// Load current collection.
+		$list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-        if (!empty($list->metadata['options']['source']) && $list->metadata['options']['source'] == 'collection') {
+		if (!empty($list->metadata['options']['source']) && $list->metadata['options']['source'] == 'collection') {
 
-            // Get collection's UID.
-            return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$list->metadata['options']['select'].'" />';
+			// Get collection's UID.
+			return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$list->metadata['options']['select'].'" />';
 
-        } elseif (!empty($list->metadata['options']['params']['fq'])) {
+		} elseif (!empty($list->metadata['options']['params']['fq'])) {
 
-            // Get collection's UID from search metadata.
-            foreach ($list->metadata['options']['params']['fq'] as $id => $facet) {
+			// Get collection's UID from search metadata.
+			foreach ($list->metadata['options']['params']['fq'] as $id => $facet) {
 
-                $facetKeyVal = explode(':', $facet, 2);
+				$facetKeyVal = explode(':', $facet, 2);
 
-                if ($facetKeyVal[0] == 'collection_faceting' && !strpos($facetKeyVal[1], '" OR "')) {
+				if ($facetKeyVal[0] == 'collection_faceting' && !strpos($facetKeyVal[1], '" OR "')) {
 
-                    $collectionId = tx_dlf_helper::getIdFromIndexName(trim($facetKeyVal[1], '(")'), 'tx_dlf_collections');
+					$collectionId = tx_dlf_helper::getIdFromIndexName(trim($facetKeyVal[1], '(")'), 'tx_dlf_collections');
 
-                }
+				}
 
-            }
+			}
 
-            return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$collectionId.'" />';
+			return '<input type="hidden" name="'.$this->prefixId.'[collection]" value="'.$collectionId.'" />';
 
-        }
+		}
 
-        return '';
+		return '';
 
-    }
+	}
 
-    /**
-     * Adds the current document's UID or parent ID to the search form
-     *
-     * @access	protected
-     *
-     * @return	string		HTML input fields with current document's UID and parent ID
-     */
-    protected function addCurrentDocument() {
+	/**
+	 * Adds the current document's UID or parent ID to the search form
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		HTML input fields with current document's UID and parent ID
+	 */
+	protected function addCurrentDocument() {
 
-        // Load current list object.
-        $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+		// Load current list object.
+		$list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-        // Load current document.
-        if (!empty($this->piVars['id']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['id'])) {
+		// Load current document.
+		if (!empty($this->piVars['id']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['id'])) {
 
-            $this->loadDocument();
+			$this->loadDocument();
 
-            // Get document's UID or parent ID.
-            if ($this->doc->ready) {
+			// Get document's UID or parent ID.
+			if ($this->doc->ready) {
 
-                return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.($this->doc->parentId > 0 ? $this->doc->parentId : $this->doc->uid).'" />';
+				return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.($this->doc->parentId > 0 ? $this->doc->parentId : $this->doc->uid).'" />';
 
-            }
+			}
 
-        } elseif (!empty($list->metadata['options']['params']['fq'])) {
+		} elseif (!empty($list->metadata['options']['params']['fq'])) {
 
-            // Get document's UID from search metadata.
-            foreach ($list->metadata['options']['params']['fq'] as $id => $facet) {
+			// Get document's UID from search metadata.
+			foreach ($list->metadata['options']['params']['fq'] as $id => $facet) {
 
-                $facetKeyVal = explode(':', $facet);
+				$facetKeyVal = explode(':', $facet);
 
-                if ($facetKeyVal[0] == 'uid') {
+				if ($facetKeyVal[0] == 'uid') {
 
-                    $documentId = (int) substr($facetKeyVal[1], 1, strpos($facetKeyVal[1], ')'));
+					$documentId = (int) substr($facetKeyVal[1], 1, strpos($facetKeyVal[1], ')'));
 
-                }
+				}
 
-            }
+			}
 
-            return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.$documentId.'" />';
+			return '<input type="hidden" name="'.$this->prefixId.'[id]" value="'.$documentId.'" />';
 
-        }
+		}
 
-        return '';
+		return '';
 
-    }
+	}
 
-    /**
-     * Adds the encrypted Solr core name to the search form
-     *
-     * @access	protected
-     *
-     * @return	string		HTML input fields with encrypted core name and hash
-     */
-    protected function addEncryptedCoreName() {
+	/**
+	 * Adds the encrypted Solr core name to the search form
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		HTML input fields with encrypted core name and hash
+	 */
+	protected function addEncryptedCoreName() {
 
-        // Get core name.
-        $name = tx_dlf_helper::getIndexName($this->conf['solrcore'], 'tx_dlf_solrcores');
+		// Get core name.
+		$name = tx_dlf_helper::getIndexName($this->conf['solrcore'], 'tx_dlf_solrcores');
 
-        // Encrypt core name.
-        if (!empty($name)) {
+		// Encrypt core name.
+		if (!empty($name)) {
 
-            $name = tx_dlf_helper::encrypt($name);
+			$name = tx_dlf_helper::encrypt($name);
 
-        }
+		}
 
-        // Add encrypted fields to search form.
-        if (is_array($name)) {
+		// Add encrypted fields to search form.
+		if (is_array($name)) {
 
-            return '<input type="hidden" name="'.$this->prefixId.'[encrypted]" value="'.$name['encrypted'].'" /><input type="hidden" name="'.$this->prefixId.'[hashed]" value="'.$name['hash'].'" />';
+			return '<input type="hidden" name="'.$this->prefixId.'[encrypted]" value="'.$name['encrypted'].'" /><input type="hidden" name="'.$this->prefixId.'[hashed]" value="'.$name['hash'].'" />';
 
-        } else {
+		} else {
 
-            return '';
+			return '';
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Returns the extended search form and adds the JS files necessary for extended search.
-     *
-     * @access	protected
-     *
-     * @return	string		The extended search form or an empty string
-     */
-    protected function addExtendedSearch() {
+	/**
+	 * Returns the extended search form and adds the JS files necessary for extended search.
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		The extended search form or an empty string
+	 */
+	protected function addExtendedSearch() {
 
-        $extendedSearch = '';
+		$extendedSearch = '';
 
-        // Quit without doing anything if no fields for extended search are selected.
-        if (empty($this->conf['extendedSlotCount']) || empty($this->conf['extendedFields'])) {
+		// Quit without doing anything if no fields for extended search are selected.
+		if (empty($this->conf['extendedSlotCount']) || empty($this->conf['extendedFields'])) {
 
-            return $extendedSearch;
+			return $extendedSearch;
 
-        }
+		}
 
-        // Get operator options.
-        $operatorOptions = '';
+		// Get operator options.
+		$operatorOptions = '';
 
-        foreach (array ('AND', 'OR', 'NOT') as $operator) {
+		foreach (array ('AND', 'OR', 'NOT') as $operator) {
 
-            $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-'.$operator.'" value="'.$operator.'">'.$this->pi_getLL($operator, '', TRUE).'</option>';
+			$operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-'.$operator.'" value="'.$operator.'">'.$this->pi_getLL($operator, '', TRUE).'</option>';
 
-        }
+		}
 
-        // Get field selector options.
-        $fieldSelectorOptions = '';
+		// Get field selector options.
+		$fieldSelectorOptions = '';
 
-        $searchFields = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
+		$searchFields = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
 
-        foreach ($searchFields as $searchField) {
+		foreach ($searchFields as $searchField) {
 
-            $fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-'.$searchField.'" value="'.$searchField.'">'.tx_dlf_helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']).'</option>';
+			$fieldSelectorOptions .= '<option class="tx-dlf-search-field-option tx-dlf-search-field-'.$searchField.'" value="'.$searchField.'">'.tx_dlf_helper::translate($searchField, 'tx_dlf_metadata', $this->conf['pages']).'</option>';
 
-        }
+		}
 
-        for ($i = 0; $i < $this->conf['extendedSlotCount']; $i++) {
+		for ($i = 0; $i < $this->conf['extendedSlotCount']; $i++) {
 
-            $markerArray = array (
-                '###EXT_SEARCH_OPERATOR###' => '<select class="tx-dlf-search-operator tx-dlf-search-operator-'.$i.'" name="'.$this->prefixId.'[extOperator]['.$i.']">'.$operatorOptions.'</select>',
-                '###EXT_SEARCH_FIELDSELECTOR###' => '<select class="tx-dlf-search-field tx-dlf-search-field-'.$i.'" name="'.$this->prefixId.'[extField]['.$i.']">'.$fieldSelectorOptions.'</select>',
-                '###EXT_SEARCH_FIELDQUERY###' => '<input class="tx-dlf-search-query tx-dlf-search-query-'.$i.'" type="text" name="'.$this->prefixId.'[extQuery]['.$i.']" />'
-            );
+			$markerArray = array (
+				'###EXT_SEARCH_OPERATOR###' => '<select class="tx-dlf-search-operator tx-dlf-search-operator-'.$i.'" name="'.$this->prefixId.'[extOperator]['.$i.']">'.$operatorOptions.'</select>',
+				'###EXT_SEARCH_FIELDSELECTOR###' => '<select class="tx-dlf-search-field tx-dlf-search-field-'.$i.'" name="'.$this->prefixId.'[extField]['.$i.']">'.$fieldSelectorOptions.'</select>',
+				'###EXT_SEARCH_FIELDQUERY###' => '<input class="tx-dlf-search-query tx-dlf-search-query-'.$i.'" type="text" name="'.$this->prefixId.'[extQuery]['.$i.']" />'
+			);
 
-            $extendedSearch .= $this->cObj->substituteMarkerArray($this->cObj->getSubpart($this->template, '###EXT_SEARCH_ENTRY###'), $markerArray);
+			$extendedSearch .= $this->cObj->substituteMarkerArray($this->cObj->getSubpart($this->template, '###EXT_SEARCH_ENTRY###'), $markerArray);
 
-        }
+		}
 
-        return $extendedSearch;
+		return $extendedSearch;
 
-    }
+	}
 
-    /**
-     * Adds the facets menu to the search form
-     *
-     * @access	protected
-     *
-     * @return	string		HTML output of facets menu
-     */
-    protected function addFacetsMenu() {
+	/**
+	 * Adds the facets menu to the search form
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		HTML output of facets menu
+	 */
+	protected function addFacetsMenu() {
 
-        // Check for typoscript configuration to prevent fatal error.
-        if (empty($this->conf['facetsConf.'])) {
+		// Check for typoscript configuration to prevent fatal error.
+		if (empty($this->conf['facetsConf.'])) {
 
-            if (TYPO3_DLOG) {
+			if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->addFacetsMenu()] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->addFacetsMenu()] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-            }
+			}
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // Quit without doing anything if no facets are selected.
-        if (empty($this->conf['facets'])) {
+		// Quit without doing anything if no facets are selected.
+		if (empty($this->conf['facets'])) {
 
-            return '';
+			return '';
 
-        }
+		}
 
-        // Get facets from plugin configuration.
-        $facets = array ();
+		// Get facets from plugin configuration.
+		$facets = array ();
 
-        foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
+		foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
 
-            $facets[$facet.'_faceting'] = tx_dlf_helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
+			$facets[$facet.'_faceting'] = tx_dlf_helper::translate($facet, 'tx_dlf_metadata', $this->conf['pages']);
 
-        }
+		}
 
-        // Render facets menu.
-        $TSconfig = array ();
+		// Render facets menu.
+		$TSconfig = array ();
 
-        $TSconfig['special'] = 'userfunction';
+		$TSconfig['special'] = 'userfunction';
 
-        $TSconfig['special.']['userFunc'] = 'tx_dlf_search->makeFacetsMenuArray';
+		$TSconfig['special.']['userFunc'] = 'tx_dlf_search->makeFacetsMenuArray';
 
-        $TSconfig['special.']['facets'] = $facets;
+		$TSconfig['special.']['facets'] = $facets;
 
-        $TSconfig['special.']['limit'] = max(intval($this->conf['limitFacets']), 1);
+		$TSconfig['special.']['limit'] = max(intval($this->conf['limitFacets']), 1);
 
-        $TSconfig = tx_dlf_helper::array_merge_recursive_overrule($this->conf['facetsConf.'], $TSconfig);
+		$TSconfig = tx_dlf_helper::array_merge_recursive_overrule($this->conf['facetsConf.'], $TSconfig);
 
-        return $this->cObj->HMENU($TSconfig);
+		return $this->cObj->HMENU($TSconfig);
 
-    }
+	}
 
-    /**
-     * Adds the fulltext switch to the search form
-     *
-     * @access	protected
-     *
-     * @param int $isFulltextSearch
-     *
-     * @return	string		HTML output of fulltext switch
-     */
-    protected function addFulltextSwitch($isFulltextSearch = 0) {
+	/**
+	 * Adds the fulltext switch to the search form
+	 *
+	 * @access	protected
+	 *
+	 * @param int $isFulltextSearch
+	 *
+	 * @return	string		HTML output of fulltext switch
+	 */
+	protected function addFulltextSwitch($isFulltextSearch = 0) {
 
-        $output = '';
+		$output = '';
 
-        // Check for plugin configuration.
-        if (!empty($this->conf['fulltext'])) {
+		// Check for plugin configuration.
+		if (!empty($this->conf['fulltext'])) {
 
-            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-no" type="radio" name="'.$this->prefixId.'[fulltext]" value="0" '.($isFulltextSearch == 0 ? 'checked="checked"' : '').' />';
+			$output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-no" type="radio" name="'.$this->prefixId.'[fulltext]" value="0" '.($isFulltextSearch == 0 ? 'checked="checked"' : '').' />';
 
-            $output .= ' <label for="tx-dlf-search-fulltext-no">'.$this->pi_getLL('label.inMetadata', '').'</label>';
+			$output .= ' <label for="tx-dlf-search-fulltext-no">'.$this->pi_getLL('label.inMetadata', '').'</label>';
 
-            $output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-yes" type="radio" name="'.$this->prefixId.'[fulltext]" value="1" '.($isFulltextSearch == 1 ? 'checked="checked"' : '').'/>';
+			$output .= ' <input class="tx-dlf-search-fulltext" id="tx-dlf-search-fulltext-yes" type="radio" name="'.$this->prefixId.'[fulltext]" value="1" '.($isFulltextSearch == 1 ? 'checked="checked"' : '').'/>';
 
-            $output .= ' <label for="tx-dlf-search-fulltext-yes">'.$this->pi_getLL('label.inFulltext', '').'</label>';
+			$output .= ' <label for="tx-dlf-search-fulltext-yes">'.$this->pi_getLL('label.inFulltext', '').'</label>';
 
-        }
+		}
 
-        return $output;
+		return $output;
 
-    }
+	}
 
-    /**
-     * Adds the logical page field to the search form
-     *
-     * @access	protected
-     *
-     * @return	string		HTML output of logical page field
-     */
-    protected function addLogicalPage() {
+	/**
+	 * Adds the logical page field to the search form
+	 *
+	 * @access	protected
+	 *
+	 * @return	string		HTML output of logical page field
+	 */
+	protected function addLogicalPage() {
 		
-        $output = '';
+		$output = '';
 
-        // Check for plugin configuration.
-        if (!empty($this->conf['showLogicalPageField'])) {
+		// Check for plugin configuration.
+		if (!empty($this->conf['showLogicalPageField'])) {
 			
-            $output .= ' <label for="tx-dlf-search-logical-page">'.$this->pi_getLL('label.logicalPage', '').': </label>';
+			$output .= ' <label for="tx-dlf-search-logical-page">'.$this->pi_getLL('label.logicalPage', '').': </label>';
 			
-            $output .= ' <input class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" type="text" name="'.$this->prefixId.'[logicalPage]" />';
+			$output .= ' <input class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" type="text" name="'.$this->prefixId.'[logicalPage]" />';
 			
-        }
+		}
 
-        return $output;
+		return $output;
 		
-    }
+	}
 
-    /**
-     * Creates an array for a HMENU entry of a facet value.
-     *
-     * @param	string		$field: The facet's index_name
-     * @param	string		$value: The facet's value
-     * @param	integer		$count: Number of hits for this facet
-     * @param	array		$search: The parameters of the current search query
-     * @param	string		&$state: The state of the parent item
-     *
-     * @return	array		The array for the facet's menu entry
-     */
-    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
+	/**
+	 * Creates an array for a HMENU entry of a facet value.
+	 *
+	 * @param	string		$field: The facet's index_name
+	 * @param	string		$value: The facet's value
+	 * @param	integer		$count: Number of hits for this facet
+	 * @param	array		$search: The parameters of the current search query
+	 * @param	string		&$state: The state of the parent item
+	 *
+	 * @return	array		The array for the facet's menu entry
+	 */
+	protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
 
-        $entryArray = array ();
+		$entryArray = array ();
 
-        // Translate value.
-        if ($field == 'owner_faceting') {
+		// Translate value.
+		if ($field == 'owner_faceting') {
 
-            // Translate name of holding library.
-            $entryArray['title'] = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
+			// Translate name of holding library.
+			$entryArray['title'] = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_libraries', $this->conf['pages']));
 
-        } elseif ($field == 'type_faceting') {
+		} elseif ($field == 'type_faceting') {
 
-            // Translate document type.
-            $entryArray['title'] = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
+			// Translate document type.
+			$entryArray['title'] = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_structures', $this->conf['pages']));
 
-        } elseif ($field == 'collection_faceting') {
+		} elseif ($field == 'collection_faceting') {
 
-            // Translate name of collection.
-            $entryArray['title'] = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_collections', $this->conf['pages']));
+			// Translate name of collection.
+			$entryArray['title'] = htmlspecialchars(tx_dlf_helper::translate($value, 'tx_dlf_collections', $this->conf['pages']));
 
-        } elseif ($field == 'language_faceting') {
+		} elseif ($field == 'language_faceting') {
 
-            // Translate ISO 639 language code.
-            $entryArray['title'] = htmlspecialchars(tx_dlf_helper::getLanguageName($value));
+			// Translate ISO 639 language code.
+			$entryArray['title'] = htmlspecialchars(tx_dlf_helper::getLanguageName($value));
 
-        } else {
+		} else {
 
-            $entryArray['title'] = htmlspecialchars($value);
+			$entryArray['title'] = htmlspecialchars($value);
 
-        }
+		}
 
-        $entryArray['count'] = $count;
+		$entryArray['count'] = $count;
 
-        $entryArray['doNotLinkIt'] = 0;
+		$entryArray['doNotLinkIt'] = 0;
 
-        // Check if facet is already selected.
-        $index = array_search($field.':("'.tx_dlf_solr::escapeQuery($value).'")', $search['params']['fq']);
+		// Check if facet is already selected.
+		$index = array_search($field.':("'.tx_dlf_solr::escapeQuery($value).'")', $search['params']['fq']);
 
-        if ($index !== FALSE) {
+		if ($index !== FALSE) {
 
-            // Facet is selected, thus remove it from filter.
-            unset($search['params']['fq'][$index]);
+			// Facet is selected, thus remove it from filter.
+			unset($search['params']['fq'][$index]);
 
-            $search['params']['fq'] = array_values($search['params']['fq']);
+			$search['params']['fq'] = array_values($search['params']['fq']);
 
-            $entryArray['ITEM_STATE'] = 'CUR';
+			$entryArray['ITEM_STATE'] = 'CUR';
 
-            $state = 'ACTIFSUB';
+			$state = 'ACTIFSUB';
 
-            //Reset facets
-            if ($this->conf['resetFacets']) {
-                //remove ($count) for selected facet in template
-                $entryArray['count'] = FALSE;
-                //build link to delete selected facet
-                $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $search['params']['fq']));
-                $entryArray['title'] = sprintf($this->pi_getLL('resetFacet', ''), $entryArray['title']);
-            }
+			//Reset facets
+			if ($this->conf['resetFacets']) {
+				//remove ($count) for selected facet in template
+				$entryArray['count'] = FALSE;
+				//build link to delete selected facet
+				$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $search['params']['fq']));
+				$entryArray['title'] = sprintf($this->pi_getLL('resetFacet', ''), $entryArray['title']);
+			}
 
-        } else {
+		} else {
 
-            // Facet is not selected, thus add it to filter.
-            $search['params']['fq'][] = $field.':("'.tx_dlf_solr::escapeQuery($value).'")';
+			// Facet is not selected, thus add it to filter.
+			$search['params']['fq'][] = $field.':("'.tx_dlf_solr::escapeQuery($value).'")';
 
-            $entryArray['ITEM_STATE'] = 'NO';
+			$entryArray['ITEM_STATE'] = 'NO';
 
-        }
+		}
 
-        $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $search['params']['fq']));
+		$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $search['params']['fq']));
 
-        return $entryArray;
+		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);
 
-        // Disable caching for this plugin.
-        $this->setCache(FALSE);
+		// Disable caching for this plugin.
+		$this->setCache(FALSE);
 
-        // Quit without doing anything if required variables are not set.
-        if (empty($this->conf['solrcore'])) {
+		// Quit without doing anything if required variables are not set.
+		if (empty($this->conf['solrcore'])) {
 
-            if (TYPO3_DLOG) {
+			if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
-            }
+			}
 
-            return $content;
+			return $content;
 
-        }
+		}
 
-        if (!isset($this->piVars['query']) && empty($this->piVars['extQuery'])) {
+		if (!isset($this->piVars['query']) && empty($this->piVars['extQuery'])) {
 
-            // Extract query and filter from last search.
-            $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+			// Extract query and filter from last search.
+			$list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-            if (!empty($list->metadata['searchString'])) {
+			if (!empty($list->metadata['searchString'])) {
 
-                if ($list->metadata['options']['source'] == 'search') {
+				if ($list->metadata['options']['source'] == 'search') {
 
-                    $search['query'] = $list->metadata['searchString'];
+					$search['query'] = $list->metadata['searchString'];
 
-                }
+				}
 
-                $search['params'] = $list->metadata['options']['params'];
+				$search['params'] = $list->metadata['options']['params'];
 
-            }
+			}
 
-            // Add javascript for search suggestions if enabled and jQuery autocompletion is available.
-            if (!empty($this->conf['suggest'])) {
+			// Add javascript for search suggestions if enabled and jQuery autocompletion is available.
+			if (!empty($this->conf['suggest'])) {
 
-                $this->addAutocompleteJS();
+				$this->addAutocompleteJS();
 
-            }
+			}
 
-            // 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/search/template.tmpl'), '###TEMPLATE###');
+				$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/search/template.tmpl'), '###TEMPLATE###');
 
-            }
+			}
 
-            // 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
+			);
 
-            // Fill markers.
-            $markerArray = array (
-                '###ACTION_URL###' => $this->cObj->typoLink_URL($linkConf),
-                '###LABEL_QUERY###' => (!empty($search['query']) ? $search['query'] : $this->pi_getLL('label.query')),
-                '###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),
-                '###FIELD_QUERY###' => $this->prefixId.'[query]',
-                '###QUERY###' => (!empty($search['query']) ? $search['query'] : ''),
-                '###FULLTEXTSWITCH###' => $this->addFulltextSwitch($list->metadata['fulltextSearch']),
-                '###FIELD_DOC###' => ($this->conf['searchIn'] == 'document' || $this->conf['searchIn'] == 'all' ? $this->addCurrentDocument() : ''),
-                '###FIELD_COLL###' => ($this->conf['searchIn'] == 'collection' || $this->conf['searchIn'] == 'all' ? $this->addCurrentCollection() : ''),
-                '###ADDITIONAL_INPUTS###' => $this->addEncryptedCoreName(),
-                '###FACETS_MENU###' => $this->addFacetsMenu(),
-                '###LOGICAL_PAGE###' => $this->addLogicalPage()
-            );
+			// Fill markers.
+			$markerArray = array (
+				'###ACTION_URL###' => $this->cObj->typoLink_URL($linkConf),
+				'###LABEL_QUERY###' => (!empty($search['query']) ? $search['query'] : $this->pi_getLL('label.query')),
+				'###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),
+				'###FIELD_QUERY###' => $this->prefixId.'[query]',
+				'###QUERY###' => (!empty($search['query']) ? $search['query'] : ''),
+				'###FULLTEXTSWITCH###' => $this->addFulltextSwitch($list->metadata['fulltextSearch']),
+				'###FIELD_DOC###' => ($this->conf['searchIn'] == 'document' || $this->conf['searchIn'] == 'all' ? $this->addCurrentDocument() : ''),
+				'###FIELD_COLL###' => ($this->conf['searchIn'] == 'collection' || $this->conf['searchIn'] == 'all' ? $this->addCurrentCollection() : ''),
+				'###ADDITIONAL_INPUTS###' => $this->addEncryptedCoreName(),
+				'###FACETS_MENU###' => $this->addFacetsMenu(),
+				'###LOGICAL_PAGE###' => $this->addLogicalPage()
+			);
 
-            // Get additional fields for extended search.
-            $extendedSearch = $this->addExtendedSearch();
+			// Get additional fields for extended search.
+			$extendedSearch = $this->addExtendedSearch();
 
-            // Display search form.
-            $content .= $this->cObj->substituteSubpart($this->cObj->substituteMarkerArray($this->template, $markerArray), '###EXT_SEARCH_ENTRY###', $extendedSearch);
+			// Display search form.
+			$content .= $this->cObj->substituteSubpart($this->cObj->substituteMarkerArray($this->template, $markerArray), '###EXT_SEARCH_ENTRY###', $extendedSearch);
 
-            return $this->pi_wrapInBaseClass($content);
+			return $this->pi_wrapInBaseClass($content);
 
-        } else {
+		} else {
 
-            // Instantiate search object.
-            $solr = tx_dlf_solr::getInstance($this->conf['solrcore']);
+			// Instantiate search object.
+			$solr = tx_dlf_solr::getInstance($this->conf['solrcore']);
 
-            if (!$solr->ready) {
+			if (!$solr->ready) {
 
-                if (TYPO3_DLOG) {
+				if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
+					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
 
-                }
+				}
 
-                return $content;
+				return $content;
 
-            }
+			}
 
-            // Build label for result list.
-            $label = $this->pi_getLL('search', '', TRUE);
+			// Build label for result list.
+			$label = $this->pi_getLL('search', '', TRUE);
 
-            if (!empty($this->piVars['query'])) {
+			if (!empty($this->piVars['query'])) {
 
-                $label .= htmlspecialchars(sprintf($this->pi_getLL('for', ''), $this->piVars['query']));
+				$label .= htmlspecialchars(sprintf($this->pi_getLL('for', ''), $this->piVars['query']));
 
-            }
+			}
 
-            // Prepare query parameters.
-            $params = array ();
+			// Prepare query parameters.
+			$params = array ();
 
-            $matches = array ();
+			$matches = array ();
 
-            // Set search query.
-            if ((!empty($this->conf['fulltext']) && !empty($this->piVars['fulltext'])) || preg_match('/fulltext:\((.*)\)/', $this->piVars['query'], $matches)) {
+			// Set search query.
+			if ((!empty($this->conf['fulltext']) && !empty($this->piVars['fulltext'])) || preg_match('/fulltext:\((.*)\)/', $this->piVars['query'], $matches)) {
 
-                // If the query already is a fulltext query e.g using the facets
-                $this->piVars['query'] = empty($matches[1]) ? $this->piVars['query'] : $matches[1];
+				// If the query already is a fulltext query e.g using the facets
+				$this->piVars['query'] = empty($matches[1]) ? $this->piVars['query'] : $matches[1];
 
-                // Search in fulltext field if applicable. query must not be empty!
-                if (!empty($this->piVars['query'])) {
+				// Search in fulltext field if applicable. query must not be empty!
+				if (!empty($this->piVars['query'])) {
 
-                    $query = 'fulltext:('.tx_dlf_solr::escapeQuery($this->piVars['query']).')';
+					$query = 'fulltext:('.tx_dlf_solr::escapeQuery($this->piVars['query']).')';
 
-                }
+				}
 
-                // Add highlighting for fulltext.
-                $params['hl'] = 'true';
+				// Add highlighting for fulltext.
+				$params['hl'] = 'true';
 
-                $params['hl.fl'] = 'fulltext';
+				$params['hl.fl'] = 'fulltext';
 
-            } else {
-                // Retain given search field if valid.
-                $query = tx_dlf_solr::escapeQueryKeepField($this->piVars['query'], $this->conf['pages']);
+			} else {
+				// Retain given search field if valid.
+				$query = tx_dlf_solr::escapeQueryKeepField($this->piVars['query'], $this->conf['pages']);
 
-            }
+			}
 
-            // Add extended search query.
-            if (!empty($this->piVars['extQuery']) && is_array($this->piVars['extQuery'])) {
+			// Add extended search query.
+			if (!empty($this->piVars['extQuery']) && is_array($this->piVars['extQuery'])) {
 
-                $allowedOperators = array ('AND', 'OR', 'NOT');
+				$allowedOperators = array ('AND', 'OR', 'NOT');
 
-                $allowedFields = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
+				$allowedFields = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
 
-                for ($i = 0; $i < count($this->piVars['extQuery']); $i++) {
+				for ($i = 0; $i < count($this->piVars['extQuery']); $i++) {
 
-                    if (!empty($this->piVars['extQuery'][$i])) {
+					if (!empty($this->piVars['extQuery'][$i])) {
 
-                        if (in_array($this->piVars['extOperator'][$i], $allowedOperators) && in_array($this->piVars['extField'][$i], $allowedFields)) {
+						if (in_array($this->piVars['extOperator'][$i], $allowedOperators) && in_array($this->piVars['extField'][$i], $allowedFields)) {
 
-                            if (!empty($query)) {
+							if (!empty($query)) {
 
-                                $query .= ' '.$this->piVars['extOperator'][$i].' ';
+								$query .= ' '.$this->piVars['extOperator'][$i].' ';
 
-                            }
+							}
 
-                            $query .= tx_dlf_indexing::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']).':('.tx_dlf_solr::escapeQuery($this->piVars['extQuery'][$i]).')';
+							$query .= tx_dlf_indexing::getIndexFieldName($this->piVars['extField'][$i], $this->conf['pages']).':('.tx_dlf_solr::escapeQuery($this->piVars['extQuery'][$i]).')';
 
-                        }
+						}
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-            // Add filter query for faceting.
-            if (!empty($this->piVars['fq'])) {
+			// Add filter query for faceting.
+			if (!empty($this->piVars['fq'])) {
 
-                $params['fq'] = $this->piVars['fq'];
+				$params['fq'] = $this->piVars['fq'];
 
-            }
+			}
 
-            // Add filter query for in-document searching.
-            if ($this->conf['searchIn'] == 'document' || $this->conf['searchIn'] == 'all') {
+			// Add filter query for in-document searching.
+			if ($this->conf['searchIn'] == 'document' || $this->conf['searchIn'] == 'all') {
 
-                if (!empty($this->piVars['id']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['id'])) {
+				if (!empty($this->piVars['id']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['id'])) {
 
-                    $params['fq'][] = 'uid:('.$this->piVars['id'].') OR partof:('.$this->piVars['id'].')';
+					$params['fq'][] = 'uid:('.$this->piVars['id'].') OR partof:('.$this->piVars['id'].')';
 
-                    $label .= htmlspecialchars(sprintf($this->pi_getLL('in', ''), tx_dlf_document::getTitle($this->piVars['id'])));
+					$label .= htmlspecialchars(sprintf($this->pi_getLL('in', ''), tx_dlf_document::getTitle($this->piVars['id'])));
 
-                }
+				}
 
-            }
+			}
 
-            // Add filter query for in-collection searching.
-            if ($this->conf['searchIn'] == 'collection' || $this->conf['searchIn'] == 'all') {
+			// Add filter query for in-collection searching.
+			if ($this->conf['searchIn'] == 'collection' || $this->conf['searchIn'] == 'all') {
 
-                if (!empty($this->piVars['collection']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['collection'])) {
+				if (!empty($this->piVars['collection']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->piVars['collection'])) {
 
-                    $index_name = tx_dlf_helper::getIndexName($this->piVars['collection'], 'tx_dlf_collections', $this->conf['pages']);
+					$index_name = tx_dlf_helper::getIndexName($this->piVars['collection'], 'tx_dlf_collections', $this->conf['pages']);
 
-                    $params['fq'][] = 'collection_faceting:("'.tx_dlf_solr::escapeQuery($index_name).'")';
+					$params['fq'][] = 'collection_faceting:("'.tx_dlf_solr::escapeQuery($index_name).'")';
 
-                    $label .= sprintf($this->pi_getLL('in', '', TRUE), tx_dlf_helper::translate($index_name, 'tx_dlf_collections', $this->conf['pages']));
+					$label .= sprintf($this->pi_getLL('in', '', TRUE), tx_dlf_helper::translate($index_name, 'tx_dlf_collections', $this->conf['pages']));
 
-                }
+				}
 
-            }
+			}
 
-            // Add filter query for collection restrictions.
-            if ($this->conf['collections']) {
+			// Add filter query for collection restrictions.
+			if ($this->conf['collections']) {
 
-                $collIds = explode(',', $this->conf['collections']);
+				$collIds = explode(',', $this->conf['collections']);
 
-                $collIndexNames = array ();
+				$collIndexNames = array ();
 
-                foreach ($collIds as $collId) {
+				foreach ($collIds as $collId) {
 
-                    $collIndexNames[] = tx_dlf_solr::escapeQuery(tx_dlf_helper::getIndexName(intval($collId), 'tx_dlf_collections', $this->conf['pages']));
+					$collIndexNames[] = tx_dlf_solr::escapeQuery(tx_dlf_helper::getIndexName(intval($collId), 'tx_dlf_collections', $this->conf['pages']));
 
-                }
+				}
 
-                // Last value is fake and used for distinction in $this->addCurrentCollection()
-                $params['fq'][] = 'collection_faceting:("'.implode('" OR "', $collIndexNames).'" OR "FakeValueForDistinction")';
+				// Last value is fake and used for distinction in $this->addCurrentCollection()
+				$params['fq'][] = 'collection_faceting:("'.implode('" OR "', $collIndexNames).'" OR "FakeValueForDistinction")';
 
-            }
+			}
 
-            // Set search parameters.
-            $solr->limit = max(intval($this->conf['limit']), 1);
+			// Set search parameters.
+			$solr->limit = max(intval($this->conf['limit']), 1);
 
-            $solr->cPid = $this->conf['pages'];
+			$solr->cPid = $this->conf['pages'];
 
-            $solr->params = $params;
+			$solr->params = $params;
 
-            // Perform search.
-            $results = $solr->search($query);
+			// Perform search.
+			$results = $solr->search($query);
 
-            $results->metadata = array (
-                'label' => $label,
-                'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $solr->numberOfHits, count($results))).'</p>',
-                'thumbnail' => '',
-                'searchString' => $this->piVars['query'],
-                'fulltextSearch' => (!empty($this->piVars['fulltext']) ? '1' : '0'),
-                'options' => $results->metadata['options']
-            );
+			$results->metadata = array (
+				'label' => $label,
+				'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $solr->numberOfHits, count($results))).'</p>',
+				'thumbnail' => '',
+				'searchString' => $this->piVars['query'],
+				'fulltextSearch' => (!empty($this->piVars['fulltext']) ? '1' : '0'),
+				'options' => $results->metadata['options']
+			);
 
-            $results->save();
+			$results->save();
 
-            // Clean output buffer.
-            \TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
+			// Clean output buffer.
+			\TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
 
-            $additionalParams = array ();
+			$additionalParams = array ();
 
-            if (!empty($this->piVars['logicalPage'])) {
+			if (!empty($this->piVars['logicalPage'])) {
 
-                $additionalParams['logicalPage'] = $this->piVars['logicalPage'];
+				$additionalParams['logicalPage'] = $this->piVars['logicalPage'];
 
-            }
+			}
 
-            // Jump directly to the page view, if there is only one result and it is configured
-            if ($results->count() == 1 && !empty($this->conf['showSingleResult'])) {
+			// Jump directly to the page view, if there is only one result and it is configured
+			if ($results->count() == 1 && !empty($this->conf['showSingleResult'])) {
 
-                $linkConf['parameter'] = $this->conf['targetPidPageView'];
+				$linkConf['parameter'] = $this->conf['targetPidPageView'];
 
-                $additionalParams['id'] = $results->current()['uid'];
-                $additionalParams['highlight_word'] = preg_replace('/\s\s+/', ';', $results->metadata['searchString']);
-                $additionalParams['page'] = count($results[0]['subparts']) == 1 ? $results[0]['subparts'][0]['page'] : 1;
+				$additionalParams['id'] = $results->current()['uid'];
+				$additionalParams['highlight_word'] = preg_replace('/\s\s+/', ';', $results->metadata['searchString']);
+				$additionalParams['page'] = count($results[0]['subparts']) == 1 ? $results[0]['subparts'][0]['page'] : 1;
 
-            } else {
+			} else {
 
-                // Keep some plugin variables.
-                $linkConf['parameter'] = $this->conf['targetPid'];
+				// Keep some plugin variables.
+				$linkConf['parameter'] = $this->conf['targetPid'];
 
-                if (!empty($this->piVars['order'])) {
+				if (!empty($this->piVars['order'])) {
 
-                    $additionalParams['order'] = $this->piVars['order'];
-                    $additionalParams['asc'] = !empty($this->piVars['asc']) ? '1' : '0';
+					$additionalParams['order'] = $this->piVars['order'];
+					$additionalParams['asc'] = !empty($this->piVars['asc']) ? '1' : '0';
 
-                }
+				}
 
-            }
+			}
 
-            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE);
+			$linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE);
 
-            // Send headers.
-            header('Location: '.\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
+			// Send headers.
+			header('Location: '.\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));
 
-            // Flush output buffer and end script processing.
-            ob_end_flush();
+			// Flush output buffer and end script processing.
+			ob_end_flush();
 
-            exit;
+			exit;
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * 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 makeFacetsMenuArray($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 makeFacetsMenuArray($content, $conf) {
 
-        $this->init($conf);
+		$this->init($conf);
 
-        $menuArray = array ();
+		$menuArray = array ();
 
-        // Set default value for facet search.
-        $search = array (
-            'query' => '*',
-            'params' => array ()
-        );
+		// Set default value for facet search.
+		$search = array (
+			'query' => '*',
+			'params' => array ()
+		);
 
-        // Extract query and filter from last search.
-        $list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+		// Extract query and filter from last search.
+		$list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-        if (!empty($list->metadata['options']['source'])) {
+		if (!empty($list->metadata['options']['source'])) {
 
-            if ($list->metadata['options']['source'] == 'search') {
+			if ($list->metadata['options']['source'] == 'search') {
 
-                $search['query'] = $list->metadata['options']['select'];
+				$search['query'] = $list->metadata['options']['select'];
 
-            }
+			}
 
-            $search['params'] = $list->metadata['options']['params'];
+			$search['params'] = $list->metadata['options']['params'];
 
-        }
+		}
 
-        // Get applicable facets.
-        $solr = tx_dlf_solr::getInstance($this->conf['solrcore']);
+		// Get applicable facets.
+		$solr = tx_dlf_solr::getInstance($this->conf['solrcore']);
 
-        if (!$solr->ready) {
+		if (!$solr->ready) {
 
-            if (TYPO3_DLOG) {
+			if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->makeFacetsMenuArray('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_search->makeFacetsMenuArray('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
 
-            }
+			}
 
-            return array ();
+			return array ();
 
-        }
+		}
 
-        // Set needed parameters for facet search.
-        if (empty($search['params']['fq'])) {
+		// Set needed parameters for facet search.
+		if (empty($search['params']['fq'])) {
 
-            $search['params']['fq'] = array ();
+			$search['params']['fq'] = array ();
 
-        }
+		}
 
-        $search['params']['facet'] = 'true';
+		$search['params']['facet'] = 'true';
 
-        $search['params']['facet.field'] = array_keys($this->conf['facets']);
+		$search['params']['facet.field'] = array_keys($this->conf['facets']);
 
-        //override SOLR default value for facet.limit of 100
-        $search['params']['facet.limit'] = $this->conf['limitFacets'];
+		//override SOLR default value for facet.limit of 100
+		$search['params']['facet.limit'] = $this->conf['limitFacets'];
 
-        // Perform search.
-        $results = $solr->service->search($search['query'], 0, $this->conf['limit'], $search['params']);
+		// Perform search.
+		$results = $solr->service->search($search['query'], 0, $this->conf['limit'], $search['params']);
 
-        // Process results.
-        foreach ($results->facet_counts->facet_fields as $field => $values) {
+		// Process results.
+		foreach ($results->facet_counts->facet_fields as $field => $values) {
 
-            $entryArray = array ();
+			$entryArray = array ();
 
-            $entryArray['title'] = htmlspecialchars($this->conf['facets'][$field]);
+			$entryArray['title'] = htmlspecialchars($this->conf['facets'][$field]);
 
-            $entryArray['count'] = 0;
+			$entryArray['count'] = 0;
 
-            $entryArray['_OVERRIDE_HREF'] = '';
+			$entryArray['_OVERRIDE_HREF'] = '';
 
-            $entryArray['doNotLinkIt'] = 1;
+			$entryArray['doNotLinkIt'] = 1;
 
-            $entryArray['ITEM_STATE'] = 'NO';
+			$entryArray['ITEM_STATE'] = 'NO';
 
-            // Count number of facet values.
-            $i = 0;
+			// Count number of facet values.
+			$i = 0;
 
-            foreach ($values as $value => $count) {
+			foreach ($values as $value => $count) {
 
-                if ($count > 0) {
+				if ($count > 0) {
 
-                    $hasValue = TRUE;
+					$hasValue = TRUE;
 
-                    $entryArray['count']++;
+					$entryArray['count']++;
 
-                    if ($entryArray['ITEM_STATE'] == 'NO') {
+					if ($entryArray['ITEM_STATE'] == 'NO') {
 
-                        $entryArray['ITEM_STATE'] = 'IFSUB';
+						$entryArray['ITEM_STATE'] = 'IFSUB';
 
-                    }
+					}
 
-                    $entryArray['_SUB_MENU'][] = $this->getFacetsMenuEntry($field, $value, $count, $search, $entryArray['ITEM_STATE']);
+					$entryArray['_SUB_MENU'][] = $this->getFacetsMenuEntry($field, $value, $count, $search, $entryArray['ITEM_STATE']);
 
-                    if (++$i == $this->conf['limit']) {
+					if (++$i == $this->conf['limit']) {
 
-                        break;
+						break;
 
-                    }
+					}
 
-                } else {
+				} else {
 
-                    break;
+					break;
 
-                }
+				}
 
-            }
+			}
 
-            $menuArray[] = $entryArray;
+			$menuArray[] = $entryArray;
 
-        }
+		}
 
-        return $menuArray;
+		return $menuArray;
 
 
-    }
+	}
 
 }

Spacing +21 added lines, -21 removed lines

@@ -198,7 +198,7 @@ 
         // Get operator options.
         $operatorOptions = '';
 
-        foreach (array ('AND', 'OR', 'NOT') as $operator) {
+        foreach (array('AND', 'OR', 'NOT') as $operator) {
 
             $operatorOptions .= '<option class="tx-dlf-search-operator-option tx-dlf-search-operator-'.$operator.'" value="'.$operator.'">'.$this->pi_getLL($operator, '', TRUE).'</option>';
 
@@ -217,7 +217,7 @@ 
 
         for ($i = 0; $i < $this->conf['extendedSlotCount']; $i++) {
 
-            $markerArray = array (
+            $markerArray = array(
                 '###EXT_SEARCH_OPERATOR###' => '<select class="tx-dlf-search-operator tx-dlf-search-operator-'.$i.'" name="'.$this->prefixId.'[extOperator]['.$i.']">'.$operatorOptions.'</select>',
                 '###EXT_SEARCH_FIELDSELECTOR###' => '<select class="tx-dlf-search-field tx-dlf-search-field-'.$i.'" name="'.$this->prefixId.'[extField]['.$i.']">'.$fieldSelectorOptions.'</select>',
                 '###EXT_SEARCH_FIELDQUERY###' => '<input class="tx-dlf-search-query tx-dlf-search-query-'.$i.'" type="text" name="'.$this->prefixId.'[extQuery]['.$i.']" />'
@@ -261,7 +261,7 @@ 
         }
 
         // Get facets from plugin configuration.
-        $facets = array ();
+        $facets = array();
 
         foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['facets'], TRUE) as $facet) {
 
@@ -270,7 +270,7 @@ 
         }
 
         // Render facets menu.
-        $TSconfig = array ();
+        $TSconfig = array();
 
         $TSconfig['special'] = 'userfunction';
 
@@ -353,7 +353,7 @@ 
      */
     protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
 
-        $entryArray = array ();
+        $entryArray = array();
 
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -405,7 +405,7 @@ 
                 //remove ($count) for selected facet in template
                 $entryArray['count'] = FALSE;
                 //build link to delete selected facet
-                $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $search['params']['fq']));
+                $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('query' => $search['query'], 'fq' => $search['params']['fq']));
                 $entryArray['title'] = sprintf($this->pi_getLL('resetFacet', ''), $entryArray['title']);
             }
 
@@ -418,7 +418,7 @@ 
 
         }
 
-        $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('query' => $search['query'], 'fq' => $search['params']['fq']));
+        $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array('query' => $search['query'], 'fq' => $search['params']['fq']));
 
         return $entryArray;
 
@@ -490,13 +490,13 @@ 
             }
 
             // Configure @action URL for form.
-            $linkConf = array (
+            $linkConf = array(
                 'parameter' => $GLOBALS['TSFE']->id,
                 'forceAbsoluteUrl' => 1
             );
 
             // Fill markers.
-            $markerArray = array (
+            $markerArray = array(
                 '###ACTION_URL###' => $this->cObj->typoLink_URL($linkConf),
                 '###LABEL_QUERY###' => (!empty($search['query']) ? $search['query'] : $this->pi_getLL('label.query')),
                 '###LABEL_SUBMIT###' => $this->pi_getLL('label.submit'),
@@ -545,9 +545,9 @@ 
             }
 
             // Prepare query parameters.
-            $params = array ();
+            $params = array();
 
-            $matches = array ();
+            $matches = array();
 
             // Set search query.
             if ((!empty($this->conf['fulltext']) && !empty($this->piVars['fulltext'])) || preg_match('/fulltext:\((.*)\)/', $this->piVars['query'], $matches)) {
@@ -576,7 +576,7 @@ 
             // Add extended search query.
             if (!empty($this->piVars['extQuery']) && is_array($this->piVars['extQuery'])) {
 
-                $allowedOperators = array ('AND', 'OR', 'NOT');
+                $allowedOperators = array('AND', 'OR', 'NOT');
 
                 $allowedFields = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['extendedFields'], TRUE);
 
@@ -642,7 +642,7 @@ 
 
                 $collIds = explode(',', $this->conf['collections']);
 
-                $collIndexNames = array ();
+                $collIndexNames = array();
 
                 foreach ($collIds as $collId) {
 
@@ -665,7 +665,7 @@ 
             // Perform search.
             $results = $solr->search($query);
 
-            $results->metadata = array (
+            $results->metadata = array(
                 'label' => $label,
                 'description' => '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $solr->numberOfHits, count($results))).'</p>',
                 'thumbnail' => '',
@@ -679,7 +679,7 @@ 
             // Clean output buffer.
             \TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
 
-            $additionalParams = array ();
+            $additionalParams = array();
 
             if (!empty($this->piVars['logicalPage'])) {
 
@@ -738,12 +738,12 @@ 
 
         $this->init($conf);
 
-        $menuArray = array ();
+        $menuArray = array();
 
         // Set default value for facet search.
-        $search = array (
+        $search = array(
             'query' => '*',
-            'params' => array ()
+            'params' => array()
         );
 
         // Extract query and filter from last search.
@@ -772,14 +772,14 @@ 
 
             }
 
-            return array ();
+            return array();
 
         }
 
         // Set needed parameters for facet search.
         if (empty($search['params']['fq'])) {
 
-            $search['params']['fq'] = array ();
+            $search['params']['fq'] = array();
 
         }
 
@@ -796,7 +796,7 @@ 
         // Process results.
         foreach ($results->facet_counts->facet_fields as $field => $values) {
 
-            $entryArray = array ();
+            $entryArray = array();
 
             $entryArray['title'] = htmlspecialchars($this->conf['facets'][$field]);
 

plugins/search/class.tx_dlf_search_suggest.php

Indentation +24 added lines, -24 removed lines

@@ -20,43 +20,43 @@
  */
 class tx_dlf_search_suggest extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 
-    public $scriptRelPath = 'plugins/search/class.tx_dlf_search_suggest.php';
+	public $scriptRelPath = 'plugins/search/class.tx_dlf_search_suggest.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 = array ()) {
+	/**
+	 * 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 = array ()) {
 
-        if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted') != '' && \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed') != '') {
+		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted') != '' && \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed') != '') {
 
-            $core = tx_dlf_helper::decrypt(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted'), \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed'));
+			$core = tx_dlf_helper::decrypt(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted'), \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed'));
 
-        }
+		}
 
-        if (!empty($core)) {
+		if (!empty($core)) {
 
-            $url = trim(tx_dlf_solr::getSolrUrl($core), '/').'/suggest/?q='.tx_dlf_solr::escapeQuery(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('q'));
+			$url = trim(tx_dlf_solr::getSolrUrl($core), '/').'/suggest/?q='.tx_dlf_solr::escapeQuery(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('q'));
 
-            if ($stream = fopen($url, 'r')) {
+			if ($stream = fopen($url, 'r')) {
 
-                $content .= stream_get_contents($stream);
+				$content .= stream_get_contents($stream);
 
-                fclose($stream);
+				fclose($stream);
 
-            }
+			}
 
-        }
+		}
 
-        echo $content;
+		echo $content;
 
-    }
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

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

plugins/newspaper/class.tx_dlf_newspaper.php

Indentation +274 added lines, -274 removed lines

@@ -20,406 +20,406 @@
  */
 class tx_dlf_newspaper extends tx_dlf_plugin {
 
-    public $extKey = 'dlf';
+	public $extKey = 'dlf';
 
-    public $scriptRelPath = 'plugins/newspaper/class.tx_dlf_newspaper.php';
+	public $scriptRelPath = 'plugins/newspaper/class.tx_dlf_newspaper.php';
 
-    /**
-     * The main method of the PlugIn
-     *
-     * @access	public
-     *
-     * @param	string		$content: The PlugIn content
-     * @param	array		$conf: The PlugIn configuration
-     *
-     * @return	string		The content that is displayed on the website
-     */
-    public function main($content, $conf) {
+	/**
+	 * The main method of the PlugIn
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$content: The PlugIn content
+	 * @param	array		$conf: The PlugIn configuration
+	 *
+	 * @return	string		The content that is displayed on the website
+	 */
+	public function main($content, $conf) {
 
-        // Nothing to do here.
-        return $content;
+		// Nothing to do here.
+		return $content;
 
-    }
+	}
 
-    /**
-     * The Calendar Method
-     *
-     * @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 calendar($content, $conf) {
+	/**
+	 * The Calendar Method
+	 *
+	 * @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 calendar($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 $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']), '###TEMPLATECALENDAR###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATECALENDAR###');
 
-        } else {
+		} else {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/newspaper/template.tmpl'), '###TEMPLATECALENDAR###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/newspaper/template.tmpl'), '###TEMPLATECALENDAR###');
 
-        }
+		}
 
-        // Get all children of year anchor.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_documents.uid AS uid, tx_dlf_documents.title AS title, tx_dlf_documents.year AS year',
-            'tx_dlf_documents',
-            '(tx_dlf_documents.structure='.tx_dlf_helper::getIdFromIndexName('issue', 'tx_dlf_structures', $this->doc->pid).' AND tx_dlf_documents.partof='.intval($this->doc->uid).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
-            '',
-            'title ASC',
-            ''
-        );
+		// Get all children of year anchor.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_documents.uid AS uid, tx_dlf_documents.title AS title, tx_dlf_documents.year AS year',
+			'tx_dlf_documents',
+			'(tx_dlf_documents.structure='.tx_dlf_helper::getIdFromIndexName('issue', 'tx_dlf_structures', $this->doc->pid).' AND tx_dlf_documents.partof='.intval($this->doc->uid).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+			'',
+			'title ASC',
+			''
+		);
 
-        // Process results.
-        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+		// Process results.
+		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-            $issues[] = array (
-                'uid' => $resArray['uid'],
-                'title' => $resArray['title'],
-                'year' => $resArray['year']
-            );
+			$issues[] = array (
+				'uid' => $resArray['uid'],
+				'title' => $resArray['title'],
+				'year' => $resArray['year']
+			);
 
-        }
+		}
 
-        // 	We need an array of issues with month number as key.
-        $calendarIssues = array ();
+		// 	We need an array of issues with month number as key.
+		$calendarIssues = array ();
 
-        foreach ($issues as $issue) {
+		foreach ($issues as $issue) {
 
-            $calendarIssues[date('n', strtotime($issue['year']))][date('j', strtotime($issue['year']))][] = $issue;
+			$calendarIssues[date('n', strtotime($issue['year']))][date('j', strtotime($issue['year']))][] = $issue;
 
-        }
+		}
 
-        $allIssues = array ();
+		$allIssues = array ();
 
-        // Get subpart templates.
-        $subparts['list'] = $this->cObj->getSubpart($this->template, '###ISSUELIST###');
+		// Get subpart templates.
+		$subparts['list'] = $this->cObj->getSubpart($this->template, '###ISSUELIST###');
 
-        $subparts['month'] = $this->cObj->getSubpart($this->template, '###CALMONTH###');
+		$subparts['month'] = $this->cObj->getSubpart($this->template, '###CALMONTH###');
 
-        $subparts['week'] = $this->cObj->getSubpart($subparts['month'], '###CALWEEK###');
+		$subparts['week'] = $this->cObj->getSubpart($subparts['month'], '###CALWEEK###');
 
-        $subparts['singleday'] = $this->cObj->getSubpart($subparts['list'], '###SINGLEDAY###');
+		$subparts['singleday'] = $this->cObj->getSubpart($subparts['list'], '###SINGLEDAY###');
 
-        // Build calendar for given year.
-        $year = date('Y', strtotime($issues[0]['year']));
+		// Build calendar for given year.
+		$year = date('Y', strtotime($issues[0]['year']));
 
-        for ($i = 0; $i <= 11; $i++) {
+		for ($i = 0; $i <= 11; $i++) {
 
-            $markerArray = array (
-                '###DAYMON_NAME###' => strftime('%a', strtotime('last Monday')),
-                '###DAYTUE_NAME###' => strftime('%a', strtotime('last Tuesday')),
-                '###DAYWED_NAME###' => strftime('%a', strtotime('last Wednesday')),
-                '###DAYTHU_NAME###' => strftime('%a', strtotime('last Thursday')),
-                '###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
-                '###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
-                '###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
-                '###MONTHNAME###' 	=> strftime('%B', strtotime($year.'-'.($i + 1).'-1'))
-            );
+			$markerArray = array (
+				'###DAYMON_NAME###' => strftime('%a', strtotime('last Monday')),
+				'###DAYTUE_NAME###' => strftime('%a', strtotime('last Tuesday')),
+				'###DAYWED_NAME###' => strftime('%a', strtotime('last Wednesday')),
+				'###DAYTHU_NAME###' => strftime('%a', strtotime('last Thursday')),
+				'###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
+				'###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
+				'###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
+				'###MONTHNAME###' 	=> strftime('%B', strtotime($year.'-'.($i + 1).'-1'))
+			);
 
-            // Reset week content of new month.
-            $subWeekPartContent = '';
+			// Reset week content of new month.
+			$subWeekPartContent = '';
 
-            $firstOfMonth = strtotime($year.'-'.($i + 1).'-1');
-            $lastOfMonth = strtotime('last day of', ($firstOfMonth));
-            $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
+			$firstOfMonth = strtotime($year.'-'.($i + 1).'-1');
+			$lastOfMonth = strtotime('last day of', ($firstOfMonth));
+			$firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
 
-            // There are never more than 6 weeks in a month.
-            for ($j = 0; $j <= 5; $j++) {
+			// There are never more than 6 weeks in a month.
+			for ($j = 0; $j <= 5; $j++) {
 
-                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
+				$firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
 
-                $weekArray = array (
-                    '###DAYMON###' => '&nbsp;',
-                    '###DAYTUE###' => '&nbsp;',
-                    '###DAYWED###' => '&nbsp;',
-                    '###DAYTHU###' => '&nbsp;',
-                    '###DAYFRI###' => '&nbsp;',
-                    '###DAYSAT###' => '&nbsp;',
-                    '###DAYSUN###' => '&nbsp;',
-                );
+				$weekArray = array (
+					'###DAYMON###' => '&nbsp;',
+					'###DAYTUE###' => '&nbsp;',
+					'###DAYWED###' => '&nbsp;',
+					'###DAYTHU###' => '&nbsp;',
+					'###DAYFRI###' => '&nbsp;',
+					'###DAYSAT###' => '&nbsp;',
+					'###DAYSUN###' => '&nbsp;',
+				);
 
-                // Every week has seven days. ;-)
-                for ($k = 0; $k <= 6; $k++) {
+				// Every week has seven days. ;-)
+				for ($k = 0; $k <= 6; $k++) {
 
-                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
+					$currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
 
-                    if ($currentDayTime >= $firstOfMonth && $currentDayTime <= $lastOfMonth) {
+					if ($currentDayTime >= $firstOfMonth && $currentDayTime <= $lastOfMonth) {
 
-                        $dayLinks = '';
+						$dayLinks = '';
 
-                        $dayLinksText = array ();
+						$dayLinksText = array ();
 
-                        $dayLinksList = '';
+						$dayLinksList = '';
 
-                        $currentMonth = date('n', $currentDayTime);
+						$currentMonth = date('n', $currentDayTime);
 
-                        if (is_array($calendarIssues[$currentMonth])) {
+						if (is_array($calendarIssues[$currentMonth])) {
 
-                            foreach ($calendarIssues[$currentMonth] as $id => $day) {
+							foreach ($calendarIssues[$currentMonth] as $id => $day) {
 
-                                if ($id == date('j', $currentDayTime)) {
+								if ($id == date('j', $currentDayTime)) {
 
-                                    $dayLinks = $id;
+									$dayLinks = $id;
 
-                                    foreach ($day as $issue) {
+									foreach ($day as $issue) {
 
-                                        $dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
+										$dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
 
-                                        $linkConf = array (
-                                            'useCacheHash' => 1,
-                                            'parameter' => $this->conf['targetPid'],
-                                            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
-                                            'ATagParams' => ' class="title"',
-                                        );
+										$linkConf = array (
+											'useCacheHash' => 1,
+											'parameter' => $this->conf['targetPid'],
+											'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
+											'ATagParams' => ' class="title"',
+										);
 
-                                        $dayLinksText[] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
+										$dayLinksText[] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
 
-                                        // Save issues for list view.
-                                        $allIssues[$currentDayTime][] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
-                                    }
-                                }
+										// Save issues for list view.
+										$allIssues[$currentDayTime][] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
+									}
+								}
 
-                            }
+							}
 
-                            if (!empty($dayLinksText)) {
+							if (!empty($dayLinksText)) {
 
-                                $dayLinksList = '<ul>';
+								$dayLinksList = '<ul>';
 
-                                foreach ($dayLinksText as $link) {
+								foreach ($dayLinksText as $link) {
 
-                                    $dayLinksList .= '<li>'.$link.'</li>';
+									$dayLinksList .= '<li>'.$link.'</li>';
 
-                                }
+								}
 
-                                $dayLinksList .= '</ul>';
+								$dayLinksList .= '</ul>';
 
-                            }
+							}
 
-                            $dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
-                        }
+							$dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
+						}
 
-                        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
+						switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
 
-                            case '0': $weekArray['###DAYSUN###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
-                                break;
+							case '0': $weekArray['###DAYSUN###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
+								break;
 
-                            case '1': $weekArray['###DAYMON###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
-                                break;
+							case '1': $weekArray['###DAYMON###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
+								break;
 
-                            case '2': $weekArray['###DAYTUE###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
-                                break;
+							case '2': $weekArray['###DAYTUE###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
+								break;
 
-                            case '3': $weekArray['###DAYWED###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
-                                break;
+							case '3': $weekArray['###DAYWED###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
+								break;
 
-                            case '4': $weekArray['###DAYTHU###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
-                                break;
+							case '4': $weekArray['###DAYTHU###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
+								break;
 
-                            case '5': $weekArray['###DAYFRI###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
-                                break;
+							case '5': $weekArray['###DAYFRI###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
+								break;
 
-                            case '6': $weekArray['###DAYSAT###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
-                                break;
+							case '6': $weekArray['###DAYSAT###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
+								break;
 
-                        }
+						}
 
-                    }
+					}
 
-                }
+				}
 
-                // Fill the weeks.
-                $subWeekPartContent .= $this->cObj->substituteMarkerArray($subparts['week'], $weekArray);
+				// Fill the weeks.
+				$subWeekPartContent .= $this->cObj->substituteMarkerArray($subparts['week'], $weekArray);
 
-            }
+			}
 
-            // Fill the month markers.
-            $subPartContent .= $this->cObj->substituteMarkerArray($subparts['month'], $markerArray);
+			// Fill the month markers.
+			$subPartContent .= $this->cObj->substituteMarkerArray($subparts['month'], $markerArray);
 
-            // Fill the week markers with the week entries.
-            $subPartContent = $this->cObj->substituteSubpart($subPartContent, '###CALWEEK###', $subWeekPartContent);
-        }
+			// Fill the week markers with the week entries.
+			$subPartContent = $this->cObj->substituteSubpart($subPartContent, '###CALWEEK###', $subWeekPartContent);
+		}
 
-        // Link to years overview
-        $linkConf = array (
-            'useCacheHash' => 1,
-            'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
-        );
+		// Link to years overview
+		$linkConf = array (
+			'useCacheHash' => 1,
+			'parameter' => $this->conf['targetPid'],
+			'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
+		);
 
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
+		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
 
-        // Link to current year.
-        $linkConf = array (
-            'useCacheHash' => 1,
-            'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
-        );
+		// Link to current year.
+		$linkConf = array (
+			'useCacheHash' => 1,
+			'parameter' => $this->conf['targetPid'],
+			'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
+		);
 
-        $yearLink = $this->cObj->typoLink($year, $linkConf);
+		$yearLink = $this->cObj->typoLink($year, $linkConf);
 
-        // Prepare list as alternative of the calendar view.
-        foreach ($allIssues as $dayTime => $issues) {
+		// Prepare list as alternative of the calendar view.
+		foreach ($allIssues as $dayTime => $issues) {
 
-            $markerArrayDay['###DATE_STRING###'] = strftime('%A, %x', $dayTime);
+			$markerArrayDay['###DATE_STRING###'] = strftime('%A, %x', $dayTime);
 
-            $markerArrayDay['###ITEMS###'] = '';
+			$markerArrayDay['###ITEMS###'] = '';
 
-            foreach ($issues as $issue) {
+			foreach ($issues as $issue) {
 
-                $markerArrayDay['###ITEMS###'] .= $issue;
+				$markerArrayDay['###ITEMS###'] .= $issue;
 
-            }
+			}
 
-            $subPartContentList .= $this->cObj->substituteMarkerArray($subparts['singleday'], $markerArrayDay);
+			$subPartContentList .= $this->cObj->substituteMarkerArray($subparts['singleday'], $markerArrayDay);
 
-        }
+		}
 
-        $this->template = $this->cObj->substituteSubpart($this->template, '###SINGLEDAY###', $subPartContentList);
+		$this->template = $this->cObj->substituteSubpart($this->template, '###SINGLEDAY###', $subPartContentList);
 
-        if (count($allIssues) < 6) {
+		if (count($allIssues) < 6) {
 
-            $listViewActive = TRUE;
+			$listViewActive = TRUE;
 
-        } else {
+		} else {
 
-            $listViewActive = FALSE;
+			$listViewActive = FALSE;
 
-        }
+		}
 
-        $markerArray = array (
-            '###CALENDARVIEWACTIVE###' => $listViewActive ? '' : 'active',
-            '###LISTVIEWACTIVE###' => $listViewActive ? 'active' : '',
-            '###CALYEAR###' => $yearLink,
-            '###CALALLYEARS###' => $allYearsLink,
-            '###LABEL_CALENDAR###' => $this->pi_getLL('label.view_calendar'),
-            '###LABEL_LIST_VIEW###' => $this->pi_getLL('label.view_list'),
-        );
+		$markerArray = array (
+			'###CALENDARVIEWACTIVE###' => $listViewActive ? '' : 'active',
+			'###LISTVIEWACTIVE###' => $listViewActive ? 'active' : '',
+			'###CALYEAR###' => $yearLink,
+			'###CALALLYEARS###' => $allYearsLink,
+			'###LABEL_CALENDAR###' => $this->pi_getLL('label.view_calendar'),
+			'###LABEL_LIST_VIEW###' => $this->pi_getLL('label.view_list'),
+		);
 
-        $this->template = $this->cObj->substituteMarkerArray($this->template, $markerArray);
+		$this->template = $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-        return $this->cObj->substituteSubpart($this->template, '###CALMONTH###', $subPartContent);
+		return $this->cObj->substituteSubpart($this->template, '###CALMONTH###', $subPartContent);
 
-    }
+	}
 
-    /**
-     * The Year Method
-     *
-     * @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 years($content, $conf) {
+	/**
+	 * The Year Method
+	 *
+	 * @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 years($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 $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']), '###TEMPLATEYEAR###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource($this->conf['templateFile']), '###TEMPLATEYEAR###');
 
-        } else {
+		} else {
 
-            $this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/newspaper/template.tmpl'), '###TEMPLATEYEAR###');
+			$this->template = $this->cObj->getSubpart($this->cObj->fileResource('EXT:dlf/plugins/newspaper/template.tmpl'), '###TEMPLATEYEAR###');
 
-        }
+		}
 
-        // Get subpart templates
-        $subparts['year'] = $this->cObj->getSubpart($this->template, '###LISTYEAR###');
+		// Get subpart templates
+		$subparts['year'] = $this->cObj->getSubpart($this->template, '###LISTYEAR###');
 
-        // get the title of the anchor file
-        $titleAnchor = $this->doc->getTitle($this->doc->uid);
+		// get the title of the anchor file
+		$titleAnchor = $this->doc->getTitle($this->doc->uid);
 
-        // get all children of anchor. this should be the year anchor documents
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_documents.uid AS uid, tx_dlf_documents.title AS title',
-            'tx_dlf_documents',
-            '(tx_dlf_documents.structure='.tx_dlf_helper::getIdFromIndexName('year', 'tx_dlf_structures', $this->doc->pid).' AND tx_dlf_documents.partof='.intval($this->doc->uid).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
-            '',
-            'title ASC',
-            ''
-        );
+		// get all children of anchor. this should be the year anchor documents
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_documents.uid AS uid, tx_dlf_documents.title AS title',
+			'tx_dlf_documents',
+			'(tx_dlf_documents.structure='.tx_dlf_helper::getIdFromIndexName('year', 'tx_dlf_structures', $this->doc->pid).' AND tx_dlf_documents.partof='.intval($this->doc->uid).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+			'',
+			'title ASC',
+			''
+		);
 
-        // Process results.
-        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+		// Process results.
+		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-            $years[] = array (
-                'title' => $resArray['title'],
-                'uid' => $resArray['uid']
-            );
+			$years[] = array (
+				'title' => $resArray['title'],
+				'uid' => $resArray['uid']
+			);
 
-        }
+		}
 
-        $subYearPartContent = '';
+		$subYearPartContent = '';
 
-        if (count($years) > 0) {
+		if (count($years) > 0) {
 
-            foreach ($years as $id => $year) {
+			foreach ($years as $id => $year) {
 
-                $linkConf = array (
-                    'useCacheHash' => 1,
-                    'parameter' => $this->conf['targetPid'],
-                    'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
-                    'title' => $titleAnchor.': '.$year['title']
-                );
+				$linkConf = array (
+					'useCacheHash' => 1,
+					'parameter' => $this->conf['targetPid'],
+					'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
+					'title' => $titleAnchor.': '.$year['title']
+				);
 
-                $yearArray = array (
-                    '###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf),
-                );
+				$yearArray = array (
+					'###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf),
+				);
 
-                $subYearPartContent .= $this->cObj->substituteMarkerArray($subparts['year'], $yearArray);
+				$subYearPartContent .= $this->cObj->substituteMarkerArray($subparts['year'], $yearArray);
 
-            }
-        }
+			}
+		}
 
-        // link to years overview (should be itself here)
-        $linkConf = array (
-            'useCacheHash' => 1,
-            'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
-        );
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
+		// link to years overview (should be itself here)
+		$linkConf = array (
+			'useCacheHash' => 1,
+			'parameter' => $this->conf['targetPid'],
+			'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
+		);
+		$allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
 
-        // Fill markers.
-        $markerArray = array (
-            '###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),
-            '###CALALLYEARS###' => $allYearsLink
-        );
+		// Fill markers.
+		$markerArray = array (
+			'###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),
+			'###CALALLYEARS###' => $allYearsLink
+		);
 
-        $this->template = $this->cObj->substituteMarkerArray($this->template, $markerArray);
+		$this->template = $this->cObj->substituteMarkerArray($this->template, $markerArray);
 
-        // fill the week markers
-        return $this->cObj->substituteSubpart($this->template, '###LISTYEAR###', $subYearPartContent);
+		// fill the week markers
+		return $this->cObj->substituteSubpart($this->template, '###LISTYEAR###', $subYearPartContent);
 
-    }
+	}
 
 }

Spacing +15 added lines, -15 removed lines

@@ -89,7 +89,7 @@ 
         // Process results.
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-            $issues[] = array (
+            $issues[] = array(
                 'uid' => $resArray['uid'],
                 'title' => $resArray['title'],
                 'year' => $resArray['year']
@@ -98,7 +98,7 @@ 
         }
 
         // 	We need an array of issues with month number as key.
-        $calendarIssues = array ();
+        $calendarIssues = array();
 
         foreach ($issues as $issue) {
 
@@ -106,7 +106,7 @@ 
 
         }
 
-        $allIssues = array ();
+        $allIssues = array();
 
         // Get subpart templates.
         $subparts['list'] = $this->cObj->getSubpart($this->template, '###ISSUELIST###');
@@ -122,7 +122,7 @@ 
 
         for ($i = 0; $i <= 11; $i++) {
 
-            $markerArray = array (
+            $markerArray = array(
                 '###DAYMON_NAME###' => strftime('%a', strtotime('last Monday')),
                 '###DAYTUE_NAME###' => strftime('%a', strtotime('last Tuesday')),
                 '###DAYWED_NAME###' => strftime('%a', strtotime('last Wednesday')),
@@ -145,7 +145,7 @@ 
 
                 $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
 
-                $weekArray = array (
+                $weekArray = array(
                     '###DAYMON###' => '&nbsp;',
                     '###DAYTUE###' => '&nbsp;',
                     '###DAYWED###' => '&nbsp;',
@@ -164,7 +164,7 @@ 
 
                         $dayLinks = '';
 
-                        $dayLinksText = array ();
+                        $dayLinksText = array();
 
                         $dayLinksList = '';
 
@@ -182,7 +182,7 @@ 
 
                                         $dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
 
-                                        $linkConf = array (
+                                        $linkConf = array(
                                             'useCacheHash' => 1,
                                             'parameter' => $this->conf['targetPid'],
                                             'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
@@ -257,7 +257,7 @@ 
         }
 
         // Link to years overview
-        $linkConf = array (
+        $linkConf = array(
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
             'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
@@ -266,7 +266,7 @@ 
         $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
 
         // Link to current year.
-        $linkConf = array (
+        $linkConf = array(
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
             'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
@@ -303,7 +303,7 @@ 
 
         }
 
-        $markerArray = array (
+        $markerArray = array(
             '###CALENDARVIEWACTIVE###' => $listViewActive ? '' : 'active',
             '###LISTVIEWACTIVE###' => $listViewActive ? 'active' : '',
             '###CALYEAR###' => $yearLink,
@@ -372,7 +372,7 @@ 
         // Process results.
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-            $years[] = array (
+            $years[] = array(
                 'title' => $resArray['title'],
                 'uid' => $resArray['uid']
             );
@@ -385,14 +385,14 @@ 
 
             foreach ($years as $id => $year) {
 
-                $linkConf = array (
+                $linkConf = array(
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetPid'],
                     'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
                     'title' => $titleAnchor.': '.$year['title']
                 );
 
-                $yearArray = array (
+                $yearArray = array(
                     '###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf),
                 );
 
@@ -402,7 +402,7 @@ 
         }
 
         // link to years overview (should be itself here)
-        $linkConf = array (
+        $linkConf = array(
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
             'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
@@ -410,7 +410,7 @@ 
         $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
 
         // Fill markers.
-        $markerArray = array (
+        $markerArray = array(
             '###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),
             '###CALALLYEARS###' => $allYearsLink
         );