@@ -24,7 +24,7 @@ |
||
24 | 24 | $headerString = ''; |
25 | 25 | |
26 | 26 | foreach ($headers as $header => $headerValue) { |
27 | - $headerString .= $header . ': ' . $headerValue . "\r\n"; |
|
27 | + $headerString .= $header.': '.$headerValue."\r\n"; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | mail($to, $subject, $content, $headerString); |
@@ -404,11 +404,11 @@ |
||
404 | 404 | public function getRevealHash() |
405 | 405 | { |
406 | 406 | $data = $this->id // unique per request |
407 | - . '|' . $this->ip // } |
|
408 | - . '|' . $this->forwardedip // } private data not known to those without access |
|
409 | - . '|' . $this->useragent // } |
|
410 | - . '|' . $this->email // } |
|
411 | - . '|' . $this->status; // to rudimentarily invalidate the token on status change |
|
407 | + . '|'.$this->ip // } |
|
408 | + . '|'.$this->forwardedip // } private data not known to those without access |
|
409 | + . '|'.$this->useragent // } |
|
410 | + . '|'.$this->email // } |
|
411 | + . '|'.$this->status; // to rudimentarily invalidate the token on status change |
|
412 | 412 | |
413 | 413 | return hash('sha256', $data); |
414 | 414 | } |
@@ -54,7 +54,7 @@ |
||
54 | 54 | final protected function setUpSmarty() |
55 | 55 | { |
56 | 56 | $this->smarty = new Smarty(); |
57 | - $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins'); |
|
57 | + $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath().'/smarty-plugins'); |
|
58 | 58 | |
59 | 59 | $this->assign('currentUser', User::getCommunity()); |
60 | 60 | $this->assign('loggedIn', false); |
@@ -96,7 +96,7 @@ |
||
96 | 96 | |
97 | 97 | $statement = $this->getDatabase()->prepare($query); |
98 | 98 | $statement->bindValue(":username", $this->user->getUsername()); |
99 | - $statement->bindValue(":date", date('Y-m-d') . "%"); |
|
99 | + $statement->bindValue(":date", date('Y-m-d')."%"); |
|
100 | 100 | $statement->execute(); |
101 | 101 | $today = $statement->fetchColumn(); |
102 | 102 | $statement->closeCursor(); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $cacheResult->delete(); |
73 | 73 | |
74 | 74 | if (isset($result['error']['info'])) { |
75 | - throw new Exception("Unrecognised API response to query: " . $result['error']['info']); |
|
75 | + throw new Exception("Unrecognised API response to query: ".$result['error']['info']); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | throw new Exception("Unrecognised API response to query."); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | if ($result['antispoof']['result'] == "error") { |
92 | 92 | // we've got conflicts, let's do something with them. |
93 | - throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']); |
|
93 | + throw new Exception("Encountered error while getting result: ".$result['antispoof']['error']); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | throw new Exception("Unrecognised API response to query."); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $statement = $database->prepare($query); |
63 | 63 | |
64 | 64 | foreach ($destinationIps as $ip) { |
65 | - echo 'Fetching data for ' . $ip . PHP_EOL; |
|
65 | + echo 'Fetching data for '.$ip.PHP_EOL; |
|
66 | 66 | |
67 | 67 | $statement->bindValue(':exitaddr', $ip); |
68 | 68 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | )); |
82 | 82 | |
83 | 83 | foreach (array(80 => $http, 443 => $https) as $port => $response) { |
84 | - echo ' Running for port ' . $ip . ':' . $port . PHP_EOL; |
|
84 | + echo ' Running for port '.$ip.':'.$port.PHP_EOL; |
|
85 | 85 | |
86 | 86 | $statement->bindValue(':exitport', $port); |
87 | 87 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
102 | - echo 'Done for ' . $ip . PHP_EOL; |
|
102 | + echo 'Done for '.$ip.PHP_EOL; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | // kill old cached entries |
@@ -207,7 +207,7 @@ |
||
207 | 207 | } |
208 | 208 | } |
209 | 209 | |
210 | - public function getRoleConfiguration(){ |
|
210 | + public function getRoleConfiguration() { |
|
211 | 211 | return $this->roleConfiguration; |
212 | 212 | } |
213 | 213 | } |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | foreach ($users as $user) { |
30 | 30 | $toAdd = array('user'); |
31 | 31 | |
32 | - if($user['status'] === 'Admin'){ |
|
32 | + if ($user['status'] === 'Admin') { |
|
33 | 33 | $toAdd[] = 'admin'; |
34 | 34 | } |
35 | 35 | |
36 | - if($user['checkuser'] == 1){ |
|
36 | + if ($user['checkuser'] == 1) { |
|
37 | 37 | $toAdd[] = 'checkuser'; |
38 | 38 | } |
39 | 39 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $log->setComment($logData); |
61 | 61 | $log->save(); |
62 | 62 | |
63 | - if($user['status'] === 'Admin' || $user['status'] === 'User'){ |
|
63 | + if ($user['status'] === 'Admin' || $user['status'] === 'User') { |
|
64 | 64 | $update->execute(array('id' => $user['id'])); |
65 | 65 | } |
66 | 66 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | } |
105 | 105 | |
106 | 106 | if ($data === false) { |
107 | - throw new CurlException('Curl error: ' . $this->httpHelper->getError()); |
|
107 | + throw new CurlException('Curl error: '.$this->httpHelper->getError()); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | $result = json_decode($data); |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | $response = $this->callApi($tokenParams, 'POST'); |
125 | 125 | |
126 | 126 | if (isset($response->error)) { |
127 | - throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info); |
|
127 | + throw new MediaWikiApiException($response->error->code.': '.$response->error->info); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | $token = $response->query->tokens->logintoken; |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | $loginResponse = $this->callApi($params, 'POST'); |
144 | 144 | |
145 | - if($loginResponse->login->result == 'Success'){ |
|
145 | + if ($loginResponse->login->result == 'Success') { |
|
146 | 146 | return; |
147 | 147 | } |
148 | 148 |