github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r385

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@385 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2012-03-12 01:53:14 +00:00
commit 94c89a3291
9 changed files with 75 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

8
upload/admin/admin_disallow.php
View file

@ -37,7 +37,7 @@ if( isset($_POST['add_name']) )
$message = $lang['DISALLOW_SUCCESSFUL']; $message = $lang['DISALLOW_SUCCESSFUL'];
} }
$message .= "<br /><br />" . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], "<a href=\""admin_disallow.php\">", "</a>") . "<br /><br />" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "<a href=\"index.php?pane=right\">", "</a>"); $message .= '<br /><br />'. sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], '<a href="admin_disallow.php">', '</a>') . '<br /><br />'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
message_die(GENERAL_MESSAGE, $message); message_die(GENERAL_MESSAGE, $message);
} }
@ -53,7 +53,7 @@ else if( isset($_POST['delete_name']) )
message_die(GENERAL_ERROR, "Couldn't removed disallowed user.", "",__LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Couldn't removed disallowed user.", "",__LINE__, __FILE__, $sql);
} }
$message .= $lang['DISALLOWED_DELETED'] . "<br /><br />" . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], "<a href=\""admin_disallow.php\">", "</a>") . "<br /><br />" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "<a href=\"index.php?pane=right\">", "</a>"); $message .= $lang['DISALLOWED_DELETED'] .'<br /><br />'. sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], '<a href="admin_disallow.php">', '</a>') .'<br /><br />'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
message_die(GENERAL_MESSAGE, $message); message_die(GENERAL_MESSAGE, $message);
@ -92,8 +92,8 @@ else
$disallow_select .= '</select>'; $disallow_select .= '</select>';
$template->assign_vars(array( $template->assign_vars(array(
"S_DISALLOW_SELECT" => $disallow_select, 'S_DISALLOW_SELECT' => $disallow_select,
"S_FORM_ACTION" => "admin_disallow.php", 'S_FORM_ACTION' => 'admin_disallow.php',
)); ));
print_page('admin_disallow.tpl', 'admin'); print_page('admin_disallow.tpl', 'admin');

70
upload/admin/admin_user_search.php
View file

@ -118,7 +118,7 @@ if(!isset($_POST['dosearch'])&&!isset($_GET['dosearch']))
'STYLE_LIST' => $styles_list, 'STYLE_LIST' => $styles_list,
'LASTVISITED_LIST' => $lastvisited_list, 'LASTVISITED_LIST' => $lastvisited_list,
'S_SEARCH_ACTION' => "admin_user_search.php" 'S_SEARCH_ACTION' => 'admin_user_search.php',
)); ));
} }
else else
@ -314,7 +314,7 @@ else
} }
} }
$base_url = "admin_user_search.php?dosearch=true"; $base_url = 'admin_user_search.php?dosearch=true';
$select_sql = "SELECT u.user_id, u.username, u.user_rank, u.user_email, u.user_posts, u.user_regdate, u.user_level, u.user_active, u.user_lastvisit $select_sql = "SELECT u.user_id, u.username, u.user_rank, u.user_email, u.user_posts, u.user_regdate, u.user_level, u.user_active, u.user_lastvisit
FROM ". BB_USERS ." AS u"; FROM ". BB_USERS ." AS u";
@ -347,7 +347,7 @@ else
switch($mode) switch($mode)
{ {
case 'search_username': case 'search_username':
$base_url .= "&search_username=true&username=".rawurlencode(stripslashes($username)); $base_url .= '&search_username=true&username='.rawurlencode(stripslashes($username));
$text = sprintf($lang['SEARCH_FOR_USERNAME'], strip_tags(htmlspecialchars(stripslashes($username)))); $text = sprintf($lang['SEARCH_FOR_USERNAME'], strip_tags(htmlspecialchars(stripslashes($username))));
@ -396,7 +396,7 @@ else
} }
break; break;
case 'search_email': case 'search_email':
$base_url .= "&search_email=true&email=".rawurlencode(stripslashes($email)); $base_url .= '&search_email=true&email='.rawurlencode(stripslashes($email));
$text = sprintf($lang['SEARCH_FOR_EMAIL'], strip_tags(htmlspecialchars(stripslashes($email)))); $text = sprintf($lang['SEARCH_FOR_EMAIL'], strip_tags(htmlspecialchars(stripslashes($email))));
@ -445,7 +445,7 @@ else
} }
break; break;
case 'search_ip': case 'search_ip':
$base_url .= "&search_ip=true&ip_address=".rawurlencode(stripslashes($ip_address)); $base_url .= '&search_ip=true&ip_address='.rawurlencode(stripslashes($ip_address));
// Remove any whitespace // Remove any whitespace
$ip_address = trim($ip_address); $ip_address = trim($ip_address);
@ -525,10 +525,7 @@ else
message_die(GENERAL_MESSAGE, $lang['SEARCH_INVALID_IP']); message_die(GENERAL_MESSAGE, $lang['SEARCH_INVALID_IP']);
} }
$ip_in_sql = ''; $ip_in_sql = $ip_like_sql = $ip_like_sql_flylast = $ip_like_sql_flyreg = '';
$ip_like_sql = '';
$ip_like_sql_flylast = '';
$ip_like_sql_flyreg = '';
foreach($users as $address) foreach($users as $address)
{ {
@ -658,7 +655,7 @@ else
break; break;
case 'search_joindate': case 'search_joindate':
$base_url .= "&search_joindate=true&date_type=".rawurlencode($date_type)."&date_day=".rawurlencode($date_day)."&date_month=".rawurlencode($date_month)."&date_year=".rawurlencode(stripslashes($date_year)); $base_url .= '&search_joindate=true&date_type='. rawurlencode($date_type) .'&date_day='. rawurlencode($date_day) .'&date_month='. rawurlencode($date_month) .'&date_year='. rawurlencode(stripslashes($date_year));
$date_type = trim(strtolower($date_type)); $date_type = trim(strtolower($date_type));
@ -713,7 +710,7 @@ else
case 'search_group': case 'search_group':
$group_id = intval($group_id); $group_id = intval($group_id);
$base_url .= "&search_group=true&group_id=".rawurlencode($group_id); $base_url .= '&search_group=true&group_id='. rawurlencode($group_id);
if(!$group_id) if(!$group_id)
{ {
@ -754,7 +751,7 @@ else
case 'search_rank': case 'search_rank':
$rank_id = intval($rank_id); $rank_id = intval($rank_id);
$base_url .= "&search_rank=true&rank_id=".rawurlencode($rank_id); $base_url .= '&search_rank=true&rank_id='. rawurlencode($rank_id);
if(!$rank_id) if(!$rank_id)
{ {
@ -793,7 +790,7 @@ else
$postcount_type = trim(strtolower($postcount_type)); $postcount_type = trim(strtolower($postcount_type));
$postcount_value = trim(strtolower($postcount_value)); $postcount_value = trim(strtolower($postcount_value));
$base_url .= "&search_postcount=true&postcount_type=".rawurlencode($postcount_type)."&postcount_value=".rawurlencode(stripslashes($postcount_value)); $base_url .= '&search_postcount=true&postcount_type='. rawurlencode($postcount_type) .'&postcount_value='. rawurlencode(stripslashes($postcount_value));
switch($postcount_type) switch($postcount_type)
{ {
@ -870,7 +867,7 @@ else
break; break;
case 'search_userfield': case 'search_userfield':
$base_url .= "&search_userfield=true&userfield_type=".rawurlencode($userfield_type)."&userfield_value=".rawurlencode(stripslashes($userfield_value)); $base_url .= '&search_userfield=true&userfield_type='. rawurlencode($userfield_type) .'&userfield_value='. rawurlencode(stripslashes($userfield_value));
$text = strip_tags(htmlspecialchars(stripslashes($userfield_value))); $text = strip_tags(htmlspecialchars(stripslashes($userfield_value)));
@ -951,7 +948,7 @@ else
$lastvisited_type = trim(strtolower($lastvisited_type)); $lastvisited_type = trim(strtolower($lastvisited_type));
$lastvisited_days = intval($lastvisited_days); $lastvisited_days = intval($lastvisited_days);
$base_url .= "&search_lastvisited=true&lastvisited_type=".rawurlencode(stripslashes($lastvisited_type))."&lastvisited_days=".rawurlencode($lastvisited_days); $base_url .= '&search_lastvisited=true&lastvisited_type='. rawurlencode(stripslashes($lastvisited_type)) .'&lastvisited_days='. rawurlencode($lastvisited_days);
$lastvisited_seconds = ( TIMENOW - ( ( ( $lastvisited_days * 24 ) * 60 ) * 60 ) ); $lastvisited_seconds = ( TIMENOW - ( ( ( $lastvisited_days * 24 ) * 60 ) * 60 ) );
@ -986,7 +983,7 @@ else
break; break;
case 'search_language': case 'search_language':
$base_url .= "&search_language=true&language_type=".rawurlencode(stripslashes($language_type)); $base_url .= '&search_language=true&language_type='. rawurlencode(stripslashes($language_type));
$language_type = trim(strtolower(stripslashes($language_type))); $language_type = trim(strtolower(stripslashes($language_type)));
@ -1007,7 +1004,7 @@ else
break; break;
case 'search_timezone': case 'search_timezone':
$base_url .= "&search_timezone=true&timezone_type=".rawurlencode(stripslashes($timezone_type)); $base_url .= '&search_timezone=true&timezone_type='. rawurlencode(stripslashes($timezone_type));
$text = sprintf($lang['SEARCH_FOR_TIMEZONE'], strip_tags(htmlspecialchars(stripslashes($timezone_type)))); $text = sprintf($lang['SEARCH_FOR_TIMEZONE'], strip_tags(htmlspecialchars(stripslashes($timezone_type))));
$timezone_type = intval($timezone_type); $timezone_type = intval($timezone_type);
@ -1025,7 +1022,7 @@ else
message_die(GENERAL_MESSAGE, 'Disabled'); message_die(GENERAL_MESSAGE, 'Disabled');
break; break;
case 'search_moderators': case 'search_moderators':
$base_url .= "&search_moderators=true&moderators_forum=".rawurlencode(stripslashes($moderators_forum)); $base_url .= '&search_moderators=true&moderators_forum='. rawurlencode(stripslashes($moderators_forum));
$moderators_forum = intval($moderators_forum); $moderators_forum = intval($moderators_forum);
$sql = "SELECT forum_name $sql = "SELECT forum_name
@ -1069,7 +1066,7 @@ else
default: default:
$misc = trim(strtolower($misc)); $misc = trim(strtolower($misc));
$base_url .= "&search_misc=true&misc=".rawurlencode(stripslashes($misc)); $base_url .= '&search_misc=true&misc='. rawurlencode(stripslashes($misc));
switch($misc) switch($misc)
{ {
@ -1149,40 +1146,40 @@ else
case 'regdate': case 'regdate':
$sort = 'regdate'; $sort = 'regdate';
$select_sql .= "u.user_regdate"; $select_sql .= 'u.user_regdate';
break; break;
case 'posts': case 'posts':
$sort = 'posts'; $sort = 'posts';
$select_sql .= "u.user_posts"; $select_sql .= 'u.user_posts';
break; break;
case 'user_email': case 'user_email':
$sort = 'user_email'; $sort = 'user_email';
$select_sql .= "u.user_email"; $select_sql .= 'u.user_email';
break; break;
case 'lastvisit': case 'lastvisit':
$sort = 'lastvisit'; $sort = 'lastvisit';
$select_sql .= "u.user_lastvisit"; $select_sql .= 'u.user_lastvisit';
break; break;
case 'username': case 'username':
default: default:
$sort = 'username'; $sort = 'username';
$select_sql .= "u.username"; $select_sql .= 'u.username';
} }
switch(@$_GET['order']) switch(@$_GET['order'])
{ {
case 'DESC': case 'DESC':
$order = "DESC"; $order = 'DESC';
$o_order = "ASC"; $o_order = 'ASC';
break; break;
case 'DESC': case 'DESC':
default: default:
$o_order = "DESC"; $o_order = 'DESC';
$order = "ASC"; $order = 'ASC';
} }
$select_sql .= " $order"; $select_sql .= " $order";
@ -1227,17 +1224,12 @@ else
if($page > 1) if($page > 1)
{ {
$pagination .= '<a href="'.("$base_url&sort=$sort&order=$order&page=".($page - 1)).'">'.$lang['PREVIOUS'].'</a>'; $pagination .= '<a href="'.$base_url.'&sort='.$sort.'&order='.$order.'&page='.($page - 1).'">'. $lang['PREVIOUS'] .'</a>';
} }
if($page < $num_pages) if($page < $num_pages)
{ {
$pagination .= ( $pagination == '' ) ? '<a href="'.("$base_url&sort=$sort&order=$order&page=".($page + 1)).'">'.$lang['NEXT'].'</a>' : ' | <a href="'.("$base_url&sort=$sort&order=$order&page=".($page + 1)).'">'.$lang['NEXT'].'</a>'; $pagination .= ( $pagination == '' ) ? '<a href="'.$base_url.'&sort='.$sort.'&order='.$order.'&page='. ($page + 1) .'">'.$lang['NEXT'].'</a>' : ' | <a href="'.$base_url.'&sort='.$sort.'&order='.$order.'&page='. ($page + 1) .'">'.$lang['NEXT'].'</a>';
}
if($num_pages > 2)
{
$pagination .= '&nbsp;&nbsp;<input type="text" name="page" maxlength="5" size="2" class="post" />&nbsp;<input type="submit" name="submit" value="'.$lang['GO'].'" class="post" />';
} }
$template->assign_vars(array( $template->assign_vars(array(
@ -1245,13 +1237,13 @@ else
'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], $page, $num_pages), 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], $page, $num_pages),
'PAGINATION' => $pagination, 'PAGINATION' => $pagination,
'NEW_SEARCH' => sprintf($lang['SEARCH_USERS_NEW'],$text, $total_pages['total'], "admin_user_search.php"), 'NEW_SEARCH' => sprintf($lang['SEARCH_USERS_NEW'],$text, $total_pages['total'], 'admin_user_search.php'),
'U_USERNAME' => ($sort == 'username') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=username&order=$order", 'U_USERNAME' => ($sort == 'username') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=username&order=$order",
'U_EMAIL' => ($sort == 'user_email') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=user_email&order=$order", 'U_EMAIL' => ($sort == 'user_email') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=user_email&order=$order",
'U_POSTS' => ($sort == 'posts') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=posts&order=$order", 'U_POSTS' => ($sort == 'posts') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=posts&order=$order",
'U_JOINDATE' => ($sort == 'regdate') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=regdate&order=$order", 'U_JOINDATE' => ($sort == 'regdate') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=regdate&order=$order",
'U_LASTVISIT' => ($sort == 'lastvisit') ? "$base_url&sort=$sort&order=$o_order") : "$base_url&sort=lastvisit&order=$order", 'U_LASTVISIT' => ($sort == 'lastvisit') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=lastvisit&order=$order",
'S_POST_ACTION' => "$base_url&sort=$sort&order=$order" 'S_POST_ACTION' => "$base_url&sort=$sort&order=$order"
)); ));
@ -1303,8 +1295,8 @@ else
'ABLED' => ( ( $rowset[$i]['user_active'] ) ? $lang['ENABLED'] : $lang['DISABLED'] ), 'ABLED' => ( ( $rowset[$i]['user_active'] ) ? $lang['ENABLED'] : $lang['DISABLED'] ),
'U_VIEWPOSTS' => "../search.php?search_author=1&amp;uid={$rowset[$i]['user_id']}", 'U_VIEWPOSTS' => "../search.php?search_author=1&amp;uid={$rowset[$i]['user_id']}",
'U_MANAGE' => "../profile.php?mode=editprofile&".POST_USERS_URL."=".$rowset[$i]['user_id'], 'U_MANAGE' => '../profile.php?mode=editprofile&'. POST_USERS_URL .'='.$rowset[$i]['user_id'],
'U_PERMISSIONS' => "admin_ug_auth.php?mode=user&".POST_USERS_URL."=".$rowset[$i]['user_id'], 'U_PERMISSIONS' => 'admin_ug_auth.php?mode=user&'. POST_USERS_URL .'='. $rowset[$i]['user_id'],
)); ));
} }
} }

6
upload/config.php
View file

@ -52,8 +52,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.4 (beta)'; $bb_cfg['tp_version'] = '2.4 (beta)';
$bb_cfg['tp_release_state'] = 'R384'; $bb_cfg['tp_release_state'] = 'R385';
$bb_cfg['tp_release_date'] = '11-03-2012'; $bb_cfg['tp_release_date'] = '12-03-2012';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';
@ -279,7 +279,7 @@ $bb_cfg['topic_tpl']['overall_header'] = TEMPLATES_DIR .'topic_tpl_overall_heade
$bb_cfg['topic_tpl']['rules_video'] = TEMPLATES_DIR .'topic_tpl_rules_video.html'; $bb_cfg['topic_tpl']['rules_video'] = TEMPLATES_DIR .'topic_tpl_rules_video.html';
// Cookie // Cookie
$bb_cfg['cookie_domain'] = (empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : ''; # '.yourdomain.com' $bb_cfg['cookie_domain'] = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : ''; # '.yourdomain.com'
$bb_cfg['cookie_path'] = '/'; # '/forum/' $bb_cfg['cookie_path'] = '/'; # '/forum/'
$bb_cfg['cookie_secure'] = (!empty($_SERVER['HTTPS']) ? 1 : 0); # 0 $bb_cfg['cookie_secure'] = (!empty($_SERVER['HTTPS']) ? 1 : 0); # 0
$bb_cfg['cookie_prefix'] = 'bb_'; # 'bb_' $bb_cfg['cookie_prefix'] = 'bb_'; # 'bb_'

2
upload/includes/report_hack/report_post.php
View file

@ -164,7 +164,7 @@ class report_post extends report_module
function subject_url($report_subject, $non_html_amp = false) function subject_url($report_subject, $non_html_amp = false)
{ {
$report_subject = (int) $report_subject; $report_subject = (int) $report_subject;
return "viewtopic.php?" . POST_POST_URL . "=$report_subject#$report_subject", $non_html_amp; return 'viewtopic.php?'. POST_POST_URL .'='. $report_subject .'#'. $report_subject . $non_html_amp;
} }
// //

2
upload/includes/report_hack/report_privmsg.php
View file

@ -163,7 +163,7 @@ class report_privmsg extends report_module
function subject_url($report_subject, $non_html_amp = false) function subject_url($report_subject, $non_html_amp = false)
{ {
$sep = ($non_html_amp) ? '&' : '&amp;'; $sep = ($non_html_amp) ? '&' : '&amp;';
return "privmsg.php?mode=read$sep" . POST_POST_URL . '=' . (int) $report_subject, $non_html_amp; return 'privmsg.php?mode=read'.$sep . POST_POST_URL . '=' . (int) $report_subject . $non_html_amp;
} }
// //

2
upload/includes/report_hack/report_topic.php
View file

@ -163,7 +163,7 @@ class report_topic extends report_module
// //
function subject_url($report_subject, $non_html_amp = false) function subject_url($report_subject, $non_html_amp = false)
{ {
return "viewtopic.php?" . POST_TOPIC_URL . '=' . (int) $report_subject, $non_html_amp; return 'viewtopic.php?'. POST_TOPIC_URL .'='. (int) $report_subject . $non_html_amp;
} }
// //

2
upload/includes/report_hack/report_user.php
View file

@ -21,7 +21,7 @@ class report_user extends report_module
function subject_url($id, $non_html_amp = false) function subject_url($id, $non_html_amp = false)
{ {
$sep = ($non_html_amp) ? '&' : '&amp;'; $sep = ($non_html_amp) ? '&' : '&amp;';
return "profile.php?mode=viewprofile$sep" . POST_USERS_URL . '=' . (int) $id, $non_html_amp; return 'profile.php?mode=viewprofile'. $sep. POST_USERS_URL .'=' . (int) $id . $non_html_amp;
} }
// //

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

@ -2,8 +2,6 @@
if (!defined('BB_ROOT')) die(basename(__FILE__)); if (!defined('BB_ROOT')) die(basename(__FILE__));
$template->set_filenames(array('body' => 'usercp_register.tpl'));
array_deep($_POST, 'trim'); array_deep($_POST, 'trim');
set_die_append_msg(); set_die_append_msg();
@ -142,6 +140,7 @@ switch ($mode)
$sql = " $sql = "
SELECT SELECT
user_id, user_id,
user_rank,
user_level, user_level,
user_avatar, user_avatar,
$profile_fields_sql $profile_fields_sql
@ -486,7 +485,7 @@ foreach ($profile_fields as $field => $can_edit)
{ {
$sig = prepare_message($sig); $sig = prepare_message($sig);
if (mb_strlen($sig, "UTF-8") > $bb_cfg['max_sig_chars']) if (mb_strlen($sig, 'UTF-8') > $bb_cfg['max_sig_chars'])
{ {
$errors[] = $lang['SIGNATURE_TOO_LONG']; $errors[] = $lang['SIGNATURE_TOO_LONG'];
} }
@ -605,19 +604,19 @@ foreach ($profile_fields as $field => $can_edit)
$s_colspan = 0; $s_colspan = 0;
for($i = 0; $i < @count($avatar_images[$category]); $i++) for($i = 0; $i < @count($avatar_images[$category]); $i++)
{ {
$template->assign_block_vars("avatar_row", array()); $template->assign_block_vars('avatar_row', array());
$s_colspan = max($s_colspan, count($avatar_images[$category][$i])); $s_colspan = max($s_colspan, count($avatar_images[$category][$i]));
for($j = 0; $j < count($avatar_images[$category][$i]); $j++) for($j = 0; $j < count($avatar_images[$category][$i]); $j++)
{ {
$template->assign_block_vars('avatar_row.avatar_column', array( $template->assign_block_vars('avatar_row.avatar_column', array(
"AVATAR_IMAGE" => $bb_cfg['avatar_gallery_path'] . '/' . $category . '/' . $avatar_images[$category][$i][$j], 'AVATAR_IMAGE' => $bb_cfg['avatar_gallery_path'] . '/' . $category . '/' . $avatar_images[$category][$i][$j],
"AVATAR_NAME" => $avatar_name[$category][$i][$j]) 'AVATAR_NAME' => $avatar_name[$category][$i][$j])
); );
$template->assign_block_vars('avatar_row.avatar_option_column', array( $template->assign_block_vars('avatar_row.avatar_option_column', array(
"S_OPTIONS_AVATAR" => $avatar_images[$category][$i][$j]) 'S_OPTIONS_AVATAR' => $avatar_images[$category][$i][$j])
); );
} }
} }
@ -627,7 +626,7 @@ foreach ($profile_fields as $field => $can_edit)
$template->assign_vars(array( $template->assign_vars(array(
'S_CATEGORY_SELECT' => $s_categories, 'S_CATEGORY_SELECT' => $s_categories,
'S_COLSPAN' => $s_colspan, 'S_COLSPAN' => $s_colspan,
'S_PROFILE_ACTION' => "profile.php?mode=$mode", 'S_PROFILE_ACTION' => 'profile.php?mode='. $mode,
'S_HIDDEN_FIELDS' => $s_hidden_vars) 'S_HIDDEN_FIELDS' => $s_hidden_vars)
); );
@ -777,6 +776,7 @@ if ($submit && !$errors)
if (IS_ADMIN) if (IS_ADMIN)
{ {
set_pr_die_append_msg($new_user_id);
$message = $lang['ACCOUNT_ADDED']; $message = $lang['ACCOUNT_ADDED'];
} }
else else
@ -826,7 +826,7 @@ if ($submit && !$errors)
$emailer->replyto($bb_cfg['board_email']); $emailer->replyto($bb_cfg['board_email']);
$emailer->email_address($email); $emailer->email_address($email);
$emailer->use_template("admin_activate", $user_lang); $emailer->use_template('admin_activate', $user_lang);
$emailer->set_subject($lang['NEW_ACCOUNT_SUBJECT']); $emailer->set_subject($lang['NEW_ACCOUNT_SUBJECT']);
$emailer->assign_vars(array( $emailer->assign_vars(array(
@ -840,8 +840,6 @@ if ($submit && !$errors)
} }
} }
$message = $message . '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'], '<a href="index.php">', '</a>');
bb_die($message); bb_die($message);
} }
/** /**
@ -849,6 +847,7 @@ if ($submit && !$errors)
*/ */
else else
{ {
set_pr_die_append_msg($pr_data['user_id']);
// если что-то было изменено // если что-то было изменено
if ($db_data) if ($db_data)
{ {
@ -866,7 +865,7 @@ if ($submit && !$errors)
if($bb_cfg['require_activation'] == USER_ACTIVATION_ADMIN) if($bb_cfg['require_activation'] == USER_ACTIVATION_ADMIN)
{ {
$emailer->use_template("admin_activate", $pr_data['user_lang']); $emailer->use_template('admin_activate', $pr_data['user_lang']);
} }
else else
{ {
@ -885,13 +884,13 @@ if ($submit && !$errors)
$emailer->send(); $emailer->send();
$emailer->reset(); $emailer->reset();
$message = $lang['PROFILE_UPDATED_INACTIVE'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'], '<a href="index.php">', '</a>'); $message = $lang['PROFILE_UPDATED_INACTIVE'];
$user->session_end(); $user->session_end();
} }
else else
{ {
meta_refresh("index.php", 10); meta_refresh('index.php' , 10);
$message = $lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'], '<a href="index.php">', '</a>'); $message = $lang['PROFILE_UPDATED'];
} }
$sql_args = DB()->build_array('UPDATE', $db_data); $sql_args = DB()->build_array('UPDATE', $db_data);
@ -914,12 +913,12 @@ if ($submit && !$errors)
} }
elseif(!$pr_data['user_active']) elseif(!$pr_data['user_active'])
{ {
bb_die($lang['PROFILE_UPDATED_INACTIVE'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'], '<a href="index.php">', '</a>')); bb_die($lang['PROFILE_UPDATED_INACTIVE']);
} }
else else
{ {
meta_refresh("index.php", 10); meta_refresh('index.php' , 10);
bb_die($lang['PROFILE_UPDATED'] . '<br /><br /><a href="' . PROFILE_URL . $userdata['user_id'] . '">'.$lang['RETURN_PROFILE'].'</a><br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'], '<a href="index.php">', '</a>')); bb_die($lang['PROFILE_UPDATED']);
} }
} }
else else
@ -955,8 +954,20 @@ $template->assign_vars(array(
)); ));
require(PAGE_HEADER); print_page('usercp_register.tpl');
$template->pparse('body'); // ----------------------------------------------------------- //
// Functions
//
function set_pr_die_append_msg ($pr_uid)
{
global $lang, $template;
require(PAGE_FOOTER); $template->assign_var('BB_DIE_APPEND_MSG', '
<a href="'. PROFILE_URL . $pr_uid .'" onclick="return post2url(this.href, {after_edit: 1});">Перейти к просмотру профиля</a>
<br /><br />
<a href="profile.php?mode=editprofile'. (IS_ADMIN ? "&amp;u=$pr_uid" : '') .'" onclick="return post2url(this.href, {after_edit: 1});">Вернуться к редактированию</a>
<br /><br />
<a href="index.php">Вернуться на главную страницу</a>
');
}

3
upload/language/lang_russian/lang_admin.php
View file

@ -672,6 +672,5 @@ $lang['SEED_BONUS'] = 'Сид Бонус';
$lang['SEED_BONUS_ADD'] = '<h4>Добавление сид бонуса</h4><h6>Кол-во раздаваемых раздач пользователем и размер начисления бонусов за них (начисления раз в час)</h6>'; $lang['SEED_BONUS_ADD'] = '<h4>Добавление сид бонуса</h4><h6>Кол-во раздаваемых раздач пользователем и размер начисления бонусов за них (начисления раз в час)</h6>';
$lang['SEED_BONUS_RELEASE'] = 'до N-числа релизов'; $lang['SEED_BONUS_RELEASE'] = 'до N-числа релизов';
$lang['SEED_BONUS_POINTS'] = 'бонусов в час'; $lang['SEED_BONUS_POINTS'] = 'бонусов в час';
$lang['SEED_BONUS_TOR_SIZE'] = '<h4>Минимальный размер раздачи, за который будут начисляться бонусы</h4><h6>Если хотите начислять бонусы за все раздачи, оставте поле пустым.</h6>'; $lang['SEED_BONUS_TOR_SIZE'] = '<h4>Минимальный размер раздачи, за который будут начисляться бонусы</h4><h6>Если хотите начислять бонусы за все раздачи, оставьте поле пустым.</h6>';
$lang['SEED_BONUS_USER_REGDATA'] = '<h4>Минимальный стаж пользователя на трекере, после которого будут начисляться бонусы</h4><h6>Если хотите начислять бонусы всем пользователям, оставте поле пустым.</h6>'; $lang['SEED_BONUS_USER_REGDATA'] = '<h4>Минимальный стаж пользователя на трекере, после которого будут начисляться бонусы</h4><h6>Если хотите начислять бонусы всем пользователям, оставте поле пустым.</h6>';