@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | public function getRevisionCounts(Project $project, User $user) |
18 | 18 | { |
19 | 19 | // Set up cache. |
20 | - $cacheKey = 'revisioncounts.' . $project->getDatabaseName() . '.' . $user->getUsername(); |
|
20 | + $cacheKey = 'revisioncounts.'.$project->getDatabaseName().'.'.$user->getUsername(); |
|
21 | 21 | if ($this->cache->hasItem($cacheKey)) { |
22 | 22 | return $this->cache->getItem($cacheKey)->get(); |
23 | 23 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | public function getRevisionDates(Project $project, User $user) |
79 | 79 | { |
80 | 80 | // Set up cache. |
81 | - $cacheKey = 'revisiondates.' . $project->getDatabaseName() . '.' . $user->getUsername(); |
|
81 | + $cacheKey = 'revisiondates.'.$project->getDatabaseName().'.'.$user->getUsername(); |
|
82 | 82 | if ($this->cache->hasItem($cacheKey)) { |
83 | 83 | return $this->cache->getItem($cacheKey)->get(); |
84 | 84 | } |
@@ -150,10 +150,10 @@ discard block |
||
150 | 150 | $results = $resultQuery->fetchAll(); |
151 | 151 | |
152 | 152 | $pageCounts = array_combine( |
153 | - array_map(function ($e) { |
|
153 | + array_map(function($e) { |
|
154 | 154 | return $e['source']; |
155 | 155 | }, $results), |
156 | - array_map(function ($e) { |
|
156 | + array_map(function($e) { |
|
157 | 157 | return $e['value']; |
158 | 158 | }, $results) |
159 | 159 | ); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | // Query. |
186 | 186 | $sql = "SELECT CONCAT(log_type, '-', log_action) AS source, COUNT(log_id) AS value |
187 | - FROM " . $this->getTableName($project->getDatabaseName(), 'logging') . " |
|
187 | + FROM " . $this->getTableName($project->getDatabaseName(), 'logging')." |
|
188 | 188 | WHERE log_user = :userId |
189 | 189 | GROUP BY log_type, log_action"; |
190 | 190 | $resultQuery = $this->getProjectsConnection()->prepare($sql); |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | $resultQuery->execute(); |
194 | 194 | $results = $resultQuery->fetchAll(); |
195 | 195 | $logCounts = array_combine( |
196 | - array_map(function ($e) { |
|
196 | + array_map(function($e) { |
|
197 | 197 | return $e['source']; |
198 | 198 | }, $results), |
199 | - array_map(function ($e) { |
|
199 | + array_map(function($e) { |
|
200 | 200 | return $e['value']; |
201 | 201 | }, $results) |
202 | 202 | ); |
@@ -342,9 +342,9 @@ discard block |
||
342 | 342 | $resultQuery->bindParam(":id", $userId); |
343 | 343 | $resultQuery->execute(); |
344 | 344 | $results = $resultQuery->fetchAll(); |
345 | - $namespaceTotals = array_combine(array_map(function ($e) { |
|
345 | + $namespaceTotals = array_combine(array_map(function($e) { |
|
346 | 346 | return $e['page_namespace']; |
347 | - }, $results), array_map(function ($e) { |
|
347 | + }, $results), array_map(function($e) { |
|
348 | 348 | return $e['total']; |
349 | 349 | }, $results)); |
350 | 350 | return $namespaceTotals; |
@@ -366,14 +366,14 @@ discard block |
||
366 | 366 | $revisions = $this->cacheGet($cacheKey); |
367 | 367 | } else { |
368 | 368 | $sql = |
369 | - "SELECT rev_id, rev_timestamp, UNIX_TIMESTAMP(rev_timestamp) AS unix_timestamp, " . |
|
370 | - " rev_minor_edit, rev_deleted, rev_len, rev_parent_id, rev_comment, " . |
|
371 | - " page_title, page_namespace " . " FROM " . |
|
372 | - $this->labsHelper->getTable('revision', $project['dbName']) . " JOIN " . |
|
373 | - $this->labsHelper->getTable('page', $project['dbName']) . |
|
374 | - " ON (rev_page = page_id)" . |
|
375 | - " WHERE rev_timestamp > NOW() - INTERVAL $days DAY AND rev_user_text LIKE :username" . |
|
376 | - " ORDER BY rev_timestamp DESC" . " LIMIT 10"; |
|
369 | + "SELECT rev_id, rev_timestamp, UNIX_TIMESTAMP(rev_timestamp) AS unix_timestamp, ". |
|
370 | + " rev_minor_edit, rev_deleted, rev_len, rev_parent_id, rev_comment, ". |
|
371 | + " page_title, page_namespace "." FROM ". |
|
372 | + $this->labsHelper->getTable('revision', $project['dbName'])." JOIN ". |
|
373 | + $this->labsHelper->getTable('page', $project['dbName']). |
|
374 | + " ON (rev_page = page_id)". |
|
375 | + " WHERE rev_timestamp > NOW() - INTERVAL $days DAY AND rev_user_text LIKE :username". |
|
376 | + " ORDER BY rev_timestamp DESC"." LIMIT 10"; |
|
377 | 377 | $resultQuery = $this->replicas->prepare($sql); |
378 | 378 | $resultQuery->bindParam(":username", $username); |
379 | 379 | $resultQuery->execute(); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | if (count($revisions) === 0) { |
384 | 384 | continue; |
385 | 385 | } |
386 | - $revsWithProject = array_map(function (&$item) use ($project) { |
|
386 | + $revsWithProject = array_map(function(&$item) use ($project) { |
|
387 | 387 | $item['project_name'] = $project['wikiName']; |
388 | 388 | $item['project_url'] = $project['url']; |
389 | 389 | $item['project_db_name'] = $project['dbName']; |
@@ -393,8 +393,8 @@ discard block |
||
393 | 393 | }, $revisions); |
394 | 394 | $allRevisions = array_merge($allRevisions, $revsWithProject); |
395 | 395 | } |
396 | - usort($allRevisions, function ($a, $b) { |
|
397 | - return $b['rev_timestamp'] - $a['rev_timestamp']; |
|
396 | + usort($allRevisions, function($a, $b) { |
|
397 | + return $b['rev_timestamp']-$a['rev_timestamp']; |
|
398 | 398 | }); |
399 | 399 | |
400 | 400 | return array_slice($allRevisions, 0, $topN); |
@@ -413,12 +413,12 @@ discard block |
||
413 | 413 | } |
414 | 414 | |
415 | 415 | $sql = |
416 | - "SELECT " . " YEAR(rev_timestamp) AS `year`," . |
|
417 | - " MONTH(rev_timestamp) AS `month`," . " page_namespace," . |
|
418 | - " COUNT(rev_id) AS `count` " . " FROM " . $this->labsHelper->getTable('revision') . |
|
419 | - " JOIN " . $this->labsHelper->getTable('page') . " ON (rev_page = page_id)" . |
|
420 | - " WHERE rev_user_text = :username" . |
|
421 | - " GROUP BY YEAR(rev_timestamp), MONTH(rev_timestamp), page_namespace " . |
|
416 | + "SELECT "." YEAR(rev_timestamp) AS `year`,". |
|
417 | + " MONTH(rev_timestamp) AS `month`,"." page_namespace,". |
|
418 | + " COUNT(rev_id) AS `count` "." FROM ".$this->labsHelper->getTable('revision'). |
|
419 | + " JOIN ".$this->labsHelper->getTable('page')." ON (rev_page = page_id)". |
|
420 | + " WHERE rev_user_text = :username". |
|
421 | + " GROUP BY YEAR(rev_timestamp), MONTH(rev_timestamp), page_namespace ". |
|
422 | 422 | " ORDER BY rev_timestamp DESC"; |
423 | 423 | $resultQuery = $this->replicas->prepare($sql); |
424 | 424 | $resultQuery->bindParam(":username", $username); |
@@ -440,14 +440,14 @@ discard block |
||
440 | 440 | if (!isset($out['totals'][$ns])) { |
441 | 441 | $out['totals'][$ns] = []; |
442 | 442 | } |
443 | - $out['totals'][$ns][$total['year'] . $total['month']] = $total['count']; |
|
443 | + $out['totals'][$ns][$total['year'].$total['month']] = $total['count']; |
|
444 | 444 | } |
445 | 445 | // Fill in the blanks (where no edits were made in a given month for a namespace). |
446 | 446 | for ($y = $out['min_year']; $y <= $out['max_year']; $y++) { |
447 | 447 | for ($m = 1; $m <= 12; $m++) { |
448 | 448 | foreach ($out['totals'] as $nsId => &$total) { |
449 | - if (!isset($total[$y . $m])) { |
|
450 | - $total[$y . $m] = 0; |
|
449 | + if (!isset($total[$y.$m])) { |
|
450 | + $total[$y.$m] = 0; |
|
451 | 451 | } |
452 | 452 | } |
453 | 453 | } |