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

r232

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@232 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2011-08-21 03:33:57 +00:00
commit 292a43cf59
9 changed files with 74 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

7
upload/admin/admin_ranks.php
View file

@ -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 .= "<br /><br />" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "<a href=\"" . append_sid("admin_ranks.php") . "\">", "</a>") . "<br /><br />" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "<a href=\"" . append_sid("index.php?pane=right") . "\">", "</a>");
$datastore->update('ranks');
message_die(GENERAL_MESSAGE, $message);
}
@ -203,6 +202,8 @@ if($mode != "")
$message = $lang['RANK_REMOVED'] . "<br /><br />" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "<a href=\"" . append_sid("admin_ranks.php") . "\">", "</a>") . "<br /><br />" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "<a href=\"" . append_sid("index.php?pane=right") . "\">", "</a>");
$datastore->update('ranks');
message_die(GENERAL_MESSAGE, $message);
}

4
upload/config.php
View file

@ -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Попробуйте повторить запрос через несколько минут";

19
upload/groupcp.php
View file

@ -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']) ? '<a class="txtb" href="'. append_sid("privmsg.php?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'">'. $lang['SEND_PM_TXTB'] .'</a>' : '<a href="' . append_sid("privmsg.php?mode=post&amp;". POST_USERS_URL ."=".$row['user_id']) .'"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
if (bf($row['user_opt'], 'user_opt', 'viewemail') || $group_mod)
{
$email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&amp;". 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&amp;" . 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&amp;" . 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&amp;". POST_USERS_URL ."=$user_id",
));
}

26
upload/includes/functions.php
View file

@ -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 = '<span title="'. $title .'" class="'. $style .'">'. $username .'</span>';
if(!in_array($user_id, array('', ANONYMOUS, BOT_UID)) && $username)
{
$profile = '<a href="'. make_url(PROFILE_URL . $user_id) .'">'. $profile .'</a>';
}
if(!in_array($user_id, array('', ANONYMOUS, BOT_UID)) && $username)
{
$profile = '<a href="'. make_url(PROFILE_URL . $user_id) .'">'. $profile .'</a>';
}
return $profile;
}

2
upload/memberlist.php
View file

@ -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,

65
upload/privmsg.php
View file

@ -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&amp;" . POST_USERS_URL . "=$msg_userid");
$msg_user = profile_url($row);
$msg_subject = $row['privmsgs_subject'];
@ -1690,15 +1688,15 @@ else
{
$msg_subject = '<b>' . $msg_subject . '</b>';
$msg_date = '<b>' . $msg_date . '</b>';
$msg_username = '<b>' . $msg_username . '</b>';
$msg_user = '<b>' . $msg_user . '</b>';
}
$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) );

10
upload/templates/default/groupcp.tpl
View file

@ -117,7 +117,7 @@
</tr>
<tr class="row1 tCenter">
<td width="3%">{ROW_NUMBER}</td>
<td><a href="{U_MOD_VIEWPROFILE}" class="gen"><b>{MOD_USERNAME}</b></a></td>
<td><b>{MOD_USER}</b></td>
<td>{MOD_PM}</td>
<td>{MOD_EMAIL}</td>
<td>{MOD_FROM}</td>
@ -134,7 +134,7 @@
<!-- BEGIN member -->
<tr class="{member.ROW_CLASS} tCenter">
<td width="3%">{member.ROW_NUMBER}</td>
<td><a href="{member.U_VIEWPROFILE}" class="gen">{member.USERNAME}</a></td>
<td>{member.USER}</td>
<td>{member.PM}</td>
<td>{member.EMAIL}</td>
<td>{member.FROM}</td>
@ -202,7 +202,7 @@
<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_JOINED}</b></th>
<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_POSTS_SHORT}</b></th>
<th class="{sorter: false}" ><b class="tbs-text">{L_WEBSITE}</b></th>
</tr>
<tr>
<td class="catTitle" colspan="8">{L_PENDING_MEMBERS}</td>
@ -211,14 +211,14 @@
<!-- BEGIN pending -->
<tr class="{pending.ROW_CLASS} tCenter">
<td><input type="checkbox" name="pending_members[]" value="{pending.USER_ID}"/></td>
<td><a href="{pending.U_VIEWPROFILE}" class="gen">{pending.USERNAME}</a></td>
<td>{pending.USER}</td>
<td>{pending.PM}</td>
<td>{pending.EMAIL}</td>
<td>{pending.FROM}</td>
<td class="small">{pending.JOINED}</td>
<td>{pending.POSTS}</td>
<td>{pending.WWW}</td>
</tr>
<!-- END pending -->
<tfoot>

14
upload/templates/default/privmsgs.tpl
View file

@ -70,21 +70,21 @@
</tr>
</table>
<table class="forumline tablesorter">
<table class="forumline tablesorter">
<thead>
<tr>
<th width="2%">&nbsp;</th>
<th width="50%" class="{sorter: 'text'}"><b class="tbs-text">{L_SUBJECT}</b></th>
<th width="5%" class="{sorter: 'text'}"><b class="tbs-text">{L_FROM_OR_TO}</b></th>
<th width="5%" class="{sorter: 'digit'}"><b class="tbs-text">{L_DATE}</b></th>
<th width="2%">&nbsp;</th>
</tr>
<th width="50%" class="{sorter: 'text'}"><b class="tbs-text">{L_SUBJECT}</b></th>
<th width="5%" class="{sorter: 'text'}"><b class="tbs-text">{L_FROM_OR_TO}</b></th>
<th width="5%" class="{sorter: 'digit'}"><b class="tbs-text">{L_DATE}</b></th>
<th width="2%">&nbsp;</th>
</tr>
</thead>
<!-- BEGIN listrow -->
<tr class="{listrow.ROW_CLASS} med tCenter">
<td><img src="{listrow.PRIVMSG_FOLDER_IMG}" alt="{listrow.L_PRIVMSG_FOLDER_ALT}" title="{listrow.L_PRIVMSG_FOLDER_ALT}" /></td>
<td class="tLeft pad_0"><a href="{listrow.U_READ}" class="med bold block pad_4">{listrow.SUBJECT}</a></td>
<td><a href="{listrow.U_FROM_USER_PROFILE}">{listrow.FROM}</a></td>
<td>{listrow.FROM}</td>
<td>{listrow.DATE}</td>
<td><input type="checkbox" name="mark[]2" value="{listrow.S_MARK_ID}" /></td>
</tr>

6
upload/templates/default/privmsgs_read.tpl
View file

@ -30,11 +30,11 @@
</tr>
<tr>
<td>{L_FROM}:&nbsp;</td>
<td width="100%"><b><a href="{PROFILE_URL}{FROM_USER_ID}" class="med">{FROM_USER_NAME}</a></b></td>
<td width="100%"><b>{FROM_USER}</b></td>
</tr>
<tr>
<td>{L_TO}:&nbsp;</td>
<td><a href="{PROFILE_URL}{TO_USER_ID}" class="med">{TO_USER_NAME}</a></td>
<td>{TO_USER}</td>
</tr>
<tr>
<td>{L_POSTED}:&nbsp;</td>
@ -47,7 +47,7 @@
</thead>
<tbody>
<tr>
<td colspan="2" class="row4 gen pad_4">
<td colspan="2" class="row1 gen pad_4">
<div class="post_wrap"><div class="post_body">{PM_MESSAGE}</div></div>
<div class="clearB tRight">{QUOTE_PM_IMG} {EDIT_PM_IMG} {REPORT_PM_IMG}</div>
</td>