diff --git a/upload/admin/admin_ranks.php b/upload/admin/admin_ranks.php index 92f854ffd..938582e2c 100644 --- a/upload/admin/admin_ranks.php +++ b/upload/admin/admin_ranks.php @@ -7,9 +7,6 @@ if (!empty($setmodules)) return; } -function update_ranks () { $GLOBALS['datastore']->update('ranks'); } -register_shutdown_function('update_ranks'); - require('./pagestart.php'); // ACP Header - END @@ -164,6 +161,8 @@ if($mode != "") $message .= "

" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $datastore->update('ranks'); + message_die(GENERAL_MESSAGE, $message); } @@ -203,6 +202,8 @@ if($mode != "") $message = $lang['RANK_REMOVED'] . "

" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $datastore->update('ranks'); + message_die(GENERAL_MESSAGE, $message); } diff --git a/upload/config.php b/upload/config.php index 11b3b98b3..312b9f79f 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Beta'; -$bb_cfg['tp_release_state'] = 'R229'; -$bb_cfg['tp_release_date'] = '17-08-2011'; +$bb_cfg['tp_release_state'] = 'R232'; +$bb_cfg['tp_release_date'] = '21-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; diff --git a/upload/groupcp.php b/upload/groupcp.php index 9a9bcba13..79c75db78 100644 --- a/upload/groupcp.php +++ b/upload/groupcp.php @@ -19,7 +19,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$ $joined = bb_date($row['user_regdate'], $lang['DATE_FORMAT']); $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; $pm = ($bb_cfg['text_buttons']) ? ''. $lang['SEND_PM_TXTB'] .'' : '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; - + if (bf($row['user_opt'], 'user_opt', 'viewemail') || $group_mod) { $email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&". POST_USERS_URL ."=".$row['user_id']) : 'mailto:'. $row['user_email']; @@ -419,7 +419,7 @@ else // Members $count_members = DB()->fetch_rowset(" - SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending + SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u WHERE ug.group_id = $group_id AND ug.user_pending = 0 @@ -434,7 +434,7 @@ else // Members $group_members = DB()->fetch_rowset(" - SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending + SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, ug.user_pending FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u WHERE ug.group_id = $group_id AND ug.user_pending = 0 @@ -451,7 +451,7 @@ else if ($is_moderator) { $modgroup_pending_list = DB()->fetch_rowset(" - SELECT u.username, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email + SELECT u.username, u.user_rank, u.user_id, u.user_opt, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email FROM ". BB_USER_GROUP ." ug, ". BB_USERS ." u WHERE ug.group_id = $group_id AND ug.user_pending = 1 @@ -552,14 +552,13 @@ else 'GROUP_NAME' => htmlCHR($group_info['group_name']), 'GROUP_DESCRIPTION' => $group_info['group_description'], 'GROUP_DETAILS' => $group_details, - 'MOD_USERNAME' => $username, + 'MOD_USER' => profile_url($group_moderator), 'MOD_FROM' => $from, 'MOD_JOINED' => $joined, 'MOD_POSTS' => $posts, 'MOD_PM' => $pm, 'MOD_EMAIL' => $email, 'MOD_WWW' => $www, - 'U_MOD_VIEWPROFILE' => "profile.php?mode=viewprofile&" . POST_USERS_URL . "=$user_id", 'U_SEARCH_USER' => "search.php?mode=searchuser", 'GROUP_TYPE' => $group_type, 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, @@ -577,7 +576,6 @@ else // Dump out the remaining users foreach ($group_members as $i => $member) { - $username = $member['username']; $user_id = $member['user_id']; generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www); @@ -589,7 +587,7 @@ else $template->assign_block_vars('member', array( 'ROW_NUMBER' => $i + ( $start + 1 ), 'ROW_CLASS' => $row_class, - 'USERNAME' => $username, + 'USER' => profile_url($member), 'FROM' => $from, 'JOINED' => $joined, 'POSTS' => $posts, @@ -597,7 +595,6 @@ else 'PM' => $pm, 'EMAIL' => $email, 'WWW' => $www, - 'U_VIEWPROFILE' => "profile.php?mode=viewprofile&" . POST_USERS_URL . "=$user_id", )); if ($is_moderator) @@ -627,7 +624,6 @@ else { foreach ($modgroup_pending_list as $i => $member) { - $username = $member['username']; $user_id = $member['user_id']; generate_user_info($member, $bb_cfg['default_dateformat'], $is_moderator, $from, $posts, $joined, $pm, $email, $www); @@ -638,14 +634,13 @@ else $template->assign_block_vars('pending', array( 'ROW_CLASS' => $row_class, - 'USERNAME' => $username, + 'USER' => profile_url($member), 'FROM' => $from, 'JOINED' => $joined, 'POSTS' => $posts, 'USER_ID' => $user_id, 'PM' => $pm, 'EMAIL' => $email, - 'U_VIEWPROFILE' => "profile.php?mode=viewprofile&". POST_USERS_URL ."=$user_id", )); } diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 72ea794ab..f492e141c 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -2803,27 +2803,29 @@ function profile_url($data) { global $bb_cfg, $lang, $datastore; - if (!$ranks = $datastore->get('ranks')) + if (!$ranks = $datastore->get('ranks')) { $datastore->update('ranks'); $ranks = $datastore->get('ranks'); } - if(isset($ranks[$data['user_rank']])) - { $title = $ranks[$data['user_rank']]['rank_title']; $style = $ranks[$data['user_rank']]['rank_style']; - } - if(empty($title)) $title = 'User'; - if(empty($style)) $style = 'colorUser'; + $user_rank = !empty($data['user_rank']) ? $data['user_rank'] : 0; - $username = !empty($data['username']) ? $data['username'] : $lang['GUEST']; - $user_id = (!empty($data['user_id']) && $username != $lang['GUEST']) ? $data['user_id'] : ANONYMOUS; + if(isset($ranks[$user_rank])) + { $title = $ranks[$user_rank]['rank_title']; $style = $ranks[$user_rank]['rank_style']; + } + if(empty($title)) $title = 'User'; + if(empty($style)) $style = 'colorUser'; + + $username = !empty($data['username']) ? $data['username'] : $lang['GUEST']; + $user_id = (!empty($data['user_id']) && $username != $lang['GUEST']) ? $data['user_id'] : ANONYMOUS; $profile = ''. $username .''; - if(!in_array($user_id, array('', ANONYMOUS, BOT_UID)) && $username) - { - $profile = ''. $profile .''; - } + if(!in_array($user_id, array('', ANONYMOUS, BOT_UID)) && $username) + { + $profile = ''. $profile .''; + } return $profile; } diff --git a/upload/memberlist.php b/upload/memberlist.php index b69e363a6..c7847564c 100644 --- a/upload/memberlist.php +++ b/upload/memberlist.php @@ -196,7 +196,7 @@ if ($result = DB()->fetch_rowset($sql)) $template->assign_block_vars('memberrow', array( 'ROW_NUMBER' => $i + ( $start + 1 ), 'ROW_CLASS' => $row_class, - 'USER' => profile($row), + 'USER' => profile_url($row), 'FROM' => $from, 'JOINED_RAW' => $row['user_regdate'], 'JOINED' => $joined, diff --git a/upload/privmsg.php b/upload/privmsg.php index c2eb33c2e..8be0b38bd 100644 --- a/upload/privmsg.php +++ b/upload/privmsg.php @@ -164,7 +164,9 @@ if ( $mode == 'read' ) // // Major query obtains the message ... // - $sql = "SELECT u.username AS username_1, u.user_id AS user_id_1, u2.username AS username_2, u2.user_id AS user_id_2, u.user_posts, u.user_from, u.user_email, u.user_regdate, u.user_rank, u.user_avatar, pm.*, pmt.privmsgs_text + $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_email, u.user_regdate, u.user_rank, u.user_avatar, + u2.username AS to_username, u2.user_id AS to_user_id, u2.user_rank as to_user_rank, + pm.*, pmt.privmsgs_text FROM " . BB_PRIVMSGS . " pm, " . BB_PRIVMSGS_TEXT . " pmt, " . BB_USERS . " u, " . BB_USERS . " u2 WHERE pm.privmsgs_id = $privmsgs_id AND pmt.privmsgs_text_id = pm.privmsgs_id @@ -432,10 +434,10 @@ if ( $mode == 'read' ) 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); - $username_from = $privmsg['username_1']; - $user_id_from = $privmsg['user_id_1']; - $username_to = $privmsg['username_2']; - $user_id_to = $privmsg['user_id_2']; + $username_from = $privmsg['username']; + $user_id_from = $privmsg['user_id']; + $username_to = $privmsg['to_username']; + $user_id_to = $privmsg['to_user_id']; $post_date = bb_date($privmsg['privmsgs_date']); @@ -474,27 +476,25 @@ if ( $mode == 'read' ) // Dump it to the templating engine // $template->assign_vars(array( - 'TO_USER_ID' => $user_id_to, - 'TO_USER_NAME' => $username_to, - 'FROM_USER_ID' => $user_id_from, - 'FROM_USER_NAME' => $username_from, + 'TO_USER' => profile_url(array('username' => $username_to, 'user_id' => $user_id_to, 'user_rank' => $privmsg['to_user_rank'])), + 'FROM_USER' => profile_url($privmsg), - 'QR_SUBJECT' => ((!preg_match('/^Re:/', $post_subject)) ? 'Re: ' : '') . $post_subject, - 'MESSAGE_TO' => $username_to, - 'MESSAGE_FROM' => $username_from, - 'RANK_IMAGE' => (@$rank_image) ? $rank_image : '', - 'POSTER_JOINED' => (@$poster_joined) ? $poster_joined : '', - 'POSTER_POSTS' => (@$poster_posts) ? $poster_posts : '', - 'POSTER_FROM' => (@$poster_from) ? $poster_from : '', - 'POSTER_AVATAR' => (@$poster_avatar) ? $poster_avatar : '', - 'POST_SUBJECT' => $post_subject, - 'POST_DATE' => $post_date, - 'PM_MESSAGE' => $private_message, + 'QR_SUBJECT' => (!preg_match('/^Re:/', $post_subject) ? 'Re: ' : '') . $post_subject, + 'MESSAGE_TO' => $username_to, + 'MESSAGE_FROM' => $username_from, + 'RANK_IMAGE' => (@$rank_image) ? $rank_image : '', + 'POSTER_JOINED' => (@$poster_joined) ? $poster_joined : '', + 'POSTER_POSTS' => (@$poster_posts) ? $poster_posts : '', + 'POSTER_FROM' => (@$poster_from) ? $poster_from : '', + 'POSTER_AVATAR' => (@$poster_avatar) ? $poster_avatar : '', + 'POST_SUBJECT' => $post_subject, + 'POST_DATE' => $post_date, + 'PM_MESSAGE' => $private_message, - 'PROFILE_IMG' => $profile_img, - 'PROFILE' => $profile, - 'SEARCH_IMG' => $search_img, - 'SEARCH' => $search, + 'PROFILE_IMG' => $profile_img, + 'PROFILE' => $profile, + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, )); } else if ( ( $delete && $mark_list ) || $delete_all ) @@ -565,7 +565,7 @@ else if ( ( $delete && $mark_list ) || $delete_all ) WHERE $delete_type $delete_sql_id"; if ( !($result = DB()->sql_query($sql)) ) { - message_die(GENERAL_ERROR, 'Could not obtain id list to delete messages', '', __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain id list to delete messages', '', __LINE__, __FILE__, $sql); } $mark_list = array(); @@ -1457,7 +1457,7 @@ else // $sql_tot = "SELECT COUNT(privmsgs_id) AS total FROM " . BB_PRIVMSGS . " "; - $sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username + $sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username, u.user_rank FROM " . BB_PRIVMSGS . " pm, " . BB_USERS . " u "; switch( $folder ) { @@ -1671,9 +1671,7 @@ else $icon_flag_alt = ( $flag == PRIVMSGS_NEW_MAIL || $flag == PRIVMSGS_UNREAD_MAIL ) ? $lang['UNREAD_MESSAGE'] : $lang['READ_MESSAGE']; $msg_userid = $row['user_id']; - $msg_username = $row['username']; - - $u_from_user_profile = append_sid("profile.php?mode=viewprofile&" . POST_USERS_URL . "=$msg_userid"); + $msg_user = profile_url($row); $msg_subject = $row['privmsgs_subject']; @@ -1690,15 +1688,15 @@ else { $msg_subject = '' . $msg_subject . ''; $msg_date = '' . $msg_date . ''; - $msg_username = '' . $msg_username . ''; + $msg_user = '' . $msg_user . ''; } - $row_class = !($i & 1) ? 'prow1' : 'prow2'; + $row_class = !($i & 1) ? 'row1' : 'row2'; $i++; $template->assign_block_vars('listrow', array( 'ROW_CLASS' => $row_class, - 'FROM' => $msg_username, + 'FROM' => $msg_user, 'SUBJECT' => htmlCHR($msg_subject), 'DATE' => $msg_date, @@ -1709,8 +1707,7 @@ else 'S_MARK_ID' => $privmsg_id, 'U_READ' => $u_subject, - 'U_FROM_USER_PROFILE' => $u_from_user_profile) - ); + )); } while( $row = DB()->sql_fetchrow($result) ); diff --git a/upload/templates/default/groupcp.tpl b/upload/templates/default/groupcp.tpl index 3fc8f0da4..f2fc8756d 100644 --- a/upload/templates/default/groupcp.tpl +++ b/upload/templates/default/groupcp.tpl @@ -117,7 +117,7 @@ {ROW_NUMBER} - {MOD_USERNAME} + {MOD_USER} {MOD_PM} {MOD_EMAIL} {MOD_FROM} @@ -134,7 +134,7 @@ {member.ROW_NUMBER} - {member.USERNAME} + {member.USER} {member.PM} {member.EMAIL} {member.FROM} @@ -202,7 +202,7 @@ {L_JOINED} {L_POSTS_SHORT} {L_WEBSITE} - + {L_PENDING_MEMBERS} @@ -211,14 +211,14 @@ - {pending.USERNAME} + {pending.USER} {pending.PM} {pending.EMAIL} {pending.FROM} {pending.JOINED} {pending.POSTS} {pending.WWW} - + diff --git a/upload/templates/default/privmsgs.tpl b/upload/templates/default/privmsgs.tpl index 06a3759ba..93ccd0255 100644 --- a/upload/templates/default/privmsgs.tpl +++ b/upload/templates/default/privmsgs.tpl @@ -70,21 +70,21 @@ - +
- - - - - + + + + + - + diff --git a/upload/templates/default/privmsgs_read.tpl b/upload/templates/default/privmsgs_read.tpl index 870b47a54..1dcbf7eb3 100644 --- a/upload/templates/default/privmsgs_read.tpl +++ b/upload/templates/default/privmsgs_read.tpl @@ -30,11 +30,11 @@ - + - + @@ -47,7 +47,7 @@ -
 {L_SUBJECT}{L_FROM_OR_TO}{L_DATE}  
{L_SUBJECT}{L_FROM_OR_TO}{L_DATE} 
{listrow.L_PRIVMSG_FOLDER_ALT} {listrow.SUBJECT}{listrow.FROM}{listrow.FROM} {listrow.DATE}
{L_FROM}: {FROM_USER_NAME}{FROM_USER}
{L_TO}: {TO_USER_NAME}{TO_USER}
{L_POSTED}: 
+
{PM_MESSAGE}
{QUOTE_PM_IMG} {EDIT_PM_IMG} {REPORT_PM_IMG}