mirror of
https://github.com/torrentpier/torrentpier
synced 2025-08-22 14:23:57 -07:00
r593
Старт ветки develop. В ней будут публиковаться промежуточные изменения, опубликованные до включения в ветку master (соответственно до объявления о выходе новой "ревизии"). Изменения: - чистка от пустых строк, пустых окончаний строк; - фикс настроек системы сидбонусов в админке; - фикс функции вывода картинки пола пользователя; - удаление неактуальной информации из шаблона; - изменения в работе tidy.
This commit is contained in:
Exile
parent
ecd8d71e80
commit
3ed9f6e039
93 changed files with 412 additions and 577 deletions
|
|
@ -15,8 +15,6 @@ $msg = '[b]Внимание![/b] Наш трекер переехал на но
|
|||
[b]Пароль:[/b] %s
|
||||
Сменить пароль можно после входа на трекер в [url='.$new_tr_url.'profile.php?mode=editprofile]настройках[/url].';
|
||||
|
||||
|
||||
|
||||
if (empty($_POST['confirm']))
|
||||
{
|
||||
stdhead();
|
||||
|
|
|
|||
|
|
@ -46,16 +46,6 @@ function set_auto_increment($table_name, $column, $val = null)
|
|||
// Users functions
|
||||
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('TRUNCATE '. BB_BT_USERS);
|
||||
}
|
||||
|
|
@ -173,15 +163,6 @@ function tp_topics_cleanup()
|
|||
DB()->query("TRUNCATE ". BB_POSTS_SEARCH);
|
||||
DB()->query("TRUNCATE ". BB_POSTS_TEXT);
|
||||
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;
|
||||
}
|
||||
|
|
@ -299,7 +280,6 @@ function convert_torrent($torrent)
|
|||
"topic_last_post_time" => $torrent['added'],
|
||||
);
|
||||
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_data = array(
|
||||
|
|
@ -409,7 +389,6 @@ function convert_comment($comment)
|
|||
),
|
||||
);
|
||||
tp_add_post($post_data);
|
||||
//add_search_words($comment['id'], stripslashes($post_text));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
<?php
|
||||
|
||||
$passwords = array();
|
||||
|
|
@ -168,15 +168,6 @@ function tp_topics_cleanup()
|
|||
DB()->query("TRUNCATE ". BB_POSTS_SEARCH);
|
||||
DB()->query("TRUNCATE ". BB_POSTS_TEXT);
|
||||
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;
|
||||
}
|
||||
|
|
@ -404,7 +395,6 @@ function convert_comment($comment)
|
|||
),
|
||||
);
|
||||
tp_add_post($post_data);
|
||||
//add_search_words($comment['id'], stripslashes($post_text));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
<?php
|
||||
|
||||
$passwords = array();
|
||||
|
|
@ -8,7 +8,6 @@ require(INC_DIR .'functions_torrent.php');
|
|||
require(BB_ROOT .'converter/settings.php');
|
||||
require(BB_ROOT .'converter/functions.php');
|
||||
|
||||
|
||||
// Init userdata
|
||||
$user->session_start();
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,6 @@ else
|
|||
$sort_order = 'ASC';
|
||||
}
|
||||
|
||||
|
||||
// Pagination ?
|
||||
$do_pagination = ($view != 'stats' && $view != 'search') ? true : false;
|
||||
|
||||
|
|
|
|||
|
|
@ -40,9 +40,7 @@ else
|
|||
|
||||
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 == 'bonus_upload' || $config_name == 'bonus_upload_price') $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]));
|
||||
bb_update_config(array($config_name => $new[$config_name]));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ if (!empty($setmodules))
|
|||
require('./pagestart.php');
|
||||
// ACP Header - END
|
||||
|
||||
|
||||
// View Read Post Reply Edit Delete Sticky Announce Vote Poll PostAttach Download
|
||||
$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
|
||||
|
|
|
|||
|
|
@ -951,7 +951,6 @@ function renumber_order ($mode, $cat = 0)
|
|||
}
|
||||
$sql .= " ORDER BY $orderfield ASC";
|
||||
|
||||
|
||||
if (!$result = DB()->sql_query($sql))
|
||||
{
|
||||
bb_die('Could not get list of categories / forums #2');
|
||||
|
|
|
|||
|
|
@ -245,7 +245,6 @@ else
|
|||
|
||||
generate_pagination($url, $items_count, $per_page, $start);
|
||||
|
||||
|
||||
$filter = array();
|
||||
|
||||
if ($log_rowset)
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ else
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if ($mode != '')
|
||||
{
|
||||
if ($mode == 'edit' || $mode == 'add')
|
||||
|
|
|
|||
|
|
@ -795,10 +795,7 @@ else
|
|||
$base_url .= '&search_moderators=true&moderators_forum='. rawurlencode(stripslashes($moderators_forum));
|
||||
$moderators_forum = intval($moderators_forum);
|
||||
|
||||
$sql = "SELECT forum_name
|
||||
FROM ".BB_FORUMS."
|
||||
WHERE forum_id = ".$moderators_forum;
|
||||
|
||||
$sql = "SELECT forum_name FROM ".BB_FORUMS." WHERE forum_id = ".$moderators_forum;
|
||||
|
||||
if (!$result = DB()->sql_query($sql))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,21 +1,5 @@
|
|||
<?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)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ define('FILENAME_CRYPTIC', false);
|
|||
define('FILENAME_CRYPTIC_LENGTH', 64);
|
||||
define('FILENAME_TRANSLITERATE', true);
|
||||
|
||||
|
||||
class attach_parent
|
||||
{
|
||||
var $post_attach = false;
|
||||
|
|
|
|||
|
|
@ -475,7 +475,6 @@ $bb_cfg['max_search_words_per_post'] = 200;
|
|||
$bb_cfg['search_min_word_len'] = 3;
|
||||
$bb_cfg['search_max_word_len'] = 35;
|
||||
$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';
|
||||
|
||||
// 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;
|
||||
|
||||
// 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
|
||||
$bb_cfg['show_ads'] = false;
|
||||
|
|
@ -581,7 +580,6 @@ $banned_user_agents = array(
|
|||
# 'wget',
|
||||
);
|
||||
|
||||
$bb_cfg['porno_forums_screenshots_topic_id'] = 0; // (int) 7
|
||||
$bb_cfg['trash_forum_id'] = 0; // (int) 7
|
||||
|
||||
$bb_cfg['first_logon_redirect_url'] = 'index.php';
|
||||
|
|
|
|||
|
|
@ -164,7 +164,6 @@ for ($i = 0; $i < $num_auth_pages && $authorised == false; $i++)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (!$authorised)
|
||||
{
|
||||
bb_die($lang['SORRY_AUTH_VIEW_ATTACH']);
|
||||
|
|
|
|||
|
|
@ -3078,7 +3078,6 @@ class UTF8
|
|||
return self::convert_case($data, CASE_UPPER);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Convert all HTML entities to native UTF-8 characters
|
||||
* Функция декодирует гораздо больше именованных сущностей, чем стандартная html_entity_decode()
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
function print_confirmation ($tpl_vars)
|
||||
{
|
||||
global $template, $lang;
|
||||
|
|
@ -2813,13 +2812,13 @@ function gender_image ($gender)
|
|||
switch ($gender)
|
||||
{
|
||||
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;
|
||||
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;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
|
|||
if ($update_watched_sql)
|
||||
{
|
||||
DB()->query("UPDATE ". BB_TOPICS_WATCH ."
|
||||
SET notify_status = ". TOPIC_WATCH_UN_NOTIFIED ."
|
||||
SET notify_status = ". TOPIC_WATCH_UNNOTIFIED ."
|
||||
WHERE topic_id = $topic_id
|
||||
AND user_id IN ($update_watched_sql)
|
||||
");
|
||||
|
|
|
|||
|
|
@ -581,7 +581,6 @@ function report_count_obtain()
|
|||
return $report_count;
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Obtains reports (for a specific report module if $module_id is defined)
|
||||
// Includes authorisation check if $auth_check is set to true.
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ define('TOPIC_LOCKED', 1);
|
|||
define('TOPIC_MOVED', 2);
|
||||
|
||||
define('TOPIC_WATCH_NOTIFIED', 1);
|
||||
define('TOPIC_WATCH_UN_NOTIFIED', 0);
|
||||
define('TOPIC_WATCH_UNNOTIFIED', 0);
|
||||
|
||||
// Topic types
|
||||
define('POST_NORMAL', 0);
|
||||
|
|
@ -240,6 +240,7 @@ define('POST_REPORT_REASON_URL', 'r');
|
|||
// Gender
|
||||
define('MALE', 1);
|
||||
define('FEMALE', 2);
|
||||
define('NOGENDER', 0);
|
||||
|
||||
// Poll
|
||||
# 1 - обычный опрос
|
||||
|
|
@ -428,7 +429,7 @@ if (!empty($banned_user_agents))
|
|||
{
|
||||
if (strstr(USER_AGENT, $agent))
|
||||
{
|
||||
$filename = 'Skachivajte fajly brauzerom (скачивайте файлы браузером)';
|
||||
$filename = 'Download files by using browser';
|
||||
$output = '@';
|
||||
header('Content-Type: text/plain');
|
||||
header('Content-Disposition: attachment; filename="'. $filename .'"');
|
||||
|
|
|
|||
|
|
@ -657,9 +657,6 @@ class user_common
|
|||
bb_setcookie(COOKIE_TOPIC, '');
|
||||
bb_setcookie(COOKIE_FORUM, '');
|
||||
bb_setcookie(COOKIE_MARK, '');
|
||||
|
||||
// Info message
|
||||
# $template->assign_var('INFO_MESSAGE', $lang['FORUMS_MARKED_READ']);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -797,7 +794,6 @@ class user_common
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// userdata cache
|
||||
//
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ define('XS_TAG_ELSEIF', 7);
|
|||
define('XS_TAG_ENDIF', 8);
|
||||
define('XS_TAG_BEGINELSE', 11);
|
||||
|
||||
|
||||
class Template
|
||||
{
|
||||
var $classname = "Template";
|
||||
|
|
@ -528,7 +527,6 @@ class Template
|
|||
return $varref;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Generates a reference to the array of data values for the given
|
||||
* (possibly nested) block namespace. This is a string of the form:
|
||||
|
|
@ -1134,7 +1132,6 @@ class Template
|
|||
return $tokens;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Compiles code and writes to cache if needed
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -522,7 +522,6 @@ foreach ($profile_fields as $field => $can_edit)
|
|||
$tp_data['USER_OCC'] = $pr_data['user_occ'];
|
||||
break;
|
||||
|
||||
|
||||
/**
|
||||
* Интересы
|
||||
*/
|
||||
|
|
@ -554,7 +553,6 @@ foreach ($profile_fields as $field => $can_edit)
|
|||
$tp_data['USER_SKYPE'] = $pr_data['user_skype'];
|
||||
break;
|
||||
|
||||
|
||||
/**
|
||||
* Twitter
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ $template->assign_vars(array(
|
|||
'SKYPE' => $profiledata['user_skype'],
|
||||
'TWITTER' => $profiledata['user_twitter'],
|
||||
'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'] : '',
|
||||
'AGE' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '',
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
</style>
|
||||
|
||||
|
||||
<div id="infobox-body">
|
||||
|
||||
<p>Information for copyright holders.</p>
|
||||
|
|
|
|||
|
|
@ -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.';
|
||||
|
||||
|
||||
//
|
||||
// Viewtopic
|
||||
//
|
||||
|
|
@ -696,7 +695,6 @@ $lang['ASC'] = 'Ascending';
|
|||
$lang['DESC'] = 'Descending';
|
||||
$lang['ORDER'] = 'Order';
|
||||
|
||||
|
||||
//
|
||||
// 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.';
|
||||
|
||||
|
||||
//
|
||||
// Viewonline
|
||||
//
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
</style>
|
||||
|
||||
|
||||
<div id="infobox-body">
|
||||
|
||||
<p>Информация для правообладателей.</p>
|
||||
|
|
|
|||
|
|
@ -234,7 +234,6 @@ $lang['RULES_MODERATE'] = 'Вы <b>можете</b> модерировать э
|
|||
|
||||
$lang['NO_TOPICS_POST_ONE'] = 'В этом форуме пока нет сообщений<br />Кликните <b>Начать новую тему</b>, и ваше сообщение станет первым.';
|
||||
|
||||
|
||||
//
|
||||
// Viewtopic
|
||||
//
|
||||
|
|
@ -696,7 +695,6 @@ $lang['ASC'] = 'по возрастанию';
|
|||
$lang['DESC'] = 'по убыванию';
|
||||
$lang['ORDER'] = ''; // не нужно, в английском используется в контексте 'Order ascending';
|
||||
|
||||
|
||||
//
|
||||
// Group control panel
|
||||
//
|
||||
|
|
@ -842,7 +840,6 @@ $lang['NOT_AUTHORISED'] = 'Нет доступа';
|
|||
|
||||
$lang['YOU_BEEN_BANNED'] = 'Вам был закрыт доступ к форуму<br />Обратитесь к вебмастеру или администратору сайта за дополнительной информацией';
|
||||
|
||||
|
||||
//
|
||||
// Viewonline
|
||||
//
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
</style>
|
||||
|
||||
|
||||
<div id="infobox-body">
|
||||
|
||||
<p>Інформація для правовласників.</p>
|
||||
|
|
|
|||
|
|
@ -234,7 +234,6 @@ $lang['RULES_MODERATE'] = 'Ви <b>можете</b> модерувати цей
|
|||
|
||||
$lang['NO_TOPICS_POST_ONE'] = 'У цьому форумі поки немає повідомлень<br />Натисніть <b>Почати нову тему</b>, і ваше повідомлення буде першим.';
|
||||
|
||||
|
||||
//
|
||||
// Viewtopic
|
||||
//
|
||||
|
|
@ -696,7 +695,6 @@ $lang['ASC'] = 'за зростанням';
|
|||
$lang['DESC'] = 'за спаданням';
|
||||
$lang['ORDER'] = ''; // не потрібно, в англійській використовується в контексті 'ascending Order';
|
||||
|
||||
|
||||
//
|
||||
// Group control panel
|
||||
//
|
||||
|
|
@ -842,7 +840,6 @@ $lang['NOT_AUTHORISED'] = 'Немає доступу';
|
|||
|
||||
$lang['YOU_BEEN_BANNED'] = 'Вам був закритий доступ до форуму<br />Зверніться до вебмайстру або адміністратору сайту за додатковою інформацією';
|
||||
|
||||
|
||||
//
|
||||
// Viewonline
|
||||
//
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ if (isset($_POST['login']))
|
|||
if ($login_err > $bb_cfg['invalid_logins']) $need_captcha = true;
|
||||
if ($login_err > 50)
|
||||
{
|
||||
// забанить ип :)
|
||||
// TODO temp ban ip
|
||||
}
|
||||
CACHE('bb_login_err')->set('l_err_'. USER_IP, ($login_err + 1), 3600);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -162,7 +162,6 @@ switch ($mode)
|
|||
// Functions
|
||||
//
|
||||
|
||||
|
||||
class bb_poll
|
||||
{
|
||||
var $err_msg = '';
|
||||
|
|
|
|||
|
|
@ -4,19 +4,12 @@ define('IN_ADMIN', true);
|
|||
define('BB_ROOT', './../');
|
||||
require(BB_ROOT .'common.php');
|
||||
|
||||
|
||||
############################################################################
|
||||
|
||||
$peers_in_last_minutes = array(30, 15, 5, 1);
|
||||
$peers_in_last_sec_limit = 300;
|
||||
|
||||
############################################################################
|
||||
|
||||
|
||||
$announce_interval = intval($bb_cfg['announce_interval']);
|
||||
$stat = array();
|
||||
|
||||
|
||||
define('TMP_TRACKER_TABLE', 'tmp_tracker');
|
||||
|
||||
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"
|
||||
$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
|
||||
$stat += DB()->fetch_row("SELECT COUNT(DISTINCT user_id) AS u_bt_active FROM ". TMP_TRACKER_TABLE);
|
||||
// All bt-users
|
||||
|
|
@ -47,7 +39,6 @@ $stat += DB()->fetch_row("SELECT COUNT(*) AS u_bt_all FROM ". BB_BT_USERS);
|
|||
// All bb-users
|
||||
$stat += DB()->fetch_row("SELECT COUNT(*) AS u_bb_all FROM ". BB_USERS);
|
||||
|
||||
|
||||
// Active torrents
|
||||
$stat += DB()->fetch_row("SELECT COUNT(DISTINCT topic_id) AS tor_active FROM ". TMP_TRACKER_TABLE);
|
||||
// With seeder
|
||||
|
|
@ -55,7 +46,6 @@ $stat += DB()->fetch_row("SELECT COUNT(DISTINCT topic_id) AS tor_with_seeder FRO
|
|||
// All torrents
|
||||
$stat += DB()->fetch_row("SELECT COUNT(*) AS tor_all, SUM(size) AS torrents_size FROM ". BB_BT_TORRENTS);
|
||||
|
||||
|
||||
// Last xx minutes
|
||||
$peers_in_last_min = array();
|
||||
foreach ($peers_in_last_minutes as $t)
|
||||
|
|
|
|||
|
|
@ -124,7 +124,6 @@ tr.hl-tr:hover td { background-color: #CFC !important; }
|
|||
<!-- IF TPL_CRON_EDIT -->
|
||||
<h1>{L_CRON_EDIT_HEAD}</h1>
|
||||
|
||||
|
||||
<a href="admin_cron.php?mode=list">{L_CRON_LIST}</a>
|
||||
<br /><br />
|
||||
|
||||
|
|
|
|||
|
|
@ -63,6 +63,3 @@
|
|||
</form>
|
||||
<!--========================================================================-->
|
||||
<!-- ENDIF / TPL_EDIT_FORUM_AUTH -->
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -96,10 +96,8 @@ table.log_filters td {
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
<div class="spacer_8"></div>
|
||||
|
||||
|
||||
<table class="forumline">
|
||||
<tr>
|
||||
<th>{L_ACTS_LOG_LOGS_ACTION}</th>
|
||||
|
|
|
|||
|
|
@ -1533,4 +1533,3 @@ div#autocomplete_popup span.regenerate {
|
|||
background-repeat: repeat-x;
|
||||
border-color: #dca7a7;
|
||||
}
|
||||
|
||||
|
|
@ -42,7 +42,6 @@
|
|||
<!--========================================================================-->
|
||||
<!-- ENDIF / SELECT_GROUP -->
|
||||
|
||||
|
||||
<!-- IF GROUP_INFO -->
|
||||
<!--========================================================================-->
|
||||
|
||||
|
|
@ -217,7 +216,7 @@
|
|||
<td>{pending.PM}</td>
|
||||
<td>{pending.EMAIL}</td>
|
||||
<td>{pending.FROM}</td>
|
||||
<td class="small">{pending.JOINED}</td>
|
||||
<td>{pending.JOINED}</td>
|
||||
<td>{pending.POSTS}</td>
|
||||
<td>{pending.WWW}</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -116,11 +116,6 @@
|
|||
</p>
|
||||
<!-- 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 -->
|
||||
{L_NO_POSTS}
|
||||
<!-- ENDIF -->
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
<h4 class="tCenter mrg_16">{L_ENTER_PASSWORD}</h4>
|
||||
<!-- ENDIF -->
|
||||
|
||||
|
||||
<div class="mrg_16">
|
||||
<table class="borderless bCenter">
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@
|
|||
<!--========================================================================-->
|
||||
<!-- ENDIF / TPL_MODCP_IP -->
|
||||
|
||||
|
||||
<!-- IF TPL_MODCP_MOVE -->
|
||||
<!--========================================================================-->
|
||||
|
||||
|
|
@ -115,7 +114,6 @@
|
|||
<!--========================================================================-->
|
||||
<!-- ENDIF / TPL_MODCP_MOVE -->
|
||||
|
||||
|
||||
<div class="bottom_info">
|
||||
|
||||
<div class="spacer_4"></div>
|
||||
|
|
|
|||
|
|
@ -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_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_MEMBERLIST}"><b>{L_MEMBERLIST}</b></a><span style="color:#CDCDCD;">|</span>
|
||||
<a href="{U_MEMBERLIST}"><b>{L_MEMBERLIST}</b></a>
|
||||
</td>
|
||||
<td class="nowrap" align="right">
|
||||
<!-- BEGIN switch_report_list -->
|
||||
|
|
@ -518,13 +518,5 @@ $(document).ready(function() {
|
|||
</div>
|
||||
<!-- 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 -->
|
||||
<!-- module_xx.tpl START -->
|
||||
|
|
@ -109,7 +109,6 @@
|
|||
</tr>
|
||||
<!-- END switch_smilies_extra -->
|
||||
</table><!--/smilies-->
|
||||
|
||||
</td>
|
||||
<td class="vTop pad_0 w100"><!-- INCLUDE posting_editor.tpl --></td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
<!--========================================================================-->
|
||||
<!-- ENDIF / TPL_ADD_ATTACHMENT -->
|
||||
|
||||
|
||||
<!-- IF TPL_POSTED_ATTACHMENTS -->
|
||||
<!--========================================================================-->
|
||||
|
||||
|
|
|
|||
|
|
@ -34,11 +34,13 @@ function emoticon(text) {
|
|||
<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>
|
||||
<!-- END switch_smilies_extra -->
|
||||
</table></td>
|
||||
</table>
|
||||
</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>
|
||||
</table></td>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -571,7 +571,6 @@ var TPL = {
|
|||
submit_fn : {}
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
-------------------------------------------------------------------------------------------------
|
||||
-- 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>
|
||||
<!--/tyt_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>
|
||||
<!--/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>
|
||||
<!--/file_list-->
|
||||
|
||||
|
||||
<!--faq_traclist-->
|
||||
<div id="faq_traclist"> <a href="http://rutracker.org/forum/viewtopic.php?t=2525182" target="_blank"><b>Как быстро создать треклист с указанием битрейта</b></a></div>
|
||||
<!--/faq_traclist-->
|
||||
|
|
|
|||
|
|
@ -2,22 +2,6 @@
|
|||
|
||||
<div id="pm_header">
|
||||
<!-- 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">
|
||||
<tr>
|
||||
<td colspan="3" class="row1 med tCenter nowrap">{BOX_SIZE_STATUS}</td>
|
||||
|
|
|
|||
|
|
@ -17,12 +17,9 @@
|
|||
</tr>
|
||||
<!-- END report_statistics -->
|
||||
</table>
|
||||
|
||||
<br />
|
||||
|
||||
<!-- BEGIN switch_deleted_reports -->
|
||||
<span class="maintitle">{L_DELETED_REPORTS}:</span><br /><br />
|
||||
|
||||
<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">
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@
|
|||
|
||||
</form>
|
||||
|
||||
|
||||
<div class="bottom_info">
|
||||
|
||||
<div class="spacer_4"></div>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ $(document).ready(function(){
|
|||
return false;
|
||||
});
|
||||
|
||||
|
||||
$('td.topic_id').click(function(){
|
||||
if (!ajax.in_edit_mode) {
|
||||
$('#show-edit-btn a').click();
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ td.topic_id { cursor: pointer; }
|
|||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
<table id="post-row" style="display: none;">
|
||||
<tr>
|
||||
<td class="row2" colspan="7">
|
||||
|
|
|
|||
|
|
@ -131,6 +131,7 @@ ajax.callback.mod_action = function(data) {
|
|||
ajax.ip_load = true;
|
||||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
ajax.group_membership = function(mode) {
|
||||
$('#gr-mem-list').html('<i class="loading-1">{L_LOADING}</i>');
|
||||
|
|
@ -173,7 +174,6 @@ ajax.callback.gen_passkey = function(data){
|
|||
</script>
|
||||
<!-- ENDIF / SHOW_PASSKEY -->
|
||||
|
||||
|
||||
<style type="text/css">
|
||||
#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; }
|
||||
|
|
@ -323,7 +323,8 @@ ajax.callback.gen_passkey = function(data){
|
|||
<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>
|
||||
</fieldset>
|
||||
<fieldset class="mrg_6"><legend>{L_BAN_USER}</legend>
|
||||
<fieldset class="mrg_6">
|
||||
<legend>{L_BAN_USER}</legend>
|
||||
<div class="tLeft" style="padding: 2px 6px 6px; display: block;" id="user-opt">
|
||||
<label><input type="checkbox" name="dis_avatar"/>{L_HIDE_AVATARS}</label>
|
||||
<label><input type="checkbox" name="dis_sig"/>{L_SHOW_CAPTION}</label>
|
||||
|
|
@ -438,7 +439,6 @@ ajax.callback.gen_passkey = function(data){
|
|||
<!-- ENDIF -->
|
||||
<tr>
|
||||
<td colspan="2" class="pad_4">
|
||||
|
||||
<table id="traf-stats-tbl" <!-- IF TRAF_STATS -->style="display: none;"<!-- ENDIF --> class="bCenter borderless" cellspacing="1">
|
||||
<tr class="row3">
|
||||
<th class="stats-ext"></th>
|
||||
|
|
@ -479,10 +479,8 @@ ajax.callback.gen_passkey = function(data){
|
|||
<!-- 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>
|
||||
</table>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
<!--/user_details-->
|
||||
|
||||
|
|
|
|||
|
|
@ -584,22 +584,6 @@ function build_poll_add_form (src_el)
|
|||
</tr>
|
||||
</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;">
|
||||
<tr>
|
||||
<td valign="top">
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@
|
|||
|
||||
<!-- BEGIN tor_reged -->
|
||||
|
||||
|
||||
<!-- IF TOR_BLOCKED -->
|
||||
<table id="tor_blocked" class="error">
|
||||
<tr><td><p class="error_msg">{TOR_BLOCKED_MSG}</p></td></tr>
|
||||
|
|
|
|||
|
|
@ -227,7 +227,6 @@ if ($moderation)
|
|||
));
|
||||
}
|
||||
|
||||
|
||||
if (!$forums = $datastore->get('cat_forums'))
|
||||
{
|
||||
$datastore->update('cat_forums');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue