@@ -5,11 +5,11 @@ |
||
5 | 5 | <?php echo $this->getRefreshLink(); ?> |
6 | 6 | <?php echo $this->getEnableDisableLink(); ?> |
7 | 7 | <?php |
8 | - // Check if ActiveProcess is reached |
|
9 | - if (\TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getActiveProcessCount()) < \TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getMaxActiveProcessCount())) { |
|
10 | - echo $this->getAddLink(); |
|
11 | - } |
|
12 | - ?> |
|
8 | + // Check if ActiveProcess is reached |
|
9 | + if (\TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getActiveProcessCount()) < \TYPO3\CMS\Core\Utility\MathUtility::convertToPositiveInteger($this->getMaxActiveProcessCount())) { |
|
10 | + echo $this->getAddLink(); |
|
11 | + } |
|
12 | + ?> |
|
13 | 13 | <?php echo $this->getModeLink(); ?> |
14 | 14 | </div> |
15 | 15 |
@@ -1,24 +1,24 @@ |
||
1 | 1 | <?php |
2 | 2 | $extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler'); |
3 | 3 | return array( |
4 | - 'tx_crawler_lib' => $extensionPath . 'class.tx_crawler_lib.php', |
|
5 | - 'tx_crawler_cli_flush' => $extensionPath . 'cli/class.tx_crawler_cli_flush.php', |
|
6 | - 'tx_crawler_cli' => $extensionPath . 'cli/class.tx_crawler_cli.php', |
|
7 | - 'tx_crawler_cli_im' => $extensionPath . 'cli/class.tx_crawler_cli_im.php', |
|
8 | - 'tx_crawler_domain_events_dispatcher' => $extensionPath . 'domain/events/class.tx_crawler_domain_events_dispatcher.php', |
|
9 | - 'tx_crawler_domain_events_observer' => $extensionPath . 'domain/events/interface.tx_crawler_domain_events_observer.php', |
|
10 | - 'tx_crawler_domain_lib_abstract_dbobject' => $extensionPath . 'domain/lib/class.tx_crawler_domain_lib_abstract_dbobject.php', |
|
11 | - 'tx_crawler_domain_process_manager' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_manager.php', |
|
12 | - 'tx_crawler_domain_process' => $extensionPath . 'domain/process/class.tx_crawler_domain_process.php', |
|
13 | - 'tx_crawler_domain_process_collection' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_collection.php', |
|
14 | - 'tx_crawler_domain_process_repository' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_repository.php', |
|
15 | - 'tx_crawler_domain_queue_entry' => $extensionPath . 'domain/queue/class.tx_crawler_domain_queue_entry.php', |
|
16 | - 'tx_crawler_domain_queue_repository' => $extensionPath . 'domain/queue/class.tx_crawler_domain_queue_repository.php', |
|
17 | - 'tx_crawler_domain_reason' => $extensionPath . 'domain/reason/class.tx_crawler_domain_reason.php', |
|
18 | - 'tx_crawler_hooks_tsfe' => $extensionPath . 'hooks/class.tx_crawler_hooks_tsfe.php', |
|
19 | - 'tx_crawler_hooks_staticFileCacheCreateUri' => $extensionPath . 'hooks/class.tx_crawler_hooks_staticFileCacheCreateUri.php', |
|
20 | - 'tx_crawler_hooks_processCleanUp' => $extensionPath . 'hooks/class.tx_crawler_hooks_processCleanUp.php', |
|
21 | - 'tx_crawler_modfunc1' => $extensionPath . 'modfunc1/class.tx_crawler_modfunc1.php', |
|
22 | - 'tx_crawler_view_pagination' => $extensionPath . 'view/class.tx_crawler_view_pagination.php', |
|
23 | - 'tx_crawler_view_process_list' => $extensionPath . 'view/process/class.tx_crawler_view_process_list.php', |
|
4 | + 'tx_crawler_lib' => $extensionPath . 'class.tx_crawler_lib.php', |
|
5 | + 'tx_crawler_cli_flush' => $extensionPath . 'cli/class.tx_crawler_cli_flush.php', |
|
6 | + 'tx_crawler_cli' => $extensionPath . 'cli/class.tx_crawler_cli.php', |
|
7 | + 'tx_crawler_cli_im' => $extensionPath . 'cli/class.tx_crawler_cli_im.php', |
|
8 | + 'tx_crawler_domain_events_dispatcher' => $extensionPath . 'domain/events/class.tx_crawler_domain_events_dispatcher.php', |
|
9 | + 'tx_crawler_domain_events_observer' => $extensionPath . 'domain/events/interface.tx_crawler_domain_events_observer.php', |
|
10 | + 'tx_crawler_domain_lib_abstract_dbobject' => $extensionPath . 'domain/lib/class.tx_crawler_domain_lib_abstract_dbobject.php', |
|
11 | + 'tx_crawler_domain_process_manager' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_manager.php', |
|
12 | + 'tx_crawler_domain_process' => $extensionPath . 'domain/process/class.tx_crawler_domain_process.php', |
|
13 | + 'tx_crawler_domain_process_collection' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_collection.php', |
|
14 | + 'tx_crawler_domain_process_repository' => $extensionPath . 'domain/process/class.tx_crawler_domain_process_repository.php', |
|
15 | + 'tx_crawler_domain_queue_entry' => $extensionPath . 'domain/queue/class.tx_crawler_domain_queue_entry.php', |
|
16 | + 'tx_crawler_domain_queue_repository' => $extensionPath . 'domain/queue/class.tx_crawler_domain_queue_repository.php', |
|
17 | + 'tx_crawler_domain_reason' => $extensionPath . 'domain/reason/class.tx_crawler_domain_reason.php', |
|
18 | + 'tx_crawler_hooks_tsfe' => $extensionPath . 'hooks/class.tx_crawler_hooks_tsfe.php', |
|
19 | + 'tx_crawler_hooks_staticFileCacheCreateUri' => $extensionPath . 'hooks/class.tx_crawler_hooks_staticFileCacheCreateUri.php', |
|
20 | + 'tx_crawler_hooks_processCleanUp' => $extensionPath . 'hooks/class.tx_crawler_hooks_processCleanUp.php', |
|
21 | + 'tx_crawler_modfunc1' => $extensionPath . 'modfunc1/class.tx_crawler_modfunc1.php', |
|
22 | + 'tx_crawler_view_pagination' => $extensionPath . 'view/class.tx_crawler_view_pagination.php', |
|
23 | + 'tx_crawler_view_process_list' => $extensionPath . 'view/process/class.tx_crawler_view_process_list.php', |
|
24 | 24 | ); |
@@ -37,29 +37,29 @@ |
||
37 | 37 | */ |
38 | 38 | class tx_crawler_cli extends \TYPO3\CMS\Core\Controller\CommandLineController { |
39 | 39 | |
40 | - /** |
|
41 | - * Constructor |
|
42 | - * |
|
43 | - * @return void |
|
44 | - */ |
|
45 | - function __construct() { |
|
46 | - parent::__construct(); |
|
40 | + /** |
|
41 | + * Constructor |
|
42 | + * |
|
43 | + * @return void |
|
44 | + */ |
|
45 | + function __construct() { |
|
46 | + parent::__construct(); |
|
47 | 47 | |
48 | - $this->cli_options[] = array('-h', 'Show the help', ''); |
|
49 | - $this->cli_options[] = array('--help', 'Same as -h', ''); |
|
50 | - $this->cli_options[] = array('--countInARun count', 'Amount of pages', 'How many pages should be crawled during that run.'); |
|
51 | - $this->cli_options[] = array('--sleepTime milliseconds', 'Millisecounds to relax system during crawls', 'Amount of millisecounds which the system should use to relax between crawls.'); |
|
52 | - $this->cli_options[] = array('--sleepAfterFinish seconds', 'Secounds to relax system after all crawls.', 'Amount of secounds which the system should use to relax after all crawls are done.'); |
|
48 | + $this->cli_options[] = array('-h', 'Show the help', ''); |
|
49 | + $this->cli_options[] = array('--help', 'Same as -h', ''); |
|
50 | + $this->cli_options[] = array('--countInARun count', 'Amount of pages', 'How many pages should be crawled during that run.'); |
|
51 | + $this->cli_options[] = array('--sleepTime milliseconds', 'Millisecounds to relax system during crawls', 'Amount of millisecounds which the system should use to relax between crawls.'); |
|
52 | + $this->cli_options[] = array('--sleepAfterFinish seconds', 'Secounds to relax system after all crawls.', 'Amount of secounds which the system should use to relax after all crawls are done.'); |
|
53 | 53 | |
54 | - // Setting help texts: |
|
55 | - $this->cli_help['name'] = 'crawler CLI interface -- Crawling the URLs from the queue'; |
|
56 | - $this->cli_help['synopsis'] = '###OPTIONS###'; |
|
57 | - $this->cli_help['description'] = ""; |
|
58 | - $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler\nWill trigger the crawler which starts to process the queue entires\n"; |
|
59 | - $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2010'; |
|
60 | - } |
|
54 | + // Setting help texts: |
|
55 | + $this->cli_help['name'] = 'crawler CLI interface -- Crawling the URLs from the queue'; |
|
56 | + $this->cli_help['synopsis'] = '###OPTIONS###'; |
|
57 | + $this->cli_help['description'] = ""; |
|
58 | + $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler\nWill trigger the crawler which starts to process the queue entires\n"; |
|
59 | + $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2010'; |
|
60 | + } |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']) { |
64 | - include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']); |
|
64 | + include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli.php']); |
|
65 | 65 | } |
@@ -37,41 +37,41 @@ |
||
37 | 37 | */ |
38 | 38 | class tx_crawler_cli_im extends \TYPO3\CMS\Core\Controller\CommandLineController { |
39 | 39 | |
40 | - /** |
|
41 | - * Constructor |
|
42 | - * |
|
43 | - * @return void |
|
44 | - */ |
|
45 | - function __construct() { |
|
46 | - parent::__construct(); |
|
40 | + /** |
|
41 | + * Constructor |
|
42 | + * |
|
43 | + * @return void |
|
44 | + */ |
|
45 | + function __construct() { |
|
46 | + parent::__construct(); |
|
47 | 47 | |
48 | - // Adding options to help archive: |
|
49 | - /** |
|
50 | - * We removed the "proc" option as it seemd not to be working any more. But as the complete handling of the crawler has changed regarding the configuration |
|
51 | - * this is completely ok. Since configuration records were introduced to configure "what should be done" additionally to page ts the way to setup jobs |
|
52 | - * has drifted from selecting filtering processing instructions to selecting/filtering configuration keys (you can configure the processing instructions there). |
|
53 | - * This is also reflected in the backend modules and allows you a much clearer and powerful way to work with the crawler extension. |
|
54 | - */ |
|
55 | - // $this->cli_options[] = array('-proc listOfProcInstr', 'Comma list of processing instructions. These are the "actions" carried out when crawling and you must specify at least one. Depends on third-party extensions. Examples are "tx_cachemgm_recache" from "cachemgm" extension (will recache pages), "tx_staticpub_publish" from "staticpub" (publishing pages to static files) or "tx_indexedsearch_reindex" from "indexed_search" (indexes pages).'); |
|
56 | - // TODO: cleanup here! |
|
57 | - $this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include."); |
|
58 | - $this->cli_options[] = array('-o mode', 'Output mode: "url", "exec", "queue"', "Specifies output modes\nurl : Will list URLs which wget could use as input.\nqueue: Will put entries in queue table.\nexec: Will execute all entries right away!"); |
|
59 | - $this->cli_options[] = array('-n number', 'Number of items per minute.', 'Specifies how many items are put in the queue per minute. Only valid for output mode "queue"'); |
|
60 | - $this->cli_options[] = array('-conf configurationkeys','List of Configuration Keys','A commaseperated list of crawler configurations'); |
|
61 | - # $this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n 0 = all output\n 1 = info and greater (default)\n 2 = warnings and greater\n 3 = errors"); |
|
48 | + // Adding options to help archive: |
|
49 | + /** |
|
50 | + * We removed the "proc" option as it seemd not to be working any more. But as the complete handling of the crawler has changed regarding the configuration |
|
51 | + * this is completely ok. Since configuration records were introduced to configure "what should be done" additionally to page ts the way to setup jobs |
|
52 | + * has drifted from selecting filtering processing instructions to selecting/filtering configuration keys (you can configure the processing instructions there). |
|
53 | + * This is also reflected in the backend modules and allows you a much clearer and powerful way to work with the crawler extension. |
|
54 | + */ |
|
55 | + // $this->cli_options[] = array('-proc listOfProcInstr', 'Comma list of processing instructions. These are the "actions" carried out when crawling and you must specify at least one. Depends on third-party extensions. Examples are "tx_cachemgm_recache" from "cachemgm" extension (will recache pages), "tx_staticpub_publish" from "staticpub" (publishing pages to static files) or "tx_indexedsearch_reindex" from "indexed_search" (indexes pages).'); |
|
56 | + // TODO: cleanup here! |
|
57 | + $this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include."); |
|
58 | + $this->cli_options[] = array('-o mode', 'Output mode: "url", "exec", "queue"', "Specifies output modes\nurl : Will list URLs which wget could use as input.\nqueue: Will put entries in queue table.\nexec: Will execute all entries right away!"); |
|
59 | + $this->cli_options[] = array('-n number', 'Number of items per minute.', 'Specifies how many items are put in the queue per minute. Only valid for output mode "queue"'); |
|
60 | + $this->cli_options[] = array('-conf configurationkeys','List of Configuration Keys','A commaseperated list of crawler configurations'); |
|
61 | + # $this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n 0 = all output\n 1 = info and greater (default)\n 2 = warnings and greater\n 3 = errors"); |
|
62 | 62 | |
63 | - // Setting help texts: |
|
64 | - $this->cli_help['name'] = 'crawler CLI interface -- Submitting URLs to be crawled via CLI interface.'; |
|
65 | - $this->cli_help['synopsis'] = 'page_id ###OPTIONS###'; |
|
66 | - $this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It can put entries in the queue from command line options, return the list of URLs and even execute all entries right away without having to queue them up - this can be useful for immediate re-cache, re-indexing or static publishing from command line."; |
|
67 | - $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_im 7 -d=2 -conf=<configurationKey> -o=exec\nWill re-cache pages from page 7 and two levels down, executed immediately.\n"; |
|
68 | - $this->cli_help['examples'].= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n"; |
|
69 | - $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009'; |
|
70 | - } |
|
63 | + // Setting help texts: |
|
64 | + $this->cli_help['name'] = 'crawler CLI interface -- Submitting URLs to be crawled via CLI interface.'; |
|
65 | + $this->cli_help['synopsis'] = 'page_id ###OPTIONS###'; |
|
66 | + $this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It can put entries in the queue from command line options, return the list of URLs and even execute all entries right away without having to queue them up - this can be useful for immediate re-cache, re-indexing or static publishing from command line."; |
|
67 | + $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_im 7 -d=2 -conf=<configurationKey> -o=exec\nWill re-cache pages from page 7 and two levels down, executed immediately.\n"; |
|
68 | + $this->cli_help['examples'].= "/.../cli_dispatch.phpsh crawler_im 7 -d=0 -conf=<configurationKey> -n=4 -o=queue\nWill put entries for re-caching pages from page 7 into queue, 4 every minute.\n"; |
|
69 | + $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009'; |
|
70 | + } |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']) { |
74 | - include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']); |
|
74 | + include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_im.php']); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | ?> |
@@ -5,20 +5,20 @@ discard block |
||
5 | 5 | * Retrieve path (taken from cli_dispatch.phpsh) |
6 | 6 | */ |
7 | 7 | |
8 | - // Get path to this script |
|
8 | + // Get path to this script |
|
9 | 9 | $tempPathThisScript = isset($_SERVER['argv'][0]) ? $_SERVER['argv'][0] : (isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_']); |
10 | 10 | |
11 | - // Resolve path |
|
11 | + // Resolve path |
|
12 | 12 | if (!isAbsPath($tempPathThisScript)) { |
13 | - $workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd(); |
|
14 | - if ($workingDirectory) { |
|
15 | - $tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript); |
|
16 | - if (!@is_file($tempPathThisScript)) { |
|
17 | - die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL); |
|
18 | - } |
|
19 | - } else { |
|
20 | - die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL); |
|
21 | - } |
|
13 | + $workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd(); |
|
14 | + if ($workingDirectory) { |
|
15 | + $tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript); |
|
16 | + if (!@is_file($tempPathThisScript)) { |
|
17 | + die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL); |
|
18 | + } |
|
19 | + } else { |
|
20 | + die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL); |
|
21 | + } |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | $typo3Root = preg_replace('#typo3conf/ext/crawler/cli/bootstrap.php$#', '', $tempPathThisScript); |
@@ -30,33 +30,33 @@ discard block |
||
30 | 30 | */ |
31 | 31 | $additionalHeaders = unserialize(base64_decode($_SERVER['argv'][3])); |
32 | 32 | if (is_array($additionalHeaders)) { |
33 | - foreach ($additionalHeaders as $additionalHeader) { |
|
34 | - if (strpos($additionalHeader, ':') !== FALSE) { |
|
35 | - list($key, $value) = explode(':', $additionalHeader, 2); |
|
36 | - $key = str_replace('-', '_', strtoupper(trim($key))); |
|
37 | - if ($key != 'HOST') { |
|
38 | - $_SERVER['HTTP_' . $key] = $value; |
|
39 | - } |
|
40 | - } |
|
41 | - } |
|
33 | + foreach ($additionalHeaders as $additionalHeader) { |
|
34 | + if (strpos($additionalHeader, ':') !== FALSE) { |
|
35 | + list($key, $value) = explode(':', $additionalHeader, 2); |
|
36 | + $key = str_replace('-', '_', strtoupper(trim($key))); |
|
37 | + if ($key != 'HOST') { |
|
38 | + $_SERVER['HTTP_' . $key] = $value; |
|
39 | + } |
|
40 | + } |
|
41 | + } |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
45 | - // put parsed query parts into $_GET array |
|
45 | + // put parsed query parts into $_GET array |
|
46 | 46 | $urlParts = parse_url($_SERVER['argv'][2]); |
47 | - // Populating $_GET |
|
47 | + // Populating $_GET |
|
48 | 48 | parse_str($urlParts['query'], $_GET); |
49 | - // Populating $_REQUEST |
|
49 | + // Populating $_REQUEST |
|
50 | 50 | parse_str($urlParts['query'], $_REQUEST); |
51 | - // Populating $_POST |
|
51 | + // Populating $_POST |
|
52 | 52 | $_POST = array(); |
53 | - // Populating $_COOKIE |
|
53 | + // Populating $_COOKIE |
|
54 | 54 | $_COOKIE = array(); |
55 | 55 | |
56 | - // Get the TYPO3_SITE_PATH of the website frontend: |
|
56 | + // Get the TYPO3_SITE_PATH of the website frontend: |
|
57 | 57 | $typo3SitePath = $_SERVER['argv'][1]; |
58 | 58 | |
59 | - // faking the environment |
|
59 | + // faking the environment |
|
60 | 60 | $_SERVER['DOCUMENT_ROOT'] = preg_replace('#' . preg_quote($typo3SitePath, '#') . '$#', '', $typo3Root); |
61 | 61 | $_SERVER['HTTP_USER_AGENT'] = 'CLI Mode'; |
62 | 62 | $_SERVER['HTTP_HOST'] = $_SERVER['SERVER_NAME'] = $urlParts['host']; |
@@ -66,15 +66,15 @@ discard block |
||
66 | 66 | $_SERVER['REQUEST_URI'] = $urlParts['path'] . (isset($urlParts['query']) ? '?' . $urlParts['query'] : ''); |
67 | 67 | $_SERVER['REQUEST_METHOD'] = 'GET'; |
68 | 68 | |
69 | - // Define a port if used in the URL: |
|
69 | + // Define a port if used in the URL: |
|
70 | 70 | if (isset($urlParts['port'])) { |
71 | - $_SERVER['HTTP_HOST'] .= ':' . $urlParts['port']; |
|
72 | - $_SERVER['SERVER_PORT'] = $urlParts['port']; |
|
71 | + $_SERVER['HTTP_HOST'] .= ':' . $urlParts['port']; |
|
72 | + $_SERVER['SERVER_PORT'] = $urlParts['port']; |
|
73 | 73 | } |
74 | 74 | |
75 | - // Define HTTPS disposal: |
|
75 | + // Define HTTPS disposal: |
|
76 | 76 | if ($urlParts['scheme'] === 'https') { |
77 | - $_SERVER['HTTPS'] = 'on'; |
|
77 | + $_SERVER['HTTPS'] = 'on'; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | chdir($typo3Root); |
@@ -88,11 +88,11 @@ discard block |
||
88 | 88 | * @return boolean |
89 | 89 | */ |
90 | 90 | function isAbsPath($path) { |
91 | - // on Windows also a path starting with a drive letter is absolute: X:/ |
|
92 | - if (stristr(PHP_OS, 'win') && substr($path, 1, 2) === ':/') { |
|
93 | - return TRUE; |
|
94 | - } |
|
91 | + // on Windows also a path starting with a drive letter is absolute: X:/ |
|
92 | + if (stristr(PHP_OS, 'win') && substr($path, 1, 2) === ':/') { |
|
93 | + return TRUE; |
|
94 | + } |
|
95 | 95 | |
96 | - // path starting with a / is always absolute, on every system |
|
97 | - return (substr($path, 0, 1) === '/'); |
|
96 | + // path starting with a / is always absolute, on every system |
|
97 | + return (substr($path, 0, 1) === '/'); |
|
98 | 98 | } |
@@ -37,30 +37,30 @@ |
||
37 | 37 | */ |
38 | 38 | class tx_crawler_cli_flush extends \TYPO3\CMS\Core\Controller\CommandLineController { |
39 | 39 | |
40 | - /** |
|
41 | - * Constructor |
|
42 | - * |
|
43 | - * @return void |
|
44 | - */ |
|
45 | - function __construct() { |
|
46 | - parent::__construct(); |
|
40 | + /** |
|
41 | + * Constructor |
|
42 | + * |
|
43 | + * @return void |
|
44 | + */ |
|
45 | + function __construct() { |
|
46 | + parent::__construct(); |
|
47 | 47 | |
48 | - // Adding options to help archive: |
|
49 | - $this->cli_options[] = array('-o mode', 'Output mode: "finished", "all", "pending"', "Specifies the type queue entries which is flushed in the process."); |
|
50 | - # $this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n 0 = all output\n 1 = info and greater (default)\n 2 = warnings and greater\n 3 = errors"); |
|
48 | + // Adding options to help archive: |
|
49 | + $this->cli_options[] = array('-o mode', 'Output mode: "finished", "all", "pending"', "Specifies the type queue entries which is flushed in the process."); |
|
50 | + # $this->cli_options[] = array('-v level', 'Verbosity level 0-3', "The value of level can be:\n 0 = all output\n 1 = info and greater (default)\n 2 = warnings and greater\n 3 = errors"); |
|
51 | 51 | |
52 | - // Setting help texts: |
|
53 | - $this->cli_help['name'] = 'crawler CLI interface -- Cleaning up the queue.'; |
|
54 | - $this->cli_help['synopsis'] = 'page_id ###OPTIONS###'; |
|
55 | - $this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It will remove queue entires and perform a cleanup."; |
|
56 | - $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 5 -o=finished\nWill remove all finished queue-entries in the sub-branch of page 5\n"; |
|
57 | - $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 0 -o=all\nWill remove all queue-entries for every page\n"; |
|
58 | - $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009'; |
|
59 | - } |
|
52 | + // Setting help texts: |
|
53 | + $this->cli_help['name'] = 'crawler CLI interface -- Cleaning up the queue.'; |
|
54 | + $this->cli_help['synopsis'] = 'page_id ###OPTIONS###'; |
|
55 | + $this->cli_help['description'] = "Works as a CLI interface to some functionality from the Web > Info > Site Crawler module; It will remove queue entires and perform a cleanup."; |
|
56 | + $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 5 -o=finished\nWill remove all finished queue-entries in the sub-branch of page 5\n"; |
|
57 | + $this->cli_help['examples'] = "/.../cli_dispatch.phpsh crawler_flush 0 -o=all\nWill remove all queue-entries for every page\n"; |
|
58 | + $this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009'; |
|
59 | + } |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_flush.php']) { |
63 | - include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_flush.php']); |
|
63 | + include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/cli/class.tx_crawler_cli_flush.php']); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | ?> |
@@ -24,43 +24,43 @@ |
||
24 | 24 | |
25 | 25 | abstract class tx_crawler_domain_lib_abstract_dbobject { |
26 | 26 | |
27 | - /** |
|
28 | - * @var array |
|
29 | - */ |
|
30 | - protected $row; |
|
27 | + /** |
|
28 | + * @var array |
|
29 | + */ |
|
30 | + protected $row; |
|
31 | 31 | |
32 | - /** |
|
33 | - * @var string table name |
|
34 | - */ |
|
35 | - protected static $tableName; |
|
32 | + /** |
|
33 | + * @var string table name |
|
34 | + */ |
|
35 | + protected static $tableName; |
|
36 | 36 | |
37 | - /** |
|
38 | - * Constructor |
|
39 | - * |
|
40 | - * @param array $row optional array with propertys |
|
41 | - */ |
|
42 | - public function __construct($row = array()) { |
|
43 | - $this->row = $row; |
|
44 | - } |
|
37 | + /** |
|
38 | + * Constructor |
|
39 | + * |
|
40 | + * @param array $row optional array with propertys |
|
41 | + */ |
|
42 | + public function __construct($row = array()) { |
|
43 | + $this->row = $row; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Get table name |
|
48 | - * |
|
49 | - * @param void |
|
50 | - * @return string table name |
|
51 | - */ |
|
52 | - public static function getTableName(){ |
|
53 | - return self::$tableName; |
|
54 | - } |
|
46 | + /** |
|
47 | + * Get table name |
|
48 | + * |
|
49 | + * @param void |
|
50 | + * @return string table name |
|
51 | + */ |
|
52 | + public static function getTableName(){ |
|
53 | + return self::$tableName; |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Returns the propertys of the object as array |
|
58 | - * |
|
59 | - * @return array |
|
60 | - */ |
|
61 | - public function getRow() { |
|
62 | - return $this->row; |
|
63 | - } |
|
56 | + /** |
|
57 | + * Returns the propertys of the object as array |
|
58 | + * |
|
59 | + * @return array |
|
60 | + */ |
|
61 | + public function getRow() { |
|
62 | + return $this->row; |
|
63 | + } |
|
64 | 64 | |
65 | 65 | |
66 | 66 | } |
@@ -24,19 +24,19 @@ |
||
24 | 24 | |
25 | 25 | class tx_crawler_domain_queue_entry extends tx_crawler_domain_lib_abstract_dbobject { |
26 | 26 | |
27 | - /** |
|
28 | - * @var string table name |
|
29 | - */ |
|
30 | - protected static $tableName = 'tx_crawler_queue'; |
|
27 | + /** |
|
28 | + * @var string table name |
|
29 | + */ |
|
30 | + protected static $tableName = 'tx_crawler_queue'; |
|
31 | 31 | |
32 | - /** |
|
33 | - * Returns the execution time of the record as int value |
|
34 | - * |
|
35 | - * @return int |
|
36 | - */ |
|
37 | - public function getExecutionTime(){ |
|
38 | - return $this->row['exec_time']; |
|
39 | - } |
|
32 | + /** |
|
33 | + * Returns the execution time of the record as int value |
|
34 | + * |
|
35 | + * @return int |
|
36 | + */ |
|
37 | + public function getExecutionTime(){ |
|
38 | + return $this->row['exec_time']; |
|
39 | + } |
|
40 | 40 | |
41 | 41 | } |
42 | 42 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | { |
70 | 70 | $db = $this->getDB(); |
71 | 71 | $where = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) . |
72 | - ' AND exec_time > 0 '; |
|
72 | + ' AND exec_time > 0 '; |
|
73 | 73 | $limit = 1; |
74 | 74 | $groupby = ''; |
75 | 75 |