|
@@ -90,10 +90,10 @@ discard block |
|
|
block discarded – undo |
|
90
|
90
|
* |
|
91
|
91
|
* @return array Menu array |
|
92
|
92
|
*/ |
|
93
|
|
- function modMenu() { |
|
|
93
|
+ function modMenu() { |
|
94
|
94
|
global $LANG; |
|
95
|
95
|
|
|
96
|
|
- return array ( |
|
|
96
|
+ return array( |
|
97
|
97
|
'depth' => array( |
|
98
|
98
|
0 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_0'), |
|
99
|
99
|
1 => $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.depth_1'), |
|
@@ -150,7 +150,7 @@ discard block |
|
|
block discarded – undo |
|
150
|
150
|
} |
|
151
|
151
|
|
|
152
|
152
|
// Set CSS styles specific for this document: |
|
153
|
|
- $this->pObj->content = str_replace('/*###POSTCSSMARKER###*/',' |
|
|
153
|
+ $this->pObj->content = str_replace('/*###POSTCSSMARKER###*/', ' |
|
154
|
154
|
TABLE.c-list TR TD { white-space: nowrap; vertical-align: top; } |
|
155
|
155
|
',$this->pObj->content); |
|
156
|
156
|
|
|
@@ -195,7 +195,7 @@ discard block |
|
|
block discarded – undo |
|
195
|
195
|
*/ |
|
196
|
196
|
|
|
197
|
197
|
// Additional menus for the log type: |
|
198
|
|
- if ($this->pObj->MOD_SETTINGS['crawlaction']==='log') { |
|
|
198
|
+ if ($this->pObj->MOD_SETTINGS['crawlaction'] === 'log') { |
|
199
|
199
|
$h_func .= \TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu( |
|
200
|
200
|
$this->pObj->id, |
|
201
|
201
|
'SET[depth]', |
|
@@ -204,15 +204,15 @@ discard block |
|
|
block discarded – undo |
|
204
|
204
|
'index.php' |
|
205
|
205
|
); |
|
206
|
206
|
|
|
207
|
|
- $quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details=' . intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : ''; |
|
|
207
|
+ $quiPart = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details') ? '&qid_details='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) : ''; |
|
208
|
208
|
|
|
209
|
209
|
$setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID')); |
|
210
|
210
|
|
|
211
|
|
- $h_func.= '<hr/>'. |
|
212
|
|
- $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.display').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->pObj->id,'SET[log_display]',$this->pObj->MOD_SETTINGS['log_display'],$this->pObj->MOD_MENU['log_display'],'index.php','&setID='.$setId) . ' - ' . |
|
213
|
|
- $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showresultlog').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_resultLog]',$this->pObj->MOD_SETTINGS['log_resultLog'],'index.php','&setID='.$setId . $quiPart) . ' - ' . |
|
214
|
|
- $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showfevars').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id,'SET[log_feVars]',$this->pObj->MOD_SETTINGS['log_feVars'],'index.php','&setID='.$setId . $quiPart) . ' - ' . |
|
215
|
|
- $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage').': ' . |
|
|
211
|
+ $h_func .= '<hr/>'. |
|
|
212
|
+ $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.display').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu($this->pObj->id, 'SET[log_display]', $this->pObj->MOD_SETTINGS['log_display'], $this->pObj->MOD_MENU['log_display'], 'index.php', '&setID='.$setId).' - '. |
|
|
213
|
+ $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showresultlog').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_resultLog]', $this->pObj->MOD_SETTINGS['log_resultLog'], 'index.php', '&setID='.$setId.$quiPart).' - '. |
|
|
214
|
+ $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.showfevars').': '.\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncCheck($this->pObj->id, 'SET[log_feVars]', $this->pObj->MOD_SETTINGS['log_feVars'], 'index.php', '&setID='.$setId.$quiPart).' - '. |
|
|
215
|
+ $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.itemsPerPage').': '. |
|
216
|
216
|
\TYPO3\CMS\Backend\Utility\BackendUtility::getFuncMenu( |
|
217
|
217
|
$this->pObj->id, |
|
218
|
218
|
'SET[itemsPerPage]', |
|
@@ -222,11 +222,11 @@ discard block |
|
|
block discarded – undo |
|
222
|
222
|
); |
|
223
|
223
|
} |
|
224
|
224
|
|
|
225
|
|
- $theOutput= $this->pObj->doc->spacer(5); |
|
226
|
|
- $theOutput.= $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1); |
|
|
225
|
+ $theOutput = $this->pObj->doc->spacer(5); |
|
|
226
|
+ $theOutput .= $this->pObj->doc->section($LANG->getLL('title'), $h_func, 0, 1); |
|
227
|
227
|
|
|
228
|
228
|
// Branch based on type: |
|
229
|
|
- switch ((string)$this->pObj->MOD_SETTINGS['crawlaction']) { |
|
|
229
|
+ switch ((string) $this->pObj->MOD_SETTINGS['crawlaction']) { |
|
230
|
230
|
case 'start': |
|
231
|
231
|
if (empty($this->pObj->id)) { |
|
232
|
232
|
$this->addErrorMessage($GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noPageSelected')); |
|
@@ -274,7 +274,7 @@ discard block |
|
|
block discarded – undo |
|
274
|
274
|
* |
|
275
|
275
|
* @return string HTML output |
|
276
|
276
|
*/ |
|
277
|
|
- function drawURLs() { |
|
|
277
|
+ function drawURLs() { |
|
278
|
278
|
global $BACK_PATH, $BE_USER; |
|
279
|
279
|
|
|
280
|
280
|
// Init: |
|
@@ -283,12 +283,12 @@ discard block |
|
|
block discarded – undo |
|
283
|
283
|
$this->downloadCrawlUrls = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('_download'); |
|
284
|
284
|
$this->makeCrawlerProcessableChecks(); |
|
285
|
285
|
|
|
286
|
|
- switch((string)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp')) { |
|
|
286
|
+ switch ((string) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('tstamp')) { |
|
287
|
287
|
case 'midnight': |
|
288
|
|
- $this->scheduledTime = mktime(0,0,0); |
|
|
288
|
+ $this->scheduledTime = mktime(0, 0, 0); |
|
289
|
289
|
break; |
|
290
|
290
|
case '04:00': |
|
291
|
|
- $this->scheduledTime = mktime(0,0,0)+4*3600; |
|
|
291
|
+ $this->scheduledTime = mktime(0, 0, 0) + 4 * 3600; |
|
292
|
292
|
break; |
|
293
|
293
|
case 'now': |
|
294
|
294
|
default: |
|
@@ -308,23 +308,23 @@ discard block |
|
|
block discarded – undo |
|
308
|
308
|
$this->crawlerObj->setID = \TYPO3\CMS\Core\Utility\GeneralUtility::md5int(microtime()); |
|
309
|
309
|
|
|
310
|
310
|
if (empty($this->incomingConfigurationSelection) |
|
311
|
|
- || (count($this->incomingConfigurationSelection)==1 && empty($this->incomingConfigurationSelection[0])) |
|
|
311
|
+ || (count($this->incomingConfigurationSelection) == 1 && empty($this->incomingConfigurationSelection[0])) |
|
312
|
312
|
) { |
|
313
|
|
- $code= ' |
|
|
313
|
+ $code = ' |
|
314
|
314
|
<tr> |
|
315
|
315
|
<td colspan="7"><b>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.noConfigSelected').'</b></td> |
|
316
|
316
|
</tr>'; |
|
317
|
317
|
} else { |
|
318
|
|
- if($this->submitCrawlUrls){ |
|
|
318
|
+ if ($this->submitCrawlUrls) { |
|
319
|
319
|
$reason = new tx_crawler_domain_reason(); |
|
320
|
320
|
$reason->setReason(tx_crawler_domain_reason::REASON_GUI_SUBMIT); |
|
321
|
321
|
|
|
322
|
|
- if($BE_USER instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication){ $username = $BE_USER->user['username']; } |
|
|
322
|
+ if ($BE_USER instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication) { $username = $BE_USER->user['username']; } |
|
323
|
323
|
$reason->setDetailText('The user '.$username.' added pages to the crawler queue manually '); |
|
324
|
324
|
|
|
325
|
|
- tx_crawler_domain_events_dispatcher::getInstance()->post( 'invokeQueueChange', |
|
|
325
|
+ tx_crawler_domain_events_dispatcher::getInstance()->post('invokeQueueChange', |
|
326
|
326
|
$this->findCrawler()->setID, |
|
327
|
|
- array( 'reason' => $reason )); |
|
|
327
|
+ array('reason' => $reason)); |
|
328
|
328
|
} |
|
329
|
329
|
|
|
330
|
330
|
$code = $this->crawlerObj->getPageTreeAndUrls( |
|
@@ -345,18 +345,18 @@ discard block |
|
|
block discarded – undo |
|
345
|
345
|
$this->duplicateTrack = $this->crawlerObj->duplicateTrack; |
|
346
|
346
|
|
|
347
|
347
|
$output = ''; |
|
348
|
|
- if ($code) { |
|
|
348
|
+ if ($code) { |
|
349
|
349
|
|
|
350
|
350
|
$output .= '<h3>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.configuration').':</h3>'; |
|
351
|
351
|
$output .= '<input type="hidden" name="id" value="'.intval($this->pObj->id).'" />'; |
|
352
|
352
|
|
|
353
|
|
- if (!$this->submitCrawlUrls) { |
|
|
353
|
+ if (!$this->submitCrawlUrls) { |
|
354
|
354
|
$output .= $this->drawURLs_cfgSelectors().'<br />'; |
|
355
|
355
|
$output .= '<input type="submit" name="_update" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerUpdate').'" /> '; |
|
356
|
356
|
$output .= '<input type="submit" name="_crawl" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerCrawl').'" /> '; |
|
357
|
357
|
$output .= '<input type="submit" name="_download" value="'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.triggerDownload').'" /><br /><br />'; |
|
358
|
358
|
$output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.count').': '.count(array_keys($this->duplicateTrack)).'<br />'; |
|
359
|
|
- $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s',time()).'<br />'; |
|
|
359
|
+ $output .= $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s', time()).'<br />'; |
|
360
|
360
|
$output .= '<br /> |
|
361
|
361
|
<table class="lrPadding c-list url-table">'. |
|
362
|
362
|
$this->drawURLs_printTableHeader(). |
|
@@ -370,7 +370,7 @@ discard block |
|
|
block discarded – undo |
|
370
|
370
|
} |
|
371
|
371
|
|
|
372
|
372
|
// Download Urls to crawl: |
|
373
|
|
- if ($this->downloadCrawlUrls) { |
|
|
373
|
+ if ($this->downloadCrawlUrls) { |
|
374
|
374
|
|
|
375
|
375
|
// Creating output header: |
|
376
|
376
|
$mimeType = 'application/octet-stream'; |
|
@@ -378,7 +378,7 @@ discard block |
|
|
block discarded – undo |
|
378
|
378
|
Header('Content-Disposition: attachment; filename=CrawlerUrls.txt'); |
|
379
|
379
|
|
|
380
|
380
|
// Printing the content of the CSV lines: |
|
381
|
|
- echo implode(chr(13).chr(10),$this->downloadUrls); |
|
|
381
|
+ echo implode(chr(13).chr(10), $this->downloadUrls); |
|
382
|
382
|
|
|
383
|
383
|
// Exits: |
|
384
|
384
|
exit; |
|
@@ -393,7 +393,7 @@ discard block |
|
|
block discarded – undo |
|
393
|
393
|
* |
|
394
|
394
|
* @return string HTML table |
|
395
|
395
|
*/ |
|
396
|
|
- function drawURLs_cfgSelectors() { |
|
|
396
|
+ function drawURLs_cfgSelectors() { |
|
397
|
397
|
|
|
398
|
398
|
// depth |
|
399
|
399
|
$cell[] = $this->selectorBox( |
|
@@ -409,11 +409,11 @@ discard block |
|
|
block discarded – undo |
|
409
|
409
|
$this->pObj->MOD_SETTINGS['depth'], |
|
410
|
410
|
0 |
|
411
|
411
|
); |
|
412
|
|
- $availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth']?$this->pObj->MOD_SETTINGS['depth']:0 ); |
|
|
412
|
+ $availableConfigurations = $this->crawlerObj->getConfigurationsForBranch($this->pObj->id, $this->pObj->MOD_SETTINGS['depth'] ? $this->pObj->MOD_SETTINGS['depth'] : 0); |
|
413
|
413
|
|
|
414
|
414
|
// Configurations |
|
415
|
415
|
$cell[] = $this->selectorBox( |
|
416
|
|
- empty($availableConfigurations)?array():array_combine($availableConfigurations, $availableConfigurations), |
|
|
416
|
+ empty($availableConfigurations) ? array() : array_combine($availableConfigurations, $availableConfigurations), |
|
417
|
417
|
'configurationSelection', |
|
418
|
418
|
$this->incomingConfigurationSelection, |
|
419
|
419
|
1 |
|
@@ -474,7 +474,7 @@ discard block |
|
|
block discarded – undo |
|
474
|
474
|
* |
|
475
|
475
|
* @return string Table header |
|
476
|
476
|
*/ |
|
477
|
|
- function drawURLs_printTableHeader() { |
|
|
477
|
+ function drawURLs_printTableHeader() { |
|
478
|
478
|
|
|
479
|
479
|
$content = ' |
|
480
|
480
|
<tr class="bgColor5 tableheader"> |
|
@@ -512,7 +512,7 @@ discard block |
|
|
block discarded – undo |
|
512
|
512
|
* |
|
513
|
513
|
* @return string HTML output |
|
514
|
514
|
*/ |
|
515
|
|
- function drawLog() { |
|
|
515
|
+ function drawLog() { |
|
516
|
516
|
global $BACK_PATH; |
|
517
|
517
|
$output = ''; |
|
518
|
518
|
|
|
@@ -524,46 +524,46 @@ discard block |
|
|
block discarded – undo |
|
524
|
524
|
$this->CSVExport = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_csv'); |
|
525
|
525
|
|
|
526
|
526
|
// Read URL: |
|
527
|
|
- if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')) { |
|
528
|
|
- $this->crawlerObj->readUrl(intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')),TRUE); |
|
|
527
|
+ if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')) { |
|
|
528
|
+ $this->crawlerObj->readUrl(intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_read')), TRUE); |
|
529
|
529
|
} |
|
530
|
530
|
|
|
531
|
531
|
// Look for set ID sent - if it is, we will display contents of that set: |
|
532
|
532
|
$showSetId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID')); |
|
533
|
533
|
|
|
534
|
534
|
// Show details: |
|
535
|
|
- if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) { |
|
|
535
|
+ if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details')) { |
|
536
|
536
|
|
|
537
|
537
|
// Get entry record: |
|
538
|
|
- list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*','tx_crawler_queue','qid='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details'))); |
|
|
538
|
+ list($q_entry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('qid_details'))); |
|
539
|
539
|
|
|
540
|
540
|
// Explode values: |
|
541
|
541
|
$resStatus = $this->getResStatus($q_entry); |
|
542
|
542
|
$q_entry['parameters'] = unserialize($q_entry['parameters']); |
|
543
|
543
|
$q_entry['result_data'] = unserialize($q_entry['result_data']); |
|
544
|
|
- if (is_array($q_entry['result_data'])) { |
|
|
544
|
+ if (is_array($q_entry['result_data'])) { |
|
545
|
545
|
$q_entry['result_data']['content'] = unserialize($q_entry['result_data']['content']); |
|
546
|
546
|
} |
|
547
|
547
|
|
|
548
|
|
- if(!$this->pObj->MOD_SETTINGS['log_resultLog']) { |
|
|
548
|
+ if (!$this->pObj->MOD_SETTINGS['log_resultLog']) { |
|
549
|
549
|
unset($q_entry['result_data']['content']['log']); |
|
550
|
550
|
} |
|
551
|
551
|
|
|
552
|
552
|
// Print rudimentary details: |
|
553
|
553
|
$output .= ' |
|
554
|
554
|
<br /><br /> |
|
555
|
|
- <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.back') . '" name="_back" /> |
|
556
|
|
- <input type="hidden" value="' . $this->pObj->id . '" name="id" /> |
|
557
|
|
- <input type="hidden" value="' . $showSetId . '" name="setID" /> |
|
|
555
|
+ <input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.back').'" name="_back" /> |
|
|
556
|
+ <input type="hidden" value="' . $this->pObj->id.'" name="id" /> |
|
|
557
|
+ <input type="hidden" value="' . $showSetId.'" name="setID" /> |
|
558
|
558
|
<br /> |
|
559
|
|
- Current server time: ' . date('H:i:s', time()) . '<br />' . |
|
560
|
|
- 'Status: ' . $resStatus . '<br />' . |
|
|
559
|
+ Current server time: ' . date('H:i:s', time()).'<br />'. |
|
|
560
|
+ 'Status: '.$resStatus.'<br />'. |
|
561
|
561
|
\TYPO3\CMS\Core\Utility\DebugUtility::viewArray($q_entry); |
|
562
|
562
|
} else { // Show list: |
|
563
|
563
|
|
|
564
|
564
|
// If either id or set id, show list: |
|
565
|
|
- if ($this->pObj->id || $showSetId) { |
|
566
|
|
- if ($this->pObj->id) { |
|
|
565
|
+ if ($this->pObj->id || $showSetId) { |
|
|
566
|
+ if ($this->pObj->id) { |
|
567
|
567
|
// Drawing tree: |
|
568
|
568
|
$tree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Tree\View\PageTreeView'); |
|
569
|
569
|
$perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1); |
|
@@ -577,16 +577,16 @@ discard block |
|
|
block discarded – undo |
|
577
|
577
|
); |
|
578
|
578
|
|
|
579
|
579
|
// Get branch beneath: |
|
580
|
|
- if ($this->pObj->MOD_SETTINGS['depth']) { |
|
|
580
|
+ if ($this->pObj->MOD_SETTINGS['depth']) { |
|
581
|
581
|
$tree->getTree($this->pObj->id, $this->pObj->MOD_SETTINGS['depth'], ''); |
|
582
|
582
|
} |
|
583
|
583
|
|
|
584
|
584
|
// Traverse page tree: |
|
585
|
585
|
$code = ''; $count = 0; |
|
586
|
|
- foreach($tree->tree as $data) { |
|
|
586
|
+ foreach ($tree->tree as $data) { |
|
587
|
587
|
$code .= $this->drawLog_addRows( |
|
588
|
588
|
$data['row'], |
|
589
|
|
- $data['HTML'] . \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages',$data['row'],TRUE), |
|
|
589
|
+ $data['HTML'].\TYPO3\CMS\Backend\Utility\BackendUtility::getRecordTitle('pages', $data['row'], TRUE), |
|
590
|
590
|
intval($this->pObj->MOD_SETTINGS['itemsPerPage']) |
|
591
|
591
|
); |
|
592
|
592
|
if (++$count == 1000) { |
|
@@ -595,13 +595,13 @@ discard block |
|
|
block discarded – undo |
|
595
|
595
|
} |
|
596
|
596
|
} else { |
|
597
|
597
|
$code = ''; |
|
598
|
|
- $code.= $this->drawLog_addRows( |
|
|
598
|
+ $code .= $this->drawLog_addRows( |
|
599
|
599
|
$showSetId, |
|
600
|
600
|
'Set ID: '.$showSetId |
|
601
|
601
|
); |
|
602
|
602
|
} |
|
603
|
603
|
|
|
604
|
|
- if ($code) { |
|
|
604
|
+ if ($code) { |
|
605
|
605
|
|
|
606
|
606
|
$output .= ' |
|
607
|
607
|
<br /><br /> |
|
@@ -612,7 +612,7 @@ discard block |
|
|
block discarded – undo |
|
612
|
612
|
<input type="hidden" value="'.$this->pObj->id.'" name="id" /> |
|
613
|
613
|
<input type="hidden" value="'.$showSetId.'" name="setID" /> |
|
614
|
614
|
<br /> |
|
615
|
|
- '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s',time()).' |
|
|
615
|
+ '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.curtime').': '.date('H:i:s', time()).' |
|
616
|
616
|
<br /><br /> |
|
617
|
617
|
|
|
618
|
618
|
|
|
@@ -638,10 +638,10 @@ discard block |
|
|
block discarded – undo |
|
638
|
638
|
</tr> |
|
639
|
639
|
'; |
|
640
|
640
|
|
|
641
|
|
- $cc=0; |
|
642
|
|
- foreach($setList as $set) { |
|
643
|
|
- $code.= ' |
|
644
|
|
- <tr class="bgColor'.($cc%2 ? '-20':'-10').'"> |
|
|
641
|
+ $cc = 0; |
|
|
642
|
+ foreach ($setList as $set) { |
|
|
643
|
+ $code .= ' |
|
|
644
|
+ <tr class="bgColor'.($cc % 2 ? '-20' : '-10').'"> |
|
645
|
645
|
<td><a href="'.htmlspecialchars('index.php?setID='.$set['set_id']).'">'.$set['set_id'].'</a></td> |
|
646
|
646
|
<td>'.$set['count_value'].'</td> |
|
647
|
647
|
<td>'.\TYPO3\CMS\Backend\Utility\BackendUtility::dateTimeAge($set['scheduled']).'</td> |
|
@@ -659,7 +659,7 @@ discard block |
|
|
block discarded – undo |
|
659
|
659
|
} |
|
660
|
660
|
} |
|
661
|
661
|
|
|
662
|
|
- if($this->CSVExport) { |
|
|
662
|
+ if ($this->CSVExport) { |
|
663
|
663
|
$this->outputCsvFile(); |
|
664
|
664
|
} |
|
665
|
665
|
|
|
@@ -685,7 +685,7 @@ discard block |
|
|
block discarded – undo |
|
685
|
685
|
$csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($fieldNames); |
|
686
|
686
|
|
|
687
|
687
|
// Data: |
|
688
|
|
- foreach($this->CSVaccu as $row) { |
|
|
688
|
+ foreach ($this->CSVaccu as $row) { |
|
689
|
689
|
$csvLines[] = \TYPO3\CMS\Core\Utility\GeneralUtility::csvValues($row); |
|
690
|
690
|
} |
|
691
|
691
|
|
|
@@ -695,7 +695,7 @@ discard block |
|
|
block discarded – undo |
|
695
|
695
|
Header('Content-Disposition: attachment; filename=CrawlerLog.csv'); |
|
696
|
696
|
|
|
697
|
697
|
// Printing the content of the CSV lines: |
|
698
|
|
- echo implode(chr(13).chr(10),$csvLines); |
|
|
698
|
+ echo implode(chr(13).chr(10), $csvLines); |
|
699
|
699
|
|
|
700
|
700
|
// Exits: |
|
701
|
701
|
exit; |
|
@@ -710,14 +710,14 @@ discard block |
|
|
block discarded – undo |
|
710
|
710
|
* @param int Items per Page setting |
|
711
|
711
|
* @return string HTML <tr> content (one or more) |
|
712
|
712
|
*/ |
|
713
|
|
- function drawLog_addRows($pageRow_setId, $titleString, $itemsPerPage=10) { |
|
|
713
|
+ function drawLog_addRows($pageRow_setId, $titleString, $itemsPerPage = 10) { |
|
714
|
714
|
|
|
715
|
715
|
// If Flush button is pressed, flush tables instead of selecting entries: |
|
716
|
716
|
|
|
717
|
|
- if(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush')) { |
|
|
717
|
+ if (\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush')) { |
|
718
|
718
|
$doFlush = true; |
|
719
|
719
|
$doFullFlush = false; |
|
720
|
|
- } elseif(\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush_all')) { |
|
|
720
|
+ } elseif (\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('_flush_all')) { |
|
721
|
721
|
$doFlush = true; |
|
722
|
722
|
$doFullFlush = true; |
|
723
|
723
|
} else { |
|
@@ -726,7 +726,7 @@ discard block |
|
|
block discarded – undo |
|
726
|
726
|
} |
|
727
|
727
|
|
|
728
|
728
|
// Get result: |
|
729
|
|
- if (is_array($pageRow_setId)) { |
|
|
729
|
+ if (is_array($pageRow_setId)) { |
|
730
|
730
|
$res = $this->crawlerObj->getLogEntriesForPageId($pageRow_setId['uid'], $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage)); |
|
731
|
731
|
} else { |
|
732
|
732
|
$res = $this->crawlerObj->getLogEntriesForSetId($pageRow_setId, $this->pObj->MOD_SETTINGS['log_display'], $doFlush, $doFullFlush, intval($itemsPerPage)); |
|
@@ -737,14 +737,14 @@ discard block |
|
|
block discarded – undo |
|
737
|
737
|
+ ($this->pObj->MOD_SETTINGS['log_resultLog'] ? -1 : 0) |
|
738
|
738
|
+ ($this->pObj->MOD_SETTINGS['log_feVars'] ? 3 : 0); |
|
739
|
739
|
|
|
740
|
|
- if (count($res)) { |
|
|
740
|
+ if (count($res)) { |
|
741
|
741
|
// Traverse parameter combinations: |
|
742
|
742
|
$c = 0; |
|
743
|
|
- $content=''; |
|
744
|
|
- foreach($res as $kk => $vv) { |
|
|
743
|
+ $content = ''; |
|
|
744
|
+ foreach ($res as $kk => $vv) { |
|
745
|
745
|
|
|
746
|
746
|
// Title column: |
|
747
|
|
- if (!$c) { |
|
|
747
|
+ if (!$c) { |
|
748
|
748
|
$titleClm = '<td rowspan="'.count($res).'">'.$titleString.'</td>'; |
|
749
|
749
|
} else { |
|
750
|
750
|
$titleClm = ''; |
|
@@ -761,16 +761,16 @@ discard block |
|
|
block discarded – undo |
|
761
|
761
|
|
|
762
|
762
|
// Put data into array: |
|
763
|
763
|
$rowData = array(); |
|
764
|
|
- if ($this->pObj->MOD_SETTINGS['log_resultLog']) { |
|
|
764
|
+ if ($this->pObj->MOD_SETTINGS['log_resultLog']) { |
|
765
|
765
|
$rowData['result_log'] = $resLog; |
|
766
|
766
|
} else { |
|
767
|
|
- $rowData['scheduled'] = ($vv['scheduled']> 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate'); |
|
|
767
|
+ $rowData['scheduled'] = ($vv['scheduled'] > 0) ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']) : ' '.$GLOBALS['LANG']->sL('LLL:EXT:crawler/modfunc1/locallang.xml:labels.immediate'); |
|
768
|
768
|
$rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-'; |
|
769
|
769
|
} |
|
770
|
|
- $rowData['result_status'] = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($resStatus,50); |
|
|
770
|
+ $rowData['result_status'] = \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($resStatus, 50); |
|
771
|
771
|
$rowData['url'] = '<a href="'.htmlspecialchars($parameters['url']).'" target="_newWIndow">'.htmlspecialchars($parameters['url']).'</a>'; |
|
772
|
772
|
$rowData['feUserGroupList'] = $parameters['feUserGroupList']; |
|
773
|
|
- $rowData['procInstructions'] = is_array($parameters['procInstructions']) ? implode('; ',$parameters['procInstructions']) : ''; |
|
|
773
|
+ $rowData['procInstructions'] = is_array($parameters['procInstructions']) ? implode('; ', $parameters['procInstructions']) : ''; |
|
774
|
774
|
$rowData['set_id'] = $vv['set_id']; |
|
775
|
775
|
|
|
776
|
776
|
if ($this->pObj->MOD_SETTINGS['log_feVars']) { |
|
@@ -780,31 +780,31 @@ discard block |
|
|
block discarded – undo |
|
780
|
780
|
} |
|
781
|
781
|
|
|
782
|
782
|
$setId = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('setID')); |
|
783
|
|
- $refreshIcon = $GLOBALS['BACK_PATH'] . 'sysext/t3skin/extjs/images/grid/refresh.gif'; |
|
|
783
|
+ $refreshIcon = $GLOBALS['BACK_PATH'].'sysext/t3skin/extjs/images/grid/refresh.gif'; |
|
784
|
784
|
|
|
785
|
785
|
// Put rows together: |
|
786
|
|
- $content.= ' |
|
787
|
|
- <tr class="bgColor'.($c%2 ? '-20':'-10').'"> |
|
|
786
|
+ $content .= ' |
|
|
787
|
+ <tr class="bgColor'.($c % 2 ? '-20' : '-10').'"> |
|
788
|
788
|
'.$titleClm.' |
|
789
|
|
- <td><a href="' . $this->getModuleUrl(array('qid_details' => $vv['qid'], 'setID' => $setId)) . '">'.htmlspecialchars($vv['qid']).'</a></td> |
|
790
|
|
- <td><a href="' . $this->getModuleUrl(array('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>'; |
|
791
|
|
- foreach($rowData as $fKey => $value) { |
|
|
789
|
+ <td><a href="' . $this->getModuleUrl(array('qid_details' => $vv['qid'], 'setID' => $setId)).'">'.htmlspecialchars($vv['qid']).'</a></td> |
|
|
790
|
+ <td><a href="' . $this->getModuleUrl(array('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>'; |
|
|
791
|
+ foreach ($rowData as $fKey => $value) { |
|
792
|
792
|
|
|
793
|
|
- if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url',$fKey)) { |
|
794
|
|
- $content.= ' |
|
|
793
|
+ if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('url', $fKey)) { |
|
|
794
|
+ $content .= ' |
|
795
|
795
|
<td>'.$value.'</td>'; |
|
796
|
796
|
} else { |
|
797
|
|
- $content.= ' |
|
|
797
|
+ $content .= ' |
|
798
|
798
|
<td>'.nl2br(htmlspecialchars($value)).'</td>'; |
|
799
|
799
|
} |
|
800
|
800
|
} |
|
801
|
|
- $content.= ' |
|
|
801
|
+ $content .= ' |
|
802
|
802
|
</tr>'; |
|
803
|
803
|
$c++; |
|
804
|
804
|
|
|
805
|
|
- if ($this->CSVExport) { |
|
|
805
|
+ if ($this->CSVExport) { |
|
806
|
806
|
// Only for CSV (adding qid and scheduled/exec_time if needed): |
|
807
|
|
- $rowData['result_log'] = implode('// ',explode(chr(10),$resLog)); |
|
|
807
|
+ $rowData['result_log'] = implode('// ', explode(chr(10), $resLog)); |
|
808
|
808
|
$rowData['qid'] = $vv['qid']; |
|
809
|
809
|
$rowData['scheduled'] = \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['scheduled']); |
|
810
|
810
|
$rowData['exec_time'] = $vv['exec_time'] ? \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($vv['exec_time']) : '-'; |
|
@@ -847,7 +847,7 @@ discard block |
|
|
block discarded – undo |
|
847
|
847
|
* |
|
848
|
848
|
* @return string Table header |
|
849
|
849
|
*/ |
|
850
|
|
- function drawLog_printTableHeader() { |
|
|
850
|
+ function drawLog_printTableHeader() { |
|
851
|
851
|
|
|
852
|
852
|
$content = ' |
|
853
|
853
|
<tr class="bgColor5 tableheader"> |
|
@@ -898,7 +898,7 @@ discard block |
|
|
block discarded – undo |
|
898
|
898
|
} |
|
899
|
899
|
|
|
900
|
900
|
function getResStatus($vv) { |
|
901
|
|
- if ($vv['result_data']) { |
|
|
901
|
+ if ($vv['result_data']) { |
|
902
|
902
|
$requestContent = unserialize($vv['result_data']); |
|
903
|
903
|
$requestResult = unserialize($requestContent['content']); |
|
904
|
904
|
if (is_array($requestResult)) { |
|
@@ -907,9 +907,9 @@ discard block |
|
|
block discarded – undo |
|
907
|
907
|
} else { |
|
908
|
908
|
$resStatus = implode("\n", $requestResult['errorlog']); |
|
909
|
909
|
} |
|
910
|
|
- $resLog = is_array($requestResult['log']) ? implode(chr(10),$requestResult['log']) : ''; |
|
|
910
|
+ $resLog = is_array($requestResult['log']) ? implode(chr(10), $requestResult['log']) : ''; |
|
911
|
911
|
} else { |
|
912
|
|
- $resStatus = 'Error: '.substr(preg_replace('/\s+/',' ',strip_tags($requestContent['content'])),0,10000).'...'; |
|
|
912
|
+ $resStatus = 'Error: '.substr(preg_replace('/\s+/', ' ', strip_tags($requestContent['content'])), 0, 10000).'...'; |
|
913
|
913
|
} |
|
914
|
914
|
} else { |
|
915
|
915
|
$resStatus = '-'; |
|
@@ -937,7 +937,7 @@ discard block |
|
|
block discarded – undo |
|
937
|
937
|
* @param void |
|
938
|
938
|
* @return string |
|
939
|
939
|
*/ |
|
940
|
|
- protected function drawProcessOverviewAction(){ |
|
|
940
|
+ protected function drawProcessOverviewAction() { |
|
941
|
941
|
|
|
942
|
942
|
$this->runRefreshHooks(); |
|
943
|
943
|
|
|
@@ -951,20 +951,20 @@ discard block |
|
|
block discarded – undo |
|
951
|
951
|
$this->addErrorMessage($e->getMessage()); |
|
952
|
952
|
} |
|
953
|
953
|
|
|
954
|
|
- $offset = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('offset')); |
|
955
|
|
- $perpage = 20; |
|
|
954
|
+ $offset = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('offset')); |
|
|
955
|
+ $perpage = 20; |
|
956
|
956
|
|
|
957
|
|
- $processRepository = new tx_crawler_domain_process_repository(); |
|
958
|
|
- $queueRepository = new tx_crawler_domain_queue_repository(); |
|
|
957
|
+ $processRepository = new tx_crawler_domain_process_repository(); |
|
|
958
|
+ $queueRepository = new tx_crawler_domain_queue_repository(); |
|
959
|
959
|
|
|
960
|
960
|
$mode = $this->pObj->MOD_SETTINGS['processListMode']; |
|
961
|
961
|
if ($mode == 'detail') { |
|
962
|
962
|
$where = ''; |
|
963
|
|
- } elseif($mode == 'simple') { |
|
|
963
|
+ } elseif ($mode == 'simple') { |
|
964
|
964
|
$where = 'active = 1'; |
|
965
|
965
|
} |
|
966
|
966
|
|
|
967
|
|
- $allProcesses = $processRepository->findAll('ttl','DESC', $perpage, $offset,$where); |
|
|
967
|
+ $allProcesses = $processRepository->findAll('ttl', 'DESC', $perpage, $offset, $where); |
|
968
|
968
|
$allCount = $processRepository->countAll($where); |
|
969
|
969
|
|
|
970
|
970
|
$listView = new tx_crawler_view_process_list(); |
|
@@ -976,10 +976,10 @@ discard block |
|
|
block discarded – undo |
|
976
|
976
|
$listView->setTotalUnprocessedItemCount($queueRepository->countAllPendingItems()); |
|
977
|
977
|
$listView->setAssignedUnprocessedItemCount($queueRepository->countAllAssignedPendingItems()); |
|
978
|
978
|
$listView->setActiveProcessCount($processRepository->countActive()); |
|
979
|
|
- $listView->setMaxActiveProcessCount(tx_crawler_api::forceIntegerInRange($this->extensionSettings['processLimit'],1,99,1)); |
|
|
979
|
+ $listView->setMaxActiveProcessCount(tx_crawler_api::forceIntegerInRange($this->extensionSettings['processLimit'], 1, 99, 1)); |
|
980
|
980
|
$listView->setMode($mode); |
|
981
|
981
|
|
|
982
|
|
- $paginationView = new tx_crawler_view_pagination(); |
|
|
982
|
+ $paginationView = new tx_crawler_view_pagination(); |
|
983
|
983
|
$paginationView->setCurrentOffset($offset); |
|
984
|
984
|
$paginationView->setPerPage($perpage); |
|
985
|
985
|
$paginationView->setTotalItemCount($allCount); |
|
@@ -1016,7 +1016,7 @@ discard block |
|
|
block discarded – undo |
|
1016
|
1016
|
|
|
1017
|
1017
|
$exitCode = 0; |
|
1018
|
1018
|
$out = array(); |
|
1019
|
|
- exec(escapeshellcmd($this->extensionSettings['phpPath'] . ' -v'), $out, $exitCode); |
|
|
1019
|
+ exec(escapeshellcmd($this->extensionSettings['phpPath'].' -v'), $out, $exitCode); |
|
1020
|
1020
|
if ($exitCode > 0) { |
|
1021
|
1021
|
$this->addErrorMessage(sprintf($LANG->sL('LLL:EXT:crawler/modfunc1/locallang.xml:message.phpBinaryNotFound'), htmlspecialchars($this->extensionSettings['phpPath']))); |
|
1022
|
1022
|
} |
|
@@ -1079,7 +1079,7 @@ discard block |
|
|
block discarded – undo |
|
1079
|
1079
|
* @param void |
|
1080
|
1080
|
* @return void |
|
1081
|
1081
|
*/ |
|
1082
|
|
- protected function handleProcessOverviewActions(){ |
|
|
1082
|
+ protected function handleProcessOverviewActions() { |
|
1083
|
1083
|
|
|
1084
|
1084
|
$crawler = $this->findCrawler(); |
|
1085
|
1085
|
|
|
@@ -1112,8 +1112,8 @@ discard block |
|
|
block discarded – undo |
|
1112
|
1112
|
* @return tx_crawler_lib crawler object |
|
1113
|
1113
|
* @author Timo Schmidt <[email protected]> |
|
1114
|
1114
|
*/ |
|
1115
|
|
- protected function findCrawler(){ |
|
1116
|
|
- if(!$this->crawlerObj instanceof tx_crawler_lib){ |
|
|
1115
|
+ protected function findCrawler() { |
|
|
1116
|
+ if (!$this->crawlerObj instanceof tx_crawler_lib) { |
|
1117
|
1117
|
$this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib'); |
|
1118
|
1118
|
} |
|
1119
|
1119
|
return $this->crawlerObj; |
|
@@ -1214,15 +1214,15 @@ discard block |
|
|
block discarded – undo |
|
1214
|
1214
|
* @param boolean If set, will draw multiple box. |
|
1215
|
1215
|
* @return string HTML select element |
|
1216
|
1216
|
*/ |
|
1217
|
|
- function selectorBox($optArray, $name, $value, $multiple) { |
|
|
1217
|
+ function selectorBox($optArray, $name, $value, $multiple) { |
|
1218
|
1218
|
|
|
1219
|
1219
|
$options = array(); |
|
1220
|
|
- foreach($optArray as $key => $val) { |
|
|
1220
|
+ foreach ($optArray as $key => $val) { |
|
1221
|
1221
|
$options[] = ' |
|
1222
|
|
- <option value="'.htmlspecialchars($key).'"'.((!$multiple && !strcmp($value,$key)) || ($multiple && in_array($key,(array)$value))?' selected="selected"':'').'>'.htmlspecialchars($val).'</option>'; |
|
|
1222
|
+ <option value="'.htmlspecialchars($key).'"'.((!$multiple && !strcmp($value, $key)) || ($multiple && in_array($key, (array) $value)) ? ' selected="selected"' : '').'>'.htmlspecialchars($val).'</option>'; |
|
1223
|
1223
|
} |
|
1224
|
1224
|
|
|
1225
|
|
- $output = '<select name="'.htmlspecialchars($name.($multiple?'[]':'')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('',$options).'</select>'; |
|
|
1225
|
+ $output = '<select name="'.htmlspecialchars($name.($multiple ? '[]' : '')).'"'.($multiple ? ' multiple="multiple" size="'.count($options).'"' : '').'>'.implode('', $options).'</select>'; |
|
1226
|
1226
|
|
|
1227
|
1227
|
return $output; |
|
1228
|
1228
|
} |
|
@@ -1261,6 +1261,6 @@ discard block |
|
|
block discarded – undo |
|
1261
|
1261
|
} |
|
1262
|
1262
|
} |
|
1263
|
1263
|
|
|
1264
|
|
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php']) { |
|
|
1264
|
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php']) { |
|
1265
|
1265
|
include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/modfunc1/class.tx_crawler_modfunc1.php']); |
|
1266
|
1266
|
} |