Erikmitk / kitodo-presentation

plugins/feeds/class.tx_dlf_feeds.php

Indentation +128 added lines, -128 removed lines

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

Spacing +2 added lines, -2 removed lines

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

plugins/toc/class.tx_dlf_toc.php

Indentation +190 added lines, -190 removed lines

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

Spacing +14 added lines, -14 removed lines

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

ext_localconf.php

Indentation +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 if (!defined('TYPO3_MODE')) {
-    die ('Access denied.');
+	die ('Access denied.');
 }
 
 // Register plugins.
@@ -76,7 +76,7 @@ 
 
 if (TYPO3_MODE === 'FE') {
 
-    /*
+	/*
 	 * docTypeCheck user function to use in Typoscript
 	 *
 	 * @access	public
@@ -90,12 +90,12 @@ 
 	 *
 	 * @return	boolean		TRUE if document type matches, FALSE if not
 	 **/
-    function user_dlf_docTypeCheck($type) {
+	function user_dlf_docTypeCheck($type) {
 
-        $hook = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_doctype');
+		$hook = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_doctype');
 
-        return ($hook->getDocType() === $type);
+		return ($hook->getDocType() === $type);
 
-    }
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_hacks.php:tx_dlf_hacks';
 
 // Register command line scripts.
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array ('EXT:'.$_EXTKEY.'/cli/class.tx_dlf_cli.php', '_CLI_dlf');
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array('EXT:'.$_EXTKEY.'/cli/class.tx_dlf_cli.php', '_CLI_dlf');
 
 // Register AJAX eID handlers.
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = 'EXT:'.$_EXTKEY.'/plugins/search/class.tx_dlf_search_suggest.php';

hooks/class.tx_dlf_em.php

Indentation +526 added lines, -526 removed lines

@@ -19,660 +19,660 @@
  */
 class tx_dlf_em {
 
-    /**
-     * This holds the current configuration
-     *
-     * @var	array
-     * @access protected
-     */
-    protected $conf = array ();
-
-    /**
-     * This holds the output ready to return
-     *
-     * @var	string
-     * @access protected
-     */
-    protected $content = '';
-
-    /**
-     * Check if a connection to a Solr server could be established with the given credentials.
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Core\TypoScript\ConfigurationForm &$pObj: The parent object
-     *
-     * @return	string		Message informing the user of success or failure
-     */
-    public function checkSolrConnection(&$params, &$pObj) {
-
-        // Prepend username and password to hostname.
-        if (!empty($this->conf['solrUser']) && !empty($this->conf['solrPass'])) {
+	/**
+	 * This holds the current configuration
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected $conf = array ();
+
+	/**
+	 * This holds the output ready to return
+	 *
+	 * @var	string
+	 * @access protected
+	 */
+	protected $content = '';
+
+	/**
+	 * Check if a connection to a Solr server could be established with the given credentials.
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Core\TypoScript\ConfigurationForm &$pObj: The parent object
+	 *
+	 * @return	string		Message informing the user of success or failure
+	 */
+	public function checkSolrConnection(&$params, &$pObj) {
+
+		// Prepend username and password to hostname.
+		if (!empty($this->conf['solrUser']) && !empty($this->conf['solrPass'])) {
 
-            $host = $this->conf['solrUser'].':'.$this->conf['solrPass'].'@'.(!empty($this->conf['solrHost']) ? $this->conf['solrHost'] : 'localhost');
-
-        } else {
-
-            $host = (!empty($this->conf['solrHost']) ? $this->conf['solrHost'] : 'localhost');
-
-        }
+			$host = $this->conf['solrUser'].':'.$this->conf['solrPass'].'@'.(!empty($this->conf['solrHost']) ? $this->conf['solrHost'] : 'localhost');
+
+		} else {
+
+			$host = (!empty($this->conf['solrHost']) ? $this->conf['solrHost'] : 'localhost');
+
+		}
 
-        // Set port if not set.
-        $port = (!empty($this->conf['solrPort']) ? \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->conf['solrPort'], 0, 65535, 8180) : 8180);
-
-        // Trim path and append trailing slash.
-        $path = (!empty($this->conf['solrPath']) ? trim($this->conf['solrPath'], '/').'/' : '');
-
-        // Build request URI.
-        $url = 'http://'.$host.':'.$port.'/'.$path.'admin/cores?wt=xml';
-
-        $context = stream_context_create(array (
-            'http' => array (
-                'method' => 'GET',
-                'user_agent' => (!empty($this->conf['useragent']) ? $this->conf['useragent'] : ini_get('user_agent'))
-            )
-        ));
+		// Set port if not set.
+		$port = (!empty($this->conf['solrPort']) ? \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->conf['solrPort'], 0, 65535, 8180) : 8180);
+
+		// Trim path and append trailing slash.
+		$path = (!empty($this->conf['solrPath']) ? trim($this->conf['solrPath'], '/').'/' : '');
+
+		// Build request URI.
+		$url = 'http://'.$host.':'.$port.'/'.$path.'admin/cores?wt=xml';
+
+		$context = stream_context_create(array (
+			'http' => array (
+				'method' => 'GET',
+				'user_agent' => (!empty($this->conf['useragent']) ? $this->conf['useragent'] : ini_get('user_agent'))
+			)
+		));
 
-        // Try to connect to Solr server.
-        $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
-
-        // Check status code.
-        if ($response) {
-
-            $status = $response->xpath('//lst[@name="responseHeader"]/int[@name="status"]');
-
-            if (is_array($status)) {
-
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    sprintf($GLOBALS['LANG']->getLL('solr.status'), (string) $status[0]),
-                    $GLOBALS['LANG']->getLL('solr.connected'),
-                    ($status[0] == 0 ? \TYPO3\CMS\Core\Messaging\FlashMessage::OK : \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING),
-                    FALSE
-                );
-
-                $this->content .= $message->render();
-
-                return $this->content;
-
-            }
-
-        }
-
-        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-            sprintf($GLOBALS['LANG']->getLL('solr.error'), $url),
-            $GLOBALS['LANG']->getLL('solr.notConnected'),
-            \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-            FALSE
-        );
-
-        $this->content .= $message->render();
-
-        return $this->content;
-
-    }
-
-    /**
-     * Make sure a backend user exists and is configured properly.
-     *
-     * @access	protected
-     *
-     * @param	boolean		$checkOnly: Just check the user or change it, too?
-     * @param	integer		$groupUid: UID of the corresponding usergroup
-     *
-     * @return	integer		UID of user or 0 if something is wrong
-     */
-    protected function checkCliUser($checkOnly, $groupUid) {
+		// Try to connect to Solr server.
+		$response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
+
+		// Check status code.
+		if ($response) {
+
+			$status = $response->xpath('//lst[@name="responseHeader"]/int[@name="status"]');
+
+			if (is_array($status)) {
+
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					sprintf($GLOBALS['LANG']->getLL('solr.status'), (string) $status[0]),
+					$GLOBALS['LANG']->getLL('solr.connected'),
+					($status[0] == 0 ? \TYPO3\CMS\Core\Messaging\FlashMessage::OK : \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING),
+					FALSE
+				);
+
+				$this->content .= $message->render();
+
+				return $this->content;
+
+			}
+
+		}
+
+		$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+			'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+			sprintf($GLOBALS['LANG']->getLL('solr.error'), $url),
+			$GLOBALS['LANG']->getLL('solr.notConnected'),
+			\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+			FALSE
+		);
+
+		$this->content .= $message->render();
+
+		return $this->content;
+
+	}
+
+	/**
+	 * Make sure a backend user exists and is configured properly.
+	 *
+	 * @access	protected
+	 *
+	 * @param	boolean		$checkOnly: Just check the user or change it, too?
+	 * @param	integer		$groupUid: UID of the corresponding usergroup
+	 *
+	 * @return	integer		UID of user or 0 if something is wrong
+	 */
+	protected function checkCliUser($checkOnly, $groupUid) {
 
-        // Set default return value.
-        $usrUid = 0;
+		// Set default return value.
+		$usrUid = 0;
 
-        // Check if user "_cli_dlf" exists, is no admin and is not disabled.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'uid,admin,usergroup',
-            'be_users',
-            'username='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users').\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_users')
-        );
+		// Check if user "_cli_dlf" exists, is no admin and is not disabled.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'uid,admin,usergroup',
+			'be_users',
+			'username='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users').\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_users')
+		);
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-            $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-            // Explode comma-separated list.
-            $resArray['usergroup'] = explode(',', $resArray['usergroup']);
+			// Explode comma-separated list.
+			$resArray['usergroup'] = explode(',', $resArray['usergroup']);
 
-            // Check if user is not disabled.
-            $result2 = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                '1',
-                'be_users',
-                'uid='.intval($resArray['uid']).\TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('be_users')
-            );
+			// Check if user is not disabled.
+			$result2 = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'1',
+				'be_users',
+				'uid='.intval($resArray['uid']).\TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('be_users')
+			);
 
-            // Check if user is configured properly.
-            if (count(array_diff(array ($groupUid), $resArray['usergroup'])) == 0
-                    && !$resArray['admin']
-                    && $GLOBALS['TYPO3_DB']->sql_num_rows($result2) > 0) {
+			// Check if user is configured properly.
+			if (count(array_diff(array ($groupUid), $resArray['usergroup'])) == 0
+					&& !$resArray['admin']
+					&& $GLOBALS['TYPO3_DB']->sql_num_rows($result2) > 0) {
 
-                $usrUid = $resArray['uid'];
+				$usrUid = $resArray['uid'];
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $GLOBALS['LANG']->getLL('cliUserGroup.usrOkayMsg'),
-                    $GLOBALS['LANG']->getLL('cliUserGroup.usrOkay'),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    FALSE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrOkayMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrOkay'),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+					FALSE
+				);
 
-            } else {
+			} else {
 
-                if (!$checkOnly && $groupUid) {
+				if (!$checkOnly && $groupUid) {
 
-                    // Keep exisiting values and add the new ones.
-                    $usergroup = array_unique(array_merge(array ($groupUid), $resArray['usergroup']));
+					// Keep exisiting values and add the new ones.
+					$usergroup = array_unique(array_merge(array ($groupUid), $resArray['usergroup']));
 
-                    // Try to configure user.
-                    $data = array ();
-                    $data['be_users'][$resArray['uid']] = array (
-                        'admin' => 0,
-                        'usergroup' => implode(',', $usergroup),
-                        $GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['disabled'] => 0,
-                        $GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['starttime'] => 0,
-                        $GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['endtime'] => 0
-                    );
+					// Try to configure user.
+					$data = array ();
+					$data['be_users'][$resArray['uid']] = array (
+						'admin' => 0,
+						'usergroup' => implode(',', $usergroup),
+						$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['disabled'] => 0,
+						$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['starttime'] => 0,
+						$GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['endtime'] => 0
+					);
 
-                    tx_dlf_helper::processDBasAdmin($data);
+					tx_dlf_helper::processDBasAdmin($data);
 
-                    // Check if configuration was successful.
-                    if ($this->checkCliUser(TRUE, $groupUid)) {
+					// Check if configuration was successful.
+					if ($this->checkCliUser(TRUE, $groupUid)) {
 
-                        $usrUid = $resArray['uid'];
+						$usrUid = $resArray['uid'];
 
-                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            $GLOBALS['LANG']->getLL('cliUserGroup.usrConfiguredMsg'),
-                            $GLOBALS['LANG']->getLL('cliUserGroup.usrConfigured'),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                            FALSE
-                        );
-
-                    } else {
-
-                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
-                            $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                            FALSE
-                        );
+						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							$GLOBALS['LANG']->getLL('cliUserGroup.usrConfiguredMsg'),
+							$GLOBALS['LANG']->getLL('cliUserGroup.usrConfigured'),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+							FALSE
+						);
+
+					} else {
+
+						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
+							$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+							FALSE
+						);
 
-                    }
-
-                } else {
-
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
-                        $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
-                    );
-
-                }
-
-            }
-
-        } else {
-
-            if (!$checkOnly && $groupUid) {
-
-                // Try to create user.
-                $tempUid = uniqid('NEW');
-
-                $data = array ();
-                $data['be_users'][$tempUid] = array (
-                    'pid' => 0,
-                    'username' => '_cli_dlf',
-                    'password' => md5($tempUid),
-                    'realName' => $GLOBALS['LANG']->getLL('cliUserGroup.usrRealName'),
-                    'usergroup' => intval($groupUid)
-                );
+					}
+
+				} else {
+
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						FALSE
+					);
+
+				}
+
+			}
+
+		} else {
+
+			if (!$checkOnly && $groupUid) {
+
+				// Try to create user.
+				$tempUid = uniqid('NEW');
+
+				$data = array ();
+				$data['be_users'][$tempUid] = array (
+					'pid' => 0,
+					'username' => '_cli_dlf',
+					'password' => md5($tempUid),
+					'realName' => $GLOBALS['LANG']->getLL('cliUserGroup.usrRealName'),
+					'usergroup' => intval($groupUid)
+				);
 
-                $substUid = tx_dlf_helper::processDBasAdmin($data);
+				$substUid = tx_dlf_helper::processDBasAdmin($data);
 
-                // Check if creation was successful.
-                if (!empty($substUid[$tempUid])) {
-
-                    $usrUid = $substUid[$tempUid];
-
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('cliUserGroup.usrCreatedMsg'),
-                        $GLOBALS['LANG']->getLL('cliUserGroup.usrCreated'),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                        FALSE
-                    );
+				// Check if creation was successful.
+				if (!empty($substUid[$tempUid])) {
+
+					$usrUid = $substUid[$tempUid];
+
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrCreatedMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrCreated'),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+						FALSE
+					);
 
-                } else {
+				} else {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
-                        $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						FALSE
+					);
 
-                }
+				}
 
-            } else {
+			} else {
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
-                    $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+					FALSE
+				);
 
-            }
+			}
 
-        }
+		}
 
-        $this->content = $message->render();
+		$this->content = $message->render();
 
-        return $usrUid;
+		return $usrUid;
 
-    }
+	}
 
-    /**
-     * Make sure a backend usergroup exists and is configured properly.
-     *
-     * @access	protected
-     *
-     * @param	boolean		$checkOnly: Just check the usergroup or change it, too?
-     * @param	array		$settings: Array with default settings
-     *
-     * @return	integer		UID of usergroup or 0 if something is wrong
-     */
-    protected function checkCliGroup($checkOnly, $settings = array ()) {
+	/**
+	 * Make sure a backend usergroup exists and is configured properly.
+	 *
+	 * @access	protected
+	 *
+	 * @param	boolean		$checkOnly: Just check the usergroup or change it, too?
+	 * @param	array		$settings: Array with default settings
+	 *
+	 * @return	integer		UID of usergroup or 0 if something is wrong
+	 */
+	protected function checkCliGroup($checkOnly, $settings = array ()) {
 
-        // Set default return value.
-        $grpUid = 0;
+		// Set default return value.
+		$grpUid = 0;
 
-        // Set default configuration for usergroup.
-        if (empty($settings)) {
+		// Set default configuration for usergroup.
+		if (empty($settings)) {
 
-            $settings = array (
-                'non_exclude_fields' => array (),
-                'tables_select' => array (
-                    'tx_dlf_documents',
-                    'tx_dlf_collections',
-                    'tx_dlf_libraries',
-                    'tx_dlf_structures',
-                    'tx_dlf_metadata',
-                    'tx_dlf_metadataformat',
-                    'tx_dlf_formats',
-                    'tx_dlf_solrcores'
-                ),
-                'tables_modify' => array (
-                    'tx_dlf_documents',
-                    'tx_dlf_collections',
-                    'tx_dlf_libraries'
-                )
-            );
+			$settings = array (
+				'non_exclude_fields' => array (),
+				'tables_select' => array (
+					'tx_dlf_documents',
+					'tx_dlf_collections',
+					'tx_dlf_libraries',
+					'tx_dlf_structures',
+					'tx_dlf_metadata',
+					'tx_dlf_metadataformat',
+					'tx_dlf_formats',
+					'tx_dlf_solrcores'
+				),
+				'tables_modify' => array (
+					'tx_dlf_documents',
+					'tx_dlf_collections',
+					'tx_dlf_libraries'
+				)
+			);
 
-            // Set allowed exclude fields.
-            foreach ($settings['tables_modify'] as $table) {
+			// Set allowed exclude fields.
+			foreach ($settings['tables_modify'] as $table) {
 
-                foreach ($GLOBALS['TCA'][$table]['columns'] as $field => $fieldConf) {
+				foreach ($GLOBALS['TCA'][$table]['columns'] as $field => $fieldConf) {
 
-                    if (!empty($fieldConf['exclude'])) {
+					if (!empty($fieldConf['exclude'])) {
 
-                        $settings['non_exclude_fields'][] = $table.':'.$field;
+						$settings['non_exclude_fields'][] = $table.':'.$field;
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-        // Check if group "_cli_dlf" exists and is not disabled.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'uid,non_exclude_fields,tables_select,tables_modify,'.
-                $GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'],
-            'be_groups',
-            'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').
-                \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
-        );
+		// Check if group "_cli_dlf" exists and is not disabled.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'uid,non_exclude_fields,tables_select,tables_modify,'.
+				$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'],
+			'be_groups',
+			'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').
+				\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
+		);
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-            $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-            // Explode comma-separated lists.
-            $resArray['non_exclude_fields'] = explode(',', $resArray['non_exclude_fields']);
+			// Explode comma-separated lists.
+			$resArray['non_exclude_fields'] = explode(',', $resArray['non_exclude_fields']);
 
-            $resArray['tables_select'] = explode(',', $resArray['tables_select']);
+			$resArray['tables_select'] = explode(',', $resArray['tables_select']);
 
-            $resArray['tables_modify'] = explode(',', $resArray['tables_modify']);
+			$resArray['tables_modify'] = explode(',', $resArray['tables_modify']);
 
-            // Check if usergroup is configured properly.
-            if (count(array_diff($settings['non_exclude_fields'], $resArray['non_exclude_fields'])) == 0
-                    && count(array_diff($settings['tables_select'], $resArray['tables_select'])) == 0
-                    && count(array_diff($settings['tables_modify'], $resArray['tables_modify'])) == 0
-                    && $resArray[$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled']] == 0) {
+			// Check if usergroup is configured properly.
+			if (count(array_diff($settings['non_exclude_fields'], $resArray['non_exclude_fields'])) == 0
+					&& count(array_diff($settings['tables_select'], $resArray['tables_select'])) == 0
+					&& count(array_diff($settings['tables_modify'], $resArray['tables_modify'])) == 0
+					&& $resArray[$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled']] == 0) {
 
-                $grpUid = $resArray['uid'];
+				$grpUid = $resArray['uid'];
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $GLOBALS['LANG']->getLL('cliUserGroup.grpOkayMsg'),
-                    $GLOBALS['LANG']->getLL('cliUserGroup.grpOkay'),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    FALSE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpOkayMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpOkay'),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+					FALSE
+				);
 
-            } else {
+			} else {
 
-                if (!$checkOnly) {
+				if (!$checkOnly) {
 
-                    // Keep exisiting values and add the new ones.
-                    $non_exclude_fields = array_unique(array_merge($settings['non_exclude_fields'], $resArray['non_exclude_fields']));
+					// Keep exisiting values and add the new ones.
+					$non_exclude_fields = array_unique(array_merge($settings['non_exclude_fields'], $resArray['non_exclude_fields']));
 
-                    $tables_select = array_unique(array_merge($settings['tables_select'], $resArray['tables_select']));
+					$tables_select = array_unique(array_merge($settings['tables_select'], $resArray['tables_select']));
 
-                    $tables_modify = array_unique(array_merge($settings['tables_modify'], $resArray['tables_modify']));
+					$tables_modify = array_unique(array_merge($settings['tables_modify'], $resArray['tables_modify']));
 
-                    // Try to configure usergroup.
-                    $data = array ();
-                    $data['be_groups'][$resArray['uid']] = array (
-                        'non_exclude_fields' => implode(',', $non_exclude_fields),
-                        'tables_select' => implode(',', $tables_select),
-                        'tables_modify' => implode(',', $tables_modify),
-                        $GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'] => 0
-                    );
+					// Try to configure usergroup.
+					$data = array ();
+					$data['be_groups'][$resArray['uid']] = array (
+						'non_exclude_fields' => implode(',', $non_exclude_fields),
+						'tables_select' => implode(',', $tables_select),
+						'tables_modify' => implode(',', $tables_modify),
+						$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'] => 0
+					);
 
-                    tx_dlf_helper::processDBasAdmin($data);
+					tx_dlf_helper::processDBasAdmin($data);
 
-                    // Check if configuration was successful.
-                    if ($this->checkCliGroup(TRUE, $settings)) {
+					// Check if configuration was successful.
+					if ($this->checkCliGroup(TRUE, $settings)) {
 
-                        $grpUid = $resArray['uid'];
+						$grpUid = $resArray['uid'];
 
-                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            $GLOBALS['LANG']->getLL('cliUserGroup.grpConfiguredMsg'),
-                            $GLOBALS['LANG']->getLL('cliUserGroup.grpConfigured'),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                            FALSE
-                        );
+						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							$GLOBALS['LANG']->getLL('cliUserGroup.grpConfiguredMsg'),
+							$GLOBALS['LANG']->getLL('cliUserGroup.grpConfigured'),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+							FALSE
+						);
 
-                    } else {
+					} else {
 
-                        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
-                            $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
-                            \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                            FALSE
-                        );
+						$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+							$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
+							$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
+							\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+							FALSE
+						);
 
-                    }
+					}
 
-                } else {
+				} else {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
-                        $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						FALSE
+					);
 
-                }
+				}
 
-            }
+			}
 
-        } else {
+		} else {
 
-            if (!$checkOnly) {
+			if (!$checkOnly) {
 
-                // Try to create usergroup.
-                $tempUid = uniqid('NEW');
+				// Try to create usergroup.
+				$tempUid = uniqid('NEW');
 
-                $data = array ();
-                $data['be_groups'][$tempUid] = array (
-                    'pid' => 0,
-                    'title' => '_cli_dlf',
-                    'description' => $GLOBALS['LANG']->getLL('cliUserGroup.grpDescription'),
-                    'non_exclude_fields' => implode(',', $settings['non_exclude_fields']),
-                    'tables_select' => implode(',', $settings['tables_select']),
-                    'tables_modify' => implode(',', $settings['tables_modify'])
-                );
+				$data = array ();
+				$data['be_groups'][$tempUid] = array (
+					'pid' => 0,
+					'title' => '_cli_dlf',
+					'description' => $GLOBALS['LANG']->getLL('cliUserGroup.grpDescription'),
+					'non_exclude_fields' => implode(',', $settings['non_exclude_fields']),
+					'tables_select' => implode(',', $settings['tables_select']),
+					'tables_modify' => implode(',', $settings['tables_modify'])
+				);
 
-                $substUid = tx_dlf_helper::processDBasAdmin($data);
+				$substUid = tx_dlf_helper::processDBasAdmin($data);
 
-                // Check if creation was successful.
-                if (!empty($substUid[$tempUid])) {
+				// Check if creation was successful.
+				if (!empty($substUid[$tempUid])) {
 
-                    $grpUid = $substUid[$tempUid];
+					$grpUid = $substUid[$tempUid];
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('cliUserGroup.grpCreatedMsg'),
-                        $GLOBALS['LANG']->getLL('cliUserGroup.grpCreated'),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                        FALSE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpCreatedMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpCreated'),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+						FALSE
+					);
 
-                } else {
+				} else {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
-                        $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
+						$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+						FALSE
+					);
 
-                }
+				}
 
-            } else {
+			} else {
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
-                    $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
+					$GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+					FALSE
+				);
 
-            }
+			}
 
-        }
+		}
 
-        $this->content = $message->render();
+		$this->content = $message->render();
 
-        return $grpUid;
+		return $grpUid;
 
-    }
+	}
 
-    /**
-     * Make sure a CLI user and group exist.
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Core\TypoScript\ConfigurationForm &$pObj: The parent object
-     *
-     * @return	string		Message informing the user of success or failure
-     */
-    public function checkCliUserGroup(&$params, &$pObj) {
+	/**
+	 * Make sure a CLI user and group exist.
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Core\TypoScript\ConfigurationForm &$pObj: The parent object
+	 *
+	 * @return	string		Message informing the user of success or failure
+	 */
+	public function checkCliUserGroup(&$params, &$pObj) {
 
-        // Check if usergroup "_cli_dlf" exists and is configured properly.
-        $groupUid = $this->checkCliGroup(empty($this->conf['makeCliUserGroup']));
+		// Check if usergroup "_cli_dlf" exists and is configured properly.
+		$groupUid = $this->checkCliGroup(empty($this->conf['makeCliUserGroup']));
 
-        // Save output because it will be overwritten by the user check method.
-        $content = $this->content;
+		// Save output because it will be overwritten by the user check method.
+		$content = $this->content;
 
-        // Check if user "_cli_dlf" exists and is configured properly.
-        $userUid = $this->checkCliUser(empty($this->conf['makeCliUserGroup']), $groupUid);
+		// Check if user "_cli_dlf" exists and is configured properly.
+		$userUid = $this->checkCliUser(empty($this->conf['makeCliUserGroup']), $groupUid);
 
-        // Merge output from usergroup and user checks.
-        $this->content .= $content;
+		// Merge output from usergroup and user checks.
+		$this->content .= $content;
 
-        // Check if CLI dispatcher is executable.
-        if (is_executable(PATH_typo3.'cli_dispatch.phpsh')) {
+		// Check if CLI dispatcher is executable.
+		if (is_executable(PATH_typo3.'cli_dispatch.phpsh')) {
 
-            $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                $GLOBALS['LANG']->getLL('cliUserGroup.cliOkayMsg'),
-                $GLOBALS['LANG']->getLL('cliUserGroup.cliOkay'),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
-            );
+			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliOkayMsg'),
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliOkay'),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+				FALSE
+			);
 
-        } else {
+		} else {
 
-            $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                $GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkayMsg'),
-                $GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkay'),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                FALSE
-            );
-
-        }
-
-        $this->content .= $message->render();
+			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkayMsg'),
+				$GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkay'),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+				FALSE
+			);
+
+		}
+
+		$this->content .= $message->render();
 
-        return $this->content;
+		return $this->content;
 
-    }
+	}
 
-    /**
-     * Make sure the essential namespaces are defined.
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Core\TypoScript\ConfigurationForm &$pObj: The parent object
-     *
-     * @return	string		Message informing the user of success or failure
-     */
-    public function checkMetadataFormats(&$params, &$pObj) {
+	/**
+	 * Make sure the essential namespaces are defined.
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Core\TypoScript\ConfigurationForm &$pObj: The parent object
+	 *
+	 * @return	string		Message informing the user of success or failure
+	 */
+	public function checkMetadataFormats(&$params, &$pObj) {
 
-        $nsDefined = array (
-            'MODS' => FALSE,
-            'TEIHDR' => FALSE
-        );
+		$nsDefined = array (
+			'MODS' => FALSE,
+			'TEIHDR' => FALSE
+		);
 
-        // Check if formats "MODS" and "TEIHDR" exist.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'type',
-            'tx_dlf_formats',
-            '(type='.$GLOBALS['TYPO3_DB']->fullQuoteStr('MODS', 'tx_dlf_formats').' OR type='.$GLOBALS['TYPO3_DB']->fullQuoteStr('TEIHDR', 'tx_dlf_formats').')'.tx_dlf_helper::whereClause('tx_dlf_formats')
-        );
+		// Check if formats "MODS" and "TEIHDR" exist.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'type',
+			'tx_dlf_formats',
+			'(type='.$GLOBALS['TYPO3_DB']->fullQuoteStr('MODS', 'tx_dlf_formats').' OR type='.$GLOBALS['TYPO3_DB']->fullQuoteStr('TEIHDR', 'tx_dlf_formats').')'.tx_dlf_helper::whereClause('tx_dlf_formats')
+		);
 
-        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-            $nsDefined[$resArray['type']] = TRUE;
+			$nsDefined[$resArray['type']] = TRUE;
 
-        }
+		}
 
-        // Build data array.
-        $data = array ();
+		// Build data array.
+		$data = array ();
 
-        // Add MODS namespace.
-        if (!$nsDefined['MODS']) {
+		// Add MODS namespace.
+		if (!$nsDefined['MODS']) {
 
-            $data['tx_dlf_formats'][uniqid('NEW')] = array (
-                'pid' => 0,
-                'type' => 'MODS',
-                'root' => 'mods',
-                'namespace' => 'http://www.loc.gov/mods/v3',
-                'class' => 'tx_dlf_mods'
-            );
+			$data['tx_dlf_formats'][uniqid('NEW')] = array (
+				'pid' => 0,
+				'type' => 'MODS',
+				'root' => 'mods',
+				'namespace' => 'http://www.loc.gov/mods/v3',
+				'class' => 'tx_dlf_mods'
+			);
 
-        }
+		}
 
-        // Add TEIHDR namespace.
-        if (!$nsDefined['TEIHDR']) {
-
-            $data['tx_dlf_formats'][uniqid('NEW')] = array (
-                'pid' => 0,
-                'type' => 'TEIHDR',
-                'root' => 'teiHeader',
-                'namespace' => 'http://www.tei-c.org/ns/1.0',
-                'class' => 'tx_dlf_teihdr'
-            );
+		// Add TEIHDR namespace.
+		if (!$nsDefined['TEIHDR']) {
+
+			$data['tx_dlf_formats'][uniqid('NEW')] = array (
+				'pid' => 0,
+				'type' => 'TEIHDR',
+				'root' => 'teiHeader',
+				'namespace' => 'http://www.tei-c.org/ns/1.0',
+				'class' => 'tx_dlf_teihdr'
+			);
 
-        }
+		}
 
-        if (!empty($data)) {
+		if (!empty($data)) {
 
-            // Process changes.
-            $substUid = tx_dlf_helper::processDBasAdmin($data);
+			// Process changes.
+			$substUid = tx_dlf_helper::processDBasAdmin($data);
 
-            if (!empty($substUid)) {
+			if (!empty($substUid)) {
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $GLOBALS['LANG']->getLL('metadataFormats.nsCreatedMsg'),
-                    $GLOBALS['LANG']->getLL('metadataFormats.nsCreated'),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                    FALSE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					$GLOBALS['LANG']->getLL('metadataFormats.nsCreatedMsg'),
+					$GLOBALS['LANG']->getLL('metadataFormats.nsCreated'),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+					FALSE
+				);
 
-            } else {
+			} else {
 
-                $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $GLOBALS['LANG']->getLL('metadataFormats.nsNotCreatedMsg'),
-                    $GLOBALS['LANG']->getLL('metadataFormats.nsNotCreated'),
-                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
-                );
+				$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+					$GLOBALS['LANG']->getLL('metadataFormats.nsNotCreatedMsg'),
+					$GLOBALS['LANG']->getLL('metadataFormats.nsNotCreated'),
+					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+					FALSE
+				);
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                $GLOBALS['LANG']->getLL('metadataFormats.nsOkayMsg'),
-                $GLOBALS['LANG']->getLL('metadataFormats.nsOkay'),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
-            );
+			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				$GLOBALS['LANG']->getLL('metadataFormats.nsOkayMsg'),
+				$GLOBALS['LANG']->getLL('metadataFormats.nsOkay'),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+				FALSE
+			);
 
-        }
+		}
 
-        $this->content .= $message->render();
+		$this->content .= $message->render();
 
-        return $this->content;
+		return $this->content;
 
-    }
+	}
 
-    /**
-     * This is the constructor.
-     *
-     * @access	public
-     *
-     * @return	void
-     */
-    public function __construct() {
+	/**
+	 * This is the constructor.
+	 *
+	 * @access	public
+	 *
+	 * @return	void
+	 */
+	public function __construct() {
 
-        // Load localization file.
-        $GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
+		// Load localization file.
+		$GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
 
-        // Get current configuration.
-        $this->conf = array_merge((array) unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']), (array) \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('data'));
+		// Get current configuration.
+		$this->conf = array_merge((array) unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']), (array) \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('data'));
 
-    }
+	}
 
 }

Spacing +22 added lines, -22 removed lines

@@ -25,7 +25,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $conf = array ();
+    protected $conf = array();
 
     /**
      * This holds the output ready to return
@@ -67,8 +67,8 @@ 
         // Build request URI.
         $url = 'http://'.$host.':'.$port.'/'.$path.'admin/cores?wt=xml';
 
-        $context = stream_context_create(array (
-            'http' => array (
+        $context = stream_context_create(array(
+            'http' => array(
                 'method' => 'GET',
                 'user_agent' => (!empty($this->conf['useragent']) ? $this->conf['useragent'] : ini_get('user_agent'))
             )
@@ -151,7 +151,7 @@ 
             );
 
             // Check if user is configured properly.
-            if (count(array_diff(array ($groupUid), $resArray['usergroup'])) == 0
+            if (count(array_diff(array($groupUid), $resArray['usergroup'])) == 0
                     && !$resArray['admin']
                     && $GLOBALS['TYPO3_DB']->sql_num_rows($result2) > 0) {
 
@@ -170,11 +170,11 @@ 
                 if (!$checkOnly && $groupUid) {
 
                     // Keep exisiting values and add the new ones.
-                    $usergroup = array_unique(array_merge(array ($groupUid), $resArray['usergroup']));
+                    $usergroup = array_unique(array_merge(array($groupUid), $resArray['usergroup']));
 
                     // Try to configure user.
-                    $data = array ();
-                    $data['be_users'][$resArray['uid']] = array (
+                    $data = array();
+                    $data['be_users'][$resArray['uid']] = array(
                         'admin' => 0,
                         'usergroup' => implode(',', $usergroup),
                         $GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['disabled'] => 0,
@@ -230,8 +230,8 @@ 
                 // Try to create user.
                 $tempUid = uniqid('NEW');
 
-                $data = array ();
-                $data['be_users'][$tempUid] = array (
+                $data = array();
+                $data['be_users'][$tempUid] = array(
                     'pid' => 0,
                     'username' => '_cli_dlf',
                     'password' => md5($tempUid),
@@ -296,7 +296,7 @@ 
      *
      * @return	integer		UID of usergroup or 0 if something is wrong
      */
-    protected function checkCliGroup($checkOnly, $settings = array ()) {
+    protected function checkCliGroup($checkOnly, $settings = array()) {
 
         // Set default return value.
         $grpUid = 0;
@@ -304,9 +304,9 @@ 
         // Set default configuration for usergroup.
         if (empty($settings)) {
 
-            $settings = array (
-                'non_exclude_fields' => array (),
-                'tables_select' => array (
+            $settings = array(
+                'non_exclude_fields' => array(),
+                'tables_select' => array(
                     'tx_dlf_documents',
                     'tx_dlf_collections',
                     'tx_dlf_libraries',
@@ -316,7 +316,7 @@ 
                     'tx_dlf_formats',
                     'tx_dlf_solrcores'
                 ),
-                'tables_modify' => array (
+                'tables_modify' => array(
                     'tx_dlf_documents',
                     'tx_dlf_collections',
                     'tx_dlf_libraries'
@@ -388,8 +388,8 @@ 
                     $tables_modify = array_unique(array_merge($settings['tables_modify'], $resArray['tables_modify']));
 
                     // Try to configure usergroup.
-                    $data = array ();
-                    $data['be_groups'][$resArray['uid']] = array (
+                    $data = array();
+                    $data['be_groups'][$resArray['uid']] = array(
                         'non_exclude_fields' => implode(',', $non_exclude_fields),
                         'tables_select' => implode(',', $tables_select),
                         'tables_modify' => implode(',', $tables_modify),
@@ -444,8 +444,8 @@ 
                 // Try to create usergroup.
                 $tempUid = uniqid('NEW');
 
-                $data = array ();
-                $data['be_groups'][$tempUid] = array (
+                $data = array();
+                $data['be_groups'][$tempUid] = array(
                     'pid' => 0,
                     'title' => '_cli_dlf',
                     'description' => $GLOBALS['LANG']->getLL('cliUserGroup.grpDescription'),
@@ -566,7 +566,7 @@ 
      */
     public function checkMetadataFormats(&$params, &$pObj) {
 
-        $nsDefined = array (
+        $nsDefined = array(
             'MODS' => FALSE,
             'TEIHDR' => FALSE
         );
@@ -585,12 +585,12 @@ 
         }
 
         // Build data array.
-        $data = array ();
+        $data = array();
 
         // Add MODS namespace.
         if (!$nsDefined['MODS']) {
 
-            $data['tx_dlf_formats'][uniqid('NEW')] = array (
+            $data['tx_dlf_formats'][uniqid('NEW')] = array(
                 'pid' => 0,
                 'type' => 'MODS',
                 'root' => 'mods',
@@ -603,7 +603,7 @@ 
         // Add TEIHDR namespace.
         if (!$nsDefined['TEIHDR']) {
 
-            $data['tx_dlf_formats'][uniqid('NEW')] = array (
+            $data['tx_dlf_formats'][uniqid('NEW')] = array(
                 'pid' => 0,
                 'type' => 'TEIHDR',
                 'root' => 'teiHeader',

hooks/class.tx_dlf_hacks.php

Indentation +39 added lines, -39 removed lines

@@ -19,69 +19,69 @@
  */
 class tx_dlf_hacks {
 
-    /**
-     * Hook for the __construct() method of dlf/common/class.tx_dlf_document.php
-     * When using Kitodo.Production the record identifier is saved only in MODS, but not
-     * in METS. To get it anyway, we have to do some magic.
-     *
-     * @access	public
-     *
-     * @param	SimpleXMLElement		&$xml: The XML object
-     * @param	mixed		$record_id: The record identifier
-     *
-     * @return	void
-     */
-    public function construct_postProcessRecordId(SimpleXMLElement &$xml, &$record_id) {
+	/**
+	 * Hook for the __construct() method of dlf/common/class.tx_dlf_document.php
+	 * When using Kitodo.Production the record identifier is saved only in MODS, but not
+	 * in METS. To get it anyway, we have to do some magic.
+	 *
+	 * @access	public
+	 *
+	 * @param	SimpleXMLElement		&$xml: The XML object
+	 * @param	mixed		$record_id: The record identifier
+	 *
+	 * @return	void
+	 */
+	public function construct_postProcessRecordId(SimpleXMLElement &$xml, &$record_id) {
 
-        if (!$record_id) {
+		if (!$record_id) {
 
-            $xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
+			$xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
 
-            // Get all logical structure nodes with metadata, but without associated METS-Pointers.
-            if (($divs = $xml->xpath('//mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID and not(./mets:mptr)]'))) {
+			// Get all logical structure nodes with metadata, but without associated METS-Pointers.
+			if (($divs = $xml->xpath('//mets:structMap[@TYPE="LOGICAL"]//mets:div[@DMDID and not(./mets:mptr)]'))) {
 
-                $smLinks = $xml->xpath('//mets:structLink/mets:smLink');
+				$smLinks = $xml->xpath('//mets:structLink/mets:smLink');
 
-                if ($smLinks) {
+				if ($smLinks) {
 
-                    foreach ($smLinks as $smLink) {
+					foreach ($smLinks as $smLink) {
 
-                        $links[(string) $smLink->attributes('http://www.w3.org/1999/xlink')->from][] = (string) $smLink->attributes('http://www.w3.org/1999/xlink')->to;
+						$links[(string) $smLink->attributes('http://www.w3.org/1999/xlink')->from][] = (string) $smLink->attributes('http://www.w3.org/1999/xlink')->to;
 
-                    }
+					}
 
-                    foreach ($divs as $div) {
+					foreach ($divs as $div) {
 
-                        if (!empty($links[(string) $div['ID']])) {
+						if (!empty($links[(string) $div['ID']])) {
 
-                            $id = (string) $div['DMDID'];
+							$id = (string) $div['DMDID'];
 
-                            break;
+							break;
 
-                        }
+						}
 
-                    }
+					}
 
-                }
+				}
 
-                if (empty($id)) {
+				if (empty($id)) {
 
-                    $id = (string) $divs[0]['DMDID'];
+					$id = (string) $divs[0]['DMDID'];
 
-                }
+				}
 
-                $recordIds = $xml->xpath('//mets:dmdSec[@ID="'.$id.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
+				$recordIds = $xml->xpath('//mets:dmdSec[@ID="'.$id.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
 
-                if (!empty($recordIds[0])) {
+				if (!empty($recordIds[0])) {
 
-                    $record_id = (string) $recordIds[0];
+					$record_id = (string) $recordIds[0];
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
 }

hooks/class.tx_dlf_tcemain.php

Indentation +280 added lines, -280 removed lines

@@ -19,433 +19,433 @@
  */
 class tx_dlf_tcemain {
 
-    /**
-     * Field post-processing hook for the process_datamap() method.
-     *
-     * @access	public
-     *
-     * @param	string		$status: 'new' or 'update'
-     * @param	string		$table: The destination table
-     * @param	integer		$id: The uid of the record
-     * @param	array		&$fieldArray: Array of field values
-     * @param	\TYPO3\CMS\Core\DataHandling\DataHandler $pObj: The parent object
-     *
-     * @return	void
-     */
-    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray, $pObj) {
+	/**
+	 * Field post-processing hook for the process_datamap() method.
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$status: 'new' or 'update'
+	 * @param	string		$table: The destination table
+	 * @param	integer		$id: The uid of the record
+	 * @param	array		&$fieldArray: Array of field values
+	 * @param	\TYPO3\CMS\Core\DataHandling\DataHandler $pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray, $pObj) {
 
-        if ($status == 'new') {
+		if ($status == 'new') {
 
-            switch ($table) {
+			switch ($table) {
 
-                // Field post-processing for table "tx_dlf_documents".
-                case 'tx_dlf_documents':
+				// Field post-processing for table "tx_dlf_documents".
+				case 'tx_dlf_documents':
 
-                    // Set sorting field if empty.
-                    if (empty($fieldArray['title_sorting']) && !empty($fieldArray['title'])) {
+					// Set sorting field if empty.
+					if (empty($fieldArray['title_sorting']) && !empty($fieldArray['title'])) {
 
-                        $fieldArray['title_sorting'] = $fieldArray['title'];
+						$fieldArray['title_sorting'] = $fieldArray['title'];
 
-                    }
+					}
 
-                    break;
+					break;
 
-                    // Field post-processing for table "tx_dlf_metadata".
-                case 'tx_dlf_metadata':
+					// Field post-processing for table "tx_dlf_metadata".
+				case 'tx_dlf_metadata':
 
-                    // Store field in index if it should appear in lists.
-                    if (!empty($fieldArray['is_listed'])) {
+					// Store field in index if it should appear in lists.
+					if (!empty($fieldArray['is_listed'])) {
 
-                        $fieldArray['index_stored'] = 1;
+						$fieldArray['index_stored'] = 1;
 
-                    }
+					}
 
-                    // Index field in index if it should be used for auto-completion.
-                    if (!empty($fieldArray['index_autocomplete'])) {
+					// Index field in index if it should be used for auto-completion.
+					if (!empty($fieldArray['index_autocomplete'])) {
 
-                        $fieldArray['index_indexed'] = 1;
+						$fieldArray['index_indexed'] = 1;
 
-                    }
+					}
 
-                    // Field post-processing for tables "tx_dlf_metadata", "tx_dlf_collections", "tx_dlf_libraries" and "tx_dlf_structures".
-                case 'tx_dlf_collections':
-                case 'tx_dlf_libraries':
-                case 'tx_dlf_structures':
+					// Field post-processing for tables "tx_dlf_metadata", "tx_dlf_collections", "tx_dlf_libraries" and "tx_dlf_structures".
+				case 'tx_dlf_collections':
+				case 'tx_dlf_libraries':
+				case 'tx_dlf_structures':
 
-                    // Set label as index name if empty.
-                    if (empty($fieldArray['index_name']) && !empty($fieldArray['label'])) {
+					// Set label as index name if empty.
+					if (empty($fieldArray['index_name']) && !empty($fieldArray['label'])) {
 
-                        $fieldArray['index_name'] = $fieldArray['label'];
+						$fieldArray['index_name'] = $fieldArray['label'];
 
-                    }
+					}
 
-                    // Set index name as label if empty.
-                    if (empty($fieldArray['label']) && !empty($fieldArray['index_name'])) {
+					// Set index name as label if empty.
+					if (empty($fieldArray['label']) && !empty($fieldArray['index_name'])) {
 
-                        $fieldArray['label'] = $fieldArray['index_name'];
+						$fieldArray['label'] = $fieldArray['index_name'];
 
-                    }
+					}
 
-                    // Ensure that index names don't get mixed up with sorting values.
-                    if (substr($fieldArray['index_name'], -8) == '_sorting') {
+					// Ensure that index names don't get mixed up with sorting values.
+					if (substr($fieldArray['index_name'], -8) == '_sorting') {
 
-                        $fieldArray['index_name'] .= '0';
+						$fieldArray['index_name'] .= '0';
 
-                    }
+					}
 
-                    break;
+					break;
 
-                    // Field post-processing for table "tx_dlf_solrcores".
-                case 'tx_dlf_solrcores':
+					// Field post-processing for table "tx_dlf_solrcores".
+				case 'tx_dlf_solrcores':
 
-                    // Get number of existing cores.
-                    $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                        '*',
-                        'tx_dlf_solrcores',
-                        '',
-                        '',
-                        '',
-                        ''
-                    );
+					// Get number of existing cores.
+					$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+						'*',
+						'tx_dlf_solrcores',
+						'',
+						'',
+						'',
+						''
+					);
 
-                    // Get first unused core number.
-                    $coreNumber = tx_dlf_solr::solrGetCoreNumber($GLOBALS['TYPO3_DB']->sql_num_rows($result));
+					// Get first unused core number.
+					$coreNumber = tx_dlf_solr::solrGetCoreNumber($GLOBALS['TYPO3_DB']->sql_num_rows($result));
 
-                    // Get Solr credentials.
-                    $conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
+					// Get Solr credentials.
+					$conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
 
-                    // Prepend username and password to hostname.
-                    if ($conf['solrUser'] && $conf['solrPass']) {
+					// Prepend username and password to hostname.
+					if ($conf['solrUser'] && $conf['solrPass']) {
 
-                        $host = $conf['solrUser'].':'.$conf['solrPass'].'@'.($conf['solrHost'] ? $conf['solrHost'] : 'localhost');
+						$host = $conf['solrUser'].':'.$conf['solrPass'].'@'.($conf['solrHost'] ? $conf['solrHost'] : 'localhost');
 
-                    } else {
+					} else {
 
-                        $host = ($conf['solrHost'] ? $conf['solrHost'] : 'localhost');
+						$host = ($conf['solrHost'] ? $conf['solrHost'] : 'localhost');
 
-                    }
+					}
 
-                    // Set port if not set.
-                    $port = (intval($conf['solrPort']) > 0 ? intval($conf['solrPort']) : 8180);
+					// Set port if not set.
+					$port = (intval($conf['solrPort']) > 0 ? intval($conf['solrPort']) : 8180);
 
-                    // Trim path and append trailing slash.
-                    $path = (trim($conf['solrPath'], '/') ? trim($conf['solrPath'], '/').'/' : '');
+					// Trim path and append trailing slash.
+					$path = (trim($conf['solrPath'], '/') ? trim($conf['solrPath'], '/').'/' : '');
 
-                    $context = stream_context_create(array (
-                        'http' => array (
-                            'method' => 'GET',
-                            'user_agent' => ($conf['useragent'] ? $conf['useragent'] : ini_get('user_agent'))
-                        )
-                    ));
+					$context = stream_context_create(array (
+						'http' => array (
+							'method' => 'GET',
+							'user_agent' => ($conf['useragent'] ? $conf['useragent'] : ini_get('user_agent'))
+						)
+					));
 
-                    // Build request for adding new Solr core.
-                    // @see http://wiki.apache.org/solr/CoreAdmin
-                    $url = 'http://'.$host.':'.$port.'/'.$path.'admin/cores?wt=xml&action=CREATE&name=dlfCore'.$coreNumber.'&instanceDir=.&dataDir=dlfCore'.$coreNumber;
+					// Build request for adding new Solr core.
+					// @see http://wiki.apache.org/solr/CoreAdmin
+					$url = 'http://'.$host.':'.$port.'/'.$path.'admin/cores?wt=xml&action=CREATE&name=dlfCore'.$coreNumber.'&instanceDir=.&dataDir=dlfCore'.$coreNumber;
 
-                    $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
+					$response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
 
-                    // Process response.
-                    if ($response) {
+					// Process response.
+					if ($response) {
 
-                        $status = $response->xpath('//lst[@name="responseHeader"]/int[@name="status"]');
+						$status = $response->xpath('//lst[@name="responseHeader"]/int[@name="status"]');
 
-                        if ($status && $status[0] == 0) {
+						if ($status && $status[0] == 0) {
 
-                            $fieldArray['index_name'] = 'dlfCore'.$coreNumber;
+							$fieldArray['index_name'] = 'dlfCore'.$coreNumber;
 
-                            return;
+							return;
 
-                        }
+						}
 
-                    }
+					}
 
-                    if (TYPO3_DLOG) {
+					if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Could not create new Apache Solr core "dlfCore'.$coreNumber.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
+						\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Could not create new Apache Solr core "dlfCore'.$coreNumber.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
 
-                    }
+					}
 
-                    // Solr core could not be created, thus unset field array.
-                    $fieldArray = array ();
+					// Solr core could not be created, thus unset field array.
+					$fieldArray = array ();
 
-                    break;
+					break;
 
-            }
+			}
 
-        } elseif ($status == 'update') {
+		} elseif ($status == 'update') {
 
-            switch ($table) {
+			switch ($table) {
 
-                    // Field post-processing for table "tx_dlf_metadata".
-                case 'tx_dlf_metadata':
+					// Field post-processing for table "tx_dlf_metadata".
+				case 'tx_dlf_metadata':
 
-                    // Store field in index if it should appear in lists.
-                    if (!empty($fieldArray['is_listed'])) {
+					// Store field in index if it should appear in lists.
+					if (!empty($fieldArray['is_listed'])) {
 
-                        $fieldArray['index_stored'] = 1;
+						$fieldArray['index_stored'] = 1;
 
-                    }
+					}
 
-                    if (isset($fieldArray['index_stored']) && $fieldArray['index_stored'] == 0 && !isset($fieldArray['is_listed'])) {
+					if (isset($fieldArray['index_stored']) && $fieldArray['index_stored'] == 0 && !isset($fieldArray['is_listed'])) {
 
-                        // Get current configuration.
-                        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                            $table.'.is_listed AS is_listed',
-                            $table,
-                            $table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
-                            '',
-                            '',
-                            '1'
-                        );
+						// Get current configuration.
+						$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+							$table.'.is_listed AS is_listed',
+							$table,
+							$table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
+							'',
+							'',
+							'1'
+						);
 
-                        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+						if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                            // Reset storing to current.
-                            list ($fieldArray['index_stored']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+							// Reset storing to current.
+							list ($fieldArray['index_stored']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-                        }
+						}
 
-                    }
+					}
 
-                    // Index field in index if it should be used for auto-completion.
-                    if (!empty($fieldArray['index_autocomplete'])) {
+					// Index field in index if it should be used for auto-completion.
+					if (!empty($fieldArray['index_autocomplete'])) {
 
-                        $fieldArray['index_indexed'] = 1;
+						$fieldArray['index_indexed'] = 1;
 
-                    }
+					}
 
-                    if (isset($fieldArray['index_indexed']) && $fieldArray['index_indexed'] == 0 && !isset($fieldArray['index_autocomplete'])) {
+					if (isset($fieldArray['index_indexed']) && $fieldArray['index_indexed'] == 0 && !isset($fieldArray['index_autocomplete'])) {
 
-                        // Get current configuration.
-                        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                            $table.'.index_autocomplete AS index_autocomplete',
-                            $table,
-                            $table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
-                            '',
-                            '',
-                            '1'
-                        );
+						// Get current configuration.
+						$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+							$table.'.index_autocomplete AS index_autocomplete',
+							$table,
+							$table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
+							'',
+							'',
+							'1'
+						);
 
-                        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+						if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                            // Reset indexing to current.
-                            list ($fieldArray['index_indexed']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+							// Reset indexing to current.
+							list ($fieldArray['index_indexed']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-                        }
+						}
 
-                    }
+					}
 
-                    // Field post-processing for tables "tx_dlf_metadata" and "tx_dlf_structures".
-                case 'tx_dlf_structures':
+					// Field post-processing for tables "tx_dlf_metadata" and "tx_dlf_structures".
+				case 'tx_dlf_structures':
 
-                    // The index name should not be changed in production.
-                    if (isset($fieldArray['index_name'])) {
+					// The index name should not be changed in production.
+					if (isset($fieldArray['index_name'])) {
 
-                        if (count($fieldArray) < 2) {
+						if (count($fieldArray) < 2) {
 
-                            // Unset the whole field array.
-                            $fieldArray = array ();
+							// Unset the whole field array.
+							$fieldArray = array ();
 
-                        } else {
+						} else {
 
-                            // Get current index name.
-                            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                                $table.'.index_name AS index_name',
-                                $table,
-                                $table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
-                                '',
-                                '',
-                                '1'
-                            );
+							// Get current index name.
+							$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+								$table.'.index_name AS index_name',
+								$table,
+								$table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
+								'',
+								'',
+								'1'
+							);
 
-                            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+							if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                                // Reset index name to current.
-                                list ($fieldArray['index_name']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+								// Reset index name to current.
+								list ($fieldArray['index_name']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-                            }
+							}
 
-                        }
+						}
 
-                        if (TYPO3_DLOG) {
+						if (TYPO3_DLOG) {
 
-                            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Prevented change of "index_name" for UID "'.$id.'" in table "'.$table.'"', $this->extKey, SYSLOG_SEVERITY_NOTICE, $fieldArray);
+							\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Prevented change of "index_name" for UID "'.$id.'" in table "'.$table.'"', $this->extKey, SYSLOG_SEVERITY_NOTICE, $fieldArray);
 
-                        }
+						}
 
-                    }
+					}
 
-                    break;
+					break;
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * After database operations hook for the process_datamap() method.
-     *
-     * @access	public
-     *
-     * @param	string		$status: 'new' or 'update'
-     * @param	string		$table: The destination table
-     * @param	integer		$id: The uid of the record
-     * @param	array		&$fieldArray: Array of field values
-     * @param	\TYPO3\CMS\Core\DataHandling\DataHandler $pObj: The parent object
-     *
-     * @return	void
-     */
-    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray, $pObj) {
+	/**
+	 * After database operations hook for the process_datamap() method.
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$status: 'new' or 'update'
+	 * @param	string		$table: The destination table
+	 * @param	integer		$id: The uid of the record
+	 * @param	array		&$fieldArray: Array of field values
+	 * @param	\TYPO3\CMS\Core\DataHandling\DataHandler $pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray, $pObj) {
 
-        if ($status == 'update') {
+		if ($status == 'update') {
 
-            switch ($table) {
+			switch ($table) {
 
-                // After database operations for table "tx_dlf_documents".
-                case 'tx_dlf_documents':
+				// After database operations for table "tx_dlf_documents".
+				case 'tx_dlf_documents':
 
-                    // Delete/reindex document in Solr according to "hidden" status in database.
-                    if (isset($fieldArray['hidden'])) {
+					// Delete/reindex document in Solr according to "hidden" status in database.
+					if (isset($fieldArray['hidden'])) {
 
-                        // Get Solr core.
-                        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                            'tx_dlf_solrcores.uid',
-                            'tx_dlf_solrcores,tx_dlf_documents',
-                            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-                            '',
-                            '',
-                            '1'
-                        );
+						// Get Solr core.
+						$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+							'tx_dlf_solrcores.uid',
+							'tx_dlf_solrcores,tx_dlf_documents',
+							'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+							'',
+							'',
+							'1'
+						);
 
-                        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+						if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                            list ($core) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+							list ($core) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-                            if ($fieldArray['hidden']) {
+							if ($fieldArray['hidden']) {
 
-                                // Establish Solr connection.
-                                if ($solr = tx_dlf_solr::getInstance($core)) {
+								// Establish Solr connection.
+								if ($solr = tx_dlf_solr::getInstance($core)) {
 
-                                    // Delete Solr document.
-                                    $solr->service->deleteByQuery('uid:'.$id);
+									// Delete Solr document.
+									$solr->service->deleteByQuery('uid:'.$id);
 
-                                    $solr->service->commit();
+									$solr->service->commit();
 
-                                }
+								}
 
-                            } else {
+							} else {
 
-                                // Reindex document.
-                                $doc =& tx_dlf_document::getInstance($id);
+								// Reindex document.
+								$doc =& tx_dlf_document::getInstance($id);
 
-                                if ($doc->ready) {
+								if ($doc->ready) {
 
-                                    $doc->save($doc->pid, $core);
+									$doc->save($doc->pid, $core);
 
-                                } else {
+								} else {
 
-                                    if (TYPO3_DLOG) {
+									if (TYPO3_DLOG) {
 
-                                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_afterDatabaseOperations('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
+										\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_afterDatabaseOperations('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
 
-                                    }
+									}
 
-                                }
+								}
 
-                            }
+							}
 
-                        }
+						}
 
-                    }
+					}
 
-                    break;
+					break;
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Post-processing hook for the process_cmdmap() method.
-     *
-     * @access	public
-     *
-     * @param	string		$command: 'move', 'copy', 'localize', 'inlineLocalizeSynchronize', 'delete' or 'undelete'
-     * @param	string		$table: The destination table
-     * @param	integer		$id: The uid of the record
-     * @param	mixed		$value: The value for the command
-     * @param	\TYPO3\CMS\Core\DataHandling\DataHandler $pObj: The parent object
-     *
-     * @return	void
-     */
-    public function processCmdmap_postProcess($command, $table, $id, $value, $pObj) {
+	/**
+	 * Post-processing hook for the process_cmdmap() method.
+	 *
+	 * @access	public
+	 *
+	 * @param	string		$command: 'move', 'copy', 'localize', 'inlineLocalizeSynchronize', 'delete' or 'undelete'
+	 * @param	string		$table: The destination table
+	 * @param	integer		$id: The uid of the record
+	 * @param	mixed		$value: The value for the command
+	 * @param	\TYPO3\CMS\Core\DataHandling\DataHandler $pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function processCmdmap_postProcess($command, $table, $id, $value, $pObj) {
 
-        if (in_array($command, array ('move', 'delete', 'undelete')) && $table == 'tx_dlf_documents') {
+		if (in_array($command, array ('move', 'delete', 'undelete')) && $table == 'tx_dlf_documents') {
 
-            // Get Solr core.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'tx_dlf_solrcores.uid',
-                'tx_dlf_solrcores,tx_dlf_documents',
-                'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-                '',
-                '',
-                '1'
-            );
+			// Get Solr core.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_solrcores.uid',
+				'tx_dlf_solrcores,tx_dlf_documents',
+				'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+				'',
+				'',
+				'1'
+			);
 
-            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-                list ($core) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+				list ($core) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-                switch ($command) {
+				switch ($command) {
 
-                    case 'move':
-                    case 'delete':
+					case 'move':
+					case 'delete':
 
-                        // Establish Solr connection.
-                        if ($solr = tx_dlf_solr::getInstance($core)) {
+						// Establish Solr connection.
+						if ($solr = tx_dlf_solr::getInstance($core)) {
 
-                            // Delete Solr document.
-                            $solr->service->deleteByQuery('uid:'.$id);
+							// Delete Solr document.
+							$solr->service->deleteByQuery('uid:'.$id);
 
-                            $solr->service->commit();
+							$solr->service->commit();
 
-                            if ($command == 'delete') {
+							if ($command == 'delete') {
 
-                                break;
+								break;
 
-                            }
+							}
 
-                        }
+						}
 
-                    case 'undelete':
+					case 'undelete':
 
-                        // Reindex document.
-                        $doc =& tx_dlf_document::getInstance($id);
+						// Reindex document.
+						$doc =& tx_dlf_document::getInstance($id);
 
-                        if ($doc->ready) {
+						if ($doc->ready) {
 
-                            $doc->save($doc->pid, $core);
+							$doc->save($doc->pid, $core);
 
-                        } else {
+						} else {
 
-                            if (TYPO3_DLOG) {
+							if (TYPO3_DLOG) {
 
-                                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processCmdmap_postProcess('.$command.', '.$table.', '.$id.', '.$value.', ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+								\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processCmdmap_postProcess('.$command.', '.$table.', '.$id.', '.$value.', ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
-                            }
+							}
 
-                        }
+						}
 
-                        break;
+						break;
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
 }

Spacing +7 added lines, -7 removed lines

@@ -131,8 +131,8 @@ 
                     // Trim path and append trailing slash.
                     $path = (trim($conf['solrPath'], '/') ? trim($conf['solrPath'], '/').'/' : '');
 
-                    $context = stream_context_create(array (
-                        'http' => array (
+                    $context = stream_context_create(array(
+                        'http' => array(
                             'method' => 'GET',
                             'user_agent' => ($conf['useragent'] ? $conf['useragent'] : ini_get('user_agent'))
                         )
@@ -166,7 +166,7 @@ 
                     }
 
                     // Solr core could not be created, thus unset field array.
-                    $fieldArray = array ();
+                    $fieldArray = array();
 
                     break;
 
@@ -244,7 +244,7 @@ 
                         if (count($fieldArray) < 2) {
 
                             // Unset the whole field array.
-                            $fieldArray = array ();
+                            $fieldArray = array();
 
                         } else {
 
@@ -337,7 +337,7 @@ 
                             } else {
 
                                 // Reindex document.
-                                $doc =& tx_dlf_document::getInstance($id);
+                                $doc = & tx_dlf_document::getInstance($id);
 
                                 if ($doc->ready) {
 
@@ -382,7 +382,7 @@ 
      */
     public function processCmdmap_postProcess($command, $table, $id, $value, $pObj) {
 
-        if (in_array($command, array ('move', 'delete', 'undelete')) && $table == 'tx_dlf_documents') {
+        if (in_array($command, array('move', 'delete', 'undelete')) && $table == 'tx_dlf_documents') {
 
             // Get Solr core.
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -422,7 +422,7 @@ 
                     case 'undelete':
 
                         // Reindex document.
-                        $doc =& tx_dlf_document::getInstance($id);
+                        $doc = & tx_dlf_document::getInstance($id);
 
                         if ($doc->ready) {
 

hooks/class.tx_dlf_doctype.php

Indentation +143 added lines, -143 removed lines

@@ -20,61 +20,61 @@ 
  */
 class tx_dlf_doctype {
 
-    /**
-     * This holds the current document
-     *
-     * @var	tx_dlf_document
-     * @access protected
-     */
-    protected $doc;
-
-    /**
-     * This holds the extension key
-     *
-     * @var	string
-     * @access protected
-     */
-    protected $extKey = 'dlf';
-
-    /**
-     * This holds the current DLF plugin parameters
-     * @see __contruct()
-     *
-     * @var	array
-     * @access protected
-     */
-    protected $piVars = array ();
-
-    /**
-     * This holds the DLF parameter prefix
-     *
-     * @var	string
-     * @access protected
-     */
-    protected $prefixId = 'tx_dlf';
-
-    /**
-     * Check the current document's type.
-     *
-     * @access	public
-     *
-     * @return	string		The type of the current document
-     */
-    public function getDocType() {
-
-        // Load current document.
-        $this->loadDocument();
-
-        if ($this->doc === NULL) {
-
-            // Quit without doing anything if document not available.
-            return '';
-
-        }
-
-        $toc = $this->doc->tableOfContents;
-
-        /*
+	/**
+	 * This holds the current document
+	 *
+	 * @var	tx_dlf_document
+	 * @access protected
+	 */
+	protected $doc;
+
+	/**
+	 * This holds the extension key
+	 *
+	 * @var	string
+	 * @access protected
+	 */
+	protected $extKey = 'dlf';
+
+	/**
+	 * This holds the current DLF plugin parameters
+	 * @see __contruct()
+	 *
+	 * @var	array
+	 * @access protected
+	 */
+	protected $piVars = array ();
+
+	/**
+	 * This holds the DLF parameter prefix
+	 *
+	 * @var	string
+	 * @access protected
+	 */
+	protected $prefixId = 'tx_dlf';
+
+	/**
+	 * Check the current document's type.
+	 *
+	 * @access	public
+	 *
+	 * @return	string		The type of the current document
+	 */
+	public function getDocType() {
+
+		// Load current document.
+		$this->loadDocument();
+
+		if ($this->doc === NULL) {
+
+			// Quit without doing anything if document not available.
+			return '';
+
+		}
+
+		$toc = $this->doc->tableOfContents;
+
+		/*
 		 * Get the document type
 		 *
 		 * 1. newspaper
@@ -88,145 +88,145 @@ 
 		 * 			  - children array([0]) --> type = month
 		 * 			  - children array([0], [1], [2], ...) --> type = day --> Issue
 		 */
-        switch ($toc[0]['type']) {
+		switch ($toc[0]['type']) {
 
-            case 'newspaper':
+			case 'newspaper':
 
-                $nodes_year = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]');
+				$nodes_year = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]');
 
-                if (count($nodes_year) > 1) {
+				if (count($nodes_year) > 1) {
 
-                    // Multiple years means this is a newspaper's anchor file.
-                    return 'newspaper';
+					// Multiple years means this is a newspaper's anchor file.
+					return 'newspaper';
 
-                } else {
+				} else {
 
-                    $nodes_month = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]/mets:div[@TYPE="month"]');
+					$nodes_month = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]/mets:div[@TYPE="month"]');
 
-                    $nodes_day = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]/mets:div[@TYPE="month"]/mets:div[@TYPE="day"]');
+					$nodes_day = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]/mets:div[@TYPE="month"]/mets:div[@TYPE="day"]');
 
-                    $nodes_issue = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]//mets:div[@TYPE="issue"]');
+					$nodes_issue = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]//mets:div[@TYPE="issue"]');
 
-                    $nodes_issue_current = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]//mets:div[@TYPE="issue"]/@DMDID');
+					$nodes_issue_current = $this->doc->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]/mets:div[@TYPE="newspaper"]/mets:div[@TYPE="year"]//mets:div[@TYPE="issue"]/@DMDID');
 
-                    if (count($nodes_year) == 1 && count($nodes_issue) == 0) {
+					if (count($nodes_year) == 1 && count($nodes_issue) == 0) {
 
-                        // It's possible to have only one year in the newspaper's anchor file.
-                        return 'newspaper';
+						// It's possible to have only one year in the newspaper's anchor file.
+						return 'newspaper';
 
-                    } elseif (count($nodes_year) == 1 && count($nodes_month) > 1) {
+					} elseif (count($nodes_year) == 1 && count($nodes_month) > 1) {
 
-                        // One year, multiple months means this is a year's anchor file.
-                        return 'year';
+						// One year, multiple months means this is a year's anchor file.
+						return 'year';
 
-                    } elseif (count($nodes_year) == 1 && count($nodes_month) == 1 && count($nodes_day) > 1) {
+					} elseif (count($nodes_year) == 1 && count($nodes_month) == 1 && count($nodes_day) > 1) {
 
-                        // One year, one month, one or more days means this is a year's anchor file.
-                        return 'year';
+						// One year, one month, one or more days means this is a year's anchor file.
+						return 'year';
 
-                    } elseif (count($nodes_year) == 1 && count($nodes_month) == 1 && count($nodes_day) == 1 && count($nodes_issue_current) == 0) {
+					} elseif (count($nodes_year) == 1 && count($nodes_month) == 1 && count($nodes_day) == 1 && count($nodes_issue_current) == 0) {
 
-                        // One year, one month, a single day, one or more issues (but not the current one) means this is a year's anchor file.
-                        return 'year';
+						// One year, one month, a single day, one or more issues (but not the current one) means this is a year's anchor file.
+						return 'year';
 
-                    } else {
+					} else {
 
-                        // In all other cases we assume it's newspaper's issue.
-                        return 'issue';
+						// In all other cases we assume it's newspaper's issue.
+						return 'issue';
 
-                    }
+					}
 
-                }
+				}
 
-                break;
+				break;
 
-            default:
+			default:
 
-                return $toc[0]['type'];
+				return $toc[0]['type'];
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Loads the current document into $this->doc
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function loadDocument() {
+	/**
+	 * Loads the current document into $this->doc
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function loadDocument() {
 
-        // Check for required variable.
-        if (!empty($this->piVars['id'])) {
+		// Check for required variable.
+		if (!empty($this->piVars['id'])) {
 
-            // Get instance of tx_dlf_document.
-            $this->doc =& tx_dlf_document::getInstance($this->piVars['id']);
+			// Get instance of tx_dlf_document.
+			$this->doc =& tx_dlf_document::getInstance($this->piVars['id']);
 
-            if (!$this->doc->ready) {
+			if (!$this->doc->ready) {
 
-                // Destroy the incomplete object.
-                $this->doc = NULL;
+				// Destroy the incomplete object.
+				$this->doc = NULL;
 
-                if (TYPO3_DLOG) {
+				if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with UID "'.$this->piVars['id'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with UID "'.$this->piVars['id'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-                }
+				}
 
-            }
+			}
 
-        } elseif (!empty($this->piVars['recordId'])) {
+		} elseif (!empty($this->piVars['recordId'])) {
 
-            // Get UID of document with given record identifier.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'tx_dlf_documents.uid',
-                'tx_dlf_documents',
-                'tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['recordId'], 'tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_documents'),
-                '',
-                '',
-                '1'
-            );
+			// Get UID of document with given record identifier.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_documents.uid',
+				'tx_dlf_documents',
+				'tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['recordId'], 'tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_documents'),
+				'',
+				'',
+				'1'
+			);
 
-            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 1) {
+			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) == 1) {
 
-                list ($this->piVars['id']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
+				list ($this->piVars['id']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
 
-                // Set superglobal $_GET array.
-                $_GET[$this->prefixId]['id'] = $this->piVars['id'];
+				// Set superglobal $_GET array.
+				$_GET[$this->prefixId]['id'] = $this->piVars['id'];
 
-                // Unset variable to avoid infinite looping.
-                unset ($this->piVars['recordId'], $_GET[$this->prefixId]['recordId']);
+				// Unset variable to avoid infinite looping.
+				unset ($this->piVars['recordId'], $_GET[$this->prefixId]['recordId']);
 
-                // Try to load document.
-                $this->loadDocument();
+				// Try to load document.
+				$this->loadDocument();
 
-            } else {
+			} else {
 
-                if (TYPO3_DLOG) {
+				if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with record ID "'.$this->piVars['recordId'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+					\TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with record ID "'.$this->piVars['recordId'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Initializes the hook by setting initial variables.
-     *
-     * @access public
-     *
-     * @return	void
-     */
-    public function __construct() {
+	/**
+	 * Initializes the hook by setting initial variables.
+	 *
+	 * @access public
+	 *
+	 * @return	void
+	 */
+	public function __construct() {
 
-        // Load current plugin parameters.
-        $this->piVars = \TYPO3\CMS\Core\Utility\GeneralUtility::_GPmerged($this->prefixId);
+		// Load current plugin parameters.
+		$this->piVars = \TYPO3\CMS\Core\Utility\GeneralUtility::_GPmerged($this->prefixId);
 
-    }
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $piVars = array ();
+    protected $piVars = array();
 
     /**
      * This holds the DLF parameter prefix
@@ -161,7 +161,7 @@ 
         if (!empty($this->piVars['id'])) {
 
             // Get instance of tx_dlf_document.
-            $this->doc =& tx_dlf_document::getInstance($this->piVars['id']);
+            $this->doc = & tx_dlf_document::getInstance($this->piVars['id']);
 
             if (!$this->doc->ready) {
 

hooks/class.tx_dlf_tceforms.php

Indentation +255 added lines, -255 removed lines

@@ -19,393 +19,393 @@
  */
 class tx_dlf_tceforms {
 
-    /**
-     * Helper to display document's thumbnail for table "tx_dlf_documents"
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
-     *
-     * @return	string		HTML <img> tag for thumbnail
-     */
-    public function displayThumbnail(&$params, &$pObj) {
+	/**
+	 * Helper to display document's thumbnail for table "tx_dlf_documents"
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
+	 *
+	 * @return	string		HTML <img> tag for thumbnail
+	 */
+	public function displayThumbnail(&$params, &$pObj) {
 
-        $output = '<div style="padding:5px; background-color:#000000;">';
+		$output = '<div style="padding:5px; background-color:#000000;">';
 
-        // Simulate TCA field type "passthrough".
-        $output .= '<input type="hidden" name="'.$params['itemFormElName'].'" value="'.$params['itemFormElValue'].'" />';
+		// Simulate TCA field type "passthrough".
+		$output .= '<input type="hidden" name="'.$params['itemFormElName'].'" value="'.$params['itemFormElValue'].'" />';
 
-        if (!empty($params['itemFormElValue'])) {
+		if (!empty($params['itemFormElValue'])) {
 
-            $output .= '<img alt="" src="'.$params['itemFormElValue'].'" />';
+			$output .= '<img alt="" src="'.$params['itemFormElValue'].'" />';
 
-        }
+		}
 
-        $output .= '</div>';
+		$output .= '</div>';
 
-        return $output;
+		return $output;
 
-    }
+	}
 
-    /**
-     * Helper to get flexform's items array for plugin "tx_dlf_collection"
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
-     *
-     * @return	void
-     */
-    public function itemsProcFunc_collectionList(&$params, &$pObj) {
+	/**
+	 * Helper to get flexform's items array for plugin "tx_dlf_collection"
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function itemsProcFunc_collectionList(&$params, &$pObj) {
 
-        // the access to pi_flexform data has changed in TYPO3 7.6
-        if (version_compare(TYPO3_version, '7.6', '<')) {
+		// the access to pi_flexform data has changed in TYPO3 7.6
+		if (version_compare(TYPO3_version, '7.6', '<')) {
 
-            if ($params['row']['pi_flexform']) {
+			if ($params['row']['pi_flexform']) {
 
-                $pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
+				$pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
 
-                $pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
+				$pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $pages = $params['row']['pages'];
+			$pages = $params['row']['pages'];
 
-        }
+		}
 
-        if (!empty($pages)) {
+		if (!empty($pages)) {
 
-            // There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
-            // i.e. instead of "18" it reads "pages_18|Title"
-            if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
+			// There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
+			// i.e. instead of "18" it reads "pages_18|Title"
+			if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
 
-                $parts = explode('|', $pages);
+				$parts = explode('|', $pages);
 
-                $pages = array_pop(explode('_', $parts[0]));
+				$pages = array_pop(explode('_', $parts[0]));
 
-            }
+			}
 
-            if ($pages > 0) {
+			if ($pages > 0) {
 
-                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                    'label,uid',
-                    'tx_dlf_collections',
-                    'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_collections'),
-                    '',
-                    'label',
-                    ''
-                );
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+					'label,uid',
+					'tx_dlf_collections',
+					'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_collections'),
+					'',
+					'label',
+					''
+				);
 
-                if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
+				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-                    while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
+					while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
 
-                        $params['items'][] = $resArray;
+						$params['items'][] = $resArray;
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Helper to get flexform's items array for plugin "tx_dlf_search"
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
-     *
-     * @return	void
-     */
-    public function itemsProcFunc_extendedSearchList(&$params, &$pObj) {
+	/**
+	 * Helper to get flexform's items array for plugin "tx_dlf_search"
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function itemsProcFunc_extendedSearchList(&$params, &$pObj) {
 
-        // the access to pi_flexform data has changed in TYPO3 7.6
-        if (version_compare(TYPO3_version, '7.6', '<')) {
+		// the access to pi_flexform data has changed in TYPO3 7.6
+		if (version_compare(TYPO3_version, '7.6', '<')) {
 
-            if ($params['row']['pi_flexform']) {
+			if ($params['row']['pi_flexform']) {
 
-                $pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
+				$pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
 
-                $pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
+				$pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $pages = $params['row']['pages'];
+			$pages = $params['row']['pages'];
 
-        }
+		}
 
-        if (!empty($pages)) {
+		if (!empty($pages)) {
 
-            // There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
-            // i.e. instead of "18" it reads "pages_18|Title"
-            if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
+			// There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
+			// i.e. instead of "18" it reads "pages_18|Title"
+			if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
 
-                $_parts = explode('|', $pages);
+				$_parts = explode('|', $pages);
 
-                $pages = array_pop(explode('_', $_parts[0]));
+				$pages = array_pop(explode('_', $_parts[0]));
 
-            }
+			}
 
-            if ($pages > 0) {
+			if ($pages > 0) {
 
-                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                    'label,index_name',
-                    'tx_dlf_metadata',
-                    'index_indexed=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
-                    '',
-                    'sorting',
-                    ''
-                );
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+					'label,index_name',
+					'tx_dlf_metadata',
+					'index_indexed=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+					'',
+					'sorting',
+					''
+				);
 
-                if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
+				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-                    while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
+					while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
 
-                        $params['items'][] = $resArray;
+						$params['items'][] = $resArray;
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Helper to get flexform's items array for plugin "tx_dlf_search"
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
-     *
-     * @return	void
-     */
-    public function itemsProcFunc_facetsList(&$params, &$pObj) {
+	/**
+	 * Helper to get flexform's items array for plugin "tx_dlf_search"
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function itemsProcFunc_facetsList(&$params, &$pObj) {
 
-        // the access to pi_flexform data has changed in TYPO3 7.6
-        if (version_compare(TYPO3_version, '7.6', '<')) {
+		// the access to pi_flexform data has changed in TYPO3 7.6
+		if (version_compare(TYPO3_version, '7.6', '<')) {
 
-            if ($params['row']['pi_flexform']) {
+			if ($params['row']['pi_flexform']) {
 
-                $pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
+				$pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
 
-                $pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
+				$pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $pages = $params['row']['pages'];
+			$pages = $params['row']['pages'];
 
-        }
+		}
 
-        if (!empty($pages)) {
+		if (!empty($pages)) {
 
-            // There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
-            // i.e. instead of "18" it reads "pages_18|Title"
-            if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
+			// There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
+			// i.e. instead of "18" it reads "pages_18|Title"
+			if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
 
-                $_parts = explode('|', $pages);
+				$_parts = explode('|', $pages);
 
-                $pages = array_pop(explode('_', $_parts[0]));
+				$pages = array_pop(explode('_', $_parts[0]));
 
-            }
+			}
 
-            if ($pages > 0) {
+			if ($pages > 0) {
 
-                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                    'label,index_name',
-                    'tx_dlf_metadata',
-                    'is_facet=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
-                    '',
-                    'sorting',
-                    ''
-                );
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+					'label,index_name',
+					'tx_dlf_metadata',
+					'is_facet=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+					'',
+					'sorting',
+					''
+				);
 
-                if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
+				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-                    while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
+					while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
 
-                        $params['items'][] = $resArray;
+						$params['items'][] = $resArray;
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Helper to get flexform's items array for plugin "tx_dlf_oai"
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
-     *
-     * @return	void
-     */
-    public function itemsProcFunc_libraryList(&$params, &$pObj) {
+	/**
+	 * Helper to get flexform's items array for plugin "tx_dlf_oai"
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function itemsProcFunc_libraryList(&$params, &$pObj) {
 
-        // the access to pi_flexform data has changed in TYPO3 7.6
-        if (version_compare(TYPO3_version, '7.6', '<')) {
+		// the access to pi_flexform data has changed in TYPO3 7.6
+		if (version_compare(TYPO3_version, '7.6', '<')) {
 
-            if ($params['row']['pi_flexform']) {
+			if ($params['row']['pi_flexform']) {
 
-                $pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
+				$pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
 
-                $pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
+				$pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $pages = $params['row']['pages'];
+			$pages = $params['row']['pages'];
 
-        }
+		}
 
-        if (!empty($pages)) {
+		if (!empty($pages)) {
 
-            // There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
-            // i.e. instead of "18" it reads "pages_18|Title"
-            if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
+			// There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
+			// i.e. instead of "18" it reads "pages_18|Title"
+			if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
 
-                $parts = explode('|', $pages);
+				$parts = explode('|', $pages);
 
-                $pages = array_pop(explode('_', $parts[0]));
+				$pages = array_pop(explode('_', $parts[0]));
 
-            }
+			}
 
-            if ($pages > 0) {
+			if ($pages > 0) {
 
-                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                    'label,uid',
-                    'tx_dlf_libraries',
-                    'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_libraries'),
-                    '',
-                    'label',
-                    ''
-                );
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+					'label,uid',
+					'tx_dlf_libraries',
+					'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_libraries'),
+					'',
+					'label',
+					''
+				);
 
-                if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
+				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-                    while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
+					while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
 
-                        $params['items'][] = $resArray;
+						$params['items'][] = $resArray;
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Helper to get flexform's items array for plugin "tx_dlf_search"
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
-     *
-     * @return	void
-     */
-    public function itemsProcFunc_solrList(&$params, &$pObj) {
+	/**
+	 * Helper to get flexform's items array for plugin "tx_dlf_search"
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function itemsProcFunc_solrList(&$params, &$pObj) {
 
-        // the access to pi_flexform data has changed in TYPO3 7.6
-        if (version_compare(TYPO3_version, '7.6', '<')) {
+		// the access to pi_flexform data has changed in TYPO3 7.6
+		if (version_compare(TYPO3_version, '7.6', '<')) {
 
-            if ($params['row']['pi_flexform']) {
+			if ($params['row']['pi_flexform']) {
 
-                $pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
+				$pi_flexform = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($params['row']['pi_flexform']);
 
-                $pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
+				$pages = $pi_flexform['data']['sDEF']['lDEF']['pages']['vDEF'];
 
-            }
+			}
 
-        } else {
+		} else {
 
-            $pages = $params['row']['pages'];
+			$pages = $params['row']['pages'];
 
-        }
+		}
 
-        if (!empty($pages)) {
+		if (!empty($pages)) {
 
-            // There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
-            // i.e. instead of "18" it reads "pages_18|Title"
-            if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
+			// There is a strange behavior where the uid from the flexform is prepended by the table's name and appended by its title.
+			// i.e. instead of "18" it reads "pages_18|Title"
+			if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($pages)) {
 
-                $parts = explode('|', $pages);
+				$parts = explode('|', $pages);
 
-                $pages = array_pop(explode('_', $parts[0]));
+				$pages = array_pop(explode('_', $parts[0]));
 
-            }
+			}
 
-            if ($pages > 0) {
+			if ($pages > 0) {
 
-                $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                    'label,uid',
-                    'tx_dlf_solrcores',
-                    'pid IN ('.intval($pages).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-                    '',
-                    'label',
-                    ''
-                );
+				$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+					'label,uid',
+					'tx_dlf_solrcores',
+					'pid IN ('.intval($pages).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+					'',
+					'label',
+					''
+				);
 
-                if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
+				if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
 
-                    while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
+					while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
 
-                        $params['items'][] = $resArray;
+						$params['items'][] = $resArray;
 
-                    }
+					}
 
-                }
+				}
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Helper to get flexform's items array for plugin "tx_dlf_toolbox"
-     *
-     * @access	public
-     *
-     * @param	array		&$params: An array with parameters
-     * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
-     *
-     * @return	void
-     */
-    public function itemsProcFunc_toolList(&$params, &$pObj) {
+	/**
+	 * Helper to get flexform's items array for plugin "tx_dlf_toolbox"
+	 *
+	 * @access	public
+	 *
+	 * @param	array		&$params: An array with parameters
+	 * @param	\TYPO3\CMS\Backend\Form\FormEngine &$pObj: The parent object
+	 *
+	 * @return	void
+	 */
+	public function itemsProcFunc_toolList(&$params, &$pObj) {
 
-        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'] as $class => $label) {
+		foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'] as $class => $label) {
 
-            $params['items'][] = array ($GLOBALS['LANG']->sL($label), $class);
+			$params['items'][] = array ($GLOBALS['LANG']->sL($label), $class);
 
-        }
+		}
 
-    }
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -402,7 +402,7 @@
 
         foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'] as $class => $label) {
 
-            $params['items'][] = array ($GLOBALS['LANG']->sL($label), $class);
+            $params['items'][] = array($GLOBALS['LANG']->sL($label), $class);
 
         }
 

class.ext_update.php

Indentation +186 added lines, -186 removed lines

@@ -19,265 +19,265 @@
  */
 class ext_update {
 
-    /**
-     * This holds the output ready to return
-     *
-     * @var	string
-     * @access protected
-     */
-    protected $content = '';
+	/**
+	 * This holds the output ready to return
+	 *
+	 * @var	string
+	 * @access protected
+	 */
+	protected $content = '';
 
-    /**
-     * Triggers the update option in the extension manager
-     *
-     * @access	public
-     *
-     * @return	boolean		Should the update option be shown?
-     */
-    public function access() {
+	/**
+	 * Triggers the update option in the extension manager
+	 *
+	 * @access	public
+	 *
+	 * @return	boolean		Should the update option be shown?
+	 */
+	public function access() {
 
-        if (count($this->getMetadataConfig())) {
+		if (count($this->getMetadataConfig())) {
 
-            return TRUE;
+			return TRUE;
 
-        } else if ($this->oldIndexRelatedTableNames()) {
+		} else if ($this->oldIndexRelatedTableNames()) {
 
-            return TRUE;
+			return TRUE;
 
-        }
+		}
 
-        return FALSE;
+		return FALSE;
 
-    }
+	}
 
-    /**
-     * Get all outdated metadata configuration records
-     *
-     * @access	protected
-     *
-     * @return	array		Array of UIDs of outdated records
-     */
-    protected function getMetadataConfig() {
+	/**
+	 * Get all outdated metadata configuration records
+	 *
+	 * @access	protected
+	 *
+	 * @return	array		Array of UIDs of outdated records
+	 */
+	protected function getMetadataConfig() {
 
-        $uids = array ();
+		$uids = array ();
 
-        // check if tx_dlf_metadata.xpath exists anyhow
-        $fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
+		// check if tx_dlf_metadata.xpath exists anyhow
+		$fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
 
-        if (!in_array('xpath', array_keys($fieldsInDatabase))) {
+		if (!in_array('xpath', array_keys($fieldsInDatabase))) {
 
-            return $uids;
+			return $uids;
 
-        }
+		}
 
-        // Get all records with outdated configuration.
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'tx_dlf_metadata.uid AS uid',
-            'tx_dlf_metadata',
-            'tx_dlf_metadata.format=0 AND NOT tx_dlf_metadata.xpath=\'\''.tx_dlf_helper::whereClause('tx_dlf_metadata'),
-            '',
-            '',
-            ''
-        );
+		// Get all records with outdated configuration.
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'tx_dlf_metadata.uid AS uid',
+			'tx_dlf_metadata',
+			'tx_dlf_metadata.format=0 AND NOT tx_dlf_metadata.xpath=\'\''.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+			'',
+			'',
+			''
+		);
 
-        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-            while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-                $uids[] = intval($resArray['uid']);
+				$uids[] = intval($resArray['uid']);
 
-            }
+			}
 
-        }
+		}
 
-        return $uids;
+		return $uids;
 
-    }
+	}
 
-    /**
-     * The main method of the class
-     *
-     * @access	public
-     *
-     * @return	string		The content that is displayed on the website
-     */
-    public function main() {
+	/**
+	 * The main method of the class
+	 *
+	 * @access	public
+	 *
+	 * @return	string		The content that is displayed on the website
+	 */
+	public function main() {
 
-        // Load localization file.
-        $GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
+		// Load localization file.
+		$GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
 
-        // Update the metadata configuration.
-        if (count($this->getMetadataConfig())) {
-            $this->updateMetadataConfig();
-        }
+		// Update the metadata configuration.
+		if (count($this->getMetadataConfig())) {
+			$this->updateMetadataConfig();
+		}
 
-        if ($this->oldIndexRelatedTableNames()) {
+		if ($this->oldIndexRelatedTableNames()) {
 
-            $this->renameIndexRelatedColumns();
+			$this->renameIndexRelatedColumns();
 
-        }
+		}
 
-        return $this->content;
+		return $this->content;
 
-    }
+	}
 
-    /**
-     * Check for old index related colums
-     *
-     * @access	protected
-     *
-     * @return	boolean		true if old index related columns exist
-     */
-    protected function oldIndexRelatedTableNames() {
+	/**
+	 * Check for old index related colums
+	 *
+	 * @access	protected
+	 *
+	 * @return	boolean		true if old index related columns exist
+	 */
+	protected function oldIndexRelatedTableNames() {
 
-        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'column_name',
-            'INFORMATION_SCHEMA.COLUMNS',
-            'TABLE_NAME = "tx_dlf_metadata"',
-            '',
-            '',
-            ''
-            );
+		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'column_name',
+			'INFORMATION_SCHEMA.COLUMNS',
+			'TABLE_NAME = "tx_dlf_metadata"',
+			'',
+			'',
+			''
+			);
 
-        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 			
-            if ($resArray['column_name'] == 'tokenized' 
-                || $resArray['column_name'] == 'stored'
-                || $resArray['column_name'] == 'indexed'
-                || $resArray['column_name'] == 'boost'
-                || $resArray['column_name'] == 'autocomplete') {
+			if ($resArray['column_name'] == 'tokenized' 
+				|| $resArray['column_name'] == 'stored'
+				|| $resArray['column_name'] == 'indexed'
+				|| $resArray['column_name'] == 'boost'
+				|| $resArray['column_name'] == 'autocomplete') {
 
-                    return TRUE;
+					return TRUE;
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
-    /**
-     * Copy the data of the old index related columns to the new columns
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function renameIndexRelatedColumns() {
+	/**
+	 * Copy the data of the old index related columns to the new columns
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function renameIndexRelatedColumns() {
 
-        $sqlQuery = "UPDATE tx_dlf_metadata SET `index_tokenized` = `tokenized`
+		$sqlQuery = "UPDATE tx_dlf_metadata SET `index_tokenized` = `tokenized`
 											, `index_stored` = `stored`
 											, `index_indexed` = `indexed`
 											, `index_boost` = `boost`
 											, `index_autocomplete` = `autocomplete`";
 
-        // Copy the content of the old tables to the new ones
-        $result = $GLOBALS['TYPO3_DB']->sql_query($sqlQuery);
+		// Copy the content of the old tables to the new ones
+		$result = $GLOBALS['TYPO3_DB']->sql_query($sqlQuery);
 
-        if ($result) {
+		if ($result) {
 
-            $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsOkay', TRUE),
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
-                );
+			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsOkay', TRUE),
+				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+				FALSE
+				);
 
-        } else {
+		} else {
 
-            $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsNotOkay', TRUE),
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
-                \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-                FALSE
-                );
+			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsNotOkay', TRUE),
+				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
+				\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+				FALSE
+				);
 
-        }
+		}
 
-        $this->content .= $message->render();
+		$this->content .= $message->render();
 
-    }
+	}
 
-    /**
-     * Update all outdated metadata configuration records
-     *
-     * @access	protected
-     *
-     * @return	void
-     */
-    protected function updateMetadataConfig() {
+	/**
+	 * Update all outdated metadata configuration records
+	 *
+	 * @access	protected
+	 *
+	 * @return	void
+	 */
+	protected function updateMetadataConfig() {
 
-        $metadataUids = $this->getMetadataConfig();
+		$metadataUids = $this->getMetadataConfig();
 
-        if (!empty($metadataUids)) {
+		if (!empty($metadataUids)) {
 
-            $data = array ();
+			$data = array ();
 
-            // Get all old metadata configuration records.
-            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                'tx_dlf_metadata.uid AS uid,tx_dlf_metadata.pid AS pid,tx_dlf_metadata.cruser_id AS cruser_id,tx_dlf_metadata.encoded AS encoded,tx_dlf_metadata.xpath AS xpath,tx_dlf_metadata.xpath_sorting AS xpath_sorting',
-                'tx_dlf_metadata',
-                'tx_dlf_metadata.uid IN ('.implode(',', $metadataUids).')'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
-                '',
-                '',
-                ''
-            );
+			// Get all old metadata configuration records.
+			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+				'tx_dlf_metadata.uid AS uid,tx_dlf_metadata.pid AS pid,tx_dlf_metadata.cruser_id AS cruser_id,tx_dlf_metadata.encoded AS encoded,tx_dlf_metadata.xpath AS xpath,tx_dlf_metadata.xpath_sorting AS xpath_sorting',
+				'tx_dlf_metadata',
+				'tx_dlf_metadata.uid IN ('.implode(',', $metadataUids).')'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+				'',
+				'',
+				''
+			);
 
-            while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-                $newId = uniqid('NEW');
+				$newId = uniqid('NEW');
 
-                // Copy record to new table.
-                $data['tx_dlf_metadataformat'][$newId] = array (
-                    'pid' => $resArray['pid'],
-                    'cruser_id' => $resArray['cruser_id'],
-                    'parent_id' => $resArray['uid'],
-                    'encoded' => $resArray['encoded'],
-                    'xpath' => $resArray['xpath'],
-                    'xpath_sorting' => $resArray['xpath_sorting']
-                );
+				// Copy record to new table.
+				$data['tx_dlf_metadataformat'][$newId] = array (
+					'pid' => $resArray['pid'],
+					'cruser_id' => $resArray['cruser_id'],
+					'parent_id' => $resArray['uid'],
+					'encoded' => $resArray['encoded'],
+					'xpath' => $resArray['xpath'],
+					'xpath_sorting' => $resArray['xpath_sorting']
+				);
 
-                // Add reference to old table.
-                $data['tx_dlf_metadata'][$resArray['uid']]['format'] = $newId;
+				// Add reference to old table.
+				$data['tx_dlf_metadata'][$resArray['uid']]['format'] = $newId;
 
-            }
+			}
 
-            if (!empty($data)) {
+			if (!empty($data)) {
 
-                // Process datamap.
-                $substUids = tx_dlf_helper::processDBasAdmin($data);
+				// Process datamap.
+				$substUids = tx_dlf_helper::processDBasAdmin($data);
 
-                unset ($data);
+				unset ($data);
 
-                if (!empty($substUids)) {
+				if (!empty($substUids)) {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('update.metadataConfigOkay', TRUE),
-                        $GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                        FALSE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('update.metadataConfigOkay', TRUE),
+						$GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+						FALSE
+					);
 
-                } else {
+				} else {
 
-                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('update.metadataConfigNotOkay', TRUE),
-                        $GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
-                        \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-                        FALSE
-                    );
+					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+						$GLOBALS['LANG']->getLL('update.metadataConfigNotOkay', TRUE),
+						$GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
+						\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+						FALSE
+					);
 
-                }
+				}
 
-                $this->content .= $message->render();
+				$this->content .= $message->render();
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 
 }

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
      */
     protected function getMetadataConfig() {
 
-        $uids = array ();
+        $uids = array();
 
         // check if tx_dlf_metadata.xpath exists anyhow
         $fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
@@ -212,7 +212,7 @@ 
 
         if (!empty($metadataUids)) {
 
-            $data = array ();
+            $data = array();
 
             // Get all old metadata configuration records.
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -229,7 +229,7 @@ 
                 $newId = uniqid('NEW');
 
                 // Copy record to new table.
-                $data['tx_dlf_metadataformat'][$newId] = array (
+                $data['tx_dlf_metadataformat'][$newId] = array(
                     'pid' => $resArray['pid'],
                     'cruser_id' => $resArray['cruser_id'],
                     'parent_id' => $resArray['uid'],