@@ -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 | array('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 | |
@@ -66,10 +66,10 @@ |
||
| 66 | 66 | if ($this->isCrawlerExtensionRunning($frontend) && preg_match('#^/index.php\?&?id=(\d+)(&.*)?$#', $uri, $matches)) { |
| 67 | 67 | $speakingUri = $frontend->cObj->typoLink_URL(array('parameter' => $matches[1], 'additionalParams' => $matches[2])); |
| 68 | 68 | $speakingUriParts = parse_url($speakingUri); |
| 69 | - if(false === $speakingUriParts){ |
|
| 70 | - throw new \Exception('Could not parse URI: ' . $speakingUri, 1289915976); |
|
| 69 | + if (false === $speakingUriParts) { |
|
| 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 === '/') { |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $additionalParameters = array(); |
| 68 | 68 | $additionalParameters[] = 'SET[function]=tx_crawler_modfunc1'; |
| 69 | 69 | $additionalParameters[] = 'SET[crawlaction]=start'; |
| 70 | - $additionalParameters[] = 'configurationSelection[]=' . $crawlerConfiguration['name']; |
|
| 70 | + $additionalParameters[] = 'configurationSelection[]='.$crawlerConfiguration['name']; |
|
| 71 | 71 | |
| 72 | 72 | $additionalMenuItems = array(); |
| 73 | 73 | $additionalMenuItems[] = $backRef->linkItem( |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | 'crawler' |
| 77 | 77 | ), |
| 78 | 78 | $this->getContextMenuIcon(), |
| 79 | - 'top.goToModule(\'web_info\', 1, \'&' . implode('&', $additionalParameters) . '\'); return hideCM();' |
|
| 79 | + 'top.goToModule(\'web_info\', 1, \'&'.implode('&', $additionalParameters).'\'); return hideCM();' |
|
| 80 | 80 | ); |
| 81 | 81 | |
| 82 | 82 | return array_merge($menuItems, $additionalMenuItems); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $icon = sprintf( |
| 93 | 93 | '<img src="%s" border="0" align="top" alt="" />', |
| 94 | - ExtensionManagementUtility::extRelPath('crawler') . 'icon_tx_crawler_configuration.gif' |
|
| 94 | + ExtensionManagementUtility::extRelPath('crawler').'icon_tx_crawler_configuration.gif' |
|
| 95 | 95 | ); |
| 96 | 96 | |
| 97 | 97 | return $icon; |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $this->startPage = 0; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - $_SERVER['argv'] = array($_SERVER['argv'][0], $this->startPage,'-ss', '-d', $this->depth, '-o', self::MODE, '-conf', implode(',', $this->configuration)); |
|
| 95 | + $_SERVER['argv'] = array($_SERVER['argv'][0], $this->startPage, '-ss', '-d', $this->depth, '-o', self::MODE, '-conf', implode(',', $this->configuration)); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
@@ -109,6 +109,6 @@ discard block |
||
| 109 | 109 | $this->startPage = 0; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - return implode(',', $this->configuration) . ' (depth: ' . $this->depth . ', startPage:' . $this->startPage . ')'; |
|
| 112 | + return implode(',', $this->configuration).' (depth: '.$this->depth.', startPage:'.$this->startPage.')'; |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | \ No newline at end of file |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * @return tx_crawler_domain_queue_entry $entry |
| 38 | 38 | */ |
| 39 | 39 | public function findYoungestEntryForProcess(tx_crawler_domain_process $process) { |
| 40 | - return $this->getFirstOrLastObjectByProcess($process,'exec_time ASC'); |
|
| 40 | + return $this->getFirstOrLastObjectByProcess($process, 'exec_time ASC'); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @return tx_crawler_domain_queue_entry |
| 48 | 48 | */ |
| 49 | 49 | public function findOldestEntryForProcess(tx_crawler_domain_process $process) { |
| 50 | - return $this->getFirstOrLastObjectByProcess($process,'exec_time DESC'); |
|
| 50 | + return $this->getFirstOrLastObjectByProcess($process, 'exec_time DESC'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
@@ -60,15 +60,15 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | protected function getFirstOrLastObjectByProcess($process, $orderby) { |
| 62 | 62 | $db = $this->getDB(); |
| 63 | - $where = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(),$this->tableName). |
|
| 63 | + $where = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(), $this->tableName). |
|
| 64 | 64 | ' AND exec_time > 0 '; |
| 65 | 65 | $limit = 1; |
| 66 | 66 | $groupby = ''; |
| 67 | 67 | |
| 68 | - $res = $db->exec_SELECTgetRows('*','tx_crawler_queue',$where,$groupby,$orderby,$limit); |
|
| 69 | - if($res) { |
|
| 70 | - $first = $res[0]; |
|
| 71 | - }else{ |
|
| 68 | + $res = $db->exec_SELECTgetRows('*', 'tx_crawler_queue', $where, $groupby, $orderby, $limit); |
|
| 69 | + if ($res) { |
|
| 70 | + $first = $res[0]; |
|
| 71 | + } else { |
|
| 72 | 72 | $first = array(); |
| 73 | 73 | } |
| 74 | 74 | $resultObject = new tx_crawler_domain_queue_entry($first); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | public function countExtecutedItemsByProcess($process) { |
| 85 | 85 | |
| 86 | - return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),$this->tableName)); |
|
| 86 | + return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr($process->getProcess_id(), $this->tableName)); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @return int |
| 94 | 94 | */ |
| 95 | 95 | public function countNonExecutedItemsByProcess($process) { |
| 96 | - return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),$this->tableName)); |
|
| 96 | + return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr($process->getProcess_id(), $this->tableName)); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /** |
@@ -135,8 +135,8 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | protected function countItemsByWhereClause($where) { |
| 137 | 137 | $db = $this->getDB(); |
| 138 | - $rs = $db->exec_SELECTquery('count(*) as anz',$this->tableName,$where); |
|
| 139 | - $res = $db->sql_fetch_assoc($rs); |
|
| 138 | + $rs = $db->exec_SELECTquery('count(*) as anz', $this->tableName, $where); |
|
| 139 | + $res = $db->sql_fetch_assoc($rs); |
|
| 140 | 140 | |
| 141 | 141 | return $res['anz']; |
| 142 | 142 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | $res = $db->exec_SELECTquery( |
| 203 | 203 | 'configuration, count(*) as c', |
| 204 | 204 | $this->tableName, |
| 205 | - 'set_id in ('. implode(',',$setIds).') AND scheduled < '.time(), |
|
| 205 | + 'set_id in ('.implode(',', $setIds).') AND scheduled < '.time(), |
|
| 206 | 206 | 'configuration' |
| 207 | 207 | ); |
| 208 | 208 | while ($row = $db->sql_fetch_assoc($res)) { |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | * @author Fabrizio Branca <[email protected]> |
| 248 | 248 | * @since 2010-11-16 |
| 249 | 249 | */ |
| 250 | - public function getLastProcessedEntries($selectFields='*', $limit='100') { |
|
| 250 | + public function getLastProcessedEntries($selectFields = '*', $limit = '100') { |
|
| 251 | 251 | $db = $this->getDB(); |
| 252 | 252 | $res = $db->exec_SELECTquery( |
| 253 | 253 | $selectFields, |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $res = $db->exec_SELECTquery( |
| 280 | 280 | 'process_id_completed, min(exec_time) as start, max(exec_time) as end, count(*) as urlcount', |
| 281 | 281 | $this->tableName, |
| 282 | - 'exec_time != 0 and exec_time >= '.intval($start). ' and exec_time <= ' . intval($end), |
|
| 282 | + 'exec_time != 0 and exec_time >= '.intval($start).' and exec_time <= '.intval($end), |
|
| 283 | 283 | 'process_id_completed' |
| 284 | 284 | ); |
| 285 | 285 | |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | * @author Timo Schmidt <[email protected]> |
| 37 | 37 | * @return int |
| 38 | 38 | */ |
| 39 | - public function getExecutionTime(){ |
|
| 39 | + public function getExecutionTime() { |
|
| 40 | 40 | return $this->row['exec_time']; |
| 41 | 41 | } |
| 42 | 42 | |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | $this->tableName, |
| 60 | 60 | $where, |
| 61 | 61 | '', |
| 62 | - htmlspecialchars($orderField) . ' ' . htmlspecialchars($orderDirection), |
|
| 62 | + htmlspecialchars($orderField).' '.htmlspecialchars($orderDirection), |
|
| 63 | 63 | self::getLimitFromItemCountAndOffset($itemCount, $offset) |
| 64 | 64 | ); |
| 65 | 65 | |
| 66 | 66 | if (is_array($rows)) { |
| 67 | - foreach($rows as $row) { |
|
| 67 | + foreach ($rows as $row) { |
|
| 68 | 68 | $collection->append(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance($this->objectClassname, $row)); |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * @return integer |
| 100 | 100 | */ |
| 101 | 101 | public function countNotTimeouted($ttl) { |
| 102 | - return $this->countByWhere('deleted = 0 AND ttl > ' . intval($ttl)); |
|
| 102 | + return $this->countByWhere('deleted = 0 AND ttl > '.intval($ttl)); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | public static function getLimitFromItemCountAndOffset($itemCount, $offset) { |
| 114 | 114 | $itemCount = filter_var($itemCount, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'default' => 20))); |
| 115 | 115 | $offset = filter_var($offset, FILTER_VALIDATE_INT, array('options' => array('min_range' => 0, 'default' => 0))); |
| 116 | - $limit = $offset . ', ' . $itemCount; |
|
| 116 | + $limit = $offset.', '.$itemCount; |
|
| 117 | 117 | |
| 118 | 118 | return $limit; |
| 119 | 119 | } |
@@ -151,7 +151,7 @@ |
||
| 151 | 151 | // TODO: use class constants for these states |
| 152 | 152 | if ($this->getActive() && $this->getProgress() < 100) { |
| 153 | 153 | $stage = 'running'; |
| 154 | - } elseif(!$this->getActive() && $this->getProgress() < 100) { |
|
| 154 | + } elseif (!$this->getActive() && $this->getProgress() < 100) { |
|
| 155 | 155 | $stage = 'cancelled'; |
| 156 | 156 | } else { |
| 157 | 157 | $stage = 'completed'; |
@@ -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); |