diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index 746d7cfbe..3f36a104a 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -206,7 +206,7 @@ foreach ($profile_fields as $field => $can_edit) $db_data['user_active'] = $active; } break; - + /** * Имя (edit, reg) */ @@ -215,7 +215,8 @@ foreach ($profile_fields as $field => $can_edit) if ($submit) { - if (!$errors AND $err = validate_username($username) && $mode == 'register') + $err = validate_username($username); + if (!$errors AND $err && $mode == 'register') { $errors[] = $err; } @@ -962,6 +963,12 @@ if ($mode == 'editprofile' && $userdata['session_logged_in']) } //bt end +$new_user = (int) request_var('admin', ''); +if($new_user && IS_ADMIN) $gen_simple_header = true; +$template->assign_vars(array( + 'NEW_USER' => $new_user, +)); + require(PAGE_HEADER); $template->pparse('body'); diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 320cc43fe..36b596eb9 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -205,6 +205,7 @@ $lang['VIEW_FORUM'] = 'View Forum'; $lang['FORUM_NOT_EXIST'] = 'The forum you selected does not exist.'; $lang['REACHED_ON_ERROR'] = 'You have reached this page in error.'; +$lang['ERROR_PORNO_FORUM'] = 'This porno-forum is hidden in your profile'; $lang['DISPLAY_TOPICS'] = 'Display topics from previous'; $lang['ALL_TOPICS'] = 'All Topics'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 25a19be1c..7d464198b 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -207,6 +207,7 @@ $lang['VIEW_FORUM'] = 'Просмотр форума'; $lang['FORUM_NOT_EXIST'] = 'Форума, который вы выбрали, не существует'; $lang['REACHED_ON_ERROR'] = 'Вы попали на эту страницу из-за ошибки'; +$lang['ERROR_PORNO_FORUM'] = 'Данный porno-форум скрыт вами в профиле'; $lang['DISPLAY_TOPICS'] = 'Показать'; $lang['ALL_TOPICS'] = 'все темы'; diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl index 848cd62f4..193ee6122 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/templates/admin/index.tpl @@ -88,7 +88,7 @@ table.forumline { margin: 0 auto; }