@@ -263,7 +263,7 @@ |
||
263 | 263 | "dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database, |
264 | 264 | "username" => $toolserver_username, |
265 | 265 | "password" => $toolserver_password, |
266 | - "options" => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'), |
|
266 | + "options" => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'), |
|
267 | 267 | ), |
268 | 268 | "wikipedia" => array( |
269 | 269 | "dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db, |
@@ -32,7 +32,7 @@ |
||
32 | 32 | { |
33 | 33 | $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup(); |
34 | 34 | if (! $this->getSiteConfiguration()->isRegistrationAllowed()) { |
35 | - throw new AccessDeniedException(); |
|
35 | + throw new AccessDeniedException(); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | // Dual-mode page |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $request = WebRequest::postString("request"); |
46 | 46 | |
47 | 47 | if ($authenticate === null || $authenticate === "" || $request === null || $request === "") { |
48 | - throw new ApplicationLogicException("No authentication specified"); |
|
48 | + throw new ApplicationLogicException("No authentication specified"); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | return array(json_decode($authenticate), json_decode($request), 'u2f'); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $userSearchHelper = UserSearchHelper::get($this->getDatabase()); |
24 | 24 | |
25 | 25 | if (WebRequest::getString('all') === null) { |
26 | - $userSearchHelper->byStatus(User::STATUS_ACTIVE); |
|
26 | + $userSearchHelper->byStatus(User::STATUS_ACTIVE); |
|
27 | 27 | |
28 | 28 | } |
29 | 29 |
@@ -241,19 +241,19 @@ |
||
241 | 241 | */ |
242 | 242 | public function setForwardedIp($forwardedip) |
243 | 243 | { |
244 | - // Verify that the XFF chain only contains valid IP addresses, and silently discard anything that isn't. |
|
244 | + // Verify that the XFF chain only contains valid IP addresses, and silently discard anything that isn't. |
|
245 | 245 | |
246 | - $xff = explode(',', $forwardedip); |
|
247 | - $valid = array(); |
|
246 | + $xff = explode(',', $forwardedip); |
|
247 | + $valid = array(); |
|
248 | 248 | |
249 | - foreach ($xff as $ip) { |
|
250 | - $ip = trim($ip); |
|
251 | - if (filter_var($ip, FILTER_VALIDATE_IP)) { |
|
252 | - $valid[] = $ip; |
|
253 | - } |
|
254 | - } |
|
249 | + foreach ($xff as $ip) { |
|
250 | + $ip = trim($ip); |
|
251 | + if (filter_var($ip, FILTER_VALIDATE_IP)) { |
|
252 | + $valid[] = $ip; |
|
253 | + } |
|
254 | + } |
|
255 | 255 | |
256 | - $this->forwardedip = implode(", ", $valid); |
|
256 | + $this->forwardedip = implode(", ", $valid); |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | /** |
@@ -28,15 +28,15 @@ |
||
28 | 28 | return (bool)$dontUseDb; |
29 | 29 | } |
30 | 30 | |
31 | - /** |
|
32 | - * Gets the offline message |
|
33 | - * |
|
34 | - * @param bool $external |
|
35 | - * @param null|string $message |
|
36 | - * |
|
37 | - * @return string |
|
38 | - * @throws SmartyException |
|
39 | - */ |
|
31 | + /** |
|
32 | + * Gets the offline message |
|
33 | + * |
|
34 | + * @param bool $external |
|
35 | + * @param null|string $message |
|
36 | + * |
|
37 | + * @return string |
|
38 | + * @throws SmartyException |
|
39 | + */ |
|
40 | 40 | public static function getOfflineMessage($external, $message = null) |
41 | 41 | { |
42 | 42 | global $dontUseDbCulprit, $dontUseDbReason, $baseurl; |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | { |
348 | 348 | $userIds = array(); |
349 | 349 | |
350 | - foreach ($logs as $logEntry) { |
|
350 | + foreach ($logs as $logEntry) { |
|
351 | 351 | if (!$logEntry instanceof Log) { |
352 | 352 | // if this happens, we've done something wrong with passing back the log data. |
353 | 353 | throw new Exception('Log entry is not an instance of a Log, this should never happen.'); |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | |
369 | 369 | $logData = array(); |
370 | 370 | |
371 | - foreach ($logs as $logEntry) { |
|
371 | + foreach ($logs as $logEntry) { |
|
372 | 372 | $objectDescription = self::getObjectDescription($logEntry->getObjectId(), $logEntry->getObjectType(), |
373 | 373 | $database, $configuration); |
374 | 374 |
@@ -16,8 +16,8 @@ |
||
16 | 16 | 'google' => 'https://www.google.com/search?q=%DATA%', |
17 | 17 | 'domain' => 'http://%DATA%/', |
18 | 18 | 'rangefinder' => 'https://tools.wmflabs.org/rangeblockfinder/?ip=%DATA%', |
19 | - 'ipcheck' => 'https://ipcheck.toolforge.org/index.php?ip=%DATA%', |
|
20 | - 'bgpview' => 'https://bgpview.io/ip/%DATA%' |
|
19 | + 'ipcheck' => 'https://ipcheck.toolforge.org/index.php?ip=%DATA%', |
|
20 | + 'bgpview' => 'https://bgpview.io/ip/%DATA%' |
|
21 | 21 | ); |
22 | 22 | |
23 | 23 | if (!isset($_GET['tool']) |