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

r303

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@303 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2011-11-02 22:16:21 +00:00
commit d4335cdc4f
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
upload/config.php
View file

@ -53,8 +53,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.2 Beta'; $bb_cfg['tp_version'] = '2.2 Beta';
$bb_cfg['tp_release_state'] = 'R302'; $bb_cfg['tp_release_state'] = 'R303';
$bb_cfg['tp_release_date'] = '30-10-2011'; $bb_cfg['tp_release_date'] = '03-11-2011';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';

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

@ -38,7 +38,8 @@ function edit_post(post_id, type, text) {
ajax.open_edit = false; ajax.open_edit = false;
} }
} }
ajax.callback.posts = function(data) { if(data.html){ ajax.callback.posts = function(data) {
if(data.html){
$('#pp_'+ data.post_id).show().html(data.html); $('#pp_'+ data.post_id).show().html(data.html);
initPostBBCode('#pp_'+ data.post_id); initPostBBCode('#pp_'+ data.post_id);
$('#pe_'+ data.post_id).hide(); $('#pe_'+ data.post_id).hide();
@ -48,7 +49,8 @@ ajax.callback.posts = function(data) { if(data.html){
$('#pe_'+ data.post_id).html(data.text); $('#pe_'+ data.post_id).html(data.text);
} }
if(data.redirect) document.location.href = data.redirect; if(data.redirect) document.location.href = data.redirect;
if(data.hide) { if(ajax.open_edit == data.post_id) ajax.open_edit = false; if(data.hide) {
if(ajax.open_edit == data.post_id) ajax.open_edit = false;
$('tbody#post_'+ data.post_id).hide(); $('tbody#post_'+ data.post_id).hide();
} }
if(data.quote) $('textarea#message').attr('value', $('textarea#message').val() + data.message +' ').focus(); if(data.quote) $('textarea#message').attr('value', $('textarea#message').val() + data.message +' ').focus();
@ -220,11 +222,11 @@ function set_hid_chbox (id)
<p class="avatar">{postrow.POSTER_AVATAR}</p> <p class="avatar">{postrow.POSTER_AVATAR}</p>
<!-- ELSE --> <!-- ELSE -->
<!-- IF QUICK_REPLY --> <!-- IF QUICK_REPLY -->
<p class="nick<!-- IF postrow.POSTER_NAME --> nick-author<!-- ENDIF -->" title="{L_INS_NAME_TIP}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickPoster('{postrow.POSTER_NAME_JS}');"> <p class="nick<!-- IF postrow.POSTER_AUTHOR --> nick-author<!-- ENDIF -->" title="{L_INS_NAME_TIP}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickPoster('{postrow.POSTER_NAME_JS}');">
<a href="#" onclick="return false;">{postrow.POSTER_NAME}</a> <a href="#" onclick="return false;">{postrow.POSTER_NAME}</a>
</p> </p>
<!-- ELSE --> <!-- ELSE -->
<p class="nick<!-- IF postrow.POSTER_NAME --> nick-author<!-- ENDIF -->">{postrow.POSTER_NAME}</p> <p class="nick<!-- IF postrow.POSTER_AUTHOR --> nick-author<!-- ENDIF -->">{postrow.POSTER_NAME}</p>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF postrow.POSTER_RANK --><p class="rank_txt">{postrow.POSTER_RANK}</p><!-- ENDIF --> <!-- IF postrow.POSTER_RANK --><p class="rank_txt">{postrow.POSTER_RANK}</p><!-- ENDIF -->

11
upload/viewtopic.php
View file

@ -860,7 +860,9 @@ for($i = 0; $i < $total_posts; $i++)
$user_sig = ($bb_cfg['allow_sig'] && !$user->opt_js['h_sig'] && $postrow[$i]['user_sig']) ? $postrow[$i]['user_sig'] : ''; $user_sig = ($bb_cfg['allow_sig'] && !$user->opt_js['h_sig'] && $postrow[$i]['user_sig']) ? $postrow[$i]['user_sig'] : '';
if(bf($postrow[$i]['user_opt'], 'user_opt', 'allow_sig')) if(bf($postrow[$i]['user_opt'], 'user_opt', 'allow_sig'))
{ $user_sig = $lang['SIGNATURE_DISABLE']; } {
$user_sig = $lang['SIGNATURE_DISABLE'];
}
else if ($user_sig) else if ($user_sig)
{ {
$user_sig = bbcode2html($user_sig); $user_sig = bbcode2html($user_sig);
@ -947,7 +949,7 @@ for($i = 0; $i < $total_posts; $i++)
'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2', 'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
'POST_ID' => $postrow[$i]['post_id'], 'POST_ID' => $postrow[$i]['post_id'],
'IS_NEWEST' => ($postrow[$i]['post_id'] == $newest), 'IS_NEWEST' => ($postrow[$i]['post_id'] == $newest),
'POSTER_NAME' => ($poster_id != $t_data['topic_poster']) ? profile_url(array('username' => $poster, 'user_rank' => $user_rank)) : $poster, 'POSTER_NAME' => ($poster_id != $t_data['topic_poster']) ? profile_url(array('username' => $poster, 'user_rank' => $user_rank)) : wbr($poster),
'POSTER_NAME_JS' => addslashes($poster), 'POSTER_NAME_JS' => addslashes($poster),
'POSTER_RANK' => $poster_rank, 'POSTER_RANK' => $poster_rank,
'RANK_IMAGE' => $rank_image, 'RANK_IMAGE' => $rank_image,
@ -958,6 +960,7 @@ for($i = 0; $i < $total_posts; $i++)
'POSTER_FROM' => ($bb_cfg['show_poster_from']) ? wbr($poster_from) : '', 'POSTER_FROM' => ($bb_cfg['show_poster_from']) ? wbr($poster_from) : '',
'POSTER_BOT' => ($poster_id == BOT_UID), 'POSTER_BOT' => ($poster_id == BOT_UID),
'POSTER_ID' => $poster_id, 'POSTER_ID' => $poster_id,
'POSTER_AUTHOR' => ($poster_id == $t_data['topic_poster']),
'POSTED_AFTER' => ($prev_post_time) ? delta_time($postrow[$i]['post_time'], $prev_post_time) : '', 'POSTED_AFTER' => ($prev_post_time) ? delta_time($postrow[$i]['post_time'], $prev_post_time) : '',
'IS_UNREAD' => is_unread($postrow[$i]['post_time'], $topic_id, $forum_id), 'IS_UNREAD' => is_unread($postrow[$i]['post_time'], $topic_id, $forum_id),
'IS_FIRST_POST' => (!$start && ($postrow[$i]['post_id'] == $t_data['topic_first_post_id'])), 'IS_FIRST_POST' => (!$start && ($postrow[$i]['post_id'] == $t_data['topic_first_post_id'])),
@ -1034,7 +1037,9 @@ if ($bb_cfg['show_quick_reply'])
} }
foreach($is_auth as $name => $is) foreach($is_auth as $name => $is)
{ $template->assign_vars(array(strtoupper($name) => $is)); } {
$template->assign_vars(array(strtoupper($name) => $is));
}
$template->assign_vars(array( $template->assign_vars(array(
'PG_ROW_CLASS' => isset($pg_row_class) ? $pg_row_class : 'row1', 'PG_ROW_CLASS' => isset($pg_row_class) ? $pg_row_class : 'row1',