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

r593

Browse source 
Старт ветки develop. В ней будут публиковаться промежуточные изменения, опубликованные до включения в ветку master (соответственно до объявления о выходе новой "ревизии").

Изменения:

- чистка от пустых строк, пустых окончаний строк;
- фикс настроек системы сидбонусов в админке;
- фикс функции вывода картинки пола пользователя;
- удаление неактуальной информации из шаблона;
- изменения в работе tidy.
This commit is contained in:
Exile 2014-08-01 03:11:48 +04:00
commit 3ed9f6e039
93 changed files with 412 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

2
other/converter/TBDevYSE_pre6/ReadMe.txt
View file

@ -15,7 +15,7 @@ Quick guide:
(Don't forget to remove these files after completion). (Don't forget to remove these files after completion).
You allow to change message text, see $msg in pass.php for this. You allow to change message text, see $msg in pass.php for this.
10. If you want to redirect peers from older announce to new announce everytime, replace original TBDev's announce.php with 10. If you want to redirect peers from older announce to new announce everytime, replace original TBDev's announce.php with
'for_tbdev/announce.php' 'for_tbdev/announce.php'
Cheers, RoadTrain. Cheers, RoadTrain.
http://torrentpier.me/ http://torrentpier.me/

2
other/converter/TBDevYSE_pre6/for_tbdev/pass.php
View file

@ -15,8 +15,6 @@ $msg = '[b]Внимание![/b] Наш трекер переехал на но
[b]Пароль:[/b] %s [b]Пароль:[/b] %s
Сменить пароль можно после входа на трекер в [url='.$new_tr_url.'profile.php?mode=editprofile]настройках[/url].'; Сменить пароль можно после входа на трекер в [url='.$new_tr_url.'profile.php?mode=editprofile]настройках[/url].';
if (empty($_POST['confirm'])) if (empty($_POST['confirm']))
{ {
stdhead(); stdhead();

25
other/converter/TBDevYSE_pre6/root/converter/functions.php
View file

@ -43,19 +43,9 @@ function set_auto_increment($table_name, $column, $val = null)
DB()->query("ALTER TABLE $table_name auto_increment = $val"); DB()->query("ALTER TABLE $table_name auto_increment = $val");
} }
//Users functions // Users functions
function tp_users_cleanup() function tp_users_cleanup()
{ {
/*
if (!function_exists('user_delete')) require_once(INC_DIR .'functions_admin.php');
if ($row = DB()->fetch_row("SELECT user_id FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .');'))
{
foreach ($row as $user)
{
user_delete($user['user_id']);
}
}*/
DB()->query('DELETE FROM '. BB_USERS .' WHERE user_id NOT IN('. EXCLUDED_USERS_CSV .')'); DB()->query('DELETE FROM '. BB_USERS .' WHERE user_id NOT IN('. EXCLUDED_USERS_CSV .')');
DB()->query('TRUNCATE '. BB_BT_USERS); DB()->query('TRUNCATE '. BB_BT_USERS);
} }
@ -173,15 +163,6 @@ function tp_topics_cleanup()
DB()->query("TRUNCATE ". BB_POSTS_SEARCH); DB()->query("TRUNCATE ". BB_POSTS_SEARCH);
DB()->query("TRUNCATE ". BB_POSTS_TEXT); DB()->query("TRUNCATE ". BB_POSTS_TEXT);
DB()->query("TRUNCATE ". BB_TOPICS); DB()->query("TRUNCATE ". BB_TOPICS);
/*if (!function_exists('topic_delete')) require_once(INC_DIR .'functions_admin.php');
if ($row = DB()->fetch_row("SELECT topic_id FROM ". BB_TOPICS))
{
foreach ($row as $topic)
{
topic_delete($topic['topic_id']);
}
}*/
return; return;
} }
@ -299,7 +280,6 @@ function convert_torrent($torrent)
"topic_last_post_time" => $torrent['added'], "topic_last_post_time" => $torrent['added'],
); );
tp_add_topic($topic_data); tp_add_topic($topic_data);
//$post_text = prepare_message($torrent['descr'], true, true);
$post_text = stripslashes(prepare_message(addslashes(unprepare_message($torrent['descr'])), true, true)); $post_text = stripslashes(prepare_message(addslashes(unprepare_message($torrent['descr'])), true, true));
$post_data = array( $post_data = array(
@ -387,7 +367,7 @@ function convert_torrent($torrent)
return; return;
} }
//Comments functions // Comments functions
function convert_comment($comment) function convert_comment($comment)
{ {
$post_text = prepare_message($comment['text'], true, true); $post_text = prepare_message($comment['text'], true, true);
@ -409,7 +389,6 @@ function convert_comment($comment)
), ),
); );
tp_add_post($post_data); tp_add_post($post_data);
//add_search_words($comment['id'], stripslashes($post_text));
return; return;
} }

1
other/converter/TBDevYSE_pre6/root/converter/passwords.php
View file

@ -1,2 +1,3 @@
<?php <?php
$passwords = array(); $passwords = array();

2
other/converter/TBDevYSE_pre6/root/recover.php
View file

@ -91,7 +91,7 @@ for ($i = 0; $i < $loops; $i++)
print_ok ("Completed"); print_ok ("Completed");
if(!empty($not_exist)) if (!empty($not_exist))
{ {
print_ok ("These torrents doesn't exist in filesystem: ". implode(', ', array_unique($not_exist))); print_ok ("These torrents doesn't exist in filesystem: ". implode(', ', array_unique($not_exist)));
} }

12
other/recover/converter/functions.php
View file

@ -168,15 +168,6 @@ function tp_topics_cleanup()
DB()->query("TRUNCATE ". BB_POSTS_SEARCH); DB()->query("TRUNCATE ". BB_POSTS_SEARCH);
DB()->query("TRUNCATE ". BB_POSTS_TEXT); DB()->query("TRUNCATE ". BB_POSTS_TEXT);
DB()->query("TRUNCATE ". BB_TOPICS); DB()->query("TRUNCATE ". BB_TOPICS);
/*if (!function_exists('topic_delete')) require_once('./includes/functions_admin.php');
if ($row = DB()->fetch_row("SELECT topic_id FROM ". TOPICS))
{
foreach ($row as $topic)
{
topic_delete($topic['topic_id']);
}
}*/
return; return;
} }
@ -362,7 +353,7 @@ function convert_torrent($torrent)
"topic_id" => $torrent['topic_id'], "topic_id" => $torrent['topic_id'],
"forum_id" => $torrent['category'], "forum_id" => $torrent['category'],
"attach_id" => $torrent['attach_id'], "attach_id" => $torrent['attach_id'],
"size" => $torrent['size'], "size" => $torrent['size'],
"reg_time" => $torrent['added'], "reg_time" => $torrent['added'],
"complete_count" => $torrent['times_completed'], "complete_count" => $torrent['times_completed'],
"seeder_last_seen" => $torrent['lastseed'], "seeder_last_seen" => $torrent['lastseed'],
@ -404,7 +395,6 @@ function convert_comment($comment)
), ),
); );
tp_add_post($post_data); tp_add_post($post_data);
//add_search_words($comment['id'], stripslashes($post_text));
return; return;
} }

1
other/recover/converter/passwords.php
View file

@ -1,2 +1,3 @@
<?php <?php
$passwords = array(); $passwords = array();

3
other/recover/recover.php
View file

@ -8,7 +8,6 @@ require(INC_DIR .'functions_torrent.php');
require(BB_ROOT .'converter/settings.php'); require(BB_ROOT .'converter/settings.php');
require(BB_ROOT .'converter/functions.php'); require(BB_ROOT .'converter/functions.php');
// Init userdata // Init userdata
$user->session_start(); $user->session_start();
@ -91,7 +90,7 @@ for ($i = 0; $i < $loops; $i++)
print_ok ("Completed"); print_ok ("Completed");
if(!empty($not_exist)) if (!empty($not_exist))
{ {
print_ok ("These torrents doesn't exist in filesystem: ". implode(', ', array_unique($not_exist))); print_ok ("These torrents doesn't exist in filesystem: ". implode(', ', array_unique($not_exist)));
} }

1
upload/admin/admin_attach_cp.php
View file

@ -76,7 +76,6 @@ else
$sort_order = 'ASC'; $sort_order = 'ASC';
} }
// Pagination ? // Pagination ?
$do_pagination = ($view != 'stats' && $view != 'search') ? true : false; $do_pagination = ($view != 'stats' && $view != 'search') ? true : false;

8
upload/admin/admin_board.php
View file

@ -40,9 +40,7 @@ else
if (isset($_POST['submit']) && $row['config_value'] != $new[$config_name]) if (isset($_POST['submit']) && $row['config_value'] != $new[$config_name])
{ {
if ($config_name == 'seed_bonus_points' || $config_name == 'seed_bonus_release') $new[$config_name] = serialize($new[$config_name]); if ($config_name == ('seed_bonus_points' || 'seed_bonus_release' || 'bonus_upload' || 'bonus_upload_price')) $new[$config_name] = serialize(str_replace(',', '.', $new[$config_name]));
if ($config_name == 'bonus_upload' || $config_name == 'bonus_upload_price') $new[$config_name] = serialize($new[$config_name]);
bb_update_config(array($config_name => $new[$config_name])); bb_update_config(array($config_name => $new[$config_name]));
} }
} }
@ -89,7 +87,7 @@ switch($mode)
if ($new['seed_bonus_points'] && $new['seed_bonus_release']) if ($new['seed_bonus_points'] && $new['seed_bonus_release'])
{ {
$seed_bonus = unserialize($new['seed_bonus_points']); $seed_bonus = unserialize($new['seed_bonus_points']);
$seed_release = unserialize($new['seed_bonus_release']); $seed_release = unserialize($new['seed_bonus_release']);
foreach ($seed_bonus as $i => $row) foreach ($seed_bonus as $i => $row)
@ -106,7 +104,7 @@ switch($mode)
if ($new['bonus_upload'] && $new['bonus_upload_price']) if ($new['bonus_upload'] && $new['bonus_upload_price'])
{ {
$upload_row = unserialize($new['bonus_upload']); $upload_row = unserialize($new['bonus_upload']);
$price_row = unserialize($new['bonus_upload_price']); $price_row = unserialize($new['bonus_upload_price']);
foreach ($upload_row as $i => $row) foreach ($upload_row as $i => $row)
{ {

1
upload/admin/admin_forumauth_list.php
View file

@ -9,7 +9,6 @@ if (!empty($setmodules))
require('./pagestart.php'); require('./pagestart.php');
// ACP Header - END // ACP Header - END
// View Read Post Reply Edit Delete Sticky Announce Vote Poll PostAttach Download // View Read Post Reply Edit Delete Sticky Announce Vote Poll PostAttach Download
$simple_auth_ary = array( $simple_auth_ary = array(
/* Public */ 0 => array(AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_ALL), // Public /* Public */ 0 => array(AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_ALL), // Public

1
upload/admin/admin_forums.php
View file

@ -951,7 +951,6 @@ function renumber_order ($mode, $cat = 0)
} }
$sql .= " ORDER BY $orderfield ASC"; $sql .= " ORDER BY $orderfield ASC";
if (!$result = DB()->sql_query($sql)) if (!$result = DB()->sql_query($sql))
{ {
bb_die('Could not get list of categories / forums #2'); bb_die('Could not get list of categories / forums #2');

1
upload/admin/admin_log.php
View file

@ -245,7 +245,6 @@ else
generate_pagination($url, $items_count, $per_page, $start); generate_pagination($url, $items_count, $per_page, $start);
$filter = array(); $filter = array();
if ($log_rowset) if ($log_rowset)

1
upload/admin/admin_ranks.php
View file

@ -36,7 +36,6 @@ else
} }
} }
if ($mode != '') if ($mode != '')
{ {
if ($mode == 'edit' || $mode == 'add') if ($mode == 'edit' || $mode == 'add')

5
upload/admin/admin_user_search.php
View file

@ -795,10 +795,7 @@ else
$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 FROM ".BB_FORUMS." WHERE forum_id = ".$moderators_forum;
FROM ".BB_FORUMS."
WHERE forum_id = ".$moderators_forum;
if (!$result = DB()->sql_query($sql)) if (!$result = DB()->sql_query($sql))
{ {

16
upload/attach_mod/includes/functions_includes.php
View file

@ -1,21 +1,5 @@
<?php <?php
/**
* Setup Basic Authentication
*/
// moved to auth
/**
* Setup Forum Authentication (admin/admin_forumauth.php)
*/
//admin/admin_forumauth.php
/**
* Setup Usergroup Authentication
*/
//admin/admin_ug_auth.php
/** /**
* Setup s_auth_can in viewforum and viewtopic (viewtopic.php/viewforum.php) * Setup s_auth_can in viewforum and viewtopic (viewtopic.php/viewforum.php)
*/ */

1
upload/attach_mod/posting_attachments.php
View file

@ -9,7 +9,6 @@ define('FILENAME_CRYPTIC', false);
define('FILENAME_CRYPTIC_LENGTH', 64); define('FILENAME_CRYPTIC_LENGTH', 64);
define('FILENAME_TRANSLITERATE', true); define('FILENAME_TRANSLITERATE', true);
class attach_parent class attach_parent
{ {
var $post_attach = false; var $post_attach = false;

22
upload/config.php
View file

@ -451,11 +451,11 @@ $bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable
$bb_cfg['post_date_format'] = 'd-M-Y H:i'; $bb_cfg['post_date_format'] = 'd-M-Y H:i';
$bb_cfg['ext_link_new_win'] = true; // open external links in new window $bb_cfg['ext_link_new_win'] = true; // open external links in new window
$bb_cfg['topic_moved_days_keep'] = 7; // remove topic moved links after xx days (or FALSE to disable) $bb_cfg['topic_moved_days_keep'] = 7; // remove topic moved links after xx days (or FALSE to disable)
$bb_cfg['allowed_posts_per_page'] = array(15, 30, 50, 100); $bb_cfg['allowed_posts_per_page'] = array(15, 30, 50, 100);
$bb_cfg['user_signature_start'] = '<div class="signature"><br />_________________<br />'; $bb_cfg['user_signature_start'] = '<div class="signature"><br />_________________<br />';
$bb_cfg['user_signature_end'] = '</div>'; // Это позволит использовать html теги, которые требуют закрытия. Например <table> или <font color> $bb_cfg['user_signature_end'] = '</div>'; // Это позволит использовать html теги, которые требуют закрытия. Например <table> или <font color>
// Posts // Posts
$bb_cfg['use_posts_cache'] = true; // if you switch from ON to OFF, you need to TRUNCATE `bb_posts_html` table $bb_cfg['use_posts_cache'] = true; // if you switch from ON to OFF, you need to TRUNCATE `bb_posts_html` table
@ -475,7 +475,6 @@ $bb_cfg['max_search_words_per_post'] = 200;
$bb_cfg['search_min_word_len'] = 3; $bb_cfg['search_min_word_len'] = 3;
$bb_cfg['search_max_word_len'] = 35; $bb_cfg['search_max_word_len'] = 35;
$bb_cfg['limit_max_search_results'] = false; $bb_cfg['limit_max_search_results'] = false;
$bb_cfg['tidy_post'] = true;
$bb_cfg['spam_filter_file_path'] = ''; //BB_PATH .'/misc/spam_filter_words.txt'; $bb_cfg['spam_filter_file_path'] = ''; //BB_PATH .'/misc/spam_filter_words.txt';
// Posting // Posting
@ -502,7 +501,7 @@ $bb_cfg['user_not_active_days_keep'] = 180; // inactive users but only wi
$bb_cfg['groupcp_members_per_page'] = 300; $bb_cfg['groupcp_members_per_page'] = 300;
// Tidy // Tidy
if ($bb_cfg['tidy_post'] && !function_exists('tidy_repair_string') or !extension_loaded('tidy')) die('Set $bb_cfg[\'tidy_post\'] = false in config.php'); $bb_cfg['tidy_post'] = (!extension_loaded('tidy')) ? false : true;
// Ads // Ads
$bb_cfg['show_ads'] = false; $bb_cfg['show_ads'] = false;
@ -581,15 +580,14 @@ $banned_user_agents = array(
# 'wget', # 'wget',
); );
$bb_cfg['porno_forums_screenshots_topic_id'] = 0; // (int) 7 $bb_cfg['trash_forum_id'] = 0; // (int) 7
$bb_cfg['trash_forum_id'] = 0; // (int) 7
$bb_cfg['first_logon_redirect_url'] = 'index.php'; $bb_cfg['first_logon_redirect_url'] = 'index.php';
$bb_cfg['terms_and_conditions_url'] = 'index.php'; $bb_cfg['terms_and_conditions_url'] = 'index.php';
$bb_cfg['user_agreement_url'] = 'misc.php?do=info&show=user_agreement'; $bb_cfg['user_agreement_url'] = 'misc.php?do=info&show=user_agreement';
$bb_cfg['copyright_holders_url'] = 'misc.php?do=info&show=copyright_holders'; $bb_cfg['copyright_holders_url'] = 'misc.php?do=info&show=copyright_holders';
$bb_cfg['advert_url'] = 'misc.php?do=info&show=advert'; $bb_cfg['advert_url'] = 'misc.php?do=info&show=advert';
// Captcha // Captcha
$bb_cfg['captcha'] = array( $bb_cfg['captcha'] = array(

1
upload/download.php
View file

@ -164,7 +164,6 @@ for ($i = 0; $i < $num_auth_pages && $authorised == false; $i++)
} }
} }
if (!$authorised) if (!$authorised)
{ {
bb_die($lang['SORRY_AUTH_VIEW_ATTACH']); bb_die($lang['SORRY_AUTH_VIEW_ATTACH']);

1
upload/includes/class.utf8.php
View file

@ -3078,7 +3078,6 @@ class UTF8
return self::convert_case($data, CASE_UPPER); return self::convert_case($data, CASE_UPPER);
} }
/** /**
* Convert all HTML entities to native UTF-8 characters * Convert all HTML entities to native UTF-8 characters
* Функция декодирует гораздо больше именованных сущностей, чем стандартная html_entity_decode() * Функция декодирует гораздо больше именованных сущностей, чем стандартная html_entity_decode()

7
upload/includes/functions.php
View file

@ -2313,7 +2313,6 @@ function poll_is_active ($t_data)
return ($t_data['topic_vote'] == 1 && $t_data['topic_time'] > TIMENOW - $bb_cfg['poll_max_days']*86400); return ($t_data['topic_vote'] == 1 && $t_data['topic_time'] > TIMENOW - $bb_cfg['poll_max_days']*86400);
} }
function print_confirmation ($tpl_vars) function print_confirmation ($tpl_vars)
{ {
global $template, $lang; global $template, $lang;
@ -2813,13 +2812,13 @@ function gender_image ($gender)
switch ($gender) switch ($gender)
{ {
case MALE: case MALE:
$user_gender = '<img src="'. $images['icon_male'] .'" alt="'. $lang['GENDER_SELECT'][1] .'" title="'. $lang['GENDER_SELECT'][1] .'" border="0" />'; $user_gender = '<img src="'. $images['icon_male'] .'" alt="'. $lang['GENDER_SELECT'][MALE] .'" title="'. $lang['GENDER_SELECT'][MALE] .'" border="0" />';
break; break;
case FEMALE: case FEMALE:
$user_gender = '<img src="'. $images['icon_female'] .'" alt="'. $lang['GENDER_SELECT'][1] .'" title="'. $lang['GENDER_SELECT'][2] .'" border="0" />'; $user_gender = '<img src="'. $images['icon_female'] .'" alt="'. $lang['GENDER_SELECT'][FEMALE] .'" title="'. $lang['GENDER_SELECT'][FEMALE] .'" border="0" />';
break; break;
default: default:
$user_gender = '<img src="'. $images['icon_nogender'] .'" alt="'. $lang['GENDER_SELECT'][0] .'" title="'. $lang['GENDER_SELECT'][0] .'" border="0" />'; $user_gender = '<img src="'. $images['icon_nogender'] .'" alt="'. $lang['GENDER_SELECT'][NOGENDER] .'" title="'. $lang['GENDER_SELECT'][NOGENDER] .'" border="0" />';
break; break;
} }
} }

2
upload/includes/functions_post.php
View file

@ -406,7 +406,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
if ($update_watched_sql) if ($update_watched_sql)
{ {
DB()->query("UPDATE ". BB_TOPICS_WATCH ." DB()->query("UPDATE ". BB_TOPICS_WATCH ."
SET notify_status = ". TOPIC_WATCH_UN_NOTIFIED ." SET notify_status = ". TOPIC_WATCH_UNNOTIFIED ."
WHERE topic_id = $topic_id WHERE topic_id = $topic_id
AND user_id IN ($update_watched_sql) AND user_id IN ($update_watched_sql)
"); ");

1
upload/includes/functions_report.php
View file

@ -581,7 +581,6 @@ function report_count_obtain()
return $report_count; return $report_count;
} }
// //
// Obtains reports (for a specific report module if $module_id is defined) // Obtains reports (for a specific report module if $module_id is defined)
// Includes authorisation check if $auth_check is set to true. // Includes authorisation check if $auth_check is set to true.

5
upload/includes/init_bb.php
View file

@ -161,7 +161,7 @@ define('TOPIC_LOCKED', 1);
define('TOPIC_MOVED', 2); define('TOPIC_MOVED', 2);
define('TOPIC_WATCH_NOTIFIED', 1); define('TOPIC_WATCH_NOTIFIED', 1);
define('TOPIC_WATCH_UN_NOTIFIED', 0); define('TOPIC_WATCH_UNNOTIFIED', 0);
// Topic types // Topic types
define('POST_NORMAL', 0); define('POST_NORMAL', 0);
@ -240,6 +240,7 @@ define('POST_REPORT_REASON_URL', 'r');
// Gender // Gender
define('MALE', 1); define('MALE', 1);
define('FEMALE', 2); define('FEMALE', 2);
define('NOGENDER', 0);
// Poll // Poll
# 1 - обычный опрос # 1 - обычный опрос
@ -428,7 +429,7 @@ if (!empty($banned_user_agents))
{ {
if (strstr(USER_AGENT, $agent)) if (strstr(USER_AGENT, $agent))
{ {
$filename = 'Skachivajte fajly brauzerom (скачивайте файлы браузером)'; $filename = 'Download files by using browser';
$output = '@'; $output = '@';
header('Content-Type: text/plain'); header('Content-Type: text/plain');
header('Content-Disposition: attachment; filename="'. $filename .'"'); header('Content-Disposition: attachment; filename="'. $filename .'"');

4
upload/includes/sessions.php
View file

@ -657,9 +657,6 @@ class user_common
bb_setcookie(COOKIE_TOPIC, ''); bb_setcookie(COOKIE_TOPIC, '');
bb_setcookie(COOKIE_FORUM, ''); bb_setcookie(COOKIE_FORUM, '');
bb_setcookie(COOKIE_MARK, ''); bb_setcookie(COOKIE_MARK, '');
// Info message
# $template->assign_var('INFO_MESSAGE', $lang['FORUMS_MARKED_READ']);
} }
} }
@ -797,7 +794,6 @@ class user_common
} }
} }
// //
// userdata cache // userdata cache
// //

3
upload/includes/template.php
View file

@ -33,7 +33,6 @@ define('XS_TAG_ELSEIF', 7);
define('XS_TAG_ENDIF', 8); define('XS_TAG_ENDIF', 8);
define('XS_TAG_BEGINELSE', 11); define('XS_TAG_BEGINELSE', 11);
class Template class Template
{ {
var $classname = "Template"; var $classname = "Template";
@ -528,7 +527,6 @@ class Template
return $varref; return $varref;
} }
/** /**
* Generates a reference to the array of data values for the given * Generates a reference to the array of data values for the given
* (possibly nested) block namespace. This is a string of the form: * (possibly nested) block namespace. This is a string of the form:
@ -1134,7 +1132,6 @@ class Template
return $tokens; return $tokens;
} }
/** /**
* Compiles code and writes to cache if needed * Compiles code and writes to cache if needed
*/ */

2
upload/includes/ucp/register.php
View file

@ -522,7 +522,6 @@ foreach ($profile_fields as $field => $can_edit)
$tp_data['USER_OCC'] = $pr_data['user_occ']; $tp_data['USER_OCC'] = $pr_data['user_occ'];
break; break;
/** /**
* Интересы * Интересы
*/ */
@ -554,7 +553,6 @@ foreach ($profile_fields as $field => $can_edit)
$tp_data['USER_SKYPE'] = $pr_data['user_skype']; $tp_data['USER_SKYPE'] = $pr_data['user_skype'];
break; break;
/** /**
* Twitter * Twitter
*/ */

20
upload/includes/ucp/viewprofile.php
View file

@ -120,7 +120,7 @@ $template->assign_vars(array(
'SKYPE' => $profiledata['user_skype'], 'SKYPE' => $profiledata['user_skype'],
'TWITTER' => $profiledata['user_twitter'], 'TWITTER' => $profiledata['user_twitter'],
'USER_POINTS' => $profiledata['user_points'], 'USER_POINTS' => $profiledata['user_points'],
'GENDER' => ($bb_cfg['gender'] && $profiledata['user_gender']) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '', 'GENDER' => ($bb_cfg['gender']) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '',
'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '', 'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '',
'AGE' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '', 'AGE' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '',
@ -189,13 +189,13 @@ else if (IS_MOD)
// Show users torrent-profile // Show users torrent-profile
if (IS_AM || $profile_user_id || !bf($profiledata['user_opt'], 'user_opt', 'user_dls')) if (IS_AM || $profile_user_id || !bf($profiledata['user_opt'], 'user_opt', 'user_dls'))
{ {
require(INC_DIR .'ucp/viewtorrent.php'); require(INC_DIR .'ucp/viewtorrent.php');
} }
// Ajax bt_userdata // Ajax bt_userdata
if (IS_AM || $profile_user_id) if (IS_AM || $profile_user_id)
{ {
show_bt_userdata($profiledata['user_id']); show_bt_userdata($profiledata['user_id']);
} }
else else
{ {
@ -227,13 +227,13 @@ if (IS_ADMIN)
$user_restrictions = array(); $user_restrictions = array();
if (bf($profiledata['user_opt'], 'user_opt', 'dis_avatar')) $user_restrictions[] = $lang['HIDE_AVATARS']; if (bf($profiledata['user_opt'], 'user_opt', 'dis_avatar')) $user_restrictions[] = $lang['HIDE_AVATARS'];
if (bf($profiledata['user_opt'], 'user_opt', 'dis_sig')) $user_restrictions[] = $lang['SHOW_CAPTION']; if (bf($profiledata['user_opt'], 'user_opt', 'dis_sig')) $user_restrictions[] = $lang['SHOW_CAPTION'];
if (bf($profiledata['user_opt'], 'user_opt', 'dis_passkey')) $user_restrictions[] = $lang['DOWNLOAD_TORRENT']; if (bf($profiledata['user_opt'], 'user_opt', 'dis_passkey')) $user_restrictions[] = $lang['DOWNLOAD_TORRENT'];
if (bf($profiledata['user_opt'], 'user_opt', 'dis_pm')) $user_restrictions[] = $lang['SEND_PM']; if (bf($profiledata['user_opt'], 'user_opt', 'dis_pm')) $user_restrictions[] = $lang['SEND_PM'];
if (bf($profiledata['user_opt'], 'user_opt', 'dis_post')) $user_restrictions[] = $lang['SEND_MESSAGE']; if (bf($profiledata['user_opt'], 'user_opt', 'dis_post')) $user_restrictions[] = $lang['SEND_MESSAGE'];
if (bf($profiledata['user_opt'], 'user_opt', 'dis_post_edit')) $user_restrictions[] = $lang['EDIT_POST']; if (bf($profiledata['user_opt'], 'user_opt', 'dis_post_edit')) $user_restrictions[] = $lang['EDIT_POST'];
if (bf($profiledata['user_opt'], 'user_opt', 'dis_topic')) $user_restrictions[] = $lang['NEW_THREADS']; if (bf($profiledata['user_opt'], 'user_opt', 'dis_topic')) $user_restrictions[] = $lang['NEW_THREADS'];
$template->assign_var('USER_RESTRICTIONS', join('</li><li>', $user_restrictions)); $template->assign_var('USER_RESTRICTIONS', join('</li><li>', $user_restrictions));

60
upload/includes/ucp/viewtorrent.php
View file

@ -51,15 +51,15 @@ if ($releasing)
$is_gold = ''; $is_gold = '';
if ($tr_cfg['gold_silver_enabled']) if ($tr_cfg['gold_silver_enabled'])
{ {
if ($row['tor_type'] == TOR_TYPE_GOLD) if ($row['tor_type'] == TOR_TYPE_GOLD)
{ {
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;'; $is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
} }
elseif ($row['tor_type'] == TOR_TYPE_SILVER) elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{ {
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;'; $is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
} }
} }
$topic_title = wbr($row['topic_title']); $topic_title = wbr($row['topic_title']);
@ -71,7 +71,7 @@ if ($releasing)
'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'], 'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
'TOR_TYPE' => $is_gold, 'TOR_TYPE' => $is_gold,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0, 'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0, 'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') .'/s' : '-', 'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') .'/s' : '-',
)); ));
@ -86,15 +86,15 @@ if ($seeding)
$is_gold = ''; $is_gold = '';
if ($tr_cfg['gold_silver_enabled']) if ($tr_cfg['gold_silver_enabled'])
{ {
if ($row['tor_type'] == TOR_TYPE_GOLD) if ($row['tor_type'] == TOR_TYPE_GOLD)
{ {
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;'; $is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
} }
elseif ($row['tor_type'] == TOR_TYPE_SILVER) elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{ {
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;'; $is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
} }
} }
$topic_title = wbr($row['topic_title']); $topic_title = wbr($row['topic_title']);
@ -106,7 +106,7 @@ if ($seeding)
'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'], 'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
'TOR_TYPE' => $is_gold, 'TOR_TYPE' => $is_gold,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0, 'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0, 'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') .'/s' : '-', 'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') .'/s' : '-',
)); ));
@ -121,15 +121,15 @@ if ($leeching)
$is_gold = ''; $is_gold = '';
if ($tr_cfg['gold_silver_enabled']) if ($tr_cfg['gold_silver_enabled'])
{ {
if ($row['tor_type'] == TOR_TYPE_GOLD) if ($row['tor_type'] == TOR_TYPE_GOLD)
{ {
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'.$lang['GOLD'].'" />&nbsp;'; $is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'.$lang['GOLD'].'" />&nbsp;';
} }
elseif ($row['tor_type'] == TOR_TYPE_SILVER) elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{ {
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'.$lang['SILVER'].'" />&nbsp;'; $is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'.$lang['SILVER'].'" />&nbsp;';
} }
} }
$compl_size = ($row['remain'] && $row['size'] && $row['size'] > $row['remain']) ? ($row['size'] - $row['remain']) : 0; $compl_size = ($row['remain'] && $row['size'] && $row['size'] > $row['remain']) ? ($row['size'] - $row['remain']) : 0;
$compl_perc = ($compl_size) ? floor($compl_size * 100 / $row['size']) : 0; $compl_perc = ($compl_size) ? floor($compl_size * 100 / $row['size']) : 0;
@ -144,7 +144,7 @@ if ($leeching)
'COMPL_PERC' => $compl_perc, 'COMPL_PERC' => $compl_perc,
'TOR_TYPE' => $is_gold, 'TOR_TYPE' => $is_gold,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0, 'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0, 'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'SPEED_DOWN' => ($row['speed_down']) ? humn_size($row['speed_down'], 0, 'KB') .'/s' : '-', 'SPEED_DOWN' => ($row['speed_down']) ? humn_size($row['speed_down'], 0, 'KB') .'/s' : '-',
)); ));

2
upload/index.php
View file

@ -24,7 +24,7 @@ if ($bb_cfg['show_latest_news'])
} }
if ($bb_cfg['show_network_news']) if ($bb_cfg['show_network_news'])
{ {
$datastore->enqueue('network_news'); $datastore->enqueue('network_news');
} }
// Init userdata // Init userdata

1
upload/language/en/html/copyright_holders.html
View file

@ -10,7 +10,6 @@
</style> </style>
<div id="infobox-body"> <div id="infobox-body">
<p>Information for copyright holders.</p> <p>Information for copyright holders.</p>

3
upload/language/en/main.php
View file

@ -234,7 +234,6 @@ $lang['RULES_MODERATE'] = 'You <b>can</b> moderate this forum';
$lang['NO_TOPICS_POST_ONE'] = 'There are no posts in this forum.<br />Click on the <b>Post New Topic</b> link on this page to post one.'; $lang['NO_TOPICS_POST_ONE'] = 'There are no posts in this forum.<br />Click on the <b>Post New Topic</b> link on this page to post one.';
// //
// Viewtopic // Viewtopic
// //
@ -696,7 +695,6 @@ $lang['ASC'] = 'Ascending';
$lang['DESC'] = 'Descending'; $lang['DESC'] = 'Descending';
$lang['ORDER'] = 'Order'; $lang['ORDER'] = 'Order';
// //
// Group control panel // Group control panel
// //
@ -842,7 +840,6 @@ $lang['NOT_AUTHORISED'] = 'Not Authorised';
$lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum.<br />Please contact the webmaster or board administrator for more information.'; $lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum.<br />Please contact the webmaster or board administrator for more information.';
// //
// Viewonline // Viewonline
// //

1
upload/language/ru/html/copyright_holders.html
View file

@ -10,7 +10,6 @@
</style> </style>
<div id="infobox-body"> <div id="infobox-body">
<p>Информация для правообладателей.</p> <p>Информация для правообладателей.</p>

3
upload/language/ru/main.php
View file

@ -234,7 +234,6 @@ $lang['RULES_MODERATE'] = 'Вы <b>можете</b> модерировать э
$lang['NO_TOPICS_POST_ONE'] = 'В этом форуме пока нет сообщений<br />Кликните <b>Начать новую тему</b>, и ваше сообщение станет первым.'; $lang['NO_TOPICS_POST_ONE'] = 'В этом форуме пока нет сообщений<br />Кликните <b>Начать новую тему</b>, и ваше сообщение станет первым.';
// //
// Viewtopic // Viewtopic
// //
@ -696,7 +695,6 @@ $lang['ASC'] = 'по возрастанию';
$lang['DESC'] = 'по убыванию'; $lang['DESC'] = 'по убыванию';
$lang['ORDER'] = ''; // не нужно, в английском используется в контексте 'Order ascending'; $lang['ORDER'] = ''; // не нужно, в английском используется в контексте 'Order ascending';
// //
// Group control panel // Group control panel
// //
@ -842,7 +840,6 @@ $lang['NOT_AUTHORISED'] = 'Нет доступа';
$lang['YOU_BEEN_BANNED'] = 'Вам был закрыт доступ к форуму<br />Обратитесь к вебмастеру или администратору сайта за дополнительной информацией'; $lang['YOU_BEEN_BANNED'] = 'Вам был закрыт доступ к форуму<br />Обратитесь к вебмастеру или администратору сайта за дополнительной информацией';
// //
// Viewonline // Viewonline
// //

1
upload/language/ua/html/copyright_holders.html
View file

@ -10,7 +10,6 @@
</style> </style>
<div id="infobox-body"> <div id="infobox-body">
<p>Інформація для правовласників.</p> <p>Інформація для правовласників.</p>

3
upload/language/ua/main.php
View file

@ -234,7 +234,6 @@ $lang['RULES_MODERATE'] = 'Ви <b>можете</b> модерувати цей
$lang['NO_TOPICS_POST_ONE'] = 'У цьому форумі поки немає повідомлень<br />Натисніть <b>Почати нову тему</b>, і ваше повідомлення буде першим.'; $lang['NO_TOPICS_POST_ONE'] = 'У цьому форумі поки немає повідомлень<br />Натисніть <b>Почати нову тему</b>, і ваше повідомлення буде першим.';
// //
// Viewtopic // Viewtopic
// //
@ -696,7 +695,6 @@ $lang['ASC'] = 'за зростанням';
$lang['DESC'] = 'за спаданням'; $lang['DESC'] = 'за спаданням';
$lang['ORDER'] = ''; // не потрібно, в англійській використовується в контексті 'ascending Order'; $lang['ORDER'] = ''; // не потрібно, в англійській використовується в контексті 'ascending Order';
// //
// Group control panel // Group control panel
// //
@ -842,7 +840,6 @@ $lang['NOT_AUTHORISED'] = 'Немає доступу';
$lang['YOU_BEEN_BANNED'] = 'Вам був закритий доступ до форуму<br />Зверніться до вебмайстру або адміністратору сайту за додатковою інформацією'; $lang['YOU_BEEN_BANNED'] = 'Вам був закритий доступ до форуму<br />Зверніться до вебмайстру або адміністратору сайту за додатковою інформацією';
// //
// Viewonline // Viewonline
// //

8
upload/login.php
View file

@ -103,13 +103,13 @@ if (isset($_POST['login']))
$login_errors[] = $lang['ERROR_LOGIN']; $login_errors[] = $lang['ERROR_LOGIN'];
if(!$mod_admin_login) if (!$mod_admin_login)
{ {
$login_err = CACHE('bb_login_err')->get('l_err_'. USER_IP); $login_err = CACHE('bb_login_err')->get('l_err_'. USER_IP);
if($login_err > $bb_cfg['invalid_logins']) $need_captcha = true; if ($login_err > $bb_cfg['invalid_logins']) $need_captcha = true;
if($login_err > 50) if ($login_err > 50)
{ {
// забанить ип :) // TODO temp ban ip
} }
CACHE('bb_login_err')->set('l_err_'. USER_IP, ($login_err + 1), 3600); CACHE('bb_login_err')->set('l_err_'. USER_IP, ($login_err + 1), 3600);
} }

1
upload/poll.php
View file

@ -162,7 +162,6 @@ switch ($mode)
// Functions // Functions
// //
class bb_poll class bb_poll
{ {
var $err_msg = ''; var $err_msg = '';

4
upload/search.php
View file

@ -707,14 +707,14 @@ else
if ($text_match_sql) if ($text_match_sql)
{ {
$search_match_topics_csv = ''; $search_match_topics_csv = '';
$title_match_topics = get_title_match_topics($text_match_sql, $forum_selected); $title_match_topics = get_title_match_topics($text_match_sql, $forum_selected);
if (!$search_match_topics_csv = join(',', $title_match_topics)) if (!$search_match_topics_csv = join(',', $title_match_topics))
{ {
bb_die($lang['NO_SEARCH_MATCH']); bb_die($lang['NO_SEARCH_MATCH']);
} }
$where_id = ($title_match) ? 't.topic_id' : 'p.post_id'; $where_id = ($title_match) ? 't.topic_id' : 'p.post_id';
$SQL['WHERE'][] = "$where_id IN($search_match_topics_csv)"; $SQL['WHERE'][] = "$where_id IN($search_match_topics_csv)";
prevent_huge_searches($SQL); prevent_huge_searches($SQL);

10
upload/stats/tracker.php
View file

@ -4,19 +4,12 @@ define('IN_ADMIN', true);
define('BB_ROOT', './../'); define('BB_ROOT', './../');
require(BB_ROOT .'common.php'); require(BB_ROOT .'common.php');
############################################################################
$peers_in_last_minutes = array(30, 15, 5, 1); $peers_in_last_minutes = array(30, 15, 5, 1);
$peers_in_last_sec_limit = 300; $peers_in_last_sec_limit = 300;
############################################################################
$announce_interval = intval($bb_cfg['announce_interval']); $announce_interval = intval($bb_cfg['announce_interval']);
$stat = array(); $stat = array();
define('TMP_TRACKER_TABLE', 'tmp_tracker'); define('TMP_TRACKER_TABLE', 'tmp_tracker');
DB()->query(" DB()->query("
@ -39,7 +32,6 @@ $stat += DB()->fetch_row("SELECT COUNT(*) AS p_within_ann FROM ". TMP_TRACKER_TA
// All peers, "max_peer_time" // All peers, "max_peer_time"
$stat += DB()->fetch_row("SELECT COUNT(*) AS p_all, SUM(speed_up) as speed_up, SUM(speed_down) as speed_down, UNIX_TIMESTAMP() - MIN(update_time) AS max_peer_time, UNIX_TIMESTAMP() - MAX(update_time) AS last_peer_time FROM ". TMP_TRACKER_TABLE); $stat += DB()->fetch_row("SELECT COUNT(*) AS p_all, SUM(speed_up) as speed_up, SUM(speed_down) as speed_down, UNIX_TIMESTAMP() - MIN(update_time) AS max_peer_time, UNIX_TIMESTAMP() - MAX(update_time) AS last_peer_time FROM ". TMP_TRACKER_TABLE);
// Active users // Active users
$stat += DB()->fetch_row("SELECT COUNT(DISTINCT user_id) AS u_bt_active FROM ". TMP_TRACKER_TABLE); $stat += DB()->fetch_row("SELECT COUNT(DISTINCT user_id) AS u_bt_active FROM ". TMP_TRACKER_TABLE);
// All bt-users // All bt-users
@ -47,7 +39,6 @@ $stat += DB()->fetch_row("SELECT COUNT(*) AS u_bt_all FROM ". BB_BT_USERS);
// All bb-users // All bb-users
$stat += DB()->fetch_row("SELECT COUNT(*) AS u_bb_all FROM ". BB_USERS); $stat += DB()->fetch_row("SELECT COUNT(*) AS u_bb_all FROM ". BB_USERS);
// Active torrents // Active torrents
$stat += DB()->fetch_row("SELECT COUNT(DISTINCT topic_id) AS tor_active FROM ". TMP_TRACKER_TABLE); $stat += DB()->fetch_row("SELECT COUNT(DISTINCT topic_id) AS tor_active FROM ". TMP_TRACKER_TABLE);
// With seeder // With seeder
@ -55,7 +46,6 @@ $stat += DB()->fetch_row("SELECT COUNT(DISTINCT topic_id) AS tor_with_seeder FRO
// All torrents // All torrents
$stat += DB()->fetch_row("SELECT COUNT(*) AS tor_all, SUM(size) AS torrents_size FROM ". BB_BT_TORRENTS); $stat += DB()->fetch_row("SELECT COUNT(*) AS tor_all, SUM(size) AS torrents_size FROM ". BB_BT_TORRENTS);
// Last xx minutes // Last xx minutes
$peers_in_last_min = array(); $peers_in_last_min = array();
foreach ($peers_in_last_minutes as $t) foreach ($peers_in_last_minutes as $t)

1
upload/templates/admin/admin_cron.tpl
View file

@ -124,7 +124,6 @@ tr.hl-tr:hover td { background-color: #CFC !important; }
<!-- IF TPL_CRON_EDIT --> <!-- IF TPL_CRON_EDIT -->
<h1>{L_CRON_EDIT_HEAD}</h1> <h1>{L_CRON_EDIT_HEAD}</h1>
<a href="admin_cron.php?mode=list">{L_CRON_LIST}</a> <a href="admin_cron.php?mode=list">{L_CRON_LIST}</a>
<br /><br /> <br /><br />

3
upload/templates/admin/admin_forumauth.tpl
View file

@ -63,6 +63,3 @@
</form> </form>
<!--========================================================================--> <!--========================================================================-->
<!-- ENDIF / TPL_EDIT_FORUM_AUTH --> <!-- ENDIF / TPL_EDIT_FORUM_AUTH -->

2
upload/templates/admin/admin_log.tpl
View file

@ -96,10 +96,8 @@ table.log_filters td {
</tr> </tr>
</table> </table>
<div class="spacer_8"></div> <div class="spacer_8"></div>
<table class="forumline"> <table class="forumline">
<tr> <tr>
<th>{L_ACTS_LOG_LOGS_ACTION}</th> <th>{L_ACTS_LOG_LOGS_ACTION}</th>

1
upload/templates/default/css/main.css
View file

@ -1533,4 +1533,3 @@ div#autocomplete_popup span.regenerate {
background-repeat: repeat-x; background-repeat: repeat-x;
border-color: #dca7a7; border-color: #dca7a7;
} }

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

@ -42,7 +42,6 @@
<!--========================================================================--> <!--========================================================================-->
<!-- ENDIF / SELECT_GROUP --> <!-- ENDIF / SELECT_GROUP -->
<!-- IF GROUP_INFO --> <!-- IF GROUP_INFO -->
<!--========================================================================--> <!--========================================================================-->
@ -217,7 +216,7 @@
<td>{pending.PM}</td> <td>{pending.PM}</td>
<td>{pending.EMAIL}</td> <td>{pending.EMAIL}</td>
<td>{pending.FROM}</td> <td>{pending.FROM}</td>
<td class="small">{pending.JOINED}</td> <td>{pending.JOINED}</td>
<td>{pending.POSTS}</td> <td>{pending.POSTS}</td>
<td>{pending.WWW}</td> <td>{pending.WWW}</td>
</tr> </tr>

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

@ -116,11 +116,6 @@
</p> </p>
<!-- END last --> <!-- END last -->
<p class="f_stat_inline hidden">
<span class="f_stat_topics"><em>{L_TOPICS_SHORT}:</em> {c.f.TOPICS}</span>
<span class="f_stat_posts"><em>{L_POSTS_SHORT}:</em> {c.f.POSTS}</span>
</p>
<!-- ELSE / start of !c.f.POSTS --> <!-- ELSE / start of !c.f.POSTS -->
{L_NO_POSTS} {L_NO_POSTS}
<!-- ENDIF --> <!-- ENDIF -->

1
upload/templates/default/login.tpl
View file

@ -21,7 +21,6 @@
<h4 class="tCenter mrg_16">{L_ENTER_PASSWORD}</h4> <h4 class="tCenter mrg_16">{L_ENTER_PASSWORD}</h4>
<!-- ENDIF --> <!-- ENDIF -->
<div class="mrg_16"> <div class="mrg_16">
<table class="borderless bCenter"> <table class="borderless bCenter">
<tr> <tr>

2
upload/templates/default/modcp.tpl
View file

@ -47,7 +47,6 @@
<!--========================================================================--> <!--========================================================================-->
<!-- ENDIF / TPL_MODCP_IP --> <!-- ENDIF / TPL_MODCP_IP -->
<!-- IF TPL_MODCP_MOVE --> <!-- IF TPL_MODCP_MOVE -->
<!--========================================================================--> <!--========================================================================-->
@ -115,7 +114,6 @@
<!--========================================================================--> <!--========================================================================-->
<!-- ENDIF / TPL_MODCP_MOVE --> <!-- ENDIF / TPL_MODCP_MOVE -->
<div class="bottom_info"> <div class="bottom_info">
<div class="spacer_4"></div> <div class="spacer_4"></div>

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

@ -249,7 +249,7 @@ if ( (typeof(window.opera) != "undefined" && window.opera.version() < 13) || (wi
<a href="{U_SEARCH}"><b>{L_SEARCH}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_SEARCH}"><b>{L_SEARCH}</b></a><span style="color:#CDCDCD;">|</span>
<a href="{U_TERMS}"><b style="color: #993300;">{L_TERMS}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_TERMS}"><b style="color: #993300;">{L_TERMS}</b></a><span style="color:#CDCDCD;">|</span>
<a href="{U_GROUP_CP}"><b>{L_USERGROUPS}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_GROUP_CP}"><b>{L_USERGROUPS}</b></a><span style="color:#CDCDCD;">|</span>
<a href="{U_MEMBERLIST}"><b>{L_MEMBERLIST}</b></a><span style="color:#CDCDCD;">|</span> <a href="{U_MEMBERLIST}"><b>{L_MEMBERLIST}</b></a>
</td> </td>
<td class="nowrap" align="right"> <td class="nowrap" align="right">
<!-- BEGIN switch_report_list --> <!-- BEGIN switch_report_list -->
@ -518,13 +518,5 @@ $(document).ready(function() {
</div> </div>
<!-- ENDIF / ERROR_MESSAGE --> <!-- ENDIF / ERROR_MESSAGE -->
<!-- IF INFO_MESSAGE -->
<div class="info_msg_wrap">
<table class="info_msg">
<tr><td><div class="msg">{INFO_MESSAGE}</div></td></tr>
</table>
</div>
<!-- ENDIF / INFO_MESSAGE -->
<!-- page_header.tpl END --> <!-- page_header.tpl END -->
<!-- module_xx.tpl START --> <!-- module_xx.tpl START -->

7
upload/templates/default/posting.tpl
View file

@ -71,7 +71,7 @@
</tr> </tr>
<tr id="view_message" class="hidden"> <tr id="view_message" class="hidden">
<td colspan="2"> <td colspan="2">
<div class="view-message"></div> <div class="view-message"></div>
</td> </td>
</tr> </tr>
<!-- IF POSTING_USERNAME --> <!-- IF POSTING_USERNAME -->
@ -109,9 +109,8 @@
</tr> </tr>
<!-- END switch_smilies_extra --> <!-- END switch_smilies_extra -->
</table><!--/smilies--> </table><!--/smilies-->
</td>
</td> <td class="vTop pad_0 w100"><!-- INCLUDE posting_editor.tpl --></td>
<td class="vTop pad_0 w100"><!-- INCLUDE posting_editor.tpl --></td>
</tr> </tr>
<!-- IF IN_PM --> <!-- IF IN_PM -->
<!-- ELSEIF LOGGED_IN --> <!-- ELSEIF LOGGED_IN -->

1
upload/templates/default/posting_attach.tpl
View file

@ -29,7 +29,6 @@
<!--========================================================================--> <!--========================================================================-->
<!-- ENDIF / TPL_ADD_ATTACHMENT --> <!-- ENDIF / TPL_ADD_ATTACHMENT -->
<!-- IF TPL_POSTED_ATTACHMENTS --> <!-- IF TPL_POSTED_ATTACHMENTS -->
<!--========================================================================--> <!--========================================================================-->

52
upload/templates/default/posting_smilies.tpl
View file

@ -15,30 +15,32 @@ function emoticon(text) {
<table width="100%" cellpadding="10"> <table width="100%" cellpadding="10">
<tr> <tr>
<td> <td>
<table class="forumline"> <table class="forumline">
<tr> <tr>
<th>{L_EMOTICONS}</th> <th>{L_EMOTICONS}</th>
</tr> </tr>
<tr> <tr>
<td class="row1"> <td class="row1">
<table class="borderless w100" cellpadding="5"> <table class="borderless w100" cellpadding="5">
<!-- BEGIN smilies_row --> <!-- BEGIN smilies_row -->
<tr align="center"> <tr align="center">
<!-- BEGIN smilies_col --> <!-- BEGIN smilies_col -->
<td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td> <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td>
<!-- END smilies_col --> <!-- END smilies_col -->
</tr> </tr>
<!-- END smilies_row --> <!-- END smilies_row -->
<!-- BEGIN switch_smilies_extra --> <!-- BEGIN switch_smilies_extra -->
<tr align="center"> <tr align="center">
<td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="open_window('{U_MORE_SMILIES}', 250, 300);return false" target="_smilies" class="nav">{L_MORE_EMOTICONS}</a></td> <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="open_window('{U_MORE_SMILIES}', 250, 300);return false" target="_smilies" class="nav">{L_MORE_EMOTICONS}</a></td>
</tr> </tr>
<!-- END switch_smilies_extra --> <!-- END switch_smilies_extra -->
</table></td> </table>
</tr> </td>
<tr> </tr>
<td class="row2" align="center"><br /><span class="med"><a href="javascript:window.close();" class="med">{L_CLOSE_WINDOW}</a></span></td> <tr>
</tr> <td class="row2" align="center"><br /><span class="med"><a href="javascript:window.close();" class="med">{L_CLOSE_WINDOW}</a></span></td>
</table></td> </tr>
</table>
</td>
</tr> </tr>
</table> </table>

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

@ -571,7 +571,6 @@ var TPL = {
submit_fn : {} submit_fn : {}
}; };
/* /*
------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------
-- el_attr -------------------------------------------------------------------------------------- -- el_attr --------------------------------------------------------------------------------------
@ -4722,7 +4721,6 @@ $(function(){
<div id="tyt_faq_url"> <a href="http://rutracker.org/forum/viewtopic.php?t=2135853" target="_blank"><b>тут</b></a> </div> <div id="tyt_faq_url"> <a href="http://rutracker.org/forum/viewtopic.php?t=2135853" target="_blank"><b>тут</b></a> </div>
<!--/tyt_faq_url--> <!--/tyt_faq_url-->
<!--wtf_faq_url--> <!--wtf_faq_url-->
<div id="wtf_faq_url"> <a href="http://rutracker.org/forum/viewtopic.php?t=488848#other" target="_blank"><b>Что это значит?</b></a> </div> <div id="wtf_faq_url"> <a href="http://rutracker.org/forum/viewtopic.php?t=488848#other" target="_blank"><b>Что это значит?</b></a> </div>
<!--/wtf_faq_url--> <!--/wtf_faq_url-->
@ -4767,7 +4765,6 @@ $(function(){
<div id="file_list"> <a href="http://rutracker.org/forum/viewtopic.php?p=21307338#21307338" target="_blank"><b>Как создать список файлов?</b></a></div> <div id="file_list"> <a href="http://rutracker.org/forum/viewtopic.php?p=21307338#21307338" target="_blank"><b>Как создать список файлов?</b></a></div>
<!--/file_list--> <!--/file_list-->
<!--faq_traclist--> <!--faq_traclist-->
<div id="faq_traclist"> <a href="http://rutracker.org/forum/viewtopic.php?t=2525182" target="_blank"><b>Как быстро создать треклист с указанием битрейта</b></a></div> <div id="faq_traclist"> <a href="http://rutracker.org/forum/viewtopic.php?t=2525182" target="_blank"><b>Как быстро создать треклист с указанием битрейта</b></a></div>
<!--/faq_traclist--> <!--/faq_traclist-->

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

@ -2,22 +2,6 @@
<div id="pm_header"> <div id="pm_header">
<!-- IF PM_BOX_SIZE_INFO --> <!-- IF PM_BOX_SIZE_INFO -->
<table class="bordered pm_box_size pad_2 floatL">
<tr>
<td colspan="3" class="row1 med tCenter nowrap">{BOX_SIZE_STATUS}</td>
</tr>
<tr>
<td colspan="3" class="row3">
<div class="spacer_8 progress" style="width: {INBOX_LIMIT_IMG_WIDTH}px;"></div>
</td>
</tr>
<tr class="row1 small">
<td width="30%">0%</td>
<td width="40%" class="tCenter">50%</td>
<td width="30%" class="tRight">100%</td>
</tr>
</table>
<table class="bordered pm_box_size pad_2 floatR"> <table class="bordered pm_box_size pad_2 floatR">
<tr> <tr>
<td colspan="3" class="row1 med tCenter nowrap">{BOX_SIZE_STATUS}</td> <td colspan="3" class="row1 med tCenter nowrap">{BOX_SIZE_STATUS}</td>

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

@ -17,12 +17,9 @@
</tr> </tr>
<!-- END report_statistics --> <!-- END report_statistics -->
</table> </table>
<br /> <br />
<!-- BEGIN switch_deleted_reports --> <!-- BEGIN switch_deleted_reports -->
<span class="maintitle">{L_DELETED_REPORTS}:</span><br /><br /> <span class="maintitle">{L_DELETED_REPORTS}:</span><br /><br />
<form action="{S_REPORT_ACTION}" method="post" id="report_list_deleted" style="margin: 0"> <form action="{S_REPORT_ACTION}" method="post" id="report_list_deleted" style="margin: 0">
<table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="forumline"> <table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="forumline">
<tr> <tr>

1
upload/templates/default/search.tpl
View file

@ -109,7 +109,6 @@
</form> </form>
<div class="bottom_info"> <div class="bottom_info">
<div class="spacer_4"></div> <div class="spacer_4"></div>

1
upload/templates/default/search_results.tpl
View file

@ -84,7 +84,6 @@ $(document).ready(function(){
return false; return false;
}); });
$('td.topic_id').click(function(){ $('td.topic_id').click(function(){
if (!ajax.in_edit_mode) { if (!ajax.in_edit_mode) {
$('#show-edit-btn a').click(); $('#show-edit-btn a').click();

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

@ -63,7 +63,7 @@ document.write('<input type="hidden" name="user_timezone" value="'+tz+'" />');
<tr> <tr>
<td class="prof-title">{L_USERNAME}: *</td> <td class="prof-title">{L_USERNAME}: *</td>
<td><!-- IF CAN_EDIT_USERNAME --><input id="username" onBlur="ajax.exec({ action: 'user_register', mode: 'check_name', username: $('#username').val()}); return false;" type="text" name="username" size="35" maxlength="25" value="{USERNAME}" /><!-- ELSE --><b>{USERNAME}</b><!-- ENDIF --> <td><!-- IF CAN_EDIT_USERNAME --><input id="username" onBlur="ajax.exec({ action: 'user_register', mode: 'check_name', username: $('#username').val()}); return false;" type="text" name="username" size="35" maxlength="25" value="{USERNAME}" /><!-- ELSE --><b>{USERNAME}</b><!-- ENDIF -->
<span id="check_name"></span></td> <span id="check_name"></span></td>
</tr> </tr>
<tr> <tr>
<td class="prof-title">{L_EMAIL}: * <!-- IF EDIT_PROFILE --><!-- ELSE IF $bb_cfg['reg_email_activation'] --><br /><h6>{L_EMAIL_EXPLAIN}</h6><!-- ENDIF --></td> <td class="prof-title">{L_EMAIL}: * <!-- IF EDIT_PROFILE --><!-- ELSE IF $bb_cfg['reg_email_activation'] --><br /><h6>{L_EMAIL_EXPLAIN}</h6><!-- ENDIF --></td>
@ -79,15 +79,15 @@ document.write('<input type="hidden" name="user_timezone" value="'+tz+'" />');
<tr> <tr>
<td class="prof-title"><!-- IF EDIT_PROFILE -->{L_NEW_PASSWORD}: * <br /><h6>{L_PASSWORD_IF_CHANGED}</h6><!-- ELSE -->{L_PASSWORD}: *<!-- ENDIF --></td> <td class="prof-title"><!-- IF EDIT_PROFILE -->{L_NEW_PASSWORD}: * <br /><h6>{L_PASSWORD_IF_CHANGED}</h6><!-- ELSE -->{L_PASSWORD}: *<!-- ENDIF --></td>
<td> <td>
<input id="pass" type="<!-- IF SHOW_PASS -->text<!-- ELSE -->password<!-- ENDIF -->" name="new_pass" size="35" maxlength="32" value="" />&nbsp; <input id="pass" type="<!-- IF SHOW_PASS -->text<!-- ELSE -->password<!-- ENDIF -->" name="new_pass" size="35" maxlength="32" value="" />&nbsp;
<span id="autocomplete" title="{L_AUTOCOMPLETE}">&#9668;</span> &nbsp;<i class="med">{L_PASSWORD_LONG}</i> <span id="autocomplete" title="{L_AUTOCOMPLETE}">&#9668;</span> &nbsp;<i class="med">{L_PASSWORD_LONG}</i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="prof-title">{L_CONFIRM_PASSWORD}: * <!-- IF EDIT_PROFILE --><br /><h6>{L_PASSWORD_CONFIRM_IF_CHANGED}</h6><!-- ENDIF --></td> <td class="prof-title">{L_CONFIRM_PASSWORD}: * <!-- IF EDIT_PROFILE --><br /><h6>{L_PASSWORD_CONFIRM_IF_CHANGED}</h6><!-- ENDIF --></td>
<td> <td>
<input id="pass_confirm" onBlur="ajax.exec({ action: 'user_register', mode: 'check_pass', pass: $('#pass').val(), pass_confirm: $('#pass_confirm').val() }); return false;" type="<!-- IF SHOW_PASS -->text<!-- ELSE -->password<!-- ENDIF -->" name="cfm_pass" size="35" maxlength="32" value="" /> <input id="pass_confirm" onBlur="ajax.exec({ action: 'user_register', mode: 'check_pass', pass: $('#pass').val(), pass_confirm: $('#pass_confirm').val() }); return false;" type="<!-- IF SHOW_PASS -->text<!-- ELSE -->password<!-- ENDIF -->" name="cfm_pass" size="35" maxlength="32" value="" />
<span id="check_pass"></span> <span id="check_pass"></span>
</td> </td>
</tr> </tr>
<!-- IF CAPTCHA_HTML --> <!-- IF CAPTCHA_HTML -->

1
upload/templates/default/usercp_topic_watch.tpl
View file

@ -61,7 +61,6 @@ td.topic_id { cursor: pointer; }
</form> </form>
</div> </div>
<table id="post-row" style="display: none;"> <table id="post-row" style="display: none;">
<tr> <tr>
<td class="row2" colspan="7"> <td class="row2" colspan="7">

184
upload/templates/default/usercp_viewprofile.tpl
View file

@ -115,22 +115,23 @@ ajax.callback.manage_user = function(data) {
<script type="text/javascript"> <script type="text/javascript">
ajax.ip_load = false; ajax.ip_load = false;
ajax.mod_action = function(mode) { ajax.mod_action = function(mode) {
if(!ajax.ip_load) { if (!ajax.ip_load) {
ajax.exec({ ajax.exec({
action : 'mod_action', action : 'mod_action',
mode : mode, mode : mode,
user_id : {PROFILE_USER_ID} user_id : {PROFILE_USER_ID}
}); });
} }
else else
{ {
$('#ip_list').toggle(); $('#ip_list').toggle();
}}; }};
ajax.callback.mod_action = function(data) { ajax.callback.mod_action = function(data) {
$('#ip_list').html(data.ip_list_html); $('#ip_list').html(data.ip_list_html);
ajax.ip_load = true; ajax.ip_load = true;
} }
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
ajax.group_membership = function(mode) { ajax.group_membership = function(mode) {
$('#gr-mem-list').html('<i class="loading-1">{L_LOADING}</i>'); $('#gr-mem-list').html('<i class="loading-1">{L_LOADING}</i>');
@ -173,7 +174,6 @@ ajax.callback.gen_passkey = function(data){
</script> </script>
<!-- ENDIF / SHOW_PASSKEY --> <!-- ENDIF / SHOW_PASSKEY -->
<style type="text/css"> <style type="text/css">
#traf-stats-tbl { width: 468px; background: #F9F9F9; border: 1px solid #A5AFB4; border-collapse: separate; } #traf-stats-tbl { width: 468px; background: #F9F9F9; border: 1px solid #A5AFB4; border-collapse: separate; }
#traf-stats-tbl th, #traf-stats-tbl td { padding: 2px 10px 3px; text-align: center; white-space: nowrap; font-size: 11px; } #traf-stats-tbl th, #traf-stats-tbl td { padding: 2px 10px 3px; text-align: center; white-space: nowrap; font-size: 11px; }
@ -314,25 +314,26 @@ ajax.callback.gen_passkey = function(data){
<span class="editable bold">{USER_REGDATE}</span> <span class="editable bold">{USER_REGDATE}</span>
<!-- IF IS_ADMIN --> <!-- IF IS_ADMIN -->
[ <a href="#admin" class="menu-root menu-alt1"><span class="adm">{L_MANAGE_USER}</span></a> ] [ <a href="#admin" class="menu-root menu-alt1"><span class="adm">{L_MANAGE_USER}</span></a> ]
<div class="menu-sub row1 border bw_TRBL" id="admin"> <div class="menu-sub row1 border bw_TRBL" id="admin">
<fieldset class="mrg_6"> <fieldset class="mrg_6">
<div class="tLeft" style="padding: 5px 6px 6px; display: block; font-size: 13px;"> <div class="tLeft" style="padding: 5px 6px 6px; display: block; font-size: 13px;">
<a href="#" onclick="ajax.exec({action : 'manage_user', mode: '<!-- IF USER_ACTIVE -->user_deactivate<!-- ELSE -->user_activate<!-- ENDIF -->', user_id : {PROFILE_USER_ID}}); return false;" class="<!-- IF USER_ACTIVE -->adm<!-- ELSE -->seed bold<!-- ENDIF -->"><!-- IF USER_ACTIVE -->{L_USER_DEACTIVATE}<!-- ELSE -->{L_USER_ACTIVATE}<!-- ENDIF --></a> <br /> <a href="#" onclick="ajax.exec({action : 'manage_user', mode: '<!-- IF USER_ACTIVE -->user_deactivate<!-- ELSE -->user_activate<!-- ENDIF -->', user_id : {PROFILE_USER_ID}}); return false;" class="<!-- IF USER_ACTIVE -->adm<!-- ELSE -->seed bold<!-- ENDIF -->"><!-- IF USER_ACTIVE -->{L_USER_DEACTIVATE}<!-- ELSE -->{L_USER_ACTIVATE}<!-- ENDIF --></a> <br />
<a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_profile', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_USER_DELETE_EXPLAIN}</a> <br /> <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_profile', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_USER_DELETE_EXPLAIN}</a> <br />
<a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_topics', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_ALL_POSTS}</a> <br /> <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_topics', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_ALL_POSTS}</a> <br />
<a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_message', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_POSTS}</a> <br /> <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_message', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_POSTS}</a> <br />
</div> </div>
</fieldset> </fieldset>
<fieldset class="mrg_6"><legend>{L_BAN_USER}</legend> <fieldset class="mrg_6">
<div class="tLeft" style="padding: 2px 6px 6px; display: block;" id="user-opt"> <legend>{L_BAN_USER}</legend>
<label><input type="checkbox" name="dis_avatar"/>{L_HIDE_AVATARS}</label> <div class="tLeft" style="padding: 2px 6px 6px; display: block;" id="user-opt">
<label><input type="checkbox" name="dis_sig"/>{L_SHOW_CAPTION}</label> <label><input type="checkbox" name="dis_avatar"/>{L_HIDE_AVATARS}</label>
<label><input type="checkbox" name="dis_passkey"/>{L_DOWNLOAD_TORRENT}</label> <label><input type="checkbox" name="dis_sig"/>{L_SHOW_CAPTION}</label>
<label><input type="checkbox" name="dis_pm"/>{L_SEND_PM}</label> <label><input type="checkbox" name="dis_passkey"/>{L_DOWNLOAD_TORRENT}</label>
<label><input type="checkbox" name="dis_post"/>{L_SEND_MESSAGE}</label> <label><input type="checkbox" name="dis_pm"/>{L_SEND_PM}</label>
<label><input type="checkbox" name="dis_post_edit"/>{L_EDIT_POST}</label> <label><input type="checkbox" name="dis_post"/>{L_SEND_MESSAGE}</label>
<label><input type="checkbox" name="dis_topic"/>{L_NEW_THREADS}</label> <label><input type="checkbox" name="dis_post_edit"/>{L_EDIT_POST}</label>
</div> <label><input type="checkbox" name="dis_topic"/>{L_NEW_THREADS}</label>
</div>
</fieldset> </fieldset>
<div id="user-opt-save" class="hidden tCenter"> <div id="user-opt-save" class="hidden tCenter">
<p><input id="user-opt-save-btn" class="bold long" type="button" value="{L_SUBMIT}" /></p> <p><input id="user-opt-save-btn" class="bold long" type="button" value="{L_SUBMIT}" /></p>
@ -350,10 +351,10 @@ ajax.callback.gen_passkey = function(data){
</td> </td>
</tr> </tr>
<tr> <tr>
<th class="nowrap">{L_LAST_ACTIVITY}:</th> <th class="nowrap">{L_LAST_ACTIVITY}:</th>
<td> <td>
<b>{LAST_ACTIVITY_TIME}</b> <b>{LAST_ACTIVITY_TIME}</b>
<!-- IF TRAF_STATS --><span id="traf-stats-span">[ <a href="#" id="traf-stats-btn" class="med" onclick="ajax.index_data('get_traf_stats'); return false;">{L_VIEWING_USER_BT_PROFILE}</a> ]</span><!-- ENDIF --> <!-- IF TRAF_STATS --><span id="traf-stats-span">[ <a href="#" id="traf-stats-btn" class="med" onclick="ajax.index_data('get_traf_stats'); return false;">{L_VIEWING_USER_BT_PROFILE}</a> ]</span><!-- ENDIF -->
</td> </td>
</tr> </tr>
@ -371,30 +372,30 @@ ajax.callback.gen_passkey = function(data){
</tr> </tr>
<tr id="bt_user_ratio" <!-- IF TRAF_STATS -->style="display: none;"<!-- ENDIF -->> <tr id="bt_user_ratio" <!-- IF TRAF_STATS -->style="display: none;"<!-- ENDIF -->>
<th>{L_USER_RATIO}:</th> <th>{L_USER_RATIO}:</th>
<td> <td>
<!-- IF DOWN_TOTAL_BYTES gt MIN_DL_BYTES --> <!-- IF DOWN_TOTAL_BYTES gt MIN_DL_BYTES -->
<b id="u_ratio" class="gen">{USER_RATIO}</b> <b id="u_ratio" class="gen">{USER_RATIO}</b>
[<a class="gen" href="#" onclick="toggle_block('ratio-expl'); return false;">?</a>] [<a class="gen" href="#" onclick="toggle_block('ratio-expl'); return false;">?</a>]
<!-- ELSE --> <!-- ELSE -->
<span class="med" title="{L_IT_WILL_BE_DOWN} {MIN_DL_FOR_RATIO}"><b>{L_NONE}</b> (DL < {MIN_DL_FOR_RATIO})</span> <span class="med" title="{L_IT_WILL_BE_DOWN} {MIN_DL_FOR_RATIO}"><b>{L_NONE}</b> (DL < {MIN_DL_FOR_RATIO})</span>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF SHOW_PASSKEY --> <!-- IF SHOW_PASSKEY -->
[ {L_BT_PASSKEY}: <span id="passkey-btn"><a class="med" href="#" onclick="$('#passkey-gen').show(); $('#passkey-btn').hide(); return false;">{L_BT_PASSKEY_VIEW}</a></span> [ {L_BT_PASSKEY}: <span id="passkey-btn"><a class="med" href="#" onclick="$('#passkey-gen').show(); $('#passkey-btn').hide(); return false;">{L_BT_PASSKEY_VIEW}</a></span>
<span id="passkey-gen" class="med" style="display: none;"> <span id="passkey-gen" class="med" style="display: none;">
<b id="passkey" class="med bold">{AUTH_KEY}</b>&nbsp; <b id="passkey" class="med bold">{AUTH_KEY}</b>&nbsp;
<a href="#" onclick="ajax.exec({ action: 'gen_passkey', user_id : {PROFILE_USER_ID} }); return false;">{L_BT_GEN_PASSKEY}</a> <a href="#" onclick="ajax.exec({ action: 'gen_passkey', user_id : {PROFILE_USER_ID} }); return false;">{L_BT_GEN_PASSKEY}</a>
</span> ] </span> ]
<!-- ENDIF --> <!-- ENDIF -->
</td> </td>
</tr> </tr>
<tr id="ratio-expl" style="display: none;"> <tr id="ratio-expl" style="display: none;">
<td colspan="2" class="med tCenter"> <td colspan="2" class="med tCenter">
( {L_UPLOADED} <b class="seedmed">{UP_TOTAL}</b> + {L_RELEASED} <b class="seedmed">{RELEASED}</b> + {L_BONUS} <b class="seedmed">{UP_BONUS}</b> ) / {L_DOWNLOADED} <b class="leechmed">{DOWN_TOTAL}</b> ( {L_UPLOADED} <b class="seedmed">{UP_TOTAL}</b> + {L_RELEASED} <b class="seedmed">{RELEASED}</b> + {L_BONUS} <b class="seedmed">{UP_BONUS}</b> ) / {L_DOWNLOADED} <b class="leechmed">{DOWN_TOTAL}</b>
</td> </td>
</tr> </tr>
<!-- IF LOCATION --> <!-- IF LOCATION -->
<tr> <tr>
@ -436,53 +437,50 @@ ajax.callback.gen_passkey = function(data){
<td><b>{AGE}</b></td> <td><b>{AGE}</b></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
<tr> <tr>
<td colspan="2" class="pad_4"> <td colspan="2" class="pad_4">
<table id="traf-stats-tbl" <!-- IF TRAF_STATS -->style="display: none;"<!-- ENDIF --> class="bCenter borderless" cellspacing="1">
<table id="traf-stats-tbl" <!-- IF TRAF_STATS -->style="display: none;"<!-- ENDIF --> class="bCenter borderless" cellspacing="1"> <tr class="row3">
<tr class="row3"> <th class="stats-ext"></th>
<th class="stats-ext"></th> <th>{L_DOWNLOADED}</th>
<th>{L_DOWNLOADED}</th> <th>{L_UPLOADED}</th>
<th>{L_UPLOADED}</th> <th>{L_RELEASED}</th>
<th>{L_RELEASED}</th> <th>{L_BONUS}</th>
<th>{L_BONUS}</th> <!-- IF $bb_cfg['seed_bonus_enabled'] --><th>{L_SEED_BONUS}</th><!-- ENDIF -->
<!-- IF $bb_cfg['seed_bonus_enabled'] --><th>{L_SEED_BONUS}</th><!-- ENDIF --> </tr>
</tr> <tr class="row1 stats-ext">
<tr class="row1 stats-ext"> <td>{L_TD_TRAF}</td>
<td>{L_TD_TRAF}</td> <td class="leech">{TD_DL}</td>
<td class="leech">{TD_DL}</td> <td class="seed">{TD_UL}</td>
<td class="seed">{TD_UL}</td> <td class="seed">{TD_REL}</td>
<td class="seed">{TD_REL}</td> <td class="seed">{TD_BONUS}</td>
<td class="seed">{TD_BONUS}</td> <!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{TD_POINTS}</td><!-- ENDIF -->
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{TD_POINTS}</td><!-- ENDIF --> </tr>
</tr> <tr class="row5 stats-ext">
<tr class="row5 stats-ext"> <td>{L_YS_TRAF}</td>
<td>{L_YS_TRAF}</td> <td class="leech">{YS_DL}</td>
<td class="leech">{YS_DL}</td> <td class="seed">{YS_UL}</td>
<td class="seed">{YS_UL}</td> <td class="seed">{YS_REL}</td>
<td class="seed">{YS_REL}</td> <td class="seed">{YS_BONUS}</td>
<td class="seed">{YS_BONUS}</td> <!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{YS_POINTS}</td><!-- ENDIF -->
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{YS_POINTS}</td><!-- ENDIF --> </tr>
</tr> <tr class="row1">
<tr class="row1"> <td class="stats-ext">{L_TOTAL_TRAF}</td>
<td class="stats-ext">{L_TOTAL_TRAF}</td> <td id="u_down_total"><span class="editable bold leechmed">{DOWN_TOTAL}</span></td>
<td id="u_down_total"><span class="editable bold leechmed">{DOWN_TOTAL}</span></td> <td id="u_up_total"><span class="editable bold seedmed">{UP_TOTAL}</span></td>
<td id="u_up_total"><span class="editable bold seedmed">{UP_TOTAL}</span></td> <td id="u_up_release"><span class="editable bold seedmed">{RELEASED}</span></td>
<td id="u_up_release"><span class="editable bold seedmed">{RELEASED}</span></td> <td id="u_up_bonus"><span class="editable bold seedmed">{UP_BONUS}</span></td>
<td id="u_up_bonus"><span class="editable bold seedmed">{UP_BONUS}</span></td> <!-- IF $bb_cfg['seed_bonus_enabled'] --><td id="user_points"><span class="editable bold points">{USER_POINTS}</span></td><!-- ENDIF -->
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td id="user_points"><span class="editable bold points">{USER_POINTS}</span></td><!-- ENDIF --> </tr>
</tr> <tr class="row5">
<tr class="row5"> <td colspan="1">{L_MAX_SPEED}</td>
<td colspan="1">{L_MAX_SPEED}</td> <td colspan="2">{L_DL_DL_SPEED}: {SPEED_DOWN}</td>
<td colspan="2">{L_DL_DL_SPEED}: {SPEED_DOWN}</td> <td colspan="2">{L_DL_UL_SPEED}: {SPEED_UP}</td>
<td colspan="2">{L_DL_UL_SPEED}: {SPEED_UP}</td> <!-- IF $bb_cfg['seed_bonus_enabled'] --><td colspan="1"><!-- IF PROFILE_USER --><a href="profile.php?mode=bonus">{L_EXCHANGE}</a><!-- ENDIF --></td><!-- ENDIF -->
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td colspan="1"><!-- IF PROFILE_USER --><a href="profile.php?mode=bonus">{L_EXCHANGE}</a><!-- ENDIF --></td><!-- ENDIF --> </tr>
</tr> </table>
</table> </td>
</tr>
</td>
</tr>
</table> </table>
<!--/user_details--> <!--/user_details-->
@ -493,7 +491,7 @@ ajax.callback.gen_passkey = function(data){
<!-- IF SIGNATURE --> <!-- IF SIGNATURE -->
<tr> <tr>
<td class="row1 pad_4" colspan="2"> <td class="row1 pad_4" colspan="2">
<div class="signature">{SIGNATURE}</div> <div class="signature">{SIGNATURE}</div>
</td> </td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->

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

@ -584,22 +584,6 @@ function build_poll_add_form (src_el)
</tr> </tr>
</table> </table>
<!-- IF PORNO_FORUM -->
<script type="text/javascript">
// block Imageshack images
$(document).ready(function(){
$("div.post_body")
.find("img.postImg[@src*='imageshack']")
.attr({ src: "images/smiles/tr_oops.gif", alt: "{L_SCREENSHOTS_RULES_TOPIC}" })
.wrap('<a href="viewtopic.php?t={$bb_cfg['porno_forums_screenshots_topic_id']}"></a>')
.end()
.find("a.postLink[@href*='imageshack']")
.attr({ href: "viewtopic.php?t={$bb_cfg['porno_forums_screenshots_topic_id']}" })
.text("{L_SCREENSHOTS_RULES_TOPIC}");
});
</script>
<!-- ENDIF -->
<table cellpadding="0" class="w100" style="padding-top: 2px;"> <table cellpadding="0" class="w100" style="padding-top: 2px;">
<tr> <tr>
<td valign="top"> <td valign="top">

1
upload/templates/default/viewtopic_attach.tpl
View file

@ -127,7 +127,6 @@
<!-- BEGIN tor_reged --> <!-- BEGIN tor_reged -->
<!-- IF TOR_BLOCKED --> <!-- IF TOR_BLOCKED -->
<table id="tor_blocked" class="error"> <table id="tor_blocked" class="error">
<tr><td><p class="error_msg">{TOR_BLOCKED_MSG}</p></td></tr> <tr><td><p class="error_msg">{TOR_BLOCKED_MSG}</p></td></tr>

1
upload/viewtopic.php
View file

@ -227,7 +227,6 @@ if ($moderation)
)); ));
} }
if (!$forums = $datastore->get('cat_forums')) if (!$forums = $datastore->get('cat_forums'))
{ {
$datastore->update('cat_forums'); $datastore->update('cat_forums');