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

r294

Browse source 
Фиксы багов выявленных бета тестерами git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@294 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2011-09-30 17:24:53 +00:00
commit ec91bce317
7 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
upload/ajax/posts.php
View file

@ -77,6 +77,10 @@ switch($this->request['type'])
$message = (!empty($message)) ? preg_replace($orig_word, $replace_word, $message) : ''; $message = (!empty($message)) ? preg_replace($orig_word, $replace_word, $message) : '';
} }
if($post['post_attachment'] || $post['topic_first_post_id'])
{
$message = '[quote]'. $post['topic_title'] .'[/quote]';
}
if(mb_strlen($message, 'UTF-8') > 1000) if(mb_strlen($message, 'UTF-8') > 1000)
{ {
$this->response['redirect'] = make_url('posting.php?mode=quote&p='. $post_id); $this->response['redirect'] = make_url('posting.php?mode=quote&p='. $post_id);

14
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.1 Stable'; $bb_cfg['tp_version'] = '2.1 Stable';
$bb_cfg['tp_release_state'] = 'R293'; $bb_cfg['tp_release_state'] = 'R294';
$bb_cfg['tp_release_date'] = '20-09-2011'; $bb_cfg['tp_release_date'] = '30-09-2011';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';
@ -508,7 +508,9 @@ $bb_cfg['copyright_holders_html_path'] = $bb_cfg['html_path'] .'copyright_holder
$bb_cfg['advert_html_path'] = $bb_cfg['html_path'] .'advert.html'; # $bb_cfg['advert_html_path'] = $bb_cfg['html_path'] .'advert.html'; #
// Captcha // Captcha
$bb_cfg['captcha']['disabled'] = false; $bb_cfg['captcha'] = array(
$bb_cfg['captcha']['secret_key'] = 'secret_key'; 'disabled' => false,
$bb_cfg['captcha']['img_url'] = './images/captcha/'; # without '/' 'secret_key' => 'secret_key',
$bb_cfg['captcha']['img_path'] = BB_PATH .'/images/captcha/'; # without '/' 'img_url' => './images/captcha/', # without '/'
'img_path' => BB_PATH .'/images/captcha/', # without '/'
);

2
upload/includes/cron/jobs/cache_gc.php
View file

@ -15,6 +15,6 @@ foreach ($gc_cache as $cache_name)
if (method_exists(CACHE($cache_name), 'gc')) if (method_exists(CACHE($cache_name), 'gc'))
{ {
$changes = CACHE($cache_name)->gc(); $changes = CACHE($cache_name)->gc();
$cron_runtime_log .= date('Y-m-d H:i:s') ." -- tr -- $changes rows deleted\n"; $cron_runtime_log = date('Y-m-d H:i:s') ." -- tr -- $changes rows deleted\n";
} }
} }

2
upload/includes/cron/jobs/tr_cleanup_and_dlstat.php
View file

@ -2,6 +2,8 @@
if (!defined('BB_ROOT')) die(basename(__FILE__)); if (!defined('BB_ROOT')) die(basename(__FILE__));
global $tr_cfg;
$releaser = DL_STATUS_RELEASER; $releaser = DL_STATUS_RELEASER;
if($bb_cfg['announce_type'] != 'xbt') if($bb_cfg['announce_type'] != 'xbt')

3
upload/templates/default/index.tpl
View file

@ -49,8 +49,7 @@
<!-- IF SHOW_FORUMS --> <!-- IF SHOW_FORUMS -->
<!-- IF H_C_AL_MESS --> <!-- IF H_C_AL_MESS -->
<div class="row1 med tCenter pad_4 border bw_TRBL">{L_HIDE_CAT_MESS}</div> <div class="row1 med tCenter pad_4 border bw_TRBL" style="margin: 4px 0;">{L_HIDE_CAT_MESS}</div>
<div class="cat_separator"></div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- BEGIN c --> <!-- BEGIN c -->

17
upload/templates/default/viewforum.tpl
View file

@ -382,20 +382,9 @@ td.topic_id { cursor: pointer; }
</td> </td>
<td class="med" style="padding: 0 4px 2px 4px;">|</td> <td class="med" style="padding: 0 4px 2px 4px;">|</td>
<td class="small nowrap" style="padding: 0;">{L_TOPICS_PER_PAGE}:</td> <td class="small nowrap" style="padding: 0;">{L_TOPICS_PER_PAGE}:</td>
<td class="small nowrap" style="padding: 0 0 0 3px;">{SELECT_TPP}</td> <td class="small nowrap" style="padding: 0 0 0 3px;">
<!-- IF TORRENTS --> <form id="tpp" action="{PAGE_URL_TPP}" method="post">{SELECT_TPP}</form>
<td class="small nowrap" style="padding: 0 0 0 6px;">{L_STATUS}:</td> </td>
<td class="small nowrap" style="padding: 0 0 0 3px;">{SELECT_TST}</td>
<!-- ENDIF -->
<td class="small nowrap" style="padding: 0 0 0 3px;">&nbsp;<input id="tst-submit-btn" type="button" class="bold" value="&raquo;" style="width: 30px;" onclick="mod_goto(); return false;" /></td>
<script type="text/javascript">
function mod_goto(){
window.location = '{MOD_URL}' +'&tpp='+ $('#tpp').val() <!-- IF TORRENTS -->+'&tst='+ $('#tst').val()<!-- ENDIF --> +'&mod=1';
}
$(function(){
$('#tst').bind('change', function(){ $('#tst-submit-btn').attr({disabled: 1}); mod_goto(); });
});
</script>
<!-- ENDIF / AUTH_MOD --> <!-- ENDIF / AUTH_MOD -->
<td class="small bold nowrap tRight w100"> <td class="small bold nowrap tRight w100">

3
upload/viewforum.php
View file

@ -440,7 +440,7 @@ $template->assign_vars(array(
'ONLY_NEW_TOPICS_ON' => ($only_new == ONLY_NEW_TOPICS), 'ONLY_NEW_TOPICS_ON' => ($only_new == ONLY_NEW_TOPICS),
'TITLE_MATCH' => htmlCHR($title_match), 'TITLE_MATCH' => htmlCHR($title_match),
'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page) : '', 'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page, null, null, 'onchange="$(\'#tpp\').submit();"') : '',
'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? $lang['FORUM_LOCKED'] : $lang['POST_NEW_TOPIC'], 'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? $lang['FORUM_LOCKED'] : $lang['POST_NEW_TOPIC'],
'S_AUTH_LIST' => $u_auth, 'S_AUTH_LIST' => $u_auth,
'U_VIEW_FORUM' => FORUM_URL . $forum_id, 'U_VIEW_FORUM' => FORUM_URL . $forum_id,
@ -572,6 +572,7 @@ else
$template->assign_vars(array( $template->assign_vars(array(
'PAGE_URL' => $pg_url, 'PAGE_URL' => $pg_url,
'PAGE_URL_TPP' => url_arg($pg_url, 'tpp', null),
'FOUND_TOPICS' => $found_topics, 'FOUND_TOPICS' => $found_topics,
'AUTH_MOD' => $is_auth['auth_mod'], 'AUTH_MOD' => $is_auth['auth_mod'],