AOEpeople / crawler

domain/queue/class.tx_crawler_domain_queue_repository.php

Doc Comments +1 added lines

@@ -132,6 +132,7 @@
 	/**
 	 * Internal method to count items by a given where clause
 	 *
+	 * @param string $where
 	 */
 	protected function countItemsByWhereClause($where) {
 		$db 	= $this->getDB();

Indentation +241 added lines, -241 removed lines

@@ -25,270 +25,270 @@
 class tx_crawler_domain_queue_repository extends tx_crawler_domain_lib_abstract_repository {
 
 
-	protected $objectClassname = 'tx_crawler_domain_queue_entry';
+    protected $objectClassname = 'tx_crawler_domain_queue_entry';
 
-	protected $tableName = 'tx_crawler_queue';
+    protected $tableName = 'tx_crawler_queue';
 
-	/**
-	 * This mehtod is used to find the youngest entry for a given process.
-	 *
-	 * @author Timo Schmidt <timo.schmidt@aoemedia.de>
-	 * @param tx_crawler_domain_process $process
-	 * @return tx_crawler_domain_queue_entry $entry
-	 */
-	public function findYoungestEntryForProcess(tx_crawler_domain_process $process) {
-		return $this->getFirstOrLastObjectByProcess($process,'exec_time ASC');
-	}
+    /**
+     * This mehtod is used to find the youngest entry for a given process.
+     *
+     * @author Timo Schmidt <timo.schmidt@aoemedia.de>
+     * @param tx_crawler_domain_process $process
+     * @return tx_crawler_domain_queue_entry $entry
+     */
+    public function findYoungestEntryForProcess(tx_crawler_domain_process $process) {
+        return $this->getFirstOrLastObjectByProcess($process,'exec_time ASC');
+    }
 
-	/**
-	 * This method is used to find the oldest entry for a given process.
-	 *
-	 * @param tx_crawler_domain_process $process
-	 * @return tx_crawler_domain_queue_entry
-	 */
-	public function findOldestEntryForProcess(tx_crawler_domain_process $process) {
-		return $this->getFirstOrLastObjectByProcess($process,'exec_time DESC');
-	}
+    /**
+     * This method is used to find the oldest entry for a given process.
+     *
+     * @param tx_crawler_domain_process $process
+     * @return tx_crawler_domain_queue_entry
+     */
+    public function findOldestEntryForProcess(tx_crawler_domain_process $process) {
+        return $this->getFirstOrLastObjectByProcess($process,'exec_time DESC');
+    }
 
 
-	/**
-	 * This internal helper method is used to create an instance of an entry object
-	 *
-	 * @param tx_crawler_domain_process $process
-	 * @param string $orderby first matching item will be returned as object
-	 * @return tx_crawler_domain_queue_entry
-	 */
-	protected function getFirstOrLastObjectByProcess($process, $orderby) {
-		$db = $this->getDB();
-		$where = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(),$this->tableName).
-				 ' AND exec_time > 0 ';
-		$limit = 1;
-		$groupby = '';
+    /**
+     * This internal helper method is used to create an instance of an entry object
+     *
+     * @param tx_crawler_domain_process $process
+     * @param string $orderby first matching item will be returned as object
+     * @return tx_crawler_domain_queue_entry
+     */
+    protected function getFirstOrLastObjectByProcess($process, $orderby) {
+        $db = $this->getDB();
+        $where = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(),$this->tableName).
+                    ' AND exec_time > 0 ';
+        $limit = 1;
+        $groupby = '';
 
-		$res 	= $db->exec_SELECTgetRows('*','tx_crawler_queue',$where,$groupby,$orderby,$limit);
-		if($res) {
-			$first 	= $res[0];
-		}else{
-			$first = array();
-		}
-		$resultObject = new tx_crawler_domain_queue_entry($first);
-		return $resultObject;
-	}
+        $res 	= $db->exec_SELECTgetRows('*','tx_crawler_queue',$where,$groupby,$orderby,$limit);
+        if($res) {
+            $first 	= $res[0];
+        }else{
+            $first = array();
+        }
+        $resultObject = new tx_crawler_domain_queue_entry($first);
+        return $resultObject;
+    }
 
-	/**
-	 * Counts all executed items of a process.
-	 *
-	 * @param tx_crawler_domain_process $process
-	 * @return int
-	 */
-	public function countExtecutedItemsByProcess($process) {
+    /**
+     * Counts all executed items of a process.
+     *
+     * @param tx_crawler_domain_process $process
+     * @return int
+     */
+    public function countExtecutedItemsByProcess($process) {
 
-		return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),$this->tableName));
-	}
+        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),$this->tableName));
+    }
 
-	/**
-	 * Counts items of a process which yet have not been processed/executed
-	 *
-	 * @param tx_crawler_domain_process $process
-	 * @return int
-	 */
-	public function countNonExecutedItemsByProcess($process) {
-		return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),$this->tableName));
-	}
+    /**
+     * Counts items of a process which yet have not been processed/executed
+     *
+     * @param tx_crawler_domain_process $process
+     * @return int
+     */
+    public function countNonExecutedItemsByProcess($process) {
+        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),$this->tableName));
+    }
 
-	/**
-	 * This method can be used to count all queue entrys which are
-	 * scheduled for now or a earler date.
-	 *
-	 * @param void
-	 * @return int
-	 */
-	public function countAllPendingItems() {
-		return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < '.time());
-	}
+    /**
+     * This method can be used to count all queue entrys which are
+     * scheduled for now or a earler date.
+     *
+     * @param void
+     * @return int
+     */
+    public function countAllPendingItems() {
+        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < '.time());
+    }
 
-	/**
-	 * This method can be used to count all queue entrys which are
-	 * scheduled for now or a earler date and are assigned to a process.
-	 *
-	 * @param void
-	 * @return int
-	 */
-	public function countAllAssignedPendingItems() {
-		return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id != ''");
-	}
+    /**
+     * This method can be used to count all queue entrys which are
+     * scheduled for now or a earler date and are assigned to a process.
+     *
+     * @param void
+     * @return int
+     */
+    public function countAllAssignedPendingItems() {
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id != ''");
+    }
 
-	/**
-	 * This method can be used to count all queue entrys which are
-	 * scheduled for now or a earler date and are not assigned to a process.
-	 *
-	 * @param void
-	 * @return int
-	 */
-	public function countAllUnassignedPendingItems() {
-		return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id = ''");
-	}
+    /**
+     * This method can be used to count all queue entrys which are
+     * scheduled for now or a earler date and are not assigned to a process.
+     *
+     * @param void
+     * @return int
+     */
+    public function countAllUnassignedPendingItems() {
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id = ''");
+    }
 
-	/**
-	 * Internal method to count items by a given where clause
-	 *
-	 */
-	protected function countItemsByWhereClause($where) {
-		$db 	= $this->getDB();
-		$rs 	= $db->exec_SELECTquery('count(*) as anz',$this->tableName,$where);
-		$res 	= $db->sql_fetch_assoc($rs);
+    /**
+     * Internal method to count items by a given where clause
+     *
+     */
+    protected function countItemsByWhereClause($where) {
+        $db 	= $this->getDB();
+        $rs 	= $db->exec_SELECTquery('count(*) as anz',$this->tableName,$where);
+        $res 	= $db->sql_fetch_assoc($rs);
 
-		return $res['anz'];
-	}
+        return $res['anz'];
+    }
 
-	/**
-	 * Count pending queue entries grouped by configuration key
-	 *
-	 * @param void
-	 * @return array
-	 * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
-	 * @since 2099-09-03
-	 */
-	public function countPendingItemsGroupedByConfigurationKey() {
-		$db = $this->getDB();
-		$res = $db->exec_SELECTquery(
-			"configuration, count(*) as unprocessed, sum(process_id != '') as assignedButUnprocessed",
-			$this->tableName,
-			'exec_time = 0 AND scheduled < '.time(),
-			'configuration'
-		);
-		$rows = array();
-		while ($row = $db->sql_fetch_assoc($res)) {
-			$rows[] = $row;
-		}
-		return $rows;
-	}
+    /**
+     * Count pending queue entries grouped by configuration key
+     *
+     * @param void
+     * @return array
+     * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
+     * @since 2099-09-03
+     */
+    public function countPendingItemsGroupedByConfigurationKey() {
+        $db = $this->getDB();
+        $res = $db->exec_SELECTquery(
+            "configuration, count(*) as unprocessed, sum(process_id != '') as assignedButUnprocessed",
+            $this->tableName,
+            'exec_time = 0 AND scheduled < '.time(),
+            'configuration'
+        );
+        $rows = array();
+        while ($row = $db->sql_fetch_assoc($res)) {
+            $rows[] = $row;
+        }
+        return $rows;
+    }
 
-	/**
-	 * Get set id with unprocessed entries
-	 *
-	 * @param void
-	 * @return array array of set ids
-	 * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
-	 * @since 2009-09-03
-	 */
-	public function getSetIdWithUnprocessedEntries() {
-		$db = $this->getDB();
-		$res = $db->exec_SELECTquery(
-			'set_id',
-			$this->tableName,
-			'exec_time = 0 AND scheduled < '.time(),
-			'set_id'
-		);
-		$setIds = array();
-		while ($row = $db->sql_fetch_assoc($res)) {
-			$setIds[] = intval($row['set_id']);
-		}
-		return $setIds;
-	}
+    /**
+     * Get set id with unprocessed entries
+     *
+     * @param void
+     * @return array array of set ids
+     * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
+     * @since 2009-09-03
+     */
+    public function getSetIdWithUnprocessedEntries() {
+        $db = $this->getDB();
+        $res = $db->exec_SELECTquery(
+            'set_id',
+            $this->tableName,
+            'exec_time = 0 AND scheduled < '.time(),
+            'set_id'
+        );
+        $setIds = array();
+        while ($row = $db->sql_fetch_assoc($res)) {
+            $setIds[] = intval($row['set_id']);
+        }
+        return $setIds;
+    }
 
-	/**
-	 * Get total queue entries by configuration
-	 *
-	 * @param array set ids
-	 * @return array totals by configuration (keys)
-	 * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
-	 * @since 2009-09-03
-	 */
-	public function getTotalQueueEntriesByConfiguration(array $setIds) {
-		$totals = array();
-		if (count($setIds) > 0) {
-			$db = $this->getDB();
-			$res = $db->exec_SELECTquery(
-				'configuration, count(*) as c',
-				$this->tableName,
-				'set_id in ('. implode(',',$setIds).') AND scheduled < '.time(),
-				'configuration'
-			);
-			while ($row = $db->sql_fetch_assoc($res)) {
-				$totals[$row['configuration']] = $row['c'];
-			}
-		}
-		return $totals;
-	}
+    /**
+     * Get total queue entries by configuration
+     *
+     * @param array set ids
+     * @return array totals by configuration (keys)
+     * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
+     * @since 2009-09-03
+     */
+    public function getTotalQueueEntriesByConfiguration(array $setIds) {
+        $totals = array();
+        if (count($setIds) > 0) {
+            $db = $this->getDB();
+            $res = $db->exec_SELECTquery(
+                'configuration, count(*) as c',
+                $this->tableName,
+                'set_id in ('. implode(',',$setIds).') AND scheduled < '.time(),
+                'configuration'
+            );
+            while ($row = $db->sql_fetch_assoc($res)) {
+                $totals[$row['configuration']] = $row['c'];
+            }
+        }
+        return $totals;
+    }
 
-	/**
-	 * Get the timestamps of the last processed entries
-	 *
-	 * @param void
-	 * @return array
-	 * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
-	 * @since 2009-09-03
-	 */
-	public function getLastProcessedEntriesTimestamps($limit = 100) {
-		$db = $this->getDB();
-		$res = $db->exec_SELECTquery(
-			'exec_time',
-			$this->tableName,
-			'',
-			'',
-			'exec_time desc',
-			$limit
-		);
+    /**
+     * Get the timestamps of the last processed entries
+     *
+     * @param void
+     * @return array
+     * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
+     * @since 2009-09-03
+     */
+    public function getLastProcessedEntriesTimestamps($limit = 100) {
+        $db = $this->getDB();
+        $res = $db->exec_SELECTquery(
+            'exec_time',
+            $this->tableName,
+            '',
+            '',
+            'exec_time desc',
+            $limit
+        );
 
-		$rows = array();
-		while (($row = $db->sql_fetch_assoc($res)) !== false) {
-			$rows[] = $row['exec_time'];
-		}
-		return $rows;
-	}
+        $rows = array();
+        while (($row = $db->sql_fetch_assoc($res)) !== false) {
+            $rows[] = $row['exec_time'];
+        }
+        return $rows;
+    }
 
-	/**
-	 * Get the last processed entries
-	 *
-	 * @param string $selectFields
-	 * @param int $limit
-	 * @return array
-	 * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
-	 * @since 2010-11-16
-	 */
-	public function getLastProcessedEntries($selectFields='*', $limit='100') {
-		$db = $this->getDB();
-		$res = $db->exec_SELECTquery(
-			$selectFields,
-			$this->tableName,
-			'',
-			'',
-			'exec_time desc',
-			$limit
-		);
+    /**
+     * Get the last processed entries
+     *
+     * @param string $selectFields
+     * @param int $limit
+     * @return array
+     * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
+     * @since 2010-11-16
+     */
+    public function getLastProcessedEntries($selectFields='*', $limit='100') {
+        $db = $this->getDB();
+        $res = $db->exec_SELECTquery(
+            $selectFields,
+            $this->tableName,
+            '',
+            '',
+            'exec_time desc',
+            $limit
+        );
 
-		$rows = array();
-		while (($row = $db->sql_fetch_assoc($res)) !== false) {
-			$rows[] = $row;
-		}
-		return $rows;
-	}
+        $rows = array();
+        while (($row = $db->sql_fetch_assoc($res)) !== false) {
+            $rows[] = $row;
+        }
+        return $rows;
+    }
 
-	/**
-	 * Get performance statistics data
-	 *
-	 * @param int start timestamp
-	 * @param int end timestamp
-	 * @return array performance data
-	 * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
-	 * @since 2009-09-03
-	 */
-	public function getPerformanceData($start, $end) {
-		$db = $this->getDB();
-		$res = $db->exec_SELECTquery(
-			'process_id_completed, min(exec_time) as start, max(exec_time) as end, count(*) as urlcount',
-			$this->tableName,
-			'exec_time != 0 and exec_time >= '.intval($start). ' and exec_time <= ' . intval($end),
-			'process_id_completed'
-		);
+    /**
+     * Get performance statistics data
+     *
+     * @param int start timestamp
+     * @param int end timestamp
+     * @return array performance data
+     * @author Fabrizio Branca <fabrizio.branca@aoemedia.de>
+     * @since 2009-09-03
+     */
+    public function getPerformanceData($start, $end) {
+        $db = $this->getDB();
+        $res = $db->exec_SELECTquery(
+            'process_id_completed, min(exec_time) as start, max(exec_time) as end, count(*) as urlcount',
+            $this->tableName,
+            'exec_time != 0 and exec_time >= '.intval($start). ' and exec_time <= ' . intval($end),
+            'process_id_completed'
+        );
 
-		$rows = array();
-		while (($row = $db->sql_fetch_assoc($res)) !== false) {
-			$rows[$row['process_id_completed']] = $row;
-		}
-		return $rows;
-	}
+        $rows = array();
+        while (($row = $db->sql_fetch_assoc($res)) !== false) {
+            $rows[$row['process_id_completed']] = $row;
+        }
+        return $rows;
+    }
 
     /**
      * This method is used to count all processes in the process table.

domain/reason/class.tx_crawler_domain_reason.php

Doc Comments +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
 	 * This method is used to set the uid of the queue entry
 	 * where the reason is relevant for.
 	 *
-	 * @param int $entry_id
+	 * @param int $entry_uid
 	 */
 	public function setQueueEntryUid($entry_uid) {
 		$this->row['queue_entry_uid'] = $entry_uid;

Indentation +75 added lines, -75 removed lines

@@ -24,90 +24,90 @@
 
 class tx_crawler_domain_reason extends tx_crawler_domain_lib_abstract_dbobject {
 
-	protected static $tableName = 'tx_crawler_reason';
+    protected static $tableName = 'tx_crawler_reason';
 
-	/**
-	 * THE CONSTANTS REPRESENT THE KIND OF THE REASON
-	 *
-	 * Convention for own states: <extensionkey>_<reason>
-	 */
-	const REASON_DEFAULT = 'crawler_default_reason';
-	const REASON_GUI_SUBMIT = 'crawler_gui_submit_reason';
-	const REASON_CLI_SUBMIT = 'crawler_cli_submit_reason';
+    /**
+     * THE CONSTANTS REPRESENT THE KIND OF THE REASON
+     *
+     * Convention for own states: <extensionkey>_<reason>
+     */
+    const REASON_DEFAULT = 'crawler_default_reason';
+    const REASON_GUI_SUBMIT = 'crawler_gui_submit_reason';
+    const REASON_CLI_SUBMIT = 'crawler_cli_submit_reason';
 
-	/**
-	 * Set uid
-	 *
-	 * @param int uid
-	 * @return void
-	 */
-	public function setUid($uid) {
-		$this->row['uid'] = $uid;
-	}
+    /**
+     * Set uid
+     *
+     * @param int uid
+     * @return void
+     */
+    public function setUid($uid) {
+        $this->row['uid'] = $uid;
+    }
 
-	/**
-	 * Method to set a timestamp for the creation time of this record
-	 *
-	 * @param int $time
-	 */
-	public function setCreationDate($time) {
-		$this->row['crdate'] = $time;
-	}
+    /**
+     * Method to set a timestamp for the creation time of this record
+     *
+     * @param int $time
+     */
+    public function setCreationDate($time) {
+        $this->row['crdate'] = $time;
+    }
 
-	/**
-	 * This method can be used to set a user id of the user who has created this reason entry
-	 *
-	 * @param int $user_id
-	 */
-	public function setBackendUserId($user_id) {
-		$this->row['cruser_id'] = $user_id;
-	}
+    /**
+     * This method can be used to set a user id of the user who has created this reason entry
+     *
+     * @param int $user_id
+     */
+    public function setBackendUserId($user_id) {
+        $this->row['cruser_id'] = $user_id;
+    }
 
-	/**
-	 * Method to set the type of the reason for this reason instance (see constances)
-	 *
-	 * @param string $string
-	 */
-	public function setReason($string) {
-		$this->row['reason'] = $string;
-	}
+    /**
+     * Method to set the type of the reason for this reason instance (see constances)
+     *
+     * @param string $string
+     */
+    public function setReason($string) {
+        $this->row['reason'] = $string;
+    }
 
-	/**
-	 * This method returns the attached reason text.
-	 * @return string
-	 */
-	public function getReason() {
-		return $this->row['reason'];
-	}
+    /**
+     * This method returns the attached reason text.
+     * @return string
+     */
+    public function getReason() {
+        return $this->row['reason'];
+    }
 
-	/**
-	 * This method can be used to assign a detail text to the crawler reason
-	 *
-	 * @param string $detail_text
-	 */
-	public function setDetailText($detail_text) {
-		$this->row['detail_text'] = $detail_text;
-	}
+    /**
+     * This method can be used to assign a detail text to the crawler reason
+     *
+     * @param string $detail_text
+     */
+    public function setDetailText($detail_text) {
+        $this->row['detail_text'] = $detail_text;
+    }
 
-	/**
-	 * Returns the attachet detail text.
-	 *
-	 * @param void
-	 * @return string
-	 */
-	public function getDetailText() {
-		return $this->row['detail_text'];
-	}
+    /**
+     * Returns the attachet detail text.
+     *
+     * @param void
+     * @return string
+     */
+    public function getDetailText() {
+        return $this->row['detail_text'];
+    }
 
-	/**
-	 * This method is used to set the uid of the queue entry
-	 * where the reason is relevant for.
-	 *
-	 * @param int $entry_id
-	 */
-	public function setQueueEntryUid($entry_uid) {
-		$this->row['queue_entry_uid'] = $entry_uid;
-	}
+    /**
+     * This method is used to set the uid of the queue entry
+     * where the reason is relevant for.
+     *
+     * @param int $entry_id
+     */
+    public function setQueueEntryUid($entry_uid) {
+        $this->row['queue_entry_uid'] = $entry_uid;
+    }
 
 }
 

modfunc1/class.tx_crawler_modfunc1.php

Doc Comments +3 added lines

@@ -709,6 +709,7 @@ 
 	 * @param	array		Page row or set-id
 	 * @param	string		Title string
 	 * @param	int			Items per Page setting
+	 * @param string $titleString
 	 * @return	string		HTML <tr> content (one or more)
 	 */
 	function drawLog_addRows($pageRow_setId, $titleString, $itemsPerPage=10) {
@@ -1214,6 +1215,8 @@ 
 	 * @param	string		Selector box name
 	 * @param	string		Selector box value (array for multiple...)
 	 * @param	boolean		If set, will draw multiple box.
+	 * @param string $name
+	 * @param integer $multiple
 	 * @return	string		HTML select element
 	 */
 	function selectorBox($optArray, $name, $value, $multiple)	{

Indentation +943 added lines, -943 removed lines

@@ -35,126 +35,126 @@ 
  * @subpackage tx_crawler
  */
 class tx_crawler_modfunc1 extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
-		// Internal, dynamic:
-	var $duplicateTrack = array();
-	var $submitCrawlUrls = FALSE;
-	var $downloadCrawlUrls = FALSE;
-
-	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 {
@@ -172,16 +172,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(
@@ -194,63 +194,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;
+    }
 
 
 
@@ -263,176 +263,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(
@@ -453,7 +453,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>
@@ -466,17 +466,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>
@@ -487,8 +487,8 @@ 
 				<td>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.parameters').':</td>
 			</tr>';
 
-		return $content;
-	}
+        return $content;
+    }
 
 
 
@@ -501,110 +501,110 @@ 
 
 
 
-	/*******************************
+    /*******************************
 	 *
 	 * 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 = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $this->pObj->pageinfo);
-					$HTML = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('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 = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $this->pObj->pageinfo);
+                    $HTML = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('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" />
@@ -618,20 +618,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>
@@ -639,9 +639,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>
@@ -649,217 +649,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>').'
@@ -868,14 +868,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.
@@ -902,25 +902,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;
+    }
 
 
 
@@ -929,343 +929,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']);
 }
\ No newline at end of file

view/class.tx_crawler_view_pagination.php

Doc Comments +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	 * Returns the total number of pages needed to  display all content which
 	 * is paginatable
 	 *
-	 * @return int
+	 * @return double
 	 */
 	public function getTotalPagesCount() {
 	 	return ceil($this->getTotalItemCount() / $this->getPerPage());

Indentation +115 added lines, -115 removed lines

@@ -24,121 +24,121 @@
 
 class tx_crawler_view_pagination {
 
-	/**
-	 * @var string template path
-	 */
-	protected $template = 'EXT:crawler/template/pagination.php';
-
-	/**
-	 * @var int $perpage number of items perPage
-	 */
-	protected $perPage;
-
-	/**
-	 * @var int $currentOffset current offset
-	 */
-	protected $currentOffset;
-
-	/**
-	 * @var int $totalItemCount number of total item
-	 */
-	protected $totalItemCount;
-
-	/**
-	 * @var string $baseUrl
-	 */
-	protected $baseUrl;
-
-
-
-
-	/**
-	 * Method to render the view.
-	 *
-	 * @return string html content
-	 */
-	public function render() {
-		ob_start();
-		$this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
-		include($this->template);
-		$content = ob_get_contents();
-		ob_end_clean();
-
-		return $content;
-	}
-
-	/**
-	 * Returns the currently configured offset-
-	 * @return int
-	 */
-	public function getCurrentOffset() {
-		return $this->currentOffset;
-	}
-
-	/**
-	 * Method to read the number of items per page
-	 *
-	 * @return int
-	 */
-	public function getPerPage() {
-		return $this->perPage;
-	}
-
-	/**
-	 * Method to set the current offset from start
-	 *
-	 * @param int $currentOffset
-	 */
-	public function setCurrentOffset($currentOffset) {
-		$this->currentOffset = $currentOffset;
-	}
-
-	/**
-	 * Number of items per page.
-	 *
-	 * @param int $perPage
-	 */
-	public function setPerPage($perPage) {
-		$this->perPage = $perPage;
-	}
-
-	/**
-	 * returns the total number of items
-	 * @return int
-	 */
-	public function getTotalItemCount() {
-		return $this->totalItemCount;
-	}
-
-	/**
-	 * Method to set the total number of items in the pagination
-	 *
-	 * @param int $totalItemCount
-	 */
-	public function setTotalItemCount($totalItemCount) {
-		$this->totalItemCount = $totalItemCount;
-	}
-
-	/**
-	 * Returns the total number of pages needed to  display all content which
-	 * is paginatable
-	 *
-	 * @return int
-	 */
-	public function getTotalPagesCount() {
-	 	return ceil($this->getTotalItemCount() / $this->getPerPage());
-	}
-
-	/**
-	 * This method is used to caluclate the label for a pageoffset,
-	 * in normal cases its the internal offset + 1
-	 *
-	 * @param int $pageoffset
-	 * @return int
-	 */
-	protected function getLabelForPageOffset($pageoffset) {
-		return $pageoffset + 1;
-	}
+    /**
+     * @var string template path
+     */
+    protected $template = 'EXT:crawler/template/pagination.php';
+
+    /**
+     * @var int $perpage number of items perPage
+     */
+    protected $perPage;
+
+    /**
+     * @var int $currentOffset current offset
+     */
+    protected $currentOffset;
+
+    /**
+     * @var int $totalItemCount number of total item
+     */
+    protected $totalItemCount;
+
+    /**
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+
+
+
+    /**
+     * Method to render the view.
+     *
+     * @return string html content
+     */
+    public function render() {
+        ob_start();
+        $this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
+        include($this->template);
+        $content = ob_get_contents();
+        ob_end_clean();
+
+        return $content;
+    }
+
+    /**
+     * Returns the currently configured offset-
+     * @return int
+     */
+    public function getCurrentOffset() {
+        return $this->currentOffset;
+    }
+
+    /**
+     * Method to read the number of items per page
+     *
+     * @return int
+     */
+    public function getPerPage() {
+        return $this->perPage;
+    }
+
+    /**
+     * Method to set the current offset from start
+     *
+     * @param int $currentOffset
+     */
+    public function setCurrentOffset($currentOffset) {
+        $this->currentOffset = $currentOffset;
+    }
+
+    /**
+     * Number of items per page.
+     *
+     * @param int $perPage
+     */
+    public function setPerPage($perPage) {
+        $this->perPage = $perPage;
+    }
+
+    /**
+     * returns the total number of items
+     * @return int
+     */
+    public function getTotalItemCount() {
+        return $this->totalItemCount;
+    }
+
+    /**
+     * Method to set the total number of items in the pagination
+     *
+     * @param int $totalItemCount
+     */
+    public function setTotalItemCount($totalItemCount) {
+        $this->totalItemCount = $totalItemCount;
+    }
+
+    /**
+     * Returns the total number of pages needed to  display all content which
+     * is paginatable
+     *
+     * @return int
+     */
+    public function getTotalPagesCount() {
+            return ceil($this->getTotalItemCount() / $this->getPerPage());
+    }
+
+    /**
+     * This method is used to caluclate the label for a pageoffset,
+     * in normal cases its the internal offset + 1
+     *
+     * @param int $pageoffset
+     * @return int
+     */
+    protected function getLabelForPageOffset($pageoffset) {
+        return $pageoffset + 1;
+    }
 
 }
 

view/process/class.tx_crawler_view_process_list.php

Doc Comments +3 added lines, -2 removed lines

@@ -111,6 +111,7 @@ 
 	 * Set the page id
 	 *
 	 * @param int page id
+	 * @param integer $pageId
 	 */
 	public function setPageId($pageId) {
 		$this->pageId = $pageId;
@@ -269,7 +270,7 @@ 
 	 * Converts seconds into minutes
 	 *
 	 * @param int $seconds
-	 * @return int
+	 * @return double
 	 */
 	protected function asMinutes($seconds) {
 		return round($seconds / 60);
@@ -409,7 +410,7 @@ 
 	 * just a wrapper should be done in a cleaner way
 	 * later on
 	 *
-	 * @param $label
+	 * @param string $label
 	 * @return string
 	 */
 	protected function getLLLabel($label) {

Indentation +391 added lines, -391 removed lines

@@ -24,397 +24,397 @@
 
 class tx_crawler_view_process_list {
 
-	/**
-	 * @var string template path
-	 */
-	protected $template = 'EXT:crawler/template/process/list.php';
-
-	/**
-	 * @var string icon path
-	 */
-	protected $iconPath;
-
-	/**
-	 * @var string Holds the path to start a cli process via command line
-	 */
-	protected $cliPath;
-
-	/**
-	 * @var int Holds the total number of items pending in the queue to be processed
-	 */
-	protected $totalItemCount;
-
-	/**
-	 * @var boolean Holds the enable state of the crawler
-	 */
-	protected $isCrawlerEnabled;
-
-	/**
-	 * @var int Holds the number of active processes
-	 */
-	protected $activeProcessCount;
-
-	/**
-	 * @var int Holds the number of maximum active processes
-	 */
-	protected $maxActiveProcessCount;
-
-	/**
-	 * @var string Holds the mode state, can be simple or detail
-	 */
-	protected $mode;
-
-	/**
-	 * @var int Holds the current page id
-	 */
-	protected $pageId;
-
-	/**
-	 * @var int $totalItemCount number of total item
-	 */
-	protected $totalUnprocessedItemCount;
-
-	/**
-	 * @var int Holds the number of assigned unprocessed items
-	 */
-	protected $assignedUnprocessedItemCount;
-
-	/**
-	 * @return int
-	 */
-	public function getAssignedUnprocessedItemCount() {
-		return $this->assignedUnprocessedItemCount;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTotalUnprocessedItemCount() {
-		return $this->totalUnprocessedItemCount;
-	}
-
-	/**
-	 * @param int $assignedUnprocessedItemCount
-	 */
-	public function setAssignedUnprocessedItemCount($assignedUnprocessedItemCount) {
-		$this->assignedUnprocessedItemCount = $assignedUnprocessedItemCount;
-	}
-
-	/**
-	 * @param int $totalUnprocessedItemCount
-	 */
-	public function setTotalUnprocessedItemCount($totalUnprocessedItemCount) {
-		$this->totalUnprocessedItemCount = $totalUnprocessedItemCount;
-	}
-
-	/**
-	 * Set the page id
-	 *
-	 * @param int page id
-	 */
-	public function setPageId($pageId) {
-		$this->pageId = $pageId;
-	}
-
-	/**
-	 * Get the page id
-	 *
-	 * @return int page id
-	 */
-	public function getPageId() {
-		return $this->pageId;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getMode() {
-		return $this->mode;
-	}
-
-	/**
-	 * @param string $mode
-	 */
-	public function setMode($mode) {
-		$this->mode = $mode;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getMaxActiveProcessCount() {
-		return $this->maxActiveProcessCount;
-	}
-
-	/**
-	 * @param int $maxActiveProcessCount
-	 */
-	public function setMaxActiveProcessCount($maxActiveProcessCount) {
-		$this->maxActiveProcessCount = $maxActiveProcessCount;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getActiveProcessCount() {
-		return $this->activeProcessCount;
-	}
-
-	/**
-	 * @param int $activeProcessCount
-	 */
-	public function setActiveProcessCount($activeProcessCount) {
-		$this->activeProcessCount = $activeProcessCount;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public function getIsCrawlerEnabled() {
-		return $this->isCrawlerEnabled;
-	}
-
-	/**
-	 * @param boolean $isCrawlerEnabled
-	 */
-	public function setIsCrawlerEnabled($isCrawlerEnabled) {
-		$this->isCrawlerEnabled = $isCrawlerEnabled;
-	}
-
-
-	/**
-	 * Returns the path to start a cli process from the shell
-	 * @return string
-	 */
-	public function getCliPath() {
-		return $this->cliPath;
-	}
-
-	/**
-	 * @param string $cliPath
-	 */
-	public function setCliPath($cliPath) {
-		$this->cliPath = $cliPath;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getTotalItemCount() {
-		return $this->totalItemCount;
-	}
-
-	/**
-	 * @param int $totalItemCount
-	 */
-	public function setTotalItemCount($totalItemCount) {
-		$this->totalItemCount = $totalItemCount;
-	}
-
-	/**
-	 * Method to set the path to the icon from outside
-	 *
-	 * @param string $iconPath
-	 */
-	public function setIconPath($iconPath) {
-		$this->iconPath = $iconPath;
-	}
-
-	/**
-	 * Method to read the configured icon path
-	 *
-	 * @return string
-	 */
-	protected function getIconPath() {
-		return $this->iconPath;
-	}
-
-	/**
-	 * Method to set a collection of process objects to be displayed in
-	 * the list view.
-	 *
-	 * @param tx_crawler_domain_process_collection $processCollection
-	 */
-	public function setProcessCollection($processCollection) {
-		$this->processCollection = $processCollection;
-	}
-
-	/**
-	 * Returns a collection of processObjects.
-	 *
-	 * @return tx_crawler_domain_process_collection
-	 */
-	protected function getProcessCollection() {
-		return $this->processCollection;
-	}
-
-	/**
-	 * Formats a timestamp as date
-	 *
-	 * @param int $timestamp
-	 * @return string
-	 */
-	protected function asDate($timestamp) {
-		if ($timestamp > 0) {
-			return date($this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:time.detailed'), $timestamp);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Converts seconds into minutes
-	 *
-	 * @param int $seconds
-	 * @return int
-	 */
-	protected function asMinutes($seconds) {
-		return round($seconds / 60);
-	}
-
-	/**
-	 * Returns the state icon for the current job
-	 *
-	 * @param string $state
-	 * @return string icon
-	 */
-	protected function getIconForState($state) {
-		switch($state) {
-			case 'running':
-				$icon = 'bullet_orange';
-				$title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.running');
-				break;
-			case 'completed':
-				$icon = 'bullet_green';
-				$title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.success');
-				break;
-			case 'cancelled':
-				$icon = 'bullet_red';
-				$title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.cancelled');
-				break;
-		}
-
-		return $this->getIcon($icon, $title);
-	}
-
-	/**
-	 * Returns a tag for the refresh icon
-	 *
-	 * @return string
-	 */
-	protected function getRefreshIcon() {
-		return $this->getIcon('arrow_refresh');
-	}
-
-	/**
-	 * Returns a tag for the refresh icon
-	 *
-	 * @return string
-	 */
-	protected function getRefreshLink() {
-		return '<input onclick="window.location=\'' . \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess' . '\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_refresh.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh') . '" />';
-	}
-
-	/**
-	 * Returns an icon to stop all processes
-	 *
-	 * @return string html tag for stop icon
-	 */
-	protected function getStopIcon() {
-		return $this->getIcon('stop');
-	}
-
-	/**
-	 * Returns a link for the panel to enable or disable the crawler
-	 *
-	 * @return string
-	 */
-	protected function getEnableDisableLink() {
-		if ($this->getIsCrawlerEnabled()) {
-			return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_stop_blue.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling') . '" />';
-		} else {
-			return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_play.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling') . '" />';
-		}
-	}
-
-	/**
-	 * Get mode link
-	 *
-	 * @param void
-	 * @return string a-tag
-	 */
-	protected function getModeLink() {
-		if ($this->getMode() == 'detail') {
-			return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_in.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running') . '" />';
-		} elseif ($this->getMode() == 'simple') {
-			return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_out.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all') . '" />';
-		}
-	}
-
-	/**
-	 * Get add link
-	 *
-	 * @param void
-	 * @return string a-tag
-	 */
-	protected function getAddLink() {
-		if ($this->getActiveProcessCount() < $this->getMaxActiveProcessCount() && $this->getIsCrawlerEnabled()) {
-			return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'add.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add') . '" />';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Returns the icon to add new crawler processes
-	 *
-	 * @return string html tag for image to add new processes
-	 */
-	protected function getAddIcon() {
-		return $this->getIcon('add');
-	}
-
-	/**
-	 * Returns an imagetag for an icon
-	 *
-	 * @param string $icon
-	 * @return string html tag for icon
-	 */
-	protected function getIcon($icon, $title='') {
-		if (!empty($title)) {
-			$title = ' title="'.$title.'"';
-		}
-		return '<img src="'.$this->getIconPath().$icon.'.png" ' . $title . ' />';
-	}
-
-	/**
-	 * Method to render the view.
-	 *
-	 * @return string html content
-	 */
-	public function render() {
-		ob_start();
-		$this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
-		include($this->template);
-		$content = ob_get_contents();
-		ob_end_clean();
-		return $content;
-	}
-
-	/**
-	 * retrieve locallanglabel from environment
-	 * just a wrapper should be done in a cleaner way
-	 * later on
-	 *
-	 * @param $label
-	 * @return string
-	 */
-	protected function getLLLabel($label) {
-		return $GLOBALS['LANG']->sL($label);
-	}
+    /**
+     * @var string template path
+     */
+    protected $template = 'EXT:crawler/template/process/list.php';
+
+    /**
+     * @var string icon path
+     */
+    protected $iconPath;
+
+    /**
+     * @var string Holds the path to start a cli process via command line
+     */
+    protected $cliPath;
+
+    /**
+     * @var int Holds the total number of items pending in the queue to be processed
+     */
+    protected $totalItemCount;
+
+    /**
+     * @var boolean Holds the enable state of the crawler
+     */
+    protected $isCrawlerEnabled;
+
+    /**
+     * @var int Holds the number of active processes
+     */
+    protected $activeProcessCount;
+
+    /**
+     * @var int Holds the number of maximum active processes
+     */
+    protected $maxActiveProcessCount;
+
+    /**
+     * @var string Holds the mode state, can be simple or detail
+     */
+    protected $mode;
+
+    /**
+     * @var int Holds the current page id
+     */
+    protected $pageId;
+
+    /**
+     * @var int $totalItemCount number of total item
+     */
+    protected $totalUnprocessedItemCount;
+
+    /**
+     * @var int Holds the number of assigned unprocessed items
+     */
+    protected $assignedUnprocessedItemCount;
+
+    /**
+     * @return int
+     */
+    public function getAssignedUnprocessedItemCount() {
+        return $this->assignedUnprocessedItemCount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalUnprocessedItemCount() {
+        return $this->totalUnprocessedItemCount;
+    }
+
+    /**
+     * @param int $assignedUnprocessedItemCount
+     */
+    public function setAssignedUnprocessedItemCount($assignedUnprocessedItemCount) {
+        $this->assignedUnprocessedItemCount = $assignedUnprocessedItemCount;
+    }
+
+    /**
+     * @param int $totalUnprocessedItemCount
+     */
+    public function setTotalUnprocessedItemCount($totalUnprocessedItemCount) {
+        $this->totalUnprocessedItemCount = $totalUnprocessedItemCount;
+    }
+
+    /**
+     * Set the page id
+     *
+     * @param int page id
+     */
+    public function setPageId($pageId) {
+        $this->pageId = $pageId;
+    }
+
+    /**
+     * Get the page id
+     *
+     * @return int page id
+     */
+    public function getPageId() {
+        return $this->pageId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMode() {
+        return $this->mode;
+    }
+
+    /**
+     * @param string $mode
+     */
+    public function setMode($mode) {
+        $this->mode = $mode;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getMaxActiveProcessCount() {
+        return $this->maxActiveProcessCount;
+    }
+
+    /**
+     * @param int $maxActiveProcessCount
+     */
+    public function setMaxActiveProcessCount($maxActiveProcessCount) {
+        $this->maxActiveProcessCount = $maxActiveProcessCount;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getActiveProcessCount() {
+        return $this->activeProcessCount;
+    }
+
+    /**
+     * @param int $activeProcessCount
+     */
+    public function setActiveProcessCount($activeProcessCount) {
+        $this->activeProcessCount = $activeProcessCount;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getIsCrawlerEnabled() {
+        return $this->isCrawlerEnabled;
+    }
+
+    /**
+     * @param boolean $isCrawlerEnabled
+     */
+    public function setIsCrawlerEnabled($isCrawlerEnabled) {
+        $this->isCrawlerEnabled = $isCrawlerEnabled;
+    }
+
+
+    /**
+     * Returns the path to start a cli process from the shell
+     * @return string
+     */
+    public function getCliPath() {
+        return $this->cliPath;
+    }
+
+    /**
+     * @param string $cliPath
+     */
+    public function setCliPath($cliPath) {
+        $this->cliPath = $cliPath;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getTotalItemCount() {
+        return $this->totalItemCount;
+    }
+
+    /**
+     * @param int $totalItemCount
+     */
+    public function setTotalItemCount($totalItemCount) {
+        $this->totalItemCount = $totalItemCount;
+    }
+
+    /**
+     * Method to set the path to the icon from outside
+     *
+     * @param string $iconPath
+     */
+    public function setIconPath($iconPath) {
+        $this->iconPath = $iconPath;
+    }
+
+    /**
+     * Method to read the configured icon path
+     *
+     * @return string
+     */
+    protected function getIconPath() {
+        return $this->iconPath;
+    }
+
+    /**
+     * Method to set a collection of process objects to be displayed in
+     * the list view.
+     *
+     * @param tx_crawler_domain_process_collection $processCollection
+     */
+    public function setProcessCollection($processCollection) {
+        $this->processCollection = $processCollection;
+    }
+
+    /**
+     * Returns a collection of processObjects.
+     *
+     * @return tx_crawler_domain_process_collection
+     */
+    protected function getProcessCollection() {
+        return $this->processCollection;
+    }
+
+    /**
+     * Formats a timestamp as date
+     *
+     * @param int $timestamp
+     * @return string
+     */
+    protected function asDate($timestamp) {
+        if ($timestamp > 0) {
+            return date($this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:time.detailed'), $timestamp);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Converts seconds into minutes
+     *
+     * @param int $seconds
+     * @return int
+     */
+    protected function asMinutes($seconds) {
+        return round($seconds / 60);
+    }
+
+    /**
+     * Returns the state icon for the current job
+     *
+     * @param string $state
+     * @return string icon
+     */
+    protected function getIconForState($state) {
+        switch($state) {
+            case 'running':
+                $icon = 'bullet_orange';
+                $title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.running');
+                break;
+            case 'completed':
+                $icon = 'bullet_green';
+                $title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.success');
+                break;
+            case 'cancelled':
+                $icon = 'bullet_red';
+                $title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.cancelled');
+                break;
+        }
+
+        return $this->getIcon($icon, $title);
+    }
+
+    /**
+     * Returns a tag for the refresh icon
+     *
+     * @return string
+     */
+    protected function getRefreshIcon() {
+        return $this->getIcon('arrow_refresh');
+    }
+
+    /**
+     * Returns a tag for the refresh icon
+     *
+     * @return string
+     */
+    protected function getRefreshLink() {
+        return '<input onclick="window.location=\'' . \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess' . '\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_refresh.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh') . '" />';
+    }
+
+    /**
+     * Returns an icon to stop all processes
+     *
+     * @return string html tag for stop icon
+     */
+    protected function getStopIcon() {
+        return $this->getIcon('stop');
+    }
+
+    /**
+     * Returns a link for the panel to enable or disable the crawler
+     *
+     * @return string
+     */
+    protected function getEnableDisableLink() {
+        if ($this->getIsCrawlerEnabled()) {
+            return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_stop_blue.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling') . '" />';
+        } else {
+            return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_play.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling') . '" />';
+        }
+    }
+
+    /**
+     * Get mode link
+     *
+     * @param void
+     * @return string a-tag
+     */
+    protected function getModeLink() {
+        if ($this->getMode() == 'detail') {
+            return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_in.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running') . '" />';
+        } elseif ($this->getMode() == 'simple') {
+            return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_out.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all') . '" />';
+        }
+    }
+
+    /**
+     * Get add link
+     *
+     * @param void
+     * @return string a-tag
+     */
+    protected function getAddLink() {
+        if ($this->getActiveProcessCount() < $this->getMaxActiveProcessCount() && $this->getIsCrawlerEnabled()) {
+            return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'add.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add') . '" />';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Returns the icon to add new crawler processes
+     *
+     * @return string html tag for image to add new processes
+     */
+    protected function getAddIcon() {
+        return $this->getIcon('add');
+    }
+
+    /**
+     * Returns an imagetag for an icon
+     *
+     * @param string $icon
+     * @return string html tag for icon
+     */
+    protected function getIcon($icon, $title='') {
+        if (!empty($title)) {
+            $title = ' title="'.$title.'"';
+        }
+        return '<img src="'.$this->getIconPath().$icon.'.png" ' . $title . ' />';
+    }
+
+    /**
+     * Method to render the view.
+     *
+     * @return string html content
+     */
+    public function render() {
+        ob_start();
+        $this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
+        include($this->template);
+        $content = ob_get_contents();
+        ob_end_clean();
+        return $content;
+    }
+
+    /**
+     * retrieve locallanglabel from environment
+     * just a wrapper should be done in a cleaner way
+     * later on
+     *
+     * @param $label
+     * @return string
+     */
+    protected function getLLLabel($label) {
+        return $GLOBALS['LANG']->sL($label);
+    }
 }
 
 ?>

Classes/Hooks/StaticFileCacheCreateUriHook.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * @param string $uri
      * @param TypoScriptFrontendController $frontend
      *
-     * @return array
+     * @return string[]
      *
      * @throws \Exception
      *

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>
 

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']);

 }

 

 ?>