@@ -90,7 +90,7 @@ |
||
| 90 | 90 | $this->getSiteConfiguration()); |
| 91 | 91 | |
| 92 | 92 | // token is for old consumer, run through the approval workflow again |
| 93 | - if($oauth->getIdentity(true)->getAudience() !== $this->getSiteConfiguration()->getOAuthConsumerToken()) { |
|
| 93 | + if ($oauth->getIdentity(true)->getAudience() !== $this->getSiteConfiguration()->getOAuthConsumerToken()) { |
|
| 94 | 94 | $authoriseUrl = $oauth->getRequestToken(); |
| 95 | 95 | $this->redirectUrl($authoriseUrl); |
| 96 | 96 | |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | // <https://accounts.wmflabs.org/wiki/Help:Introduction> |
| 108 | 108 | // The code currently assumes that the template was parsed for enwiki, and will need to be |
| 109 | 109 | // updated once other wikis are supported. |
| 110 | - $templateHtml = preg_replace( '/(<a href=")(\/wiki\/)/', '$1//en.wikipedia.org$2', $templateHtml ); |
|
| 110 | + $templateHtml = preg_replace('/(<a href=")(\/wiki\/)/', '$1//en.wikipedia.org$2', $templateHtml); |
|
| 111 | 111 | |
| 112 | 112 | $this->assign('templateHtml', $templateHtml); |
| 113 | 113 | $this->assign('template', $template); |
@@ -115,14 +115,14 @@ |
||
| 115 | 115 | // Each entry is in the form [ database string, attribute name ] |
| 116 | 116 | // and it happens to be that the attribute is just the lower case form of the database value |
| 117 | 117 | $actions = [ |
| 118 | - [ 'Suspended', 'suspended' ], |
|
| 119 | - [ 'Promoted', 'promoted' ], |
|
| 120 | - [ 'Approved', 'approved' ], |
|
| 121 | - [ 'Demoted', 'demoted' ], |
|
| 122 | - [ 'Declined', 'declined' ], |
|
| 123 | - [ 'Renamed', 'renamed' ], |
|
| 124 | - [ 'Edited', 'edited' ], |
|
| 125 | - [ 'Prefchange', 'prefchange' ], |
|
| 118 | + ['Suspended', 'suspended'], |
|
| 119 | + ['Promoted', 'promoted'], |
|
| 120 | + ['Approved', 'approved'], |
|
| 121 | + ['Demoted', 'demoted'], |
|
| 122 | + ['Declined', 'declined'], |
|
| 123 | + ['Renamed', 'renamed'], |
|
| 124 | + ['Edited', 'edited'], |
|
| 125 | + ['Prefchange', 'prefchange'], |
|
| 126 | 126 | ]; |
| 127 | 127 | foreach ($actions as $action) { |
| 128 | 128 | $dbValue = $action[0]; |
@@ -182,13 +182,15 @@ |
||
| 182 | 182 | return ((int)$this->deleted) === 1; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - public function getSectionHeader() { |
|
| 185 | + public function getSectionHeader() |
|
| 186 | + { |
|
| 186 | 187 | // Hard-coded for future update ability to change this per-template. This has beem moved from being hard-coded |
| 187 | 188 | // directly in the welcome task, and safely permits us to show the header in the welcome template preview |
| 188 | 189 | return "Welcome!"; |
| 189 | 190 | } |
| 190 | 191 | |
| 191 | - public function getBotCodeForWikiSave(string $request, $creator) { |
|
| 192 | + public function getBotCodeForWikiSave(string $request, $creator) |
|
| 193 | + { |
|
| 192 | 194 | $templateText = $this->getBotCode(); |
| 193 | 195 | |
| 194 | 196 | $templateText = str_replace('$request', $request, $templateText); |
@@ -361,7 +361,7 @@ |
||
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | $task = $job->getTask(); |
| 364 | - if(isset($taskDescriptions[$task])){ |
|
| 364 | + if (isset($taskDescriptions[$task])) { |
|
| 365 | 365 | $description = $taskDescriptions[$task]; |
| 366 | 366 | } else { |
| 367 | 367 | $description = 'Unknown task'; |
@@ -361,9 +361,10 @@ |
||
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | $task = $job->getTask(); |
| 364 | - if(isset($taskDescriptions[$task])){ |
|
| 364 | + if(isset($taskDescriptions[$task])) { |
|
| 365 | 365 | $description = $taskDescriptions[$task]; |
| 366 | - } else { |
|
| 366 | + } |
|
| 367 | + else { |
|
| 367 | 368 | $description = 'Unknown task'; |
| 368 | 369 | } |
| 369 | 370 | |
@@ -184,7 +184,7 @@ |
||
| 184 | 184 | $emailDomain = explode("@", $request->getEmail())[1]; |
| 185 | 185 | $this->assign("emailurl", $emailDomain); |
| 186 | 186 | $this->assign('commonEmailDomain', in_array(strtolower($emailDomain), $configuration->getCommonEmailDomains()) |
| 187 | - || $request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail() ); |
|
| 187 | + || $request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()); |
|
| 188 | 188 | |
| 189 | 189 | $trustedIp = $xffProvider->getTrustedClientIp($request->getIp(), $request->getForwardedIp()); |
| 190 | 190 | $this->assign('requestTrustedIp', $trustedIp); |
@@ -195,8 +195,7 @@ |
||
| 195 | 195 | if ( |
| 196 | 196 | ($request->getEmail() != $this->getSiteConfiguration()->getDataClearEmail()) && |
| 197 | 197 | ($request->getIp() != $this->getSiteConfiguration()->getDataClearIp()) |
| 198 | - ) |
|
| 199 | - { |
|
| 198 | + ) { |
|
| 200 | 199 | $requestEmailHelper = new RequestEmailHelper($this->getEmailHelper()); |
| 201 | 200 | $requestEmailHelper->sendMail($request, $mailText, $currentUser, $ccMailingList); |
| 202 | 201 | |
@@ -23,7 +23,8 @@ discard block |
||
| 23 | 23 | * |
| 24 | 24 | * @return JobQueueSearchHelper |
| 25 | 25 | */ |
| 26 | - public static function get(PdoDatabase $database) { |
|
| 26 | + public static function get(PdoDatabase $database) |
|
| 27 | + { |
|
| 27 | 28 | $helper = new JobQueueSearchHelper($database); |
| 28 | 29 | return $helper; |
| 29 | 30 | } |
@@ -33,7 +34,8 @@ discard block |
||
| 33 | 34 | * |
| 34 | 35 | * @return $this |
| 35 | 36 | */ |
| 36 | - public function statusIn($statuses) { |
|
| 37 | + public function statusIn($statuses) |
|
| 38 | + { |
|
| 37 | 39 | $this->inClause('status', $statuses); |
| 38 | 40 | |
| 39 | 41 | return $this; |
@@ -42,27 +44,31 @@ discard block |
||
| 42 | 44 | /** |
| 43 | 45 | * @return $this |
| 44 | 46 | */ |
| 45 | - public function notAcknowledged() { |
|
| 47 | + public function notAcknowledged() |
|
| 48 | + { |
|
| 46 | 49 | $this->whereClause .= ' AND (acknowledged IS NULL OR acknowledged = 0)'; |
| 47 | 50 | |
| 48 | 51 | return $this; |
| 49 | 52 | } |
| 50 | 53 | |
| 51 | - public function byTask($task) { |
|
| 54 | + public function byTask($task) |
|
| 55 | + { |
|
| 52 | 56 | $this->whereClause .= ' AND task = ?'; |
| 53 | 57 | $this->parameterList[] = $task; |
| 54 | 58 | |
| 55 | 59 | return $this; |
| 56 | 60 | } |
| 57 | 61 | |
| 58 | - public function byUser($userId) { |
|
| 62 | + public function byUser($userId) |
|
| 63 | + { |
|
| 59 | 64 | $this->whereClause .= ' AND user = ?'; |
| 60 | 65 | $this->parameterList[] = $userId; |
| 61 | 66 | |
| 62 | 67 | return $this; |
| 63 | 68 | } |
| 64 | 69 | |
| 65 | - public function byStatus($status) { |
|
| 70 | + public function byStatus($status) |
|
| 71 | + { |
|
| 66 | 72 | $this->whereClause .= ' AND status = ?'; |
| 67 | 73 | $this->parameterList[] = $status; |
| 68 | 74 | |
@@ -77,7 +83,7 @@ discard block |
||
| 77 | 83 | return $this; |
| 78 | 84 | } |
| 79 | 85 | |
| 80 | - public function newestFirst() |
|
| 86 | + public function newestFirst() |
|
| 81 | 87 | { |
| 82 | 88 | $this->orderBy = 'id DESC'; |
| 83 | 89 | |