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

@@ -28,126 +28,126 @@ 
  * Class tx_crawler_modfunc1
  */
 class tx_crawler_modfunc1 extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
-		// Internal, dynamic:
-	var $duplicateTrack = array();
-	var $submitCrawlUrls = FALSE;
-	var $downloadCrawlUrls = FALSE;
-
-	var $scheduledTime = 0;
-	var $reqMinute = 0;
-
-	/**
-	 * @var array holds the selection of configuration from the configuration selector box
-	 */
-	var $incomingConfigurationSelection = array();
-
-	/**
-	 * @var tx_crawler_lib
-	 */
-	var $crawlerObj;
-
-	var $CSVaccu = array();
-
-	/**
-	 * If true the user requested a CSV export of the queue
-	 *
-	 * @var boolean
-	 */
-	var $CSVExport = FALSE;
-
-	var $downloadUrls = array();
-
-	/**
-	 * Holds the configuration from ext_conf_template loaded by loadExtensionSettings()
-	 *
-	 * @var array
-	 */
-	protected $extensionSettings = 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/locallang_core.php:labels.depth_0'),
-				1 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_1'),
-				2 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_2'),
-				3 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_3'),
-				4 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_4'),
-				99 => $LANG->sL('LLL:EXT:lang/locallang_core.php: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->loadExtensionSettings();
-		if (empty($this->pObj->MOD_SETTINGS['processListMode'])) {
-			$this->pObj->MOD_SETTINGS['processListMode'] = 'simple';
-		}
+        // Internal, dynamic:
+    var $duplicateTrack = array();
+    var $submitCrawlUrls = FALSE;
+    var $downloadCrawlUrls = FALSE;
+
+    var $scheduledTime = 0;
+    var $reqMinute = 0;
+
+    /**
+     * @var array holds the selection of configuration from the configuration selector box
+     */
+    var $incomingConfigurationSelection = array();
+
+    /**
+     * @var tx_crawler_lib
+     */
+    var $crawlerObj;
+
+    var $CSVaccu = array();
+
+    /**
+     * If true the user requested a CSV export of the queue
+     *
+     * @var boolean
+     */
+    var $CSVExport = FALSE;
+
+    var $downloadUrls = array();
+
+    /**
+     * Holds the configuration from ext_conf_template loaded by loadExtensionSettings()
+     *
+     * @var array
+     */
+    protected $extensionSettings = 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/locallang_core.php:labels.depth_0'),
+                1 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_1'),
+                2 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_2'),
+                3 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_3'),
+                4 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_4'),
+                99 => $LANG->sL('LLL:EXT:lang/locallang_core.php: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->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 {
@@ -165,16 +165,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(
@@ -187,63 +187,63 @@ 
 		}
 		*/
 
-			// 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->spacer(5);
+        $theOutput.= $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1);
 
-		$theOutput= $this->pObj->doc->spacer(5);
-		$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;
+    }
 
 
 
@@ -256,176 +256,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);
-
-				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
-			);
+        } 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
+            );
 
 
-		}
+        }
 
-		$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);
-
-				// Exits:
-			exit;
-		}
-
-			// Return output:
-		return 	$output;
-	}
+                        $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').'" />';
+            }
+        }
 
-	/**
-	 * Draws the configuration selectors for compiling URLs:
-	 *
-	 * @return	string		HTML table
-	 */
-	function drawURLs_cfgSelectors()	{
+            // Download Urls to crawl:
+        if ($this->downloadCrawlUrls)	{
 
-			// depth
-		$cell[] = $this->selectorBox(
-			array(
-				0 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_0'),
-				1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_1'),
-				2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_2'),
-				3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_3'),
-				4 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_4'),
-				99 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php: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 );
+                // Creating output header:
+            $mimeType = 'application/octet-stream';
+            Header('Content-Type: '.$mimeType);
+            Header('Content-Disposition: attachment; filename=CrawlerUrls.txt');
 
-			// Configurations
-		$cell[] = $this->selectorBox(
-			empty($availableConfigurations)?array():array_combine($availableConfigurations, $availableConfigurations),
-			'configurationSelection',
-			$this->incomingConfigurationSelection,
-			1
-		);
+                // Printing the content of the CSV lines:
+            echo implode(chr(13).chr(10),$this->downloadUrls);
 
-			// 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
-		);
+                // Exits:
+            exit;
+        }
 
-		// TODO: check relevance
-		/*
+            // Return output:
+        return 	$output;
+    }
+
+    /**
+     * 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/locallang_core.php:labels.depth_0'),
+                1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_1'),
+                2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_2'),
+                3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_3'),
+                4 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_4'),
+                99 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php: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(
@@ -446,7 +446,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>
@@ -459,17 +459,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>
@@ -480,8 +480,8 @@ 
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.parameters').':</td>
 			</tr>';
 
-		return $content;
-	}
+        return $content;
+    }
 
 
 
@@ -494,109 +494,109 @@ 
 
 
 
-	/*******************************
+    /*******************************
 	 *
 	 * 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:
-					$HTML = \AOE\Crawler\Utility\IconUtility::getIconForRecord('pages', $this->pObj->pageinfo);
-					$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 .= '
+                '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:
+                    $HTML = \AOE\Crawler\Utility\IconUtility::getIconForRecord('pages', $this->pObj->pageinfo);
+                    $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" />
@@ -610,20 +610,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>
@@ -631,9 +631,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>
@@ -641,217 +641,217 @@ 
 						</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);
+
+            // 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		Page row or set-id
+     * @param	string		Title string
+     * @param	int			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;
+        }
 
-			// Printing the content of the CSV lines:
-		echo implode(chr(13).chr(10),$csvLines);
+            // 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));
+        }
 
-			// Exits:
-		exit;
-	}
+            // 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 = '';
+                }
 
-	/**
-	 * Create the rows for display of the page tree
-	 * For each page a number of rows are shown displaying GET variable configuration
-	 *
-	 * @param	array		Page row or set-id
-	 * @param	string		Title string
-	 * @param	int			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;
-		}
+                    // Result:
+                $resLog = $this->getResultLog($vv);
 
-			// 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));
-		}
+                $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';
+                }
 
-			// 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.= '
+                    // 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;
-	}
+        }
 
-	/**
-	 * 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 $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'];
+        }
 
-		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>').'
@@ -860,14 +860,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.
@@ -894,25 +894,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;
+    }
 
 
 
@@ -921,343 +921,343 @@ 
 
 
 
-	/*****************************
+    /*****************************
 	 *
 	 * 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());
-		}
-
-		$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();
-
-		$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(tx_crawler_api::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;
-	}
-
-	/**
-	 * 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'));
-		}
+    /**
+     * 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());
+        }
 
-		if ($this->isPhpForkAvailable() === false) {
-			$this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.noPhpForkAvailable'));
-		}
+        $offset 	= intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('offset'));
+        $perpage 	= 20;
 
-		$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');
+        $processRepository	= new tx_crawler_domain_process_repository();
+        $queueRepository	= new tx_crawler_domain_queue_repository();
 
-		if (is_array($userArray))
-			$isAvailable = true;
-
-		return $isAvailable;
-	}
+        $mode = $this->pObj->MOD_SETTINGS['processListMode'];
+        if ($mode == 'detail') {
+            $where = '';
+        } elseif($mode == 'simple') {
+            $where = 'active = 1';
+        }
 
-	/**
-	 * 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');
+        $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(tx_crawler_api::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();
+        }
 
-		if (is_array($userArray) && $userArray[0]['admin'] == 0)
-			$isAvailable = true;
+        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'));
+        }
 
-		return $isAvailable;
-	}
+        if ($this->isPhpForkAvailable() === false) {
+            $this->addErrorMessage($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.noPhpForkAvailable'));
+        }
 
-	/**
-	 * 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;
-		}
-	}
+        $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');
+
+        if (is_array($userArray))
+            $isAvailable = true;
+
+        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');
+
+        if (is_array($userArray) && $userArray[0]['admin'] == 0)
+            $isAvailable = true;
+
+        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;
+        }
+    }
 
 
 
 
-	/**
-	 * 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		Options key(value) => label pairs
-	 * @param	string		Selector box name
-	 * @param	string		Selector box value (array for multiple...)
-	 * @param	boolean		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[] = '
+    /**
+     * 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		Options key(value) => label pairs
+     * @param	string		Selector box name
+     * @param	string		Selector box value (array for multiple...)
+     * @param	boolean		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[] = '
 				<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>';
-
-		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);
-				}
-			}
-		}
+        }
 
-	}
+        $output = '<select name="'.htmlspecialchars($name.($multiple?'[]':'')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('',$options).'</select>';
+
+        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);
+                }
+            }
+        }
 
-	/**
-	 * 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']);
 }

template/pagination.php

Braces +4 added lines, -1 removed lines

@@ -1,4 +1,7 @@
-<?php if (!defined('TYPO3_MODE')) die ('Access denied.'); ?>
+<?php if (!defined('TYPO3_MODE')) {
+    die ('Access denied.');
+}
+?>
 
 Page:
 <?php for($currentPageOffset 	= 0; $currentPageOffset < $this->getTotalPagesCount(); $currentPageOffset++ ){  ?>

template/process/list.php

Indentation +5 added lines, -5 removed lines

@@ -5,11 +5,11 @@
 	<?php echo $this->getRefreshLink(); ?>
 	<?php echo $this->getEnableDisableLink(); ?>
 	<?php
-		// Check if ActiveProcess is reached
-		if (\TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getActiveProcessCount()) < \TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getMaxActiveProcessCount())) {
-			echo $this->getAddLink();
-		}
-	?>
+        // Check if ActiveProcess is reached
+        if (\TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getActiveProcessCount()) < \TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getMaxActiveProcessCount())) {
+            echo $this->getAddLink();
+        }
+    ?>
 	<?php echo $this->getModeLink(); ?>
 </div>
 

Braces +9 added lines, -3 removed lines

@@ -1,4 +1,7 @@ 
-<?php if (!defined('TYPO3_MODE')) die ('Access denied.'); ?>
+<?php if (!defined('TYPO3_MODE')) {
+    die ('Access denied.');
+}
+?>
 
 <br />
 <div id="controll-panel">
@@ -69,8 +72,11 @@ 
 					</div>
 				<?php elseif ($process->getState() == 'cancelled'): ?>
 					<?php echo $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.cancelled'); ?>
-				<?php else: ?>
-					<?php echo $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.success'); ?>
+				<?php else {
+    : ?>
+					<?php echo $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.success');
+}
+?>
 				<?php endif; ?>
 				</td>
 			</tr>

cli/crawler_cli.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('TYPO3_cliMode'))	die('You cannot run this script directly!');
+if (!defined('TYPO3_cliMode')) {
+    die('You cannot run this script directly!');
+}
 
 $crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
 

cli/crawler_im.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('TYPO3_cliMode'))	die('You cannot run this script directly!');
+if (!defined('TYPO3_cliMode')) {
+    die('You cannot run this script directly!');
+}
 
 $crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
 $crawlerObj->CLI_main_im($_SERVER["argv"]);

cli/class.tx_crawler_cli.php

Indentation +20 added lines, -20 removed lines

@@ -37,29 +37,29 @@
  */

 class tx_crawler_cli extends \TYPO3\CMS\Core\Controller\CommandLineController {

 

-	/**

-	 * Constructor

-	 *

-	 * @return	void

-	 */

-	function __construct() {

-		parent::__construct();

+    /**

+     * Constructor

+     *

+     * @return	void

+     */

+    function __construct() {

+        parent::__construct();

 

-		$this->cli_options[] = array('-h', 'Show the help', '');

-		$this->cli_options[] = array('--help', 'Same as -h', '');

-		$this->cli_options[] = array('--countInARun count', 'Amount of pages', 'How many pages should be crawled during that run.');

-		$this->cli_options[] = array('--sleepTime milliseconds', 'Millisecounds to relax system during crawls', 'Amount of millisecounds which the system should use to relax between crawls.');

-		$this->cli_options[] = array('--sleepAfterFinish seconds', 'Secounds to relax system after all crawls.', 'Amount of secounds which the system should use to relax after all crawls are done.');

+        $this->cli_options[] = array('-h', 'Show the help', '');

+        $this->cli_options[] = array('--help', 'Same as -h', '');

+        $this->cli_options[] = array('--countInARun count', 'Amount of pages', 'How many pages should be crawled during that run.');

+        $this->cli_options[] = array('--sleepTime milliseconds', 'Millisecounds to relax system during crawls', 'Amount of millisecounds which the system should use to relax between crawls.');

+        $this->cli_options[] = array('--sleepAfterFinish seconds', 'Secounds to relax system after all crawls.', 'Amount of secounds which the system should use to relax after all crawls are done.');

 

-		// Setting help texts:

-		$this->cli_help['name'] = 'crawler CLI interface -- Crawling the URLs from the queue';

-		$this->cli_help['synopsis'] = '###OPTIONS###';

-		$this->cli_help['description'] = "";

-		$this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler\nWill trigger the crawler which starts to process the queue entires\n";

-		$this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2010';

-	}

+        // Setting help texts:

+        $this->cli_help['name'] = 'crawler CLI interface -- Crawling the URLs from the queue';

+        $this->cli_help['synopsis'] = '###OPTIONS###';

+        $this->cli_help['description'] = "";

+        $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler\nWill trigger the crawler which starts to process the queue entires\n";

+        $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2010';

+    }

 }

 

 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']) {

-	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']);

+    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']);

 }

cli/class.tx_crawler_cli_im.php

Indentation +30 added lines, -30 removed lines

@@ -37,41 +37,41 @@
  */

 class tx_crawler_cli_im extends \TYPO3\CMS\Core\Controller\CommandLineController {

 

-	/**

-	 * Constructor

-	 *

-	 * @return	void

-	 */

-	function __construct() {

-		parent::__construct();

+    /**

+     * Constructor

+     *

+     * @return	void

+     */

+    function __construct() {

+        parent::__construct();

 

-		// Adding options to help archive:

-		/**

-		* We removed the "proc" option as it seemd not to be working any more. But as the complete handling of the crawler has changed regarding the configuration

-		* this is completely ok. Since configuration records were introduced to configure "what should be done" additionally to page ts the way to setup jobs

-		* has drifted from selecting filtering processing instructions to selecting/filtering configuration keys (you can configure the processing instructions there).

-		* This is also reflected in the backend modules and allows you a much clearer and powerful way to work with the crawler extension.

-		*/

-		// $this->cli_options[] = array('-proc listOfProcInstr', 'Comma list of processing instructions. These are the "actions" carried out when crawling and you must specify at least one. Depends on third-party extensions. Examples are "tx_cachemgm_recache" from "cachemgm" extension (will recache pages), "tx_staticpub_publish" from "staticpub" (publishing pages to static files) or "tx_indexedsearch_reindex" from "indexed_search" (indexes pages).');

-		// TODO: cleanup here!

-		$this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include.");

-		$this->cli_options[] = array('-o mode', 'Output mode: "url", "exec", "queue"', "Specifies output modes\nurl : Will list URLs which wget could use as input.\nqueue: Will put entries in queue table.\nexec: Will execute all entries right away!");

-		$this->cli_options[] = array('-n number', 'Number of items per minute.', 'Specifies how many items are put in the queue per minute. Only valid for output mode "queue"');

-		$this->cli_options[] = array('-conf configurationkeys','List of Configuration Keys','A commaseperated list of crawler configurations');

-		#		$this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n  0 = all output\n  1 = info and greater (default)\n  2 = warnings and greater\n  3 = errors");

+        // Adding options to help archive:

+        /**

+         * We removed the "proc" option as it seemd not to be working any more. But as the complete handling of the crawler has changed regarding the configuration

+         * this is completely ok. Since configuration records were introduced to configure "what should be done" additionally to page ts the way to setup jobs

+         * has drifted from selecting filtering processing instructions to selecting/filtering configuration keys (you can configure the processing instructions there).

+         * This is also reflected in the backend modules and allows you a much clearer and powerful way to work with the crawler extension.

+         */

+        // $this->cli_options[] = array('-proc listOfProcInstr', 'Comma list of processing instructions. These are the "actions" carried out when crawling and you must specify at least one. Depends on third-party extensions. Examples are "tx_cachemgm_recache" from "cachemgm" extension (will recache pages), "tx_staticpub_publish" from "staticpub" (publishing pages to static files) or "tx_indexedsearch_reindex" from "indexed_search" (indexes pages).');

+        // TODO: cleanup here!

+        $this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include.");

+        $this->cli_options[] = array('-o mode', 'Output mode: "url", "exec", "queue"', "Specifies output modes\nurl : Will list URLs which wget could use as input.\nqueue: Will put entries in queue table.\nexec: Will execute all entries right away!");

+        $this->cli_options[] = array('-n number', 'Number of items per minute.', 'Specifies how many items are put in the queue per minute. Only valid for output mode "queue"');

+        $this->cli_options[] = array('-conf configurationkeys','List of Configuration Keys','A commaseperated list of crawler configurations');

+        #		$this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n  0 = all output\n  1 = info and greater (default)\n  2 = warnings and greater\n  3 = errors");

 

-		// Setting help texts:

-		$this->cli_help['name'] = 'crawler CLI interface -- Submitting URLs to be crawled via CLI interface.';

-		$this->cli_help['synopsis'] = 'page_id ###OPTIONS###';

-		$this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It can put entries in the queue from command line options, return the list of URLs and even execute all entries right away without having to queue them up - this can be useful for immediate re-cache, re-indexing or static publishing from command line.";

-		$this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_im 7 -d=2 -conf=<configurationKey> -o=exec\nWill re-cache pages from page 7 and two levels down, executed immediately.\n";

-		$this->cli_help['examples'].= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n";

-		$this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';

-	}

+        // Setting help texts:

+        $this->cli_help['name'] = 'crawler CLI interface -- Submitting URLs to be crawled via CLI interface.';

+        $this->cli_help['synopsis'] = 'page_id ###OPTIONS###';

+        $this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It can put entries in the queue from command line options, return the list of URLs and even execute all entries right away without having to queue them up - this can be useful for immediate re-cache, re-indexing or static publishing from command line.";

+        $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_im 7 -d=2 -conf=<configurationKey> -o=exec\nWill re-cache pages from page 7 and two levels down, executed immediately.\n";

+        $this->cli_help['examples'].= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n";

+        $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';

+    }

 }

 

 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']) {

-	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']);

+    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']);

 }

 

 ?>

cli/crawler_flush.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('TYPO3_cliMode'))	die('You cannot run this script directly!');
+if (!defined('TYPO3_cliMode')) {
+    die('You cannot run this script directly!');
+}
 
 $crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
 $crawlerObj->CLI_main_flush($_SERVER["argv"]);

cli/bootstrap.php

Indentation +38 added lines, -38 removed lines

@@ -5,20 +5,20 @@ 
  * Retrieve path (taken from cli_dispatch.phpsh)
  */
 
-	// Get path to this script
+    // Get path to this script
 $tempPathThisScript = isset($_SERVER['argv'][0]) ? $_SERVER['argv'][0] : (isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_']);
 
-	// Resolve path
+    // Resolve path
 if (!isAbsPath($tempPathThisScript)) {
-	$workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd();
-	if ($workingDirectory) {
-		$tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript);
-		if (!@is_file($tempPathThisScript)) {
-			die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL);
-		}
-	} else {
-		die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL);
-	}
+    $workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd();
+    if ($workingDirectory) {
+        $tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript);
+        if (!@is_file($tempPathThisScript)) {
+            die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL);
+        }
+    } else {
+        die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL);
+    }
 }
 
 $typo3Root = preg_replace('#typo3conf/ext/crawler/cli/bootstrap.php$#', '', $tempPathThisScript);
@@ -30,33 +30,33 @@ 
  */
 $additionalHeaders = unserialize(base64_decode($_SERVER['argv'][3]));
 if (is_array($additionalHeaders)) {
-	foreach ($additionalHeaders as $additionalHeader) {
-		if (strpos($additionalHeader, ':') !== FALSE) {
-			list($key, $value) = explode(':', $additionalHeader, 2);
-			$key = str_replace('-', '_', strtoupper(trim($key)));
-			if ($key != 'HOST') {
-				$_SERVER['HTTP_' . $key] = $value;
-			}
-		}
-	}
+    foreach ($additionalHeaders as $additionalHeader) {
+        if (strpos($additionalHeader, ':') !== FALSE) {
+            list($key, $value) = explode(':', $additionalHeader, 2);
+            $key = str_replace('-', '_', strtoupper(trim($key)));
+            if ($key != 'HOST') {
+                $_SERVER['HTTP_' . $key] = $value;
+            }
+        }
+    }
 }
 
 
-	// put parsed query parts into $_GET array
+    // put parsed query parts into $_GET array
 $urlParts = parse_url($_SERVER['argv'][2]);
-	// Populating $_GET
+    // Populating $_GET
 parse_str($urlParts['query'], $_GET);
-	// Populating $_REQUEST
+    // Populating $_REQUEST
 parse_str($urlParts['query'], $_REQUEST);
-	// Populating $_POST
+    // Populating $_POST
 $_POST = array();
-	// Populating $_COOKIE
+    // Populating $_COOKIE
 $_COOKIE = array();
 
-	// Get the TYPO3_SITE_PATH of the website frontend:
+    // Get the TYPO3_SITE_PATH of the website frontend:
 $typo3SitePath = $_SERVER['argv'][1];
 
-	// faking the environment
+    // faking the environment
 $_SERVER['DOCUMENT_ROOT'] = preg_replace('#' . preg_quote($typo3SitePath, '#') . '$#', '', $typo3Root);
 $_SERVER['HTTP_USER_AGENT'] = 'CLI Mode';
 $_SERVER['HTTP_HOST'] = $_SERVER['SERVER_NAME'] = $urlParts['host'];
@@ -66,15 +66,15 @@ 
 $_SERVER['REQUEST_URI'] = $urlParts['path'] . (isset($urlParts['query']) ? '?' . $urlParts['query'] : '');
 $_SERVER['REQUEST_METHOD'] = 'GET';
 
-	// Define a port if used in the URL:
+    // Define a port if used in the URL:
 if (isset($urlParts['port'])) {
-	$_SERVER['HTTP_HOST'] .= ':' . $urlParts['port'];
-	$_SERVER['SERVER_PORT'] = $urlParts['port'];
+    $_SERVER['HTTP_HOST'] .= ':' . $urlParts['port'];
+    $_SERVER['SERVER_PORT'] = $urlParts['port'];
 }
 
-	// Define HTTPS disposal:
+    // Define HTTPS disposal:
 if ($urlParts['scheme'] === 'https') {
-	$_SERVER['HTTPS'] = 'on';
+    $_SERVER['HTTPS'] = 'on';
 }
 
 chdir($typo3Root);
@@ -88,11 +88,11 @@ 
  * @return boolean
  */
 function isAbsPath($path) {
-		// on Windows also a path starting with a drive letter is absolute: X:/
-	if (stristr(PHP_OS, 'win') && substr($path, 1, 2) === ':/') {
-		return TRUE;
-	}
+        // on Windows also a path starting with a drive letter is absolute: X:/
+    if (stristr(PHP_OS, 'win') && substr($path, 1, 2) === ':/') {
+        return TRUE;
+    }
 
-		// path starting with a / is always absolute, on every system
-	return (substr($path, 0, 1) === '/');
+        // path starting with a / is always absolute, on every system
+    return (substr($path, 0, 1) === '/');
 }