AOEpeople / crawler

modfunc1/class.tx_crawler_modfunc1.php

Braces +6 added lines, -4 removed lines

@@ -1054,8 +1054,9 @@ 
 		$isAvailable = false;
 		$userArray = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('be_users', 'username', '_cli_crawler');
 
-		if (is_array($userArray))
-			$isAvailable = true;
+		if (is_array($userArray)) {
+					$isAvailable = true;
+		}
 
 		return $isAvailable;
 	}
@@ -1073,8 +1074,9 @@ 
 		$isAvailable = false;
 		$userArray = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('be_users', 'username', '_cli_crawler');
 
-		if (is_array($userArray) && $userArray[0]['admin'] == 0)
-			$isAvailable = true;
+		if (is_array($userArray) && $userArray[0]['admin'] == 0) {
+					$isAvailable = true;
+		}
 
 		return $isAvailable;
 	}

Indentation +916 added lines, -916 removed lines

@@ -40,126 +40,126 @@ 
  * @subpackage tx_crawler
  */
 class tx_crawler_modfunc1 extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
-		// Internal, dynamic:
-	var $duplicateTrack = array();
-	var $submitCrawlUrls = FALSE;
-	var $downloadCrawlUrls = FALSE;
+        // Internal, dynamic:
+    var $duplicateTrack = array();
+    var $submitCrawlUrls = FALSE;
+    var $downloadCrawlUrls = FALSE;
 
-	var $scheduledTime = 0;
-	var $reqMinute = 0;
+    var $scheduledTime = 0;
+    var $reqMinute = 0;
 
-	/**
-	 * @var array holds the selection of configuration from the configuration selector box
-	 */
-	var $incomingConfigurationSelection = array();
+    /**
+     * @var array holds the selection of configuration from the configuration selector box
+     */
+    var $incomingConfigurationSelection = array();
 
-	/**
-	 * @var tx_crawler_lib
-	 */
-	var $crawlerObj;
+    /**
+     * @var tx_crawler_lib
+     */
+    var $crawlerObj;
 
-	var $CSVaccu = array();
+    var $CSVaccu = array();
 
-	/**
-	 * If true the user requested a CSV export of the queue
-	 *
-	 * @var boolean
-	 */
-	var $CSVExport = FALSE;
-
-	var $downloadUrls = array();
+    /**
+     * If true the user requested a CSV export of the queue
+     *
+     * @var boolean
+     */
+    var $CSVExport = FALSE;
 
-	/**
-	 * Holds the configuration from ext_conf_template loaded by loadExtensionSettings()
-	 *
-	 * @var array
-	 */
-	protected $extensionSettings = array();
+    var $downloadUrls = array();
 
-	/**
-	 * Indicate that an flash message with an error is present.
-	 *
-	 * @var boolean
-	 */
-	protected $isErrorDetected = false;
-
-	/**
-	 * the constructor
-	 */
-	public function __construct() {
-		$this->processManager = new tx_crawler_domain_process_manager();
-	}
-
-	/**
-	 * Additions to the function menu array
-	 *
-	 * @return	array		Menu array
-	 */
-	function modMenu()	{
-		global $LANG;
-
-		return array (
-			'depth' => array(
-				0 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
-				1 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
-				2 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
-				3 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
-				4 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
-				99 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi'),
-			),
-			'crawlaction' => array(
-				'start' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.start'),
-				'log' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.log'),
-				'multiprocess' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.multiprocess')
-			),
-			'log_resultLog' => '',
-			'log_feVars' => '',
-			'processListMode' => '',
-			'log_display' => array(
-				'all' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.all'),
-				'pending' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.pending'),
-				'finished' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.finished')
-			),
-			'itemsPerPage' => array(
-				'5' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.5'),
-				'10' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.10'),
-				'50' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.50'),
-				'0' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.0')
-			)
-		);
-	}
+    /**
+     * Holds the configuration from ext_conf_template loaded by loadExtensionSettings()
+     *
+     * @var array
+     */
+    protected $extensionSettings = array();
 
-	/**
-	 * Load extension settings
-	 *
-	 * @param void
-	 * @return void
-	 */
-	protected function loadExtensionSettings() {
-		$this->extensionSettings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['crawler']);
-	}
-
-	/**
-	 * Main function
-	 *
-	 * @return	string		HTML output
-	 */
-	function main() {
-		global $LANG, $BACK_PATH;
+    /**
+     * Indicate that an flash message with an error is present.
+     *
+     * @var boolean
+     */
+    protected $isErrorDetected = false;
+
+    /**
+     * the constructor
+     */
+    public function __construct() {
+        $this->processManager = new tx_crawler_domain_process_manager();
+    }
+
+    /**
+     * Additions to the function menu array
+     *
+     * @return	array		Menu array
+     */
+    function modMenu()	{
+        global $LANG;
+
+        return array (
+            'depth' => array(
+                0 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+                1 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+                2 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+                3 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+                4 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+                99 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi'),
+            ),
+            'crawlaction' => array(
+                'start' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.start'),
+                'log' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.log'),
+                'multiprocess' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.multiprocess')
+            ),
+            'log_resultLog' => '',
+            'log_feVars' => '',
+            'processListMode' => '',
+            'log_display' => array(
+                'all' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.all'),
+                'pending' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.pending'),
+                'finished' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.finished')
+            ),
+            'itemsPerPage' => array(
+                '5' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.5'),
+                '10' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.10'),
+                '50' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.50'),
+                '0' => $LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage.0')
+            )
+        );
+    }
+
+    /**
+     * Load extension settings
+     *
+     * @param void
+     * @return void
+     */
+    protected function loadExtensionSettings() {
+        $this->extensionSettings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['crawler']);
+    }
+
+    /**
+     * Main function
+     *
+     * @return	string		HTML output
+     */
+    function main() {
+        global $LANG, $BACK_PATH;
 
-		$this->incLocalLang();
+        $this->incLocalLang();
 
-		$this->loadExtensionSettings();
-		if (empty($this->pObj->MOD_SETTINGS['processListMode'])) {
-			$this->pObj->MOD_SETTINGS['processListMode'] = 'simple';
-		}
+        $this->loadExtensionSettings();
+        if (empty($this->pObj->MOD_SETTINGS['processListMode'])) {
+            $this->pObj->MOD_SETTINGS['processListMode'] = 'simple';
+        }
 
-			// Set CSS styles specific for this document:
-		$this->pObj->content = str_replace('/*###POSTCSSMARKER###*/','
+            // Set CSS styles specific for this document:
+        $this->pObj->content = str_replace('/*###POSTCSSMARKER###*/','
 			TABLE.c-list TR TD { white-space: nowrap; vertical-align: top; }
 		',$this->pObj->content);
 
-		$this->pObj->content .= '<style type="text/css"><!--
+        $this->pObj->content .= '<style type="text/css"><!--
 			table.url-table,
 			table.param-expanded,
 			table.crawlerlog {
@@ -177,16 +177,16 @@ 
 		<link rel="stylesheet" type="text/css" href="'.$BACK_PATH.'../typo3conf/ext/crawler/template/res.css" />
 		';
 
-			// Type function menu:
-		$h_func = \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
-			$this->pObj->id,
-			'SET[crawlaction]',
-			$this->pObj->MOD_SETTINGS['crawlaction'],
-			$this->pObj->MOD_MENU['crawlaction'],
-			'index.php'
-		);
+            // Type function menu:
+        $h_func = \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
+            $this->pObj->id,
+            'SET[crawlaction]',
+            $this->pObj->MOD_SETTINGS['crawlaction'],
+            $this->pObj->MOD_MENU['crawlaction'],
+            'index.php'
+        );
 
-		/*
+        /*
 			// Showing depth-menu in certain cases:
 		if ($this->pObj->MOD_SETTINGS['crawlaction']!=='cli' && $this->pObj->MOD_SETTINGS['crawlaction']!== 'multiprocess' && ($this->pObj->MOD_SETTINGS['crawlaction']!=='log' || $this->pObj->id))	{
 			$h_func .= \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
@@ -199,62 +199,62 @@ 
 		}
 		*/
 
-			// Additional menus for the log type:
-		if ($this->pObj->MOD_SETTINGS['crawlaction']==='log')	{
-			$h_func .= \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
-				$this->pObj->id,
-				'SET[depth]',
-				$this->pObj->MOD_SETTINGS['depth'],
-				$this->pObj->MOD_MENU['depth'],
-				'index.php'
-			);
+            // Additional menus for the log type:
+        if ($this->pObj->MOD_SETTINGS['crawlaction']==='log')	{
+            $h_func .= \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
+                $this->pObj->id,
+                'SET[depth]',
+                $this->pObj->MOD_SETTINGS['depth'],
+                $this->pObj->MOD_MENU['depth'],
+                'index.php'
+            );
+
+            $quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details=' . intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : '';
+
+            $setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
+
+            $h_func.= '<hr/>'.
+                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.display').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->pObj->id,'SET[log_display]',$this->pObj->MOD_SETTINGS['log_display'],$this->pObj->MOD_MENU['log_display'],'index.php','&setID='.$setId) . ' - ' .
+                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showresultlog').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_resultLog]',$this->pObj->MOD_SETTINGS['log_resultLog'],'index.php','&setID='.$setId . $quiPart) . ' - ' .
+                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showfevars').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_feVars]',$this->pObj->MOD_SETTINGS['log_feVars'],'index.php','&setID='.$setId . $quiPart) . ' - ' .
+                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage').': ' .
+                    \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
+                        $this->pObj->id,
+                        'SET[itemsPerPage]',
+                        $this->pObj->MOD_SETTINGS['itemsPerPage'],
+                        $this->pObj->MOD_MENU['itemsPerPage'],
+                        'index.php'
+                    );
+        }
 
-			$quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details=' . intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : '';
-
-			$setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
-
-			$h_func.= '<hr/>'.
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.display').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->pObj->id,'SET[log_display]',$this->pObj->MOD_SETTINGS['log_display'],$this->pObj->MOD_MENU['log_display'],'index.php','&setID='.$setId) . ' - ' .
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showresultlog').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_resultLog]',$this->pObj->MOD_SETTINGS['log_resultLog'],'index.php','&setID='.$setId . $quiPart) . ' - ' .
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showfevars').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_feVars]',$this->pObj->MOD_SETTINGS['log_feVars'],'index.php','&setID='.$setId . $quiPart) . ' - ' .
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage').': ' .
-					\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
-						$this->pObj->id,
-						'SET[itemsPerPage]',
-						$this->pObj->MOD_SETTINGS['itemsPerPage'],
-						$this->pObj->MOD_MENU['itemsPerPage'],
-						'index.php'
-					);
-		}
+        $theOutput = $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1);
 
-		$theOutput = $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1);
-
-			// Branch based on type:
-		switch ((string)$this->pObj->MOD_SETTINGS['crawlaction']) {
-			case 'start':
-				if (empty($this->pObj->id)) {
-					$this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noPageSelected'));
-				} else {
-					$theOutput .= $this->pObj->doc->section('', $this->drawURLs(), 0, 1);
-				}
-				break;
-			case 'log':
-				if (empty($this->pObj->id)) {
-					$this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noPageSelected'));
-				} else {
-					$theOutput .= $this->pObj->doc->section('', $this->drawLog(), 0, 1);
-				}
-				break;
-			case 'cli':
-				$theOutput .= $this->pObj->doc->section('', $this->drawCLIstatus(), 0, 1);
-				break;
-			case 'multiprocess':
-				$theOutput .= $this->pObj->doc->section('', $this->drawProcessOverviewAction(), 0, 1);
-				break;
-		}
+            // Branch based on type:
+        switch ((string)$this->pObj->MOD_SETTINGS['crawlaction']) {
+            case 'start':
+                if (empty($this->pObj->id)) {
+                    $this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noPageSelected'));
+                } else {
+                    $theOutput .= $this->pObj->doc->section('', $this->drawURLs(), 0, 1);
+                }
+                break;
+            case 'log':
+                if (empty($this->pObj->id)) {
+                    $this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noPageSelected'));
+                } else {
+                    $theOutput .= $this->pObj->doc->section('', $this->drawLog(), 0, 1);
+                }
+                break;
+            case 'cli':
+                $theOutput .= $this->pObj->doc->section('', $this->drawCLIstatus(), 0, 1);
+                break;
+            case 'multiprocess':
+                $theOutput .= $this->pObj->doc->section('', $this->drawProcessOverviewAction(), 0, 1);
+                break;
+        }
 
-		return $theOutput;
-	}
+        return $theOutput;
+    }
 
 
 
@@ -267,176 +267,176 @@ 
 
 
 
-	/*******************************
+    /*******************************
 	 *
 	 * Generate URLs for crawling:
 	 *
 	 ******************************/
 
-	/**
-	 * Produces a table with overview of the URLs to be crawled for each page
-	 *
-	 * @return	string		HTML output
-	 */
-	function drawURLs()	{
-		global $BACK_PATH, $BE_USER;
-
-			// Init:
-		$this->duplicateTrack = array();
-		$this->submitCrawlUrls = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('_crawl');
-		$this->downloadCrawlUrls = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('_download');
-		$this->makeCrawlerProcessableChecks();
-
-		switch((string)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp'))	{
-			case 'midnight':
-				$this->scheduledTime = mktime(0,0,0);
-			break;
-			case '04:00':
-				$this->scheduledTime = mktime(0,0,0)+4*3600;
-			break;
-			case 'now':
-			default:
-				$this->scheduledTime = time();
-			break;
-		}
-		// $this->reqMinute = \TYPO3\CMS\Core\Utility\GeneralUtility::intInRange(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('perminute'),1,10000);
-		// TODO: check relevance
-		$this->reqMinute = 1000;
+    /**
+     * Produces a table with overview of the URLs to be crawled for each page
+     *
+     * @return	string		HTML output
+     */
+    function drawURLs()	{
+        global $BACK_PATH, $BE_USER;
+
+            // Init:
+        $this->duplicateTrack = array();
+        $this->submitCrawlUrls = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('_crawl');
+        $this->downloadCrawlUrls = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('_download');
+        $this->makeCrawlerProcessableChecks();
+
+        switch((string)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp'))	{
+            case 'midnight':
+                $this->scheduledTime = mktime(0,0,0);
+            break;
+            case '04:00':
+                $this->scheduledTime = mktime(0,0,0)+4*3600;
+            break;
+            case 'now':
+            default:
+                $this->scheduledTime = time();
+            break;
+        }
+        // $this->reqMinute = \TYPO3\CMS\Core\Utility\GeneralUtility::intInRange(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('perminute'),1,10000);
+        // TODO: check relevance
+        $this->reqMinute = 1000;
 
 
-		$this->incomingConfigurationSelection = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('configurationSelection');
-		$this->incomingConfigurationSelection = is_array($this->incomingConfigurationSelection) ? $this->incomingConfigurationSelection : array('');
+        $this->incomingConfigurationSelection = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('configurationSelection');
+        $this->incomingConfigurationSelection = is_array($this->incomingConfigurationSelection) ? $this->incomingConfigurationSelection : array('');
 
-		$this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
-		$this->crawlerObj->setAccessMode('gui');
-		$this->crawlerObj->setID = \TYPO3\CMS\Core\Utility\GeneralUtility::md5int(microtime());
+        $this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
+        $this->crawlerObj->setAccessMode('gui');
+        $this->crawlerObj->setID = \TYPO3\CMS\Core\Utility\GeneralUtility::md5int(microtime());
 
-		if (empty($this->incomingConfigurationSelection)
-			|| (count($this->incomingConfigurationSelection)==1 && empty($this->incomingConfigurationSelection[0]))
-			) {
-			$code= '
+        if (empty($this->incomingConfigurationSelection)
+            || (count($this->incomingConfigurationSelection)==1 && empty($this->incomingConfigurationSelection[0]))
+            ) {
+            $code= '
 			<tr>
 				<td colspan="7"><b>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noConfigSelected').'</b></td>
 			</tr>';
-		} else {
-			if($this->submitCrawlUrls){
-				$reason = new tx_crawler_domain_reason();
-				$reason->setReason(tx_crawler_domain_reason::REASON_GUI_SUBMIT);
+        } else {
+            if($this->submitCrawlUrls){
+                $reason = new tx_crawler_domain_reason();
+                $reason->setReason(tx_crawler_domain_reason::REASON_GUI_SUBMIT);
+
+                if($BE_USER instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication){ $username = $BE_USER->user['username']; }
+                $reason->setDetailText('The user '.$username.' added pages to the crawler queue manually ');
+
+                tx_crawler_domain_events_dispatcher::getInstance()->post(	'invokeQueueChange',
+                                                                            $this->findCrawler()->setID,
+                                                                            array(	'reason' => $reason ));
+            }
+
+            $code = $this->crawlerObj->getPageTreeAndUrls(
+                $this->pObj->id,
+                $this->pObj->MOD_SETTINGS['depth'],
+                $this->scheduledTime,
+                $this->reqMinute,
+                $this->submitCrawlUrls,
+                $this->downloadCrawlUrls,
+                array(), // Do not filter any processing instructions
+                $this->incomingConfigurationSelection
+            );
 
-				if($BE_USER instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication){ $username = $BE_USER->user['username']; }
-				$reason->setDetailText('The user '.$username.' added pages to the crawler queue manually ');
 
-				tx_crawler_domain_events_dispatcher::getInstance()->post(	'invokeQueueChange',
-																			$this->findCrawler()->setID,
-																			array(	'reason' => $reason ));
-			}
-
-			$code = $this->crawlerObj->getPageTreeAndUrls(
-				$this->pObj->id,
-				$this->pObj->MOD_SETTINGS['depth'],
-				$this->scheduledTime,
-				$this->reqMinute,
-				$this->submitCrawlUrls,
-				$this->downloadCrawlUrls,
-				array(), // Do not filter any processing instructions
-				$this->incomingConfigurationSelection
-			);
-
-
-		}
+        }
 
-		$this->downloadUrls = $this->crawlerObj->downloadUrls;
-		$this->duplicateTrack = $this->crawlerObj->duplicateTrack;
+        $this->downloadUrls = $this->crawlerObj->downloadUrls;
+        $this->duplicateTrack = $this->crawlerObj->duplicateTrack;
 
-		$output = '';
-		if ($code)	{
+        $output = '';
+        if ($code)	{
 
-			$output .= '<h3>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.configuration').':</h3>';
-			$output .= '<input type="hidden" name="id" value="'.intval($this->pObj->id).'" />';
+            $output .= '<h3>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.configuration').':</h3>';
+            $output .= '<input type="hidden" name="id" value="'.intval($this->pObj->id).'" />';
 
-			if (!$this->submitCrawlUrls)	{
-				$output .= $this->drawURLs_cfgSelectors().'<br />';
-				$output .= '<input type="submit" name="_update" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerUpdate').'" /> ';
-				$output .= '<input type="submit" name="_crawl" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerCrawl').'" /> ';
-				$output .= '<input type="submit" name="_download" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerDownload').'" /><br /><br />';
-				$output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.count').': '.count(array_keys($this->duplicateTrack)).'<br />';
-				$output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s',time()).'<br />';
-				$output .= '<br />
+            if (!$this->submitCrawlUrls)	{
+                $output .= $this->drawURLs_cfgSelectors().'<br />';
+                $output .= '<input type="submit" name="_update" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerUpdate').'" /> ';
+                $output .= '<input type="submit" name="_crawl" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerCrawl').'" /> ';
+                $output .= '<input type="submit" name="_download" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerDownload').'" /><br /><br />';
+                $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.count').': '.count(array_keys($this->duplicateTrack)).'<br />';
+                $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s',time()).'<br />';
+                $output .= '<br />
 					<table class="lrPadding c-list url-table">'.
-						$this->drawURLs_printTableHeader().
-						$code.
-					'</table>';
-			} else {
-				$output .= count(array_keys($this->duplicateTrack)).' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.submitted').'. <br /><br />';
-				$output .= '<input type="submit" name="_" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.continue').'" />';
-				$output .= '<input type="submit" onclick="this.form.elements[\'SET[crawlaction]\'].value=\'log\';" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.continueinlog').'" />';
-			}
-		}
-
-			// Download Urls to crawl:
-		if ($this->downloadCrawlUrls)	{
-
-				// Creating output header:
-			$mimeType = 'application/octet-stream';
-			Header('Content-Type: '.$mimeType);
-			Header('Content-Disposition: attachment; filename=CrawlerUrls.txt');
-
-				// Printing the content of the CSV lines:
-			echo implode(chr(13).chr(10),$this->downloadUrls);
+                        $this->drawURLs_printTableHeader().
+                        $code.
+                    '</table>';
+            } else {
+                $output .= count(array_keys($this->duplicateTrack)).' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.submitted').'. <br /><br />';
+                $output .= '<input type="submit" name="_" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.continue').'" />';
+                $output .= '<input type="submit" onclick="this.form.elements[\'SET[crawlaction]\'].value=\'log\';" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.continueinlog').'" />';
+            }
+        }
 
-				// Exits:
-			exit;
-		}
+            // Download Urls to crawl:
+        if ($this->downloadCrawlUrls)	{
 
-			// Return output:
-		return 	$output;
-	}
+                // Creating output header:
+            $mimeType = 'application/octet-stream';
+            Header('Content-Type: '.$mimeType);
+            Header('Content-Disposition: attachment; filename=CrawlerUrls.txt');
 
-	/**
-	 * Draws the configuration selectors for compiling URLs:
-	 *
-	 * @return	string		HTML table
-	 */
-	function drawURLs_cfgSelectors()	{
+                // Printing the content of the CSV lines:
+            echo implode(chr(13).chr(10),$this->downloadUrls);
 
-			// depth
-		$cell[] = $this->selectorBox(
-			array(
-				0 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
-				1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
-				2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
-				3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
-				4 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
-				99 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi'),
-			),
-			'SET[depth]',
-			$this->pObj->MOD_SETTINGS['depth'],
-			0
-		);
-		$availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth']?$this->pObj->MOD_SETTINGS['depth']:0 );
-
-			// Configurations
-		$cell[] = $this->selectorBox(
-			empty($availableConfigurations)?array():array_combine($availableConfigurations, $availableConfigurations),
-			'configurationSelection',
-			$this->incomingConfigurationSelection,
-			1
-		);
+                // Exits:
+            exit;
+        }
 
-			// Scheduled time:
-		$cell[] = $this->selectorBox(
-			array(
-				'now' => $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time.now'),
-				'midnight' => $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time.midnight'),
-				'04:00' => $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time.4am'),
-			),
-			'tstamp',
-			\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('tstamp'),
-			0
-		);
+            // Return output:
+        return 	$output;
+    }
 
-		// TODO: check relevance
-		/*
+    /**
+     * Draws the configuration selectors for compiling URLs:
+     *
+     * @return	string		HTML table
+     */
+    function drawURLs_cfgSelectors()	{
+
+            // depth
+        $cell[] = $this->selectorBox(
+            array(
+                0 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
+                1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
+                2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_2'),
+                3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_3'),
+                4 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
+                99 => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi'),
+            ),
+            'SET[depth]',
+            $this->pObj->MOD_SETTINGS['depth'],
+            0
+        );
+        $availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth']?$this->pObj->MOD_SETTINGS['depth']:0 );
+
+            // Configurations
+        $cell[] = $this->selectorBox(
+            empty($availableConfigurations)?array():array_combine($availableConfigurations, $availableConfigurations),
+            'configurationSelection',
+            $this->incomingConfigurationSelection,
+            1
+        );
+
+            // Scheduled time:
+        $cell[] = $this->selectorBox(
+            array(
+                'now' => $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time.now'),
+                'midnight' => $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time.midnight'),
+                '04:00' => $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time.4am'),
+            ),
+            'tstamp',
+            \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('tstamp'),
+            0
+        );
+
+        // TODO: check relevance
+        /*
 			// Requests per minute:
 		$cell[] = $this->selectorBox(
 			array(
@@ -457,7 +457,7 @@ 
 		);
 		*/
 
-		$output = '
+        $output = '
 			<table class="lrPadding c-list">
 				<tr class="bgColor5 tableheader">
 					<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.depth').':</td>
@@ -470,17 +470,17 @@ 
 				</tr>
 			</table>';
 
-		return $output;
-	}
+        return $output;
+    }
 
-	/**
-	 * Create Table header row for URL display
-	 *
-	 * @return	string		Table header
-	 */
-	function drawURLs_printTableHeader()	{
+    /**
+     * Create Table header row for URL display
+     *
+     * @return	string		Table header
+     */
+    function drawURLs_printTableHeader()	{
 
-		$content = '
+        $content = '
 			<tr class="bgColor5 tableheader">
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.pagetitle').':</td>
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.key').':</td>
@@ -491,8 +491,8 @@ 
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.parameters').':</td>
 			</tr>';
 
-		return $content;
-	}
+        return $content;
+    }
 
 
 
@@ -505,75 +505,75 @@ 
 
 
 
-	/*******************************
+    /*******************************
 	 *
 	 * Shows log of indexed URLs
 	 *
 	 ******************************/
 
-	/**
-	 * Shows the log of indexed URLs
-	 *
-	 * @return	string		HTML output
-	 */
-	function drawLog()	{
-		global $BACK_PATH;
-		$output = '';
-
-			// Init:
-		$this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
-		$this->crawlerObj->setAccessMode('gui');
-		$this->crawlerObj->setID = \TYPO3\CMS\Core\Utility\GeneralUtility::md5int(microtime());
-
-		$this->CSVExport = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_csv');
-
-			// Read URL:
-		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')) {
-			$this->crawlerObj->readUrl(intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')),TRUE);
-		}
+    /**
+     * Shows the log of indexed URLs
+     *
+     * @return	string		HTML output
+     */
+    function drawLog()	{
+        global $BACK_PATH;
+        $output = '';
+
+            // Init:
+        $this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
+        $this->crawlerObj->setAccessMode('gui');
+        $this->crawlerObj->setID = \TYPO3\CMS\Core\Utility\GeneralUtility::md5int(microtime());
+
+        $this->CSVExport = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_csv');
+
+            // Read URL:
+        if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')) {
+            $this->crawlerObj->readUrl(intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')),TRUE);
+        }
 
-			// Look for set ID sent - if it is, we will display contents of that set:
-		$showSetId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
+            // Look for set ID sent - if it is, we will display contents of that set:
+        $showSetId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
 
-			// Show details:
-		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details'))	{
+            // Show details:
+        if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details'))	{
 
-				// Get entry record:
-			list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*','tx_crawler_queue','qid='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')));
+                // Get entry record:
+            list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*','tx_crawler_queue','qid='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')));
 
-				// Explode values:
-				$resStatus = $this->getResStatus($q_entry);
-			$q_entry['parameters'] = unserialize($q_entry['parameters']);
-			$q_entry['result_data'] = unserialize($q_entry['result_data']);
-			if (is_array($q_entry['result_data']))	{
-				$q_entry['result_data']['content'] = unserialize($q_entry['result_data']['content']);
-			}
+                // Explode values:
+                $resStatus = $this->getResStatus($q_entry);
+            $q_entry['parameters'] = unserialize($q_entry['parameters']);
+            $q_entry['result_data'] = unserialize($q_entry['result_data']);
+            if (is_array($q_entry['result_data']))	{
+                $q_entry['result_data']['content'] = unserialize($q_entry['result_data']['content']);
+            }
 
-			if(!$this->pObj->MOD_SETTINGS['log_resultLog']) {
-				unset($q_entry['result_data']['content']['log']);
-			}
+            if(!$this->pObj->MOD_SETTINGS['log_resultLog']) {
+                unset($q_entry['result_data']['content']['log']);
+            }
 
-				// Print rudimentary details:
-			$output .= '
+                // Print rudimentary details:
+            $output .= '
 				<br /><br />
 				<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.back') . '" name="_back" />
 				<input type="hidden" value="' . $this->pObj->id . '" name="id" />
 				<input type="hidden" value="' . $showSetId . '" name="setID" />
 				<br />
 				Current server time: ' . date('H:i:s', time()) . '<br />' .
-				'Status: ' . $resStatus . '<br />' .
-				\TYPO3\CMS\Core\Utility\DebugUtility::viewArray($q_entry);
-		} else {	// Show list:
-
-				// If either id or set id, show list:
-			if ($this->pObj->id || $showSetId)	{
-				if ($this->pObj->id)	{
-						// Drawing tree:
-					$tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
-					$perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-					$tree->init('AND '.$perms_clause);
-
-						// Set root row:
+                'Status: ' . $resStatus . '<br />' .
+                \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($q_entry);
+        } else {	// Show list:
+
+                // If either id or set id, show list:
+            if ($this->pObj->id || $showSetId)	{
+                if ($this->pObj->id)	{
+                        // Drawing tree:
+                    $tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
+                    $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
+                    $tree->init('AND '.$perms_clause);
+
+                        // Set root row:
                     if (VersionNumberUtility::convertVersionNumberToInteger(VersionNumberUtility::getCurrentTypo3Version()) < 8000000) {
                         $HTML = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord(
                             'pages',
@@ -583,39 +583,39 @@ 
                         $iconFactory = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Imaging\\IconFactory');
                         $HTML = $iconFactory->getIconForRecord('pages', $this->pObj->pageinfo, Icon::SIZE_SMALL)->render();
                     }
-					$tree->tree[] = Array(
-						'row' => $this->pObj->pageinfo,
-						'HTML' => $HTML
-					);
-
-						// Get branch beneath:
-					if ($this->pObj->MOD_SETTINGS['depth'])	{
-						$tree->getTree($this->pObj->id, $this->pObj->MOD_SETTINGS['depth'], '');
-					}
-
-						// Traverse page tree:
-					$code = ''; $count = 0;
-					foreach($tree->tree as $data)	{
-						$code .= $this->drawLog_addRows(
-									$data['row'],
-									$data['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages',$data['row'],TRUE),
-									intval($this->pObj->MOD_SETTINGS['itemsPerPage'])
-								);
-						if (++$count == 1000) {
-							break;
-						}
-					}
-				} else {
-					$code = '';
-					$code.= $this->drawLog_addRows(
-								$showSetId,
-								'Set ID: '.$showSetId
-							);
-				}
-
-				if ($code)	{
-
-					$output .= '
+                    $tree->tree[] = Array(
+                        'row' => $this->pObj->pageinfo,
+                        'HTML' => $HTML
+                    );
+
+                        // Get branch beneath:
+                    if ($this->pObj->MOD_SETTINGS['depth'])	{
+                        $tree->getTree($this->pObj->id, $this->pObj->MOD_SETTINGS['depth'], '');
+                    }
+
+                        // Traverse page tree:
+                    $code = ''; $count = 0;
+                    foreach($tree->tree as $data)	{
+                        $code .= $this->drawLog_addRows(
+                                    $data['row'],
+                                    $data['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages',$data['row'],TRUE),
+                                    intval($this->pObj->MOD_SETTINGS['itemsPerPage'])
+                                );
+                        if (++$count == 1000) {
+                            break;
+                        }
+                    }
+                } else {
+                    $code = '';
+                    $code.= $this->drawLog_addRows(
+                                $showSetId,
+                                'Set ID: '.$showSetId
+                            );
+                }
+
+                if ($code)	{
+
+                    $output .= '
 						<br /><br />
 						<input type="submit" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.reloadlist').'" name="_reload" />
 						<input type="submit" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.downloadcsv').'" name="_csv" />
@@ -629,20 +629,20 @@ 
 
 
 						<table class="lrPadding c-list crawlerlog">'.
-							$this->drawLog_printTableHeader().
-							$code.
-						'</table>';
-				}
-			} else {	// Otherwise show available sets:
-				$setList = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
-								'set_id, count(*) as count_value, scheduled',
-								'tx_crawler_queue',
-								'',
-								'set_id, scheduled',
-								'scheduled DESC'
-							);
-
-				$code = '
+                            $this->drawLog_printTableHeader().
+                            $code.
+                        '</table>';
+                }
+            } else {	// Otherwise show available sets:
+                $setList = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+                                'set_id, count(*) as count_value, scheduled',
+                                'tx_crawler_queue',
+                                '',
+                                'set_id, scheduled',
+                                'scheduled DESC'
+                            );
+
+                $code = '
 					<tr class="bgColor5 tableheader">
 						<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.setid').':</td>
 						<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.count').'t:</td>
@@ -650,9 +650,9 @@ 
 					</tr>
 				';
 
-				$cc=0;
-				foreach($setList as $set)	{
-					$code.= '
+                $cc=0;
+                foreach($setList as $set)	{
+                    $code.= '
 						<tr class="bgColor'.($cc%2 ? '-20':'-10').'">
 							<td><a href="'.htmlspecialchars('index.php?setID='.$set['set_id']).'">'.$set['set_id'].'</a></td>
 							<td>'.$set['count_value'].'</td>
@@ -660,218 +660,218 @@ 
 						</tr>
 					';
 
-					$cc++;
-				}
+                    $cc++;
+                }
 
-				$output .= '
+                $output .= '
 					<br /><br />
 					<table class="lrPadding c-list">'.
-						$code.
-					'</table>';
-			}
-		}
+                        $code.
+                    '</table>';
+            }
+        }
 
-		if($this->CSVExport) {
-			$this->outputCsvFile();
-		}
+        if($this->CSVExport) {
+            $this->outputCsvFile();
+        }
 
-			// Return output
-		return 	$output;
-	}
+            // Return output
+        return 	$output;
+    }
 
-	/**
-	 * Outputs the CSV file and sets the correct headers
-	 */
-	protected function outputCsvFile() {
+    /**
+     * Outputs the CSV file and sets the correct headers
+     */
+    protected function outputCsvFile() {
 
-		if (!count($this->CSVaccu)) {
-			$this->addWarningMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.canNotExportEmptyQueueToCsvText'));
-			return;
-		}
+        if (!count($this->CSVaccu)) {
+            $this->addWarningMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.canNotExportEmptyQueueToCsvText'));
+            return;
+        }
 
-		$csvLines = array();
+        $csvLines = array();
 
-			// Field names:
-		reset($this->CSVaccu);
-		$fieldNames = array_keys(current($this->CSVaccu));
-		$csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($fieldNames);
+            // Field names:
+        reset($this->CSVaccu);
+        $fieldNames = array_keys(current($this->CSVaccu));
+        $csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($fieldNames);
 
-			// Data:
-		foreach($this->CSVaccu as $row)	{
-			$csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($row);
-		}
+            // Data:
+        foreach($this->CSVaccu as $row)	{
+            $csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($row);
+        }
 
-			// Creating output header:
-		$mimeType = 'application/octet-stream';
-		Header('Content-Type: '.$mimeType);
-		Header('Content-Disposition: attachment; filename=CrawlerLog.csv');
+            // Creating output header:
+        $mimeType = 'application/octet-stream';
+        Header('Content-Type: '.$mimeType);
+        Header('Content-Disposition: attachment; filename=CrawlerLog.csv');
 
-			// Printing the content of the CSV lines:
-		echo implode(chr(13).chr(10),$csvLines);
+            // Printing the content of the CSV lines:
+        echo implode(chr(13).chr(10),$csvLines);
 
-			// Exits:
-		exit;
-	}
+            // Exits:
+        exit;
+    }
 
-	/**
-	 * Create the rows for display of the page tree
-	 * For each page a number of rows are shown displaying GET variable configuration
-	 *
-	 * @param array $pageRow_setId Page row or set-id
-	 * @param string $titleString Title string
-	 * @param int $itemsPerPage Items per Page setting
+    /**
+     * Create the rows for display of the page tree
+     * For each page a number of rows are shown displaying GET variable configuration
      *
-	 * @return string HTML <tr> content (one or more)
-	 */
-	function drawLog_addRows($pageRow_setId, $titleString, $itemsPerPage=10) {
-
-			// If Flush button is pressed, flush tables instead of selecting entries:
-
-		if(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush')) {
-			$doFlush = true;
-			$doFullFlush = false;
-		} elseif(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush_all')) {
-			$doFlush = true;
-			$doFullFlush = true;
-		} else {
-			$doFlush = false;
-			$doFullFlush = false;
-		}
+     * @param array $pageRow_setId Page row or set-id
+     * @param string $titleString Title string
+     * @param int $itemsPerPage Items per Page setting
+     *
+     * @return string HTML <tr> content (one or more)
+     */
+    function drawLog_addRows($pageRow_setId, $titleString, $itemsPerPage=10) {
+
+            // If Flush button is pressed, flush tables instead of selecting entries:
+
+        if(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush')) {
+            $doFlush = true;
+            $doFullFlush = false;
+        } elseif(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush_all')) {
+            $doFlush = true;
+            $doFullFlush = true;
+        } else {
+            $doFlush = false;
+            $doFullFlush = false;
+        }
 
-			// Get result:
-		if (is_array($pageRow_setId))	{
-			$res = $this->crawlerObj->getLogEntriesForPageId($pageRow_setId['uid'], $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage));
-		} else {
-			$res = $this->crawlerObj->getLogEntriesForSetId($pageRow_setId, $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage));
-		}
+            // Get result:
+        if (is_array($pageRow_setId))	{
+            $res = $this->crawlerObj->getLogEntriesForPageId($pageRow_setId['uid'], $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage));
+        } else {
+            $res = $this->crawlerObj->getLogEntriesForSetId($pageRow_setId, $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage));
+        }
+
+            // Init var:
+        $colSpan = 9
+                + ($this->pObj->MOD_SETTINGS['log_resultLog'] ? -1 : 0)
+                + ($this->pObj->MOD_SETTINGS['log_feVars'] ? 3 : 0);
+
+        if (count($res))	{
+                // Traverse parameter combinations:
+            $c = 0;
+            $content='';
+            foreach($res as $kk => $vv)	{
+
+                    // Title column:
+                if (!$c)	{
+                    $titleClm = '<td rowspan="'.count($res).'">'.$titleString.'</td>';
+                } else {
+                    $titleClm = '';
+                }
+
+                    // Result:
+                $resLog = $this->getResultLog($vv);
+
+                $resStatus = $this->getResStatus($vv);
+                $resFeVars = $this->getResFeVars($vv);
+
+                    // Compile row:
+                $parameters = unserialize($vv['parameters']);
+
+                    // Put data into array:
+                $rowData = array();
+                if ($this->pObj->MOD_SETTINGS['log_resultLog'])	{
+                    $rowData['result_log'] = $resLog;
+                } else {
+                    $rowData['scheduled'] = ($vv['scheduled']> 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate');
+                    $rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-';
+                }
+                $rowData['result_status'] = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($resStatus,50);
+                $rowData['url'] = '<a href="'.htmlspecialchars($parameters['url']).'" target="_newWIndow">'.htmlspecialchars($parameters['url']).'</a>';
+                $rowData['feUserGroupList'] = $parameters['feUserGroupList'];
+                $rowData['procInstructions'] = is_array($parameters['procInstructions']) ? implode('; ',$parameters['procInstructions']) : '';
+                $rowData['set_id'] = $vv['set_id'];
+
+                if ($this->pObj->MOD_SETTINGS['log_feVars']) {
+                    $rowData['tsfe_id'] = $resFeVars['id'];
+                    $rowData['tsfe_gr_list'] = $resFeVars['gr_list'];
+                    $rowData['tsfe_no_cache'] = $resFeVars['no_cache'];
+                }
 
-			// Init var:
-		$colSpan = 9
-				+ ($this->pObj->MOD_SETTINGS['log_resultLog'] ? -1 : 0)
-				+ ($this->pObj->MOD_SETTINGS['log_feVars'] ? 3 : 0);
-
-		if (count($res))	{
-				// Traverse parameter combinations:
-			$c = 0;
-			$content='';
-			foreach($res as $kk => $vv)	{
-
-					// Title column:
-				if (!$c)	{
-					$titleClm = '<td rowspan="'.count($res).'">'.$titleString.'</td>';
-				} else {
-					$titleClm = '';
-				}
-
-					// Result:
-				$resLog = $this->getResultLog($vv);
-
-				$resStatus = $this->getResStatus($vv);
-				$resFeVars = $this->getResFeVars($vv);
-
-					// Compile row:
-				$parameters = unserialize($vv['parameters']);
-
-					// Put data into array:
-				$rowData = array();
-				if ($this->pObj->MOD_SETTINGS['log_resultLog'])	{
-					$rowData['result_log'] = $resLog;
-				} else {
-					$rowData['scheduled'] = ($vv['scheduled']> 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate');
-					$rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-';
-				}
-				$rowData['result_status'] = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($resStatus,50);
-				$rowData['url'] = '<a href="'.htmlspecialchars($parameters['url']).'" target="_newWIndow">'.htmlspecialchars($parameters['url']).'</a>';
-				$rowData['feUserGroupList'] = $parameters['feUserGroupList'];
-				$rowData['procInstructions'] = is_array($parameters['procInstructions']) ? implode('; ',$parameters['procInstructions']) : '';
-				$rowData['set_id'] = $vv['set_id'];
-
-				if ($this->pObj->MOD_SETTINGS['log_feVars']) {
-					$rowData['tsfe_id'] = $resFeVars['id'];
-					$rowData['tsfe_gr_list'] = $resFeVars['gr_list'];
-					$rowData['tsfe_no_cache'] = $resFeVars['no_cache'];
-				}
-
-				$setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
-
-				$refreshIcon = $GLOBALS['BACK_PATH'] . 'gfx/refresh_n.gif';
-				if (version_compare(TYPO3_version,'7.0','>=')) {
-					$refreshIcon = $GLOBALS['BACK_PATH'] . 'sysext/t3skin/extjs/images/grid/refresh.gif';
-				}
-
-					// Put rows together:
-				$content.= '
+                $setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
+
+                $refreshIcon = $GLOBALS['BACK_PATH'] . 'gfx/refresh_n.gif';
+                if (version_compare(TYPO3_version,'7.0','>=')) {
+                    $refreshIcon = $GLOBALS['BACK_PATH'] . 'sysext/t3skin/extjs/images/grid/refresh.gif';
+                }
+
+                    // Put rows together:
+                $content.= '
 					<tr class="bgColor'.($c%2 ? '-20':'-10').'">
 						'.$titleClm.'
 						<td><a href="' . $this->getModuleUrl(array('qid_details' => $vv['qid'], 'setID' => $setId)) . '">'.htmlspecialchars($vv['qid']).'</a></td>
 						<td><a href="' . $this->getModuleUrl(array('qid_read' => $vv['qid'], 'setID' => $setId)) . '"><img src="' . $refreshIcon . '" width="14" hspace="1" vspace="2" height="14" border="0" title="'.htmlspecialchars('Read').'" alt="" /></a></td>';
-				foreach($rowData as $fKey => $value) {
+                foreach($rowData as $fKey => $value) {
 
-					if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url',$fKey))	{
-						$content.= '
+                    if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url',$fKey))	{
+                        $content.= '
 						<td>'.$value.'</td>';
-					} else {
-						$content.= '
+                    } else {
+                        $content.= '
 						<td>'.nl2br(htmlspecialchars($value)).'</td>';
-					}
-				}
-				$content.= '
+                    }
+                }
+                $content.= '
 					</tr>';
-				$c++;
-
-				if ($this->CSVExport)	{
-						// Only for CSV (adding qid and scheduled/exec_time if needed):
-					$rowData['result_log'] = implode('// ',explode(chr(10),$resLog));
-					$rowData['qid'] = $vv['qid'];
-					$rowData['scheduled'] = \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']);
-					$rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-';
-					$this->CSVaccu[] = $rowData;
-				}
-			}
-		} else {
+                $c++;
+
+                if ($this->CSVExport)	{
+                        // Only for CSV (adding qid and scheduled/exec_time if needed):
+                    $rowData['result_log'] = implode('// ',explode(chr(10),$resLog));
+                    $rowData['qid'] = $vv['qid'];
+                    $rowData['scheduled'] = \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']);
+                    $rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-';
+                    $this->CSVaccu[] = $rowData;
+                }
+            }
+        } else {
 
-				// Compile row:
-			$content = '
+                // Compile row:
+            $content = '
 				<tr class="bgColor-20">
 					<td>'.$titleString.'</td>
 					<td colspan="'.$colSpan.'"><em>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noentries').'</em></td>
 				</tr>';
-		}
+        }
 
-		return $content;
-	}
+        return $content;
+    }
 
-	/**
-	 * Find Fe vars
-	 *
-	 * @param array $row
-	 * @return array
-	 */
-	function getResFeVars($row) {
-		$feVars = array();
-
-		if ($row['result_data']) {
-			$resultData = unserialize($row['result_data']);
-			$requestResult = unserialize($resultData['content']);
-			$feVars = $requestResult['vars'];
-		}
+    /**
+     * Find Fe vars
+     *
+     * @param array $row
+     * @return array
+     */
+    function getResFeVars($row) {
+        $feVars = array();
+
+        if ($row['result_data']) {
+            $resultData = unserialize($row['result_data']);
+            $requestResult = unserialize($resultData['content']);
+            $feVars = $requestResult['vars'];
+        }
 
-		return $feVars;
-	}
+        return $feVars;
+    }
 
-	/**
-	 * Create Table header row (log)
-	 *
-	 * @return	string		Table header
-	 */
-	function drawLog_printTableHeader()	{
+    /**
+     * Create Table header row (log)
+     *
+     * @return	string		Table header
+     */
+    function drawLog_printTableHeader()	{
 
-		$content = '
+        $content = '
 			<tr class="bgColor5 tableheader">
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.pagetitle').':</td>
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.qid').':</td>
 				<td>&nbsp;</td>'.
-				($this->pObj->MOD_SETTINGS['log_resultLog'] ? '
+                ($this->pObj->MOD_SETTINGS['log_resultLog'] ? '
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.resultlog').':</td>' : '
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.scheduledtime').':</td>
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.runtime').':</td>').'
@@ -880,14 +880,14 @@ 
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.groups').':</td>
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.procinstr').':</td>
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.setid').':</td>'.
-				($this->pObj->MOD_SETTINGS['log_feVars'] ? '
+                ($this->pObj->MOD_SETTINGS['log_feVars'] ? '
 				<td>'.htmlspecialchars('TSFE->id').'</td>
 				<td>'.htmlspecialchars('TSFE->gr_list').'</td>
 				<td>'.htmlspecialchars('TSFE->no_cache').'</td>' : '').'
 			</tr>';
 
-		return $content;
-	}
+        return $content;
+    }
 
         /**
          * Extract the log information from the current row and retrive it as formatted string.
@@ -914,25 +914,25 @@ 
                 return $content;
         }
 
-	function getResStatus($vv) {
-		if ($vv['result_data'])	{
-			$requestContent = unserialize($vv['result_data']);
-			$requestResult = unserialize($requestContent['content']);
-			if (is_array($requestResult)) {
-				if (empty($requestResult['errorlog'])) {
-					$resStatus = 'OK';
-				} else {
-					$resStatus = implode("\n", $requestResult['errorlog']);
-				}
-				$resLog = is_array($requestResult['log']) ?  implode(chr(10),$requestResult['log']) : '';
-			} else {
-				$resStatus = 'Error: '.substr(preg_replace('/\s+/',' ',strip_tags($requestContent['content'])),0,10000).'...';
-			}
-		} else {
-			$resStatus = '-';
-		}
-		return $resStatus;
-	}
+    function getResStatus($vv) {
+        if ($vv['result_data'])	{
+            $requestContent = unserialize($vv['result_data']);
+            $requestResult = unserialize($requestContent['content']);
+            if (is_array($requestResult)) {
+                if (empty($requestResult['errorlog'])) {
+                    $resStatus = 'OK';
+                } else {
+                    $resStatus = implode("\n", $requestResult['errorlog']);
+                }
+                $resLog = is_array($requestResult['log']) ?  implode(chr(10),$requestResult['log']) : '';
+            } else {
+                $resStatus = 'Error: '.substr(preg_replace('/\s+/',' ',strip_tags($requestContent['content'])),0,10000).'...';
+            }
+        } else {
+            $resStatus = '-';
+        }
+        return $resStatus;
+    }
 
 
 
@@ -941,344 +941,344 @@ 
 
 
 
-	/*****************************
+    /*****************************
 	 *
 	 * CLI status display
 	 *
 	 *****************************/
 
-	/**
-	 * This method is used to show an overview about the active an the finished crawling processes
-	 *
-	 * @author Timo Schmidt
-	 * @param void
-	 * @return string
-	 */
-	protected function drawProcessOverviewAction(){
-
-		$this->runRefreshHooks();
-
-		global $BACK_PATH;
-		$this->makeCrawlerProcessableChecks();
-
-		$crawler = $this->findCrawler();
-		try {
-			$this->handleProcessOverviewActions();
-		} catch (Exception $e) {
-			$this->addErrorMessage($e->getMessage());
-		}
+    /**
+     * This method is used to show an overview about the active an the finished crawling processes
+     *
+     * @author Timo Schmidt
+     * @param void
+     * @return string
+     */
+    protected function drawProcessOverviewAction(){
+
+        $this->runRefreshHooks();
+
+        global $BACK_PATH;
+        $this->makeCrawlerProcessableChecks();
+
+        $crawler = $this->findCrawler();
+        try {
+            $this->handleProcessOverviewActions();
+        } catch (Exception $e) {
+            $this->addErrorMessage($e->getMessage());
+        }
 
-		$offset 	= intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('offset'));
-		$perpage 	= 20;
+        $offset 	= intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('offset'));
+        $perpage 	= 20;
 
-		$processRepository	= new tx_crawler_domain_process_repository();
-		$queueRepository	= new tx_crawler_domain_queue_repository();
+        $processRepository	= new tx_crawler_domain_process_repository();
+        $queueRepository	= new tx_crawler_domain_queue_repository();
 
-		$mode = $this->pObj->MOD_SETTINGS['processListMode'];
-		if ($mode == 'detail') {
-			$where = '';
-		} elseif($mode == 'simple') {
-			$where = 'active = 1';
-		}
+        $mode = $this->pObj->MOD_SETTINGS['processListMode'];
+        if ($mode == 'detail') {
+            $where = '';
+        } elseif($mode == 'simple') {
+            $where = 'active = 1';
+        }
 
-		$allProcesses 		= $processRepository->findAll('ttl','DESC', $perpage, $offset,$where);
-		$allCount			= $processRepository->countAll($where);
-
-		$listView			= new tx_crawler_view_process_list();
-		$listView->setPageId($this->pObj->id);
-		$listView->setIconPath($BACK_PATH.'../typo3conf/ext/crawler/template/process/res/img/');
-		$listView->setProcessCollection($allProcesses);
-		$listView->setCliPath($this->processManager->getCrawlerCliPath());
-		$listView->setIsCrawlerEnabled(!$crawler->getDisabled() && !$this->isErrorDetected);
-		$listView->setTotalUnprocessedItemCount($queueRepository->countAllPendingItems());
-		$listView->setAssignedUnprocessedItemCount($queueRepository->countAllAssignedPendingItems());
-		$listView->setActiveProcessCount($processRepository->countActive());
-		$listView->setMaxActiveProcessCount(\TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['processLimit'],1,99,1));
-		$listView->setMode($mode);
-
-		$paginationView		= new tx_crawler_view_pagination();
-		$paginationView->setCurrentOffset($offset);
-		$paginationView->setPerPage($perpage);
-		$paginationView->setTotalItemCount($allCount);
-
-		$output = $listView->render();
-
-		if ($paginationView->getTotalPagesCount() > 1) {
-			$output .= ' <br />'.$paginationView->render();
-		}
+        $allProcesses 		= $processRepository->findAll('ttl','DESC', $perpage, $offset,$where);
+        $allCount			= $processRepository->countAll($where);
+
+        $listView			= new tx_crawler_view_process_list();
+        $listView->setPageId($this->pObj->id);
+        $listView->setIconPath($BACK_PATH.'../typo3conf/ext/crawler/template/process/res/img/');
+        $listView->setProcessCollection($allProcesses);
+        $listView->setCliPath($this->processManager->getCrawlerCliPath());
+        $listView->setIsCrawlerEnabled(!$crawler->getDisabled() && !$this->isErrorDetected);
+        $listView->setTotalUnprocessedItemCount($queueRepository->countAllPendingItems());
+        $listView->setAssignedUnprocessedItemCount($queueRepository->countAllAssignedPendingItems());
+        $listView->setActiveProcessCount($processRepository->countActive());
+        $listView->setMaxActiveProcessCount(\TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['processLimit'],1,99,1));
+        $listView->setMode($mode);
+
+        $paginationView		= new tx_crawler_view_pagination();
+        $paginationView->setCurrentOffset($offset);
+        $paginationView->setPerPage($perpage);
+        $paginationView->setTotalItemCount($allCount);
+
+        $output = $listView->render();
+
+        if ($paginationView->getTotalPagesCount() > 1) {
+            $output .= ' <br />'.$paginationView->render();
+        }
 
-		return $output;
-	}
+        return $output;
+    }
 
-	/**
-	 * Verify that the crawler is exectuable.
-	 *
-	 * @access protected
-	 * @return void
-	 *
-	 * @author Michael Klapper <michael.klapper@aoemedia.de>
-	 */
-	protected function makeCrawlerProcessableChecks() {
-		global $LANG;
-
-		if ($this->isCrawlerUserAvailable() === false) {
-			$this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.noBeUserAvailable'));
-		} elseif ($this->isCrawlerUserNotAdmin() === false) {
-			$this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.beUserIsAdmin'));
-		}
+    /**
+     * Verify that the crawler is exectuable.
+     *
+     * @access protected
+     * @return void
+     *
+     * @author Michael Klapper <michael.klapper@aoemedia.de>
+     */
+    protected function makeCrawlerProcessableChecks() {
+        global $LANG;
+
+        if ($this->isCrawlerUserAvailable() === false) {
+            $this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.noBeUserAvailable'));
+        } elseif ($this->isCrawlerUserNotAdmin() === false) {
+            $this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.beUserIsAdmin'));
+        }
 
-		if ($this->isPhpForkAvailable() === false) {
-			$this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.noPhpForkAvailable'));
-		}
+        if ($this->isPhpForkAvailable() === false) {
+            $this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.noPhpForkAvailable'));
+        }
 
-		$exitCode = 0;
-		$out = array();
-		exec(escapeshellcmd($this->extensionSettings['phpPath'] . ' -v'), $out, $exitCode);
-		if ($exitCode > 0) {
-			$this->addErrorMessage(sprintf($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.phpBinaryNotFound'), htmlspecialchars($this->extensionSettings['phpPath'])));
-		}
-	}
+        $exitCode = 0;
+        $out = array();
+        exec(escapeshellcmd($this->extensionSettings['phpPath'] . ' -v'), $out, $exitCode);
+        if ($exitCode > 0) {
+            $this->addErrorMessage(sprintf($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.phpBinaryNotFound'), htmlspecialchars($this->extensionSettings['phpPath'])));
+        }
+    }
 
-	/**
-	 * Indicate that the required PHP method "popen" is
-	 * available in the system.
-	 *
-	 * @access protected
-	 * @return boolean
-	 *
-	 * @author Michael Klapper <michael.klapper@aoemedia.de>
-	 */
-	protected function isPhpForkAvailable() {
-		return function_exists('popen');
-	}
-
-	/**
-	 * Indicate that the required be_user "_cli_crawler" is
-	 * global available in the system.
-	 *
-	 * @access protected
-	 * @return boolean
-	 *
-	 * @author Michael Klapper <michael.klapper@aoemedia.de>
-	 */
-	protected function isCrawlerUserAvailable() {
-		$isAvailable = false;
-		$userArray = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('be_users', 'username', '_cli_crawler');
+    /**
+     * Indicate that the required PHP method "popen" is
+     * available in the system.
+     *
+     * @access protected
+     * @return boolean
+     *
+     * @author Michael Klapper <michael.klapper@aoemedia.de>
+     */
+    protected function isPhpForkAvailable() {
+        return function_exists('popen');
+    }
+
+    /**
+     * Indicate that the required be_user "_cli_crawler" is
+     * global available in the system.
+     *
+     * @access protected
+     * @return boolean
+     *
+     * @author Michael Klapper <michael.klapper@aoemedia.de>
+     */
+    protected function isCrawlerUserAvailable() {
+        $isAvailable = false;
+        $userArray = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('be_users', 'username', '_cli_crawler');
 
-		if (is_array($userArray))
-			$isAvailable = true;
+        if (is_array($userArray))
+            $isAvailable = true;
 
-		return $isAvailable;
-	}
+        return $isAvailable;
+    }
 
-	/**
-	 * Indicate that the required be_user "_cli_crawler" is
-	 * has no admin rights.
-	 *
-	 * @access protected
-	 * @return boolean
-	 *
-	 * @author Michael Klapper <michael.klapper@aoemedia.de>
-	 */
-	protected function isCrawlerUserNotAdmin() {
-		$isAvailable = false;
-		$userArray = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('be_users', 'username', '_cli_crawler');
+    /**
+     * Indicate that the required be_user "_cli_crawler" is
+     * has no admin rights.
+     *
+     * @access protected
+     * @return boolean
+     *
+     * @author Michael Klapper <michael.klapper@aoemedia.de>
+     */
+    protected function isCrawlerUserNotAdmin() {
+        $isAvailable = false;
+        $userArray = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('be_users', 'username', '_cli_crawler');
 
-		if (is_array($userArray) && $userArray[0]['admin'] == 0)
-			$isAvailable = true;
+        if (is_array($userArray) && $userArray[0]['admin'] == 0)
+            $isAvailable = true;
 
-		return $isAvailable;
-	}
+        return $isAvailable;
+    }
 
-	/**
-	 * Method to handle incomming actions of the process overview
-	 *
-	 * @param void
-	 * @return void
-	 */
-	protected function handleProcessOverviewActions(){
-
-		$crawler = $this->findCrawler();
-
-		switch (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('action')) {
-			case 'stopCrawling' :
-				//set the cli status to disable (all processes will be terminated)
-				$crawler->setDisabled(true);
-				break;
-			case 'resumeCrawling' :
-				//set the cli status to end (all processes will be terminated)
-				$crawler->setDisabled(false);
-				break;
-			case 'addProcess' :
-				$handle = $this->processManager->startProcess();
-				if ($handle === false) {
-					throw new Exception($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.newprocesserror'));
-				}
-				$this->addNoticeMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.newprocess'));
-				break;
-		}
-	}
+    /**
+     * Method to handle incomming actions of the process overview
+     *
+     * @param void
+     * @return void
+     */
+    protected function handleProcessOverviewActions(){
+
+        $crawler = $this->findCrawler();
+
+        switch (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('action')) {
+            case 'stopCrawling' :
+                //set the cli status to disable (all processes will be terminated)
+                $crawler->setDisabled(true);
+                break;
+            case 'resumeCrawling' :
+                //set the cli status to end (all processes will be terminated)
+                $crawler->setDisabled(false);
+                break;
+            case 'addProcess' :
+                $handle = $this->processManager->startProcess();
+                if ($handle === false) {
+                    throw new Exception($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.newprocesserror'));
+                }
+                $this->addNoticeMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.newprocess'));
+                break;
+        }
+    }
 
 
 
 
-	/**
-	 * Returns the singleton instance of the crawler.
-	 *
-	 * @param void
-	 * @return tx_crawler_lib crawler object
-	 * @author Timo Schmidt <schmidt@aoemedia.de>
-	 */
-	protected function findCrawler(){
-		if(!$this->crawlerObj instanceof tx_crawler_lib){
-			$this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
-		}
-		return $this->crawlerObj;
-	}
+    /**
+     * Returns the singleton instance of the crawler.
+     *
+     * @param void
+     * @return tx_crawler_lib crawler object
+     * @author Timo Schmidt <schmidt@aoemedia.de>
+     */
+    protected function findCrawler(){
+        if(!$this->crawlerObj instanceof tx_crawler_lib){
+            $this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
+        }
+        return $this->crawlerObj;
+    }
 
 
 
-	/*****************************
+    /*****************************
 	 *
 	 * General Helper Functions
 	 *
 	 *****************************/
 
-	/**
-	 * This method is used to add a message to the internal queue
-	 *
-	 * NOTE:
-	 * This method is basesd on TYPO3 4.3 or higher!
-	 *
-	 * @param  string  the message itself
-	 * @param  integer message level (-1 = success (default), 0 = info, 1 = notice, 2 = warning, 3 = error)
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function addMessage($message, $severity = \TYPO3\CMS\Core\Messaging\FlashMessage::OK) {
-		$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-			'TYPO3\CMS\Core\Messaging\FlashMessage',
-			$message,
-			'',
-			$severity
-		);
-
-		// TODO:
-		/** @var \TYPO3\CMS\Core\Messaging\FlashMessageService $flashMessageService */
-		$flashMessageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
-		$flashMessageService->getMessageQueueByIdentifier()->addMessage($message);
-	}
-
-	/**
-	 * Add notice message to the user interface.
-	 *
-	 * NOTE:
-	 * This method is basesd on TYPO3 4.3 or higher!
-	 *
-	 * @param string The message
-	 *
-	 * @access protected
-	 * @return void
-	 *
-	 * @author Michael Klapper <michael.klapper@aoemedia.de>
-	 */
-	protected function addNoticeMessage($message) {
-		$this->addMessage($message, \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE);
-	}
-
-	/**
-	 * Add error message to the user interface.
-	 *
-	 * NOTE:
-	 * This method is basesd on TYPO3 4.3 or higher!
-	 *
-	 * @param string The message
-	 *
-	 * @access protected
-	 * @return void
-	 *
-	 * @author Michael Klapper <michael.klapper@aoemedia.de>
-	 */
-	protected function addErrorMessage($message) {
-		$this->isErrorDetected = TRUE;
-		$this->addMessage($message, \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
-	}
-
-	/**
-	 * Add error message to the user interface.
-	 *
-	 * NOTE:
-	 * This method is basesd on TYPO3 4.3 or higher!
-	 *
-	 * @param string The message
-	 *
-	 * @access protected
-	 * @return void
-	 *
-	 * @author Michael Klapper <michael.klapper@aoemedia.de>
-	 */
-	protected function addWarningMessage($message) {
-		$this->addMessage($message, \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING);
-	}
-
-	/**
-	 * Create selector box
-	 *
-	 * @param	array		$optArray Options key(value) => label pairs
-	 * @param	string		$name Selector box name
-	 * @param	string		$value Selector box value (array for multiple...)
-	 * @param	boolean		$multiple If set, will draw multiple box.
+    /**
+     * This method is used to add a message to the internal queue
+     *
+     * NOTE:
+     * This method is basesd on TYPO3 4.3 or higher!
      *
-	 * @return	string		HTML select element
-	 */
-	function selectorBox($optArray, $name, $value, $multiple)	{
+     * @param  string  the message itself
+     * @param  integer message level (-1 = success (default), 0 = info, 1 = notice, 2 = warning, 3 = error)
+     *
+     * @access private
+     * @return void
+     */
+    private function addMessage($message, $severity = \TYPO3\CMS\Core\Messaging\FlashMessage::OK) {
+        $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+            'TYPO3\CMS\Core\Messaging\FlashMessage',
+            $message,
+            '',
+            $severity
+        );
+
+        // TODO:
+        /** @var \TYPO3\CMS\Core\Messaging\FlashMessageService $flashMessageService */
+        $flashMessageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
+        $flashMessageService->getMessageQueueByIdentifier()->addMessage($message);
+    }
+
+    /**
+     * Add notice message to the user interface.
+     *
+     * NOTE:
+     * This method is basesd on TYPO3 4.3 or higher!
+     *
+     * @param string The message
+     *
+     * @access protected
+     * @return void
+     *
+     * @author Michael Klapper <michael.klapper@aoemedia.de>
+     */
+    protected function addNoticeMessage($message) {
+        $this->addMessage($message, \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE);
+    }
+
+    /**
+     * Add error message to the user interface.
+     *
+     * NOTE:
+     * This method is basesd on TYPO3 4.3 or higher!
+     *
+     * @param string The message
+     *
+     * @access protected
+     * @return void
+     *
+     * @author Michael Klapper <michael.klapper@aoemedia.de>
+     */
+    protected function addErrorMessage($message) {
+        $this->isErrorDetected = TRUE;
+        $this->addMessage($message, \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+    }
+
+    /**
+     * Add error message to the user interface.
+     *
+     * NOTE:
+     * This method is basesd on TYPO3 4.3 or higher!
+     *
+     * @param string The message
+     *
+     * @access protected
+     * @return void
+     *
+     * @author Michael Klapper <michael.klapper@aoemedia.de>
+     */
+    protected function addWarningMessage($message) {
+        $this->addMessage($message, \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING);
+    }
+
+    /**
+     * Create selector box
+     *
+     * @param	array		$optArray Options key(value) => label pairs
+     * @param	string		$name Selector box name
+     * @param	string		$value Selector box value (array for multiple...)
+     * @param	boolean		$multiple If set, will draw multiple box.
+     *
+     * @return	string		HTML select element
+     */
+    function selectorBox($optArray, $name, $value, $multiple)	{
 
-		$options = array();
-		foreach($optArray as $key => $val)	{
-			$options[] = '
+        $options = array();
+        foreach($optArray as $key => $val)	{
+            $options[] = '
 				<option value="'.htmlspecialchars($key).'"'.((!$multiple && !strcmp($value,$key)) || ($multiple && in_array($key,(array)$value))?' selected="selected"':'').'>'.htmlspecialchars($val).'</option>';
-		}
+        }
 
-		$output = '<select name="'.htmlspecialchars($name.($multiple?'[]':'')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('',$options).'</select>';
+        $output = '<select name="'.htmlspecialchars($name.($multiple?'[]':'')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('',$options).'</select>';
 
-		return $output;
-	}
+        return $output;
+    }
 
-	/**
-	 * Activate hooks
-	 *
-	 * @return	void
-	 */
-	function runRefreshHooks() {
-		$crawlerLib = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
-		if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['refresh_hooks'])) {
-			foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['refresh_hooks'] as $objRef) {
-				$hookObj = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($objRef);
-				if (is_object($hookObj)) {
-					$hookObj->crawler_init($crawlerLib);
-				}
-			}
-		}
+    /**
+     * Activate hooks
+     *
+     * @return	void
+     */
+    function runRefreshHooks() {
+        $crawlerLib = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['refresh_hooks'])) {
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['refresh_hooks'] as $objRef) {
+                $hookObj = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($objRef);
+                if (is_object($hookObj)) {
+                    $hookObj->crawler_init($crawlerLib);
+                }
+            }
+        }
 
-	}
+    }
 
-	/**
-	 * Returns the URL to the current module, including $_GET['id'].
-	 *
-	 * @param array $urlParameters optional parameters to add to the URL
-	 * @return string
-	 */
-	protected function getModuleUrl(array $urlParameters = array()) {
-	    if ($this->pObj->id) {
-	        $urlParameters = array_merge($urlParameters, array(
+    /**
+     * Returns the URL to the current module, including $_GET['id'].
+     *
+     * @param array $urlParameters optional parameters to add to the URL
+     * @return string
+     */
+    protected function getModuleUrl(array $urlParameters = array()) {
+        if ($this->pObj->id) {
+            $urlParameters = array_merge($urlParameters, array(
                 'id' => $this->pObj->id
             ));
-	    }
+        }
         return \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('M'), $urlParameters);
-	}
+    }
 }
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php'])	{
-	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php']);
+    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php']);
 }

Spacing +104 added lines, -104 removed lines

@@ -95,10 +95,10 @@ 
 	 *
 	 * @return	array		Menu array
 	 */
-	function modMenu()	{
+	function modMenu() {
 		global $LANG;
 
-		return array (
+		return array(
 			'depth' => array(
 				0 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_0'),
 				1 => $LANG->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_1'),
@@ -155,7 +155,7 @@ 
 		}
 
 			// Set CSS styles specific for this document:
-		$this->pObj->content = str_replace('/*###POSTCSSMARKER###*/','
+		$this->pObj->content = str_replace('/*###POSTCSSMARKER###*/', '
 			TABLE.c-list TR TD { white-space: nowrap; vertical-align: top; }
 		',$this->pObj->content);
 
@@ -200,7 +200,7 @@ 
 		*/
 
 			// Additional menus for the log type:
-		if ($this->pObj->MOD_SETTINGS['crawlaction']==='log')	{
+		if ($this->pObj->MOD_SETTINGS['crawlaction'] === 'log') {
 			$h_func .= \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
 				$this->pObj->id,
 				'SET[depth]',
@@ -209,15 +209,15 @@ 
 				'index.php'
 			);
 
-			$quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details=' . intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : '';
+			$quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : '';
 
 			$setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
 
-			$h_func.= '<hr/>'.
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.display').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->pObj->id,'SET[log_display]',$this->pObj->MOD_SETTINGS['log_display'],$this->pObj->MOD_MENU['log_display'],'index.php','&setID='.$setId) . ' - ' .
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showresultlog').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_resultLog]',$this->pObj->MOD_SETTINGS['log_resultLog'],'index.php','&setID='.$setId . $quiPart) . ' - ' .
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showfevars').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_feVars]',$this->pObj->MOD_SETTINGS['log_feVars'],'index.php','&setID='.$setId . $quiPart) . ' - ' .
-					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage').': ' .
+			$h_func .= '<hr/>'.
+					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.display').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->pObj->id, 'SET[log_display]', $this->pObj->MOD_SETTINGS['log_display'], $this->pObj->MOD_MENU['log_display'], 'index.php', '&setID='.$setId).' - '.
+					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showresultlog').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_resultLog]', $this->pObj->MOD_SETTINGS['log_resultLog'], 'index.php', '&setID='.$setId.$quiPart).' - '.
+					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showfevars').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_feVars]', $this->pObj->MOD_SETTINGS['log_feVars'], 'index.php', '&setID='.$setId.$quiPart).' - '.
+					$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage').': '.
 					\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu(
 						$this->pObj->id,
 						'SET[itemsPerPage]',
@@ -230,7 +230,7 @@ 
 		$theOutput = $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1);
 
 			// Branch based on type:
-		switch ((string)$this->pObj->MOD_SETTINGS['crawlaction']) {
+		switch ((string) $this->pObj->MOD_SETTINGS['crawlaction']) {
 			case 'start':
 				if (empty($this->pObj->id)) {
 					$this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noPageSelected'));
@@ -278,7 +278,7 @@ 
 	 *
 	 * @return	string		HTML output
 	 */
-	function drawURLs()	{
+	function drawURLs() {
 		global $BACK_PATH, $BE_USER;
 
 			// Init:
@@ -287,12 +287,12 @@ 
 		$this->downloadCrawlUrls = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('_download');
 		$this->makeCrawlerProcessableChecks();
 
-		switch((string)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp'))	{
+		switch ((string) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp')) {
 			case 'midnight':
-				$this->scheduledTime = mktime(0,0,0);
+				$this->scheduledTime = mktime(0, 0, 0);
 			break;
 			case '04:00':
-				$this->scheduledTime = mktime(0,0,0)+4*3600;
+				$this->scheduledTime = mktime(0, 0, 0) + 4 * 3600;
 			break;
 			case 'now':
 			default:
@@ -312,23 +312,23 @@ 
 		$this->crawlerObj->setID = \TYPO3\CMS\Core\Utility\GeneralUtility::md5int(microtime());
 
 		if (empty($this->incomingConfigurationSelection)
-			|| (count($this->incomingConfigurationSelection)==1 && empty($this->incomingConfigurationSelection[0]))
+			|| (count($this->incomingConfigurationSelection) == 1 && empty($this->incomingConfigurationSelection[0]))
 			) {
-			$code= '
+			$code = '
 			<tr>
 				<td colspan="7"><b>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noConfigSelected').'</b></td>
 			</tr>';
 		} else {
-			if($this->submitCrawlUrls){
+			if ($this->submitCrawlUrls) {
 				$reason = new tx_crawler_domain_reason();
 				$reason->setReason(tx_crawler_domain_reason::REASON_GUI_SUBMIT);
 
-				if($BE_USER instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication){ $username = $BE_USER->user['username']; }
+				if ($BE_USER instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication) { $username = $BE_USER->user['username']; }
 				$reason->setDetailText('The user '.$username.' added pages to the crawler queue manually ');
 
-				tx_crawler_domain_events_dispatcher::getInstance()->post(	'invokeQueueChange',
+				tx_crawler_domain_events_dispatcher::getInstance()->post('invokeQueueChange',
 																			$this->findCrawler()->setID,
-																			array(	'reason' => $reason ));
+																			array('reason' => $reason));
 			}
 
 			$code = $this->crawlerObj->getPageTreeAndUrls(
@@ -349,18 +349,18 @@ 
 		$this->duplicateTrack = $this->crawlerObj->duplicateTrack;
 
 		$output = '';
-		if ($code)	{
+		if ($code) {
 
 			$output .= '<h3>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.configuration').':</h3>';
 			$output .= '<input type="hidden" name="id" value="'.intval($this->pObj->id).'" />';
 
-			if (!$this->submitCrawlUrls)	{
+			if (!$this->submitCrawlUrls) {
 				$output .= $this->drawURLs_cfgSelectors().'<br />';
 				$output .= '<input type="submit" name="_update" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerUpdate').'" /> ';
 				$output .= '<input type="submit" name="_crawl" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerCrawl').'" /> ';
 				$output .= '<input type="submit" name="_download" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerDownload').'" /><br /><br />';
 				$output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.count').': '.count(array_keys($this->duplicateTrack)).'<br />';
-				$output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s',time()).'<br />';
+				$output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s', time()).'<br />';
 				$output .= '<br />
 					<table class="lrPadding c-list url-table">'.
 						$this->drawURLs_printTableHeader().
@@ -374,7 +374,7 @@ 
 		}
 
 			// Download Urls to crawl:
-		if ($this->downloadCrawlUrls)	{
+		if ($this->downloadCrawlUrls) {
 
 				// Creating output header:
 			$mimeType = 'application/octet-stream';
@@ -382,7 +382,7 @@ 
 			Header('Content-Disposition: attachment; filename=CrawlerUrls.txt');
 
 				// Printing the content of the CSV lines:
-			echo implode(chr(13).chr(10),$this->downloadUrls);
+			echo implode(chr(13).chr(10), $this->downloadUrls);
 
 				// Exits:
 			exit;
@@ -397,7 +397,7 @@ 
 	 *
 	 * @return	string		HTML table
 	 */
-	function drawURLs_cfgSelectors()	{
+	function drawURLs_cfgSelectors() {
 
 			// depth
 		$cell[] = $this->selectorBox(
@@ -413,11 +413,11 @@ 
 			$this->pObj->MOD_SETTINGS['depth'],
 			0
 		);
-		$availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth']?$this->pObj->MOD_SETTINGS['depth']:0 );
+		$availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth'] ? $this->pObj->MOD_SETTINGS['depth'] : 0);
 
 			// Configurations
 		$cell[] = $this->selectorBox(
-			empty($availableConfigurations)?array():array_combine($availableConfigurations, $availableConfigurations),
+			empty($availableConfigurations) ? array() : array_combine($availableConfigurations, $availableConfigurations),
 			'configurationSelection',
 			$this->incomingConfigurationSelection,
 			1
@@ -478,7 +478,7 @@ 
 	 *
 	 * @return	string		Table header
 	 */
-	function drawURLs_printTableHeader()	{
+	function drawURLs_printTableHeader() {
 
 		$content = '
 			<tr class="bgColor5 tableheader">
@@ -516,7 +516,7 @@ 
 	 *
 	 * @return	string		HTML output
 	 */
-	function drawLog()	{
+	function drawLog() {
 		global $BACK_PATH;
 		$output = '';
 
@@ -529,45 +529,45 @@ 
 
 			// Read URL:
 		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')) {
-			$this->crawlerObj->readUrl(intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')),TRUE);
+			$this->crawlerObj->readUrl(intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')), TRUE);
 		}
 
 			// Look for set ID sent - if it is, we will display contents of that set:
 		$showSetId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
 
 			// Show details:
-		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details'))	{
+		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) {
 
 				// Get entry record:
-			list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*','tx_crawler_queue','qid='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')));
+			list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')));
 
 				// Explode values:
 				$resStatus = $this->getResStatus($q_entry);
 			$q_entry['parameters'] = unserialize($q_entry['parameters']);
 			$q_entry['result_data'] = unserialize($q_entry['result_data']);
-			if (is_array($q_entry['result_data']))	{
+			if (is_array($q_entry['result_data'])) {
 				$q_entry['result_data']['content'] = unserialize($q_entry['result_data']['content']);
 			}
 
-			if(!$this->pObj->MOD_SETTINGS['log_resultLog']) {
+			if (!$this->pObj->MOD_SETTINGS['log_resultLog']) {
 				unset($q_entry['result_data']['content']['log']);
 			}
 
 				// Print rudimentary details:
 			$output .= '
 				<br /><br />
-				<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.back') . '" name="_back" />
-				<input type="hidden" value="' . $this->pObj->id . '" name="id" />
-				<input type="hidden" value="' . $showSetId . '" name="setID" />
+				<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.back').'" name="_back" />
+				<input type="hidden" value="' . $this->pObj->id.'" name="id" />
+				<input type="hidden" value="' . $showSetId.'" name="setID" />
 				<br />
-				Current server time: ' . date('H:i:s', time()) . '<br />' .
-				'Status: ' . $resStatus . '<br />' .
+				Current server time: ' . date('H:i:s', time()).'<br />'.
+				'Status: '.$resStatus.'<br />'.
 				\TYPO3\CMS\Core\Utility\DebugUtility::viewArray($q_entry);
 		} else {	// Show list:
 
 				// If either id or set id, show list:
-			if ($this->pObj->id || $showSetId)	{
-				if ($this->pObj->id)	{
+			if ($this->pObj->id || $showSetId) {
+				if ($this->pObj->id) {
 						// Drawing tree:
 					$tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
 					$perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
@@ -589,16 +589,16 @@ 
 					);
 
 						// Get branch beneath:
-					if ($this->pObj->MOD_SETTINGS['depth'])	{
+					if ($this->pObj->MOD_SETTINGS['depth']) {
 						$tree->getTree($this->pObj->id, $this->pObj->MOD_SETTINGS['depth'], '');
 					}
 
 						// Traverse page tree:
 					$code = ''; $count = 0;
-					foreach($tree->tree as $data)	{
+					foreach ($tree->tree as $data) {
 						$code .= $this->drawLog_addRows(
 									$data['row'],
-									$data['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages',$data['row'],TRUE),
+									$data['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], TRUE),
 									intval($this->pObj->MOD_SETTINGS['itemsPerPage'])
 								);
 						if (++$count == 1000) {
@@ -607,13 +607,13 @@ 
 					}
 				} else {
 					$code = '';
-					$code.= $this->drawLog_addRows(
+					$code .= $this->drawLog_addRows(
 								$showSetId,
 								'Set ID: '.$showSetId
 							);
 				}
 
-				if ($code)	{
+				if ($code) {
 
 					$output .= '
 						<br /><br />
@@ -624,7 +624,7 @@ 
 						<input type="hidden" value="'.$this->pObj->id.'" name="id" />
 						<input type="hidden" value="'.$showSetId.'" name="setID" />
 						<br />
-						'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s',time()).'
+						'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s', time()).'
 						<br /><br />
 
 
@@ -650,10 +650,10 @@ 
 					</tr>
 				';
 
-				$cc=0;
-				foreach($setList as $set)	{
-					$code.= '
-						<tr class="bgColor'.($cc%2 ? '-20':'-10').'">
+				$cc = 0;
+				foreach ($setList as $set) {
+					$code .= '
+						<tr class="bgColor'.($cc % 2 ? '-20' : '-10').'">
 							<td><a href="'.htmlspecialchars('index.php?setID='.$set['set_id']).'">'.$set['set_id'].'</a></td>
 							<td>'.$set['count_value'].'</td>
 							<td>'.\TYPO3\CMS\Backend\Utility\BackendUtility::dateTimeAge($set['scheduled']).'</td>
@@ -671,7 +671,7 @@ 
 			}
 		}
 
-		if($this->CSVExport) {
+		if ($this->CSVExport) {
 			$this->outputCsvFile();
 		}
 
@@ -697,7 +697,7 @@ 
 		$csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($fieldNames);
 
 			// Data:
-		foreach($this->CSVaccu as $row)	{
+		foreach ($this->CSVaccu as $row) {
 			$csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($row);
 		}
 
@@ -707,7 +707,7 @@ 
 		Header('Content-Disposition: attachment; filename=CrawlerLog.csv');
 
 			// Printing the content of the CSV lines:
-		echo implode(chr(13).chr(10),$csvLines);
+		echo implode(chr(13).chr(10), $csvLines);
 
 			// Exits:
 		exit;
@@ -723,14 +723,14 @@ 
      *
 	 * @return string HTML <tr> content (one or more)
 	 */
-	function drawLog_addRows($pageRow_setId, $titleString, $itemsPerPage=10) {
+	function drawLog_addRows($pageRow_setId, $titleString, $itemsPerPage = 10) {
 
 			// If Flush button is pressed, flush tables instead of selecting entries:
 
-		if(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush')) {
+		if (\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush')) {
 			$doFlush = true;
 			$doFullFlush = false;
-		} elseif(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush_all')) {
+		} elseif (\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush_all')) {
 			$doFlush = true;
 			$doFullFlush = true;
 		} else {
@@ -739,7 +739,7 @@ 
 		}
 
 			// Get result:
-		if (is_array($pageRow_setId))	{
+		if (is_array($pageRow_setId)) {
 			$res = $this->crawlerObj->getLogEntriesForPageId($pageRow_setId['uid'], $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage));
 		} else {
 			$res = $this->crawlerObj->getLogEntriesForSetId($pageRow_setId, $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage));
@@ -750,14 +750,14 @@ 
 				+ ($this->pObj->MOD_SETTINGS['log_resultLog'] ? -1 : 0)
 				+ ($this->pObj->MOD_SETTINGS['log_feVars'] ? 3 : 0);
 
-		if (count($res))	{
+		if (count($res)) {
 				// Traverse parameter combinations:
 			$c = 0;
-			$content='';
-			foreach($res as $kk => $vv)	{
+			$content = '';
+			foreach ($res as $kk => $vv) {
 
 					// Title column:
-				if (!$c)	{
+				if (!$c) {
 					$titleClm = '<td rowspan="'.count($res).'">'.$titleString.'</td>';
 				} else {
 					$titleClm = '';
@@ -774,16 +774,16 @@ 
 
 					// Put data into array:
 				$rowData = array();
-				if ($this->pObj->MOD_SETTINGS['log_resultLog'])	{
+				if ($this->pObj->MOD_SETTINGS['log_resultLog']) {
 					$rowData['result_log'] = $resLog;
 				} else {
-					$rowData['scheduled'] = ($vv['scheduled']> 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate');
+					$rowData['scheduled'] = ($vv['scheduled'] > 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate');
 					$rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-';
 				}
-				$rowData['result_status'] = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($resStatus,50);
+				$rowData['result_status'] = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($resStatus, 50);
 				$rowData['url'] = '<a href="'.htmlspecialchars($parameters['url']).'" target="_newWIndow">'.htmlspecialchars($parameters['url']).'</a>';
 				$rowData['feUserGroupList'] = $parameters['feUserGroupList'];
-				$rowData['procInstructions'] = is_array($parameters['procInstructions']) ? implode('; ',$parameters['procInstructions']) : '';
+				$rowData['procInstructions'] = is_array($parameters['procInstructions']) ? implode('; ', $parameters['procInstructions']) : '';
 				$rowData['set_id'] = $vv['set_id'];
 
 				if ($this->pObj->MOD_SETTINGS['log_feVars']) {
@@ -794,34 +794,34 @@ 
 
 				$setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
 
-				$refreshIcon = $GLOBALS['BACK_PATH'] . 'gfx/refresh_n.gif';
-				if (version_compare(TYPO3_version,'7.0','>=')) {
-					$refreshIcon = $GLOBALS['BACK_PATH'] . 'sysext/t3skin/extjs/images/grid/refresh.gif';
+				$refreshIcon = $GLOBALS['BACK_PATH'].'gfx/refresh_n.gif';
+				if (version_compare(TYPO3_version, '7.0', '>=')) {
+					$refreshIcon = $GLOBALS['BACK_PATH'].'sysext/t3skin/extjs/images/grid/refresh.gif';
 				}
 
 					// Put rows together:
-				$content.= '
-					<tr class="bgColor'.($c%2 ? '-20':'-10').'">
+				$content .= '
+					<tr class="bgColor'.($c % 2 ? '-20' : '-10').'">
 						'.$titleClm.'
-						<td><a href="' . $this->getModuleUrl(array('qid_details' => $vv['qid'], 'setID' => $setId)) . '">'.htmlspecialchars($vv['qid']).'</a></td>
-						<td><a href="' . $this->getModuleUrl(array('qid_read' => $vv['qid'], 'setID' => $setId)) . '"><img src="' . $refreshIcon . '" width="14" hspace="1" vspace="2" height="14" border="0" title="'.htmlspecialchars('Read').'" alt="" /></a></td>';
-				foreach($rowData as $fKey => $value) {
+						<td><a href="' . $this->getModuleUrl(array('qid_details' => $vv['qid'], 'setID' => $setId)).'">'.htmlspecialchars($vv['qid']).'</a></td>
+						<td><a href="' . $this->getModuleUrl(array('qid_read' => $vv['qid'], 'setID' => $setId)).'"><img src="'.$refreshIcon.'" width="14" hspace="1" vspace="2" height="14" border="0" title="'.htmlspecialchars('Read').'" alt="" /></a></td>';
+				foreach ($rowData as $fKey => $value) {
 
-					if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url',$fKey))	{
-						$content.= '
+					if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url', $fKey)) {
+						$content .= '
 						<td>'.$value.'</td>';
 					} else {
-						$content.= '
+						$content .= '
 						<td>'.nl2br(htmlspecialchars($value)).'</td>';
 					}
 				}
-				$content.= '
+				$content .= '
 					</tr>';
 				$c++;
 
-				if ($this->CSVExport)	{
+				if ($this->CSVExport) {
 						// Only for CSV (adding qid and scheduled/exec_time if needed):
-					$rowData['result_log'] = implode('// ',explode(chr(10),$resLog));
+					$rowData['result_log'] = implode('// ', explode(chr(10), $resLog));
 					$rowData['qid'] = $vv['qid'];
 					$rowData['scheduled'] = \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']);
 					$rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-';
@@ -864,7 +864,7 @@ 
 	 *
 	 * @return	string		Table header
 	 */
-	function drawLog_printTableHeader()	{
+	function drawLog_printTableHeader() {
 
 		$content = '
 			<tr class="bgColor5 tableheader">
@@ -915,7 +915,7 @@ 
         }
 
 	function getResStatus($vv) {
-		if ($vv['result_data'])	{
+		if ($vv['result_data']) {
 			$requestContent = unserialize($vv['result_data']);
 			$requestResult = unserialize($requestContent['content']);
 			if (is_array($requestResult)) {
@@ -924,9 +924,9 @@ 
 				} else {
 					$resStatus = implode("\n", $requestResult['errorlog']);
 				}
-				$resLog = is_array($requestResult['log']) ?  implode(chr(10),$requestResult['log']) : '';
+				$resLog = is_array($requestResult['log']) ? implode(chr(10), $requestResult['log']) : '';
 			} else {
-				$resStatus = 'Error: '.substr(preg_replace('/\s+/',' ',strip_tags($requestContent['content'])),0,10000).'...';
+				$resStatus = 'Error: '.substr(preg_replace('/\s+/', ' ', strip_tags($requestContent['content'])), 0, 10000).'...';
 			}
 		} else {
 			$resStatus = '-';
@@ -954,7 +954,7 @@ 
 	 * @param void
 	 * @return string
 	 */
-	protected function drawProcessOverviewAction(){
+	protected function drawProcessOverviewAction() {
 
 		$this->runRefreshHooks();
 
@@ -968,20 +968,20 @@ 
 			$this->addErrorMessage($e->getMessage());
 		}
 
-		$offset 	= intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('offset'));
-		$perpage 	= 20;
+		$offset = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('offset'));
+		$perpage = 20;
 
-		$processRepository	= new tx_crawler_domain_process_repository();
-		$queueRepository	= new tx_crawler_domain_queue_repository();
+		$processRepository = new tx_crawler_domain_process_repository();
+		$queueRepository = new tx_crawler_domain_queue_repository();
 
 		$mode = $this->pObj->MOD_SETTINGS['processListMode'];
 		if ($mode == 'detail') {
 			$where = '';
-		} elseif($mode == 'simple') {
+		} elseif ($mode == 'simple') {
 			$where = 'active = 1';
 		}
 
-		$allProcesses 		= $processRepository->findAll('ttl','DESC', $perpage, $offset,$where);
+		$allProcesses = $processRepository->findAll('ttl', 'DESC', $perpage, $offset, $where);
 		$allCount			= $processRepository->countAll($where);
 
 		$listView			= new tx_crawler_view_process_list();
@@ -993,10 +993,10 @@ 
 		$listView->setTotalUnprocessedItemCount($queueRepository->countAllPendingItems());
 		$listView->setAssignedUnprocessedItemCount($queueRepository->countAllAssignedPendingItems());
 		$listView->setActiveProcessCount($processRepository->countActive());
-		$listView->setMaxActiveProcessCount(\TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['processLimit'],1,99,1));
+		$listView->setMaxActiveProcessCount(\TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['processLimit'], 1, 99, 1));
 		$listView->setMode($mode);
 
-		$paginationView		= new tx_crawler_view_pagination();
+		$paginationView = new tx_crawler_view_pagination();
 		$paginationView->setCurrentOffset($offset);
 		$paginationView->setPerPage($perpage);
 		$paginationView->setTotalItemCount($allCount);
@@ -1033,7 +1033,7 @@ 
 
 		$exitCode = 0;
 		$out = array();
-		exec(escapeshellcmd($this->extensionSettings['phpPath'] . ' -v'), $out, $exitCode);
+		exec(escapeshellcmd($this->extensionSettings['phpPath'].' -v'), $out, $exitCode);
 		if ($exitCode > 0) {
 			$this->addErrorMessage(sprintf($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.phpBinaryNotFound'), htmlspecialchars($this->extensionSettings['phpPath'])));
 		}
@@ -1096,7 +1096,7 @@ 
 	 * @param void
 	 * @return void
 	 */
-	protected function handleProcessOverviewActions(){
+	protected function handleProcessOverviewActions() {
 
 		$crawler = $this->findCrawler();
 
@@ -1129,8 +1129,8 @@ 
 	 * @return tx_crawler_lib crawler object
 	 * @author Timo Schmidt <schmidt@aoemedia.de>
 	 */
-	protected function findCrawler(){
-		if(!$this->crawlerObj instanceof tx_crawler_lib){
+	protected function findCrawler() {
+		if (!$this->crawlerObj instanceof tx_crawler_lib) {
 			$this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
 		}
 		return $this->crawlerObj;
@@ -1232,15 +1232,15 @@ 
      *
 	 * @return	string		HTML select element
 	 */
-	function selectorBox($optArray, $name, $value, $multiple)	{
+	function selectorBox($optArray, $name, $value, $multiple) {
 
 		$options = array();
-		foreach($optArray as $key => $val)	{
+		foreach ($optArray as $key => $val) {
 			$options[] = '
-				<option value="'.htmlspecialchars($key).'"'.((!$multiple && !strcmp($value,$key)) || ($multiple && in_array($key,(array)$value))?' selected="selected"':'').'>'.htmlspecialchars($val).'</option>';
+				<option value="'.htmlspecialchars($key).'"'.((!$multiple && !strcmp($value, $key)) || ($multiple && in_array($key, (array) $value)) ? ' selected="selected"' : '').'>'.htmlspecialchars($val).'</option>';
 		}
 
-		$output = '<select name="'.htmlspecialchars($name.($multiple?'[]':'')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('',$options).'</select>';
+		$output = '<select name="'.htmlspecialchars($name.($multiple ? '[]' : '')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('', $options).'</select>';
 
 		return $output;
 	}
@@ -1279,6 +1279,6 @@ 
 	}
 }
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php'])	{
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php']) {
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php']);
 }

class.tx_crawler_lib.php

Doc Comments +21 added lines, -7 removed lines

@@ -424,7 +424,7 @@ 
      *
      * @param  string $piString                     PI to test
      * @param  array  $incomingProcInstructions     Processing instructions
-     * @return boolean                              TRUE if found
+     * @return boolean|null                              TRUE if found
      */
     public function drawURLs_PIfilter($piString, array $incomingProcInstructions) {
         if (empty($incomingProcInstructions)) {
@@ -632,6 +632,9 @@ 
         return $baseUrl;
     }
 
+    /**
+     * @param integer $rootid
+     */
     function getConfigurationsForBranch($rootid, $depth) {
 
         $configurationsForBranch = array();
@@ -735,6 +738,7 @@ 
      *
      * @param    array        Array with key (GET var name) and values (value of GET var which is configuration for expansion)
      * @param    integer        Current page ID
+     * @param integer $pid
      * @return    array        Array with key (GET var name) with the value being an array of all possible values for that key.
      */
     function expandParameters($paramArray, $pid)    {
@@ -853,7 +857,7 @@ 
      * The number of URLs will be the multiplication of the number of parameter values for each key
      *
      * @param  array  $paramArray   Output of expandParameters(): Array with keys (GET var names) and for each an array of values
-     * @param  array  $urls         URLs accumulated in this array (for recursion)
+     * @param  string[]  $urls         URLs accumulated in this array (for recursion)
      * @return array                URLs accumulated, if number of urls exceed 'maxCompileUrls' it will return false as an error!
      */
     public function compileUrls($paramArray, $urls = array()) {
@@ -1031,6 +1035,8 @@ 
      * @param    integer        Scheduled-time
      * @param     string        (optional) configuration hash
      * @param     bool        (optional) skip inner duplication check
+     * @param string $url
+     * @param double $tstamp
      * @return    bool        true if the url was added, false if it already existed
      */
     function addUrl (
@@ -1106,7 +1112,6 @@ 
      * If the timestamp is in the future it will check, if the queued entry has exactly the same timestamp
      *
      * @param int $tstamp
-     * @param string $parameters
      * @author Fabrizio Branca
      * @author Timo Schmidt
      * @return array;
@@ -1470,6 +1475,7 @@ 
 
     /**
      * @param message
+     * @param string $message
      */
     protected function log($message) {
         if (!empty($this->extensionSettings['logFileName'])) {
@@ -1483,7 +1489,7 @@ 
      * @param array $url
      * @param string $crawlerId
      *
-     * @return array
+     * @return string[]
      */
     protected function buildRequestHeaderArray(array $url, $crawlerId) {
         $reqHeaders = array();
@@ -1586,6 +1592,12 @@ 
      * @param    boolean        If set (and submitcrawlUrls is false) will fill $downloadUrls with entries)
      * @param    array        Array of processing instructions
      * @param    array        Array of configuration keys
+     * @param integer $id
+     * @param integer $depth
+     * @param integer $scheduledTime
+     * @param integer $reqMinute
+     * @param boolean $submitCrawlUrls
+     * @param boolean $downloadCrawlUrls
      * @return    string        HTML code
      */
     function getPageTreeAndUrls(
@@ -1740,6 +1752,7 @@ 
      *
      * @param    array        Page row
      * @param    string        Page icon and title for row
+     * @param string $pageTitleAndIcon
      * @return    string        HTML <tr> content (one or more)
      */
     public function drawURLs_addRowsForPage(array $pageRow, $pageTitleAndIcon)    {
@@ -2040,7 +2053,7 @@ 
     /**
      * Function executed by crawler_im.php cli script.
      *
-     * @return bool
+     * @return null|boolean
      */
     function CLI_main_flush() {
         $this->setAccessMode('cli_flush');
@@ -2097,7 +2110,7 @@ 
      * @param  int $countInARun
      * @param  int $sleepTime
      * @param  int $sleepAfterFinish
-     * @return string                   Status message
+     * @return integer                   Status message
      */
     public function CLI_run($countInARun, $sleepTime, $sleepAfterFinish) {
         $result = 0;
@@ -2369,6 +2382,7 @@ 
      * Used to determine timeouts and to ensure a proper cleanup if there's a timeout
      *
      * @param  string  identification string for the process
+     * @param string $pid
      * @return boolean determines if the process is still active / has resources
      *
      * FIXME: Please remove Transaction, not needed as only a select query.
@@ -2406,7 +2420,7 @@ 
     /**
      * @param bool $get_as_float
      *
-     * @return mixed
+     * @return string
      */
     protected function microtime($get_as_float = false )
     {

Indentation +2 added lines, -2 removed lines

@@ -1329,7 +1329,7 @@ 
             return FALSE;
         }
 
- 	    // direct request
+            // direct request
         if ($this->extensionSettings['makeDirectRequests']) {
             $result = $this->sendDirectRequest($originalUrl, $crawlerId);
             return $result;
@@ -2360,7 +2360,7 @@ 
      *
      * @return void
      */
-     public function CLI_deleteProcessesMarkedDeleted() {
+        public function CLI_deleteProcessesMarkedDeleted() {
         $this->db->exec_DELETEquery('tx_crawler_process', 'deleted = 1');
     }
 

Spacing +286 added lines, -286 removed lines

@@ -32,8 +32,8 @@ 
 class tx_crawler_lib {
 
     var $setID = 0;
-    var $processID ='';
-    var $max_CLI_exec_time = 3600;    // One hour is max stalled time for the CLI (If the process has had the status "start" for 3600 seconds it will be regarded stalled and a new process is started.
+    var $processID = '';
+    var $max_CLI_exec_time = 3600; // One hour is max stalled time for the CLI (If the process has had the status "start" for 3600 seconds it will be regarded stalled and a new process is started.
 
     var $duplicateTrack = array();
     var $downloadUrls = array();
@@ -46,9 +46,9 @@ 
     var $queueEntries = array();
     var $urlList = array();
 
-    var $debugMode=FALSE;
+    var $debugMode = FALSE;
 
-    var $extensionSettings=array();
+    var $extensionSettings = array();
 
     var $MP = false; // mount point
 
@@ -72,9 +72,9 @@ 
     private $backendUser;
 
     const CLI_STATUS_NOTHING_PROCCESSED = 0;
-    const CLI_STATUS_REMAIN = 1;    //queue not empty
-    const CLI_STATUS_PROCESSED = 2;    //(some) queue items where processed
-    const CLI_STATUS_ABORTED = 4;    //instance didn't finish
+    const CLI_STATUS_REMAIN = 1; //queue not empty
+    const CLI_STATUS_PROCESSED = 2; //(some) queue items where processed
+    const CLI_STATUS_ABORTED = 4; //instance didn't finish
     const CLI_STATUS_POLLABLE_PROCESSED = 8;
 
     /**
@@ -165,7 +165,7 @@ 
             $this->extensionSettings['countInARun'] = 100;
         }
 
-        $this->extensionSettings['processLimit'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['processLimit'],1,99,1);
+        $this->extensionSettings['processLimit'] = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['processLimit'], 1, 99, 1);
     }
 
     /**
@@ -199,7 +199,7 @@ 
         }
 
         if (!$skipPage) {
-            if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('3,4', $pageRow['doktype']) || $pageRow['doktype']>=199)    {
+            if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('3,4', $pageRow['doktype']) || $pageRow['doktype'] >= 199) {
                 $skipPage = true;
                 $skipMessage = 'Because doktype is not allowed';
             }
@@ -220,13 +220,13 @@ 
         if (!$skipPage) {
                 // veto hook
             if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pageVeto'])) {
-                foreach($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pageVeto'] as $key => $func)    {
+                foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pageVeto'] as $key => $func) {
                     $params = array(
                         'pageRow' => $pageRow
                     );
                     // expects "false" if page is ok and "true" or a skipMessage if this page should _not_ be crawled
                     $veto = \TYPO3\CMS\Core\Utility\GeneralUtility::callUserFunction($func, $params, $this);
-                    if ($veto !== false)    {
+                    if ($veto !== false) {
                         $skipPage = true;
                         if (is_string($veto)) {
                             $skipMessage = $veto;
@@ -276,9 +276,9 @@ 
      * @param  string $configurationHash
      * @return boolean
      */
-    protected function noUnprocessedQueueEntriesForPageWithConfigurationHashExist($uid,$configurationHash) {
-        $configurationHash = $this->db->fullQuoteStr($configurationHash,'tx_crawler_queue');
-        $res = $this->db->exec_SELECTquery('count(*) as anz','tx_crawler_queue',"page_id=".intval($uid)." AND configuration_hash=".$configurationHash." AND exec_time=0");
+    protected function noUnprocessedQueueEntriesForPageWithConfigurationHashExist($uid, $configurationHash) {
+        $configurationHash = $this->db->fullQuoteStr($configurationHash, 'tx_crawler_queue');
+        $res = $this->db->exec_SELECTquery('count(*) as anz', 'tx_crawler_queue', "page_id=".intval($uid)." AND configuration_hash=".$configurationHash." AND exec_time=0");
         $row = $this->db->sql_fetch_assoc($res);
 
         return ($row['anz'] == 0);
@@ -343,26 +343,26 @@ 
             }
         }
 
-        if (is_array($vv['URLs']))    {
-            $configurationHash     =    md5(serialize($vv));
-            $skipInnerCheck     =    $this->noUnprocessedQueueEntriesForPageWithConfigurationHashExist($pageRow['uid'],$configurationHash);
+        if (is_array($vv['URLs'])) {
+            $configurationHash = md5(serialize($vv));
+            $skipInnerCheck = $this->noUnprocessedQueueEntriesForPageWithConfigurationHashExist($pageRow['uid'], $configurationHash);
 
-            foreach($vv['URLs'] as $urlQuery)    {
+            foreach ($vv['URLs'] as $urlQuery) {
 
-                if ($this->drawURLs_PIfilter($vv['subCfg']['procInstrFilter'], $incomingProcInstructions))    {
+                if ($this->drawURLs_PIfilter($vv['subCfg']['procInstrFilter'], $incomingProcInstructions)) {
 
                     // Calculate cHash:
-                    if ($vv['subCfg']['cHash'])    {
+                    if ($vv['subCfg']['cHash']) {
                         /* @var $cacheHash \TYPO3\CMS\Frontend\Page\CacheHashCalculator */
                         $cacheHash = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Frontend\Page\CacheHashCalculator');
-                        $urlQuery .= '&cHash=' . $cacheHash->generateForParameters($urlQuery);
+                        $urlQuery .= '&cHash='.$cacheHash->generateForParameters($urlQuery);
                     }
 
                     // Create key by which to determine unique-ness:
                     $uKey = $urlQuery.'|'.$vv['subCfg']['userGroups'].'|'.$vv['subCfg']['baseUrl'].'|'.$vv['subCfg']['procInstrFilter'];
 
                     // realurl support (thanks to Ingo Renner)
-                    $urlQuery = 'index.php' . $urlQuery;
+                    $urlQuery = 'index.php'.$urlQuery;
                     if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('realurl') && $vv['subCfg']['realurl']) {
                         $params = array(
                             'LD' => array(
@@ -375,8 +375,8 @@ 
                     }
 
                     // Scheduled time:
-                    $schTime = $scheduledTime + round(count($duplicateTrack)*(60/$reqMinute));
-                    $schTime = floor($schTime/60)*60;
+                    $schTime = $scheduledTime + round(count($duplicateTrack) * (60 / $reqMinute));
+                    $schTime = floor($schTime / 60) * 60;
 
                     if (isset($duplicateTrack[$uKey])) {
 
@@ -388,10 +388,10 @@ 
                         $urlList = '['.date('d.m.y H:i', $schTime).'] '.htmlspecialchars($urlQuery);
                         $this->urlList[] = '['.date('d.m.y H:i', $schTime).'] '.$urlQuery;
 
-                        $theUrl = ($vv['subCfg']['baseUrl'] ? $vv['subCfg']['baseUrl'] : \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL')) . $urlQuery;
+                        $theUrl = ($vv['subCfg']['baseUrl'] ? $vv['subCfg']['baseUrl'] : \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL')).$urlQuery;
 
                         // Submit for crawling!
-                        if ($submitCrawlUrls)    {
+                        if ($submitCrawlUrls) {
                             $added = $this->addUrl(
                             $pageRow['uid'],
                             $theUrl,
@@ -403,7 +403,7 @@ 
                             if ($added === false) {
                                 $urlList .= ' (Url already existed)';
                             }
-                        } elseif ($downloadCrawlUrls)    {
+                        } elseif ($downloadCrawlUrls) {
                             $downloadUrls[$theUrl] = $theUrl;
                         }
 
@@ -431,7 +431,7 @@ 
             return TRUE;
         }
 
-        foreach($incomingProcInstructions as $pi) {
+        foreach ($incomingProcInstructions as $pi) {
             if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($piString, $pi)) {
                 return TRUE;
             }
@@ -440,7 +440,7 @@ 
 
 
     public function getPageTSconfigForId($id) {
-        if(!$this->MP){
+        if (!$this->MP) {
             $pageTSconfig = \TYPO3\CMS\Backend\Utility\BackendUtility::getPagesTSconfig($id);
         } else {
             list(,$mountPointId) = explode('-', $this->MP);
@@ -480,24 +480,24 @@ 
 
         $res = array();
 
-        if (is_array($pageTSconfig) && is_array($pageTSconfig['tx_crawler.']['crawlerCfg.']))    {
+        if (is_array($pageTSconfig) && is_array($pageTSconfig['tx_crawler.']['crawlerCfg.'])) {
             $crawlerCfg = $pageTSconfig['tx_crawler.']['crawlerCfg.'];
 
-            if (is_array($crawlerCfg['paramSets.']))    {
-                foreach($crawlerCfg['paramSets.'] as $key => $values)    {
-                    if (!is_array($values))    {
+            if (is_array($crawlerCfg['paramSets.'])) {
+                foreach ($crawlerCfg['paramSets.'] as $key => $values) {
+                    if (!is_array($values)) {
 
                         // Sub configuration for a single configuration string:
-                        $subCfg = (array)$crawlerCfg['paramSets.'][$key.'.'];
+                        $subCfg = (array) $crawlerCfg['paramSets.'][$key.'.'];
                         $subCfg['key'] = $key;
 
-                        if (strcmp($subCfg['procInstrFilter'],''))    {
-                            $subCfg['procInstrFilter'] = implode(',',\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',',$subCfg['procInstrFilter']));
+                        if (strcmp($subCfg['procInstrFilter'], '')) {
+                            $subCfg['procInstrFilter'] = implode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $subCfg['procInstrFilter']));
                         }
-                        $pidOnlyList = implode(',',\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',',$subCfg['pidsOnly'],1));
+                        $pidOnlyList = implode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $subCfg['pidsOnly'], 1));
 
                             // process configuration if it is not page-specific or if the specific page is the current page:
-                        if (!strcmp($subCfg['pidsOnly'],'') || \TYPO3\CMS\Core\Utility\GeneralUtility::inList($pidOnlyList,$id))    {
+                        if (!strcmp($subCfg['pidsOnly'], '') || \TYPO3\CMS\Core\Utility\GeneralUtility::inList($pidOnlyList, $id)) {
 
                                 // add trailing slash if not present
                             if (!empty($subCfg['baseUrl']) && substr($subCfg['baseUrl'], -1) != '/') {
@@ -508,14 +508,14 @@ 
                             $res[$key] = array();
                             $res[$key]['subCfg'] = $subCfg;
                             $res[$key]['paramParsed'] = $this->parseParams($values);
-                            $res[$key]['paramExpanded'] = $this->expandParameters($res[$key]['paramParsed'],$id);
+                            $res[$key]['paramExpanded'] = $this->expandParameters($res[$key]['paramParsed'], $id);
                             $res[$key]['origin'] = 'pagets';
 
                                 // recognize MP value
-                            if(!$this->MP){
-                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'],array('?id='.$id));
+                            if (!$this->MP) {
+                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], array('?id='.$id));
                             } else {
-                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'],array('?id='.$id.'&MP='.$this->MP));
+                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], array('?id='.$id.'&MP='.$this->MP));
                             }
                         }
                     }
@@ -536,7 +536,7 @@ 
                 'tx_crawler_configuration',
                 'pid',
                 intval($page['uid']),
-                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration') . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('tx_crawler_configuration')
+                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration').\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('tx_crawler_configuration')
             );
 
             if (is_array($configurationRecordsForCurrentPage)) {
@@ -545,10 +545,10 @@ 
                         // check access to the configuration record
                     if (empty($configurationRecord['begroups']) || $GLOBALS['BE_USER']->isAdmin() || $this->hasGroupAccess($GLOBALS['BE_USER']->user['usergroup_cached_list'], $configurationRecord['begroups'])) {
 
-                        $pidOnlyList = implode(',',\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',',$configurationRecord['pidsonly'],1));
+                        $pidOnlyList = implode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configurationRecord['pidsonly'], 1));
 
                             // process configuration if it is not page-specific or if the specific page is the current page:
-                        if (!strcmp($configurationRecord['pidsonly'],'') || \TYPO3\CMS\Core\Utility\GeneralUtility::inList($pidOnlyList,$id)) {
+                        if (!strcmp($configurationRecord['pidsonly'], '') || \TYPO3\CMS\Core\Utility\GeneralUtility::inList($pidOnlyList, $id)) {
                             $key = $configurationRecord['name'];
 
                                 // don't overwrite previously defined paramSets
@@ -582,7 +582,7 @@ 
                                     $res[$key]['subCfg'] = $subCfg;
                                     $res[$key]['paramParsed'] = $this->parseParams($configurationRecord['configuration']);
                                     $res[$key]['paramExpanded'] = $this->expandParameters($res[$key]['paramParsed'], $id);
-                                    $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], array('?id=' . $id));
+                                    $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], array('?id='.$id));
                                     $res[$key]['origin'] = 'tx_crawler_configuration_'.$configurationRecord['uid'];
                                 }
                             }
@@ -592,8 +592,8 @@ 
             }
         }
 
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['processUrls']))    {
-            foreach($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['processUrls'] as $func)    {
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['processUrls'])) {
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['processUrls'] as $func) {
                 $params = array(
                     'res' => &$res,
                 );
@@ -620,13 +620,13 @@ 
             $res = $this->db->exec_SELECTquery(
                 '*',
                 'sys_domain',
-                'uid = '.$sysDomainUid .
-                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('sys_domain') .
+                'uid = '.$sysDomainUid.
+                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('sys_domain').
                 \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('sys_domain')
             );
             $row = $this->db->sql_fetch_assoc($res);
             if ($row['domainName'] != '') {
-                return $urlScheme .'://'. $row['domainName'];
+                return $urlScheme.'://'.$row['domainName'];
             }
         }
         return $baseUrl;
@@ -637,28 +637,28 @@ 
         $configurationsForBranch = array();
 
         $pageTSconfig = $this->getPageTSconfigForId($rootid);
-        if (is_array($pageTSconfig) && is_array($pageTSconfig['tx_crawler.']['crawlerCfg.']) && is_array($pageTSconfig['tx_crawler.']['crawlerCfg.']['paramSets.']))    {
+        if (is_array($pageTSconfig) && is_array($pageTSconfig['tx_crawler.']['crawlerCfg.']) && is_array($pageTSconfig['tx_crawler.']['crawlerCfg.']['paramSets.'])) {
 
             $sets = $pageTSconfig['tx_crawler.']['crawlerCfg.']['paramSets.'];
-            if(is_array($sets)) {
-                foreach($sets as $key=>$value) {
-                    if(!is_array($value)) continue;
-                    $configurationsForBranch[] = substr($key,-1)=='.'?substr($key,0,-1):$key;
+            if (is_array($sets)) {
+                foreach ($sets as $key=>$value) {
+                    if (!is_array($value)) continue;
+                    $configurationsForBranch[] = substr($key, -1) == '.' ? substr($key, 0, -1) : $key;
                 }
 
             }
         }
         $pids = array();
         $rootLine = \TYPO3\CMS\Backend\Utility\BackendUtility::BEgetRootLine($rootid);
-        foreach($rootLine as $node) {
+        foreach ($rootLine as $node) {
             $pids[] = $node['uid'];
         }
         /* @var \TYPO3\CMS\Backend\Tree\View\PageTreeView */
         $tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
         $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-        $tree->init('AND ' . $perms_clause);
+        $tree->init('AND '.$perms_clause);
         $tree->getTree($rootid, $depth, '');
-        foreach($tree->tree as $node) {
+        foreach ($tree->tree as $node) {
             $pids[] = $node['row']['uid'];
         }
 
@@ -666,12 +666,12 @@ 
             '*',
             'tx_crawler_configuration',
             'pid IN ('.implode(',', $pids).') '.
-            \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration') .
+            \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration').
             \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('tx_crawler_configuration').' '.
             \TYPO3\CMS\Backend\Utility\BackendUtility::versioningPlaceholderClause('tx_crawler_configuration').' '
         );
 
-        while($row = $this->db->sql_fetch_assoc($res)) {
+        while ($row = $this->db->sql_fetch_assoc($res)) {
             $configurationsForBranch[] = $row['name'];
         }
         $this->db->sql_free_result($res);
@@ -693,7 +693,7 @@ 
         if (empty($accessList)) {
             return true;
         }
-        foreach(\TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', $groupList) as $groupUid) {
+        foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', $groupList) as $groupUid) {
             if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($accessList, $groupUid)) {
                 return true;
             }
@@ -712,9 +712,9 @@ 
         $paramKeyValues = array();
         $GETparams = explode('&', $inputQuery);
 
-        foreach($GETparams as $paramAndValue)    {
-            list($p,$v) = explode('=', $paramAndValue, 2);
-            if (strlen($p))        {
+        foreach ($GETparams as $paramAndValue) {
+            list($p, $v) = explode('=', $paramAndValue, 2);
+            if (strlen($p)) {
                 $paramKeyValues[rawurldecode($p)] = rawurldecode($v);
             }
         }
@@ -737,84 +737,84 @@ 
      * @param    integer        Current page ID
      * @return    array        Array with key (GET var name) with the value being an array of all possible values for that key.
      */
-    function expandParameters($paramArray, $pid)    {
+    function expandParameters($paramArray, $pid) {
         global $TCA;
 
             // Traverse parameter names:
-        foreach($paramArray as $p => $v)    {
+        foreach ($paramArray as $p => $v) {
             $v = trim($v);
 
                 // If value is encapsulated in square brackets it means there are some ranges of values to find, otherwise the value is literal
-            if (substr($v,0,1)==='[' && substr($v,-1)===']')    {
+            if (substr($v, 0, 1) === '[' && substr($v, -1) === ']') {
                     // So, find the value inside brackets and reset the paramArray value as an array.
-                $v = substr($v,1,-1);
+                $v = substr($v, 1, -1);
                 $paramArray[$p] = array();
 
                     // Explode parts and traverse them:
-                $parts = explode('|',$v);
-                foreach($parts as $pV)    {
+                $parts = explode('|', $v);
+                foreach ($parts as $pV) {
 
                         // Look for integer range: (fx. 1-34 or -40--30 // reads minus 40 to minus 30)
-                    if (preg_match('/^(-?[0-9]+)\s*-\s*(-?[0-9]+)$/',trim($pV),$reg))    {    // Integer range:
+                    if (preg_match('/^(-?[0-9]+)\s*-\s*(-?[0-9]+)$/', trim($pV), $reg)) {    // Integer range:
 
                             // Swap if first is larger than last:
-                        if ($reg[1] > $reg[2])    {
+                        if ($reg[1] > $reg[2]) {
                             $temp = $reg[2];
                             $reg[2] = $reg[1];
                             $reg[1] = $temp;
                         }
 
                             // Traverse range, add values:
-                        $runAwayBrake = 1000;    // Limit to size of range!
-                        for($a=$reg[1]; $a<=$reg[2];$a++)    {
+                        $runAwayBrake = 1000; // Limit to size of range!
+                        for ($a = $reg[1]; $a <= $reg[2]; $a++) {
                             $paramArray[$p][] = $a;
                             $runAwayBrake--;
-                            if ($runAwayBrake<=0)    {
+                            if ($runAwayBrake <= 0) {
                                 break;
                             }
                         }
-                    } elseif (substr(trim($pV),0,7)=='_TABLE:')    {
+                    } elseif (substr(trim($pV), 0, 7) == '_TABLE:') {
 
                             // Parse parameters:
-                        $subparts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(';',$pV);
+                        $subparts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(';', $pV);
                         $subpartParams = array();
-                        foreach($subparts as $spV)    {
-                            list($pKey,$pVal) = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':',$spV);
+                        foreach ($subparts as $spV) {
+                            list($pKey, $pVal) = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':', $spV);
                             $subpartParams[$pKey] = $pVal;
                         }
 
                             // Table exists:
-                        if (isset($TCA[$subpartParams['_TABLE']]))    {
+                        if (isset($TCA[$subpartParams['_TABLE']])) {
                             $lookUpPid = isset($subpartParams['_PID']) ? intval($subpartParams['_PID']) : $pid;
                             $pidField = isset($subpartParams['_PIDFIELD']) ? trim($subpartParams['_PIDFIELD']) : 'pid';
                             $where = isset($subpartParams['_WHERE']) ? $subpartParams['_WHERE'] : '';
                             $addTable = isset($subpartParams['_ADDTABLE']) ? $subpartParams['_ADDTABLE'] : '';
 
                             $fieldName = $subpartParams['_FIELD'] ? $subpartParams['_FIELD'] : 'uid';
-                            if ($fieldName==='uid' || $TCA[$subpartParams['_TABLE']]['columns'][$fieldName]) {
+                            if ($fieldName === 'uid' || $TCA[$subpartParams['_TABLE']]['columns'][$fieldName]) {
 
                                 $andWhereLanguage = '';
                                 $transOrigPointerField = $TCA[$subpartParams['_TABLE']]['ctrl']['transOrigPointerField'];
 
                                 if ($subpartParams['_ENABLELANG'] && $transOrigPointerField) {
-                                    $andWhereLanguage = ' AND ' . $this->db->quoteStr($transOrigPointerField, $subpartParams['_TABLE']) .' <= 0 ';
+                                    $andWhereLanguage = ' AND '.$this->db->quoteStr($transOrigPointerField, $subpartParams['_TABLE']).' <= 0 ';
                                 }
 
-                                $where = $this->db->quoteStr($pidField, $subpartParams['_TABLE']) .'='.intval($lookUpPid) . ' ' .
-                                    $andWhereLanguage . $where;
+                                $where = $this->db->quoteStr($pidField, $subpartParams['_TABLE']).'='.intval($lookUpPid).' '.
+                                    $andWhereLanguage.$where;
 
                                 $rows = $this->db->exec_SELECTgetRows(
                                     $fieldName,
-                                    $subpartParams['_TABLE'] . $addTable,
-                                    $where . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause($subpartParams['_TABLE']),
+                                    $subpartParams['_TABLE'].$addTable,
+                                    $where.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause($subpartParams['_TABLE']),
                                     '',
                                     '',
                                     '',
                                     $fieldName
                                 );
 
-                                if (is_array($rows))    {
-                                    $paramArray[$p] = array_merge($paramArray[$p],array_keys($rows));
+                                if (is_array($rows)) {
+                                    $paramArray[$p] = array_merge($paramArray[$p], array_keys($rows));
                                 }
                             }
                         }
@@ -830,7 +830,7 @@ 
                             'currentValue' => $pV,
                             'pid' => $pid
                         );
-                        foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/class.tx_crawler_lib.php']['expandParameters'] as $key => $_funcRef)    {
+                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/class.tx_crawler_lib.php']['expandParameters'] as $key => $_funcRef) {
                             \TYPO3\CMS\Core\Utility\GeneralUtility::callUserFunction($_funcRef, $_params, $this);
                         }
                     }
@@ -866,11 +866,11 @@ 
 
                 // Traverse value set:
             $newUrls = array();
-            foreach($urls as $url) {
-                foreach($valueSet as $val) {
-                    $newUrls[] = $url.(strcmp($val,'') ? '&'.rawurlencode($varName).'='.rawurlencode($val) : '');
+            foreach ($urls as $url) {
+                foreach ($valueSet as $val) {
+                    $newUrls[] = $url.(strcmp($val, '') ? '&'.rawurlencode($varName).'='.rawurlencode($val) : '');
 
-                    if (count($newUrls) >  \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['maxCompileUrls'], 1, 1000000000, 10000)) {
+                    if (count($newUrls) > \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['maxCompileUrls'], 1, 1000000000, 10000)) {
                         break;
                     }
                 }
@@ -900,7 +900,7 @@ 
      */
     public function getLogEntriesForPageId($id, $filter = '', $doFlush = FALSE, $doFullFlush = FALSE, $itemsPerPage = 10) {
         // FIXME: Write Unit tests for Filters
-        switch($filter) {
+        switch ($filter) {
             case 'pending':
                 $addWhere = ' AND exec_time=0';
                 break;
@@ -914,13 +914,13 @@ 
 
         // FIXME: Write unit test that ensures that the right records are deleted.
         if ($doFlush) {
-            $this->flushQueue( ($doFullFlush?'1=1':('page_id='.intval($id))) .$addWhere);
+            $this->flushQueue(($doFullFlush ? '1=1' : ('page_id='.intval($id))).$addWhere);
             return array();
         } else {
             return $this->db->exec_SELECTgetRows('*',
                 'tx_crawler_queue',
-                'page_id=' . intval($id) . $addWhere, '', 'scheduled DESC',
-                (intval($itemsPerPage)>0 ? intval($itemsPerPage) : ''));
+                'page_id='.intval($id).$addWhere, '', 'scheduled DESC',
+                (intval($itemsPerPage) > 0 ? intval($itemsPerPage) : ''));
         }
     }
 
@@ -933,9 +933,9 @@ 
      * @param    integer        Limit the amount of entires per page default is 10
      * @return    array
      */
-    public function getLogEntriesForSetId($set_id,$filter='',$doFlush=FALSE, $doFullFlush=FALSE, $itemsPerPage=10)    {
+    public function getLogEntriesForSetId($set_id, $filter = '', $doFlush = FALSE, $doFullFlush = FALSE, $itemsPerPage = 10) {
         // FIXME: Write Unit tests for Filters
-        switch($filter)    {
+        switch ($filter) {
             case 'pending':
                 $addWhere = ' AND exec_time=0';
                 break;
@@ -947,14 +947,14 @@ 
                 break;
         }
         // FIXME: Write unit test that ensures that the right records are deleted.
-        if ($doFlush)    {
-            $this->flushQueue($doFullFlush?'':('set_id='.intval($set_id).$addWhere));
+        if ($doFlush) {
+            $this->flushQueue($doFullFlush ? '' : ('set_id='.intval($set_id).$addWhere));
             return array();
         } else {
             return $this->db->exec_SELECTgetRows('*',
                 'tx_crawler_queue',
-                'set_id='.intval($set_id).$addWhere,'','scheduled DESC',
-                (intval($itemsPerPage)>0 ? intval($itemsPerPage) : ''));
+                'set_id='.intval($set_id).$addWhere, '', 'scheduled DESC',
+                (intval($itemsPerPage) > 0 ? intval($itemsPerPage) : ''));
         }
     }
 
@@ -964,14 +964,14 @@ 
      * @param $where    SQL related filter for the entries which should be removed
      * @return void
      */
-    protected function flushQueue($where='') {
+    protected function flushQueue($where = '') {
 
-        $realWhere = strlen($where)>0?$where:'1=1';
+        $realWhere = strlen($where) > 0 ? $where : '1=1';
 
-        if(tx_crawler_domain_events_dispatcher::getInstance()->hasObserver('queueEntryFlush')) {
-            $groups = $this->db->exec_SELECTgetRows('DISTINCT set_id','tx_crawler_queue',$realWhere);
-            foreach($groups as $group) {
-                tx_crawler_domain_events_dispatcher::getInstance()->post('queueEntryFlush',$group['set_id'], $this->db->exec_SELECTgetRows('uid, set_id','tx_crawler_queue',$realWhere.' AND set_id="'.$group['set_id'].'"'));
+        if (tx_crawler_domain_events_dispatcher::getInstance()->hasObserver('queueEntryFlush')) {
+            $groups = $this->db->exec_SELECTgetRows('DISTINCT set_id', 'tx_crawler_queue', $realWhere);
+            foreach ($groups as $group) {
+                tx_crawler_domain_events_dispatcher::getInstance()->post('queueEntryFlush', $group['set_id'], $this->db->exec_SELECTgetRows('uid, set_id', 'tx_crawler_queue', $realWhere.' AND set_id="'.$group['set_id'].'"'));
             }
         }
 
@@ -988,7 +988,7 @@ 
      * @param    integer        Time at which to activate
      * @return    void
      */
-    function addQueueEntry_callBack($setId,$params,$callBack,$page_id=0,$schedule=0) {
+    function addQueueEntry_callBack($setId, $params, $callBack, $page_id = 0, $schedule = 0) {
 
         if (!is_array($params))    $params = array();
         $params['_CALLBACKOBJ'] = $callBack;
@@ -1003,7 +1003,7 @@ 
             'result_data' => '',
         );
 
-        $this->db->exec_INSERTquery('tx_crawler_queue',$fieldArray);
+        $this->db->exec_INSERTquery('tx_crawler_queue', $fieldArray);
     }
 
 
@@ -1033,13 +1033,13 @@ 
      * @param     bool        (optional) skip inner duplication check
      * @return    bool        true if the url was added, false if it already existed
      */
-    function addUrl (
+    function addUrl(
         $id,
         $url,
         array $subCfg,
         $tstamp,
-        $configurationHash='',
-        $skipInnerDuplicationCheck=false
+        $configurationHash = '',
+        $skipInnerDuplicationCheck = false
     ) {
 
         $urlAdded = false;
@@ -1050,14 +1050,14 @@ 
         );
 
             // fe user group simulation:
-        $uGs = implode(',',array_unique(\TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',',$subCfg['userGroups'],1)));
-        if ($uGs)    {
+        $uGs = implode(',', array_unique(\TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', $subCfg['userGroups'], 1)));
+        if ($uGs) {
             $parameters['feUserGroupList'] = $uGs;
         }
 
             // Setting processing instructions
-        $parameters['procInstructions'] = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',',$subCfg['procInstrFilter']);
-        if (is_array($subCfg['procInstrParams.']))    {
+        $parameters['procInstructions'] = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $subCfg['procInstrFilter']);
+        if (is_array($subCfg['procInstrParams.'])) {
             $parameters['procInstrParams'] = $subCfg['procInstrParams.'];
         }
 
@@ -1076,14 +1076,14 @@ 
             'configuration' => $subCfg['key'],
         );
 
-        if ($this->registerQueueEntriesInternallyOnly)    {
+        if ($this->registerQueueEntriesInternallyOnly) {
                 //the entries will only be registered and not stored to the database
             $this->queueEntries[] = $fieldArray;
         } else {
 
-            if(!$skipInnerDuplicationCheck){
+            if (!$skipInnerDuplicationCheck) {
                     // check if there is already an equal entry
-                $rows = $this->getDuplicateRowsIfExist($tstamp,$fieldArray);
+                $rows = $this->getDuplicateRowsIfExist($tstamp, $fieldArray);
             }
 
             if (count($rows) == 0) {
@@ -1091,9 +1091,9 @@ 
                 $uid = $this->db->sql_insert_id();
                 $rows[] = $uid;
                 $urlAdded = true;
-                tx_crawler_domain_events_dispatcher::getInstance()->post('urlAddedToQueue',$this->setID,array('uid' => $uid, 'fieldArray' => $fieldArray));
-            }else{
-                tx_crawler_domain_events_dispatcher::getInstance()->post('duplicateUrlInQueue',$this->setID,array('rows' => $rows, 'fieldArray' => $fieldArray));
+                tx_crawler_domain_events_dispatcher::getInstance()->post('urlAddedToQueue', $this->setID, array('uid' => $uid, 'fieldArray' => $fieldArray));
+            } else {
+                tx_crawler_domain_events_dispatcher::getInstance()->post('duplicateUrlInQueue', $this->setID, array('rows' => $rows, 'fieldArray' => $fieldArray));
             }
         }
 
@@ -1111,34 +1111,34 @@ 
      * @author Timo Schmidt
      * @return array;
      */
-    protected function getDuplicateRowsIfExist($tstamp,$fieldArray){
+    protected function getDuplicateRowsIfExist($tstamp, $fieldArray) {
         $rows = array();
 
         $currentTime = $this->getCurrentTime();
 
             //if this entry is scheduled with "now"
         if ($tstamp <= $currentTime) {
-            if($this->extensionSettings['enableTimeslot']){
+            if ($this->extensionSettings['enableTimeslot']) {
                 $timeBegin     = $currentTime - 100;
-                $timeEnd     = $currentTime + 100;
-                $where         = ' ((scheduled BETWEEN '.$timeBegin.' AND '.$timeEnd.' ) OR scheduled <= '. $currentTime.') ';
-            }else{
-                $where = 'scheduled <= ' . $currentTime;
+                $timeEnd = $currentTime + 100;
+                $where         = ' ((scheduled BETWEEN '.$timeBegin.' AND '.$timeEnd.' ) OR scheduled <= '.$currentTime.') ';
+            } else {
+                $where = 'scheduled <= '.$currentTime;
             }
         } elseif ($tstamp > $currentTime) {
                 //entry with a timestamp in the future need to have the same schedule time
-            $where = 'scheduled = ' . $tstamp ;
+            $where = 'scheduled = '.$tstamp;
         }
 
-        if(!empty($where)){
+        if (!empty($where)) {
             $result = $this->db->exec_SELECTgetRows(
                 'qid',
                 'tx_crawler_queue',
                 $where.
-                ' AND NOT exec_time' .
+                ' AND NOT exec_time'.
                 ' AND NOT process_id '.
                 ' AND page_id='.intval($fieldArray['page_id']).
-                ' AND parameters_hash = ' . $this->db->fullQuoteStr($fieldArray['parameters_hash'], 'tx_crawler_queue')
+                ' AND parameters_hash = '.$this->db->fullQuoteStr($fieldArray['parameters_hash'], 'tx_crawler_queue')
             );
 
             if (is_array($result)) {
@@ -1158,7 +1158,7 @@ 
      * @author Timo Schmidt <schmidt@aoemedia.de>
      * @return int
      */
-    public function getCurrentTime(){
+    public function getCurrentTime() {
         return time();
     }
 
@@ -1180,18 +1180,18 @@ 
     function readUrl($queueId, $force = FALSE) {
         $ret = 0;
         if ($this->debugMode) {
-            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl start ' . microtime(true), __FUNCTION__);
+            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl start '.microtime(true), __FUNCTION__);
         }
         // Get entry:
         list($queueRec) = $this->db->exec_SELECTgetRows('*', 'tx_crawler_queue',
-            'qid=' . intval($queueId) . ($force ? '' : ' AND exec_time=0 AND process_scheduled > 0'));
+            'qid='.intval($queueId).($force ? '' : ' AND exec_time=0 AND process_scheduled > 0'));
 
         if (!is_array($queueRec)) {
             return;
         }
 
-        $pageUidRootTypoScript = \AOE\Crawler\Utility\TypoScriptUtility::getPageUidForTypoScriptRootTemplateInRootLine((int)$queueRec['page_id']);
-        $this->initTSFE((int)$pageUidRootTypoScript);
+        $pageUidRootTypoScript = \AOE\Crawler\Utility\TypoScriptUtility::getPageUidForTypoScriptRootTemplateInRootLine((int) $queueRec['page_id']);
+        $this->initTSFE((int) $pageUidRootTypoScript);
 
         \AOE\Crawler\Utility\SignalSlotUtility::emitSignal(
             __CLASS__,
@@ -1206,7 +1206,7 @@ 
             //if mulitprocessing is used we need to store the id of the process which has handled this entry
             $field_array['process_id_completed'] = $this->processID;
         }
-        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid=' . intval($queueId), $field_array);
+        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array);
 
         $result = $this->readUrl_exec($queueRec);
         $resultData = unserialize($result['content']);
@@ -1235,11 +1235,11 @@ 
             array($queueId, &$field_array)
         );
 
-        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid=' . intval($queueId), $field_array);
+        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array);
 
 
         if ($this->debugMode) {
-            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl stop ' . microtime(true), __FUNCTION__);
+            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl stop '.microtime(true), __FUNCTION__);
         }
 
         return $ret;
@@ -1251,7 +1251,7 @@ 
      * @param    integer        Queue field array,
      * @return    string
      */
-    function readUrlFromArray($field_array)    {
+    function readUrlFromArray($field_array) {
 
             // Set exec_time to lock record:
         $field_array['exec_time'] = $this->getCurrentTime();
@@ -1262,7 +1262,7 @@ 
 
             // Set result in log which also denotes the end of the processing of this entry.
         $field_array = array('result_data' => serialize($result));
-        $this->db->exec_UPDATEquery('tx_crawler_queue','qid='.intval($queueId), $field_array);
+        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array);
 
         return $result;
     }
@@ -1273,17 +1273,17 @@ 
      * @param    array        Queue record
      * @return    string        Result output.
      */
-    function readUrl_exec($queueRec)    {
+    function readUrl_exec($queueRec) {
             // Decode parameters:
         $parameters = unserialize($queueRec['parameters']);
         $result = 'ERROR';
-        if (is_array($parameters))    {
-            if ($parameters['_CALLBACKOBJ'])    {    // Calling object:
+        if (is_array($parameters)) {
+            if ($parameters['_CALLBACKOBJ']) {    // Calling object:
                 $objRef = $parameters['_CALLBACKOBJ'];
                 $callBackObj = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($objRef);
-                if (is_object($callBackObj))    {
+                if (is_object($callBackObj)) {
                     unset($parameters['_CALLBACKOBJ']);
-                    $result = array('content' => serialize($callBackObj->crawler_execute($parameters,$this)));
+                    $result = array('content' => serialize($callBackObj->crawler_execute($parameters, $this)));
                 } else {
                     $result = array('content' => 'No object: '.$objRef);
                 }
@@ -1293,9 +1293,9 @@ 
                 $crawlerId = $queueRec['qid'].':'.md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']);
 
                     // Get result:
-                $result = $this->requestUrl($parameters['url'],$crawlerId);
+                $result = $this->requestUrl($parameters['url'], $crawlerId);
 
-                tx_crawler_domain_events_dispatcher::getInstance()->post('urlCrawled',$queueRec['set_id'],array('url' => $parameters['url'], 'result' => $result));
+                tx_crawler_domain_events_dispatcher::getInstance()->post('urlCrawled', $queueRec['set_id'], array('url' => $parameters['url'], 'result' => $result));
             }
         }
 
@@ -1312,7 +1312,7 @@ 
      * @param  integer  $recursion      Recursion limiter for 302 redirects
      * @return array                    Array with content
      */
-    function requestUrl($originalUrl, $crawlerId, $timeout=2, $recursion=10) {
+    function requestUrl($originalUrl, $crawlerId, $timeout = 2, $recursion = 10) {
 
         if (!$recursion) return false;
 
@@ -1324,7 +1324,7 @@ 
             return FALSE;
         }
 
-        if (!in_array($url['scheme'], array('','http','https'))) {
+        if (!in_array($url['scheme'], array('', 'http', 'https'))) {
             if (TYPO3_DLOG) \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Scheme does not match for url "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
             return FALSE;
         }
@@ -1342,14 +1342,14 @@ 
 
         if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse'] && $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
             $rurl = parse_url($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
-            $url['path'] = $url['scheme'] . '://' . $url['host'] . ($url['port'] > 0 ? ':' . $url['port'] : '') . $url['path'];
+            $url['path'] = $url['scheme'].'://'.$url['host'].($url['port'] > 0 ? ':'.$url['port'] : '').$url['path'];
             $reqHeaders = $this->buildRequestHeaderArray($url, $crawlerId);
         }
 
         $host = $rurl['host'];
 
         if ($url['scheme'] == 'https') {
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
             $port = ($rurl['port'] > 0) ? $rurl['port'] : 443;
         } else {
             $port = ($rurl['port'] > 0) ? $rurl['port'] : 80;
@@ -1363,24 +1363,24 @@ 
             return FALSE;
         } else {
                 // Request message:
-            $msg = implode("\r\n",$reqHeaders)."\r\n\r\n";
-            fputs ($fp, $msg);
+            $msg = implode("\r\n", $reqHeaders)."\r\n\r\n";
+            fputs($fp, $msg);
 
                 // Read response:
             $d = $this->getHttpResponseFromStream($fp);
-            fclose ($fp);
+            fclose($fp);
 
             $time = microtime(true) - $startTime;
-            $this->log($originalUrl .' '.$time);
+            $this->log($originalUrl.' '.$time);
 
                 // Implode content and headers:
             $result = array(
                 'request' => $msg,
                 'headers' => implode('', $d['headers']),
-                'content' => implode('', (array)$d['content'])
+                'content' => implode('', (array) $d['content'])
             );
 
-            if (($this->extensionSettings['follow30x']) && ($newUrl = $this->getRequestUrlFrom302Header($d['headers'],$url['user'],$url['pass']))) {
+            if (($this->extensionSettings['follow30x']) && ($newUrl = $this->getRequestUrlFrom302Header($d['headers'], $url['user'], $url['pass']))) {
                 $result = array_merge(array('parentRequest'=>$result), $this->requestUrl($newUrl, $crawlerId, $recursion--));
                 $newRequestUrl = $this->requestUrl($newUrl, $crawlerId, $timeout, --$recursion);
 
@@ -1419,8 +1419,8 @@ 
 
         // Base path must be '/<pathSegements>/':
         if ($frontendBasePath != '/') {
-            $frontendBasePath = '/' . ltrim($frontendBasePath, '/');
-            $frontendBasePath = rtrim($frontendBasePath, '/') . '/';
+            $frontendBasePath = '/'.ltrim($frontendBasePath, '/');
+            $frontendBasePath = rtrim($frontendBasePath, '/').'/';
         }
 
         return $frontendBasePath;
@@ -1450,7 +1450,7 @@ 
 
         if (is_resource($streamPointer)) {
                 // read headers
-            while($line = fgets($streamPointer, '2048')) {
+            while ($line = fgets($streamPointer, '2048')) {
                 $line = trim($line);
                 if ($line !== '') {
                     $response['headers'][] = $line;
@@ -1460,7 +1460,7 @@ 
             }
 
                 // read content
-            while($line = fgets($streamPointer, '2048')) {
+            while ($line = fgets($streamPointer, '2048')) {
                 $response['content'][] = $line;
             }
         }
@@ -1473,7 +1473,7 @@ 
      */
     protected function log($message) {
         if (!empty($this->extensionSettings['logFileName'])) {
-            @file_put_contents($this->extensionSettings['logFileName'], date('Ymd His') . $message . "\n", FILE_APPEND);
+            @file_put_contents($this->extensionSettings['logFileName'], date('Ymd His').$message."\n", FILE_APPEND);
         }
     }
 
@@ -1489,12 +1489,12 @@ 
         $reqHeaders = array();
         $reqHeaders[] = 'GET '.$url['path'].($url['query'] ? '?'.$url['query'] : '').' HTTP/1.0';
         $reqHeaders[] = 'Host: '.$url['host'];
-        if (stristr($url['query'],'ADMCMD_previewWS')) {
+        if (stristr($url['query'], 'ADMCMD_previewWS')) {
             $reqHeaders[] = 'Cookie: $Version="1"; be_typo_user="1"; $Path=/';
         }
         $reqHeaders[] = 'Connection: close';
-        if ($url['user']!='') {
-            $reqHeaders[] = 'Authorization: Basic '. base64_encode($url['user'].':'.$url['pass']);
+        if ($url['user'] != '') {
+            $reqHeaders[] = 'Authorization: Basic '.base64_encode($url['user'].':'.$url['pass']);
         }
         $reqHeaders[] = 'X-T3crawler: '.$crawlerId;
         $reqHeaders[] = 'User-Agent: TYPO3 crawler';
@@ -1509,21 +1509,21 @@ 
      * @param    string        HTTP Auth. Password
      * @return    string        URL from redirection
      */
-    protected function getRequestUrlFrom302Header($headers,$user='',$pass='') {
-        if(!is_array($headers)) return false;
-        if(!(stristr($headers[0],'301 Moved') || stristr($headers[0],'302 Found') || stristr($headers[0],'302 Moved'))) return false;
+    protected function getRequestUrlFrom302Header($headers, $user = '', $pass = '') {
+        if (!is_array($headers)) return false;
+        if (!(stristr($headers[0], '301 Moved') || stristr($headers[0], '302 Found') || stristr($headers[0], '302 Moved'))) return false;
 
-        foreach($headers as $hl) {
-            $tmp = explode(": ",$hl);
+        foreach ($headers as $hl) {
+            $tmp = explode(": ", $hl);
             $header[trim($tmp[0])] = trim($tmp[1]);
-            if(trim($tmp[0])=='Location') break;
+            if (trim($tmp[0]) == 'Location') break;
         }
-        if(!array_key_exists('Location',$header)) return false;
+        if (!array_key_exists('Location', $header)) return false;
 
-        if($user!='') {
-            if(!($tmp = parse_url($header['Location']))) return false;
-            $newUrl = $tmp['scheme'] . '://' . $user . ':' . $pass . '@' . $tmp['host'] . $tmp['path'];
-            if($tmp['query']!='') $newUrl .= '?' . $tmp['query'];
+        if ($user != '') {
+            if (!($tmp = parse_url($header['Location']))) return false;
+            $newUrl = $tmp['scheme'].'://'.$user.':'.$pass.'@'.$tmp['host'].$tmp['path'];
+            if ($tmp['query'] != '') $newUrl .= '?'.$tmp['query'];
         } else {
             $newUrl = $header['Location'];
         }
@@ -1551,15 +1551,15 @@ 
      * @param    object        TSFE object (reference under PHP5)
      * @return    void
      */
-    function fe_init(&$params, $ref)    {
+    function fe_init(&$params, $ref) {
 
             // Authenticate crawler request:
-        if (isset($_SERVER['HTTP_X_T3CRAWLER']))    {
-            list($queueId,$hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']);
-            list($queueRec) = $this->db->exec_SELECTgetRows('*','tx_crawler_queue','qid='.intval($queueId));
+        if (isset($_SERVER['HTTP_X_T3CRAWLER'])) {
+            list($queueId, $hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']);
+            list($queueRec) = $this->db->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval($queueId));
 
                 // If a crawler record was found and hash was matching, set it up:
-            if (is_array($queueRec) && $hash === md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']))    {
+            if (is_array($queueRec) && $hash === md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
                 $params['pObj']->applicationData['tx_crawler']['running'] = TRUE;
                 $params['pObj']->applicationData['tx_crawler']['parameters'] = unserialize($queueRec['parameters']);
                 $params['pObj']->applicationData['tx_crawler']['log'] = array();
@@ -1619,7 +1619,7 @@ 
             /* @var $tree \TYPO3\CMS\Backend\Tree\View\PageTreeView */
         $tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
         $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-        $tree->init('AND ' . $perms_clause);
+        $tree->init('AND '.$perms_clause);
 
         $pageinfo = \TYPO3\CMS\Backend\Utility\BackendUtility::readPageAccess($id, $perms_clause);
         if (VersionNumberUtility::convertVersionNumberToInteger(VersionNumberUtility::getCurrentTypo3Version()) < 8000000) {
@@ -1636,7 +1636,7 @@ 
         }
 
             // Get branch beneath:
-        if ($depth)    {
+        if ($depth) {
             $tree->getTree($id, $depth, '');
         }
 
@@ -1648,7 +1648,7 @@ 
             $this->MP = false;
 
                 // recognize mount points
-            if($data['row']['doktype'] == 7){
+            if ($data['row']['doktype'] == 7) {
                 $mountpage = $this->db->exec_SELECTgetRows('*', 'pages', 'uid = '.$data['row']['uid']);
 
                     // fetch mounted pages
@@ -1658,15 +1658,15 @@ 
                 $mountTree->init('AND '.$perms_clause);
                 $mountTree->getTree($mountpage[0]['mount_pid'], $depth, '');
 
-                foreach($mountTree->tree as $mountData)    {
+                foreach ($mountTree->tree as $mountData) {
                     $code .= $this->drawURLs_addRowsForPage(
                         $mountData['row'],
-                        $mountData['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages',$mountData['row'],TRUE)
+                        $mountData['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $mountData['row'], TRUE)
                     );
                 }
 
                     // replace page when mount_pid_ol is enabled
-                if($mountpage[0]['mount_pid_ol']){
+                if ($mountpage[0]['mount_pid_ol']) {
                     $data['row']['uid'] = $mountpage[0]['mount_pid'];
                 } else {
                         // if the mount_pid_ol is not set the MP must not be used for the mountpoint page
@@ -1676,7 +1676,7 @@ 
 
             $code .= $this->drawURLs_addRowsForPage(
                 $data['row'],
-                $data['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], TRUE)
+                $data['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], TRUE)
             );
         }
 
@@ -1700,7 +1700,7 @@ 
             if (!empty($excludeString)) {
                 /* @var $tree \TYPO3\CMS\Backend\Tree\View\PageTreeView */
                 $tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
-                $tree->init('AND ' . $this->backendUser->getPagePermsClause(1));
+                $tree->init('AND '.$this->backendUser->getPagePermsClause(1));
 
                 $excludeParts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $excludeString);
 
@@ -1709,7 +1709,7 @@ 
 
                         // default is "page only" = "depth=0"
                     if (empty($depth)) {
-                        $depth = ( stristr($excludePart,'+')) ? 99 : 0;
+                        $depth = (stristr($excludePart, '+')) ? 99 : 0;
                     }
 
                     $pidList[] = $pid;
@@ -1742,7 +1742,7 @@ 
      * @param    string        Page icon and title for row
      * @return    string        HTML <tr> content (one or more)
      */
-    public function drawURLs_addRowsForPage(array $pageRow, $pageTitleAndIcon)    {
+    public function drawURLs_addRowsForPage(array $pageRow, $pageTitleAndIcon) {
 
         $skipMessage = '';
 
@@ -1763,7 +1763,7 @@ 
         $cc = 0;
         $content = '';
         if (count($configurations)) {
-            foreach($configurations as $confKey => $confArray)    {
+            foreach ($configurations as $confKey => $confArray) {
 
                     // Title column:
                 if (!$c) {
@@ -1792,47 +1792,47 @@ 
                     $paramExpanded = '';
                     $calcAccu = array();
                     $calcRes = 1;
-                    foreach($confArray['paramExpanded'] as $gVar => $gVal)    {
-                        $paramExpanded.= '
+                    foreach ($confArray['paramExpanded'] as $gVar => $gVal) {
+                        $paramExpanded .= '
                             <tr>
                                 <td class="bgColor4-20">'.htmlspecialchars('&'.$gVar.'=').'<br/>'.
                                                 '('.count($gVal).')'.
                                                 '</td>
-                                <td class="bgColor4" nowrap="nowrap">'.nl2br(htmlspecialchars(implode(chr(10),$gVal))).'</td>
+                                <td class="bgColor4" nowrap="nowrap">'.nl2br(htmlspecialchars(implode(chr(10), $gVal))).'</td>
                             </tr>
                         ';
-                        $calcRes*= count($gVal);
+                        $calcRes *= count($gVal);
                         $calcAccu[] = count($gVal);
                     }
                     $paramExpanded = '<table class="lrPadding c-list param-expanded">'.$paramExpanded.'</table>';
-                    $paramExpanded.= 'Comb: '.implode('*',$calcAccu).'='.$calcRes;
+                    $paramExpanded .= 'Comb: '.implode('*', $calcAccu).'='.$calcRes;
 
                         // Options
                     $optionValues = '';
-                    if ($confArray['subCfg']['userGroups'])    {
-                        $optionValues.='User Groups: '.$confArray['subCfg']['userGroups'].'<br/>';
+                    if ($confArray['subCfg']['userGroups']) {
+                        $optionValues .= 'User Groups: '.$confArray['subCfg']['userGroups'].'<br/>';
                     }
-                    if ($confArray['subCfg']['baseUrl'])    {
-                        $optionValues.='Base Url: '.$confArray['subCfg']['baseUrl'].'<br/>';
+                    if ($confArray['subCfg']['baseUrl']) {
+                        $optionValues .= 'Base Url: '.$confArray['subCfg']['baseUrl'].'<br/>';
                     }
-                    if ($confArray['subCfg']['procInstrFilter'])    {
-                        $optionValues.='ProcInstr: '.$confArray['subCfg']['procInstrFilter'].'<br/>';
+                    if ($confArray['subCfg']['procInstrFilter']) {
+                        $optionValues .= 'ProcInstr: '.$confArray['subCfg']['procInstrFilter'].'<br/>';
                     }
 
                         // Compile row:
                     $content .= '
-                        <tr class="bgColor' . ($c%2 ? '-20':'-10') . '">
-                            ' . $titleClm . '
-                            <td>' . htmlspecialchars($confKey) . '</td>
-                            <td>' . nl2br(htmlspecialchars(rawurldecode(trim(str_replace('&', chr(10) . '&', \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $confArray['paramParsed'])))))) . '</td>
+                        <tr class="bgColor' . ($c % 2 ? '-20' : '-10').'">
+                            ' . $titleClm.'
+                            <td>' . htmlspecialchars($confKey).'</td>
+                            <td>' . nl2br(htmlspecialchars(rawurldecode(trim(str_replace('&', chr(10).'&', \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $confArray['paramParsed'])))))).'</td>
                             <td>'.$paramExpanded.'</td>
-                            <td nowrap="nowrap">' . $urlList . '</td>
-                            <td nowrap="nowrap">' . $optionValues . '</td>
-                            <td nowrap="nowrap">' . \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($confArray['subCfg']['procInstrParams.']) . '</td>
+                            <td nowrap="nowrap">' . $urlList.'</td>
+                            <td nowrap="nowrap">' . $optionValues.'</td>
+                            <td nowrap="nowrap">' . \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($confArray['subCfg']['procInstrParams.']).'</td>
                         </tr>';
                 } else {
 
-                    $content .= '<tr class="bgColor'.($c%2 ? '-20':'-10') . '">
+                    $content .= '<tr class="bgColor'.($c % 2 ? '-20' : '-10').'">
                             '.$titleClm.'
                             <td>'.htmlspecialchars($confKey).'</td>
                             <td colspan="5"><em>No entries</em> (Page is excluded in this configuration)</td>
@@ -1847,7 +1847,7 @@ 
             $message = !empty($skipMessage) ? ' ('.$skipMessage.')' : '';
 
                 // Compile row:
-            $content.= '
+            $content .= '
                 <tr class="bgColor-20" style="border-bottom: 1px solid black;">
                     <td>'.$pageTitleAndIcon.'</td>
                     <td colspan="6"><em>No entries</em>'.$message.'</td>
@@ -1925,7 +1925,7 @@ 
             $releaseStatus = $this->CLI_releaseProcesses($this->CLI_buildProcessId());
 
             $this->CLI_debug("Unprocessed Items remaining:".$this->getUnprocessedItemsCount()." (".$this->CLI_buildProcessId().")");
-            $result |= ( $this->getUnprocessedItemsCount() > 0 ? self::CLI_STATUS_REMAIN : self::CLI_STATUS_NOTHING_PROCCESSED );
+            $result |= ($this->getUnprocessedItemsCount() > 0 ? self::CLI_STATUS_REMAIN : self::CLI_STATUS_NOTHING_PROCCESSED);
         } else {
             $result |= self::CLI_STATUS_ABORTED;
         }
@@ -1938,7 +1938,7 @@ 
      *
      * @return    void
      */
-    function CLI_main_im()    {
+    function CLI_main_im() {
         $this->setAccessMode('cli_im');
 
         $cliObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_cli_im');
@@ -1948,7 +1948,7 @@ 
         $this->backendUser->setWorkspace(0);
 
             // Print help
-        if (!isset($cliObj->cli_args['_DEFAULT'][1]))    {
+        if (!isset($cliObj->cli_args['_DEFAULT'][1])) {
             $cliObj->cli_validateArgs();
             $cliObj->cli_help();
             exit;
@@ -1956,8 +1956,8 @@ 
 
         $cliObj->cli_validateArgs();
 
-        if ($cliObj->cli_argValue('-o')==='exec')    {
-            $this->registerQueueEntriesInternallyOnly=TRUE;
+        if ($cliObj->cli_argValue('-o') === 'exec') {
+            $this->registerQueueEntriesInternallyOnly = TRUE;
         }
 
         if (isset($cliObj->cli_args['_DEFAULT'][2])) {
@@ -1970,16 +1970,16 @@ 
 
         $configurationKeys  = $this->getConfigurationKeys($cliObj);
 
-        if(!is_array($configurationKeys)){
+        if (!is_array($configurationKeys)) {
             $configurations = $this->getUrlsForPageId($pageId);
-            if(is_array($configurations)){
+            if (is_array($configurations)) {
                 $configurationKeys = array_keys($configurations);
-            }else{
+            } else {
                 $configurationKeys = array();
             }
         }
 
-        if($cliObj->cli_argValue('-o')==='queue' || $cliObj->cli_argValue('-o')==='exec'){
+        if ($cliObj->cli_argValue('-o') === 'queue' || $cliObj->cli_argValue('-o') === 'exec') {
 
             $reason = new tx_crawler_domain_reason();
             $reason->setReason(tx_crawler_domain_reason::REASON_GUI_SUBMIT);
@@ -1987,7 +1987,7 @@ 
             tx_crawler_domain_events_dispatcher::getInstance()->post(
                 'invokeQueueChange',
                 $this->setID,
-                array(    'reason' => $reason )
+                array('reason' => $reason)
             );
         }
 
@@ -1998,42 +1998,42 @@ 
         $this->setID = \TYPO3\CMS\Core\Utility\GeneralUtility::md5int(microtime());
         $this->getPageTreeAndUrls(
             $pageId,
-            \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($cliObj->cli_argValue('-d'),0,99),
+            \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($cliObj->cli_argValue('-d'), 0, 99),
             $this->getCurrentTime(),
-            \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($cliObj->cli_isArg('-n') ? $cliObj->cli_argValue('-n') : 30,1,1000),
-            $cliObj->cli_argValue('-o')==='queue' || $cliObj->cli_argValue('-o')==='exec',
-            $cliObj->cli_argValue('-o')==='url',
-            \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',',$cliObj->cli_argValue('-proc'),1),
+            \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($cliObj->cli_isArg('-n') ? $cliObj->cli_argValue('-n') : 30, 1, 1000),
+            $cliObj->cli_argValue('-o') === 'queue' || $cliObj->cli_argValue('-o') === 'exec',
+            $cliObj->cli_argValue('-o') === 'url',
+            \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $cliObj->cli_argValue('-proc'), 1),
             $configurationKeys
         );
 
-        if ($cliObj->cli_argValue('-o')==='url') {
-            $cliObj->cli_echo(implode(chr(10),$this->downloadUrls).chr(10),1);
-        } elseif ($cliObj->cli_argValue('-o')==='exec')    {
+        if ($cliObj->cli_argValue('-o') === 'url') {
+            $cliObj->cli_echo(implode(chr(10), $this->downloadUrls).chr(10), 1);
+        } elseif ($cliObj->cli_argValue('-o') === 'exec') {
             $cliObj->cli_echo("Executing ".count($this->urlList)." requests right away:\n\n");
-            $cliObj->cli_echo(implode(chr(10),$this->urlList).chr(10));
+            $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10));
             $cliObj->cli_echo("\nProcessing:\n");
 
-            foreach($this->queueEntries as $queueRec)    {
+            foreach ($this->queueEntries as $queueRec) {
                 $p = unserialize($queueRec['parameters']);
-                $cliObj->cli_echo($p['url'].' ('.implode(',',$p['procInstructions']).') => ');
+                $cliObj->cli_echo($p['url'].' ('.implode(',', $p['procInstructions']).') => ');
 
                 $result = $this->readUrlFromArray($queueRec);
 
                 $requestResult = unserialize($result['content']);
-                if (is_array($requestResult))    {
-                    $resLog = is_array($requestResult['log']) ?  chr(10).chr(9).chr(9).implode(chr(10).chr(9).chr(9),$requestResult['log']) : '';
+                if (is_array($requestResult)) {
+                    $resLog = is_array($requestResult['log']) ? chr(10).chr(9).chr(9).implode(chr(10).chr(9).chr(9), $requestResult['log']) : '';
                     $cliObj->cli_echo('OK: '.$resLog.chr(10));
                 } else {
-                    $cliObj->cli_echo('Error checking Crawler Result: '.substr(preg_replace('/\s+/',' ',strip_tags($result['content'])),0,30000).'...'.chr(10));
+                    $cliObj->cli_echo('Error checking Crawler Result: '.substr(preg_replace('/\s+/', ' ', strip_tags($result['content'])), 0, 30000).'...'.chr(10));
                 }
             }
-        } elseif ($cliObj->cli_argValue('-o')==='queue')    {
+        } elseif ($cliObj->cli_argValue('-o') === 'queue') {
             $cliObj->cli_echo("Putting ".count($this->urlList)." entries in queue:\n\n");
-            $cliObj->cli_echo(implode(chr(10),$this->urlList).chr(10));
+            $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10));
         } else {
-            $cliObj->cli_echo(count($this->urlList)." entries found for processing. (Use -o to decide action):\n\n",1);
-            $cliObj->cli_echo(implode(chr(10),$this->urlList).chr(10),1);
+            $cliObj->cli_echo(count($this->urlList)." entries found for processing. (Use -o to decide action):\n\n", 1);
+            $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10), 1);
         }
     }
 
@@ -2058,12 +2058,12 @@ 
         }
 
         $cliObj->cli_validateArgs();
-        $pageId = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($cliObj->cli_args['_DEFAULT'][1],0);
+        $pageId = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($cliObj->cli_args['_DEFAULT'][1], 0);
         $fullFlush = ($pageId == 0);
 
         $mode = $cliObj->cli_argValue('-o');
 
-        switch($mode) {
+        switch ($mode) {
             case 'all':
                 $result = $this->getLogEntriesForPageId($pageId, '', true, $fullFlush);
                 break;
@@ -2086,7 +2086,7 @@ 
      * @param  tx_crawler_cli_im $cliObj    Command line object
      * @return mixed                        Array of keys or null if no keys found
      */
-    protected function getConfigurationKeys(tx_crawler_cli_im &$cliObj) {
+    protected function getConfigurationKeys(tx_crawler_cli_im & $cliObj) {
         $parameter = trim($cliObj->cli_argValue('-conf'));
         return ($parameter != '' ? \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $parameter) : array());
     }
@@ -2111,7 +2111,7 @@ 
             $purgeDate = $this->getCurrentTime() - 24 * 60 * 60 * intval($this->extensionSettings['purgeQueueDays']);
             $del = $this->db->exec_DELETEquery(
                 'tx_crawler_queue',
-                'exec_time!=0 AND exec_time<' . $purgeDate
+                'exec_time!=0 AND exec_time<'.$purgeDate
             );
         }
 
@@ -2128,10 +2128,10 @@ 
         intval($countInARun)
         );
 
-        if (count($rows)>0) {
+        if (count($rows) > 0) {
             $quidList = array();
 
-            foreach($rows as $r) {
+            foreach ($rows as $r) {
                 $quidList[] = $r['qid'];
             }
 
@@ -2142,7 +2142,7 @@ 
                 //TODO make sure we're not taking assigned queue-entires
             $this->db->exec_UPDATEquery(
                 'tx_crawler_queue',
-                'qid IN ('.implode(',',$quidList).')',
+                'qid IN ('.implode(',', $quidList).')',
                 array(
                     'process_scheduled' => intval($this->getCurrentTime()),
                     'process_id' => $processId
@@ -2153,32 +2153,32 @@ 
             $numberOfAffectedRows = $this->db->sql_affected_rows();
             $this->db->exec_UPDATEquery(
                 'tx_crawler_process',
-                "process_id = '".$processId."'" ,
+                "process_id = '".$processId."'",
                 array(
                     'assigned_items_count' => intval($numberOfAffectedRows)
                 )
             );
 
-            if($numberOfAffectedRows == count($quidList)) {
+            if ($numberOfAffectedRows == count($quidList)) {
                 $this->db->sql_query('COMMIT');
-            } else  {
+            } else {
                 $this->db->sql_query('ROLLBACK');
                 $this->CLI_debug("Nothing processed due to multi-process collision (".$this->CLI_buildProcessId().")");
-                return ( $result | self::CLI_STATUS_ABORTED );
+                return ($result | self::CLI_STATUS_ABORTED);
             }
 
 
 
-            foreach($rows as $r)    {
+            foreach ($rows as $r) {
                 $result |= $this->readUrl($r['qid']);
 
                 $counter++;
-                usleep(intval($sleepTime));    // Just to relax the system
+                usleep(intval($sleepTime)); // Just to relax the system
 
                     // if during the start and the current read url the cli has been disable we need to return from the function
                     // mark the process NOT as ended.
                 if ($this->getDisabled()) {
-                    return ( $result | self::CLI_STATUS_ABORTED );
+                    return ($result | self::CLI_STATUS_ABORTED);
                 }
 
                 if (!$this->CLI_checkIfProcessIsActive($this->CLI_buildProcessId())) {
@@ -2186,7 +2186,7 @@ 
 
                         //TODO might need an additional returncode
                     $result |= self::CLI_STATUS_ABORTED;
-                    break;        //possible timeout
+                    break; //possible timeout
                 }
             }
 
@@ -2199,7 +2199,7 @@ 
             $this->CLI_debug("Nothing within queue which needs to be processed (".$this->CLI_buildProcessId().")");
         }
 
-        if($counter > 0) {
+        if ($counter > 0) {
             $result |= self::CLI_STATUS_PROCESSED;
         }
 
@@ -2211,12 +2211,12 @@ 
      *
      * @return    void
      */
-    function CLI_runHooks()    {
+    function CLI_runHooks() {
         global $TYPO3_CONF_VARS;
-        if (is_array($TYPO3_CONF_VARS['EXTCONF']['crawler']['cli_hooks']))    {
-            foreach($TYPO3_CONF_VARS['EXTCONF']['crawler']['cli_hooks'] as $objRef)    {
+        if (is_array($TYPO3_CONF_VARS['EXTCONF']['crawler']['cli_hooks'])) {
+            foreach ($TYPO3_CONF_VARS['EXTCONF']['crawler']['cli_hooks'] as $objRef) {
                 $hookObj = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($objRef);
-                if (is_object($hookObj))    {
+                if (is_object($hookObj)) {
                     $hookObj->crawler_init($this);
                 }
             }
@@ -2253,7 +2253,7 @@ 
 
             $currentTime = $this->getCurrentTime();
 
-            while($row = $this->db->sql_fetch_assoc($res))    {
+            while ($row = $this->db->sql_fetch_assoc($res)) {
                 if ($row['ttl'] < $currentTime) {
                     $orphanProcesses[] = $row['process_id'];
                 } else {
@@ -2263,7 +2263,7 @@ 
 
                 // if there are less than allowed active processes then add a new one
             if ($processCount < intval($this->extensionSettings['processLimit'])) {
-                $this->CLI_debug("add ".$this->CLI_buildProcessId()." (".($processCount+1)."/".intval($this->extensionSettings['processLimit']).")");
+                $this->CLI_debug("add ".$this->CLI_buildProcessId()." (".($processCount + 1)."/".intval($this->extensionSettings['processLimit']).")");
 
                     // create new process record
                 $this->db->exec_INSERTquery(
@@ -2296,17 +2296,17 @@ 
      * @param  boolean  $withinLock   show whether the DB-actions are included within an existing lock
      * @return boolean
      */
-    function CLI_releaseProcesses($releaseIds, $withinLock=false) {
+    function CLI_releaseProcesses($releaseIds, $withinLock = false) {
 
         if (!is_array($releaseIds)) {
             $releaseIds = array($releaseIds);
         }
 
         if (!count($releaseIds) > 0) {
-            return false;   //nothing to release
+            return false; //nothing to release
         }
 
-        if(!$withinLock) $this->db->sql_query('BEGIN');
+        if (!$withinLock) $this->db->sql_query('BEGIN');
 
             // some kind of 2nd chance algo - this way you need at least 2 processes to have a real cleanup
             // this ensures that a single process can't mess up the entire process table
@@ -2336,21 +2336,21 @@ 
                 // mark all requested processes as non-active
         $this->db->exec_UPDATEquery(
             'tx_crawler_process',
-            'process_id IN (\''.implode('\',\'',$releaseIds).'\') AND deleted=0',
+            'process_id IN (\''.implode('\',\'', $releaseIds).'\') AND deleted=0',
             array(
                 'active'=>'0'
             )
         );
         $this->db->exec_UPDATEquery(
             'tx_crawler_queue',
-            'exec_time=0 AND process_id IN ("'.implode('","',$releaseIds).'")',
+            'exec_time=0 AND process_id IN ("'.implode('","', $releaseIds).'")',
             array(
                 'process_scheduled'=>0,
                 'process_id'=>''
             )
         );
 
-        if(!$withinLock) $this->db->sql_query('COMMIT');
+        if (!$withinLock) $this->db->sql_query('COMMIT');
 
         return true;
     }
@@ -2378,13 +2378,13 @@ 
         $this->db->sql_query('BEGIN');
         $res = $this->db->exec_SELECTquery(
             'process_id,active,ttl',
-            'tx_crawler_process','process_id = \''.$pid.'\'  AND deleted=0',
+            'tx_crawler_process', 'process_id = \''.$pid.'\'  AND deleted=0',
             '',
             'ttl',
             '0,1'
         );
-        if($row = $this->db->sql_fetch_assoc($res))    {
-            $ret = intVal($row['active'])==1;
+        if ($row = $this->db->sql_fetch_assoc($res)) {
+            $ret = intVal($row['active']) == 1;
         }
         $this->db->sql_query('COMMIT');
 
@@ -2397,8 +2397,8 @@ 
      * @return string  the ID
      */
     function CLI_buildProcessId() {
-        if(!$this->processID) {
-            $this->processID= \TYPO3\CMS\Core\Utility\GeneralUtility::shortMD5($this->microtime(true));
+        if (!$this->processID) {
+            $this->processID = \TYPO3\CMS\Core\Utility\GeneralUtility::shortMD5($this->microtime(true));
         }
         return $this->processID;
     }
@@ -2408,7 +2408,7 @@ 
      *
      * @return mixed
      */
-    protected function microtime($get_as_float = false )
+    protected function microtime($get_as_float = false)
     {
         return microtime($get_as_float);
     }
@@ -2419,7 +2419,7 @@ 
      * @param  string $msg  the message
      */
     function CLI_debug($msg) {
-        if(intval($this->extensionSettings['processDebug'])) {
+        if (intval($this->extensionSettings['processDebug'])) {
             echo $msg."\n"; flush();
         }
     }
@@ -2438,7 +2438,7 @@ 
 
         $cmd  = escapeshellcmd($this->extensionSettings['phpPath']);
         $cmd .= ' ';
-        $cmd .= escapeshellarg(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler') . 'cli/bootstrap.php');
+        $cmd .= escapeshellarg(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler').'cli/bootstrap.php');
         $cmd .= ' ';
         $cmd .= escapeshellarg($this->getFrontendBasePath());
         $cmd .= ' ';
@@ -2448,10 +2448,10 @@ 
 
         $startTime = microtime(true);
         $content = $this->executeShellCommand($cmd);
-        $this->log($url . (microtime(true) - $startTime));
+        $this->log($url.(microtime(true) - $startTime));
 
         $result = array(
-            'request' => implode("\r\n", $requestHeaders) . "\r\n\r\n",
+            'request' => implode("\r\n", $requestHeaders)."\r\n\r\n",
             'headers' => '',
             'content' => $content
         );
@@ -2471,7 +2471,7 @@ 
         $scheduledAgeInSeconds = $this->extensionSettings['cleanUpScheduledAge'] * 86400;
 
         $now = time();
-        $condition = '(exec_time<>0 AND exec_time<' . ($now - $processedAgeInSeconds) . ') OR scheduled<=' . ($now - $scheduledAgeInSeconds);
+        $condition = '(exec_time<>0 AND exec_time<'.($now - $processedAgeInSeconds).') OR scheduled<='.($now - $scheduledAgeInSeconds);
         $this->flushQueue($condition);
     }
 
@@ -2490,7 +2490,7 @@ 
             $GLOBALS['TT']->start();
         }
 
-        $GLOBALS['TSFE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController',  $GLOBALS['TYPO3_CONF_VARS'], $id, $typeNum);
+        $GLOBALS['TSFE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Controller\\TypoScriptFrontendController', $GLOBALS['TYPO3_CONF_VARS'], $id, $typeNum);
         $GLOBALS['TSFE']->sys_page = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
         $GLOBALS['TSFE']->sys_page->init(TRUE);
         $GLOBALS['TSFE']->connectToDB();
@@ -2503,6 +2503,6 @@ 
     }
 }
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/class.tx_crawler_lib.php'])    {
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/class.tx_crawler_lib.php']) {
     include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/class.tx_crawler_lib.php']);
 }

Braces +48 added lines, -18 removed lines

@@ -642,7 +642,9 @@ 
             $sets = $pageTSconfig['tx_crawler.']['crawlerCfg.']['paramSets.'];
             if(is_array($sets)) {
                 foreach($sets as $key=>$value) {
-                    if(!is_array($value)) continue;
+                    if(!is_array($value)) {
+                        continue;
+                    }
                     $configurationsForBranch[] = substr($key,-1)=='.'?substr($key,0,-1):$key;
                 }
 
@@ -990,7 +992,9 @@ 
      */
     function addQueueEntry_callBack($setId,$params,$callBack,$page_id=0,$schedule=0) {
 
-        if (!is_array($params))    $params = array();
+        if (!is_array($params)) {
+            $params = array();
+        }
         $params['_CALLBACKOBJ'] = $callBack;
 
             // Compile value array:
@@ -1092,7 +1096,7 @@ 
                 $rows[] = $uid;
                 $urlAdded = true;
                 tx_crawler_domain_events_dispatcher::getInstance()->post('urlAddedToQueue',$this->setID,array('uid' => $uid, 'fieldArray' => $fieldArray));
-            }else{
+            } else{
                 tx_crawler_domain_events_dispatcher::getInstance()->post('duplicateUrlInQueue',$this->setID,array('rows' => $rows, 'fieldArray' => $fieldArray));
             }
         }
@@ -1122,7 +1126,7 @@ 
                 $timeBegin     = $currentTime - 100;
                 $timeEnd     = $currentTime + 100;
                 $where         = ' ((scheduled BETWEEN '.$timeBegin.' AND '.$timeEnd.' ) OR scheduled <= '. $currentTime.') ';
-            }else{
+            } else{
                 $where = 'scheduled <= ' . $currentTime;
             }
         } elseif ($tstamp > $currentTime) {
@@ -1314,18 +1318,24 @@ 
      */
     function requestUrl($originalUrl, $crawlerId, $timeout=2, $recursion=10) {
 
-        if (!$recursion) return false;
+        if (!$recursion) {
+            return false;
+        }
 
             // Parse URL, checking for scheme:
         $url = parse_url($originalUrl);
 
         if ($url === FALSE) {
-            if (TYPO3_DLOG) \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Could not parse_url() for string "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+            if (TYPO3_DLOG) {
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Could not parse_url() for string "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+            }
             return FALSE;
         }
 
         if (!in_array($url['scheme'], array('','http','https'))) {
-            if (TYPO3_DLOG) \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Scheme does not match for url "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+            if (TYPO3_DLOG) {
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Scheme does not match for url "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+            }
             return FALSE;
         }
 
@@ -1359,7 +1369,9 @@ 
         $fp = fsockopen($host, $port, $errno, $errstr, $timeout);
 
         if (!$fp) {
-            if (TYPO3_DLOG) \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Error while opening "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+            if (TYPO3_DLOG) {
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Error while opening "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+            }
             return FALSE;
         } else {
                 // Request message:
@@ -1387,7 +1399,9 @@ 
                 if (is_array($newRequestUrl)) {
                     $result = array_merge(array('parentRequest'=>$result), $newRequestUrl);
                 } else {
-                    if (TYPO3_DLOG) \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Error while opening "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+                    if (TYPO3_DLOG) {
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Error while opening "%s"', $url), 'crawler', 4, array('crawlerId' => $crawlerId));
+                    }
                     return FALSE;
                 }
             }
@@ -1510,20 +1524,32 @@ 
      * @return    string        URL from redirection
      */
     protected function getRequestUrlFrom302Header($headers,$user='',$pass='') {
-        if(!is_array($headers)) return false;
-        if(!(stristr($headers[0],'301 Moved') || stristr($headers[0],'302 Found') || stristr($headers[0],'302 Moved'))) return false;
+        if(!is_array($headers)) {
+            return false;
+        }
+        if(!(stristr($headers[0],'301 Moved') || stristr($headers[0],'302 Found') || stristr($headers[0],'302 Moved'))) {
+            return false;
+        }
 
         foreach($headers as $hl) {
             $tmp = explode(": ",$hl);
             $header[trim($tmp[0])] = trim($tmp[1]);
-            if(trim($tmp[0])=='Location') break;
+            if(trim($tmp[0])=='Location') {
+                break;
+            }
+        }
+        if(!array_key_exists('Location',$header)) {
+            return false;
         }
-        if(!array_key_exists('Location',$header)) return false;
 
         if($user!='') {
-            if(!($tmp = parse_url($header['Location']))) return false;
+            if(!($tmp = parse_url($header['Location']))) {
+                return false;
+            }
             $newUrl = $tmp['scheme'] . '://' . $user . ':' . $pass . '@' . $tmp['host'] . $tmp['path'];
-            if($tmp['query']!='') $newUrl .= '?' . $tmp['query'];
+            if($tmp['query']!='') {
+                $newUrl .= '?' . $tmp['query'];
+            }
         } else {
             $newUrl = $header['Location'];
         }
@@ -1974,7 +2000,7 @@ 
             $configurations = $this->getUrlsForPageId($pageId);
             if(is_array($configurations)){
                 $configurationKeys = array_keys($configurations);
-            }else{
+            } else{
                 $configurationKeys = array();
             }
         }
@@ -2306,7 +2332,9 @@ 
             return false;   //nothing to release
         }
 
-        if(!$withinLock) $this->db->sql_query('BEGIN');
+        if(!$withinLock) {
+            $this->db->sql_query('BEGIN');
+        }
 
             // some kind of 2nd chance algo - this way you need at least 2 processes to have a real cleanup
             // this ensures that a single process can't mess up the entire process table
@@ -2350,7 +2378,9 @@ 
             )
         );
 
-        if(!$withinLock) $this->db->sql_query('COMMIT');
+        if(!$withinLock) {
+            $this->db->sql_query('COMMIT');
+        }
 
         return true;
     }