diff --git a/Code/Lib/ThreadItem.php b/Code/Lib/ThreadItem.php index e3e8df1e6..1eed3652a 100644 --- a/Code/Lib/ThreadItem.php +++ b/Code/Lib/ThreadItem.php @@ -500,7 +500,7 @@ class ThreadItem 'submid' => str_replace(['+','='], ['',''], base64_encode(urlencode($item['mid']))), 'thread_level' => $thread_level, 'indentpx' => intval(get_pconfig(local_channel(), 'system', 'thread_indent_px', get_config('system', 'thread_indent_px', 0))), - 'thread_max' => intval(get_config('system', 'thread_maxlevel', 20)) + 1 + 'thread_max' => intval(get_config('system', 'thread_maxlevel', 80)) + 1 ]; $arr = ['item' => $item, 'output' => $tmp_item]; diff --git a/Code/Module/Register.php b/Code/Module/Register.php index 3d3bfd2bd..a6b9cd575 100644 --- a/Code/Module/Register.php +++ b/Code/Module/Register.php @@ -51,7 +51,7 @@ class Register extends Controller public function post() { - // security token is session_id() based and we have a transient session, so we can't use it here. + // security token is session_id() based, and we have a transient session, so we can't use it here. //check_form_security_token_redirectOnErr('/register', 'register'); $max_dailies = intval(get_config('system', 'max_daily_registrations')); @@ -272,13 +272,13 @@ class Register extends Controller $password2 = ['password2', t('Please re-enter your password'), '', '', '', ' required ']; $invite_code = ['invite_code', t('Please enter your invitation code'), ((x($_REQUEST, 'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "")]; $name = ['name', t('Your Name'), ((x($_REQUEST, 'name')) ? $_REQUEST['name'] : ''), t('Real names are preferred.')]; - $nickhub = '@' . str_replace(array('http://', 'https://', '/'), '', get_config('system', 'baseurl')); + $nickhub = '@' . str_replace(['http://', 'https://', '/'], '', get_config('system', 'baseurl')); $nickname = ['nickname', t('Choose a short nickname'), ((x($_REQUEST, 'nickname')) ? $_REQUEST['nickname'] : ''), sprintf(t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub)]; - $role = ['permissions_role', t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role for your usage needs and privacy requirements.'), $perm_roles]; + $role = ['permissions_role', t('Channel role and privacy'), ($privacy_role) ?: 'social', t('Select a channel permission role for your usage needs and privacy requirements.'), $perm_roles]; $tos = ['tos', $label_tos, '', '', [t('no'), t('yes')], ' required ']; - $auto_create = (get_config('system', 'auto_channel_create') ? true : false); + $auto_create = (bool)get_config('system', 'auto_channel_create'); $default_role = get_config('system', 'default_permissions_role'); $email_verify = get_config('system', 'verify_email'); @@ -288,7 +288,7 @@ class Register extends Controller '$title' => t('Registration'), '$reg_is' => $registration_is, '$registertext' => bbcode(get_config('system', 'register_text')), - '$other_sites' => (($other_sites) ? t('Show affiliated sites - some of which may allow registration.') : EMPTY_STR), + '$other_sites' => (($other_sites) ? t('Show affiliated sites - some of which may allow registration.') : EMPTY_STR), '$invitations' => $invitations, '$invite_code' => $invite_code, '$auto_create' => $auto_create, diff --git a/include/conversation.php b/include/conversation.php index 934905df6..5ecf224fb 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1421,7 +1421,7 @@ function get_item_children($arr, $parent) } $thread_allow = get_config('system', 'thread_allow', true); - $thread_max = intval(get_config('system', 'thread_maxlevel', 20)); + $thread_max = intval(get_config('system', 'thread_maxlevel', 80)); foreach ($arr as $item) { if (intval($item['id']) !== intval($item['parent'])) {