@@ -71,8 +71,11 @@ |
||
71 | 71 | </div> |
72 | 72 | <?php elseif ($process->getState() == 'cancelled'): ?> |
73 | 73 | <?php echo $this->getLLLabel('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.process.cancelled'); ?> |
74 | - <?php else: ?> |
|
75 | - <?php echo $this->getLLLabel('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.process.success'); ?> |
|
74 | + <?php else { |
|
75 | + : ?> |
|
76 | + <?php echo $this->getLLLabel('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.process.success'); |
|
77 | +} |
|
78 | +?> |
|
76 | 79 | <?php endif; ?> |
77 | 80 | </td> |
78 | 81 | </tr> |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | public function multiProcess($timeout) |
97 | 97 | { |
98 | 98 | if ($this->processLimit <= 1) { |
99 | - throw new \RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.' . PHP_EOL); |
|
99 | + throw new \RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.'.PHP_EOL); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | $pendingItemsStart = $this->queueRepository->countAllPendingItems(); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | } |
115 | 115 | if ($currentPendingItems == 0) { |
116 | 116 | if ($this->verbose) { |
117 | - echo 'Finished...' . chr(10); |
|
117 | + echo 'Finished...'.chr(10); |
|
118 | 118 | } |
119 | 119 | break; |
120 | 120 | } |
@@ -126,16 +126,16 @@ discard block |
||
126 | 126 | } |
127 | 127 | sleep(1); |
128 | 128 | if ($nextTimeOut < time()) { |
129 | - $timedOutProcesses = $this->processRepository->findAll('', 'DESC', null, 0, 'ttl >' . $nextTimeOut); |
|
129 | + $timedOutProcesses = $this->processRepository->findAll('', 'DESC', null, 0, 'ttl >'.$nextTimeOut); |
|
130 | 130 | $nextTimeOut = time() + $this->timeToLive; |
131 | 131 | if ($this->verbose) { |
132 | - echo 'Cleanup' . implode(',', $timedOutProcesses->getProcessIds()) . chr(10); |
|
132 | + echo 'Cleanup'.implode(',', $timedOutProcesses->getProcessIds()).chr(10); |
|
133 | 133 | } |
134 | 134 | $this->crawlerObj->CLI_releaseProcesses($timedOutProcesses->getProcessIds(), true); |
135 | 135 | } |
136 | 136 | } |
137 | 137 | if ($currentPendingItems > 0 && $this->verbose) { |
138 | - echo 'Stop with timeout' . chr(10); |
|
138 | + echo 'Stop with timeout'.chr(10); |
|
139 | 139 | } |
140 | 140 | } |
141 | 141 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | protected function reportItemStatus() |
146 | 146 | { |
147 | - echo 'Pending:' . $this->queueRepository->countAllPendingItems() . ' / Assigned:' . $this->queueRepository->countAllAssignedPendingItems() . chr(10); |
|
147 | + echo 'Pending:'.$this->queueRepository->countAllPendingItems().' / Assigned:'.$this->queueRepository->countAllAssignedPendingItems().chr(10); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -161,14 +161,14 @@ discard block |
||
161 | 161 | $currentProcesses = $this->processRepository->countActive(); |
162 | 162 | $availableProcessesCount = $this->processLimit - $currentProcesses; |
163 | 163 | $requiredProcessesCount = ceil($this->queueRepository->countAllUnassignedPendingItems() / $this->countInARun); |
164 | - $startProcessCount = min([$availableProcessesCount,$requiredProcessesCount]); |
|
164 | + $startProcessCount = min([$availableProcessesCount, $requiredProcessesCount]); |
|
165 | 165 | if ($startProcessCount <= 0) { |
166 | 166 | return $ret; |
167 | 167 | } |
168 | 168 | if ($startProcessCount && $this->verbose) { |
169 | - echo 'Start ' . $startProcessCount . ' new processes (Running:' . $currentProcesses . ')'; |
|
169 | + echo 'Start '.$startProcessCount.' new processes (Running:'.$currentProcesses.')'; |
|
170 | 170 | } |
171 | - for ($i = 0;$i < $startProcessCount;$i++) { |
|
171 | + for ($i = 0; $i < $startProcessCount; $i++) { |
|
172 | 172 | usleep(100); |
173 | 173 | if ($this->startProcess()) { |
174 | 174 | if ($this->verbose) { |
@@ -194,16 +194,16 @@ discard block |
||
194 | 194 | |
195 | 195 | // Check whether OS is Windows |
196 | 196 | if (TYPO3_OS === 'WIN') { |
197 | - $completePath = escapeshellcmd('start ' . $this->getCrawlerCliPath()); |
|
197 | + $completePath = escapeshellcmd('start '.$this->getCrawlerCliPath()); |
|
198 | 198 | } else { |
199 | - $completePath = '(' . escapeshellcmd($this->getCrawlerCliPath()) . ' &) > /dev/null'; |
|
199 | + $completePath = '('.escapeshellcmd($this->getCrawlerCliPath()).' &) > /dev/null'; |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | $fileHandler = system($completePath); |
203 | 203 | if ($fileHandler === false) { |
204 | 204 | throw new \Exception('could not start process!'); |
205 | 205 | } else { |
206 | - for ($i = 0;$i < 10;$i++) { |
|
206 | + for ($i = 0; $i < 10; $i++) { |
|
207 | 207 | if ($this->processRepository->countNotTimeouted($ttl) > $current) { |
208 | 208 | return true; |
209 | 209 | } |
@@ -220,11 +220,11 @@ discard block |
||
220 | 220 | */ |
221 | 221 | public function getCrawlerCliPath() |
222 | 222 | { |
223 | - $phpPath = $this->crawlerObj->extensionSettings['phpPath'] . ' '; |
|
223 | + $phpPath = $this->crawlerObj->extensionSettings['phpPath'].' '; |
|
224 | 224 | $pathToTypo3 = rtrim(GeneralUtility::getIndpEnv('TYPO3_DOCUMENT_ROOT'), '/'); |
225 | 225 | $pathToTypo3 .= rtrim(GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'), '/'); |
226 | 226 | $cliPart = '/typo3/cli_dispatch.phpsh crawler'; |
227 | - $scriptPath = $phpPath . $pathToTypo3 . $cliPart; |
|
227 | + $scriptPath = $phpPath.$pathToTypo3.$cliPart; |
|
228 | 228 | |
229 | 229 | if (TYPO3_OS === 'WIN') { |
230 | 230 | $scriptPath = str_replace('/', '\\', $scriptPath); |
@@ -49,7 +49,7 @@ |
||
49 | 49 | public function execute() |
50 | 50 | { |
51 | 51 | $processManager = new ProcessService(); |
52 | - $timeout = is_int($this->timeOut) ? (int)$this->timeOut : 1800; |
|
52 | + $timeout = is_int($this->timeOut) ? (int) $this->timeOut : 1800; |
|
53 | 53 | |
54 | 54 | try { |
55 | 55 | $processManager->multiProcess($timeout); |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function offsetGet($index) |
43 | 43 | { |
44 | - if (! parent::offsetExists($index)) { |
|
45 | - throw new \Exception('Index "' . var_export($index, true) . '" for \AOE\Crawler\Domain\Model\Process are not available'); |
|
44 | + if (!parent::offsetExists($index)) { |
|
45 | + throw new \Exception('Index "'.var_export($index, true).'" for \AOE\Crawler\Domain\Model\Process are not available'); |
|
46 | 46 | } |
47 | 47 | return parent::offsetGet($index); |
48 | 48 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function offsetSet($index, $subject) |
59 | 59 | { |
60 | - if (! $subject instanceof Process) { |
|
60 | + if (!$subject instanceof Process) { |
|
61 | 61 | throw new \InvalidArgumentException('Wrong parameter type given, "\AOE\Crawler\Domain\Model\Process" expected!'); |
62 | 62 | } |
63 | 63 | parent::offsetSet($index, $subject); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function append($subject) |
73 | 73 | { |
74 | - if (! $subject instanceof Process) { |
|
74 | + if (!$subject instanceof Process) { |
|
75 | 75 | throw new \InvalidArgumentException('Wrong parameter type given, "\AOE\Crawler\Domain\Model\Process" expected!'); |
76 | 76 | } |
77 | 77 | parent::append($subject); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | { |
229 | 229 | $this->db = $GLOBALS['TYPO3_DB']; |
230 | 230 | $this->backendUser = $GLOBALS['BE_USER']; |
231 | - $this->processFilename = PATH_site . 'typo3temp/tx_crawler.proc'; |
|
231 | + $this->processFilename = PATH_site.'typo3temp/tx_crawler.proc'; |
|
232 | 232 | |
233 | 233 | $settings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['crawler']); |
234 | 234 | $settings = is_array($settings) ? $settings : []; |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['excludeDoktype'] as $key => $doktypeList) { |
287 | 287 | if (GeneralUtility::inList($doktypeList, $pageRow['doktype'])) { |
288 | 288 | $skipPage = true; |
289 | - $skipMessage = 'Doktype was excluded by "' . $key . '"'; |
|
289 | + $skipMessage = 'Doktype was excluded by "'.$key.'"'; |
|
290 | 290 | break; |
291 | 291 | } |
292 | 292 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | if (is_string($veto)) { |
308 | 308 | $skipMessage = $veto; |
309 | 309 | } else { |
310 | - $skipMessage = 'Veto from hook "' . htmlspecialchars($key) . '"'; |
|
310 | + $skipMessage = 'Veto from hook "'.htmlspecialchars($key).'"'; |
|
311 | 311 | } |
312 | 312 | // no need to execute other hooks if a previous one return a veto |
313 | 313 | break; |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | protected function noUnprocessedQueueEntriesForPageWithConfigurationHashExist($uid, $configurationHash) |
357 | 357 | { |
358 | 358 | $configurationHash = $this->db->fullQuoteStr($configurationHash, 'tx_crawler_queue'); |
359 | - $res = $this->db->exec_SELECTquery('count(*) as anz', 'tx_crawler_queue', "page_id=" . intval($uid) . " AND configuration_hash=" . $configurationHash . " AND exec_time=0"); |
|
359 | + $res = $this->db->exec_SELECTquery('count(*) as anz', 'tx_crawler_queue', "page_id=".intval($uid)." AND configuration_hash=".$configurationHash." AND exec_time=0"); |
|
360 | 360 | $row = $this->db->sql_fetch_assoc($res); |
361 | 361 | |
362 | 362 | return ($row['anz'] == 0); |
@@ -432,14 +432,14 @@ discard block |
||
432 | 432 | if ($vv['subCfg']['cHash']) { |
433 | 433 | /* @var $cacheHash \TYPO3\CMS\Frontend\Page\CacheHashCalculator */ |
434 | 434 | $cacheHash = GeneralUtility::makeInstance('TYPO3\CMS\Frontend\Page\CacheHashCalculator'); |
435 | - $urlQuery .= '&cHash=' . $cacheHash->generateForParameters($urlQuery); |
|
435 | + $urlQuery .= '&cHash='.$cacheHash->generateForParameters($urlQuery); |
|
436 | 436 | } |
437 | 437 | |
438 | 438 | // Create key by which to determine unique-ness: |
439 | - $uKey = $urlQuery . '|' . $vv['subCfg']['userGroups'] . '|' . $vv['subCfg']['baseUrl'] . '|' . $vv['subCfg']['procInstrFilter']; |
|
439 | + $uKey = $urlQuery.'|'.$vv['subCfg']['userGroups'].'|'.$vv['subCfg']['baseUrl'].'|'.$vv['subCfg']['procInstrFilter']; |
|
440 | 440 | |
441 | 441 | // realurl support (thanks to Ingo Renner) |
442 | - $urlQuery = 'index.php' . $urlQuery; |
|
442 | + $urlQuery = 'index.php'.$urlQuery; |
|
443 | 443 | if (ExtensionManagementUtility::isLoaded('realurl') && $vv['subCfg']['realurl']) { |
444 | 444 | $params = [ |
445 | 445 | 'LD' => [ |
@@ -458,12 +458,12 @@ discard block |
||
458 | 458 | if (isset($duplicateTrack[$uKey])) { |
459 | 459 | |
460 | 460 | //if the url key is registered just display it and do not resubmit is |
461 | - $urlList = '<em><span class="typo3-dimmed">' . htmlspecialchars($urlQuery) . '</span></em><br/>'; |
|
461 | + $urlList = '<em><span class="typo3-dimmed">'.htmlspecialchars($urlQuery).'</span></em><br/>'; |
|
462 | 462 | } else { |
463 | - $urlList = '[' . date('d.m.y H:i', $schTime) . '] ' . htmlspecialchars($urlQuery); |
|
464 | - $this->urlList[] = '[' . date('d.m.y H:i', $schTime) . '] ' . $urlQuery; |
|
463 | + $urlList = '['.date('d.m.y H:i', $schTime).'] '.htmlspecialchars($urlQuery); |
|
464 | + $this->urlList[] = '['.date('d.m.y H:i', $schTime).'] '.$urlQuery; |
|
465 | 465 | |
466 | - $theUrl = ($vv['subCfg']['baseUrl'] ? $vv['subCfg']['baseUrl'] : GeneralUtility::getIndpEnv('TYPO3_SITE_URL')) . $urlQuery; |
|
466 | + $theUrl = ($vv['subCfg']['baseUrl'] ? $vv['subCfg']['baseUrl'] : GeneralUtility::getIndpEnv('TYPO3_SITE_URL')).$urlQuery; |
|
467 | 467 | |
468 | 468 | // Submit for crawling! |
469 | 469 | if ($submitCrawlUrls) { |
@@ -565,7 +565,7 @@ discard block |
||
565 | 565 | if (!is_array($values)) { |
566 | 566 | |
567 | 567 | // Sub configuration for a single configuration string: |
568 | - $subCfg = (array)$crawlerCfg['paramSets.'][$key . '.']; |
|
568 | + $subCfg = (array) $crawlerCfg['paramSets.'][$key.'.']; |
|
569 | 569 | $subCfg['key'] = $key; |
570 | 570 | |
571 | 571 | if (strcmp($subCfg['procInstrFilter'], '')) { |
@@ -590,9 +590,9 @@ discard block |
||
590 | 590 | |
591 | 591 | // recognize MP value |
592 | 592 | if (!$this->MP) { |
593 | - $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id=' . $id]); |
|
593 | + $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id='.$id]); |
|
594 | 594 | } else { |
595 | - $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id=' . $id . '&MP=' . $this->MP]); |
|
595 | + $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id='.$id.'&MP='.$this->MP]); |
|
596 | 596 | } |
597 | 597 | } |
598 | 598 | } |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | 'tx_crawler_configuration', |
613 | 613 | 'pid', |
614 | 614 | intval($page['uid']), |
615 | - BackendUtility::BEenableFields('tx_crawler_configuration') . BackendUtility::deleteClause('tx_crawler_configuration') |
|
615 | + BackendUtility::BEenableFields('tx_crawler_configuration').BackendUtility::deleteClause('tx_crawler_configuration') |
|
616 | 616 | ); |
617 | 617 | |
618 | 618 | if (is_array($configurationRecordsForCurrentPage)) { |
@@ -658,8 +658,8 @@ discard block |
||
658 | 658 | $res[$key]['subCfg'] = $subCfg; |
659 | 659 | $res[$key]['paramParsed'] = $this->parseParams($configurationRecord['configuration']); |
660 | 660 | $res[$key]['paramExpanded'] = $this->expandParameters($res[$key]['paramParsed'], $id); |
661 | - $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id=' . $id]); |
|
662 | - $res[$key]['origin'] = 'tx_crawler_configuration_' . $configurationRecord['uid']; |
|
661 | + $res[$key]['URLs'] = $this->compileUrls($res[$key]['paramExpanded'], ['?id='.$id]); |
|
662 | + $res[$key]['origin'] = 'tx_crawler_configuration_'.$configurationRecord['uid']; |
|
663 | 663 | } |
664 | 664 | } |
665 | 665 | } |
@@ -697,13 +697,13 @@ discard block |
||
697 | 697 | $res = $this->db->exec_SELECTquery( |
698 | 698 | '*', |
699 | 699 | 'sys_domain', |
700 | - 'uid = ' . $sysDomainUid . |
|
701 | - BackendUtility::BEenableFields('sys_domain') . |
|
700 | + 'uid = '.$sysDomainUid. |
|
701 | + BackendUtility::BEenableFields('sys_domain'). |
|
702 | 702 | BackendUtility::deleteClause('sys_domain') |
703 | 703 | ); |
704 | 704 | $row = $this->db->sql_fetch_assoc($res); |
705 | 705 | if ($row['domainName'] != '') { |
706 | - return $urlScheme . '://' . $row['domainName']; |
|
706 | + return $urlScheme.'://'.$row['domainName']; |
|
707 | 707 | } |
708 | 708 | } |
709 | 709 | return $baseUrl; |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | /* @var PageTreeView $tree */ |
734 | 734 | $tree = GeneralUtility::makeInstance(PageTreeView::class); |
735 | 735 | $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1); |
736 | - $tree->init('AND ' . $perms_clause); |
|
736 | + $tree->init('AND '.$perms_clause); |
|
737 | 737 | $tree->getTree($rootid, $depth, ''); |
738 | 738 | foreach ($tree->tree as $node) { |
739 | 739 | $pids[] = $node['row']['uid']; |
@@ -742,10 +742,10 @@ discard block |
||
742 | 742 | $res = $this->db->exec_SELECTquery( |
743 | 743 | '*', |
744 | 744 | 'tx_crawler_configuration', |
745 | - 'pid IN (' . implode(',', $pids) . ') ' . |
|
746 | - BackendUtility::BEenableFields('tx_crawler_configuration') . |
|
747 | - BackendUtility::deleteClause('tx_crawler_configuration') . ' ' . |
|
748 | - BackendUtility::versioningPlaceholderClause('tx_crawler_configuration') . ' ' |
|
745 | + 'pid IN ('.implode(',', $pids).') '. |
|
746 | + BackendUtility::BEenableFields('tx_crawler_configuration'). |
|
747 | + BackendUtility::deleteClause('tx_crawler_configuration').' '. |
|
748 | + BackendUtility::versioningPlaceholderClause('tx_crawler_configuration').' ' |
|
749 | 749 | ); |
750 | 750 | |
751 | 751 | while ($row = $this->db->sql_fetch_assoc($res)) { |
@@ -844,7 +844,7 @@ discard block |
||
844 | 844 | |
845 | 845 | // Traverse range, add values: |
846 | 846 | $runAwayBrake = 1000; // Limit to size of range! |
847 | - for ($a = $reg[1]; $a <= $reg[2];$a++) { |
|
847 | + for ($a = $reg[1]; $a <= $reg[2]; $a++) { |
|
848 | 848 | $paramArray[$p][] = $a; |
849 | 849 | $runAwayBrake--; |
850 | 850 | if ($runAwayBrake <= 0) { |
@@ -874,16 +874,16 @@ discard block |
||
874 | 874 | $transOrigPointerField = $TCA[$subpartParams['_TABLE']]['ctrl']['transOrigPointerField']; |
875 | 875 | |
876 | 876 | if ($subpartParams['_ENABLELANG'] && $transOrigPointerField) { |
877 | - $andWhereLanguage = ' AND ' . $this->db->quoteStr($transOrigPointerField, $subpartParams['_TABLE']) . ' <= 0 '; |
|
877 | + $andWhereLanguage = ' AND '.$this->db->quoteStr($transOrigPointerField, $subpartParams['_TABLE']).' <= 0 '; |
|
878 | 878 | } |
879 | 879 | |
880 | - $where = $this->db->quoteStr($pidField, $subpartParams['_TABLE']) . '=' . intval($lookUpPid) . ' ' . |
|
881 | - $andWhereLanguage . $where; |
|
880 | + $where = $this->db->quoteStr($pidField, $subpartParams['_TABLE']).'='.intval($lookUpPid).' '. |
|
881 | + $andWhereLanguage.$where; |
|
882 | 882 | |
883 | 883 | $rows = $this->db->exec_SELECTgetRows( |
884 | 884 | $fieldName, |
885 | - $subpartParams['_TABLE'] . $addTable, |
|
886 | - $where . BackendUtility::deleteClause($subpartParams['_TABLE']), |
|
885 | + $subpartParams['_TABLE'].$addTable, |
|
886 | + $where.BackendUtility::deleteClause($subpartParams['_TABLE']), |
|
887 | 887 | '', |
888 | 888 | '', |
889 | 889 | '', |
@@ -945,7 +945,7 @@ discard block |
||
945 | 945 | $newUrls = []; |
946 | 946 | foreach ($urls as $url) { |
947 | 947 | foreach ($valueSet as $val) { |
948 | - $newUrls[] = $url . (strcmp($val, '') ? '&' . rawurlencode($varName) . '=' . rawurlencode($val) : ''); |
|
948 | + $newUrls[] = $url.(strcmp($val, '') ? '&'.rawurlencode($varName).'='.rawurlencode($val) : ''); |
|
949 | 949 | |
950 | 950 | if (count($newUrls) > MathUtility::forceIntegerInRange($this->extensionSettings['maxCompileUrls'], 1, 1000000000, 10000)) { |
951 | 951 | break; |
@@ -992,13 +992,13 @@ discard block |
||
992 | 992 | |
993 | 993 | // FIXME: Write unit test that ensures that the right records are deleted. |
994 | 994 | if ($doFlush) { |
995 | - $this->flushQueue(($doFullFlush ? '1=1' : ('page_id=' . intval($id))) . $addWhere); |
|
995 | + $this->flushQueue(($doFullFlush ? '1=1' : ('page_id='.intval($id))).$addWhere); |
|
996 | 996 | return []; |
997 | 997 | } else { |
998 | 998 | return $this->db->exec_SELECTgetRows( |
999 | 999 | '*', |
1000 | 1000 | 'tx_crawler_queue', |
1001 | - 'page_id=' . intval($id) . $addWhere, |
|
1001 | + 'page_id='.intval($id).$addWhere, |
|
1002 | 1002 | '', |
1003 | 1003 | 'scheduled DESC', |
1004 | 1004 | (intval($itemsPerPage) > 0 ? intval($itemsPerPage) : '') |
@@ -1031,13 +1031,13 @@ discard block |
||
1031 | 1031 | } |
1032 | 1032 | // FIXME: Write unit test that ensures that the right records are deleted. |
1033 | 1033 | if ($doFlush) { |
1034 | - $this->flushQueue($doFullFlush ? '' : ('set_id=' . intval($set_id) . $addWhere)); |
|
1034 | + $this->flushQueue($doFullFlush ? '' : ('set_id='.intval($set_id).$addWhere)); |
|
1035 | 1035 | return []; |
1036 | 1036 | } else { |
1037 | 1037 | return $this->db->exec_SELECTgetRows( |
1038 | 1038 | '*', |
1039 | 1039 | 'tx_crawler_queue', |
1040 | - 'set_id=' . intval($set_id) . $addWhere, |
|
1040 | + 'set_id='.intval($set_id).$addWhere, |
|
1041 | 1041 | '', |
1042 | 1042 | 'scheduled DESC', |
1043 | 1043 | (intval($itemsPerPage) > 0 ? intval($itemsPerPage) : '') |
@@ -1058,7 +1058,7 @@ discard block |
||
1058 | 1058 | if (EventDispatcher::getInstance()->hasObserver('queueEntryFlush')) { |
1059 | 1059 | $groups = $this->db->exec_SELECTgetRows('DISTINCT set_id', 'tx_crawler_queue', $realWhere); |
1060 | 1060 | foreach ($groups as $group) { |
1061 | - EventDispatcher::getInstance()->post('queueEntryFlush', $group['set_id'], $this->db->exec_SELECTgetRows('uid, set_id', 'tx_crawler_queue', $realWhere . ' AND set_id="' . $group['set_id'] . '"')); |
|
1061 | + EventDispatcher::getInstance()->post('queueEntryFlush', $group['set_id'], $this->db->exec_SELECTgetRows('uid, set_id', 'tx_crawler_queue', $realWhere.' AND set_id="'.$group['set_id'].'"')); |
|
1062 | 1062 | } |
1063 | 1063 | } |
1064 | 1064 | |
@@ -1200,24 +1200,24 @@ discard block |
||
1200 | 1200 | if ($this->extensionSettings['enableTimeslot']) { |
1201 | 1201 | $timeBegin = $currentTime - 100; |
1202 | 1202 | $timeEnd = $currentTime + 100; |
1203 | - $where = ' ((scheduled BETWEEN ' . $timeBegin . ' AND ' . $timeEnd . ' ) OR scheduled <= ' . $currentTime . ') '; |
|
1203 | + $where = ' ((scheduled BETWEEN '.$timeBegin.' AND '.$timeEnd.' ) OR scheduled <= '.$currentTime.') '; |
|
1204 | 1204 | } else { |
1205 | - $where = 'scheduled <= ' . $currentTime; |
|
1205 | + $where = 'scheduled <= '.$currentTime; |
|
1206 | 1206 | } |
1207 | 1207 | } elseif ($tstamp > $currentTime) { |
1208 | 1208 | //entry with a timestamp in the future need to have the same schedule time |
1209 | - $where = 'scheduled = ' . $tstamp ; |
|
1209 | + $where = 'scheduled = '.$tstamp; |
|
1210 | 1210 | } |
1211 | 1211 | |
1212 | 1212 | if (!empty($where)) { |
1213 | 1213 | $result = $this->db->exec_SELECTgetRows( |
1214 | 1214 | 'qid', |
1215 | 1215 | 'tx_crawler_queue', |
1216 | - $where . |
|
1217 | - ' AND NOT exec_time' . |
|
1218 | - ' AND NOT process_id ' . |
|
1219 | - ' AND page_id=' . intval($fieldArray['page_id']) . |
|
1220 | - ' AND parameters_hash = ' . $this->db->fullQuoteStr($fieldArray['parameters_hash'], 'tx_crawler_queue') |
|
1216 | + $where. |
|
1217 | + ' AND NOT exec_time'. |
|
1218 | + ' AND NOT process_id '. |
|
1219 | + ' AND page_id='.intval($fieldArray['page_id']). |
|
1220 | + ' AND parameters_hash = '.$this->db->fullQuoteStr($fieldArray['parameters_hash'], 'tx_crawler_queue') |
|
1221 | 1221 | ); |
1222 | 1222 | |
1223 | 1223 | if (is_array($result)) { |
@@ -1257,13 +1257,13 @@ discard block |
||
1257 | 1257 | { |
1258 | 1258 | $ret = 0; |
1259 | 1259 | if ($this->debugMode) { |
1260 | - GeneralUtility::devlog('crawler-readurl start ' . microtime(true), __FUNCTION__); |
|
1260 | + GeneralUtility::devlog('crawler-readurl start '.microtime(true), __FUNCTION__); |
|
1261 | 1261 | } |
1262 | 1262 | // Get entry: |
1263 | 1263 | list($queueRec) = $this->db->exec_SELECTgetRows( |
1264 | 1264 | '*', |
1265 | 1265 | 'tx_crawler_queue', |
1266 | - 'qid=' . intval($queueId) . ($force ? '' : ' AND exec_time=0 AND process_scheduled > 0') |
|
1266 | + 'qid='.intval($queueId).($force ? '' : ' AND exec_time=0 AND process_scheduled > 0') |
|
1267 | 1267 | ); |
1268 | 1268 | |
1269 | 1269 | if (!is_array($queueRec)) { |
@@ -1272,10 +1272,10 @@ discard block |
||
1272 | 1272 | |
1273 | 1273 | $parameters = unserialize($queueRec['parameters']); |
1274 | 1274 | if ($parameters['rootTemplatePid']) { |
1275 | - $this->initTSFE((int)$parameters['rootTemplatePid']); |
|
1275 | + $this->initTSFE((int) $parameters['rootTemplatePid']); |
|
1276 | 1276 | } else { |
1277 | 1277 | GeneralUtility::sysLog( |
1278 | - 'Page with (' . $queueRec['page_id'] . ') could not be crawled, please check your crawler configuration. Perhaps no Root Template Pid is set', |
|
1278 | + 'Page with ('.$queueRec['page_id'].') could not be crawled, please check your crawler configuration. Perhaps no Root Template Pid is set', |
|
1279 | 1279 | 'crawler', |
1280 | 1280 | GeneralUtility::SYSLOG_SEVERITY_WARNING |
1281 | 1281 | ); |
@@ -1294,7 +1294,7 @@ discard block |
||
1294 | 1294 | //if mulitprocessing is used we need to store the id of the process which has handled this entry |
1295 | 1295 | $field_array['process_id_completed'] = $this->processID; |
1296 | 1296 | } |
1297 | - $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid=' . intval($queueId), $field_array); |
|
1297 | + $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array); |
|
1298 | 1298 | |
1299 | 1299 | $result = $this->readUrl_exec($queueRec); |
1300 | 1300 | $resultData = unserialize($result['content']); |
@@ -1325,10 +1325,10 @@ discard block |
||
1325 | 1325 | [$queueId, &$field_array] |
1326 | 1326 | ); |
1327 | 1327 | |
1328 | - $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid=' . intval($queueId), $field_array); |
|
1328 | + $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array); |
|
1329 | 1329 | |
1330 | 1330 | if ($this->debugMode) { |
1331 | - GeneralUtility::devlog('crawler-readurl stop ' . microtime(true), __FUNCTION__); |
|
1331 | + GeneralUtility::devlog('crawler-readurl stop '.microtime(true), __FUNCTION__); |
|
1332 | 1332 | } |
1333 | 1333 | |
1334 | 1334 | return $ret; |
@@ -1359,7 +1359,7 @@ discard block |
||
1359 | 1359 | [$queueId, &$field_array] |
1360 | 1360 | ); |
1361 | 1361 | |
1362 | - $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid=' . intval($queueId), $field_array); |
|
1362 | + $this->db->exec_UPDATEquery('tx_crawler_queue', 'qid='.intval($queueId), $field_array); |
|
1363 | 1363 | |
1364 | 1364 | return $result; |
1365 | 1365 | } |
@@ -1383,12 +1383,12 @@ discard block |
||
1383 | 1383 | unset($parameters['_CALLBACKOBJ']); |
1384 | 1384 | $result = ['content' => serialize($callBackObj->crawler_execute($parameters, $this))]; |
1385 | 1385 | } else { |
1386 | - $result = ['content' => 'No object: ' . $objRef]; |
|
1386 | + $result = ['content' => 'No object: '.$objRef]; |
|
1387 | 1387 | } |
1388 | 1388 | } else { // Regular FE request: |
1389 | 1389 | |
1390 | 1390 | // Prepare: |
1391 | - $crawlerId = $queueRec['qid'] . ':' . md5($queueRec['qid'] . '|' . $queueRec['set_id'] . '|' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']); |
|
1391 | + $crawlerId = $queueRec['qid'].':'.md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']); |
|
1392 | 1392 | |
1393 | 1393 | // Get result: |
1394 | 1394 | $result = $this->requestUrl($parameters['url'], $crawlerId); |
@@ -1425,7 +1425,7 @@ discard block |
||
1425 | 1425 | return false; |
1426 | 1426 | } |
1427 | 1427 | |
1428 | - if (!in_array($url['scheme'], ['','http','https'])) { |
|
1428 | + if (!in_array($url['scheme'], ['', 'http', 'https'])) { |
|
1429 | 1429 | if (TYPO3_DLOG) { |
1430 | 1430 | GeneralUtility::devLog(sprintf('Scheme does not match for url "%s"', $url), 'crawler', 4, ['crawlerId' => $crawlerId]); |
1431 | 1431 | } |
@@ -1445,14 +1445,14 @@ discard block |
||
1445 | 1445 | |
1446 | 1446 | if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse'] && $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']) { |
1447 | 1447 | $rurl = parse_url($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlProxyServer']); |
1448 | - $url['path'] = $url['scheme'] . '://' . $url['host'] . ($url['port'] > 0 ? ':' . $url['port'] : '') . $url['path']; |
|
1448 | + $url['path'] = $url['scheme'].'://'.$url['host'].($url['port'] > 0 ? ':'.$url['port'] : '').$url['path']; |
|
1449 | 1449 | $reqHeaders = $this->buildRequestHeaderArray($url, $crawlerId); |
1450 | 1450 | } |
1451 | 1451 | |
1452 | 1452 | $host = $rurl['host']; |
1453 | 1453 | |
1454 | 1454 | if ($url['scheme'] == 'https') { |
1455 | - $host = 'ssl://' . $host; |
|
1455 | + $host = 'ssl://'.$host; |
|
1456 | 1456 | $port = ($rurl['port'] > 0) ? $rurl['port'] : 443; |
1457 | 1457 | } else { |
1458 | 1458 | $port = ($rurl['port'] > 0) ? $rurl['port'] : 80; |
@@ -1468,7 +1468,7 @@ discard block |
||
1468 | 1468 | return false; |
1469 | 1469 | } else { |
1470 | 1470 | // Request message: |
1471 | - $msg = implode("\r\n", $reqHeaders) . "\r\n\r\n"; |
|
1471 | + $msg = implode("\r\n", $reqHeaders)."\r\n\r\n"; |
|
1472 | 1472 | fputs($fp, $msg); |
1473 | 1473 | |
1474 | 1474 | // Read response: |
@@ -1476,13 +1476,13 @@ discard block |
||
1476 | 1476 | fclose($fp); |
1477 | 1477 | |
1478 | 1478 | $time = microtime(true) - $startTime; |
1479 | - $this->log($originalUrl . ' ' . $time); |
|
1479 | + $this->log($originalUrl.' '.$time); |
|
1480 | 1480 | |
1481 | 1481 | // Implode content and headers: |
1482 | 1482 | $result = [ |
1483 | 1483 | 'request' => $msg, |
1484 | 1484 | 'headers' => implode('', $d['headers']), |
1485 | - 'content' => implode('', (array)$d['content']) |
|
1485 | + 'content' => implode('', (array) $d['content']) |
|
1486 | 1486 | ]; |
1487 | 1487 | |
1488 | 1488 | if (($this->extensionSettings['follow30x']) && ($newUrl = $this->getRequestUrlFrom302Header($d['headers'], $url['user'], $url['pass']))) { |
@@ -1527,8 +1527,8 @@ discard block |
||
1527 | 1527 | |
1528 | 1528 | // Base path must be '/<pathSegements>/': |
1529 | 1529 | if ($frontendBasePath != '/') { |
1530 | - $frontendBasePath = '/' . ltrim($frontendBasePath, '/'); |
|
1531 | - $frontendBasePath = rtrim($frontendBasePath, '/') . '/'; |
|
1530 | + $frontendBasePath = '/'.ltrim($frontendBasePath, '/'); |
|
1531 | + $frontendBasePath = rtrim($frontendBasePath, '/').'/'; |
|
1532 | 1532 | } |
1533 | 1533 | |
1534 | 1534 | return $frontendBasePath; |
@@ -1584,7 +1584,7 @@ discard block |
||
1584 | 1584 | protected function log($message) |
1585 | 1585 | { |
1586 | 1586 | if (!empty($this->extensionSettings['logFileName'])) { |
1587 | - @file_put_contents($this->extensionSettings['logFileName'], date('Ymd His') . ' ' . $message . PHP_EOL, FILE_APPEND); |
|
1587 | + @file_put_contents($this->extensionSettings['logFileName'], date('Ymd His').' '.$message.PHP_EOL, FILE_APPEND); |
|
1588 | 1588 | } |
1589 | 1589 | } |
1590 | 1590 | |
@@ -1599,16 +1599,16 @@ discard block |
||
1599 | 1599 | protected function buildRequestHeaderArray(array $url, $crawlerId) |
1600 | 1600 | { |
1601 | 1601 | $reqHeaders = []; |
1602 | - $reqHeaders[] = 'GET ' . $url['path'] . ($url['query'] ? '?' . $url['query'] : '') . ' HTTP/1.0'; |
|
1603 | - $reqHeaders[] = 'Host: ' . $url['host']; |
|
1602 | + $reqHeaders[] = 'GET '.$url['path'].($url['query'] ? '?'.$url['query'] : '').' HTTP/1.0'; |
|
1603 | + $reqHeaders[] = 'Host: '.$url['host']; |
|
1604 | 1604 | if (stristr($url['query'], 'ADMCMD_previewWS')) { |
1605 | 1605 | $reqHeaders[] = 'Cookie: $Version="1"; be_typo_user="1"; $Path=/'; |
1606 | 1606 | } |
1607 | 1607 | $reqHeaders[] = 'Connection: close'; |
1608 | 1608 | if ($url['user'] != '') { |
1609 | - $reqHeaders[] = 'Authorization: Basic ' . base64_encode($url['user'] . ':' . $url['pass']); |
|
1609 | + $reqHeaders[] = 'Authorization: Basic '.base64_encode($url['user'].':'.$url['pass']); |
|
1610 | 1610 | } |
1611 | - $reqHeaders[] = 'X-T3crawler: ' . $crawlerId; |
|
1611 | + $reqHeaders[] = 'X-T3crawler: '.$crawlerId; |
|
1612 | 1612 | $reqHeaders[] = 'User-Agent: TYPO3 crawler'; |
1613 | 1613 | return $reqHeaders; |
1614 | 1614 | } |
@@ -1645,9 +1645,9 @@ discard block |
||
1645 | 1645 | if (!($tmp = parse_url($header['Location']))) { |
1646 | 1646 | return false; |
1647 | 1647 | } |
1648 | - $newUrl = $tmp['scheme'] . '://' . $user . ':' . $pass . '@' . $tmp['host'] . $tmp['path']; |
|
1648 | + $newUrl = $tmp['scheme'].'://'.$user.':'.$pass.'@'.$tmp['host'].$tmp['path']; |
|
1649 | 1649 | if ($tmp['query'] != '') { |
1650 | - $newUrl .= '?' . $tmp['query']; |
|
1650 | + $newUrl .= '?'.$tmp['query']; |
|
1651 | 1651 | } |
1652 | 1652 | } else { |
1653 | 1653 | $newUrl = $header['Location']; |
@@ -1675,10 +1675,10 @@ discard block |
||
1675 | 1675 | // Authenticate crawler request: |
1676 | 1676 | if (isset($_SERVER['HTTP_X_T3CRAWLER'])) { |
1677 | 1677 | list($queueId, $hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']); |
1678 | - list($queueRec) = $this->db->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid=' . intval($queueId)); |
|
1678 | + list($queueRec) = $this->db->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval($queueId)); |
|
1679 | 1679 | |
1680 | 1680 | // If a crawler record was found and hash was matching, set it up: |
1681 | - if (is_array($queueRec) && $hash === md5($queueRec['qid'] . '|' . $queueRec['set_id'] . '|' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) { |
|
1681 | + if (is_array($queueRec) && $hash === md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) { |
|
1682 | 1682 | $params['pObj']->applicationData['tx_crawler']['running'] = true; |
1683 | 1683 | $params['pObj']->applicationData['tx_crawler']['parameters'] = unserialize($queueRec['parameters']); |
1684 | 1684 | $params['pObj']->applicationData['tx_crawler']['log'] = []; |
@@ -1735,7 +1735,7 @@ discard block |
||
1735 | 1735 | /* @var PageTreeView $tree */ |
1736 | 1736 | $tree = GeneralUtility::makeInstance(PageTreeView::class); |
1737 | 1737 | $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1); |
1738 | - $tree->init('AND ' . $perms_clause); |
|
1738 | + $tree->init('AND '.$perms_clause); |
|
1739 | 1739 | |
1740 | 1740 | $pageinfo = BackendUtility::readPageAccess($id, $perms_clause); |
1741 | 1741 | |
@@ -1758,19 +1758,19 @@ discard block |
||
1758 | 1758 | |
1759 | 1759 | // recognize mount points |
1760 | 1760 | if ($data['row']['doktype'] == 7) { |
1761 | - $mountpage = $this->db->exec_SELECTgetRows('*', 'pages', 'uid = ' . $data['row']['uid']); |
|
1761 | + $mountpage = $this->db->exec_SELECTgetRows('*', 'pages', 'uid = '.$data['row']['uid']); |
|
1762 | 1762 | |
1763 | 1763 | // fetch mounted pages |
1764 | - $this->MP = $mountpage[0]['mount_pid'] . '-' . $data['row']['uid']; |
|
1764 | + $this->MP = $mountpage[0]['mount_pid'].'-'.$data['row']['uid']; |
|
1765 | 1765 | |
1766 | 1766 | $mountTree = GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView'); |
1767 | - $mountTree->init('AND ' . $perms_clause); |
|
1767 | + $mountTree->init('AND '.$perms_clause); |
|
1768 | 1768 | $mountTree->getTree($mountpage[0]['mount_pid'], $depth, ''); |
1769 | 1769 | |
1770 | 1770 | foreach ($mountTree->tree as $mountData) { |
1771 | 1771 | $code .= $this->drawURLs_addRowsForPage( |
1772 | 1772 | $mountData['row'], |
1773 | - $mountData['HTML'] . BackendUtility::getRecordTitle('pages', $mountData['row'], true) |
|
1773 | + $mountData['HTML'].BackendUtility::getRecordTitle('pages', $mountData['row'], true) |
|
1774 | 1774 | ); |
1775 | 1775 | } |
1776 | 1776 | |
@@ -1785,7 +1785,7 @@ discard block |
||
1785 | 1785 | |
1786 | 1786 | $code .= $this->drawURLs_addRowsForPage( |
1787 | 1787 | $data['row'], |
1788 | - $data['HTML'] . BackendUtility::getRecordTitle('pages', $data['row'], true) |
|
1788 | + $data['HTML'].BackendUtility::getRecordTitle('pages', $data['row'], true) |
|
1789 | 1789 | ); |
1790 | 1790 | } |
1791 | 1791 | |
@@ -1810,7 +1810,7 @@ discard block |
||
1810 | 1810 | if (!empty($excludeString)) { |
1811 | 1811 | /* @var $tree \TYPO3\CMS\Backend\Tree\View\PageTreeView */ |
1812 | 1812 | $tree = GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView'); |
1813 | - $tree->init('AND ' . $this->backendUser->getPagePermsClause(1)); |
|
1813 | + $tree->init('AND '.$this->backendUser->getPagePermsClause(1)); |
|
1814 | 1814 | |
1815 | 1815 | $excludeParts = GeneralUtility::trimExplode(',', $excludeString); |
1816 | 1816 | |
@@ -1877,7 +1877,7 @@ discard block |
||
1877 | 1877 | |
1878 | 1878 | // Title column: |
1879 | 1879 | if (!$c) { |
1880 | - $titleClm = '<td rowspan="' . count($configurations) . '">' . $pageTitleAndIcon . '</td>'; |
|
1880 | + $titleClm = '<td rowspan="'.count($configurations).'">'.$pageTitleAndIcon.'</td>'; |
|
1881 | 1881 | } else { |
1882 | 1882 | $titleClm = ''; |
1883 | 1883 | } |
@@ -1904,45 +1904,45 @@ discard block |
||
1904 | 1904 | foreach ($confArray['paramExpanded'] as $gVar => $gVal) { |
1905 | 1905 | $paramExpanded .= ' |
1906 | 1906 | <tr> |
1907 | - <td class="bgColor4-20">' . htmlspecialchars('&' . $gVar . '=') . '<br/>' . |
|
1908 | - '(' . count($gVal) . ')' . |
|
1907 | + <td class="bgColor4-20">' . htmlspecialchars('&'.$gVar.'=').'<br/>'. |
|
1908 | + '('.count($gVal).')'. |
|
1909 | 1909 | '</td> |
1910 | - <td class="bgColor4" nowrap="nowrap">' . nl2br(htmlspecialchars(implode(chr(10), $gVal))) . '</td> |
|
1910 | + <td class="bgColor4" nowrap="nowrap">' . nl2br(htmlspecialchars(implode(chr(10), $gVal))).'</td> |
|
1911 | 1911 | </tr> |
1912 | 1912 | '; |
1913 | 1913 | $calcRes *= count($gVal); |
1914 | 1914 | $calcAccu[] = count($gVal); |
1915 | 1915 | } |
1916 | - $paramExpanded = '<table class="lrPadding c-list param-expanded">' . $paramExpanded . '</table>'; |
|
1917 | - $paramExpanded .= 'Comb: ' . implode('*', $calcAccu) . '=' . $calcRes; |
|
1916 | + $paramExpanded = '<table class="lrPadding c-list param-expanded">'.$paramExpanded.'</table>'; |
|
1917 | + $paramExpanded .= 'Comb: '.implode('*', $calcAccu).'='.$calcRes; |
|
1918 | 1918 | |
1919 | 1919 | // Options |
1920 | 1920 | $optionValues = ''; |
1921 | 1921 | if ($confArray['subCfg']['userGroups']) { |
1922 | - $optionValues .= 'User Groups: ' . $confArray['subCfg']['userGroups'] . '<br/>'; |
|
1922 | + $optionValues .= 'User Groups: '.$confArray['subCfg']['userGroups'].'<br/>'; |
|
1923 | 1923 | } |
1924 | 1924 | if ($confArray['subCfg']['baseUrl']) { |
1925 | - $optionValues .= 'Base Url: ' . $confArray['subCfg']['baseUrl'] . '<br/>'; |
|
1925 | + $optionValues .= 'Base Url: '.$confArray['subCfg']['baseUrl'].'<br/>'; |
|
1926 | 1926 | } |
1927 | 1927 | if ($confArray['subCfg']['procInstrFilter']) { |
1928 | - $optionValues .= 'ProcInstr: ' . $confArray['subCfg']['procInstrFilter'] . '<br/>'; |
|
1928 | + $optionValues .= 'ProcInstr: '.$confArray['subCfg']['procInstrFilter'].'<br/>'; |
|
1929 | 1929 | } |
1930 | 1930 | |
1931 | 1931 | // Compile row: |
1932 | 1932 | $content .= ' |
1933 | - <tr class="bgColor' . ($c % 2 ? '-20' : '-10') . '"> |
|
1934 | - ' . $titleClm . ' |
|
1935 | - <td>' . htmlspecialchars($confKey) . '</td> |
|
1936 | - <td>' . nl2br(htmlspecialchars(rawurldecode(trim(str_replace('&', chr(10) . '&', GeneralUtility::implodeArrayForUrl('', $confArray['paramParsed'])))))) . '</td> |
|
1937 | - <td>' . $paramExpanded . '</td> |
|
1938 | - <td nowrap="nowrap">' . $urlList . '</td> |
|
1939 | - <td nowrap="nowrap">' . $optionValues . '</td> |
|
1940 | - <td nowrap="nowrap">' . DebugUtility::viewArray($confArray['subCfg']['procInstrParams.']) . '</td> |
|
1933 | + <tr class="bgColor' . ($c % 2 ? '-20' : '-10').'"> |
|
1934 | + ' . $titleClm.' |
|
1935 | + <td>' . htmlspecialchars($confKey).'</td> |
|
1936 | + <td>' . nl2br(htmlspecialchars(rawurldecode(trim(str_replace('&', chr(10).'&', GeneralUtility::implodeArrayForUrl('', $confArray['paramParsed'])))))).'</td> |
|
1937 | + <td>' . $paramExpanded.'</td> |
|
1938 | + <td nowrap="nowrap">' . $urlList.'</td> |
|
1939 | + <td nowrap="nowrap">' . $optionValues.'</td> |
|
1940 | + <td nowrap="nowrap">' . DebugUtility::viewArray($confArray['subCfg']['procInstrParams.']).'</td> |
|
1941 | 1941 | </tr>'; |
1942 | 1942 | } else { |
1943 | - $content .= '<tr class="bgColor' . ($c % 2 ? '-20' : '-10') . '"> |
|
1944 | - ' . $titleClm . ' |
|
1945 | - <td>' . htmlspecialchars($confKey) . '</td> |
|
1943 | + $content .= '<tr class="bgColor'.($c % 2 ? '-20' : '-10').'"> |
|
1944 | + ' . $titleClm.' |
|
1945 | + <td>' . htmlspecialchars($confKey).'</td> |
|
1946 | 1946 | <td colspan="5"><em>No entries</em> (Page is excluded in this configuration)</td> |
1947 | 1947 | </tr>'; |
1948 | 1948 | } |
@@ -1950,13 +1950,13 @@ discard block |
||
1950 | 1950 | $c++; |
1951 | 1951 | } |
1952 | 1952 | } else { |
1953 | - $message = !empty($skipMessage) ? ' (' . $skipMessage . ')' : ''; |
|
1953 | + $message = !empty($skipMessage) ? ' ('.$skipMessage.')' : ''; |
|
1954 | 1954 | |
1955 | 1955 | // Compile row: |
1956 | 1956 | $content .= ' |
1957 | 1957 | <tr class="bgColor-20" style="border-bottom: 1px solid black;"> |
1958 | - <td>' . $pageTitleAndIcon . '</td> |
|
1959 | - <td colspan="6"><em>No entries</em>' . $message . '</td> |
|
1958 | + <td>' . $pageTitleAndIcon.'</td> |
|
1959 | + <td colspan="6"><em>No entries</em>' . $message.'</td> |
|
1960 | 1960 | </tr>'; |
1961 | 1961 | } |
1962 | 1962 | |
@@ -1971,7 +1971,7 @@ discard block |
||
1971 | 1971 | $res = $this->db->exec_SELECTquery( |
1972 | 1972 | 'count(*) as num', |
1973 | 1973 | 'tx_crawler_queue', |
1974 | - 'exec_time=0 AND process_scheduled=0 AND scheduled<=' . $this->getCurrentTime() |
|
1974 | + 'exec_time=0 AND process_scheduled=0 AND scheduled<='.$this->getCurrentTime() |
|
1975 | 1975 | ); |
1976 | 1976 | |
1977 | 1977 | $count = $this->db->sql_fetch_assoc($res); |
@@ -2013,7 +2013,7 @@ discard block |
||
2013 | 2013 | // Run process: |
2014 | 2014 | $result = $this->CLI_run($countInARun, $sleepTime, $sleepAfterFinish); |
2015 | 2015 | } catch (Exception $e) { |
2016 | - $this->CLI_debug(get_class($e) . ': ' . $e->getMessage()); |
|
2016 | + $this->CLI_debug(get_class($e).': '.$e->getMessage()); |
|
2017 | 2017 | $result = self::CLI_STATUS_ABORTED; |
2018 | 2018 | } |
2019 | 2019 | |
@@ -2023,7 +2023,7 @@ discard block |
||
2023 | 2023 | //TODO can't we do that in a clean way? |
2024 | 2024 | $releaseStatus = $this->CLI_releaseProcesses($this->CLI_buildProcessId()); |
2025 | 2025 | |
2026 | - $this->CLI_debug("Unprocessed Items remaining:" . $this->getUnprocessedItemsCount() . " (" . $this->CLI_buildProcessId() . ")"); |
|
2026 | + $this->CLI_debug("Unprocessed Items remaining:".$this->getUnprocessedItemsCount()." (".$this->CLI_buildProcessId().")"); |
|
2027 | 2027 | $result |= ($this->getUnprocessedItemsCount() > 0 ? self::CLI_STATUS_REMAIN : self::CLI_STATUS_NOTHING_PROCCESSED); |
2028 | 2028 | } else { |
2029 | 2029 | $result |= self::CLI_STATUS_ABORTED; |
@@ -2107,32 +2107,32 @@ discard block |
||
2107 | 2107 | ); |
2108 | 2108 | |
2109 | 2109 | if ($cliObj->cli_argValue('-o') === 'url') { |
2110 | - $cliObj->cli_echo(implode(chr(10), $this->downloadUrls) . chr(10), 1); |
|
2110 | + $cliObj->cli_echo(implode(chr(10), $this->downloadUrls).chr(10), 1); |
|
2111 | 2111 | } elseif ($cliObj->cli_argValue('-o') === 'exec') { |
2112 | - $cliObj->cli_echo("Executing " . count($this->urlList) . " requests right away:\n\n"); |
|
2113 | - $cliObj->cli_echo(implode(chr(10), $this->urlList) . chr(10)); |
|
2112 | + $cliObj->cli_echo("Executing ".count($this->urlList)." requests right away:\n\n"); |
|
2113 | + $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10)); |
|
2114 | 2114 | $cliObj->cli_echo("\nProcessing:\n"); |
2115 | 2115 | |
2116 | 2116 | foreach ($this->queueEntries as $queueRec) { |
2117 | 2117 | $p = unserialize($queueRec['parameters']); |
2118 | - $cliObj->cli_echo($p['url'] . ' (' . implode(',', $p['procInstructions']) . ') => '); |
|
2118 | + $cliObj->cli_echo($p['url'].' ('.implode(',', $p['procInstructions']).') => '); |
|
2119 | 2119 | |
2120 | 2120 | $result = $this->readUrlFromArray($queueRec); |
2121 | 2121 | |
2122 | 2122 | $requestResult = unserialize($result['content']); |
2123 | 2123 | if (is_array($requestResult)) { |
2124 | - $resLog = is_array($requestResult['log']) ? chr(10) . chr(9) . chr(9) . implode(chr(10) . chr(9) . chr(9), $requestResult['log']) : ''; |
|
2125 | - $cliObj->cli_echo('OK: ' . $resLog . chr(10)); |
|
2124 | + $resLog = is_array($requestResult['log']) ? chr(10).chr(9).chr(9).implode(chr(10).chr(9).chr(9), $requestResult['log']) : ''; |
|
2125 | + $cliObj->cli_echo('OK: '.$resLog.chr(10)); |
|
2126 | 2126 | } else { |
2127 | - $cliObj->cli_echo('Error checking Crawler Result: ' . substr(preg_replace('/\s+/', ' ', strip_tags($result['content'])), 0, 30000) . '...' . chr(10)); |
|
2127 | + $cliObj->cli_echo('Error checking Crawler Result: '.substr(preg_replace('/\s+/', ' ', strip_tags($result['content'])), 0, 30000).'...'.chr(10)); |
|
2128 | 2128 | } |
2129 | 2129 | } |
2130 | 2130 | } elseif ($cliObj->cli_argValue('-o') === 'queue') { |
2131 | - $cliObj->cli_echo("Putting " . count($this->urlList) . " entries in queue:\n\n"); |
|
2132 | - $cliObj->cli_echo(implode(chr(10), $this->urlList) . chr(10)); |
|
2131 | + $cliObj->cli_echo("Putting ".count($this->urlList)." entries in queue:\n\n"); |
|
2132 | + $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10)); |
|
2133 | 2133 | } else { |
2134 | - $cliObj->cli_echo(count($this->urlList) . " entries found for processing. (Use -o to decide action):\n\n", 1); |
|
2135 | - $cliObj->cli_echo(implode(chr(10), $this->urlList) . chr(10), 1); |
|
2134 | + $cliObj->cli_echo(count($this->urlList)." entries found for processing. (Use -o to decide action):\n\n", 1); |
|
2135 | + $cliObj->cli_echo(implode(chr(10), $this->urlList).chr(10), 1); |
|
2136 | 2136 | } |
2137 | 2137 | } |
2138 | 2138 | |
@@ -2186,7 +2186,7 @@ discard block |
||
2186 | 2186 | * @param QueueCommandLineController $cliObj Command line object |
2187 | 2187 | * @return mixed Array of keys or null if no keys found |
2188 | 2188 | */ |
2189 | - protected function getConfigurationKeys(QueueCommandLineController &$cliObj) |
|
2189 | + protected function getConfigurationKeys(QueueCommandLineController & $cliObj) |
|
2190 | 2190 | { |
2191 | 2191 | $parameter = trim($cliObj->cli_argValue('-conf')); |
2192 | 2192 | return ($parameter != '' ? GeneralUtility::trimExplode(',', $parameter) : []); |
@@ -2213,7 +2213,7 @@ discard block |
||
2213 | 2213 | $purgeDate = $this->getCurrentTime() - 24 * 60 * 60 * intval($this->extensionSettings['purgeQueueDays']); |
2214 | 2214 | $del = $this->db->exec_DELETEquery( |
2215 | 2215 | 'tx_crawler_queue', |
2216 | - 'exec_time!=0 AND exec_time<' . $purgeDate |
|
2216 | + 'exec_time!=0 AND exec_time<'.$purgeDate |
|
2217 | 2217 | ); |
2218 | 2218 | } |
2219 | 2219 | |
@@ -2244,7 +2244,7 @@ discard block |
||
2244 | 2244 | //TODO make sure we're not taking assigned queue-entires |
2245 | 2245 | $this->db->exec_UPDATEquery( |
2246 | 2246 | 'tx_crawler_queue', |
2247 | - 'qid IN (' . implode(',', $quidList) . ')', |
|
2247 | + 'qid IN ('.implode(',', $quidList).')', |
|
2248 | 2248 | [ |
2249 | 2249 | 'process_scheduled' => intval($this->getCurrentTime()), |
2250 | 2250 | 'process_id' => $processId |
@@ -2255,7 +2255,7 @@ discard block |
||
2255 | 2255 | $numberOfAffectedRows = $this->db->sql_affected_rows(); |
2256 | 2256 | $this->db->exec_UPDATEquery( |
2257 | 2257 | 'tx_crawler_process', |
2258 | - "process_id = '" . $processId . "'", |
|
2258 | + "process_id = '".$processId."'", |
|
2259 | 2259 | [ |
2260 | 2260 | 'assigned_items_count' => intval($numberOfAffectedRows) |
2261 | 2261 | ] |
@@ -2265,7 +2265,7 @@ discard block |
||
2265 | 2265 | $this->db->sql_query('COMMIT'); |
2266 | 2266 | } else { |
2267 | 2267 | $this->db->sql_query('ROLLBACK'); |
2268 | - $this->CLI_debug("Nothing processed due to multi-process collision (" . $this->CLI_buildProcessId() . ")"); |
|
2268 | + $this->CLI_debug("Nothing processed due to multi-process collision (".$this->CLI_buildProcessId().")"); |
|
2269 | 2269 | return ($result | self::CLI_STATUS_ABORTED); |
2270 | 2270 | } |
2271 | 2271 | |
@@ -2282,7 +2282,7 @@ discard block |
||
2282 | 2282 | } |
2283 | 2283 | |
2284 | 2284 | if (!$this->CLI_checkIfProcessIsActive($this->CLI_buildProcessId())) { |
2285 | - $this->CLI_debug("conflict / timeout (" . $this->CLI_buildProcessId() . ")"); |
|
2285 | + $this->CLI_debug("conflict / timeout (".$this->CLI_buildProcessId().")"); |
|
2286 | 2286 | |
2287 | 2287 | //TODO might need an additional returncode |
2288 | 2288 | $result |= self::CLI_STATUS_ABORTED; |
@@ -2292,10 +2292,10 @@ discard block |
||
2292 | 2292 | |
2293 | 2293 | sleep(intval($sleepAfterFinish)); |
2294 | 2294 | |
2295 | - $msg = 'Rows: ' . $counter; |
|
2296 | - $this->CLI_debug($msg . " (" . $this->CLI_buildProcessId() . ")"); |
|
2295 | + $msg = 'Rows: '.$counter; |
|
2296 | + $this->CLI_debug($msg." (".$this->CLI_buildProcessId().")"); |
|
2297 | 2297 | } else { |
2298 | - $this->CLI_debug("Nothing within queue which needs to be processed (" . $this->CLI_buildProcessId() . ")"); |
|
2298 | + $this->CLI_debug("Nothing within queue which needs to be processed (".$this->CLI_buildProcessId().")"); |
|
2299 | 2299 | } |
2300 | 2300 | |
2301 | 2301 | if ($counter > 0) { |
@@ -2363,7 +2363,7 @@ discard block |
||
2363 | 2363 | |
2364 | 2364 | // if there are less than allowed active processes then add a new one |
2365 | 2365 | if ($processCount < intval($this->extensionSettings['processLimit'])) { |
2366 | - $this->CLI_debug("add process " . $this->CLI_buildProcessId() . " (" . ($processCount + 1) . "/" . intval($this->extensionSettings['processLimit']) . ")"); |
|
2366 | + $this->CLI_debug("add process ".$this->CLI_buildProcessId()." (".($processCount + 1)."/".intval($this->extensionSettings['processLimit']).")"); |
|
2367 | 2367 | |
2368 | 2368 | // create new process record |
2369 | 2369 | $this->db->exec_INSERTquery( |
@@ -2376,7 +2376,7 @@ discard block |
||
2376 | 2376 | ] |
2377 | 2377 | ); |
2378 | 2378 | } else { |
2379 | - $this->CLI_debug("Processlimit reached (" . ($processCount) . "/" . intval($this->extensionSettings['processLimit']) . ")"); |
|
2379 | + $this->CLI_debug("Processlimit reached (".($processCount)."/".intval($this->extensionSettings['processLimit']).")"); |
|
2380 | 2380 | $ret = false; |
2381 | 2381 | } |
2382 | 2382 | |
@@ -2402,7 +2402,7 @@ discard block |
||
2402 | 2402 | } |
2403 | 2403 | |
2404 | 2404 | if (!count($releaseIds) > 0) { |
2405 | - return false; //nothing to release |
|
2405 | + return false; //nothing to release |
|
2406 | 2406 | } |
2407 | 2407 | |
2408 | 2408 | if (!$withinLock) { |
@@ -2437,14 +2437,14 @@ discard block |
||
2437 | 2437 | // mark all requested processes as non-active |
2438 | 2438 | $this->db->exec_UPDATEquery( |
2439 | 2439 | 'tx_crawler_process', |
2440 | - 'process_id IN (\'' . implode('\',\'', $releaseIds) . '\') AND deleted=0', |
|
2440 | + 'process_id IN (\''.implode('\',\'', $releaseIds).'\') AND deleted=0', |
|
2441 | 2441 | [ |
2442 | 2442 | 'active' => '0' |
2443 | 2443 | ] |
2444 | 2444 | ); |
2445 | 2445 | $this->db->exec_UPDATEquery( |
2446 | 2446 | 'tx_crawler_queue', |
2447 | - 'exec_time=0 AND process_id IN ("' . implode('","', $releaseIds) . '")', |
|
2447 | + 'exec_time=0 AND process_id IN ("'.implode('","', $releaseIds).'")', |
|
2448 | 2448 | [ |
2449 | 2449 | 'process_scheduled' => 0, |
2450 | 2450 | 'process_id' => '' |
@@ -2484,7 +2484,7 @@ discard block |
||
2484 | 2484 | $res = $this->db->exec_SELECTquery( |
2485 | 2485 | 'process_id,active,ttl', |
2486 | 2486 | 'tx_crawler_process', |
2487 | - 'process_id = \'' . $pid . '\' AND deleted=0', |
|
2487 | + 'process_id = \''.$pid.'\' AND deleted=0', |
|
2488 | 2488 | '', |
2489 | 2489 | 'ttl', |
2490 | 2490 | '0,1' |
@@ -2528,7 +2528,7 @@ discard block |
||
2528 | 2528 | public function CLI_debug($msg) |
2529 | 2529 | { |
2530 | 2530 | if (intval($this->extensionSettings['processDebug'])) { |
2531 | - echo $msg . "\n"; |
|
2531 | + echo $msg."\n"; |
|
2532 | 2532 | flush(); |
2533 | 2533 | } |
2534 | 2534 | } |
@@ -2546,7 +2546,7 @@ discard block |
||
2546 | 2546 | |
2547 | 2547 | $cmd = escapeshellcmd($this->extensionSettings['phpPath']); |
2548 | 2548 | $cmd .= ' '; |
2549 | - $cmd .= escapeshellarg(ExtensionManagementUtility::extPath('crawler') . 'cli/bootstrap.php'); |
|
2549 | + $cmd .= escapeshellarg(ExtensionManagementUtility::extPath('crawler').'cli/bootstrap.php'); |
|
2550 | 2550 | $cmd .= ' '; |
2551 | 2551 | $cmd .= escapeshellarg($this->getFrontendBasePath()); |
2552 | 2552 | $cmd .= ' '; |
@@ -2556,10 +2556,10 @@ discard block |
||
2556 | 2556 | |
2557 | 2557 | $startTime = microtime(true); |
2558 | 2558 | $content = $this->executeShellCommand($cmd); |
2559 | - $this->log($url . ' ' . (microtime(true) - $startTime)); |
|
2559 | + $this->log($url.' '.(microtime(true) - $startTime)); |
|
2560 | 2560 | |
2561 | 2561 | $result = [ |
2562 | - 'request' => implode("\r\n", $requestHeaders) . "\r\n\r\n", |
|
2562 | + 'request' => implode("\r\n", $requestHeaders)."\r\n\r\n", |
|
2563 | 2563 | 'headers' => '', |
2564 | 2564 | 'content' => $content |
2565 | 2565 | ]; |
@@ -2580,7 +2580,7 @@ discard block |
||
2580 | 2580 | $scheduledAgeInSeconds = $this->extensionSettings['cleanUpScheduledAge'] * 86400; |
2581 | 2581 | |
2582 | 2582 | $now = time(); |
2583 | - $condition = '(exec_time<>0 AND exec_time<' . ($now - $processedAgeInSeconds) . ') OR scheduled<=' . ($now - $scheduledAgeInSeconds); |
|
2583 | + $condition = '(exec_time<>0 AND exec_time<'.($now - $processedAgeInSeconds).') OR scheduled<='.($now - $scheduledAgeInSeconds); |
|
2584 | 2584 | $this->flushQueue($condition); |
2585 | 2585 | } |
2586 | 2586 |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | white-space: nowrap; vertical-align: top; |
188 | 188 | } |
189 | 189 | --></style> |
190 | - <link rel="stylesheet" type="text/css" href="' . $BACK_PATH . '../typo3conf/ext/crawler/template/res.css" /> |
|
190 | + <link rel="stylesheet" type="text/css" href="' . $BACK_PATH.'../typo3conf/ext/crawler/template/res.css" /> |
|
191 | 191 | '; |
192 | 192 | |
193 | 193 | // Type function menu: |
@@ -209,15 +209,15 @@ discard block |
||
209 | 209 | 'index.php' |
210 | 210 | ); |
211 | 211 | |
212 | - $quiPart = GeneralUtility::_GP('qid_details') ? '&qid_details=' . intval(GeneralUtility::_GP('qid_details')) : ''; |
|
212 | + $quiPart = GeneralUtility::_GP('qid_details') ? '&qid_details='.intval(GeneralUtility::_GP('qid_details')) : ''; |
|
213 | 213 | |
214 | 214 | $setId = intval(GeneralUtility::_GP('setID')); |
215 | 215 | |
216 | - $h_func .= '<hr/>' . |
|
217 | - $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.display') . ': ' . BackendUtility::getFuncMenu($this->pObj->id, 'SET[log_display]', $this->pObj->MOD_SETTINGS['log_display'], $this->pObj->MOD_MENU['log_display'], 'index.php', '&setID=' . $setId) . ' - ' . |
|
218 | - $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.showresultlog') . ': ' . BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_resultLog]', $this->pObj->MOD_SETTINGS['log_resultLog'], 'index.php', '&setID=' . $setId . $quiPart) . ' - ' . |
|
219 | - $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.showfevars') . ': ' . BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_feVars]', $this->pObj->MOD_SETTINGS['log_feVars'], 'index.php', '&setID=' . $setId . $quiPart) . ' - ' . |
|
220 | - $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.itemsPerPage') . ': ' . |
|
216 | + $h_func .= '<hr/>'. |
|
217 | + $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.display').': '.BackendUtility::getFuncMenu($this->pObj->id, 'SET[log_display]', $this->pObj->MOD_SETTINGS['log_display'], $this->pObj->MOD_MENU['log_display'], 'index.php', '&setID='.$setId).' - '. |
|
218 | + $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.showresultlog').': '.BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_resultLog]', $this->pObj->MOD_SETTINGS['log_resultLog'], 'index.php', '&setID='.$setId.$quiPart).' - '. |
|
219 | + $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.showfevars').': '.BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_feVars]', $this->pObj->MOD_SETTINGS['log_feVars'], 'index.php', '&setID='.$setId.$quiPart).' - '. |
|
220 | + $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.itemsPerPage').': '. |
|
221 | 221 | BackendUtility::getFuncMenu( |
222 | 222 | $this->pObj->id, |
223 | 223 | 'SET[itemsPerPage]', |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $theOutput = $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1); |
231 | 231 | |
232 | 232 | // Branch based on type: |
233 | - switch ((string)$this->pObj->MOD_SETTINGS['crawlaction']) { |
|
233 | + switch ((string) $this->pObj->MOD_SETTINGS['crawlaction']) { |
|
234 | 234 | case 'start': |
235 | 235 | if (empty($this->pObj->id)) { |
236 | 236 | $this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.noPageSelected')); |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | ) { |
306 | 306 | $code = ' |
307 | 307 | <tr> |
308 | - <td colspan="7"><b>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.noConfigSelected') . '</b></td> |
|
308 | + <td colspan="7"><b>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.noConfigSelected').'</b></td> |
|
309 | 309 | </tr>'; |
310 | 310 | } else { |
311 | 311 | if ($this->submitCrawlUrls) { |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | if ($BE_USER instanceof BackendUserAuthentication) { |
316 | 316 | $username = $BE_USER->user['username']; |
317 | 317 | } |
318 | - $reason->setDetailText('The user ' . $username . ' added pages to the crawler queue manually '); |
|
318 | + $reason->setDetailText('The user '.$username.' added pages to the crawler queue manually '); |
|
319 | 319 | |
320 | 320 | EventDispatcher::getInstance()->post( |
321 | 321 | 'invokeQueueChange', |
@@ -341,25 +341,25 @@ discard block |
||
341 | 341 | |
342 | 342 | $output = ''; |
343 | 343 | if ($code) { |
344 | - $output .= '<h3>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.configuration') . ':</h3>'; |
|
345 | - $output .= '<input type="hidden" name="id" value="' . intval($this->pObj->id) . '" />'; |
|
344 | + $output .= '<h3>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.configuration').':</h3>'; |
|
345 | + $output .= '<input type="hidden" name="id" value="'.intval($this->pObj->id).'" />'; |
|
346 | 346 | |
347 | 347 | if (!$this->submitCrawlUrls) { |
348 | - $output .= $this->drawURLs_cfgSelectors() . '<br />'; |
|
349 | - $output .= '<input type="submit" name="_update" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.triggerUpdate') . '" /> '; |
|
350 | - $output .= '<input type="submit" name="_crawl" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.triggerCrawl') . '" /> '; |
|
351 | - $output .= '<input type="submit" name="_download" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.triggerDownload') . '" /><br /><br />'; |
|
352 | - $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.count') . ': ' . count(array_keys($this->duplicateTrack)) . '<br />'; |
|
353 | - $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.curtime') . ': ' . date('H:i:s', time()) . '<br />'; |
|
348 | + $output .= $this->drawURLs_cfgSelectors().'<br />'; |
|
349 | + $output .= '<input type="submit" name="_update" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.triggerUpdate').'" /> '; |
|
350 | + $output .= '<input type="submit" name="_crawl" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.triggerCrawl').'" /> '; |
|
351 | + $output .= '<input type="submit" name="_download" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.triggerDownload').'" /><br /><br />'; |
|
352 | + $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.count').': '.count(array_keys($this->duplicateTrack)).'<br />'; |
|
353 | + $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.curtime').': '.date('H:i:s', time()).'<br />'; |
|
354 | 354 | $output .= '<br /> |
355 | 355 | <table class="lrPadding c-list url-table">' . |
356 | - $this->drawURLs_printTableHeader() . |
|
357 | - $code . |
|
356 | + $this->drawURLs_printTableHeader(). |
|
357 | + $code. |
|
358 | 358 | '</table>'; |
359 | 359 | } else { |
360 | - $output .= count(array_keys($this->duplicateTrack)) . ' ' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.submitted') . '. <br /><br />'; |
|
361 | - $output .= '<input type="submit" name="_" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.continue') . '" />'; |
|
362 | - $output .= '<input type="submit" onclick="this.form.elements[\'SET[crawlaction]\'].value=\'log\';" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.continueinlog') . '" />'; |
|
360 | + $output .= count(array_keys($this->duplicateTrack)).' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.submitted').'. <br /><br />'; |
|
361 | + $output .= '<input type="submit" name="_" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.continue').'" />'; |
|
362 | + $output .= '<input type="submit" onclick="this.form.elements[\'SET[crawlaction]\'].value=\'log\';" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.continueinlog').'" />'; |
|
363 | 363 | } |
364 | 364 | } |
365 | 365 | |
@@ -368,11 +368,11 @@ discard block |
||
368 | 368 | |
369 | 369 | // Creating output header: |
370 | 370 | $mimeType = 'application/octet-stream'; |
371 | - Header('Content-Type: ' . $mimeType); |
|
371 | + Header('Content-Type: '.$mimeType); |
|
372 | 372 | Header('Content-Disposition: attachment; filename=CrawlerUrls.txt'); |
373 | 373 | |
374 | 374 | // Printing the content of the CSV lines: |
375 | - echo implode(chr(13) . chr(10), $this->downloadUrls); |
|
375 | + echo implode(chr(13).chr(10), $this->downloadUrls); |
|
376 | 376 | |
377 | 377 | exit; |
378 | 378 | } |
@@ -427,13 +427,13 @@ discard block |
||
427 | 427 | $output = ' |
428 | 428 | <table class="lrPadding c-list"> |
429 | 429 | <tr class="bgColor5 tableheader"> |
430 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.depth') . ':</td> |
|
431 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.configurations') . ':</td> |
|
432 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.scheduled') . ':</td> |
|
430 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.depth').':</td> |
|
431 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.configurations').':</td> |
|
432 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.scheduled').':</td> |
|
433 | 433 | </tr> |
434 | 434 | <tr class="bgColor4"> |
435 | 435 | <td valign="top">' . implode('</td> |
436 | - <td valign="top">', $cell) . '</td> |
|
436 | + <td valign="top">', $cell).'</td> |
|
437 | 437 | </tr> |
438 | 438 | </table>'; |
439 | 439 | |
@@ -449,13 +449,13 @@ discard block |
||
449 | 449 | { |
450 | 450 | $content = ' |
451 | 451 | <tr class="bgColor5 tableheader"> |
452 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.pagetitle') . ':</td> |
|
453 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.key') . ':</td> |
|
454 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.parametercfg') . ':</td> |
|
455 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.values') . ':</td> |
|
456 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.urls') . ':</td> |
|
457 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.options') . ':</td> |
|
458 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.parameters') . ':</td> |
|
452 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.pagetitle').':</td> |
|
453 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.key').':</td> |
|
454 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.parametercfg').':</td> |
|
455 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.values').':</td> |
|
456 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.urls').':</td> |
|
457 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.options').':</td> |
|
458 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.parameters').':</td> |
|
459 | 459 | </tr>'; |
460 | 460 | |
461 | 461 | return $content; |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | if (GeneralUtility::_GP('qid_details')) { |
497 | 497 | |
498 | 498 | // Get entry record: |
499 | - list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid=' . intval(GeneralUtility::_GP('qid_details'))); |
|
499 | + list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval(GeneralUtility::_GP('qid_details'))); |
|
500 | 500 | |
501 | 501 | // Explode values: |
502 | 502 | $resStatus = $this->getResStatus($q_entry); |
@@ -513,12 +513,12 @@ discard block |
||
513 | 513 | // Print rudimentary details: |
514 | 514 | $output .= ' |
515 | 515 | <br /><br /> |
516 | - <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.back') . '" name="_back" /> |
|
517 | - <input type="hidden" value="' . $this->pObj->id . '" name="id" /> |
|
518 | - <input type="hidden" value="' . $showSetId . '" name="setID" /> |
|
516 | + <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.back').'" name="_back" /> |
|
517 | + <input type="hidden" value="' . $this->pObj->id.'" name="id" /> |
|
518 | + <input type="hidden" value="' . $showSetId.'" name="setID" /> |
|
519 | 519 | <br /> |
520 | - Current server time: ' . date('H:i:s', time()) . '<br />' . |
|
521 | - 'Status: ' . $resStatus . '<br />' . |
|
520 | + Current server time: ' . date('H:i:s', time()).'<br />'. |
|
521 | + 'Status: '.$resStatus.'<br />'. |
|
522 | 522 | DebugUtility::viewArray($q_entry); |
523 | 523 | } else { // Show list: |
524 | 524 | |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | // Drawing tree: |
529 | 529 | $tree = GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView'); |
530 | 530 | $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1); |
531 | - $tree->init('AND ' . $perms_clause); |
|
531 | + $tree->init('AND '.$perms_clause); |
|
532 | 532 | |
533 | 533 | // Set root row: |
534 | 534 | $HTML = IconUtility::getIconForRecord('pages', $this->pObj->pageinfo); |
@@ -548,7 +548,7 @@ discard block |
||
548 | 548 | foreach ($tree->tree as $data) { |
549 | 549 | $code .= $this->drawLog_addRows( |
550 | 550 | $data['row'], |
551 | - $data['HTML'] . BackendUtility::getRecordTitle('pages', $data['row'], true), |
|
551 | + $data['HTML'].BackendUtility::getRecordTitle('pages', $data['row'], true), |
|
552 | 552 | intval($this->pObj->MOD_SETTINGS['itemsPerPage']) |
553 | 553 | ); |
554 | 554 | if (++$count == 1000) { |
@@ -559,27 +559,27 @@ discard block |
||
559 | 559 | $code = ''; |
560 | 560 | $code .= $this->drawLog_addRows( |
561 | 561 | $showSetId, |
562 | - 'Set ID: ' . $showSetId |
|
562 | + 'Set ID: '.$showSetId |
|
563 | 563 | ); |
564 | 564 | } |
565 | 565 | |
566 | 566 | if ($code) { |
567 | 567 | $output .= ' |
568 | 568 | <br /><br /> |
569 | - <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.reloadlist') . '" name="_reload" /> |
|
570 | - <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.downloadcsv') . '" name="_csv" /> |
|
571 | - <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.flushvisiblequeue') . '" name="_flush" onclick="return confirm(\'' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.confirmyouresure') . '\');" /> |
|
572 | - <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.flushfullqueue') . '" name="_flush_all" onclick="return confirm(\'' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.confirmyouresure') . '\');" /> |
|
573 | - <input type="hidden" value="' . $this->pObj->id . '" name="id" /> |
|
574 | - <input type="hidden" value="' . $showSetId . '" name="setID" /> |
|
569 | + <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.reloadlist').'" name="_reload" /> |
|
570 | + <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.downloadcsv').'" name="_csv" /> |
|
571 | + <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.flushvisiblequeue').'" name="_flush" onclick="return confirm(\''.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.confirmyouresure').'\');" /> |
|
572 | + <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.flushfullqueue').'" name="_flush_all" onclick="return confirm(\''.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.confirmyouresure').'\');" /> |
|
573 | + <input type="hidden" value="' . $this->pObj->id.'" name="id" /> |
|
574 | + <input type="hidden" value="' . $showSetId.'" name="setID" /> |
|
575 | 575 | <br /> |
576 | - ' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.curtime') . ': ' . date('H:i:s', time()) . ' |
|
576 | + ' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.curtime').': '.date('H:i:s', time()).' |
|
577 | 577 | <br /><br /> |
578 | 578 | |
579 | 579 | |
580 | 580 | <table class="lrPadding c-list crawlerlog">' . |
581 | - $this->drawLog_printTableHeader() . |
|
582 | - $code . |
|
581 | + $this->drawLog_printTableHeader(). |
|
582 | + $code. |
|
583 | 583 | '</table>'; |
584 | 584 | } |
585 | 585 | } else { // Otherwise show available sets: |
@@ -593,19 +593,19 @@ discard block |
||
593 | 593 | |
594 | 594 | $code = ' |
595 | 595 | <tr class="bgColor5 tableheader"> |
596 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.setid') . ':</td> |
|
597 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.count') . 't:</td> |
|
598 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.time') . ':</td> |
|
596 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.setid').':</td> |
|
597 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.count').'t:</td> |
|
598 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.time').':</td> |
|
599 | 599 | </tr> |
600 | 600 | '; |
601 | 601 | |
602 | 602 | $cc = 0; |
603 | 603 | foreach ($setList as $set) { |
604 | 604 | $code .= ' |
605 | - <tr class="bgColor' . ($cc % 2 ? '-20' : '-10') . '"> |
|
606 | - <td><a href="' . htmlspecialchars('index.php?setID=' . $set['set_id']) . '">' . $set['set_id'] . '</a></td> |
|
607 | - <td>' . $set['count_value'] . '</td> |
|
608 | - <td>' . BackendUtility::dateTimeAge($set['scheduled']) . '</td> |
|
605 | + <tr class="bgColor' . ($cc % 2 ? '-20' : '-10').'"> |
|
606 | + <td><a href="' . htmlspecialchars('index.php?setID='.$set['set_id']).'">'.$set['set_id'].'</a></td> |
|
607 | + <td>' . $set['count_value'].'</td> |
|
608 | + <td>' . BackendUtility::dateTimeAge($set['scheduled']).'</td> |
|
609 | 609 | </tr> |
610 | 610 | '; |
611 | 611 | |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | $output .= ' |
616 | 616 | <br /><br /> |
617 | 617 | <table class="lrPadding c-list">' . |
618 | - $code . |
|
618 | + $code. |
|
619 | 619 | '</table>'; |
620 | 620 | } |
621 | 621 | } |
@@ -652,11 +652,11 @@ discard block |
||
652 | 652 | |
653 | 653 | // Creating output header: |
654 | 654 | $mimeType = 'application/octet-stream'; |
655 | - Header('Content-Type: ' . $mimeType); |
|
655 | + Header('Content-Type: '.$mimeType); |
|
656 | 656 | Header('Content-Disposition: attachment; filename=CrawlerLog.csv'); |
657 | 657 | |
658 | 658 | // Printing the content of the CSV lines: |
659 | - echo implode(chr(13) . chr(10), $csvLines); |
|
659 | + echo implode(chr(13).chr(10), $csvLines); |
|
660 | 660 | |
661 | 661 | // Exits: |
662 | 662 | exit; |
@@ -708,7 +708,7 @@ discard block |
||
708 | 708 | |
709 | 709 | // Title column: |
710 | 710 | if (!$c) { |
711 | - $titleClm = '<td rowspan="' . count($res) . '">' . $titleString . '</td>'; |
|
711 | + $titleClm = '<td rowspan="'.count($res).'">'.$titleString.'</td>'; |
|
712 | 712 | } else { |
713 | 713 | $titleClm = ''; |
714 | 714 | } |
@@ -727,11 +727,11 @@ discard block |
||
727 | 727 | if ($this->pObj->MOD_SETTINGS['log_resultLog']) { |
728 | 728 | $rowData['result_log'] = $resLog; |
729 | 729 | } else { |
730 | - $rowData['scheduled'] = ($vv['scheduled'] > 0) ? BackendUtility::datetime($vv['scheduled']) : ' ' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.immediate'); |
|
730 | + $rowData['scheduled'] = ($vv['scheduled'] > 0) ? BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.immediate'); |
|
731 | 731 | $rowData['exec_time'] = $vv['exec_time'] ? BackendUtility::datetime($vv['exec_time']) : '-'; |
732 | 732 | } |
733 | 733 | $rowData['result_status'] = GeneralUtility::fixed_lgd_cs($resStatus, 50); |
734 | - $rowData['url'] = '<a href="' . htmlspecialchars($parameters['url']) . '" target="_newWIndow">' . htmlspecialchars($parameters['url']) . '</a>'; |
|
734 | + $rowData['url'] = '<a href="'.htmlspecialchars($parameters['url']).'" target="_newWIndow">'.htmlspecialchars($parameters['url']).'</a>'; |
|
735 | 735 | $rowData['feUserGroupList'] = $parameters['feUserGroupList']; |
736 | 736 | $rowData['procInstructions'] = is_array($parameters['procInstructions']) ? implode('; ', $parameters['procInstructions']) : ''; |
737 | 737 | $rowData['set_id'] = $vv['set_id']; |
@@ -743,21 +743,21 @@ discard block |
||
743 | 743 | } |
744 | 744 | |
745 | 745 | $setId = intval(GeneralUtility::_GP('setID')); |
746 | - $refreshIcon = $GLOBALS['BACK_PATH'] . 'sysext/t3skin/extjs/images/grid/refresh.gif'; |
|
746 | + $refreshIcon = $GLOBALS['BACK_PATH'].'sysext/t3skin/extjs/images/grid/refresh.gif'; |
|
747 | 747 | |
748 | 748 | // Put rows together: |
749 | 749 | $content .= ' |
750 | - <tr class="bgColor' . ($c % 2 ? '-20' : '-10') . '"> |
|
751 | - ' . $titleClm . ' |
|
752 | - <td><a href="' . $this->getModuleUrl(['qid_details' => $vv['qid'], 'setID' => $setId]) . '">' . htmlspecialchars($vv['qid']) . '</a></td> |
|
753 | - <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>'; |
|
750 | + <tr class="bgColor' . ($c % 2 ? '-20' : '-10').'"> |
|
751 | + ' . $titleClm.' |
|
752 | + <td><a href="' . $this->getModuleUrl(['qid_details' => $vv['qid'], 'setID' => $setId]).'">'.htmlspecialchars($vv['qid']).'</a></td> |
|
753 | + <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>'; |
|
754 | 754 | foreach ($rowData as $fKey => $value) { |
755 | 755 | if (GeneralUtility::inList('url', $fKey)) { |
756 | 756 | $content .= ' |
757 | - <td>' . $value . '</td>'; |
|
757 | + <td>' . $value.'</td>'; |
|
758 | 758 | } else { |
759 | 759 | $content .= ' |
760 | - <td>' . nl2br(htmlspecialchars($value)) . '</td>'; |
|
760 | + <td>' . nl2br(htmlspecialchars($value)).'</td>'; |
|
761 | 761 | } |
762 | 762 | } |
763 | 763 | $content .= ' |
@@ -778,8 +778,8 @@ discard block |
||
778 | 778 | // Compile row: |
779 | 779 | $content = ' |
780 | 780 | <tr class="bgColor-20"> |
781 | - <td>' . $titleString . '</td> |
|
782 | - <td colspan="' . $colSpan . '"><em>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.noentries') . '</em></td> |
|
781 | + <td>' . $titleString.'</td> |
|
782 | + <td colspan="' . $colSpan.'"><em>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.noentries').'</em></td> |
|
783 | 783 | </tr>'; |
784 | 784 | } |
785 | 785 | |
@@ -814,22 +814,22 @@ discard block |
||
814 | 814 | { |
815 | 815 | $content = ' |
816 | 816 | <tr class="bgColor5 tableheader"> |
817 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.pagetitle') . ':</td> |
|
818 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.qid') . ':</td> |
|
817 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.pagetitle').':</td> |
|
818 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.qid').':</td> |
|
819 | 819 | <td> </td>' . |
820 | 820 | ($this->pObj->MOD_SETTINGS['log_resultLog'] ? ' |
821 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.resultlog') . ':</td>' : ' |
|
822 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.scheduledtime') . ':</td> |
|
823 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.runtime') . ':</td>') . ' |
|
824 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.status') . ':</td> |
|
825 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.url') . ':</td> |
|
826 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.groups') . ':</td> |
|
827 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.procinstr') . ':</td> |
|
828 | - <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.setid') . ':</td>' . |
|
821 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.resultlog').':</td>' : ' |
|
822 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.scheduledtime').':</td> |
|
823 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.runtime').':</td>').' |
|
824 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.status').':</td> |
|
825 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.url').':</td> |
|
826 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.groups').':</td> |
|
827 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.procinstr').':</td> |
|
828 | + <td>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.setid').':</td>'. |
|
829 | 829 | ($this->pObj->MOD_SETTINGS['log_feVars'] ? ' |
830 | - <td>' . htmlspecialchars('TSFE->id') . '</td> |
|
831 | - <td>' . htmlspecialchars('TSFE->gr_list') . '</td> |
|
832 | - <td>' . htmlspecialchars('TSFE->no_cache') . '</td>' : '') . ' |
|
830 | + <td>' . htmlspecialchars('TSFE->id').'</td> |
|
831 | + <td>' . htmlspecialchars('TSFE->gr_list').'</td> |
|
832 | + <td>' . htmlspecialchars('TSFE->no_cache').'</td>' : '').' |
|
833 | 833 | </tr>'; |
834 | 834 | |
835 | 835 | return $content; |
@@ -871,7 +871,7 @@ discard block |
||
871 | 871 | } |
872 | 872 | $resLog = is_array($requestResult['log']) ? implode(chr(10), $requestResult['log']) : ''; |
873 | 873 | } else { |
874 | - $resStatus = 'Error: ' . substr(preg_replace('/\s+/', ' ', strip_tags($requestContent['content'])), 0, 10000) . '...'; |
|
874 | + $resStatus = 'Error: '.substr(preg_replace('/\s+/', ' ', strip_tags($requestContent['content'])), 0, 10000).'...'; |
|
875 | 875 | } |
876 | 876 | } else { |
877 | 877 | $resStatus = '-'; |
@@ -923,7 +923,7 @@ discard block |
||
923 | 923 | |
924 | 924 | $listView = new ProcessListView(); |
925 | 925 | $listView->setPageId($this->pObj->id); |
926 | - $listView->setIconPath($BACK_PATH . '../typo3conf/ext/crawler/template/process/res/img/'); |
|
926 | + $listView->setIconPath($BACK_PATH.'../typo3conf/ext/crawler/template/process/res/img/'); |
|
927 | 927 | $listView->setProcessCollection($allProcesses); |
928 | 928 | $listView->setCliPath($this->processManager->getCrawlerCliPath()); |
929 | 929 | $listView->setIsCrawlerEnabled(!$crawler->getDisabled() && !$this->isErrorDetected); |
@@ -941,7 +941,7 @@ discard block |
||
941 | 941 | $output = $listView->render(); |
942 | 942 | |
943 | 943 | if ($paginationView->getTotalPagesCount() > 1) { |
944 | - $output .= ' <br />' . $paginationView->render(); |
|
944 | + $output .= ' <br />'.$paginationView->render(); |
|
945 | 945 | } |
946 | 946 | |
947 | 947 | return $output; |
@@ -968,7 +968,7 @@ discard block |
||
968 | 968 | |
969 | 969 | $exitCode = 0; |
970 | 970 | $out = []; |
971 | - exec(escapeshellcmd($this->extensionSettings['phpPath'] . ' -v'), $out, $exitCode); |
|
971 | + exec(escapeshellcmd($this->extensionSettings['phpPath'].' -v'), $out, $exitCode); |
|
972 | 972 | if ($exitCode > 0) { |
973 | 973 | $this->addErrorMessage(sprintf($LANG->sL('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:message.phpBinaryNotFound'), htmlspecialchars($this->extensionSettings['phpPath']))); |
974 | 974 | } |
@@ -1149,10 +1149,10 @@ discard block |
||
1149 | 1149 | $options = []; |
1150 | 1150 | foreach ($optArray as $key => $val) { |
1151 | 1151 | $options[] = ' |
1152 | - <option value="' . htmlspecialchars($key) . '"' . ((!$multiple && !strcmp($value, $key)) || ($multiple && in_array($key, (array)$value)) ? ' selected="selected"' : '') . '>' . htmlspecialchars($val) . '</option>'; |
|
1152 | + <option value="' . htmlspecialchars($key).'"'.((!$multiple && !strcmp($value, $key)) || ($multiple && in_array($key, (array) $value)) ? ' selected="selected"' : '').'>'.htmlspecialchars($val).'</option>'; |
|
1153 | 1153 | } |
1154 | 1154 | |
1155 | - $output = '<select name="' . htmlspecialchars($name . ($multiple ? '[]' : '')) . '"' . ($multiple ? ' multiple="multiple" size="' . count($options) . '"' : '') . '>' . implode('', $options) . '</select>'; |
|
1155 | + $output = '<select name="'.htmlspecialchars($name.($multiple ? '[]' : '')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('', $options).'</select>'; |
|
1156 | 1156 | |
1157 | 1157 | return $output; |
1158 | 1158 | } |
@@ -322,7 +322,7 @@ |
||
322 | 322 | return ButtonUtility::getLinkButton( |
323 | 323 | 'actions-refresh', |
324 | 324 | $this->getLLLabel('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.refresh'), |
325 | - 'window.location=\'' . BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess&id=' . $this->pageId . '\';' |
|
325 | + 'window.location=\''.BackendUtility::getModuleUrl('web_info').'&SET[crawlaction]=multiprocess&id='.$this->pageId.'\';' |
|
326 | 326 | ); |
327 | 327 | } |
328 | 328 |