AOEpeople / crawler

Classes/Api/CrawlerApi.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
     /**
      * Determines if a page is queued
      *
-     * @param $uid
+     * @param integer $uid
      * @param bool $unprocessed_only
      * @param bool $timed_only
      * @param bool $timestamp

Spacing +11 added lines, -11 removed lines

@@ -91,7 +91,7 @@ 
      */
     protected function findCrawler()
     {
-        if (! is_object($this->crawlerObj)) {
+        if (!is_object($this->crawlerObj)) {
             $this->crawlerObj = GeneralUtility::makeInstance('tx_crawler_lib');
             $this->crawlerObj->setID = GeneralUtility::md5int(microtime());
         }
@@ -126,7 +126,7 @@ 
         if (count($this->allowedConfigrations) > 0) {
             // 	remove configuration that does not match the current selection
             foreach ($configurations as $confKey => $confArray) {
-                if (! in_array($confKey, $this->allowedConfigrations)) {
+                if (!in_array($confKey, $this->allowedConfigrations)) {
                     unset($configurations[$confKey]);
                 }
             }
@@ -191,12 +191,12 @@ 
         //if the same page is scheduled for the same time and has not be executed?
         if ($schedule_timestamp == 0) {
             //untimed elements need an exec_time with 0 because they can occure multiple times
-            $where = 'page_id=' . $page_uid . ' AND exec_time = 0 AND scheduled=' . $schedule_timestamp;
+            $where = 'page_id='.$page_uid.' AND exec_time = 0 AND scheduled='.$schedule_timestamp;
         } else {
             //timed elementes have got a fixed schedule time, if a record with this time
             //exists it is maybe queued for the future, or is has been queue for the past and therefore
             //also been processed.
-            $where = 'page_id=' . $page_uid . ' AND scheduled=' . $schedule_timestamp;
+            $where = 'page_id='.$page_uid.' AND scheduled='.$schedule_timestamp;
         }
 
         $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -226,7 +226,7 @@ 
 
         $isPageInQueue = false;
 
-        $whereClause = 'page_id = ' . (integer)$uid;
+        $whereClause = 'page_id = '.(integer) $uid;
 
         if (false !== $unprocessed_only) {
             $whereClause .= ' AND exec_time = 0';
@@ -237,7 +237,7 @@ 
         }
 
         if (false !== $timestamp) {
-            $whereClause .= ' AND scheduled = ' . (integer)$timestamp;
+            $whereClause .= ' AND scheduled = '.(integer) $timestamp;
         }
 
         $count = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows(
@@ -266,10 +266,10 @@ 
     {
         $uid = intval($uid);
         $query = 'max(scheduled) as latest';
-        $where = ' page_id = ' . $uid;
+        $where = ' page_id = '.$uid;
 
         if ($future_crawldates_only) {
-            $where .= ' AND scheduled > ' . time();
+            $where .= ' AND scheduled > '.time();
         }
 
         if ($unprocessed_only) {
@@ -302,7 +302,7 @@ 
         $limit = $GLOBALS['TYPO3_DB']->fullQuoteStr($limit, 'tx_crawler_queue');
 
         $query = 'scheduled, exec_time, set_id';
-        $where = ' page_id = ' . $uid;
+        $where = ' page_id = '.$uid;
 
         $limit_query = ($limit) ? $limit : null;
 
@@ -379,7 +379,7 @@ 
     {
         $qid = intval($qid);
         $table = 'tx_crawler_queue';
-        $where = ' qid=' . $qid;
+        $where = ' qid='.$qid;
         $GLOBALS['TYPO3_DB']->exec_DELETEquery($table, $where);
     }
 
@@ -407,7 +407,7 @@ 
      */
     protected function getQueueRepository()
     {
-        if (! $this->queueRepository instanceof \tx_crawler_domain_queue_repository) {
+        if (!$this->queueRepository instanceof \tx_crawler_domain_queue_repository) {
             $this->queueRepository = new \tx_crawler_domain_queue_repository();
         }
 

view/process/class.tx_crawler_view_process_list.php

Doc Comments +3 added lines, -3 removed lines

@@ -311,7 +311,7 @@ 
     /**
      * Returns a tag for the refresh icon
      *
-     * @return string
+     * @return AOE\Crawler\Utility\ButtonUtility
      */
     protected function getRefreshLink()
     {
@@ -325,7 +325,7 @@ 
     /**
      * Returns a link for the panel to enable or disable the crawler
      *
-     * @return string
+     * @return AOE\Crawler\Utility\ButtonUtility
      */
     protected function getEnableDisableLink()
     {
@@ -351,7 +351,7 @@ 
      *
      * @param void
      *
-     * @return string a-tag
+     * @return AOE\Crawler\Utility\ButtonUtility|null a-tag
      */
     protected function getModeLink()
     {

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,7 @@
         return \AOE\Crawler\Utility\ButtonUtility::getLinkButton(
             'actions-refresh',
             $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh'),
-            'window.location=\'' . \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess&id=' . $this->pageId . '\';'
+            'window.location=\''.\TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info').'&SET[crawlaction]=multiprocess&id='.$this->pageId.'\';'
         );
     }
 

class.tx_crawler_lib.php

Doc Comments +21 added lines, -6 removed lines

@@ -422,7 +422,7 @@ 
      *
      * @param  string $piString                     PI to test
      * @param  array  $incomingProcInstructions     Processing instructions
-     * @return boolean                              TRUE if found
+     * @return boolean|null                              TRUE if found
      */
     public function drawURLs_PIfilter($piString, array $incomingProcInstructions)
     {
@@ -632,6 +632,9 @@ 
         return $baseUrl;
     }
 
+    /**
+     * @param integer $rootid
+     */
     public function getConfigurationsForBranch($rootid, $depth)
     {
         $configurationsForBranch = [];
@@ -735,6 +738,7 @@ 
      *
      * @param    array        Array with key (GET var name) and values (value of GET var which is configuration for expansion)
      * @param    integer        Current page ID
+     * @param integer $pid
      * @return    array        Array with key (GET var name) with the value being an array of all possible values for that key.
      */
     public function expandParameters($paramArray, $pid)
@@ -853,7 +857,7 @@ 
      * The number of URLs will be the multiplication of the number of parameter values for each key
      *
      * @param  array  $paramArray   Output of expandParameters(): Array with keys (GET var names) and for each an array of values
-     * @param  array  $urls         URLs accumulated in this array (for recursion)
+     * @param  string[]  $urls         URLs accumulated in this array (for recursion)
      * @return array                URLs accumulated, if number of urls exceed 'maxCompileUrls' it will return false as an error!
      */
     public function compileUrls($paramArray, $urls = [])
@@ -1033,6 +1037,8 @@ 
      * @param    integer        Scheduled-time
      * @param     string        (optional) configuration hash
      * @param     bool        (optional) skip inner duplication check
+     * @param string $url
+     * @param double $tstamp
      * @return    bool        true if the url was added, false if it already existed
      */
     public function addUrl(
@@ -1503,6 +1509,7 @@ 
 
     /**
      * @param message
+     * @param string $message
      */
     protected function log($message)
     {
@@ -1517,7 +1524,7 @@ 
      * @param array $url
      * @param string $crawlerId
      *
-     * @return array
+     * @return string[]
      */
     protected function buildRequestHeaderArray(array $url, $crawlerId)
     {
@@ -1626,6 +1633,12 @@ 
      * @param    boolean        If set (and submitcrawlUrls is false) will fill $downloadUrls with entries)
      * @param    array        Array of processing instructions
      * @param    array        Array of configuration keys
+     * @param integer $id
+     * @param integer $depth
+     * @param integer $scheduledTime
+     * @param integer $reqMinute
+     * @param boolean $submitCrawlUrls
+     * @param boolean $downloadCrawlUrls
      * @return    string        HTML code
      */
     public function getPageTreeAndUrls(
@@ -1773,6 +1786,7 @@ 
      *
      * @param    array        Page row
      * @param    string        Page icon and title for row
+     * @param string $pageTitleAndIcon
      * @return    string        HTML <tr> content (one or more)
      */
     public function drawURLs_addRowsForPage(array $pageRow, $pageTitleAndIcon)
@@ -2064,7 +2078,7 @@ 
     /**
      * Function executed by crawler_im.php cli script.
      *
-     * @return bool
+     * @return null|boolean
      */
     public function CLI_main_flush()
     {
@@ -2123,7 +2137,7 @@ 
      * @param  int $countInARun
      * @param  int $sleepTime
      * @param  int $sleepAfterFinish
-     * @return string                   Status message
+     * @return integer                   Status message
      */
     public function CLI_run($countInARun, $sleepTime, $sleepAfterFinish)
     {
@@ -2398,6 +2412,7 @@ 
      * Used to determine timeouts and to ensure a proper cleanup if there's a timeout
      *
      * @param  string  identification string for the process
+     * @param string $pid
      * @return boolean determines if the process is still active / has resources
      *
      * FIXME: Please remove Transaction, not needed as only a select query.
@@ -2438,7 +2453,7 @@ 
     /**
      * @param bool $get_as_float
      *
-     * @return mixed
+     * @return string
      */
     protected function microtime($get_as_float = false)
     {

Spacing +71 added lines, -71 removed lines

@@ -31,7 +31,7 @@ 
 {
     public $setID = 0;
     public $processID = '';
-    public $max_CLI_exec_time = 3600;    // One hour is max stalled time for the CLI (If the process has had the status "start" for 3600 seconds it will be regarded stalled and a new process is started.
+    public $max_CLI_exec_time = 3600; // One hour is max stalled time for the CLI (If the process has had the status "start" for 3600 seconds it will be regarded stalled and a new process is started.
 
     public $duplicateTrack = [];
     public $downloadUrls = [];
@@ -69,9 +69,9 @@ 
     private $backendUser;
 
     const CLI_STATUS_NOTHING_PROCCESSED = 0;
-    const CLI_STATUS_REMAIN = 1;    //queue not empty
-    const CLI_STATUS_PROCESSED = 2;    //(some) queue items where processed
-    const CLI_STATUS_ABORTED = 4;    //instance didn't finish
+    const CLI_STATUS_REMAIN = 1; //queue not empty
+    const CLI_STATUS_PROCESSED = 2; //(some) queue items where processed
+    const CLI_STATUS_ABORTED = 4; //instance didn't finish
     const CLI_STATUS_POLLABLE_PROCESSED = 8;
 
     /**
@@ -355,14 +355,14 @@ 
                     if ($vv['subCfg']['cHash']) {
                         /* @var $cacheHash \TYPO3\CMS\Frontend\Page\CacheHashCalculator */
                         $cacheHash = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Frontend\Page\CacheHashCalculator');
-                        $urlQuery .= '&cHash=' . $cacheHash->generateForParameters($urlQuery);
+                        $urlQuery .= '&cHash='.$cacheHash->generateForParameters($urlQuery);
                     }
 
                     // Create key by which to determine unique-ness:
                     $uKey = $urlQuery.'|'.$vv['subCfg']['userGroups'].'|'.$vv['subCfg']['baseUrl'].'|'.$vv['subCfg']['procInstrFilter'];
 
                     // realurl support (thanks to Ingo Renner)
-                    $urlQuery = 'index.php' . $urlQuery;
+                    $urlQuery = 'index.php'.$urlQuery;
                     if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('realurl') && $vv['subCfg']['realurl']) {
                         $params = [
                             'LD' => [
@@ -386,7 +386,7 @@ 
                         $urlList = '['.date('d.m.y H:i', $schTime).'] '.htmlspecialchars($urlQuery);
                         $this->urlList[] = '['.date('d.m.y H:i', $schTime).'] '.$urlQuery;
 
-                        $theUrl = ($vv['subCfg']['baseUrl'] ? $vv['subCfg']['baseUrl'] : \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL')) . $urlQuery;
+                        $theUrl = ($vv['subCfg']['baseUrl'] ? $vv['subCfg']['baseUrl'] : \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL')).$urlQuery;
 
                         // Submit for crawling!
                         if ($submitCrawlUrls) {
@@ -488,7 +488,7 @@ 
                     if (!is_array($values)) {
 
                         // Sub configuration for a single configuration string:
-                        $subCfg = (array)$crawlerCfg['paramSets.'][$key.'.'];
+                        $subCfg = (array) $crawlerCfg['paramSets.'][$key.'.'];
                         $subCfg['key'] = $key;
 
                         if (strcmp($subCfg['procInstrFilter'], '')) {
@@ -535,7 +535,7 @@ 
                 'tx_crawler_configuration',
                 'pid',
                 intval($page['uid']),
-                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration') . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('tx_crawler_configuration')
+                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration').\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('tx_crawler_configuration')
             );
 
             if (is_array($configurationRecordsForCurrentPage)) {
@@ -581,7 +581,7 @@ 
                                     $res[$key]['subCfg'] = $subCfg;
                                     $res[$key]['paramParsed'] = $this->parseParams($configurationRecord['configuration']);
                                     $res[$key]['paramExpanded'] = $this->expandParameters($res[$key]['paramParsed'], $id);
-                                    $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id=' . $id]);
+                                    $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id='.$id]);
                                     $res[$key]['origin'] = 'tx_crawler_configuration_'.$configurationRecord['uid'];
                                 }
                             }
@@ -620,13 +620,13 @@ 
             $res = $this->db->exec_SELECTquery(
                 '*',
                 'sys_domain',
-                'uid = '.$sysDomainUid .
-                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('sys_domain') .
+                'uid = '.$sysDomainUid.
+                \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('sys_domain').
                 \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('sys_domain')
             );
             $row = $this->db->sql_fetch_assoc($res);
             if ($row['domainName'] != '') {
-                return $urlScheme . '://' . $row['domainName'];
+                return $urlScheme.'://'.$row['domainName'];
             }
         }
         return $baseUrl;
@@ -644,7 +644,7 @@ 
                     if (!is_array($value)) {
                         continue;
                     }
-                    $configurationsForBranch[] = substr($key, -1) == '.'?substr($key, 0, -1):$key;
+                    $configurationsForBranch[] = substr($key, -1) == '.' ?substr($key, 0, -1) : $key;
                 }
             }
         }
@@ -656,7 +656,7 @@ 
         /* @var \TYPO3\CMS\Backend\Tree\View\PageTreeView */
         $tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
         $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-        $tree->init('AND ' . $perms_clause);
+        $tree->init('AND '.$perms_clause);
         $tree->getTree($rootid, $depth, '');
         foreach ($tree->tree as $node) {
             $pids[] = $node['row']['uid'];
@@ -666,7 +666,7 @@ 
             '*',
             'tx_crawler_configuration',
             'pid IN ('.implode(',', $pids).') '.
-            \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration') .
+            \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration').
             \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('tx_crawler_configuration').' '.
             \TYPO3\CMS\Backend\Utility\BackendUtility::versioningPlaceholderClause('tx_crawler_configuration').' '
         );
@@ -766,8 +766,8 @@ 
                         }
 
                         // Traverse range, add values:
-                        $runAwayBrake = 1000;    // Limit to size of range!
-                        for ($a = $reg[1]; $a <= $reg[2];$a++) {
+                        $runAwayBrake = 1000; // Limit to size of range!
+                        for ($a = $reg[1]; $a <= $reg[2]; $a++) {
                             $paramArray[$p][] = $a;
                             $runAwayBrake--;
                             if ($runAwayBrake <= 0) {
@@ -797,16 +797,16 @@ 
                                 $transOrigPointerField = $TCA[$subpartParams['_TABLE']]['ctrl']['transOrigPointerField'];
 
                                 if ($subpartParams['_ENABLELANG'] && $transOrigPointerField) {
-                                    $andWhereLanguage = ' AND ' . $this->db->quoteStr($transOrigPointerField, $subpartParams['_TABLE']) .' <= 0 ';
+                                    $andWhereLanguage = ' AND '.$this->db->quoteStr($transOrigPointerField, $subpartParams['_TABLE']).' <= 0 ';
                                 }
 
-                                $where = $this->db->quoteStr($pidField, $subpartParams['_TABLE']) .'='.intval($lookUpPid) . ' ' .
-                                    $andWhereLanguage . $where;
+                                $where = $this->db->quoteStr($pidField, $subpartParams['_TABLE']).'='.intval($lookUpPid).' '.
+                                    $andWhereLanguage.$where;
 
                                 $rows = $this->db->exec_SELECTgetRows(
                                     $fieldName,
-                                    $subpartParams['_TABLE'] . $addTable,
-                                    $where . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause($subpartParams['_TABLE']),
+                                    $subpartParams['_TABLE'].$addTable,
+                                    $where.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause($subpartParams['_TABLE']),
                                     '',
                                     '',
                                     '',
@@ -915,13 +915,13 @@ 
 
         // FIXME: Write unit test that ensures that the right records are deleted.
         if ($doFlush) {
-            $this->flushQueue(($doFullFlush?'1=1':('page_id='.intval($id))) .$addWhere);
+            $this->flushQueue(($doFullFlush ? '1=1' : ('page_id='.intval($id))).$addWhere);
             return [];
         } else {
             return $this->db->exec_SELECTgetRows(
                 '*',
                 'tx_crawler_queue',
-                'page_id=' . intval($id) . $addWhere,
+                'page_id='.intval($id).$addWhere,
                 '',
                 'scheduled DESC',
                 (intval($itemsPerPage) > 0 ? intval($itemsPerPage) : '')
@@ -954,7 +954,7 @@ 
         }
         // FIXME: Write unit test that ensures that the right records are deleted.
         if ($doFlush) {
-            $this->flushQueue($doFullFlush?'':('set_id='.intval($set_id).$addWhere));
+            $this->flushQueue($doFullFlush ? '' : ('set_id='.intval($set_id).$addWhere));
             return [];
         } else {
             return $this->db->exec_SELECTgetRows(
@@ -976,7 +976,7 @@ 
      */
     protected function flushQueue($where = '')
     {
-        $realWhere = strlen($where) > 0?$where:'1=1';
+        $realWhere = strlen($where) > 0 ? $where : '1=1';
 
         if (tx_crawler_domain_events_dispatcher::getInstance()->hasObserver('queueEntryFlush')) {
             $groups = $this->db->exec_SELECTgetRows('DISTINCT set_id', 'tx_crawler_queue', $realWhere);
@@ -1123,13 +1123,13 @@ 
             if ($this->extensionSettings['enableTimeslot']) {
                 $timeBegin = $currentTime - 100;
                 $timeEnd = $currentTime + 100;
-                $where = ' ((scheduled BETWEEN '.$timeBegin.' AND '.$timeEnd.' ) OR scheduled <= '. $currentTime.') ';
+                $where = ' ((scheduled BETWEEN '.$timeBegin.' AND '.$timeEnd.' ) OR scheduled <= '.$currentTime.') ';
             } else {
-                $where = 'scheduled <= ' . $currentTime;
+                $where = 'scheduled <= '.$currentTime;
             }
         } elseif ($tstamp > $currentTime) {
             //entry with a timestamp in the future need to have the same schedule time
-            $where = 'scheduled = ' . $tstamp ;
+            $where = 'scheduled = '.$tstamp;
         }
 
         if (!empty($where)) {
@@ -1137,10 +1137,10 @@ 
                 'qid',
                 'tx_crawler_queue',
                 $where.
-                ' AND NOT exec_time' .
+                ' AND NOT exec_time'.
                 ' AND NOT process_id '.
                 ' AND page_id='.intval($fieldArray['page_id']).
-                ' AND parameters_hash = ' . $this->db->fullQuoteStr($fieldArray['parameters_hash'], 'tx_crawler_queue')
+                ' AND parameters_hash = '.$this->db->fullQuoteStr($fieldArray['parameters_hash'], 'tx_crawler_queue')
             );
 
             if (is_array($result)) {
@@ -1180,13 +1180,13 @@ 
     {
         $ret = 0;
         if ($this->debugMode) {
-            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl start ' . microtime(true), __FUNCTION__);
+            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl start '.microtime(true), __FUNCTION__);
         }
         // Get entry:
         list($queueRec) = $this->db->exec_SELECTgetRows(
             '*',
             'tx_crawler_queue',
-            'qid=' . intval($queueId) . ($force ? '' : ' AND exec_time=0 AND process_scheduled > 0')
+            'qid='.intval($queueId).($force ? '' : ' AND exec_time=0 AND process_scheduled > 0')
         );
 
         if (!is_array($queueRec)) {
@@ -1195,10 +1195,10 @@ 
 
         $parameters = unserialize($queueRec['parameters']);
         if ($parameters['rootTemplatePid']) {
-            $this->initTSFE((int)$parameters['rootTemplatePid']);
+            $this->initTSFE((int) $parameters['rootTemplatePid']);
         } else {
             \TYPO3\CMS\Core\Utility\GeneralUtility::sysLog(
-                'Page with (' . $queueRec['page_id'] . ') could not be crawled, please check your crawler configuration. Perhaps no Root Template Pid is set',
+                'Page with ('.$queueRec['page_id'].') could not be crawled, please check your crawler configuration. Perhaps no Root Template Pid is set',
                 'crawler',
                 \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_WARNING
             );
@@ -1217,7 +1217,7 @@ 
             //if mulitprocessing is used we need to store the id of the process which has handled this entry
             $field_array['process_id_completed'] = $this->processID;
         }
-        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid=' . intval($queueId), $field_array);
+        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array);
 
         $result = $this->readUrl_exec($queueRec);
         $resultData = unserialize($result['content']);
@@ -1248,10 +1248,10 @@ 
             [$queueId, &$field_array]
         );
 
-        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid=' . intval($queueId), $field_array);
+        $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array);
 
         if ($this->debugMode) {
-            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl stop ' . microtime(true), __FUNCTION__);
+            \TYPO3\CMS\Core\Utility\GeneralUtility::devlog('crawler-readurl stop '.microtime(true), __FUNCTION__);
         }
 
         return $ret;
@@ -1348,7 +1348,7 @@ 
             return false;
         }
 
-        if (!in_array($url['scheme'], ['','http','https'])) {
+        if (!in_array($url['scheme'], ['', 'http', 'https'])) {
             if (TYPO3_DLOG) {
                 \TYPO3\CMS\Core\Utility\GeneralUtility::devLog(sprintf('Scheme does not match for url "%s"', $url), 'crawler', 4, ['crawlerId' => $crawlerId]);
             }
@@ -1368,14 +1368,14 @@ 
 
         if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse'] && $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) {
             $rurl = parse_url($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']);
-            $url['path'] = $url['scheme'] . '://' . $url['host'] . ($url['port'] > 0 ? ':' . $url['port'] : '') . $url['path'];
+            $url['path'] = $url['scheme'].'://'.$url['host'].($url['port'] > 0 ? ':'.$url['port'] : '').$url['path'];
             $reqHeaders = $this->buildRequestHeaderArray($url, $crawlerId);
         }
 
         $host = $rurl['host'];
 
         if ($url['scheme'] == 'https') {
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
             $port = ($rurl['port'] > 0) ? $rurl['port'] : 443;
         } else {
             $port = ($rurl['port'] > 0) ? $rurl['port'] : 80;
@@ -1399,13 +1399,13 @@ 
             fclose($fp);
 
             $time = microtime(true) - $startTime;
-            $this->log($originalUrl .' '.$time);
+            $this->log($originalUrl.' '.$time);
 
             // Implode content and headers:
             $result = [
                 'request' => $msg,
                 'headers' => implode('', $d['headers']),
-                'content' => implode('', (array)$d['content'])
+                'content' => implode('', (array) $d['content'])
             ];
 
             if (($this->extensionSettings['follow30x']) && ($newUrl = $this->getRequestUrlFrom302Header($d['headers'], $url['user'], $url['pass']))) {
@@ -1450,8 +1450,8 @@ 
 
         // Base path must be '/<pathSegements>/':
         if ($frontendBasePath != '/') {
-            $frontendBasePath = '/' . ltrim($frontendBasePath, '/');
-            $frontendBasePath = rtrim($frontendBasePath, '/') . '/';
+            $frontendBasePath = '/'.ltrim($frontendBasePath, '/');
+            $frontendBasePath = rtrim($frontendBasePath, '/').'/';
         }
 
         return $frontendBasePath;
@@ -1507,7 +1507,7 @@ 
     protected function log($message)
     {
         if (!empty($this->extensionSettings['logFileName'])) {
-            @file_put_contents($this->extensionSettings['logFileName'], date('Ymd His') . ' ' . $message . PHP_EOL, FILE_APPEND);
+            @file_put_contents($this->extensionSettings['logFileName'], date('Ymd His').' '.$message.PHP_EOL, FILE_APPEND);
         }
     }
 
@@ -1529,7 +1529,7 @@ 
         }
         $reqHeaders[] = 'Connection: close';
         if ($url['user'] != '') {
-            $reqHeaders[] = 'Authorization: Basic '. base64_encode($url['user'].':'.$url['pass']);
+            $reqHeaders[] = 'Authorization: Basic '.base64_encode($url['user'].':'.$url['pass']);
         }
         $reqHeaders[] = 'X-T3crawler: '.$crawlerId;
         $reqHeaders[] = 'User-Agent: TYPO3 crawler';
@@ -1568,9 +1568,9 @@ 
             if (!($tmp = parse_url($header['Location']))) {
                 return false;
             }
-            $newUrl = $tmp['scheme'] . '://' . $user . ':' . $pass . '@' . $tmp['host'] . $tmp['path'];
+            $newUrl = $tmp['scheme'].'://'.$user.':'.$pass.'@'.$tmp['host'].$tmp['path'];
             if ($tmp['query'] != '') {
-                $newUrl .= '?' . $tmp['query'];
+                $newUrl .= '?'.$tmp['query'];
             }
         } else {
             $newUrl = $header['Location'];
@@ -1658,7 +1658,7 @@ 
         /* @var $tree \TYPO3\CMS\Backend\Tree\View\PageTreeView */
         $tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
         $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-        $tree->init('AND ' . $perms_clause);
+        $tree->init('AND '.$perms_clause);
 
         $pageinfo = \TYPO3\CMS\Backend\Utility\BackendUtility::readPageAccess($id, $perms_clause);
 
@@ -1708,7 +1708,7 @@ 
 
             $code .= $this->drawURLs_addRowsForPage(
                 $data['row'],
-                $data['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], true)
+                $data['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], true)
             );
         }
 
@@ -1733,7 +1733,7 @@ 
             if (!empty($excludeString)) {
                 /* @var $tree \TYPO3\CMS\Backend\Tree\View\PageTreeView */
                 $tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
-                $tree->init('AND ' . $this->backendUser->getPagePermsClause(1));
+                $tree->init('AND '.$this->backendUser->getPagePermsClause(1));
 
                 $excludeParts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $excludeString);
 
@@ -1853,17 +1853,17 @@ 
 
                     // Compile row:
                     $content .= '
-                        <tr class="bgColor' . ($c % 2 ? '-20':'-10') . '">
-                            ' . $titleClm . '
-                            <td>' . htmlspecialchars($confKey) . '</td>
-                            <td>' . nl2br(htmlspecialchars(rawurldecode(trim(str_replace('&', chr(10) . '&', \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $confArray['paramParsed'])))))) . '</td>
+                        <tr class="bgColor' . ($c % 2 ? '-20' : '-10').'">
+                            ' . $titleClm.'
+                            <td>' . htmlspecialchars($confKey).'</td>
+                            <td>' . nl2br(htmlspecialchars(rawurldecode(trim(str_replace('&', chr(10).'&', \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $confArray['paramParsed'])))))).'</td>
                             <td>'.$paramExpanded.'</td>
-                            <td nowrap="nowrap">' . $urlList . '</td>
-                            <td nowrap="nowrap">' . $optionValues . '</td>
-                            <td nowrap="nowrap">' . \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($confArray['subCfg']['procInstrParams.']) . '</td>
+                            <td nowrap="nowrap">' . $urlList.'</td>
+                            <td nowrap="nowrap">' . $optionValues.'</td>
+                            <td nowrap="nowrap">' . \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($confArray['subCfg']['procInstrParams.']).'</td>
                         </tr>';
                 } else {
-                    $content .= '<tr class="bgColor'.($c % 2 ? '-20':'-10') . '">
+                    $content .= '<tr class="bgColor'.($c % 2 ? '-20' : '-10').'">
                             '.$titleClm.'
                             <td>'.htmlspecialchars($confKey).'</td>
                             <td colspan="5"><em>No entries</em> (Page is excluded in this configuration)</td>
@@ -2011,7 +2011,7 @@ 
             tx_crawler_domain_events_dispatcher::getInstance()->post(
                 'invokeQueueChange',
                 $this->setID,
-                [    'reason' => $reason ]
+                ['reason' => $reason]
             );
         }
 
@@ -2111,7 +2111,7 @@ 
      * @param  tx_crawler_cli_im $cliObj    Command line object
      * @return mixed                        Array of keys or null if no keys found
      */
-    protected function getConfigurationKeys(tx_crawler_cli_im &$cliObj)
+    protected function getConfigurationKeys(tx_crawler_cli_im & $cliObj)
     {
         $parameter = trim($cliObj->cli_argValue('-conf'));
         return ($parameter != '' ? \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $parameter) : []);
@@ -2138,7 +2138,7 @@ 
             $purgeDate = $this->getCurrentTime() - 24 * 60 * 60 * intval($this->extensionSettings['purgeQueueDays']);
             $del = $this->db->exec_DELETEquery(
                 'tx_crawler_queue',
-                'exec_time!=0 AND exec_time<' . $purgeDate
+                'exec_time!=0 AND exec_time<'.$purgeDate
             );
         }
 
@@ -2198,7 +2198,7 @@ 
                 $result |= $this->readUrl($r['qid']);
 
                 $counter++;
-                usleep(intval($sleepTime));    // Just to relax the system
+                usleep(intval($sleepTime)); // Just to relax the system
 
                 // if during the start and the current read url the cli has been disable we need to return from the function
                 // mark the process NOT as ended.
@@ -2211,7 +2211,7 @@ 
 
                     //TODO might need an additional returncode
                     $result |= self::CLI_STATUS_ABORTED;
-                    break;        //possible timeout
+                    break; //possible timeout
                 }
             }
 
@@ -2327,7 +2327,7 @@ 
         }
 
         if (!count($releaseIds) > 0) {
-            return false;   //nothing to release
+            return false; //nothing to release
         }
 
         if (!$withinLock) {
@@ -2471,7 +2471,7 @@ 
 
         $cmd = escapeshellcmd($this->extensionSettings['phpPath']);
         $cmd .= ' ';
-        $cmd .= escapeshellarg(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler') . 'cli/bootstrap.php');
+        $cmd .= escapeshellarg(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler').'cli/bootstrap.php');
         $cmd .= ' ';
         $cmd .= escapeshellarg($this->getFrontendBasePath());
         $cmd .= ' ';
@@ -2481,10 +2481,10 @@ 
 
         $startTime = microtime(true);
         $content = $this->executeShellCommand($cmd);
-        $this->log($url . ' ' . (microtime(true) - $startTime));
+        $this->log($url.' '.(microtime(true) - $startTime));
 
         $result = [
-            'request' => implode("\r\n", $requestHeaders) . "\r\n\r\n",
+            'request' => implode("\r\n", $requestHeaders)."\r\n\r\n",
             'headers' => '',
             'content' => $content
         ];
@@ -2505,7 +2505,7 @@ 
         $scheduledAgeInSeconds = $this->extensionSettings['cleanUpScheduledAge'] * 86400;
 
         $now = time();
-        $condition = '(exec_time<>0 AND exec_time<' . ($now - $processedAgeInSeconds) . ') OR scheduled<=' . ($now - $scheduledAgeInSeconds);
+        $condition = '(exec_time<>0 AND exec_time<'.($now - $processedAgeInSeconds).') OR scheduled<='.($now - $scheduledAgeInSeconds);
         $this->flushQueue($condition);
     }
 

ext_autoload.php

Spacing +20 added lines, -20 removed lines

@@ -1,24 +1,24 @@
 <?php
 $extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler');
 return [
-    'tx_crawler_lib' => $extensionPath . 'class.tx_crawler_lib.php',
-    'tx_crawler_cli_flush' => $extensionPath . 'cli/class.tx_crawler_cli_flush.php',
-    'tx_crawler_cli' => $extensionPath . 'cli/class.tx_crawler_cli.php',
-    'tx_crawler_cli_im' => $extensionPath . 'cli/class.tx_crawler_cli_im.php',
-    'tx_crawler_domain_events_dispatcher' => $extensionPath . 'domain/events/class.tx_crawler_domain_events_dispatcher.php',
-    'tx_crawler_domain_events_observer' => $extensionPath . 'domain/events/interface.tx_crawler_domain_events_observer.php',
-    'tx_crawler_domain_lib_abstract_dbobject' => $extensionPath . 'domain/lib/class.tx_crawler_domain_lib_abstract_dbobject.php',
-    'tx_crawler_domain_process_manager' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_manager.php',
-    'tx_crawler_domain_process' => $extensionPath . 'domain/process/class.tx_crawler_domain_process.php',
-    'tx_crawler_domain_process_collection' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_collection.php',
-    'tx_crawler_domain_process_repository' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_repository.php',
-    'tx_crawler_domain_queue_entry' => $extensionPath . 'domain/queue/class.tx_crawler_domain_queue_entry.php',
-    'tx_crawler_domain_queue_repository' => $extensionPath . 'domain/queue/class.tx_crawler_domain_queue_repository.php',
-    'tx_crawler_domain_reason' => $extensionPath . 'domain/reason/class.tx_crawler_domain_reason.php',
-    'tx_crawler_hooks_tsfe' => $extensionPath . 'hooks/class.tx_crawler_hooks_tsfe.php',
-    'tx_crawler_hooks_staticFileCacheCreateUri' => $extensionPath . 'hooks/class.tx_crawler_hooks_staticFileCacheCreateUri.php',
-    'tx_crawler_hooks_processCleanUp' => $extensionPath . 'hooks/class.tx_crawler_hooks_processCleanUp.php',
-    'tx_crawler_modfunc1' => $extensionPath . 'modfunc1/class.tx_crawler_modfunc1.php',
-    'tx_crawler_view_pagination' => $extensionPath . 'view/class.tx_crawler_view_pagination.php',
-    'tx_crawler_view_process_list' => $extensionPath . 'view/process/class.tx_crawler_view_process_list.php',
+    'tx_crawler_lib' => $extensionPath.'class.tx_crawler_lib.php',
+    'tx_crawler_cli_flush' => $extensionPath.'cli/class.tx_crawler_cli_flush.php',
+    'tx_crawler_cli' => $extensionPath.'cli/class.tx_crawler_cli.php',
+    'tx_crawler_cli_im' => $extensionPath.'cli/class.tx_crawler_cli_im.php',
+    'tx_crawler_domain_events_dispatcher' => $extensionPath.'domain/events/class.tx_crawler_domain_events_dispatcher.php',
+    'tx_crawler_domain_events_observer' => $extensionPath.'domain/events/interface.tx_crawler_domain_events_observer.php',
+    'tx_crawler_domain_lib_abstract_dbobject' => $extensionPath.'domain/lib/class.tx_crawler_domain_lib_abstract_dbobject.php',
+    'tx_crawler_domain_process_manager' => $extensionPath.'domain/process/class.tx_crawler_domain_process_manager.php',
+    'tx_crawler_domain_process' => $extensionPath.'domain/process/class.tx_crawler_domain_process.php',
+    'tx_crawler_domain_process_collection' => $extensionPath.'domain/process/class.tx_crawler_domain_process_collection.php',
+    'tx_crawler_domain_process_repository' => $extensionPath.'domain/process/class.tx_crawler_domain_process_repository.php',
+    'tx_crawler_domain_queue_entry' => $extensionPath.'domain/queue/class.tx_crawler_domain_queue_entry.php',
+    'tx_crawler_domain_queue_repository' => $extensionPath.'domain/queue/class.tx_crawler_domain_queue_repository.php',
+    'tx_crawler_domain_reason' => $extensionPath.'domain/reason/class.tx_crawler_domain_reason.php',
+    'tx_crawler_hooks_tsfe' => $extensionPath.'hooks/class.tx_crawler_hooks_tsfe.php',
+    'tx_crawler_hooks_staticFileCacheCreateUri' => $extensionPath.'hooks/class.tx_crawler_hooks_staticFileCacheCreateUri.php',
+    'tx_crawler_hooks_processCleanUp' => $extensionPath.'hooks/class.tx_crawler_hooks_processCleanUp.php',
+    'tx_crawler_modfunc1' => $extensionPath.'modfunc1/class.tx_crawler_modfunc1.php',
+    'tx_crawler_view_pagination' => $extensionPath.'view/class.tx_crawler_view_pagination.php',
+    'tx_crawler_view_process_list' => $extensionPath.'view/process/class.tx_crawler_view_process_list.php',
 ];

Classes/Utility/TcaUtility.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
     {
         if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['procInstructions'])) {
             foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['procInstructions'] as $key => $value) {
-                $configuration['items'][] = [$value . ' [' . $key . ']', $key, $this->getExtensionIcon($key)];
+                $configuration['items'][] = [$value.' ['.$key.']', $key, $this->getExtensionIcon($key)];
             }
         }
 
@@ -59,8 +59,8 @@ 
         if (method_exists('TYPO3\\CMS\\Core\\Utility\\ExtensionManagementUtility', 'getExtensionKeyByPrefix')) {
             $parts = explode('_', $key);
             if (is_array($parts) && count($parts) > 2) {
-                $extensionKey = ExtensionManagementUtility::getExtensionKeyByPrefix('tx_' . $parts[1]);
-                $extIcon = ExtensionManagementUtility::siteRelPath($extensionKey) . 'ext_icon.gif';
+                $extensionKey = ExtensionManagementUtility::getExtensionKeyByPrefix('tx_'.$parts[1]);
+                $extIcon = ExtensionManagementUtility::siteRelPath($extensionKey).'ext_icon.gif';
             }
         }
 

Classes/Task/CrawlerQueueTaskAdditionalFieldProvider.php

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
 
         // input for startPage
         $fieldId = 'task_startPage';
-        $fieldCode = '<input name="tx_scheduler[startPage]" type="text" id="' . $fieldId . '" value="' . $task->startPage . '" class="form-control" />';
+        $fieldCode = '<input name="tx_scheduler[startPage]" type="text" id="'.$fieldId.'" value="'.$task->startPage.'" class="form-control" />';
         $additionalFields[$fieldId] = [
             'code' => $fieldCode,
             'label' => 'LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_im.startPage'
@@ -104,10 +104,10 @@ 
             '4' => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
             '99' => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi'),
         ];
-        $fieldCode = '<select name="tx_scheduler[depth]" id="' . $fieldId . '" class="form-control">';
+        $fieldCode = '<select name="tx_scheduler[depth]" id="'.$fieldId.'" class="form-control">';
 
         foreach ($fieldValueArray as $key => $label) {
-            $fieldCode .= "\t" . '<option value="' . $key . '"' . (($key == $task->depth) ? ' selected="selected"' : '') . '>' . $label . '</option>';
+            $fieldCode .= "\t".'<option value="'.$key.'"'.(($key == $task->depth) ? ' selected="selected"' : '').'>'.$label.'</option>';
         }
 
         $fieldCode .= '</select>';
@@ -119,10 +119,10 @@ 
         // combobox for configuration records
         $recordsArray = $this->getCrawlerConfigurationRecords();
         $fieldId = 'task_configuration';
-        $fieldCode = '<select name="tx_scheduler[configuration][]" multiple="multiple" id="' . $fieldId . '" class="form-control">';
-        $fieldCode .= "\t" . '<option value=""></option>';
+        $fieldCode = '<select name="tx_scheduler[configuration][]" multiple="multiple" id="'.$fieldId.'" class="form-control">';
+        $fieldCode .= "\t".'<option value=""></option>';
         for ($i = 0; $i < count($recordsArray); $i++) {
-            $fieldCode .= "\t" . '<option ' . $this->getSelectedState($task->configuration, $recordsArray[$i]['name']) . 'value="' . $recordsArray[$i]['name'] . '">' . $recordsArray[$i]['name'] . '</option>';
+            $fieldCode .= "\t".'<option '.$this->getSelectedState($task->configuration, $recordsArray[$i]['name']).'value="'.$recordsArray[$i]['name'].'">'.$recordsArray[$i]['name'].'</option>';
         }
         $fieldCode .= '</select>';
 
@@ -165,7 +165,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'tx_crawler_configuration',
-            '1=1' . BackendUtility::deleteClause('tx_crawler_configuration')
+            '1=1'.BackendUtility::deleteClause('tx_crawler_configuration')
         );
 
         while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {

domain/process/class.tx_crawler_domain_process_manager.php

Spacing +6 added lines, -6 removed lines

@@ -87,7 +87,7 @@ 
     public function multiProcess($timeout)
     {
         if ($this->processLimit <= 1) {
-            throw new RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.' . PHP_EOL);
+            throw new RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.'.PHP_EOL);
         }
 
         $pendingItemsStart = $this->queueRepository->countAllPendingItems();
@@ -149,14 +149,14 @@ 
         $currentProcesses = $this->processRepository->countActive();
         $availableProcessesCount = $this->processLimit - $currentProcesses;
         $requiredProcessesCount = ceil($this->queueRepository->countAllUnassignedPendingItems() / $this->countInARun);
-        $startProcessCount = min([$availableProcessesCount,$requiredProcessesCount]);
+        $startProcessCount = min([$availableProcessesCount, $requiredProcessesCount]);
         if ($startProcessCount <= 0) {
             return $ret;
         }
         if ($startProcessCount && $this->verbose) {
             echo 'Start '.$startProcessCount.' new processes (Running:'.$currentProcesses.')';
         }
-        for ($i = 0;$i < $startProcessCount;$i++) {
+        for ($i = 0; $i < $startProcessCount; $i++) {
             usleep(100);
             if ($this->startProcess()) {
                 if ($this->verbose) {
@@ -179,11 +179,11 @@ 
     {
         $ttl = (time() + $this->timeToLive - 1);
         $current = $this->processRepository->countNotTimeouted($ttl);
-        $completePath = '(' .escapeshellcmd($this->getCrawlerCliPath()) . ' &) > /dev/null';
+        $completePath = '('.escapeshellcmd($this->getCrawlerCliPath()).' &) > /dev/null';
         if (system($completePath) === false) {
             throw new Exception('could not start process!');
         } else {
-            for ($i = 0;$i < 10;$i++) {
+            for ($i = 0; $i < 10; $i++) {
                 if ($this->processRepository->countNotTimeouted($ttl) > $current) {
                     return true;
                 }
@@ -200,7 +200,7 @@ 
      */
     public function getCrawlerCliPath()
     {
-        $phpPath = $this->crawlerObj->extensionSettings['phpPath'] . ' ';
+        $phpPath = $this->crawlerObj->extensionSettings['phpPath'].' ';
         $pathToTypo3 = rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_DOCUMENT_ROOT'), '/');
         $pathToTypo3 .= rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'), '/');
         $cliPart = '/typo3/cli_dispatch.phpsh crawler';

domain/queue/class.tx_crawler_domain_queue_repository.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     {
         $db = $this->getDB();
         $where = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) .
-                   ' AND exec_time > 0 ';
+                    ' AND exec_time > 0 ';
         $limit = 1;
         $groupby = '';
 

Spacing +10 added lines, -10 removed lines

@@ -63,7 +63,7 @@ 
     protected function getFirstOrLastObjectByProcess($process, $orderby)
     {
         $db = $this->getDB();
-        $where = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) .
+        $where = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(), $this->tableName).
                    ' AND exec_time > 0 ';
         $limit = 1;
         $groupby = '';
@@ -88,7 +88,7 @@ 
      */
     public function countExecutedItemsByProcess($process)
     {
-        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = ' . $this->getDB()->fullQuoteStr(
+        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr(
             $process->getProcess_id(),
                 $this->tableName
         ));
@@ -103,7 +103,7 @@ 
      */
     public function countNonExecutedItemsByProcess($process)
     {
-        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = ' . $this->getDB()->fullQuoteStr(
+        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr(
             $process->getProcess_id(),
                 $this->tableName
         ));
@@ -119,7 +119,7 @@ 
      */
     public function countAllPendingItems()
     {
-        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < ' . time());
+        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < '.time());
     }
 
     /**
@@ -132,7 +132,7 @@ 
      */
     public function countAllAssignedPendingItems()
     {
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id != ''");
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id != ''");
     }
 
     /**
@@ -145,7 +145,7 @@ 
      */
     public function countAllUnassignedPendingItems()
     {
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id = ''");
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id = ''");
     }
 
     /**
@@ -175,7 +175,7 @@ 
         $res = $db->exec_SELECTquery(
             "configuration, count(*) as unprocessed, sum(process_id != '') as assignedButUnprocessed",
             $this->tableName,
-            'exec_time = 0 AND scheduled < ' . time(),
+            'exec_time = 0 AND scheduled < '.time(),
             'configuration'
         );
         $rows = [];
@@ -199,7 +199,7 @@ 
         $res = $db->exec_SELECTquery(
             'set_id',
             $this->tableName,
-            'exec_time = 0 AND scheduled < ' . time(),
+            'exec_time = 0 AND scheduled < '.time(),
             'set_id'
         );
         $setIds = [];
@@ -225,7 +225,7 @@ 
             $res = $db->exec_SELECTquery(
                 'configuration, count(*) as c',
                 $this->tableName,
-                'set_id in (' . implode(',', $setIds) . ') AND scheduled < ' . time(),
+                'set_id in ('.implode(',', $setIds).') AND scheduled < '.time(),
                 'configuration'
             );
             while ($row = $db->sql_fetch_assoc($res)) {
@@ -305,7 +305,7 @@ 
         $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),
+            'exec_time != 0 and exec_time >= '.intval($start).' and exec_time <= '.intval($end),
             'process_id_completed'
         );
 

modfunc1/class.tx_crawler_modfunc1.php

Spacing +24 added lines, -24 removed lines

@@ -201,15 +201,15 @@ 
                 'index.php'
             );
 
-            $quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details=' . intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : '';
+            $quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : '';
 
             $setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
 
             $h_func .= '<hr/>'.
-                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.display').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->pObj->id, 'SET[log_display]', $this->pObj->MOD_SETTINGS['log_display'], $this->pObj->MOD_MENU['log_display'], 'index.php', '&setID='.$setId) . ' - ' .
-                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showresultlog').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_resultLog]', $this->pObj->MOD_SETTINGS['log_resultLog'], 'index.php', '&setID='.$setId . $quiPart) . ' - ' .
-                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showfevars').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_feVars]', $this->pObj->MOD_SETTINGS['log_feVars'], 'index.php', '&setID='.$setId . $quiPart) . ' - ' .
-                    $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage').': ' .
+                    $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]',
@@ -222,7 +222,7 @@ 
         $theOutput = $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1);
 
         // Branch based on type:
-        switch ((string)$this->pObj->MOD_SETTINGS['crawlaction']) {
+        switch ((string) $this->pObj->MOD_SETTINGS['crawlaction']) {
             case 'start':
                 if (empty($this->pObj->id)) {
                     $this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noPageSelected'));
@@ -269,7 +269,7 @@ 
         $this->downloadCrawlUrls = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('_download');
         $this->makeCrawlerProcessableChecks();
 
-        switch ((string)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp')) {
+        switch ((string) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp')) {
             case 'midnight':
                 $this->scheduledTime = mktime(0, 0, 0);
             break;
@@ -312,7 +312,7 @@ 
                 tx_crawler_domain_events_dispatcher::getInstance()->post(
                     'invokeQueueChange',
                                                                             $this->findCrawler()->setID,
-                                                                            [	'reason' => $reason ]
+                                                                            ['reason' => $reason]
                 );
             }
 
@@ -396,11 +396,11 @@ 
             $this->pObj->MOD_SETTINGS['depth'],
             0
         );
-        $availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth']?$this->pObj->MOD_SETTINGS['depth']:0);
+        $availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth'] ? $this->pObj->MOD_SETTINGS['depth'] : 0);
 
         // Configurations
         $cell[] = $this->selectorBox(
-            empty($availableConfigurations)?[]:array_combine($availableConfigurations, $availableConfigurations),
+            empty($availableConfigurations) ? [] : array_combine($availableConfigurations, $availableConfigurations),
             'configurationSelection',
             $this->incomingConfigurationSelection,
             1
@@ -529,12 +529,12 @@ 
             // Print rudimentary details:
             $output .= '
 				<br /><br />
-				<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.back') . '" name="_back" />
-				<input type="hidden" value="' . $this->pObj->id . '" name="id" />
-				<input type="hidden" value="' . $showSetId . '" name="setID" />
+				<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.back').'" name="_back" />
+				<input type="hidden" value="' . $this->pObj->id.'" name="id" />
+				<input type="hidden" value="' . $showSetId.'" name="setID" />
 				<br />
-				Current server time: ' . date('H:i:s', time()) . '<br />' .
-                'Status: ' . $resStatus . '<br />' .
+				Current server time: ' . date('H:i:s', time()).'<br />'.
+                'Status: '.$resStatus.'<br />'.
                 \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($q_entry);
         } else {	// Show list:
 
@@ -564,7 +564,7 @@ 
                     foreach ($tree->tree as $data) {
                         $code .= $this->drawLog_addRows(
                                     $data['row'],
-                                    $data['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], true),
+                                    $data['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], true),
                                     intval($this->pObj->MOD_SETTINGS['itemsPerPage'])
                                 );
                         if (++$count == 1000) {
@@ -618,7 +618,7 @@ 
                 $cc = 0;
                 foreach ($setList as $set) {
                     $code .= '
-						<tr class="bgColor'.($cc % 2 ? '-20':'-10').'">
+						<tr class="bgColor'.($cc % 2 ? '-20' : '-10').'">
 							<td><a href="'.htmlspecialchars('index.php?setID='.$set['set_id']).'">'.$set['set_id'].'</a></td>
 							<td>'.$set['count_value'].'</td>
 							<td>'.\TYPO3\CMS\Backend\Utility\BackendUtility::dateTimeAge($set['scheduled']).'</td>
@@ -759,14 +759,14 @@ 
                 }
 
                 $setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID'));
-                $refreshIcon = $GLOBALS['BACK_PATH'] . 'sysext/t3skin/extjs/images/grid/refresh.gif';
+                $refreshIcon = $GLOBALS['BACK_PATH'].'sysext/t3skin/extjs/images/grid/refresh.gif';
 
                 // Put rows together:
                 $content .= '
-					<tr class="bgColor'.($c % 2 ? '-20':'-10').'">
+					<tr class="bgColor'.($c % 2 ? '-20' : '-10').'">
 						'.$titleClm.'
-						<td><a href="' . $this->getModuleUrl(['qid_details' => $vv['qid'], 'setID' => $setId]) . '">'.htmlspecialchars($vv['qid']).'</a></td>
-						<td><a href="' . $this->getModuleUrl(['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>';
+						<td><a href="' . $this->getModuleUrl(['qid_details' => $vv['qid'], 'setID' => $setId]).'">'.htmlspecialchars($vv['qid']).'</a></td>
+						<td><a href="' . $this->getModuleUrl(['qid_read' => $vv['qid'], 'setID' => $setId]).'"><img src="'.$refreshIcon.'" width="14" hspace="1" vspace="2" height="14" border="0" title="'.htmlspecialchars('Read').'" alt="" /></a></td>';
                 foreach ($rowData as $fKey => $value) {
                     if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url', $fKey)) {
                         $content .= '
@@ -984,7 +984,7 @@ 
 
         $exitCode = 0;
         $out = [];
-        exec(escapeshellcmd($this->extensionSettings['phpPath'] . ' -v'), $out, $exitCode);
+        exec(escapeshellcmd($this->extensionSettings['phpPath'].' -v'), $out, $exitCode);
         if ($exitCode > 0) {
             $this->addErrorMessage(sprintf($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.phpBinaryNotFound'), htmlspecialchars($this->extensionSettings['phpPath'])));
         }
@@ -1173,10 +1173,10 @@ 
         $options = [];
         foreach ($optArray as $key => $val) {
             $options[] = '
-				<option value="'.htmlspecialchars($key).'"'.((!$multiple && !strcmp($value, $key)) || ($multiple && in_array($key, (array)$value))?' selected="selected"':'').'>'.htmlspecialchars($val).'</option>';
+				<option value="'.htmlspecialchars($key).'"'.((!$multiple && !strcmp($value, $key)) || ($multiple && in_array($key, (array) $value)) ? ' selected="selected"' : '').'>'.htmlspecialchars($val).'</option>';
         }
 
-        $output = '<select name="'.htmlspecialchars($name.($multiple?'[]':'')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('', $options).'</select>';
+        $output = '<select name="'.htmlspecialchars($name.($multiple ? '[]' : '')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('', $options).'</select>';
 
         return $output;
     }