@@ -20,7 +20,7 @@ |
||
| 20 | 20 | class GroupReq_Notify_Background extends SMF_BackgroundTask |
| 21 | 21 | { |
| 22 | 22 | /** |
| 23 | - * This executes the task - loads up the information, puts the email in the queue and inserts any alerts as needed. |
|
| 23 | + * This executes the task - loads up the information, puts the email in the queue and inserts any alerts as needed. |
|
| 24 | 24 | * @return bool Always returns true. |
| 25 | 25 | */ |
| 26 | 26 | public function execute() |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * @return bool Always returns true. |
| 25 | 25 | */ |
| 26 | 26 | public function execute() |
| 27 | - { |
|
| 27 | + { |
|
| 28 | 28 | global $sourcedir, $smcFunc, $language, $modSettings, $scripturl; |
| 29 | 29 | |
| 30 | 30 | // Do we have any group moderators? |
@@ -3204,7 +3204,9 @@ |
||
| 3204 | 3204 | return $string; |
| 3205 | 3205 | |
| 3206 | 3206 | // This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8) |
| 3207 | - $new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches) {return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string); |
|
| 3207 | + $new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches) |
|
| 3208 | + { |
|
| 3209 | +return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string); |
|
| 3208 | 3210 | |
| 3209 | 3211 | // @todo Add more possible fixes here. For example, fix incorrect array lengths, try to handle truncated strings gracefully, etc. |
| 3210 | 3212 | |
@@ -293,7 +293,7 @@ |
||
| 293 | 293 | { |
| 294 | 294 | /** |
| 295 | 295 | * Constants for notfication types. |
| 296 | - */ |
|
| 296 | + */ |
|
| 297 | 297 | const RECEIVE_NOTIFY_EMAIL = 0x02; |
| 298 | 298 | const RECEIVE_NOTIFY_ALERT = 0x01; |
| 299 | 299 | |
@@ -498,7 +498,7 @@ |
||
| 498 | 498 | log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])])); |
| 499 | 499 | |
| 500 | 500 | $context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set) |
| 501 | - { |
|
| 501 | + { |
|
| 502 | 502 | return $v != $set; |
| 503 | 503 | }); |
| 504 | 504 | } |
@@ -222,7 +222,6 @@ |
||
| 222 | 222 | |
| 223 | 223 | $this->_validLikes['can_like'] = ($this->_user['id'] == $topicOwner ? 'cannot_like_content' : (allowedTo('likes_like') ? true : 'cannot_like_content')); |
| 224 | 224 | } |
| 225 | - |
|
| 226 | 225 | else |
| 227 | 226 | { |
| 228 | 227 | // Modders: This will give you whatever the user offers up in terms of liking, e.g. $this->_type=msg, $this->_content=1 |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | { |
| 20 | 20 | /** |
| 21 | 21 | * Constants for reply types. |
| 22 | - */ |
|
| 22 | + */ |
|
| 23 | 23 | const NOTIFY_TYPE_REPLY_AND_MODIFY = 1; |
| 24 | 24 | const NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING = 2; |
| 25 | 25 | const NOTIFY_TYPE_ONLY_REPLIES = 3; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Constants for frequencies. |
| 30 | - */ |
|
| 30 | + */ |
|
| 31 | 31 | const FREQUENCY_NOTHING = 0; |
| 32 | 32 | const FREQUENCY_EVERYTHING = 1; |
| 33 | 33 | const FREQUENCY_FIRST_UNREAD_MSG = 2; |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | const FREQUENCY_WEEKLY_DIGEST = 4; |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | - * This handles notifications when a new post is created - new topic, reply, quotes and mentions. |
|
| 38 | + * This handles notifications when a new post is created - new topic, reply, quotes and mentions. |
|
| 39 | 39 | * @return bool Always returns true |
| 40 | 40 | */ |
| 41 | 41 | public function execute() |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | // Set a list of common functions. |
| 99 | 99 | $ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);'; |
| 100 | 100 | $ent_check = empty($modSettings['disableEntityCheck']) ? function($string) |
| 101 | - { |
|
| 101 | + { |
|
| 102 | 102 | $string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string); |
| 103 | 103 | return $string; |
| 104 | 104 | } : function($string) |
@@ -2176,7 +2176,6 @@ discard block |
||
| 2176 | 2176 | loadLanguage('index+Modifications'); |
| 2177 | 2177 | $context['template_layers'] = array(); |
| 2178 | 2178 | } |
| 2179 | - |
|
| 2180 | 2179 | else |
| 2181 | 2180 | { |
| 2182 | 2181 | // Custom templates to load, or just default? |
@@ -2555,14 +2554,12 @@ discard block |
||
| 2555 | 2554 | $fileUrl = $settings['default_theme_url'] . '/css/' . $fileName; |
| 2556 | 2555 | $filePath = $settings['default_theme_dir'] . '/css/' . $fileName; |
| 2557 | 2556 | } |
| 2558 | - |
|
| 2559 | 2557 | else |
| 2560 | 2558 | { |
| 2561 | 2559 | $fileUrl = false; |
| 2562 | 2560 | $filePath = false; |
| 2563 | 2561 | } |
| 2564 | 2562 | } |
| 2565 | - |
|
| 2566 | 2563 | else |
| 2567 | 2564 | { |
| 2568 | 2565 | $fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName; |
@@ -2670,14 +2667,12 @@ discard block |
||
| 2670 | 2667 | $fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName; |
| 2671 | 2668 | $filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName; |
| 2672 | 2669 | } |
| 2673 | - |
|
| 2674 | 2670 | else |
| 2675 | 2671 | { |
| 2676 | 2672 | $fileUrl = false; |
| 2677 | 2673 | $filePath = false; |
| 2678 | 2674 | } |
| 2679 | 2675 | } |
| 2680 | - |
|
| 2681 | 2676 | else |
| 2682 | 2677 | { |
| 2683 | 2678 | $fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName; |
@@ -2293,7 +2293,6 @@ |
||
| 2293 | 2293 | list ($hookData['class'], $hookData['method']) = explode('::', $modFunc); |
| 2294 | 2294 | $hookData['pureFunc'] = $hookData['method']; |
| 2295 | 2295 | } |
| 2296 | - |
|
| 2297 | 2296 | else |
| 2298 | 2297 | $hookData['pureFunc'] = $modFunc; |
| 2299 | 2298 | |
@@ -974,7 +974,7 @@ |
||
| 974 | 974 | { |
| 975 | 975 | $row = $smcFunc['db_fetch_assoc']($result); |
| 976 | 976 | if ($row['standard_conforming_strings'] !== 'on') |
| 977 | - { |
|
| 977 | + { |
|
| 978 | 978 | $incontext['continue'] = 0; |
| 979 | 979 | $incontext['error'] = $txt['error_pg_scs']; |
| 980 | 980 | } |