@@ -12,99 +12,99 @@ |
||
12 | 12 | |
13 | 13 | class ValidationError |
14 | 14 | { |
15 | - const NAME_EMPTY = "name_empty"; |
|
16 | - const NAME_EXISTS = "name_exists"; |
|
17 | - const NAME_EXISTS_SUL = "name_exists"; |
|
18 | - const NAME_NUMONLY = "name_numonly"; |
|
19 | - const NAME_INVALIDCHAR = "name_invalidchar"; |
|
20 | - const NAME_SANITISED = "name_sanitised"; |
|
21 | - const EMAIL_EMPTY = "email_empty"; |
|
22 | - const EMAIL_WIKIMEDIA = "email_wikimedia"; |
|
23 | - const EMAIL_INVALID = "email_invalid"; |
|
24 | - const EMAIL_MISMATCH = "email_mismatch"; |
|
25 | - const OPEN_REQUEST_NAME = "open_request_name"; |
|
26 | - const BANNED = "banned"; |
|
27 | - const BANNED_TOR = "banned_tor"; |
|
28 | - /** |
|
29 | - * @var array Error text for the above |
|
30 | - */ |
|
31 | - private static $errorText = array( |
|
32 | - self::NAME_EMPTY => 'You\'ve not chosen a username!', |
|
33 | - self::NAME_EXISTS => 'I\'m sorry, but the username you selected is already taken. Please try another. ' |
|
34 | - . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore ' |
|
35 | - . '[[User:example]] would become [[User:Example]].', |
|
36 | - self::NAME_EXISTS_SUL => 'I\'m sorry, but the username you selected is already taken. Please try another. ' |
|
37 | - . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore ' |
|
38 | - . '[[User:example]] would become [[User:Example]].', |
|
39 | - self::NAME_NUMONLY => 'The username you chose is invalid: it consists entirely of numbers. Please retry ' |
|
40 | - . 'with a valid username.', |
|
41 | - self::NAME_INVALIDCHAR => 'There appears to be an invalid character in your username. Please note that the ' |
|
42 | - . 'following characters are not allowed: <code># @ / < > [ ] | { }</code>', |
|
43 | - self::NAME_SANITISED => 'Your requested username has been automatically adjusted due to technical ' |
|
44 | - . 'restrictions. Underscores have been replaced with spaces, and the first character has been capitalised.', |
|
45 | - self::EMAIL_EMPTY => 'You need to supply an email address.', |
|
46 | - self::EMAIL_WIKIMEDIA => 'Please provide your email address here.', |
|
47 | - self::EMAIL_INVALID => 'Invalid E-mail address supplied. Please check you entered it correctly.', |
|
48 | - self::EMAIL_MISMATCH => 'The email addresses you entered do not match. Please try again.', |
|
49 | - self::OPEN_REQUEST_NAME => 'There is already an open request with this name in this system.', |
|
50 | - self::BANNED => 'I\'m sorry, but you are currently banned from requesting accounts using this tool. ' |
|
51 | - . 'However, you can still send an email to [email protected] to request an account.', |
|
52 | - self::BANNED_TOR => 'Tor exit nodes are currently banned from using this tool due to excessive abuse. ' |
|
53 | - . 'Please note that Tor is also currently banned from editing Wikipedia.', |
|
54 | - ); |
|
55 | - /** |
|
56 | - * Summary of $errorCode |
|
57 | - * @var string |
|
58 | - */ |
|
59 | - private $errorCode; |
|
60 | - /** |
|
61 | - * Summary of $isError |
|
62 | - * @var bool |
|
63 | - */ |
|
64 | - private $isError; |
|
15 | + const NAME_EMPTY = "name_empty"; |
|
16 | + const NAME_EXISTS = "name_exists"; |
|
17 | + const NAME_EXISTS_SUL = "name_exists"; |
|
18 | + const NAME_NUMONLY = "name_numonly"; |
|
19 | + const NAME_INVALIDCHAR = "name_invalidchar"; |
|
20 | + const NAME_SANITISED = "name_sanitised"; |
|
21 | + const EMAIL_EMPTY = "email_empty"; |
|
22 | + const EMAIL_WIKIMEDIA = "email_wikimedia"; |
|
23 | + const EMAIL_INVALID = "email_invalid"; |
|
24 | + const EMAIL_MISMATCH = "email_mismatch"; |
|
25 | + const OPEN_REQUEST_NAME = "open_request_name"; |
|
26 | + const BANNED = "banned"; |
|
27 | + const BANNED_TOR = "banned_tor"; |
|
28 | + /** |
|
29 | + * @var array Error text for the above |
|
30 | + */ |
|
31 | + private static $errorText = array( |
|
32 | + self::NAME_EMPTY => 'You\'ve not chosen a username!', |
|
33 | + self::NAME_EXISTS => 'I\'m sorry, but the username you selected is already taken. Please try another. ' |
|
34 | + . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore ' |
|
35 | + . '[[User:example]] would become [[User:Example]].', |
|
36 | + self::NAME_EXISTS_SUL => 'I\'m sorry, but the username you selected is already taken. Please try another. ' |
|
37 | + . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore ' |
|
38 | + . '[[User:example]] would become [[User:Example]].', |
|
39 | + self::NAME_NUMONLY => 'The username you chose is invalid: it consists entirely of numbers. Please retry ' |
|
40 | + . 'with a valid username.', |
|
41 | + self::NAME_INVALIDCHAR => 'There appears to be an invalid character in your username. Please note that the ' |
|
42 | + . 'following characters are not allowed: <code># @ / < > [ ] | { }</code>', |
|
43 | + self::NAME_SANITISED => 'Your requested username has been automatically adjusted due to technical ' |
|
44 | + . 'restrictions. Underscores have been replaced with spaces, and the first character has been capitalised.', |
|
45 | + self::EMAIL_EMPTY => 'You need to supply an email address.', |
|
46 | + self::EMAIL_WIKIMEDIA => 'Please provide your email address here.', |
|
47 | + self::EMAIL_INVALID => 'Invalid E-mail address supplied. Please check you entered it correctly.', |
|
48 | + self::EMAIL_MISMATCH => 'The email addresses you entered do not match. Please try again.', |
|
49 | + self::OPEN_REQUEST_NAME => 'There is already an open request with this name in this system.', |
|
50 | + self::BANNED => 'I\'m sorry, but you are currently banned from requesting accounts using this tool. ' |
|
51 | + . 'However, you can still send an email to [email protected] to request an account.', |
|
52 | + self::BANNED_TOR => 'Tor exit nodes are currently banned from using this tool due to excessive abuse. ' |
|
53 | + . 'Please note that Tor is also currently banned from editing Wikipedia.', |
|
54 | + ); |
|
55 | + /** |
|
56 | + * Summary of $errorCode |
|
57 | + * @var string |
|
58 | + */ |
|
59 | + private $errorCode; |
|
60 | + /** |
|
61 | + * Summary of $isError |
|
62 | + * @var bool |
|
63 | + */ |
|
64 | + private $isError; |
|
65 | 65 | |
66 | - /** |
|
67 | - * Summary of __construct |
|
68 | - * |
|
69 | - * @param string $errorCode |
|
70 | - * @param bool $isError |
|
71 | - */ |
|
72 | - public function __construct($errorCode, $isError = true) |
|
73 | - { |
|
74 | - $this->errorCode = $errorCode; |
|
75 | - $this->isError = $isError; |
|
76 | - } |
|
66 | + /** |
|
67 | + * Summary of __construct |
|
68 | + * |
|
69 | + * @param string $errorCode |
|
70 | + * @param bool $isError |
|
71 | + */ |
|
72 | + public function __construct($errorCode, $isError = true) |
|
73 | + { |
|
74 | + $this->errorCode = $errorCode; |
|
75 | + $this->isError = $isError; |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * Summary of getErrorCode |
|
80 | - * @return string |
|
81 | - */ |
|
82 | - public function getErrorCode() |
|
83 | - { |
|
84 | - return $this->errorCode; |
|
85 | - } |
|
78 | + /** |
|
79 | + * Summary of getErrorCode |
|
80 | + * @return string |
|
81 | + */ |
|
82 | + public function getErrorCode() |
|
83 | + { |
|
84 | + return $this->errorCode; |
|
85 | + } |
|
86 | 86 | |
87 | - /** |
|
88 | - * @return string |
|
89 | - * @throws Exception |
|
90 | - */ |
|
91 | - public function getErrorMessage() |
|
92 | - { |
|
93 | - $text = self::$errorText[$this->errorCode]; |
|
87 | + /** |
|
88 | + * @return string |
|
89 | + * @throws Exception |
|
90 | + */ |
|
91 | + public function getErrorMessage() |
|
92 | + { |
|
93 | + $text = self::$errorText[$this->errorCode]; |
|
94 | 94 | |
95 | - if ($text == null) { |
|
96 | - throw new Exception('Unknown validation error'); |
|
97 | - } |
|
95 | + if ($text == null) { |
|
96 | + throw new Exception('Unknown validation error'); |
|
97 | + } |
|
98 | 98 | |
99 | - return $text; |
|
100 | - } |
|
99 | + return $text; |
|
100 | + } |
|
101 | 101 | |
102 | - /** |
|
103 | - * Summary of isError |
|
104 | - * @return bool |
|
105 | - */ |
|
106 | - public function isError() |
|
107 | - { |
|
108 | - return $this->isError; |
|
109 | - } |
|
102 | + /** |
|
103 | + * Summary of isError |
|
104 | + * @return bool |
|
105 | + */ |
|
106 | + public function isError() |
|
107 | + { |
|
108 | + return $this->isError; |
|
109 | + } |
|
110 | 110 | } |
@@ -12,80 +12,80 @@ |
||
12 | 12 | |
13 | 13 | class Token |
14 | 14 | { |
15 | - /** @var string */ |
|
16 | - private $tokenData; |
|
17 | - /** @var string */ |
|
18 | - private $context; |
|
19 | - /** @var DateTimeImmutable */ |
|
20 | - private $generationTimestamp; |
|
21 | - /** @var DateTimeImmutable */ |
|
22 | - private $usageTimestamp; |
|
23 | - /** @var bool */ |
|
24 | - private $used; |
|
15 | + /** @var string */ |
|
16 | + private $tokenData; |
|
17 | + /** @var string */ |
|
18 | + private $context; |
|
19 | + /** @var DateTimeImmutable */ |
|
20 | + private $generationTimestamp; |
|
21 | + /** @var DateTimeImmutable */ |
|
22 | + private $usageTimestamp; |
|
23 | + /** @var bool */ |
|
24 | + private $used; |
|
25 | 25 | |
26 | - /** |
|
27 | - * Token constructor. |
|
28 | - * |
|
29 | - * @param string $tokenData |
|
30 | - * @param string $context |
|
31 | - */ |
|
32 | - public function __construct($tokenData, $context) |
|
33 | - { |
|
34 | - $this->tokenData = $tokenData; |
|
35 | - $this->context = $context; |
|
36 | - $this->generationTimestamp = new DateTimeImmutable(); |
|
37 | - $this->usageTimestamp = null; |
|
38 | - $this->used = false; |
|
39 | - } |
|
26 | + /** |
|
27 | + * Token constructor. |
|
28 | + * |
|
29 | + * @param string $tokenData |
|
30 | + * @param string $context |
|
31 | + */ |
|
32 | + public function __construct($tokenData, $context) |
|
33 | + { |
|
34 | + $this->tokenData = $tokenData; |
|
35 | + $this->context = $context; |
|
36 | + $this->generationTimestamp = new DateTimeImmutable(); |
|
37 | + $this->usageTimestamp = null; |
|
38 | + $this->used = false; |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * @return DateTimeImmutable |
|
43 | - */ |
|
44 | - public function getGenerationTimestamp() |
|
45 | - { |
|
46 | - return $this->generationTimestamp; |
|
47 | - } |
|
41 | + /** |
|
42 | + * @return DateTimeImmutable |
|
43 | + */ |
|
44 | + public function getGenerationTimestamp() |
|
45 | + { |
|
46 | + return $this->generationTimestamp; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @return string |
|
51 | - */ |
|
52 | - public function getContext() |
|
53 | - { |
|
54 | - return $this->context; |
|
55 | - } |
|
49 | + /** |
|
50 | + * @return string |
|
51 | + */ |
|
52 | + public function getContext() |
|
53 | + { |
|
54 | + return $this->context; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * @return string |
|
59 | - */ |
|
60 | - public function getTokenData() |
|
61 | - { |
|
62 | - return $this->tokenData; |
|
63 | - } |
|
57 | + /** |
|
58 | + * @return string |
|
59 | + */ |
|
60 | + public function getTokenData() |
|
61 | + { |
|
62 | + return $this->tokenData; |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * Returns a value indicating whether the token has already been used or not |
|
67 | - * |
|
68 | - * @return boolean |
|
69 | - */ |
|
70 | - public function isUsed() |
|
71 | - { |
|
72 | - return $this->used; |
|
73 | - } |
|
65 | + /** |
|
66 | + * Returns a value indicating whether the token has already been used or not |
|
67 | + * |
|
68 | + * @return boolean |
|
69 | + */ |
|
70 | + public function isUsed() |
|
71 | + { |
|
72 | + return $this->used; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * Marks the token as used |
|
77 | - */ |
|
78 | - public function markAsUsed() |
|
79 | - { |
|
80 | - $this->used = true; |
|
81 | - $this->usageTimestamp = new DateTimeImmutable(); |
|
82 | - } |
|
75 | + /** |
|
76 | + * Marks the token as used |
|
77 | + */ |
|
78 | + public function markAsUsed() |
|
79 | + { |
|
80 | + $this->used = true; |
|
81 | + $this->usageTimestamp = new DateTimeImmutable(); |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * @return DateTimeImmutable |
|
86 | - */ |
|
87 | - public function getUsageTimestamp() |
|
88 | - { |
|
89 | - return $this->usageTimestamp; |
|
90 | - } |
|
84 | + /** |
|
85 | + * @return DateTimeImmutable |
|
86 | + */ |
|
87 | + public function getUsageTimestamp() |
|
88 | + { |
|
89 | + return $this->usageTimestamp; |
|
90 | + } |
|
91 | 91 | } |
92 | 92 | \ No newline at end of file |
@@ -13,91 +13,91 @@ |
||
13 | 13 | |
14 | 14 | class TokenManager |
15 | 15 | { |
16 | - /** |
|
17 | - * Validates a CSRF token |
|
18 | - * |
|
19 | - * @param string $data The token data string itself |
|
20 | - * @param string|null $context Token context for extra validation |
|
21 | - * |
|
22 | - * @return bool |
|
23 | - */ |
|
24 | - public function validateToken($data, $context = null) |
|
25 | - { |
|
26 | - if (!is_string($data) || strlen($data) === 0) { |
|
27 | - // Nothing to validate |
|
28 | - return false; |
|
29 | - } |
|
30 | - |
|
31 | - $tokens = WebRequest::getSessionTokenData(); |
|
32 | - |
|
33 | - // if the token doesn't exist, then it's not valid |
|
34 | - if (!array_key_exists($data, $tokens)) { |
|
35 | - return false; |
|
36 | - } |
|
37 | - |
|
38 | - /** @var Token $token */ |
|
39 | - $token = unserialize($tokens[$data]); |
|
40 | - |
|
41 | - if ($token->getTokenData() !== $data) { |
|
42 | - return false; |
|
43 | - } |
|
44 | - |
|
45 | - if ($token->getContext() !== $context) { |
|
46 | - return false; |
|
47 | - } |
|
48 | - |
|
49 | - if ($token->isUsed()) { |
|
50 | - return false; |
|
51 | - } |
|
52 | - |
|
53 | - // mark the token as used, and save it back to the session |
|
54 | - $token->markAsUsed(); |
|
55 | - $this->storeToken($token); |
|
56 | - |
|
57 | - return true; |
|
58 | - } |
|
59 | - |
|
60 | - /** |
|
61 | - * @param string|null $context An optional context for extra validation |
|
62 | - * |
|
63 | - * @return Token |
|
64 | - */ |
|
65 | - public function getNewToken($context = null) |
|
66 | - { |
|
67 | - $token = new Token($this->generateTokenData(), $context); |
|
68 | - $this->storeToken($token); |
|
69 | - |
|
70 | - return $token; |
|
71 | - } |
|
72 | - |
|
73 | - /** |
|
74 | - * Stores a token in the session data |
|
75 | - * |
|
76 | - * @param Token $token |
|
77 | - */ |
|
78 | - private function storeToken(Token $token) |
|
79 | - { |
|
80 | - $tokens = WebRequest::getSessionTokenData(); |
|
81 | - $tokens[$token->getTokenData()] = serialize($token); |
|
82 | - WebRequest::setSessionTokenData($tokens); |
|
83 | - } |
|
84 | - |
|
85 | - /** |
|
86 | - * Generates a security token |
|
87 | - * |
|
88 | - * @return string |
|
89 | - * @throws Exception |
|
90 | - * |
|
91 | - * @category Security-Critical |
|
92 | - */ |
|
93 | - private function generateTokenData() |
|
94 | - { |
|
95 | - $genBytes = openssl_random_pseudo_bytes(33); |
|
96 | - |
|
97 | - if ($genBytes !== false) { |
|
98 | - return base64_encode($genBytes); |
|
99 | - } |
|
100 | - |
|
101 | - throw new Exception('Unable to generate secure token.'); |
|
102 | - } |
|
16 | + /** |
|
17 | + * Validates a CSRF token |
|
18 | + * |
|
19 | + * @param string $data The token data string itself |
|
20 | + * @param string|null $context Token context for extra validation |
|
21 | + * |
|
22 | + * @return bool |
|
23 | + */ |
|
24 | + public function validateToken($data, $context = null) |
|
25 | + { |
|
26 | + if (!is_string($data) || strlen($data) === 0) { |
|
27 | + // Nothing to validate |
|
28 | + return false; |
|
29 | + } |
|
30 | + |
|
31 | + $tokens = WebRequest::getSessionTokenData(); |
|
32 | + |
|
33 | + // if the token doesn't exist, then it's not valid |
|
34 | + if (!array_key_exists($data, $tokens)) { |
|
35 | + return false; |
|
36 | + } |
|
37 | + |
|
38 | + /** @var Token $token */ |
|
39 | + $token = unserialize($tokens[$data]); |
|
40 | + |
|
41 | + if ($token->getTokenData() !== $data) { |
|
42 | + return false; |
|
43 | + } |
|
44 | + |
|
45 | + if ($token->getContext() !== $context) { |
|
46 | + return false; |
|
47 | + } |
|
48 | + |
|
49 | + if ($token->isUsed()) { |
|
50 | + return false; |
|
51 | + } |
|
52 | + |
|
53 | + // mark the token as used, and save it back to the session |
|
54 | + $token->markAsUsed(); |
|
55 | + $this->storeToken($token); |
|
56 | + |
|
57 | + return true; |
|
58 | + } |
|
59 | + |
|
60 | + /** |
|
61 | + * @param string|null $context An optional context for extra validation |
|
62 | + * |
|
63 | + * @return Token |
|
64 | + */ |
|
65 | + public function getNewToken($context = null) |
|
66 | + { |
|
67 | + $token = new Token($this->generateTokenData(), $context); |
|
68 | + $this->storeToken($token); |
|
69 | + |
|
70 | + return $token; |
|
71 | + } |
|
72 | + |
|
73 | + /** |
|
74 | + * Stores a token in the session data |
|
75 | + * |
|
76 | + * @param Token $token |
|
77 | + */ |
|
78 | + private function storeToken(Token $token) |
|
79 | + { |
|
80 | + $tokens = WebRequest::getSessionTokenData(); |
|
81 | + $tokens[$token->getTokenData()] = serialize($token); |
|
82 | + WebRequest::setSessionTokenData($tokens); |
|
83 | + } |
|
84 | + |
|
85 | + /** |
|
86 | + * Generates a security token |
|
87 | + * |
|
88 | + * @return string |
|
89 | + * @throws Exception |
|
90 | + * |
|
91 | + * @category Security-Critical |
|
92 | + */ |
|
93 | + private function generateTokenData() |
|
94 | + { |
|
95 | + $genBytes = openssl_random_pseudo_bytes(33); |
|
96 | + |
|
97 | + if ($genBytes !== false) { |
|
98 | + return base64_encode($genBytes); |
|
99 | + } |
|
100 | + |
|
101 | + throw new Exception('Unable to generate secure token.'); |
|
102 | + } |
|
103 | 103 | } |
104 | 104 | \ No newline at end of file |
@@ -20,43 +20,43 @@ |
||
20 | 20 | |
21 | 21 | class ApiRequestRouter implements IRequestRouter |
22 | 22 | { |
23 | - /** |
|
24 | - * @return string[] |
|
25 | - */ |
|
26 | - public static function getActionList() |
|
27 | - { |
|
28 | - return array("count", "status", "stats", "help", "monitor"); |
|
29 | - } |
|
23 | + /** |
|
24 | + * @return string[] |
|
25 | + */ |
|
26 | + public static function getActionList() |
|
27 | + { |
|
28 | + return array("count", "status", "stats", "help", "monitor"); |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * @return IRoutedTask |
|
33 | - * @throws Exception |
|
34 | - */ |
|
35 | - public function route() |
|
36 | - { |
|
37 | - $requestAction = WebRequest::getString('action'); |
|
31 | + /** |
|
32 | + * @return IRoutedTask |
|
33 | + * @throws Exception |
|
34 | + */ |
|
35 | + public function route() |
|
36 | + { |
|
37 | + $requestAction = WebRequest::getString('action'); |
|
38 | 38 | |
39 | - switch ($requestAction) { |
|
40 | - case "count": |
|
41 | - $result = new CountAction(); |
|
42 | - break; |
|
43 | - case "status": |
|
44 | - $result = new StatusAction(); |
|
45 | - break; |
|
46 | - case "stats": |
|
47 | - $result = new StatsAction(); |
|
48 | - break; |
|
49 | - case "help": |
|
50 | - $result = new HelpAction(); |
|
51 | - break; |
|
52 | - case "monitor": |
|
53 | - $result = new MonitorAction(); |
|
54 | - break; |
|
55 | - default: |
|
56 | - $result = new UnknownAction(); |
|
57 | - break; |
|
58 | - } |
|
39 | + switch ($requestAction) { |
|
40 | + case "count": |
|
41 | + $result = new CountAction(); |
|
42 | + break; |
|
43 | + case "status": |
|
44 | + $result = new StatusAction(); |
|
45 | + break; |
|
46 | + case "stats": |
|
47 | + $result = new StatsAction(); |
|
48 | + break; |
|
49 | + case "help": |
|
50 | + $result = new HelpAction(); |
|
51 | + break; |
|
52 | + case "monitor": |
|
53 | + $result = new MonitorAction(); |
|
54 | + break; |
|
55 | + default: |
|
56 | + $result = new UnknownAction(); |
|
57 | + break; |
|
58 | + } |
|
59 | 59 | |
60 | - return $result; |
|
61 | - } |
|
60 | + return $result; |
|
61 | + } |
|
62 | 62 | } |
63 | 63 | \ No newline at end of file |
@@ -17,9 +17,9 @@ |
||
17 | 17 | */ |
18 | 18 | class OAuthRequestRouter extends RequestRouter |
19 | 19 | { |
20 | - protected function getRouteFromPath($pathInfo) |
|
21 | - { |
|
22 | - // Hardcode the route for this entry point |
|
23 | - return array(PageOAuth::class, 'callback'); |
|
24 | - } |
|
20 | + protected function getRouteFromPath($pathInfo) |
|
21 | + { |
|
22 | + // Hardcode the route for this entry point |
|
23 | + return array(PageOAuth::class, 'callback'); |
|
24 | + } |
|
25 | 25 | } |
26 | 26 | \ No newline at end of file |
@@ -18,9 +18,9 @@ |
||
18 | 18 | */ |
19 | 19 | interface IRequestRouter |
20 | 20 | { |
21 | - /** |
|
22 | - * @return IRoutedTask |
|
23 | - * @throws Exception |
|
24 | - */ |
|
25 | - public function route(); |
|
21 | + /** |
|
22 | + * @return IRoutedTask |
|
23 | + * @throws Exception |
|
24 | + */ |
|
25 | + public function route(); |
|
26 | 26 | } |
27 | 27 | \ No newline at end of file |
@@ -13,36 +13,36 @@ |
||
13 | 13 | */ |
14 | 14 | class AutoLoader |
15 | 15 | { |
16 | - public static function load($class) |
|
17 | - { |
|
18 | - // handle namespaces sensibly |
|
19 | - if (strpos($class, "Waca") !== false) { |
|
20 | - // strip off the initial namespace |
|
21 | - $class = str_replace("Waca\\", "", $class); |
|
16 | + public static function load($class) |
|
17 | + { |
|
18 | + // handle namespaces sensibly |
|
19 | + if (strpos($class, "Waca") !== false) { |
|
20 | + // strip off the initial namespace |
|
21 | + $class = str_replace("Waca\\", "", $class); |
|
22 | 22 | |
23 | - // swap backslashes for forward slashes to map to directory names |
|
24 | - $class = str_replace("\\", "/", $class); |
|
25 | - } |
|
23 | + // swap backslashes for forward slashes to map to directory names |
|
24 | + $class = str_replace("\\", "/", $class); |
|
25 | + } |
|
26 | 26 | |
27 | - $paths = array( |
|
28 | - __DIR__ . '/' . $class . ".php", |
|
29 | - __DIR__ . '/DataObjects/' . $class . ".php", |
|
30 | - __DIR__ . '/Providers/' . $class . ".php", |
|
31 | - __DIR__ . '/Providers/Interfaces/' . $class . ".php", |
|
32 | - __DIR__ . '/Validation/' . $class . ".php", |
|
33 | - __DIR__ . '/Helpers/' . $class . ".php", |
|
34 | - __DIR__ . '/Helpers/Interfaces/' . $class . ".php", |
|
35 | - __DIR__ . '/' . $class . ".php", |
|
36 | - ); |
|
27 | + $paths = array( |
|
28 | + __DIR__ . '/' . $class . ".php", |
|
29 | + __DIR__ . '/DataObjects/' . $class . ".php", |
|
30 | + __DIR__ . '/Providers/' . $class . ".php", |
|
31 | + __DIR__ . '/Providers/Interfaces/' . $class . ".php", |
|
32 | + __DIR__ . '/Validation/' . $class . ".php", |
|
33 | + __DIR__ . '/Helpers/' . $class . ".php", |
|
34 | + __DIR__ . '/Helpers/Interfaces/' . $class . ".php", |
|
35 | + __DIR__ . '/' . $class . ".php", |
|
36 | + ); |
|
37 | 37 | |
38 | - foreach ($paths as $file) { |
|
39 | - if (file_exists($file)) { |
|
40 | - require_once($file); |
|
41 | - } |
|
38 | + foreach ($paths as $file) { |
|
39 | + if (file_exists($file)) { |
|
40 | + require_once($file); |
|
41 | + } |
|
42 | 42 | |
43 | - if (class_exists($class)) { |
|
44 | - return; |
|
45 | - } |
|
46 | - } |
|
47 | - } |
|
43 | + if (class_exists($class)) { |
|
44 | + return; |
|
45 | + } |
|
46 | + } |
|
47 | + } |
|
48 | 48 | } |
@@ -25,14 +25,14 @@ |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | $paths = array( |
28 | - __DIR__ . '/' . $class . ".php", |
|
29 | - __DIR__ . '/DataObjects/' . $class . ".php", |
|
30 | - __DIR__ . '/Providers/' . $class . ".php", |
|
31 | - __DIR__ . '/Providers/Interfaces/' . $class . ".php", |
|
32 | - __DIR__ . '/Validation/' . $class . ".php", |
|
33 | - __DIR__ . '/Helpers/' . $class . ".php", |
|
34 | - __DIR__ . '/Helpers/Interfaces/' . $class . ".php", |
|
35 | - __DIR__ . '/' . $class . ".php", |
|
28 | + __DIR__.'/'.$class.".php", |
|
29 | + __DIR__.'/DataObjects/'.$class.".php", |
|
30 | + __DIR__.'/Providers/'.$class.".php", |
|
31 | + __DIR__.'/Providers/Interfaces/'.$class.".php", |
|
32 | + __DIR__.'/Validation/'.$class.".php", |
|
33 | + __DIR__.'/Helpers/'.$class.".php", |
|
34 | + __DIR__.'/Helpers/Interfaces/'.$class.".php", |
|
35 | + __DIR__.'/'.$class.".php", |
|
36 | 36 | ); |
37 | 37 | |
38 | 38 | foreach ($paths as $file) { |
@@ -10,77 +10,77 @@ |
||
10 | 10 | |
11 | 11 | class StringFunctions |
12 | 12 | { |
13 | - /** |
|
14 | - * Formats a string to be used as a username. |
|
15 | - * |
|
16 | - * @param $username |
|
17 | - * |
|
18 | - * @return string |
|
19 | - */ |
|
20 | - public function formatAsUsername($username) |
|
21 | - { |
|
22 | - // trim whitespace from the ends |
|
23 | - $uname = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $username); |
|
13 | + /** |
|
14 | + * Formats a string to be used as a username. |
|
15 | + * |
|
16 | + * @param $username |
|
17 | + * |
|
18 | + * @return string |
|
19 | + */ |
|
20 | + public function formatAsUsername($username) |
|
21 | + { |
|
22 | + // trim whitespace from the ends |
|
23 | + $uname = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $username); |
|
24 | 24 | |
25 | - // convert first char to uppercase |
|
26 | - $uname = $this->ucfirst($uname); |
|
25 | + // convert first char to uppercase |
|
26 | + $uname = $this->ucfirst($uname); |
|
27 | 27 | |
28 | - // replace spaces with underscores |
|
29 | - $uname = mb_ereg_replace("[ ]+", "_", $uname); |
|
28 | + // replace spaces with underscores |
|
29 | + $uname = mb_ereg_replace("[ ]+", "_", $uname); |
|
30 | 30 | |
31 | - // trim underscores from the end |
|
32 | - $uname = mb_ereg_replace("[_]+$", "", $uname); |
|
31 | + // trim underscores from the end |
|
32 | + $uname = mb_ereg_replace("[_]+$", "", $uname); |
|
33 | 33 | |
34 | - return $uname; |
|
35 | - } |
|
34 | + return $uname; |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * Formats a string to be used as an email (specifically strips whitespace |
|
39 | - * from the beginning/end of the Email, as well as immediately before/after |
|
40 | - * the @ in the Email). |
|
41 | - * |
|
42 | - * @param $email |
|
43 | - * |
|
44 | - * @return string |
|
45 | - */ |
|
46 | - public static function formatAsEmail($email) |
|
47 | - { |
|
48 | - // trim whitespace from the ends |
|
49 | - $newemail = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $email); |
|
37 | + /** |
|
38 | + * Formats a string to be used as an email (specifically strips whitespace |
|
39 | + * from the beginning/end of the Email, as well as immediately before/after |
|
40 | + * the @ in the Email). |
|
41 | + * |
|
42 | + * @param $email |
|
43 | + * |
|
44 | + * @return string |
|
45 | + */ |
|
46 | + public static function formatAsEmail($email) |
|
47 | + { |
|
48 | + // trim whitespace from the ends |
|
49 | + $newemail = mb_ereg_replace("^[ \t]+|[ \t]+$", "", $email); |
|
50 | 50 | |
51 | - // trim whitespace from around the email address |
|
52 | - $newemail = mb_ereg_replace("[ \t]+@", "@", $newemail); |
|
53 | - $newemail = mb_ereg_replace("@[ \t]+", "@", $newemail); |
|
51 | + // trim whitespace from around the email address |
|
52 | + $newemail = mb_ereg_replace("[ \t]+@", "@", $newemail); |
|
53 | + $newemail = mb_ereg_replace("@[ \t]+", "@", $newemail); |
|
54 | 54 | |
55 | - return $newemail; |
|
56 | - } |
|
55 | + return $newemail; |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * Returns true if a string is a multibyte string |
|
60 | - * |
|
61 | - * @param string $string |
|
62 | - * |
|
63 | - * @return bool |
|
64 | - */ |
|
65 | - public function isMultibyte($string) |
|
66 | - { |
|
67 | - return strlen($string) !== mb_strlen($string); |
|
68 | - } |
|
58 | + /** |
|
59 | + * Returns true if a string is a multibyte string |
|
60 | + * |
|
61 | + * @param string $string |
|
62 | + * |
|
63 | + * @return bool |
|
64 | + */ |
|
65 | + public function isMultibyte($string) |
|
66 | + { |
|
67 | + return strlen($string) !== mb_strlen($string); |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * Make a string's first character uppercase |
|
72 | - * |
|
73 | - * @param string $string |
|
74 | - * |
|
75 | - * @return string |
|
76 | - */ |
|
77 | - public function ucfirst($string) |
|
78 | - { |
|
79 | - if (ord($string) < 128) { |
|
80 | - return ucfirst($string); |
|
81 | - } |
|
82 | - else { |
|
83 | - return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1); |
|
84 | - } |
|
85 | - } |
|
70 | + /** |
|
71 | + * Make a string's first character uppercase |
|
72 | + * |
|
73 | + * @param string $string |
|
74 | + * |
|
75 | + * @return string |
|
76 | + */ |
|
77 | + public function ucfirst($string) |
|
78 | + { |
|
79 | + if (ord($string) < 128) { |
|
80 | + return ucfirst($string); |
|
81 | + } |
|
82 | + else { |
|
83 | + return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1); |
|
84 | + } |
|
85 | + } |
|
86 | 86 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | return ucfirst($string); |
81 | 81 | } |
82 | 82 | else { |
83 | - return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1); |
|
83 | + return mb_strtoupper(mb_substr($string, 0, 1)).mb_substr($string, 1); |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | } |
@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | class UpdateTorExitTask extends ConsoleTaskBase |
15 | 15 | { |
16 | - /** |
|
17 | - * @return void |
|
18 | - */ |
|
19 | - public function execute() |
|
20 | - { |
|
21 | - TorExitProvider::regenerate( |
|
22 | - $this->getDatabase(), |
|
23 | - $this->getHttpHelper(), |
|
24 | - $this->getSiteConfiguration()->getTorExitPaths()); |
|
25 | - } |
|
16 | + /** |
|
17 | + * @return void |
|
18 | + */ |
|
19 | + public function execute() |
|
20 | + { |
|
21 | + TorExitProvider::regenerate( |
|
22 | + $this->getDatabase(), |
|
23 | + $this->getHttpHelper(), |
|
24 | + $this->getSiteConfiguration()->getTorExitPaths()); |
|
25 | + } |
|
26 | 26 | } |
27 | 27 | \ No newline at end of file |