github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 05:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r368

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@368 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2012-02-10 13:24:26 +00:00
commit 1a8d68aa3d
7 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
upload/includes/ucp/usercp_register.php
View file

@ -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');

1
upload/language/lang_english/lang_main.php
View file

@ -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';

1
upload/language/lang_russian/lang_main.php
View file

@ -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'] = 'все темы';

2
upload/templates/admin/index.tpl
View file

@ -88,7 +88,7 @@ table.forumline { margin: 0 auto; }
<tr>
<td><b>{L_ADMIN}:</b></td>
<td>
<a href="../profile.php?mode=register">{L_CREATE_PROFILE}</a>
<a href="../profile.php?mode=register&admin=1">{L_CREATE_PROFILE}</a>
</td>
</tr>
</table>

1
upload/templates/default/usercp_register.tpl
View file

@ -12,6 +12,7 @@ ajax.callback.user_register = function(data){
<form method="post" action="profile.php" class="tokenized" enctype="multipart/form-data">
<input type="hidden" name="mode" value="{MODE}" />
<input type="hidden" name="reg_agreed" value="1" />
<!-- IF NEW_USER --><input type="hidden" name="admin" value="1" /><!-- ENDIF -->
<!-- IF ADM_EDIT -->
<input type="hidden" name="u" value="{PR_USER_ID}" />
<!-- ENDIF -->

2
upload/viewforum.php
View file

@ -133,7 +133,7 @@ if (!$forums = $datastore->get('cat_forums'))
$forums = $datastore->get('cat_forums');
}
if($forums['forum'][$forum_id]['allow_porno_topic']) bb_die('бетатестеры вставте языковые');
if($forums['forum'][$forum_id]['allow_porno_topic'] && bf($userdata['user_opt'], 'user_opt', 'hide_porn_forums')) bb_die($lang['ERROR_PORNO_FORUM']);
if (!$forum_data['forum_parent'] && isset($forums['f'][$forum_id]['subforums']) && $show_subforums)
{

2
upload/viewtopic.php
View file

@ -117,7 +117,7 @@ $forum_topic_data =& $t_data;
$topic_id = $t_data['topic_id'];
$forum_id = $t_data['forum_id'];
if($t_data['allow_porno_topic']) bb_die('бетатестеры вставте языковые');
if($t_data['allow_porno_topic'] && bf($userdata['user_opt'], 'user_opt', 'hide_porn_forums')) bb_die($lang['ERROR_PORNO_FORUM']);
if ($userdata['session_admin'] && !empty($_REQUEST['mod']))
{