@@ -131,7 +131,7 @@ |
||
| 131 | 131 | // check whether visitor is user |
| 132 | 132 | /** @var bool $userIsAlreadyVisitor Whether the new user is already the default user and the |
| 133 | 133 | old user is the default user too. |
| 134 | - */ |
|
| 134 | + */ |
|
| 135 | 135 | $userIsAlreadyVisitor = $this->userIsDefault($newUser) && $this->userIsDefault($oldUserId); |
| 136 | 136 | // prevent unnecessary changes |
| 137 | 137 | if ($oldUserId == $newUserId || $userIsAlreadyVisitor) { |
@@ -57,9 +57,9 @@ |
||
| 57 | 57 | public static function getOldestPossibleReplayAttackDate() |
| 58 | 58 | { |
| 59 | 59 | /** @var XenForo_Options $options */ |
| 60 | - $options = XenForo_Application::getOptions(); |
|
| 60 | + $options = XenForo_Application::getOptions(); |
|
| 61 | 61 | /** @var int $rejectOlDefault the default maximum age of a message according*/ |
| 62 | - $rejectOlDefault = strtotime('-14 days', XenForo_Application::$time);; |
|
| 62 | + $rejectOlDefault = strtotime('-14 days', XenForo_Application::$time); ; |
|
| 63 | 63 | /** @var int $rejectOld the maximum age of a message according to the options */ |
| 64 | 64 | $rejectOldOption = ''; |
| 65 | 65 | if ($options->threema_gateway_verify_receive_time && $options->threema_gateway_verify_receive_time['enabled']) { |
@@ -8,17 +8,17 @@ discard block |
||
| 8 | 8 | * @license MIT |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | - class ThreemaGateway_Helper_Emoji |
|
| 12 | - { |
|
| 13 | - /** |
|
| 14 | - * Replaces unicode escape sequence with the correct UNICODE character. |
|
| 15 | - * |
|
| 16 | - * XenForo template helper: emojiparseunicode. |
|
| 17 | - * You need to pass it as surrogate pairs, e.g. \ud83d\udd11. |
|
| 18 | - * |
|
| 19 | - * @param string $string |
|
| 20 | - * @return string |
|
| 21 | - */ |
|
| 11 | + class ThreemaGateway_Helper_Emoji |
|
| 12 | + { |
|
| 13 | + /** |
|
| 14 | + * Replaces unicode escape sequence with the correct UNICODE character. |
|
| 15 | + * |
|
| 16 | + * XenForo template helper: emojiparseunicode. |
|
| 17 | + * You need to pass it as surrogate pairs, e.g. \ud83d\udd11. |
|
| 18 | + * |
|
| 19 | + * @param string $string |
|
| 20 | + * @return string |
|
| 21 | + */ |
|
| 22 | 22 | public static function parseUnicode($string) |
| 23 | 23 | { |
| 24 | 24 | // uses json_decode as a hackish way to encode unicode strings |
@@ -47,4 +47,4 @@ discard block |
||
| 47 | 47 | // https://regex101.com/r/aQ3eA3/1 |
| 48 | 48 | return preg_replace('/(\d)/', '\1\\u20e3', $string); |
| 49 | 49 | } |
| 50 | - } |
|
| 50 | + } |
|
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | // https://stackoverflow.com/questions/6058394/unicode-character-in-php-string |
| 26 | 26 | |
| 27 | 27 | // RegEx: https://regex101.com/r/yS2zX8/3 |
| 28 | - return preg_replace_callback('/(\\\\u([0-9a-fA-F]{4}))+/', function ($match) { |
|
| 28 | + return preg_replace_callback('/(\\\\u([0-9a-fA-F]{4}))+/', function($match) { |
|
| 29 | 29 | return json_decode('"' . $match[0] . '"'); |
| 30 | 30 | }, $string); |
| 31 | 31 | } |