Completed
Push — issue/103 ( 39a4ee )
by Tomas Norre
12:28
created
template/pagination.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php if (!defined('TYPO3_MODE')) die ('Access denied.'); ?>
2 2
 
3 3
 Page:
4
-<?php for($currentPageOffset 	= 0; $currentPageOffset < $this->getTotalPagesCount(); $currentPageOffset++ ){  ?>
4
+<?php for ($currentPageOffset = 0; $currentPageOffset < $this->getTotalPagesCount(); $currentPageOffset++) {  ?>
5 5
 	<a href="index.php?offset=<?php echo htmlspecialchars($currentPageOffset * $this->getPerPage()); ?>">
6 6
 		<?php echo	htmlspecialchars($this->getLabelForPageOffset($currentPageOffset)); ?>
7 7
 	</a>
8
-	<?php if($currentPageOffset+1 < $this->getTotalPagesCount()){ ?>
8
+	<?php if ($currentPageOffset + 1 < $this->getTotalPagesCount()) { ?>
9 9
 	|
10 10
 	<?php } ?>
11 11
 
Please login to merge, or discard this patch.
template/process/list.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,17 +50,17 @@
 block discarded – undo
50 50
 		</tr>
51 51
 	</thead>
52 52
 	<tbody>
53
-		<?php foreach($this->getProcessCollection() as $process): /* @var $process tx_crawler_domain_process */ ?>
54
-			<tr class="<?php echo (++$count % 2 == 0) ? 'odd': 'even' ?>">
53
+		<?php foreach ($this->getProcessCollection() as $process): /* @var $process tx_crawler_domain_process */ ?>
54
+			<tr class="<?php echo (++$count % 2 == 0) ? 'odd' : 'even' ?>">
55 55
 				<td><?php echo $this->getIconForState(htmlspecialchars($process->getState())); ?></td>
56 56
 				<td><?php echo htmlspecialchars($process->getProcess_id()); ?></td>
57 57
 				<td><?php echo htmlspecialchars($this->asDate($process->getTimeForFirstItem())); ?></td>
58 58
 				<td><?php echo htmlspecialchars($this->asDate($process->getTimeForLastItem())); ?></td>
59
-				<td><?php echo htmlspecialchars(floor($process->getRuntime()/ 60)); ?> min. <?php echo htmlspecialchars($process->getRuntime()) % 60 ?> sec.</td>
59
+				<td><?php echo htmlspecialchars(floor($process->getRuntime() / 60)); ?> min. <?php echo htmlspecialchars($process->getRuntime()) % 60 ?> sec.</td>
60 60
 				<td><?php echo htmlspecialchars($this->asDate($process->getTTL())); ?></td>
61 61
 				<td><?php echo htmlspecialchars($process->countItemsProcessed()); ?></td>
62 62
 				<td><?php echo htmlspecialchars($process->countItemsAssigned()); ?></td>
63
-				<td><?php echo htmlspecialchars($process->countItemsToProcess()+$process->countItemsProcessed()); ?></td>
63
+				<td><?php echo htmlspecialchars($process->countItemsToProcess() + $process->countItemsProcessed()); ?></td>
64 64
 				<td>
65 65
 				<?php if ($process->getState() == 'running'): ?>
66 66
 					<div class="crawlerprocessprogress" style="width: 200px;">
Please login to merge, or discard this patch.
ext_autoload.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,24 +1,24 @@
 block discarded – undo
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
 );
Please login to merge, or discard this patch.
cli/crawler_multiprocess.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@
 block discarded – undo
4 4
 }
5 5
 
6 6
 $processManager = new tx_crawler_domain_process_manager();
7
-$timeout = isset($_SERVER['argv'][1] ) ? intval($_SERVER['argv'][1]) : 10000;
7
+$timeout = isset($_SERVER['argv'][1]) ? intval($_SERVER['argv'][1]) : 10000;
8 8
 
9 9
 try {
10 10
 	$processManager->multiProcess($timeout);
11 11
 } catch (Exception $e) {
12
-	echo PHP_EOL . $e->getMessage();
12
+	echo PHP_EOL.$e->getMessage();
13 13
 }
Please login to merge, or discard this patch.
cli/class.tx_crawler_cli_im.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		$this->cli_options[] = array('-d depth', 'Tree depth, 0-99', "How many levels under the 'page_id' to include.");
58 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 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');
60
+		$this->cli_options[] = array('-conf configurationkeys', 'List of Configuration Keys', 'A commaseperated list of crawler configurations');
61 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 63
 		// Setting help texts:
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		$this->cli_help['synopsis'] = 'page_id ###OPTIONS###';
66 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 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";
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 69
 		$this->cli_help['author'] = 'Kasper Skaarhoj, Daniel Poetzinger, Fabrizio Branca, Tolleiv Nietsch, Timo Schmidt - AOE media 2009';
70 70
 	}
71 71
 }
Please login to merge, or discard this patch.
cli/bootstrap.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -12,12 +12,12 @@  discard block
 block discarded – undo
12 12
 if (!isAbsPath($tempPathThisScript)) {
13 13
 	$workingDirectory = $_SERVER['PWD'] ? $_SERVER['PWD'] : getcwd();
14 14
 	if ($workingDirectory) {
15
-		$tempPathThisScript = $workingDirectory . '/' . preg_replace('/\.\//', '', $tempPathThisScript);
15
+		$tempPathThisScript = $workingDirectory.'/'.preg_replace('/\.\//', '', $tempPathThisScript);
16 16
 		if (!@is_file($tempPathThisScript)) {
17
-			die('Relative path found, but an error occured during resolving of the absolute path: ' . $tempPathThisScript . PHP_EOL);
17
+			die('Relative path found, but an error occured during resolving of the absolute path: '.$tempPathThisScript.PHP_EOL);
18 18
 		}
19 19
 	} else {
20
-		die('Relative path found, but resolving absolute path is not supported on this platform.' . PHP_EOL);
20
+		die('Relative path found, but resolving absolute path is not supported on this platform.'.PHP_EOL);
21 21
 	}
22 22
 }
23 23
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 			list($key, $value) = explode(':', $additionalHeader, 2);
36 36
 			$key = str_replace('-', '_', strtoupper(trim($key)));
37 37
 			if ($key != 'HOST') {
38
-				$_SERVER['HTTP_' . $key] = $value;
38
+				$_SERVER['HTTP_'.$key] = $value;
39 39
 			}
40 40
 		}
41 41
 	}
@@ -57,18 +57,18 @@  discard block
 block discarded – undo
57 57
 $typo3SitePath = $_SERVER['argv'][1];
58 58
 
59 59
 	// faking the environment
60
-$_SERVER['DOCUMENT_ROOT'] = preg_replace('#' . preg_quote($typo3SitePath, '#') . '$#', '', $typo3Root);
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'];
63
-$_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'] = $typo3SitePath . 'index.php';
64
-$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'] = $typo3Root . 'index.php';
63
+$_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'] = $typo3SitePath.'index.php';
64
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'] = $typo3Root.'index.php';
65 65
 $_SERVER['QUERY_STRING'] = (isset($urlParts['query']) ? $urlParts['query'] : '');
66
-$_SERVER['REQUEST_URI'] = $urlParts['path'] . (isset($urlParts['query']) ? '?' . $urlParts['query'] : '');
66
+$_SERVER['REQUEST_URI'] = $urlParts['path'].(isset($urlParts['query']) ? '?'.$urlParts['query'] : '');
67 67
 $_SERVER['REQUEST_METHOD'] = 'GET';
68 68
 
69 69
 	// Define a port if used in the URL:
70 70
 if (isset($urlParts['port'])) {
71
-	$_SERVER['HTTP_HOST'] .= ':' . $urlParts['port'];
71
+	$_SERVER['HTTP_HOST'] .= ':'.$urlParts['port'];
72 72
 	$_SERVER['SERVER_PORT'] = $urlParts['port'];
73 73
 }
74 74
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 }
79 79
 
80 80
 chdir($typo3Root);
81
-include($typo3Root . '/index.php');
81
+include($typo3Root.'/index.php');
82 82
 
83 83
 
84 84
 /**
Please login to merge, or discard this patch.
domain/lib/class.tx_crawler_domain_lib_abstract_dbobject.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 	 * @param void
50 50
 	 * @return string table name
51 51
 	 */
52
-	public static function getTableName(){
52
+	public static function getTableName() {
53 53
 		return self::$tableName;
54 54
 	}
55 55
 
Please login to merge, or discard this patch.
domain/queue/class.tx_crawler_domain_queue_entry.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 	 *
35 35
 	 * @return int
36 36
 	 */
37
-	public function getExecutionTime(){
37
+	public function getExecutionTime() {
38 38
 		return $this->row['exec_time'];
39 39
 	}
40 40
 
Please login to merge, or discard this patch.
domain/queue/class.tx_crawler_domain_queue_repository.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     protected function getFirstOrLastObjectByProcess($process, $orderby)
69 69
     {
70 70
         $db      = $this->getDB();
71
-        $where   = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) .
71
+        $where   = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(), $this->tableName).
72 72
                    ' AND exec_time > 0 ';
73 73
         $limit   = 1;
74 74
         $groupby = '';
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
      */
94 94
     public function countExecutedItemsByProcess($process)
95 95
     {
96
-        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = ' . $this->getDB()->fullQuoteStr($process->getProcess_id(),
96
+        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),
97 97
                 $this->tableName));
98 98
     }
99 99
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
      */
107 107
     public function countNonExecutedItemsByProcess($process)
108 108
     {
109
-        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = ' . $this->getDB()->fullQuoteStr($process->getProcess_id(),
109
+        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr($process->getProcess_id(),
110 110
                 $this->tableName));
111 111
     }
112 112
 
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
      */
121 121
     public function countAllPendingItems()
122 122
     {
123
-        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < ' . time());
123
+        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < '.time());
124 124
     }
125 125
 
126 126
     /**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
      */
134 134
     public function countAllAssignedPendingItems()
135 135
     {
136
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id != ''");
136
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id != ''");
137 137
     }
138 138
 
139 139
     /**
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
      */
147 147
     public function countAllUnassignedPendingItems()
148 148
     {
149
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id = ''");
149
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id = ''");
150 150
     }
151 151
 
152 152
     /**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
         $res  = $db->exec_SELECTquery(
177 177
             "configuration, count(*) as unprocessed, sum(process_id != '') as assignedButUnprocessed",
178 178
             $this->tableName,
179
-            'exec_time = 0 AND scheduled < ' . time(),
179
+            'exec_time = 0 AND scheduled < '.time(),
180 180
             'configuration'
181 181
         );
182 182
         $rows = array();
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
         $res    = $db->exec_SELECTquery(
201 201
             'set_id',
202 202
             $this->tableName,
203
-            'exec_time = 0 AND scheduled < ' . time(),
203
+            'exec_time = 0 AND scheduled < '.time(),
204 204
             'set_id'
205 205
         );
206 206
         $setIds = array();
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
             $res = $db->exec_SELECTquery(
227 227
                 'configuration, count(*) as c',
228 228
                 $this->tableName,
229
-                'set_id in (' . implode(',', $setIds) . ') AND scheduled < ' . time(),
229
+                'set_id in ('.implode(',', $setIds).') AND scheduled < '.time(),
230 230
                 'configuration'
231 231
             );
232 232
             while ($row = $db->sql_fetch_assoc($res)) {
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
         $res = $db->exec_SELECTquery(
307 307
             'process_id_completed, min(exec_time) as start, max(exec_time) as end, count(*) as urlcount',
308 308
             $this->tableName,
309
-            'exec_time != 0 and exec_time >= ' . intval($start) . ' and exec_time <= ' . intval($end),
309
+            'exec_time != 0 and exec_time >= '.intval($start).' and exec_time <= '.intval($end),
310 310
             'process_id_completed'
311 311
         );
312 312
 
Please login to merge, or discard this patch.