@@ -53,7 +53,7 @@ |
||
| 53 | 53 | * @param string $uri |
| 54 | 54 | * @param TypoScriptFrontendController $frontend |
| 55 | 55 | * |
| 56 | - * @return array |
|
| 56 | + * @return string[] |
|
| 57 | 57 | * |
| 58 | 58 | * @throws \Exception |
| 59 | 59 | * |
@@ -67,9 +67,9 @@ |
||
| 67 | 67 | $speakingUri = $frontend->cObj->typoLink_URL(['parameter' => $matches[1], 'additionalParams' => $matches[2]]); |
| 68 | 68 | $speakingUriParts = parse_url($speakingUri); |
| 69 | 69 | if (false === $speakingUriParts) { |
| 70 | - throw new \Exception('Could not parse URI: ' . $speakingUri, 1289915976); |
|
| 70 | + throw new \Exception('Could not parse URI: '.$speakingUri, 1289915976); |
|
| 71 | 71 | } |
| 72 | - $speakingUrlPath = '/' . ltrim($speakingUriParts['path'], '/'); |
|
| 72 | + $speakingUrlPath = '/'.ltrim($speakingUriParts['path'], '/'); |
|
| 73 | 73 | // Don't change anything if speaking URL is part of old URI: |
| 74 | 74 | // (it might be the case the using the speaking URL failed) |
| 75 | 75 | if (strpos($uri, $speakingUrlPath) !== 0 || $speakingUrlPath === '/') { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $this->tableName, |
| 67 | 67 | $where, |
| 68 | 68 | '', |
| 69 | - htmlspecialchars($orderField) . ' ' . htmlspecialchars($orderDirection), |
|
| 69 | + htmlspecialchars($orderField).' '.htmlspecialchars($orderDirection), |
|
| 70 | 70 | self::getLimitFromItemCountAndOffset($itemCount, $offset) |
| 71 | 71 | ); |
| 72 | 72 | |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | public function countNotTimeouted($ttl) |
| 113 | 113 | { |
| 114 | - return $this->countByWhere('deleted = 0 AND ttl > ' . intval($ttl)); |
|
| 114 | + return $this->countByWhere('deleted = 0 AND ttl > '.intval($ttl)); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | { |
| 128 | 128 | $itemCount = filter_var($itemCount, FILTER_VALIDATE_INT, ['options' => ['min_range' => 1, 'default' => 20]]); |
| 129 | 129 | $offset = filter_var($offset, FILTER_VALIDATE_INT, ['options' => ['min_range' => 0, 'default' => 0]]); |
| 130 | - $limit = $offset . ', ' . $itemCount; |
|
| 130 | + $limit = $offset.', '.$itemCount; |
|
| 131 | 131 | |
| 132 | 132 | return $limit; |
| 133 | 133 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | public function execute() |
| 48 | 48 | { |
| 49 | 49 | $processManager = new \tx_crawler_domain_process_manager(); |
| 50 | - $timeout = is_int($this->timeOut) ? (int)$this->timeOut : 1800; |
|
| 50 | + $timeout = is_int($this->timeOut) ? (int) $this->timeOut : 1800; |
|
| 51 | 51 | |
| 52 | 52 | try { |
| 53 | 53 | $processManager->multiProcess($timeout); |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | * This method is used to set the uid of the queue entry |
| 112 | 112 | * where the reason is relevant for. |
| 113 | 113 | * |
| 114 | - * @param int $entry_id |
|
| 114 | + * @param int $entry_uid |
|
| 115 | 115 | */ |
| 116 | 116 | public function setQueueEntryUid($entry_uid) |
| 117 | 117 | { |
@@ -116,6 +116,7 @@ discard block |
||
| 116 | 116 | * Set the page id |
| 117 | 117 | * |
| 118 | 118 | * @param int page id |
| 119 | + * @param integer $pageId |
|
| 119 | 120 | */ |
| 120 | 121 | public function setPageId($pageId) |
| 121 | 122 | { |
@@ -293,7 +294,7 @@ discard block |
||
| 293 | 294 | * Converts seconds into minutes |
| 294 | 295 | * |
| 295 | 296 | * @param int $seconds |
| 296 | - * @return int |
|
| 297 | + * @return double |
|
| 297 | 298 | */ |
| 298 | 299 | protected function asMinutes($seconds) |
| 299 | 300 | { |
@@ -444,7 +445,7 @@ discard block |
||
| 444 | 445 | * just a wrapper should be done in a cleaner way |
| 445 | 446 | * later on |
| 446 | 447 | * |
| 447 | - * @param $label |
|
| 448 | + * @param string $label |
|
| 448 | 449 | * @return string |
| 449 | 450 | */ |
| 450 | 451 | protected function getLLLabel($label) |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | */ |
| 340 | 340 | protected function getRefreshLink() |
| 341 | 341 | { |
| 342 | - return '<input onclick="window.location=\'' . \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess&id=' . $this->pageId . '\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_refresh.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh') . '" />'; |
|
| 342 | + return '<input onclick="window.location=\''.\TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info').'&SET[crawlaction]=multiprocess&id='.$this->pageId.'\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'arrow_refresh.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh').'" />'; |
|
| 343 | 343 | } |
| 344 | 344 | |
| 345 | 345 | /** |
@@ -360,9 +360,9 @@ discard block |
||
| 360 | 360 | protected function getEnableDisableLink() |
| 361 | 361 | { |
| 362 | 362 | if ($this->getIsCrawlerEnabled()) { |
| 363 | - return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_stop_blue.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling') . '" />'; |
|
| 363 | + return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'control_stop_blue.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling').'" />'; |
|
| 364 | 364 | } else { |
| 365 | - return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_play.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling') . '" />'; |
|
| 365 | + return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'control_play.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling').'" />'; |
|
| 366 | 366 | } |
| 367 | 367 | } |
| 368 | 368 | |
@@ -375,9 +375,9 @@ discard block |
||
| 375 | 375 | protected function getModeLink() |
| 376 | 376 | { |
| 377 | 377 | if ($this->getMode() == 'detail') { |
| 378 | - return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_in.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running') . '" />'; |
|
| 378 | + return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'arrow_in.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running').'" />'; |
|
| 379 | 379 | } elseif ($this->getMode() == 'simple') { |
| 380 | - return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_out.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all') . '" />'; |
|
| 380 | + return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'arrow_out.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all').'" />'; |
|
| 381 | 381 | } |
| 382 | 382 | } |
| 383 | 383 | |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | protected function getAddLink() |
| 391 | 391 | { |
| 392 | 392 | if ($this->getActiveProcessCount() < $this->getMaxActiveProcessCount() && $this->getIsCrawlerEnabled()) { |
| 393 | - return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'add.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add') . '" />'; |
|
| 393 | + return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'add.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add').'" />'; |
|
| 394 | 394 | } else { |
| 395 | 395 | return ''; |
| 396 | 396 | } |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | if (!empty($title)) { |
| 418 | 418 | $title = ' title="'.$title.'"'; |
| 419 | 419 | } |
| 420 | - return '<img src="'.$this->getIconPath().$icon.'.png" ' . $title . ' />'; |
|
| 420 | + return '<img src="'.$this->getIconPath().$icon.'.png" '.$title.' />'; |
|
| 421 | 421 | } |
| 422 | 422 | |
| 423 | 423 | /** |
@@ -9,5 +9,5 @@ |
||
| 9 | 9 | try { |
| 10 | 10 | $processManager->multiProcess($timeout); |
| 11 | 11 | } catch (Exception $e) { |
| 12 | - echo PHP_EOL . $e->getMessage(); |
|
| 12 | + echo PHP_EOL.$e->getMessage(); |
|
| 13 | 13 | } |
@@ -130,7 +130,7 @@ |
||
| 130 | 130 | { |
| 131 | 131 | if (is_array($this->observers[$event])) { |
| 132 | 132 | foreach ($this->observers[$event] as $eventObserver) { |
| 133 | - call_user_func([$eventObserver['object'],$eventObserver['method']], $event, $group, $attachedData); |
|
| 133 | + call_user_func([$eventObserver['object'], $eventObserver['method']], $event, $group, $attachedData); |
|
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | } |
@@ -45,17 +45,17 @@ |
||
| 45 | 45 | public static function registerHooks($extKey) |
| 46 | 46 | { |
| 47 | 47 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['connectToDB']['tx_crawler'] = |
| 48 | - TsfeHook::class . '->fe_init'; |
|
| 48 | + TsfeHook::class.'->fe_init'; |
|
| 49 | 49 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['initFEuser']['tx_crawler'] = |
| 50 | - TsfeHook::class . '->fe_feuserInit'; |
|
| 50 | + TsfeHook::class.'->fe_feuserInit'; |
|
| 51 | 51 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['isOutputting']['tx_crawler'] = |
| 52 | - TsfeHook::class . '->fe_isOutputting'; |
|
| 52 | + TsfeHook::class.'->fe_isOutputting'; |
|
| 53 | 53 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['hook_eofe']['tx_crawler'] = |
| 54 | - TsfeHook::class . '->fe_eofe'; |
|
| 54 | + TsfeHook::class.'->fe_eofe'; |
|
| 55 | 55 | |
| 56 | 56 | // Activating NC Static File Cache hook |
| 57 | 57 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['nc_staticfilecache/class.tx_ncstaticfilecache.php']['createFile_initializeVariables']['tx_crawler'] = |
| 58 | - StaticFileCacheCreateUriHook::class . '->initialize'; |
|
| 58 | + StaticFileCacheCreateUriHook::class.'->initialize'; |
|
| 59 | 59 | |
| 60 | 60 | // Activating Crawler cli_hooks |
| 61 | 61 | $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$extKey]['cli_hooks'][] = |
@@ -70,14 +70,14 @@ discard block |
||
| 70 | 70 | $results = $this->getDatabaseConnection()->exec_SELECTgetRows( |
| 71 | 71 | 'process_id, system_process_id', |
| 72 | 72 | 'tx_crawler_process', |
| 73 | - 'ttl <= ' . intval(time() - $this->extensionSettings['processMaxRunTime'] - 3600) . ' AND active = 1' |
|
| 73 | + 'ttl <= '.intval(time() - $this->extensionSettings['processMaxRunTime'] - 3600).' AND active = 1' |
|
| 74 | 74 | ); |
| 75 | 75 | |
| 76 | 76 | if (!is_array($results)) { |
| 77 | 77 | return; |
| 78 | 78 | } |
| 79 | 79 | foreach ($results as $result) { |
| 80 | - $systemProcessId = (int)$result['system_process_id']; |
|
| 80 | + $systemProcessId = (int) $result['system_process_id']; |
|
| 81 | 81 | $processId = $result['process_id']; |
| 82 | 82 | if ($systemProcessId > 1) { |
| 83 | 83 | if ($this->doProcessStillExists($systemProcessId)) { |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $results = $this->getDatabaseConnection()->exec_SELECTgetRows( |
| 99 | 99 | 'process_id, system_process_id', |
| 100 | 100 | 'tx_crawler_process', |
| 101 | - 'ttl <= ' . intval(time() - $this->extensionSettings['processMaxRunTime']) . ' AND active = 1' |
|
| 101 | + 'ttl <= '.intval(time() - $this->extensionSettings['processMaxRunTime']).' AND active = 1' |
|
| 102 | 102 | ); |
| 103 | 103 | |
| 104 | 104 | if (!is_array($results)) { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | } |
| 107 | 107 | foreach ($results as $result) { |
| 108 | 108 | $processExists = false; |
| 109 | - $systemProcessId = (int)$result['system_process_id']; |
|
| 109 | + $systemProcessId = (int) $result['system_process_id']; |
|
| 110 | 110 | $processId = $result['process_id']; |
| 111 | 111 | if ($systemProcessId > 1) { |
| 112 | 112 | $dispatcherProcesses = $this->findDispatcherProcesses(); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | foreach ($dispatcherProcesses as $process) { |
| 118 | 118 | $responseArray = $this->createResponseArray($process); |
| 119 | - if ($systemProcessId === (int)$responseArray[1]) { |
|
| 119 | + if ($systemProcessId === (int) $responseArray[1]) { |
|
| 120 | 120 | $processExists = true; |
| 121 | 121 | }; |
| 122 | 122 | } |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | { |
| 139 | 139 | $this->getDatabaseConnection()->exec_DELETEquery( |
| 140 | 140 | 'tx_crawler_process', |
| 141 | - 'process_id = ' . $this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_process') |
|
| 141 | + 'process_id = '.$this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_process') |
|
| 142 | 142 | ); |
| 143 | 143 | |
| 144 | 144 | $this->getDatabaseConnection()->exec_UPDATEquery( |
| 145 | 145 | 'tx_crawler_queue', |
| 146 | - 'process_id = ' . $this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_queue'), |
|
| 146 | + 'process_id = '.$this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_queue'), |
|
| 147 | 147 | ['process_id' => ''] |
| 148 | 148 | ); |
| 149 | 149 | } |
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | $doProcessStillExists = false; |
| 178 | 178 | if (!$this->isOsWindows()) { |
| 179 | 179 | // Not windows |
| 180 | - if (file_exists('/proc/' . $pid)) { |
|
| 180 | + if (file_exists('/proc/'.$pid)) { |
|
| 181 | 181 | $doProcessStillExists = true; |
| 182 | 182 | } |
| 183 | 183 | } else { |
| 184 | 184 | // Windows |
| 185 | - exec('tasklist | find "' . $pid . '"', $returnArray, $returnValue); |
|
| 185 | + exec('tasklist | find "'.$pid.'"', $returnArray, $returnValue); |
|
| 186 | 186 | if (count($returnArray) > 0 && preg_match('/php/i', $returnValue[0])) { |
| 187 | 187 | $doProcessStillExists = true; |
| 188 | 188 | } |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | posix_kill($pid, 9); |
| 205 | 205 | } else { |
| 206 | 206 | // Windows |
| 207 | - exec('taskkill /PID ' . $pid); |
|
| 207 | + exec('taskkill /PID '.$pid); |
|
| 208 | 208 | } |
| 209 | 209 | } |
| 210 | 210 | |