AOEpeople / crawler

class.tx_crawler_lib.php

Doc Comments +12 added lines, -6 removed lines

@@ -475,7 +475,7 @@ 
      *
      * @param string $piString PI to test
      * @param array $incomingProcInstructions Processing instructions
-     * @return boolean
+     * @return boolean|null
      */
     public function drawURLs_PIfilter($piString, array $incomingProcInstructions)
     {
@@ -685,6 +685,9 @@ 
         return $baseUrl;
     }
 
+    /**
+     * @param integer $rootid
+     */
     public function getConfigurationsForBranch($rootid, $depth)
     {
         $configurationsForBranch = [];
@@ -906,7 +909,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
      */
     public function compileUrls($paramArray, $urls = [])
@@ -1556,6 +1559,7 @@ 
 
     /**
      * @param message
+     * @param string $message
      */
     protected function log($message)
     {
@@ -1570,7 +1574,7 @@ 
      * @param array $url
      * @param string $crawlerId
      *
-     * @return array
+     * @return string[]
      */
     protected function buildRequestHeaderArray(array $url, $crawlerId)
     {
@@ -1826,6 +1830,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)
@@ -2114,7 +2119,7 @@ 
     /**
      * Function executed by crawler_im.php cli script.
      *
-     * @return bool
+     * @return null|boolean
      */
     public function CLI_main_flush()
     {
@@ -2173,7 +2178,7 @@ 
      * @param int $countInARun
      * @param int $sleepTime
      * @param int $sleepAfterFinish
-     * @return string
+     * @return integer
      */
     public function CLI_run($countInARun, $sleepTime, $sleepAfterFinish)
     {
@@ -2448,6 +2453,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.
@@ -2488,7 +2494,7 @@ 
     /**
      * @param bool $get_as_float
      *
-     * @return mixed
+     * @return string
      */
     protected function microtime($get_as_float = false)
     {

Spacing +135 added lines, -135 removed lines

@@ -204,7 +204,7 @@ 
     {
         $this->db = $GLOBALS['TYPO3_DB'];
         $this->backendUser = $GLOBALS['BE_USER'];
-        $this->processFilename = PATH_site . 'typo3temp/tx_crawler.proc';
+        $this->processFilename = PATH_site.'typo3temp/tx_crawler.proc';
 
         $settings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['crawler']);
         $settings = is_array($settings) ? $settings : [];
@@ -262,7 +262,7 @@ 
                 foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['excludeDoktype'] as $key => $doktypeList) {
                     if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($doktypeList, $pageRow['doktype'])) {
                         $skipPage = true;
-                        $skipMessage = 'Doktype was excluded by "' . $key . '"';
+                        $skipMessage = 'Doktype was excluded by "'.$key.'"';
                         break;
                     }
                 }
@@ -283,7 +283,7 @@ 
                         if (is_string($veto)) {
                             $skipMessage = $veto;
                         } else {
-                            $skipMessage = 'Veto from hook "' . htmlspecialchars($key) . '"';
+                            $skipMessage = 'Veto from hook "'.htmlspecialchars($key).'"';
                         }
                         // no need to execute other hooks if a previous one return a veto
                         break;
@@ -332,7 +332,7 @@ 
     protected function noUnprocessedQueueEntriesForPageWithConfigurationHashExist($uid, $configurationHash)
     {
         $configurationHash = $this->db->fullQuoteStr($configurationHash, 'tx_crawler_queue');
-        $res = $this->db->exec_SELECTquery('count(*) as anz', 'tx_crawler_queue', "page_id=" . intval($uid) . " AND configuration_hash=" . $configurationHash . " AND exec_time=0");
+        $res = $this->db->exec_SELECTquery('count(*) as anz', 'tx_crawler_queue', "page_id=".intval($uid)." AND configuration_hash=".$configurationHash." AND exec_time=0");
         $row = $this->db->sql_fetch_assoc($res);
 
         return ($row['anz'] == 0);
@@ -408,14 +408,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'];
+                    $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' => [
@@ -434,12 +434,12 @@ 
                     if (isset($duplicateTrack[$uKey])) {
 
                         //if the url key is registered just display it and do not resubmit is
-                        $urlList = '<em><span class="typo3-dimmed">' . htmlspecialchars($urlQuery) . '</span></em><br/>';
+                        $urlList = '<em><span class="typo3-dimmed">'.htmlspecialchars($urlQuery).'</span></em><br/>';
                     } else {
-                        $urlList = '[' . date('d.m.y H:i', $schTime) . '] ' . htmlspecialchars($urlQuery);
-                        $this->urlList[] = '[' . date('d.m.y H:i', $schTime) . '] ' . $urlQuery;
+                        $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) {
@@ -541,7 +541,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'], '')) {
@@ -566,9 +566,9 @@ 
 
                             // recognize MP value
                             if (!$this->MP) {
-                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id=' . $id]);
+                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id='.$id]);
                             } else {
-                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id=' . $id . '&MP=' . $this->MP]);
+                                $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id='.$id.'&MP='.$this->MP]);
                             }
                         }
                     }
@@ -588,7 +588,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)) {
@@ -634,8 +634,8 @@ 
                                     $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]['origin'] = 'tx_crawler_configuration_' . $configurationRecord['uid'];
+                                    $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id='.$id]);
+                                    $res[$key]['origin'] = 'tx_crawler_configuration_'.$configurationRecord['uid'];
                                 }
                             }
                         }
@@ -673,13 +673,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;
@@ -709,7 +709,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'];
@@ -718,10 +718,10 @@ 
         $res = $this->db->exec_SELECTquery(
             '*',
             'tx_crawler_configuration',
-            'pid IN (' . implode(',', $pids) . ') ' .
-            \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') . ' '
+            'pid IN ('.implode(',', $pids).') '.
+            \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('tx_crawler_configuration').
+            \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('tx_crawler_configuration').' '.
+            \TYPO3\CMS\Backend\Utility\BackendUtility::versioningPlaceholderClause('tx_crawler_configuration').' '
         );
 
         while ($row = $this->db->sql_fetch_assoc($res)) {
@@ -820,7 +820,7 @@ 
 
                         // Traverse range, add values:
                         $runAwayBrake = 1000; // Limit to size of range!
-                        for ($a = $reg[1]; $a <= $reg[2];$a++) {
+                        for ($a = $reg[1]; $a <= $reg[2]; $a++) {
                             $paramArray[$p][] = $a;
                             $runAwayBrake--;
                             if ($runAwayBrake <= 0) {
@@ -850,16 +850,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']),
                                     '',
                                     '',
                                     '',
@@ -921,7 +921,7 @@ 
             $newUrls = [];
             foreach ($urls as $url) {
                 foreach ($valueSet as $val) {
-                    $newUrls[] = $url . (strcmp($val, '') ? '&' . rawurlencode($varName) . '=' . rawurlencode($val) : '');
+                    $newUrls[] = $url.(strcmp($val, '') ? '&'.rawurlencode($varName).'='.rawurlencode($val) : '');
 
                     if (count($newUrls) > \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($this->extensionSettings['maxCompileUrls'], 1, 1000000000, 10000)) {
                         break;
@@ -968,13 +968,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) : '')
@@ -1007,13 +1007,13 @@ 
         }
         // 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(
                 '*',
                 'tx_crawler_queue',
-                'set_id=' . intval($set_id) . $addWhere,
+                'set_id='.intval($set_id).$addWhere,
                 '',
                 'scheduled DESC',
                 (intval($itemsPerPage) > 0 ? intval($itemsPerPage) : '')
@@ -1034,7 +1034,7 @@ 
         if (tx_crawler_domain_events_dispatcher::getInstance()->hasObserver('queueEntryFlush')) {
             $groups = $this->db->exec_SELECTgetRows('DISTINCT set_id', 'tx_crawler_queue', $realWhere);
             foreach ($groups as $group) {
-                tx_crawler_domain_events_dispatcher::getInstance()->post('queueEntryFlush', $group['set_id'], $this->db->exec_SELECTgetRows('uid, set_id', 'tx_crawler_queue', $realWhere . ' AND set_id="' . $group['set_id'] . '"'));
+                tx_crawler_domain_events_dispatcher::getInstance()->post('queueEntryFlush', $group['set_id'], $this->db->exec_SELECTgetRows('uid, set_id', 'tx_crawler_queue', $realWhere.' AND set_id="'.$group['set_id'].'"'));
             }
         }
 
@@ -1176,24 +1176,24 @@ 
             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)) {
             $result = $this->db->exec_SELECTgetRows(
                 'qid',
                 'tx_crawler_queue',
-                $where .
-                ' 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')
+                $where.
+                ' 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')
             );
 
             if (is_array($result)) {
@@ -1233,13 +1233,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)) {
@@ -1248,10 +1248,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
             );
@@ -1270,7 +1270,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']);
@@ -1301,10 +1301,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;
@@ -1335,7 +1335,7 @@ 
             [$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);
 
         return $result;
     }
@@ -1359,12 +1359,12 @@ 
                     unset($parameters['_CALLBACKOBJ']);
                     $result = ['content' => serialize($callBackObj->crawler_execute($parameters, $this))];
                 } else {
-                    $result = ['content' => 'No object: ' . $objRef];
+                    $result = ['content' => 'No object: '.$objRef];
                 }
             } else { // Regular FE request:
 
                 // Prepare:
-                $crawlerId = $queueRec['qid'] . ':' . md5($queueRec['qid'] . '|' . $queueRec['set_id'] . '|' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']);
+                $crawlerId = $queueRec['qid'].':'.md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']);
 
                 // Get result:
                 $result = $this->requestUrl($parameters['url'], $crawlerId);
@@ -1401,7 +1401,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]);
             }
@@ -1421,14 +1421,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;
@@ -1444,7 +1444,7 @@ 
             return false;
         } else {
             // Request message:
-            $msg = implode("\r\n", $reqHeaders) . "\r\n\r\n";
+            $msg = implode("\r\n", $reqHeaders)."\r\n\r\n";
             fputs($fp, $msg);
 
             // Read response:
@@ -1452,13 +1452,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']))) {
@@ -1503,8 +1503,8 @@ 
 
         // Base path must be '/<pathSegements>/':
         if ($frontendBasePath != '/') {
-            $frontendBasePath = '/' . ltrim($frontendBasePath, '/');
-            $frontendBasePath = rtrim($frontendBasePath, '/') . '/';
+            $frontendBasePath = '/'.ltrim($frontendBasePath, '/');
+            $frontendBasePath = rtrim($frontendBasePath, '/').'/';
         }
 
         return $frontendBasePath;
@@ -1560,7 +1560,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);
         }
     }
 
@@ -1575,16 +1575,16 @@ 
     protected function buildRequestHeaderArray(array $url, $crawlerId)
     {
         $reqHeaders = [];
-        $reqHeaders[] = 'GET ' . $url['path'] . ($url['query'] ? '?' . $url['query'] : '') . ' HTTP/1.0';
-        $reqHeaders[] = 'Host: ' . $url['host'];
+        $reqHeaders[] = 'GET '.$url['path'].($url['query'] ? '?'.$url['query'] : '').' HTTP/1.0';
+        $reqHeaders[] = 'Host: '.$url['host'];
         if (stristr($url['query'], 'ADMCMD_previewWS')) {
             $reqHeaders[] = 'Cookie: $Version="1"; be_typo_user="1"; $Path=/';
         }
         $reqHeaders[] = 'Connection: close';
         if ($url['user'] != '') {
-            $reqHeaders[] = 'Authorization: Basic ' . base64_encode($url['user'] . ':' . $url['pass']);
+            $reqHeaders[] = 'Authorization: Basic '.base64_encode($url['user'].':'.$url['pass']);
         }
-        $reqHeaders[] = 'X-T3crawler: ' . $crawlerId;
+        $reqHeaders[] = 'X-T3crawler: '.$crawlerId;
         $reqHeaders[] = 'User-Agent: TYPO3 crawler';
         return $reqHeaders;
     }
@@ -1621,9 +1621,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'];
@@ -1651,10 +1651,10 @@ 
             // Authenticate crawler request:
         if (isset($_SERVER['HTTP_X_T3CRAWLER'])) {
             list($queueId, $hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']);
-            list($queueRec) = $this->db->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid=' . intval($queueId));
+            list($queueRec) = $this->db->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval($queueId));
 
             // If a crawler record was found and hash was matching, set it up:
-            if (is_array($queueRec) && $hash === md5($queueRec['qid'] . '|' . $queueRec['set_id'] . '|' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
+            if (is_array($queueRec) && $hash === md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
                 $params['pObj']->applicationData['tx_crawler']['running'] = true;
                 $params['pObj']->applicationData['tx_crawler']['parameters'] = unserialize($queueRec['parameters']);
                 $params['pObj']->applicationData['tx_crawler']['log'] = [];
@@ -1711,7 +1711,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);
 
@@ -1734,19 +1734,19 @@ 
 
             // recognize mount points
             if ($data['row']['doktype'] == 7) {
-                $mountpage = $this->db->exec_SELECTgetRows('*', 'pages', 'uid = ' . $data['row']['uid']);
+                $mountpage = $this->db->exec_SELECTgetRows('*', 'pages', 'uid = '.$data['row']['uid']);
 
                 // fetch mounted pages
-                $this->MP = $mountpage[0]['mount_pid'] . '-' . $data['row']['uid'];
+                $this->MP = $mountpage[0]['mount_pid'].'-'.$data['row']['uid'];
 
                 $mountTree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView');
-                $mountTree->init('AND ' . $perms_clause);
+                $mountTree->init('AND '.$perms_clause);
                 $mountTree->getTree($mountpage[0]['mount_pid'], $depth, '');
 
                 foreach ($mountTree->tree as $mountData) {
                     $code .= $this->drawURLs_addRowsForPage(
                         $mountData['row'],
-                        $mountData['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $mountData['row'], true)
+                        $mountData['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $mountData['row'], true)
                     );
                 }
 
@@ -1761,7 +1761,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)
             );
         }
 
@@ -1786,7 +1786,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,7 +1853,7 @@ 
 
                     // Title column:
                 if (!$c) {
-                    $titleClm = '<td rowspan="' . count($configurations) . '">' . $pageTitleAndIcon . '</td>';
+                    $titleClm = '<td rowspan="'.count($configurations).'">'.$pageTitleAndIcon.'</td>';
                 } else {
                     $titleClm = '';
                 }
@@ -1880,45 +1880,45 @@ 
                     foreach ($confArray['paramExpanded'] as $gVar => $gVal) {
                         $paramExpanded .= '
                             <tr>
-                                <td class="bgColor4-20">' . htmlspecialchars('&' . $gVar . '=') . '<br/>' .
-                                                '(' . count($gVal) . ')' .
+                                <td class="bgColor4-20">' . htmlspecialchars('&'.$gVar.'=').'<br/>'.
+                                                '('.count($gVal).')'.
                                                 '</td>
-                                <td class="bgColor4" nowrap="nowrap">' . nl2br(htmlspecialchars(implode(chr(10), $gVal))) . '</td>
+                                <td class="bgColor4" nowrap="nowrap">' . nl2br(htmlspecialchars(implode(chr(10), $gVal))).'</td>
                             </tr>
                         ';
                         $calcRes *= count($gVal);
                         $calcAccu[] = count($gVal);
                     }
-                    $paramExpanded = '<table class="lrPadding c-list param-expanded">' . $paramExpanded . '</table>';
-                    $paramExpanded .= 'Comb: ' . implode('*', $calcAccu) . '=' . $calcRes;
+                    $paramExpanded = '<table class="lrPadding c-list param-expanded">'.$paramExpanded.'</table>';
+                    $paramExpanded .= 'Comb: '.implode('*', $calcAccu).'='.$calcRes;
 
                     // Options
                     $optionValues = '';
                     if ($confArray['subCfg']['userGroups']) {
-                        $optionValues .= 'User Groups: ' . $confArray['subCfg']['userGroups'] . '<br/>';
+                        $optionValues .= 'User Groups: '.$confArray['subCfg']['userGroups'].'<br/>';
                     }
                     if ($confArray['subCfg']['baseUrl']) {
-                        $optionValues .= 'Base Url: ' . $confArray['subCfg']['baseUrl'] . '<br/>';
+                        $optionValues .= 'Base Url: '.$confArray['subCfg']['baseUrl'].'<br/>';
                     }
                     if ($confArray['subCfg']['procInstrFilter']) {
-                        $optionValues .= 'ProcInstr: ' . $confArray['subCfg']['procInstrFilter'] . '<br/>';
+                        $optionValues .= 'ProcInstr: '.$confArray['subCfg']['procInstrFilter'].'<br/>';
                     }
 
                     // Compile row:
                     $content .= '
-                        <tr class="bgColor' . ($c % 2 ? '-20' : '-10') . '">
-                            ' . $titleClm . '
-                            <td>' . htmlspecialchars($confKey) . '</td>
-                            <td>' . nl2br(htmlspecialchars(rawurldecode(trim(str_replace('&', chr(10) . '&', \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $confArray['paramParsed'])))))) . '</td>
-                            <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>
+                        <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>
                         </tr>';
                 } else {
-                    $content .= '<tr class="bgColor' . ($c % 2 ? '-20' : '-10') . '">
-                            ' . $titleClm . '
-                            <td>' . htmlspecialchars($confKey) . '</td>
+                    $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>
                         </tr>';
                 }
@@ -1926,13 +1926,13 @@ 
                 $c++;
             }
         } else {
-            $message = !empty($skipMessage) ? ' (' . $skipMessage . ')' : '';
+            $message = !empty($skipMessage) ? ' ('.$skipMessage.')' : '';
 
             // Compile row:
             $content .= '
                 <tr class="bgColor-20" style="border-bottom: 1px solid black;">
-                    <td>' . $pageTitleAndIcon . '</td>
-                    <td colspan="6"><em>No entries</em>' . $message . '</td>
+                    <td>' . $pageTitleAndIcon.'</td>
+                    <td colspan="6"><em>No entries</em>' . $message.'</td>
                 </tr>';
         }
 
@@ -1947,7 +1947,7 @@ 
         $res = $this->db->exec_SELECTquery(
             'count(*) as num',
             'tx_crawler_queue',
-            'exec_time=0 AND process_scheduled=0 AND scheduled<=' . $this->getCurrentTime()
+            'exec_time=0 AND process_scheduled=0 AND scheduled<='.$this->getCurrentTime()
         );
 
         $count = $this->db->sql_fetch_assoc($res);
@@ -1998,7 +1998,7 @@ 
             //TODO can't we do that in a clean way?
             $releaseStatus = $this->CLI_releaseProcesses($this->CLI_buildProcessId());
 
-            $this->CLI_debug("Unprocessed Items remaining:" . $this->getUnprocessedItemsCount() . " (" . $this->CLI_buildProcessId() . ")");
+            $this->CLI_debug("Unprocessed Items remaining:".$this->getUnprocessedItemsCount()." (".$this->CLI_buildProcessId().")");
             $result |= ($this->getUnprocessedItemsCount() > 0 ? self::CLI_STATUS_REMAIN : self::CLI_STATUS_NOTHING_PROCCESSED);
         } else {
             $result |= self::CLI_STATUS_ABORTED;
@@ -2082,32 +2082,32 @@ 
         );
 
         if ($cliObj->cli_argValue('-o') === 'url') {
-            $cliObj->cli_echo(implode(chr(10), $this->downloadUrls) . chr(10), 1);
+            $cliObj->cli_echo(implode(chr(10), $this->downloadUrls).chr(10), 1);
         } elseif ($cliObj->cli_argValue('-o') === 'exec') {
-            $cliObj->cli_echo("Executing " . count($this->urlList) . " requests right away:\n\n");
-            $cliObj->cli_echo(implode(chr(10), $this->urlList) . chr(10));
+            $cliObj->cli_echo("Executing ".count($this->urlList)." requests right away:\n\n");
+            $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10));
             $cliObj->cli_echo("\nProcessing:\n");
 
             foreach ($this->queueEntries as $queueRec) {
                 $p = unserialize($queueRec['parameters']);
-                $cliObj->cli_echo($p['url'] . ' (' . implode(',', $p['procInstructions']) . ') => ');
+                $cliObj->cli_echo($p['url'].' ('.implode(',', $p['procInstructions']).') => ');
 
                 $result = $this->readUrlFromArray($queueRec);
 
                 $requestResult = unserialize($result['content']);
                 if (is_array($requestResult)) {
-                    $resLog = is_array($requestResult['log']) ? chr(10) . chr(9) . chr(9) . implode(chr(10) . chr(9) . chr(9), $requestResult['log']) : '';
-                    $cliObj->cli_echo('OK: ' . $resLog . chr(10));
+                    $resLog = is_array($requestResult['log']) ? chr(10).chr(9).chr(9).implode(chr(10).chr(9).chr(9), $requestResult['log']) : '';
+                    $cliObj->cli_echo('OK: '.$resLog.chr(10));
                 } else {
-                    $cliObj->cli_echo('Error checking Crawler Result: ' . substr(preg_replace('/\s+/', ' ', strip_tags($result['content'])), 0, 30000) . '...' . chr(10));
+                    $cliObj->cli_echo('Error checking Crawler Result: '.substr(preg_replace('/\s+/', ' ', strip_tags($result['content'])), 0, 30000).'...'.chr(10));
                 }
             }
         } elseif ($cliObj->cli_argValue('-o') === 'queue') {
-            $cliObj->cli_echo("Putting " . count($this->urlList) . " entries in queue:\n\n");
-            $cliObj->cli_echo(implode(chr(10), $this->urlList) . chr(10));
+            $cliObj->cli_echo("Putting ".count($this->urlList)." entries in queue:\n\n");
+            $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10));
         } else {
-            $cliObj->cli_echo(count($this->urlList) . " entries found for processing. (Use -o to decide action):\n\n", 1);
-            $cliObj->cli_echo(implode(chr(10), $this->urlList) . chr(10), 1);
+            $cliObj->cli_echo(count($this->urlList)." entries found for processing. (Use -o to decide action):\n\n", 1);
+            $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10), 1);
         }
     }
 
@@ -2161,7 +2161,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) : []);
@@ -2188,7 +2188,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
             );
         }
 
@@ -2219,7 +2219,7 @@ 
             //TODO make sure we're not taking assigned queue-entires
             $this->db->exec_UPDATEquery(
                 'tx_crawler_queue',
-                'qid IN (' . implode(',', $quidList) . ')',
+                'qid IN ('.implode(',', $quidList).')',
                 [
                     'process_scheduled' => intval($this->getCurrentTime()),
                     'process_id' => $processId
@@ -2230,7 +2230,7 @@ 
             $numberOfAffectedRows = $this->db->sql_affected_rows();
             $this->db->exec_UPDATEquery(
                 'tx_crawler_process',
-                "process_id = '" . $processId . "'",
+                "process_id = '".$processId."'",
                 [
                     'assigned_items_count' => intval($numberOfAffectedRows)
                 ]
@@ -2240,7 +2240,7 @@ 
                 $this->db->sql_query('COMMIT');
             } else {
                 $this->db->sql_query('ROLLBACK');
-                $this->CLI_debug("Nothing processed due to multi-process collision (" . $this->CLI_buildProcessId() . ")");
+                $this->CLI_debug("Nothing processed due to multi-process collision (".$this->CLI_buildProcessId().")");
                 return ($result | self::CLI_STATUS_ABORTED);
             }
 
@@ -2257,7 +2257,7 @@ 
                 }
 
                 if (!$this->CLI_checkIfProcessIsActive($this->CLI_buildProcessId())) {
-                    $this->CLI_debug("conflict / timeout (" . $this->CLI_buildProcessId() . ")");
+                    $this->CLI_debug("conflict / timeout (".$this->CLI_buildProcessId().")");
 
                     //TODO might need an additional returncode
                     $result |= self::CLI_STATUS_ABORTED;
@@ -2267,10 +2267,10 @@ 
 
             sleep(intval($sleepAfterFinish));
 
-            $msg = 'Rows: ' . $counter;
-            $this->CLI_debug($msg . " (" . $this->CLI_buildProcessId() . ")");
+            $msg = 'Rows: '.$counter;
+            $this->CLI_debug($msg." (".$this->CLI_buildProcessId().")");
         } else {
-            $this->CLI_debug("Nothing within queue which needs to be processed (" . $this->CLI_buildProcessId() . ")");
+            $this->CLI_debug("Nothing within queue which needs to be processed (".$this->CLI_buildProcessId().")");
         }
 
         if ($counter > 0) {
@@ -2338,7 +2338,7 @@ 
 
         // if there are less than allowed active processes then add a new one
         if ($processCount < intval($this->extensionSettings['processLimit'])) {
-            $this->CLI_debug("add " . $this->CLI_buildProcessId() . " (" . ($processCount + 1) . "/" . intval($this->extensionSettings['processLimit']) . ")");
+            $this->CLI_debug("add ".$this->CLI_buildProcessId()." (".($processCount + 1)."/".intval($this->extensionSettings['processLimit']).")");
 
             // create new process record
             $this->db->exec_INSERTquery(
@@ -2351,7 +2351,7 @@ 
                 ]
                 );
         } else {
-            $this->CLI_debug("Processlimit reached (" . ($processCount) . "/" . intval($this->extensionSettings['processLimit']) . ")");
+            $this->CLI_debug("Processlimit reached (".($processCount)."/".intval($this->extensionSettings['processLimit']).")");
             $ret = false;
         }
 
@@ -2377,7 +2377,7 @@ 
         }
 
         if (!count($releaseIds) > 0) {
-            return false;   //nothing to release
+            return false; //nothing to release
         }
 
         if (!$withinLock) {
@@ -2412,14 +2412,14 @@ 
         // mark all requested processes as non-active
         $this->db->exec_UPDATEquery(
             'tx_crawler_process',
-            'process_id IN (\'' . implode('\',\'', $releaseIds) . '\') AND deleted=0',
+            'process_id IN (\''.implode('\',\'', $releaseIds).'\') AND deleted=0',
             [
                 'active' => '0'
             ]
         );
         $this->db->exec_UPDATEquery(
             'tx_crawler_queue',
-            'exec_time=0 AND process_id IN ("' . implode('","', $releaseIds) . '")',
+            'exec_time=0 AND process_id IN ("'.implode('","', $releaseIds).'")',
             [
                 'process_scheduled' => 0,
                 'process_id' => ''
@@ -2459,7 +2459,7 @@ 
         $res = $this->db->exec_SELECTquery(
             'process_id,active,ttl',
             'tx_crawler_process',
-            'process_id = \'' . $pid . '\'  AND deleted=0',
+            'process_id = \''.$pid.'\'  AND deleted=0',
             '',
             'ttl',
             '0,1'
@@ -2503,7 +2503,7 @@ 
     public function CLI_debug($msg)
     {
         if (intval($this->extensionSettings['processDebug'])) {
-            echo $msg . "\n";
+            echo $msg."\n";
             flush();
         }
     }
@@ -2521,7 +2521,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 .= ' ';
@@ -2531,10 +2531,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
         ];
@@ -2555,7 +2555,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);
     }
 

domain/process/class.tx_crawler_domain_process_manager.php

Spacing +13 added lines, -13 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();
@@ -105,7 +105,7 @@ 
             }
             if ($currentPendingItems == 0) {
                 if ($this->verbose) {
-                    echo 'Finished...' . chr(10);
+                    echo 'Finished...'.chr(10);
                 }
                 break;
             }
@@ -117,16 +117,16 @@ 
             }
             sleep(1);
             if ($nextTimeOut < time()) {
-                $timedOutProcesses = $this->processRepository->findAll('', 'DESC', null, 0, 'ttl >' . $nextTimeOut);
+                $timedOutProcesses = $this->processRepository->findAll('', 'DESC', null, 0, 'ttl >'.$nextTimeOut);
                 $nextTimeOut = time() + $this->timeToLive;
                 if ($this->verbose) {
-                    echo 'Cleanup' . implode(',', $timedOutProcesses->getProcessIds()) . chr(10);
+                    echo 'Cleanup'.implode(',', $timedOutProcesses->getProcessIds()).chr(10);
                 }
                 $this->crawlerObj->CLI_releaseProcesses($timedOutProcesses->getProcessIds(), true);
             }
         }
         if ($currentPendingItems > 0 && $this->verbose) {
-            echo 'Stop with timeout' . chr(10);
+            echo 'Stop with timeout'.chr(10);
         }
     }
 
@@ -135,7 +135,7 @@ 
      */
     protected function reportItemStatus()
     {
-        echo 'Pending:' . $this->queueRepository->countAllPendingItems() . ' / Assigned:' . $this->queueRepository->countAllAssignedPendingItems() . chr(10);
+        echo 'Pending:'.$this->queueRepository->countAllPendingItems().' / Assigned:'.$this->queueRepository->countAllAssignedPendingItems().chr(10);
     }
 
     /**
@@ -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 . ')';
+            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,10 +200,10 @@ 
      */
     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';
-        return $phpPath . $pathToTypo3 . $cliPart;
+        return $phpPath.$pathToTypo3.$cliPart;
     }
 }

modfunc1/class.tx_crawler_modfunc1.php

Spacing +97 added lines, -97 removed lines

@@ -166,7 +166,7 @@ 
 				 white-space: nowrap; vertical-align: top;
 			}
 		--></style>
-		<link rel="stylesheet" type="text/css" href="' . $BACK_PATH . '../typo3conf/ext/crawler/template/res.css" />
+		<link rel="stylesheet" type="text/css" href="' . $BACK_PATH.'../typo3conf/ext/crawler/template/res.css" />
 		';
 
         // Type function menu:
@@ -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') . ': ' .
+            $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]',
@@ -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;
@@ -297,7 +297,7 @@ 
             ) {
             $code = '
 			<tr>
-				<td colspan="7"><b>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noConfigSelected') . '</b></td>
+				<td colspan="7"><b>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noConfigSelected').'</b></td>
 			</tr>';
         } else {
             if ($this->submitCrawlUrls) {
@@ -307,12 +307,12 @@ 
                 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 ');
+                $reason->setDetailText('The user '.$username.' added pages to the crawler queue manually ');
 
                 tx_crawler_domain_events_dispatcher::getInstance()->post(
                     'invokeQueueChange',
                                                                             $this->findCrawler()->setID,
-                                                                            [	'reason' => $reason ]
+                                                                            ['reason' => $reason]
                 );
             }
 
@@ -333,25 +333,25 @@ 
 
         $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 .= $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 .
+                        $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') . '" />';
+                $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').'" />';
             }
         }
 
@@ -360,11 +360,11 @@ 
 
                 // Creating output header:
             $mimeType = 'application/octet-stream';
-            Header('Content-Type: ' . $mimeType);
+            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);
+            echo implode(chr(13).chr(10), $this->downloadUrls);
 
             // Exits:
             exit;
@@ -443,13 +443,13 @@ 
         $output = '
 			<table class="lrPadding c-list">
 				<tr class="bgColor5 tableheader">
-					<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.depth') . ':</td>
-					<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.configurations') . ':</td>
-					<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.scheduled') . ':</td>
+					<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.depth').':</td>
+					<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.configurations').':</td>
+					<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.scheduled').':</td>
 				</tr>
 				<tr class="bgColor4">
 					<td valign="top">' . implode('</td>
-					<td valign="top">', $cell) . '</td>
+					<td valign="top">', $cell).'</td>
 				</tr>
 			</table>';
 
@@ -465,13 +465,13 @@ 
     {
         $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>
-				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.parametercfg') . ':</td>
-				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.values') . ':</td>
-				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.urls') . ':</td>
-				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.options') . ':</td>
-				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.parameters') . ':</td>
+				<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>
+				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.parametercfg').':</td>
+				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.values').':</td>
+				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.urls').':</td>
+				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.options').':</td>
+				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.parameters').':</td>
 			</tr>';
 
         return $content;
@@ -512,7 +512,7 @@ 
         if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) {
 
                 // Get entry record:
-            list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid=' . intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')));
+            list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')));
 
             // Explode values:
             $resStatus = $this->getResStatus($q_entry);
@@ -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:
 
@@ -544,7 +544,7 @@ 
                     // 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);
+                    $tree->init('AND '.$perms_clause);
 
                     // Set root row:
                     $HTML = \AOE\Crawler\Utility\IconUtility::getIconForRecord('pages', $this->pObj->pageinfo);
@@ -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) {
@@ -575,27 +575,27 @@ 
                     $code = '';
                     $code .= $this->drawLog_addRows(
                                 $showSetId,
-                                'Set ID: ' . $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" />
-						<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.flushvisiblequeue') . '" name="_flush" onclick="return confirm(\'' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.confirmyouresure') . '\');" />
-						<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.flushfullqueue') . '" name="_flush_all" onclick="return confirm(\'' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.confirmyouresure') . '\');" />
-						<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.reloadlist').'" name="_reload" />
+						<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.downloadcsv').'" name="_csv" />
+						<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.flushvisiblequeue').'" name="_flush" onclick="return confirm(\''.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.confirmyouresure').'\');" />
+						<input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.flushfullqueue').'" name="_flush_all" onclick="return confirm(\''.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.confirmyouresure').'\');" />
+						<input type="hidden" value="' . $this->pObj->id.'" name="id" />
+						<input type="hidden" value="' . $showSetId.'" name="setID" />
 						<br />
-						' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime') . ': ' . date('H:i:s', time()) . '
+						' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s', time()).'
 						<br /><br />
 
 
 						<table class="lrPadding c-list crawlerlog">' .
-                            $this->drawLog_printTableHeader() .
-                            $code .
+                            $this->drawLog_printTableHeader().
+                            $code.
                         '</table>';
                 }
             } else {	// Otherwise show available sets:
@@ -609,19 +609,19 @@ 
 
                 $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>
-						<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time') . ':</td>
+						<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>
+						<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.time').':</td>
 					</tr>
 				';
 
                 $cc = 0;
                 foreach ($setList as $set) {
                     $code .= '
-						<tr class="bgColor' . ($cc % 2 ? '-20' : '-10') . '">
-							<td><a href="' . htmlspecialchars('index.php?setID=' . $set['set_id']) . '">' . $set['set_id'] . '</a></td>
-							<td>' . $set['count_value'] . '</td>
-							<td>' . \TYPO3\CMS\Backend\Utility\BackendUtility::dateTimeAge($set['scheduled']) . '</td>
+						<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>
 						</tr>
 					';
 
@@ -631,7 +631,7 @@ 
                 $output .= '
 					<br /><br />
 					<table class="lrPadding c-list">' .
-                        $code .
+                        $code.
                     '</table>';
             }
         }
@@ -668,11 +668,11 @@ 
 
         // Creating output header:
         $mimeType = 'application/octet-stream';
-        Header('Content-Type: ' . $mimeType);
+        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);
+        echo implode(chr(13).chr(10), $csvLines);
 
         // Exits:
         exit;
@@ -724,7 +724,7 @@ 
 
                     // Title column:
                 if (!$c) {
-                    $titleClm = '<td rowspan="' . count($res) . '">' . $titleString . '</td>';
+                    $titleClm = '<td rowspan="'.count($res).'">'.$titleString.'</td>';
                 } else {
                     $titleClm = '';
                 }
@@ -743,11 +743,11 @@ 
                 if ($this->pObj->MOD_SETTINGS['log_resultLog']) {
                     $rowData['result_log'] = $resLog;
                 } else {
-                    $rowData['scheduled'] = ($vv['scheduled'] > 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' ' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate');
+                    $rowData['scheduled'] = ($vv['scheduled'] > 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate');
                     $rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-';
                 }
                 $rowData['result_status'] = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($resStatus, 50);
-                $rowData['url'] = '<a href="' . htmlspecialchars($parameters['url']) . '" target="_newWIndow">' . htmlspecialchars($parameters['url']) . '</a>';
+                $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'];
@@ -759,21 +759,21 @@ 
                 }
 
                 $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') . '">
-						' . $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>';
+					<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>';
                 foreach ($rowData as $fKey => $value) {
                     if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url', $fKey)) {
                         $content .= '
-						<td>' . $value . '</td>';
+						<td>' . $value.'</td>';
                     } else {
                         $content .= '
-						<td>' . nl2br(htmlspecialchars($value)) . '</td>';
+						<td>' . nl2br(htmlspecialchars($value)).'</td>';
                     }
                 }
                 $content .= '
@@ -794,8 +794,8 @@ 
                 // 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>
+					<td>' . $titleString.'</td>
+					<td colspan="' . $colSpan.'"><em>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noentries').'</em></td>
 				</tr>';
         }
 
@@ -830,22 +830,22 @@ 
     {
         $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>' . $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'] ? '
-				<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>') . '
-				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.status') . ':</td>
-				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.url') . ':</td>
-				<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>' .
+				<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>').'
+				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.status').':</td>
+				<td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.url').':</td>
+				<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'] ? '
-				<td>' . htmlspecialchars('TSFE->id') . '</td>
-				<td>' . htmlspecialchars('TSFE->gr_list') . '</td>
-				<td>' . htmlspecialchars('TSFE->no_cache') . '</td>' : '') . '
+				<td>' . htmlspecialchars('TSFE->id').'</td>
+				<td>' . htmlspecialchars('TSFE->gr_list').'</td>
+				<td>' . htmlspecialchars('TSFE->no_cache').'</td>' : '').'
 			</tr>';
 
         return $content;
@@ -887,7 +887,7 @@ 
                 }
                 $resLog = is_array($requestResult['log']) ? implode(chr(10), $requestResult['log']) : '';
             } else {
-                $resStatus = 'Error: ' . substr(preg_replace('/\s+/', ' ', strip_tags($requestContent['content'])), 0, 10000) . '...';
+                $resStatus = 'Error: '.substr(preg_replace('/\s+/', ' ', strip_tags($requestContent['content'])), 0, 10000).'...';
             }
         } else {
             $resStatus = '-';
@@ -939,7 +939,7 @@ 
 
         $listView = new tx_crawler_view_process_list();
         $listView->setPageId($this->pObj->id);
-        $listView->setIconPath($BACK_PATH . '../typo3conf/ext/crawler/template/process/res/img/');
+        $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);
@@ -957,7 +957,7 @@ 
         $output = $listView->render();
 
         if ($paginationView->getTotalPagesCount() > 1) {
-            $output .= ' <br />' . $paginationView->render();
+            $output .= ' <br />'.$paginationView->render();
         }
 
         return $output;
@@ -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;
     }

Classes/Api/CrawlerApi.php

Spacing +8 added lines, -8 removed lines

@@ -192,12 +192,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(
@@ -227,7 +227,7 @@ 
 
         $isPageInQueue = false;
 
-        $whereClause = 'page_id = ' . (integer)$uid;
+        $whereClause = 'page_id = '.(integer) $uid;
 
         if (false !== $unprocessed_only) {
             $whereClause .= ' AND exec_time = 0';
@@ -238,7 +238,7 @@ 
         }
 
         if (false !== $timestamp) {
-            $whereClause .= ' AND scheduled = ' . (integer)$timestamp;
+            $whereClause .= ' AND scheduled = '.(integer) $timestamp;
         }
 
         $count = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows(
@@ -267,10 +267,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) {
@@ -303,7 +303,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;
 
@@ -380,7 +380,7 @@ 
     {
         $qid = intval($qid);
         $table = 'tx_crawler_queue';
-        $where = ' qid=' . $qid;
+        $where = ' qid='.$qid;
         $GLOBALS['TYPO3_DB']->exec_DELETEquery($table, $where);
     }
 

Classes/Hooks/TsfeHook.php

Spacing +5 added lines, -5 removed lines

@@ -49,10 +49,10 @@ 
             //@todo: ask service to exclude current call for special reasons: for example no relevance because the language version is not affected
 
             list($queueId, $hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']);
-            list($queueRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid=' . intval($queueId));
+            list($queueRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval($queueId));
 
             // If a crawler record was found and hash was matching, set it up:
-            if (is_array($queueRec) && $hash === md5($queueRec['qid'] . '|' . $queueRec['set_id'] . '|' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
+            if (is_array($queueRec) && $hash === md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
                 $params['pObj']->applicationData['tx_crawler']['running'] = true;
                 $params['pObj']->applicationData['tx_crawler']['parameters'] = unserialize($queueRec['parameters']);
                 $params['pObj']->applicationData['tx_crawler']['log'] = [];
@@ -80,7 +80,7 @@ 
                     $params['pObj']->fe_user->user = [];
                 }
                 $params['pObj']->fe_user->user['usergroup'] = $grList;
-                $params['pObj']->applicationData['tx_crawler']['log'][] = 'User Groups: ' . $grList;
+                $params['pObj']->applicationData['tx_crawler']['log'][] = 'User Groups: '.$grList;
             }
         }
     }
@@ -125,7 +125,7 @@ 
                 foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'] as $pollable) {
                     if (is_array($params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions']) && in_array($pollable, $params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions'])) {
                         if (empty($params['pObj']->applicationData['tx_crawler']['success'][$pollable])) {
-                            $params['pObj']->applicationData['tx_crawler']['errorlog'][] = 'Error: Pollable extension (' . $pollable . ') did not complete successfully.';
+                            $params['pObj']->applicationData['tx_crawler']['errorlog'][] = 'Error: Pollable extension ('.$pollable.') did not complete successfully.';
                         }
                     }
                 }
@@ -135,7 +135,7 @@ 
             $str = serialize($params['pObj']->applicationData['tx_crawler']);
             //just make sure that no other output distracts this
             ob_clean();
-            header('Content-Length: ' . strlen($str));
+            header('Content-Length: '.strlen($str));
             echo $str;
             // Exit since we don't want anymore output!
             exit;

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(ExtensionManagementUtility::class, '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';
             }
         }