github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -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

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

@ -14,8 +14,8 @@ Quick guide:
copy two files: automatically generated 'converter/passwords.php' and 'for_tbdev/pass.php' to your TBDevYSE root and run pass.php
(Don't forget to remove these files after completion).
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
'for_tbdev/announce.php'
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'
Cheers, RoadTrain.
http://torrentpier.me/

4
other/converter/TBDevYSE_pre6/for_tbdev/announce.php
View file

@ -42,10 +42,10 @@ mysql_close();
mysql_query("SET NAMES $dbcharset");
// Get passkey for TorrentPier
$user_id += USER_ID_DIFF;
$user_id += USER_ID_DIFF;
$res = mysql_query("SELECT auth_key FROM bb_bt_users WHERE user_id = $user_id") or err(mysql_error());
if (mysql_affected_rows() == 0)
if (mysql_affected_rows() == 0)
{
err('Passkey doesn\'t created on new tracker or user doesn\'t exist');
}

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

@ -8,14 +8,12 @@ loggedinorreturn();
$new_tr_url = "http://torrentpier.me/"; // with ending slash
$subject = "Переезд на новый движок";
$msg = '[b]Внимание![/b] Наш трекер переехал на новый движок! Адрес трекера - [url='.$new_tr_url.']'.$new_tr_url.'[/url]
Вся база перенесена на новый движок, регистрироваться заново не надо.
Войти на трекер можно [url='.$new_tr_url.'login.php]здесь[/url]. Ваши данные на новом трекере:
[b]Логин:[/b] %s
[b]Пароль:[/b] %s
$msg = '[b]Внимание![/b] Наш трекер переехал на новый движок! Адрес трекера - [url='.$new_tr_url.']'.$new_tr_url.'[/url]
Вся база перенесена на новый движок, регистрироваться заново не надо.
Войти на трекер можно [url='.$new_tr_url.'login.php]здесь[/url]. Ваши данные на новом трекере:
[b]Логин:[/b] %s
[b]Пароль:[/b] %s
Сменить пароль можно после входа на трекер в [url='.$new_tr_url.'profile.php?mode=editprofile]настройках[/url].';
if (empty($_POST['confirm']))
{
@ -32,14 +30,14 @@ if (empty($_POST['confirm']))
else
{
if(!file_exists('passwords.php')) stderr($tracker_lang['error'], 'passwords.php not exists');
include('passwords.php');
stdhead();
foreach ($passwords as $user)
{
$msg_sql = sprintf($msg, $user['username'], $user['new_passwd']);
sql_query("INSERT INTO messages (receiver, added, subject, msg) VALUES({$user['tb_user_id']}, NOW(), ".sqlesc($subject).", ".sqlesc($msg_sql).")");
}
}
stdmsg('OK', 'Mass PM succesful');
}

36
other/converter/TBDevYSE_pre6/root/convert.php
View file

@ -81,18 +81,18 @@ if (CONVERT_USERS)
{
$start = $i * C_USERS_PER_ONCE;
$offset = C_USERS_PER_ONCE;
$sql = "
SELECT
id, username, email, status, UNIX_TIMESTAMP(added) AS added, UNIX_TIMESTAMP(last_access) AS last_access,
SELECT
id, username, email, status, UNIX_TIMESTAMP(added) AS added, UNIX_TIMESTAMP(last_access) AS last_access,
class, icq, msn, aim, yahoo, website, $_sql
uploaded, downloaded, enabled, language
FROM ". TB_USERS_TABLE ."
FROM ". TB_USERS_TABLE ."
ORDER BY id
LIMIT $start, $offset";
$users = DB()->fetch_rowset($sql);
DB()->sql_freeresult();
DB()->sql_freeresult();
foreach ($users as $user)
{
@ -159,17 +159,17 @@ if (CONVERT_TORRENTS)
print_ok ("Categories from TBDev converted");
unset($cats);
// Start of torrents converting
// Start of torrents converting
switch(TR_TYPE)
{
{
case 'yse':
$_sql = 'image1, image2, ';
break;
case 'sky':
$_sql = 'poster, screenshot1, screenshot2, screenshot3, screenshot4, ';
break;
default:
$_sql = '';
break;
@ -187,9 +187,9 @@ if (CONVERT_TORRENTS)
$start = $i * C_TORRENTS_PER_ONCE;
$offset = C_TORRENTS_PER_ONCE;
$sql = "
SELECT
SELECT
id, info_hash, name, filename, search_text, descr, $_sql
category, UNIX_TIMESTAMP(added) AS added, size, views,
category, UNIX_TIMESTAMP(added) AS added, size, views,
UNIX_TIMESTAMP(last_action) AS lastseed, times_completed, owner, sticky
FROM ". TB_TORRENTS_TABLE ."
ORDER BY id
@ -197,7 +197,7 @@ if (CONVERT_TORRENTS)
$torrents = DB()->fetch_rowset($sql);
DB()->sql_freeresult();
foreach ($torrents as $torrent)
{
$torrent['topic_id'] = $torrent['id'] + $max_topic_id;
@ -219,16 +219,16 @@ if (CONVERT_TORRENTS)
$max_post_id = (int) get_max_val(BB_POSTS, 'post_id');
$max_topic_id = (int) get_max_val(BB_TOPICS, 'topic_id');
$max_attach_id = (int) get_max_val(BB_ATTACHMENTS, 'attach_id');
$comments_count = (int) get_count(TB_COMMENTS_TABLE, 'id');
$loops = (int) ceil($comments_count / C_COMMENTS_PER_ONCE);
for ($i = 0; $i < $loops; $i++)
{
$start = $i * C_COMMENTS_PER_ONCE;
$offset = C_COMMENTS_PER_ONCE;
$offset = C_COMMENTS_PER_ONCE;
$sql = "
SELECT
SELECT
c.id, c.user, c.torrent, c.text, tor.category,
UNIX_TIMESTAMP(c.added) AS added, UNIX_TIMESTAMP(c.editedat) AS editedat, c.ip
FROM ". TB_COMMENTS_TABLE ." c
@ -236,10 +236,10 @@ if (CONVERT_TORRENTS)
WHERE c.torrent <> 0
ORDER BY c.id
LIMIT $start, $offset";
$comments = DB()->fetch_rowset($sql);
DB()->sql_freeresult();
foreach ($comments as $comment)
{
$comment['user'] += $max_uid;

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

@ -21,7 +21,7 @@ function hex2bin($h)
}
function get_max_val($table_name, $column)
{
{
$row = DB()->fetch_row("SELECT MAX($column) AS $column FROM $table_name LIMIT 1");
return $row[$column];
}
@ -43,19 +43,9 @@ function set_auto_increment($table_name, $column, $val = null)
DB()->query("ALTER TABLE $table_name auto_increment = $val");
}
//Users functions
// 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);
}
@ -91,7 +81,7 @@ function convert_user($user)
"user_id" => $user['id'],
"user_active" => ($user['enabled'] == 'yes') ? true : false,
"username" => $user['username'],
"user_password" => md5($user['password']),
"user_password" => md5($user['password']),
"user_lastvisit" => $user['last_access'],
"user_regdate" => $user['added'],
"user_level" => tp_user_level($user['class']),
@ -101,11 +91,11 @@ function convert_user($user)
"user_avatar" => !empty($user['avatar']) ? $user['avatar'] : null,
"user_avatar_type" => !empty($user['avatar']) ? 2 : null,
"user_email" => $user['email'],
"user_website" => $user['website'],
"user_website" => $user['website'],
);
$columns = $values = array();
foreach ($user_data as $column => $value)
{
$columns[] = $column;
@ -113,9 +103,9 @@ function convert_user($user)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_USERS . " ($sql_columns) VALUES($sql_values);");
$bt_user_data = array(
"user_id" => $user['id'],
"auth_key" => make_rand_str(BT_AUTH_KEY_LENGTH),
@ -123,7 +113,7 @@ function convert_user($user)
"u_down_total" => $user['downloaded'],
);
$columns = $values = array();
foreach ($bt_user_data as $column => $value)
{
$columns[] = $column;
@ -131,7 +121,7 @@ function convert_user($user)
}
$sql_bt_columns = implode(',', $columns);
$sql_bt_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_BT_USERS . " ($sql_bt_columns) VALUES($sql_bt_values);");
}
@ -143,7 +133,7 @@ function tp_categories_cleanup()
function tp_add_category_old($id, $cat_title)
{
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES ." (cat_id, cat_title)
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES ." (cat_id, cat_title)
VALUES ($id, '". DB()->escape($cat_title) ."')");
return;
}
@ -151,7 +141,7 @@ function tp_add_category_old($id, $cat_title)
function tp_add_category($cat_data)
{
$columns = $values = array();
foreach ($cat_data as $column => $value)
{
$columns[] = $column;
@ -159,7 +149,7 @@ function tp_add_category($cat_data)
}
$sql_bt_columns = implode(',', $columns);
$sql_bt_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES . " ($sql_bt_columns) VALUES($sql_bt_values);");
}
@ -173,16 +163,7 @@ 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;
}
@ -196,7 +177,7 @@ function tp_add_topic($topic_data)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_TOPICS . " ($sql_columns) VALUES($sql_values);");
return;
}
@ -213,7 +194,7 @@ function tp_add_post($post_data)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES($sql_values);");
}
return;
@ -231,7 +212,7 @@ function tp_add_attach($attach_data)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES($sql_values);");
}
return;
@ -248,19 +229,19 @@ function append_images($tor)
{
$poster = $screens = '';
switch(TR_TYPE)
{
{
case 'yse':
if(!empty($tor['image1']))
if(!empty($tor['image1']))
{
$poster = "[img=right]".make_img_path($tor['image1'])."[/img]";
}
if(!empty($tor['image2']))
if(!empty($tor['image2']))
{
$screens = '[spoiler="Скриншоты"][img]'.make_img_path($tor['image2'])."[/img][/spoiler]";
}
break;
case 'sky':
if(!empty($tor['poster']))
if(!empty($tor['poster']))
{
$poster = "[img=right]".make_img_path($tor['poster'])."[/img]";
}
@ -270,7 +251,7 @@ function append_images($tor)
$screens .= '[spoiler="Скриншоты"]';
for ($i = 1; $i<=4; $i++)
{
if(!empty($tor['screenshot'.$i]))
if(!empty($tor['screenshot'.$i]))
{
$screens .= "[img]".make_img_path($tor['screenshot'.$i])."[/img] \n";
}
@ -299,9 +280,8 @@ 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(
"posts" => array(
"post_id" => $torrent['post_id'],
@ -321,7 +301,7 @@ function convert_torrent($torrent)
),
);
tp_add_post($post_data);
$attach_data = array(
"attachments" => array(
"attach_id" => $torrent['attach_id'],
@ -340,11 +320,11 @@ function convert_torrent($torrent)
),
);
tp_add_attach($attach_data);
//Torrents
if (BDECODE)
{
$filename = get_attachments_dir() .'/'. $torrent['id'] .".torrent";
$filename = get_attachments_dir() .'/'. $torrent['id'] .".torrent";
if (!file_exists($filename))
{
return;
@ -359,7 +339,7 @@ function convert_torrent($torrent)
{
$info_hash_sql = hex2bin($torrent['info_hash']);
}
$torrent_data = array(
"info_hash" => $info_hash_sql,
"post_id" => $torrent['post_id'],
@ -374,7 +354,7 @@ function convert_torrent($torrent)
);
$columns = $values = array();
foreach ($torrent_data as $column => $value)
{
$columns[] = $column;
@ -382,16 +362,16 @@ function convert_torrent($torrent)
}
$sql_columns = implode(', ', $columns);
$sql_values = implode(', ', $values);
DB()->query("INSERT IGNORE INTO ". BB_BT_TORRENTS . " ($sql_columns) VALUES($sql_values);");
return;
}
//Comments functions
// Comments functions
function convert_comment($comment)
{
$post_text = prepare_message($comment['text'], true, true);
$post_data = array(
"posts" => array(
"post_id" => $comment['id'],
@ -409,7 +389,6 @@ function convert_comment($comment)
),
);
tp_add_post($post_data);
//add_search_words($comment['id'], stripslashes($post_text));
return;
}
@ -431,7 +410,7 @@ function convert_cat($forum, $allow_torrents = true)
);
$columns = $values = array();
foreach ($forum_data as $column => $value)
{
$columns[] = $column;
@ -439,7 +418,7 @@ function convert_cat($forum, $allow_torrents = true)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_FORUMS . " ($sql_columns) VALUES($sql_values);");
return;
}

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

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

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

@ -1,5 +1,5 @@
<?php
define('IN_FORUM', true);
define('IN_SERVICE', true);
define('BB_ROOT', './');
@ -52,36 +52,36 @@ $loops = (int) ceil($torrents_count / C_TORRENTS_PER_ONCE);
$not_exist = array();
$attach_dir = get_attachments_dir() .'/';
for ($i = 0; $i < $loops; $i++)
{
$start = $i * C_TORRENTS_PER_ONCE;
$offset = C_TORRENTS_PER_ONCE;
$sql = "SELECT
$offset = C_TORRENTS_PER_ONCE;
$sql = "SELECT
tor.attach_id, tor.topic_id, ad.physical_filename
FROM ". BB_BT_TORRENTS ." tor
LEFT JOIN ". BB_ATTACHMENTS_DESC ." ad ON(ad.attach_id = tor.attach_id)
ORDER BY tor.attach_id
LIMIT $start, $offset";
$torrents = DB()->fetch_rowset($sql);
DB()->sql_freeresult();
foreach ($torrents as $torrent)
{
$filename = $attach_dir . $torrent['physical_filename'];
$filename = $attach_dir . $torrent['physical_filename'];
if (!file_exists($filename))
{
$not_exist[] = '<a href="viewtopic.php?t='. $torrent['topic_id'] .'">'. $filename .'</a>';
}
else
{
{
$tor = bdecode_file($filename);
$info = (!empty($tor['info'])) ? $tor['info'] : array();
$info_hash = pack('H*', sha1(bencode($info)));
$info_hash_sql = rtrim(DB()->escape($info_hash), ' ');
DB()->query("UPDATE ". BB_BT_TORRENTS ."
SET info_hash = '$info_hash_sql'
WHERE attach_id = {$torrent['attach_id']}");
@ -91,9 +91,9 @@ for ($i = 0; $i < $loops; $i++)
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)));
}
}
}

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

@ -100,7 +100,7 @@ function convert_user($user)
);
$columns = $values = array();
foreach ($user_data as $column => $value)
{
$columns[] = $column;
@ -108,9 +108,9 @@ function convert_user($user)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_USERS . " ($sql_columns) VALUES ($sql_values);");
$bt_user_data = array(
"user_id" => $user['id'],
"auth_key" => make_rand_str(BT_AUTH_KEY_LENGTH),
@ -118,7 +118,7 @@ function convert_user($user)
"u_down_total" => $user['downloaded'],
);
$columns = $values = array();
foreach ($bt_user_data as $column => $value)
{
$columns[] = $column;
@ -126,7 +126,7 @@ function convert_user($user)
}
$sql_bt_columns = implode(',', $columns);
$sql_bt_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_BT_USERS . " ($sql_bt_columns) VALUES ($sql_bt_values);");
}
@ -138,7 +138,7 @@ function tp_categories_cleanup()
function tp_add_category_old($id, $cat_title)
{
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES ." (cat_id, cat_title)
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES ." (cat_id, cat_title)
VALUES ($id, '". DB()->escape($cat_title) ."')");
return;
}
@ -146,7 +146,7 @@ function tp_add_category_old($id, $cat_title)
function tp_add_category($cat_data)
{
$columns = $values = array();
foreach ($cat_data as $column => $value)
{
$columns[] = $column;
@ -154,12 +154,12 @@ function tp_add_category($cat_data)
}
$sql_bt_columns = implode(',', $columns);
$sql_bt_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES . " ($sql_bt_columns) VALUES ($sql_bt_values);");
}
function tp_topics_cleanup()
{
{
DB()->query("TRUNCATE ". BB_ATTACHMENTS);
DB()->query("TRUNCATE ". BB_ATTACHMENTS_DESC);
DB()->query("TRUNCATE ". BB_BT_TORRENTS);
@ -168,21 +168,12 @@ 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;
}
function tp_add_topic($topic_data)
{
{
$columns = $values = array();
foreach ($topic_data as $column => $value)
{
@ -191,13 +182,13 @@ function tp_add_topic($topic_data)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_TOPICS . " ($sql_columns) VALUES ($sql_values);");
return;
}
function tp_add_post($post_data)
{
{
foreach ($post_data as $key => $data)
{
$columns = $values = array();
@ -208,14 +199,14 @@ function tp_add_post($post_data)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES ($sql_values);");
}
return;
}
function tp_add_attach($attach_data)
{
{
foreach ($attach_data as $key => $data)
{
$columns = $values = array();
@ -226,7 +217,7 @@ function tp_add_attach($attach_data)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES ($sql_values);");
}
return;
@ -243,19 +234,19 @@ function append_images($tor)
{
$poster = $screens = '';
switch(TR_TYPE)
{
{
case 'yse':
if(!empty($tor['image1']))
if(!empty($tor['image1']))
{
$poster = "[img=right]".make_img_path($tor['image1'])."[/img]";
}
if(!empty($tor['image2']))
if(!empty($tor['image2']))
{
$screens = '[spoiler="Скриншоты"][img]'.make_img_path($tor['image2'])."[/img][/spoiler]";
}
break;
case 'sky':
if(!empty($tor['poster']))
if(!empty($tor['poster']))
{
$poster = "[img=right]".make_img_path($tor['poster'])."[/img]";
}
@ -265,7 +256,7 @@ function append_images($tor)
$screens .= '[spoiler="Скриншоты"]';
for ($i = 1; $i<=4; $i++)
{
if(!empty($tor['screenshot'.$i]))
if(!empty($tor['screenshot'.$i]))
{
$screens .= "[img]".make_img_path($tor['screenshot'.$i])."[/img] \n";
}
@ -294,9 +285,9 @@ function convert_torrent($torrent)
"topic_last_post_time" => $torrent['added'],
);
tp_add_topic($topic_data);
$post_text = stripslashes(prepare_message(addslashes(unprepare_message($torrent['descr'])), true, true));
$post_data = array(
"posts" => array(
"post_id" => $torrent['post_id'],
@ -316,7 +307,7 @@ function convert_torrent($torrent)
),
);
tp_add_post($post_data);
$attach_data = array(
"attachments" => array(
"attach_id" => $torrent['attach_id'],
@ -335,11 +326,11 @@ function convert_torrent($torrent)
),
);
tp_add_attach($attach_data);
//Torrents
if (BDECODE)
{
$filename = get_attachments_dir() .'/'. $torrent['id'] .".torrent";
$filename = get_attachments_dir() .'/'. $torrent['id'] .".torrent";
if (!file_exists($filename))
{
return;
@ -354,7 +345,7 @@ function convert_torrent($torrent)
{
$info_hash_sql = hex2bin($torrent['info_hash']);
}
$torrent_data = array(
"info_hash" => $info_hash_sql,
"post_id" => $torrent['post_id'],
@ -362,14 +353,14 @@ function convert_torrent($torrent)
"topic_id" => $torrent['topic_id'],
"forum_id" => $torrent['category'],
"attach_id" => $torrent['attach_id'],
"size" => $torrent['size'],
"size" => $torrent['size'],
"reg_time" => $torrent['added'],
"complete_count" => $torrent['times_completed'],
"seeder_last_seen" => $torrent['lastseed'],
);
$columns = $values = array();
foreach ($torrent_data as $column => $value)
{
$columns[] = $column;
@ -377,7 +368,7 @@ function convert_torrent($torrent)
}
$sql_columns = implode(', ', $columns);
$sql_values = implode(', ', $values);
DB()->query("INSERT IGNORE INTO ". BB_BT_TORRENTS . " ($sql_columns) VALUES($sql_values);");
return;
}
@ -386,7 +377,7 @@ function convert_torrent($torrent)
function convert_comment($comment)
{
$post_text = prepare_message($comment['text'], true, true);
$post_data = array(
"posts" => array(
"post_id" => $comment['id'],
@ -404,13 +395,12 @@ function convert_comment($comment)
),
);
tp_add_post($post_data);
//add_search_words($comment['id'], stripslashes($post_text));
return;
}
//Forums functions
function tp_forums_cleanup()
{
{
DB()->query('TRUNCATE '. BB_FORUMS);
}
@ -426,7 +416,7 @@ function convert_cat($forum, $allow_torrents = true)
);
$columns = $values = array();
foreach ($forum_data as $column => $value)
{
$columns[] = $column;
@ -434,7 +424,7 @@ function convert_cat($forum, $allow_torrents = true)
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
DB()->query("INSERT IGNORE INTO ". BB_FORUMS . " ($sql_columns) VALUES ($sql_values);");
return;
}
}

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

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

25
other/recover/recover.php
View file

@ -1,5 +1,5 @@
<?php
define('IN_FORUM', true);
define('IN_SERVICE', true);
define('BB_ROOT', './');
@ -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();
@ -52,36 +51,36 @@ $loops = (int) ceil($torrents_count / C_TORRENTS_PER_ONCE);
$not_exist = array();
$attach_dir = get_attachments_dir() .'/';
for ($i = 0; $i < $loops; $i++)
{
$start = $i * C_TORRENTS_PER_ONCE;
$offset = C_TORRENTS_PER_ONCE;
$sql = "SELECT
$offset = C_TORRENTS_PER_ONCE;
$sql = "SELECT
tor.attach_id, tor.topic_id, ad.physical_filename
FROM ". BB_BT_TORRENTS ." tor
LEFT JOIN ". BB_ATTACHMENTS_DESC ." ad ON(ad.attach_id = tor.attach_id)
ORDER BY tor.attach_id
LIMIT $start, $offset";
$torrents = DB()->fetch_rowset($sql);
DB()->sql_freeresult();
foreach ($torrents as $torrent)
{
$filename = $attach_dir . $torrent['physical_filename'];
$filename = $attach_dir . $torrent['physical_filename'];
if (!file_exists($filename))
{
$not_exist[] = '<a href="viewtopic.php?t='. $torrent['topic_id'] .'">'. $filename .'</a>';
}
else
{
{
$tor = bdecode_file($filename);
$info = (!empty($tor['info'])) ? $tor['info'] : array();
$info_hash = pack('H*', sha1(bencode($info)));
$info_hash_sql = rtrim(DB()->escape($info_hash), ' ');
DB()->query("UPDATE ". BB_BT_TORRENTS ."
SET info_hash = '$info_hash_sql'
WHERE attach_id = {$torrent['attach_id']}");
@ -91,9 +90,9 @@ for ($i = 0; $i < $loops; $i++)
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)));
}
}
}

1
upload/admin/admin_attach_cp.php
View file

@ -76,7 +76,6 @@ else
$sort_order = 'ASC';
}
// Pagination ?
$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 ($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]));
}
}
@ -89,7 +87,7 @@ switch($mode)
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']);
foreach ($seed_bonus as $i => $row)
@ -106,7 +104,7 @@ switch($mode)
if ($new['bonus_upload'] && $new['bonus_upload_price'])
{
$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)
{

1
upload/admin/admin_forumauth_list.php
View file

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

1
upload/admin/admin_forums.php
View file

@ -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');

1
upload/admin/admin_log.php
View file

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

12
upload/admin/admin_mass_email.php
View file

@ -36,10 +36,10 @@ if (isset($_POST['submit']))
if ($group_id != -1)
{
$user_list = DB()->fetch_rowset("
SELECT u.username, u.user_email, u.user_lang
FROM ". BB_USERS ." u, ". BB_USER_GROUP ." ug
WHERE ug.group_id = $group_id
AND ug.user_pending = 0
SELECT u.username, u.user_email, u.user_lang
FROM ". BB_USERS ." u, ". BB_USER_GROUP ." ug
WHERE ug.group_id = $group_id
AND ug.user_pending = 0
AND u.user_id = ug.user_id
AND u.user_active = 1
AND u.user_id NOT IN(". EXCLUDED_USERS_CSV . $user_id_sql .")
@ -48,8 +48,8 @@ if (isset($_POST['submit']))
else
{
$user_list = DB()->fetch_rowset("
SELECT username, user_email, user_lang
FROM ". BB_USERS ."
SELECT username, user_email, user_lang
FROM ". BB_USERS ."
WHERE user_active = 1
AND user_id NOT IN(". EXCLUDED_USERS_CSV . $user_id_sql .")
");

1
upload/admin/admin_ranks.php
View file

@ -36,7 +36,6 @@ else
}
}
if ($mode != '')
{
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));
$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))
{

4
upload/ajax.php
View file

@ -116,7 +116,7 @@ class ajax_common
global $lang;
// Exit if we already have errors
if (!empty($this->response['error_code']))
if (!empty($this->response['error_code']))
{
$this->send();
}
@ -127,7 +127,7 @@ class ajax_common
if (!$action || !is_string($action))
{
$this->ajax_die('no action specified');
}
}
elseif (!$action_params =& $this->valid_actions[$action])
{
$this->ajax_die('invalid action: ' . $action);

2
upload/ajax/edit_user_profile.php
View file

@ -148,7 +148,7 @@ switch ($field)
$btu[$field] = $value;
$this->response['update_ids']['u_ratio'] = (string) get_bt_ratio($btu);
break;
case 'user_points':
$value = htmlCHR($value);
$value = (float) str_replace(',', '.', $this->request['value']);

8
upload/ajax/mod_action.php
View file

@ -72,13 +72,13 @@ switch ($mode)
if (!$user_id) $this->ajax_die($lang['NO_USER_ID_SPECIFIED']);
$reg_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM ". BB_USERS ."
WHERE user_reg_ip = '{$profiledata['user_reg_ip']}'
WHERE user_reg_ip = '{$profiledata['user_reg_ip']}'
AND user_reg_ip != ''
AND user_id != {$profiledata['user_id']}
ORDER BY username ASC");
$last_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " .BB_USERS ."
WHERE user_last_ip = '{$profiledata['user_last_ip']}'
$last_ip = DB()->fetch_rowset("SELECT username, user_id, user_rank FROM " .BB_USERS ."
WHERE user_last_ip = '{$profiledata['user_last_ip']}'
AND user_last_ip != ''
AND user_id != {$profiledata['user_id']}");
@ -101,7 +101,7 @@ switch ($mode)
$link_last_ip .= profile_url($row) .' ';
}
}
if ($profiledata['user_level'] == ADMIN && !IS_ADMIN) $reg_ip = $last_ip = $lang['HIDDEN'];
elseif ($profiledata['user_level'] == MOD && IS_MOD) $reg_ip = $last_ip = $lang['HIDDEN'];
else

2
upload/ajax/post_mod_comment.php
View file

@ -10,7 +10,7 @@ $mc_text = (string) $this->request['mc_text'];
if (!$mc_text = prepare_message($mc_text)) $this->ajax_die($lang['EMPTY_MESSAGE']);
$post = DB()->fetch_row("
SELECT
SELECT
p.post_id, p.poster_id
FROM ". BB_POSTS ." p
WHERE p.post_id = $post_id

2
upload/ajax/view_torrent.php
View file

@ -79,7 +79,7 @@ class torrent
function build_filelist_array ()
{
global $lang;
$info = $this->tor_decoded['info'];
if (isset($info['name.utf-8']))

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

@ -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)
*/

1
upload/attach_mod/posting_attachments.php
View file

@ -9,7 +9,6 @@ define('FILENAME_CRYPTIC', false);
define('FILENAME_CRYPTIC_LENGTH', 64);
define('FILENAME_TRANSLITERATE', true);
class attach_parent
{
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['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['user_signature_start'] = '<div class="signature"><br />_________________<br />';
$bb_cfg['user_signature_end'] = '</div>'; // Это позволит использовать html теги, которые требуют закрытия. Например <table> или <font color>
$bb_cfg['user_signature_start'] = '<div class="signature"><br />_________________<br />';
$bb_cfg['user_signature_end'] = '</div>'; // Это позволит использовать html теги, которые требуют закрытия. Например <table> или <font color>
// Posts
$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_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,15 +580,14 @@ $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['trash_forum_id'] = 0; // (int) 7
$bb_cfg['first_logon_redirect_url'] = 'index.php';
$bb_cfg['terms_and_conditions_url'] = 'index.php';
$bb_cfg['first_logon_redirect_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['copyright_holders_url'] = 'misc.php?do=info&show=copyright_holders';
$bb_cfg['advert_url'] = 'misc.php?do=info&show=advert';
$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['advert_url'] = 'misc.php?do=info&show=advert';
// Captcha
$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)
{
bb_die($lang['SORRY_AUTH_VIEW_ATTACH']);

6
upload/includes/class.correct.php
View file

@ -69,7 +69,7 @@ class Text_LangCorrect
#английский (all)
private $en = '[a-zA-Z]';
#английский (uppercase)
private $en_uc = '[A-Z]';
@ -2822,7 +2822,7 @@ class Text_LangCorrect
/**
* Исправляет клавиатурные опечатки в тексте.
*
*
* @param scalar|null $s Текст в кодировке UTF-8.
* @param int $mode Константы self::SIMILAR_CHARS и/или self::KEYBOARD_LAYOUT,
* (их можно комбинировать). Описание констант см. выше.
@ -3055,7 +3055,7 @@ class Text_LangCorrect
#если в $word были спецсимволы, а в $s их уже нет, возвращаем $s
if ($is_sc && ! preg_match('/' . $this->sc . '/sSX', $s)) return $s;
#если в $s спецсимволов больше чем букв, возвращаем $word
$sc_count = 0;
$s = preg_replace('/' . $this->sc . '/sSX', '', $s, -1, $sc_count);

2
upload/includes/class.reflection.php
View file

@ -17,7 +17,7 @@
* Useful links
* http://www.ilia.ws/archives/205-Type-hinting-for-PHP-5.3.html
* http://php.net/manual/en/language.oop5.typehinting.php
*
*
* @example ReflectionTypeHint_example.php
* @link http://code.google.com/p/php5-reflection-type-hint/
* @license http://creativecommons.org/licenses/by-sa/3.0/

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

@ -2390,7 +2390,7 @@ class UTF8
/**
* Convert UTF-16 / UCS-2 encoding string to UTF-8.
* Surrogates UTF-16 are supported!
*
*
* In Russian:
* Преобразует строку из кодировки UTF-16 / UCS-2 в UTF-8.
* Суррогаты UTF-16 поддерживаются!
@ -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()

8
upload/includes/datastore/build_stats.php
View file

@ -41,7 +41,7 @@ if ($bb_cfg['gender'])
$male = DB()->fetch_row("SELECT COUNT(user_id) AS male FROM ". BB_USERS ." WHERE user_gender = ". MALE ." AND user_id NOT IN(". EXCLUDED_USERS_CSV .")");
$female = DB()->fetch_row("SELECT COUNT(user_id) AS female FROM ". BB_USERS ." WHERE user_gender = ". FEMALE ." AND user_id NOT IN(". EXCLUDED_USERS_CSV .")");
$unselect = DB()->fetch_row("SELECT COUNT(user_id) AS unselect FROM ". BB_USERS ." WHERE user_gender = 0 AND user_id NOT IN(". EXCLUDED_USERS_CSV .")");
$data['male'] = $male['male'];
$data['female'] = $female['female'];
$data['unselect'] = $unselect['unselect'];
@ -51,10 +51,10 @@ if ($bb_cfg['gender'])
if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
{
$sql = DB()->fetch_rowset("SELECT user_id, username, user_rank , user_birthday
FROM ". BB_USERS ."
WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")
FROM ". BB_USERS ."
WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")
AND user_birthday != '0000-00-00'
AND user_active = 1
AND user_active = 1
ORDER BY user_level DESC, username
");

9
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);
}
function print_confirmation ($tpl_vars)
{
global $template, $lang;
@ -2778,7 +2777,7 @@ function get_avatar ($user_id, $ext_id, $allow_avatar = true, $size = true, $hei
{
// TODO
}
$height = ($height != '') ? 'height="'. $height .'"' : '';
$width = ($width != '') ? 'width="'. $width .'"' : '';
@ -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;
}
}

4
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)
{
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)
");
@ -423,7 +423,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi
{
DB()->query("
INSERT INTO " . BB_TOPICS_WATCH . " (user_id, topic_id, notify_status)
VALUES (". $userdata['user_id'] .", $topic_id, ". TOPIC_WATCH_NOTIFIED .")
VALUES (". $userdata['user_id'] .", $topic_id, ". TOPIC_WATCH_NOTIFIED .")
");
}
}

1
upload/includes/functions_report.php
View file

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

4
upload/includes/functions_validate.php
View file

@ -16,7 +16,7 @@ function validate_username ($username, $check_ban_and_taken = true)
if (mb_strlen($username, 'UTF-8') > USERNAME_MAX_LENGTH)
{
return $lang['USERNAME_TOO_LONG'];
}
}
else if (mb_strlen($username, 'UTF-8') < USERNAME_MIN_LENGTH)
{
return $lang['USERNAME_TOO_SMALL'];
@ -102,7 +102,7 @@ function validate_email ($email, $check_ban_and_taken = true)
$email_sql = DB()->escape($email);
if ($row = DB()->fetch_row("SELECT `user_email` FROM ". BB_USERS ." WHERE user_email = '$email_sql' LIMIT 1"))
{
{
if($row['user_email'] == $userdata['user_email'])
return false;
else

5
upload/includes/init_bb.php
View file

@ -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 .'"');

4
upload/includes/sessions.php
View file

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

5
upload/includes/template.php
View file

@ -33,8 +33,7 @@ define('XS_TAG_ELSEIF', 7);
define('XS_TAG_ENDIF', 8);
define('XS_TAG_BEGINELSE', 11);
class Template
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
*/

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

@ -43,7 +43,7 @@ if ($row = DB()->fetch_row($sql))
{
$subject = trim(html_entity_decode($_POST['subject']));
$message = trim(html_entity_decode($_POST['message']));
if(!$subject) $errors[] = $lang['EMPTY_SUBJECT_EMAIL'];
if(!$message) $errors[] = $lang['EMPTY_MESSAGE_EMAIL'];

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

@ -93,7 +93,7 @@ switch ($mode)
*/
case 'editprofile':
if (IS_GUEST) login_redirect();
// field => can_edit
$profile_fields = array(
'user_active' => IS_ADMIN,
@ -355,7 +355,7 @@ foreach ($profile_fields as $field => $can_edit)
$errors[] = sprintf($lang['BIRTHDAY_TO_LOW'], $bb_cfg['birthday_min_age']);
}
}
$pr_data['user_birthday'] = $user_birthday;
$db_data['user_birthday'] = $user_birthday;
}
@ -521,7 +521,6 @@ foreach ($profile_fields as $field => $can_edit)
}
$tp_data['USER_OCC'] = $pr_data['user_occ'];
break;
/**
* Интересы
@ -553,8 +552,7 @@ foreach ($profile_fields as $field => $can_edit)
}
$tp_data['USER_SKYPE'] = $pr_data['user_skype'];
break;
/**
* Twitter
*/
@ -571,7 +569,7 @@ foreach ($profile_fields as $field => $can_edit)
}
$tp_data['USER_TWITTER'] = $pr_data['user_twitter'];
break;
/**
* Выбор шаблона (edit)
*/

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

@ -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']) : '',
@ -189,13 +189,13 @@ else if (IS_MOD)
// Show users torrent-profile
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
if (IS_AM || $profile_user_id)
{
show_bt_userdata($profiledata['user_id']);
show_bt_userdata($profiledata['user_id']);
}
else
{
@ -227,13 +227,13 @@ if (IS_ADMIN)
$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_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_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_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_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_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_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_topic')) $user_restrictions[] = $lang['NEW_THREADS'];
$template->assign_var('USER_RESTRICTIONS', join('</li><li>', $user_restrictions));

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

@ -13,9 +13,9 @@ $not_auth_forums_sql = ($excluded_forums_csv) ? "
" : '';
$sql = DB()->fetch_rowset("
SELECT
f.forum_id, f.forum_name, t.topic_title,
tor.tor_type, tor.size,
SELECT
f.forum_id, f.forum_name, t.topic_title,
tor.tor_type, tor.size,
sn.seeders, sn.leechers, tr.*
FROM ". BB_FORUMS ." f, ". BB_TOPICS ." t, ". BB_BT_TRACKER ." tr, ". BB_BT_TORRENTS ." tor, ". BB_BT_TRACKER_SNAP ." sn
WHERE tr.user_id = {$profiledata['user_id']}
@ -51,18 +51,18 @@ if ($releasing)
$is_gold = '';
if ($tr_cfg['gold_silver_enabled'])
{
if ($row['tor_type'] == TOR_TYPE_GOLD)
{
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
}
elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
}
}
if ($row['tor_type'] == TOR_TYPE_GOLD)
{
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
}
elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
}
}
$topic_title = wbr($row['topic_title']);
$template->assign_block_vars('released', array(
'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
'FORUM_NAME' => htmlCHR($row['forum_name']),
@ -70,11 +70,11 @@ if ($releasing)
'U_VIEW_FORUM' => FORUM_URL . $row['forum_id'],
'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
'TOR_TYPE' => $is_gold,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') .'/s' : '-',
));
$releasing_count++;
}
}
@ -86,18 +86,18 @@ if ($seeding)
$is_gold = '';
if ($tr_cfg['gold_silver_enabled'])
{
if ($row['tor_type'] == TOR_TYPE_GOLD)
{
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
}
elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
}
}
if ($row['tor_type'] == TOR_TYPE_GOLD)
{
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'. $lang['GOLD'] .'" />&nbsp;';
}
elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'. $lang['SILVER'] .'" />&nbsp;';
}
}
$topic_title = wbr($row['topic_title']);
$template->assign_block_vars('seed', array(
'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
'FORUM_NAME' => htmlCHR($row['forum_name']),
@ -105,11 +105,11 @@ if ($seeding)
'U_VIEW_FORUM' => FORUM_URL . $row['forum_id'],
'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
'TOR_TYPE' => $is_gold,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'SPEED_UP' => ($row['speed_up']) ? humn_size($row['speed_up'], 0, 'KB') .'/s' : '-',
));
$seeding_count++;
}
}
@ -121,20 +121,20 @@ if ($leeching)
$is_gold = '';
if ($tr_cfg['gold_silver_enabled'])
{
if ($row['tor_type'] == TOR_TYPE_GOLD)
{
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'.$lang['GOLD'].'" />&nbsp;';
}
elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{
$is_gold = '<img src="images/tor_silver.gif" width="16" height="15" title="'.$lang['SILVER'].'" />&nbsp;';
}
}
if ($row['tor_type'] == TOR_TYPE_GOLD)
{
$is_gold = '<img src="images/tor_gold.gif" width="16" height="15" title="'.$lang['GOLD'].'" />&nbsp;';
}
elseif ($row['tor_type'] == TOR_TYPE_SILVER)
{
$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_perc = ($compl_size) ? floor($compl_size * 100 / $row['size']) : 0;
$topic_title = wbr($row['topic_title']);
$template->assign_block_vars('leech', array(
'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2',
'FORUM_NAME' => htmlCHR($row['forum_name']),
@ -143,11 +143,11 @@ if ($leeching)
'U_VIEW_TOPIC' => TOPIC_URL . $row['topic_id'],
'COMPL_PERC' => $compl_perc,
'TOR_TYPE' => $is_gold,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'TOPIC_SEEDERS' => ($row['seeders']) ? $row['seeders'] : 0,
'TOPIC_LEECHERS' => ($row['leechers']) ? $row['leechers'] : 0,
'SPEED_DOWN' => ($row['speed_down']) ? humn_size($row['speed_down'], 0, 'KB') .'/s' : '-',
));
$leeching_count++;
}
}
@ -159,4 +159,4 @@ $template->assign_vars(array(
'L_SEEDINGS' => "{$lang['SEEDING']}: ". (($seeding_count) ? "<b>$seeding_count</b>" : '0'),
'L_LEECHINGS' => "{$lang['LEECHING']}: ". (($leeching_count) ? "<b>$leeching_count</b>" : '0'),
'USER_DLS' => $releasing_count || $seeding_count || $leeching_count,
));
));

4
upload/index.php
View file

@ -24,7 +24,7 @@ if ($bb_cfg['show_latest_news'])
}
if ($bb_cfg['show_network_news'])
{
$datastore->enqueue('network_news');
$datastore->enqueue('network_news');
}
// Init userdata
@ -368,7 +368,7 @@ if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
{
$week_list = $today_list = array();
$week_all = $today_all = false;
if ($stats['birthday_week_list'])
{
shuffle($stats['birthday_week_list']);

2
upload/language/en/email/admin_send_email.tpl
View file

@ -4,7 +4,7 @@ The following is an email sent to you by an administrator of "{SITENAME}". If th
{BOARD_EMAIL}
Include this full email (particularly the headers).
Include this full email (particularly the headers).
Message sent to you follows:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

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

2
upload/language/en/html/user_agreement.html
View file

@ -5,7 +5,7 @@
<fieldset class="pad_6">
<legend class="med bold mrg_2 warnColor1">USER AGREEMENT</legend>
<div class="bCenter">
<style type="text/css">
#infobox-body p { margin-top: 1em; margin-bottom: 1em; }

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.';
//
// 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
//

2
upload/language/ru/email/admin_send_email.tpl
View file

@ -4,7 +4,7 @@ Charset: UTF-8
{BOARD_EMAIL}
Включите данное сообщение целиком (особенно заголовки).
Включите данное сообщение целиком (особенно заголовки).
Отправленное вам сообщение:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

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

2
upload/language/ru/html/user_agreement.html
View file

@ -5,7 +5,7 @@
<fieldset class="pad_6">
<legend class="med bold mrg_2 warnColor1">ПОЛЬЗОВАТЕЛЬСКОЕ СОГЛАШЕНИЕ</legend>
<div class="bCenter">
<style type="text/css">
#infobox-body p { margin-top: 1em; margin-bottom: 1em; }

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>, и ваше сообщение станет первым.';
//
// 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
//

2
upload/language/ua/email/admin_send_email.tpl
View file

@ -4,7 +4,7 @@ Charset: UTF-8
{BOARD_EMAIL}
Увімкніть дане повідомлення (особливо заголовки).
Увімкніть дане повідомлення (особливо заголовки).
Надіслане повідомлення:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

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

2
upload/language/ua/html/user_agreement.html
View file

@ -5,7 +5,7 @@
<fieldset class="pad_6">
<legend class="med bold mrg_2 warnColor1">УГОДА</legend>
<div class="bCenter">
<style type="text/css">
#infobox-body p { margin-top: 1em; margin-bottom: 1em; }

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>, і ваше повідомлення буде першим.';
//
// 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
//

8
upload/login.php
View file

@ -103,13 +103,13 @@ if (isset($_POST['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);
if($login_err > $bb_cfg['invalid_logins']) $need_captcha = true;
if($login_err > 50)
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);
}

2
upload/misc.php
View file

@ -138,7 +138,7 @@ elseif ($do == 'info')
</html>
<?php
}
else
else
{
bb_die('Invalid mode');
}

1
upload/poll.php
View file

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

10
upload/search.php
View file

@ -588,7 +588,7 @@ if ($post_mode)
$forum_id = (int) $first_post['forum_id'];
$is_unread_t = is_unread($first_post['topic_last_post_time'], $topic_id, $forum_id);
$topic_title = $first_post['topic_title'];
if (count($orig_word))
{
$topic_title = preg_replace($orig_word, $replacement_word, $topic_title);
@ -614,7 +614,7 @@ if ($post_mode)
{
$message = preg_replace($orig_word, $replacement_word, $message);
}
$template->assign_block_vars('t.p', array(
'ROW_NUM' => $row_num,
'POSTER_ID' => $post['poster_id'],
@ -700,21 +700,21 @@ else
<br /><br />
<a href="index.php">'. $lang['INDEX_RETURN'] .'</a>
');
}
}
}
if ($my_topics) $SQL['WHERE'][] = "t.topic_poster = $poster_id_val";
if ($text_match_sql)
{
$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))
{
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)";
prevent_huge_searches($SQL);

10
upload/stats/tracker.php
View file

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

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 -->
<h1>{L_CRON_EDIT_HEAD}</h1>
<a href="admin_cron.php?mode=list">{L_CRON_LIST}</a>
<br /><br />

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

@ -62,7 +62,4 @@
</form>
<!--========================================================================-->
<!-- ENDIF / TPL_EDIT_FORUM_AUTH -->
<!-- ENDIF / TPL_EDIT_FORUM_AUTH -->

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

@ -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>
@ -208,7 +206,7 @@ table.log_filters td {
</div>
</td>
<!-- ENDIF -->
</tr></table>
</fieldset>
<!-- ENDIF -->

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

@ -30,7 +30,7 @@
</form>
<script type="text/javascript">
function checkForm(formObj)
function checkForm(formObj)
{
formErrors = false;

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

@ -3,7 +3,7 @@
<tr>
<th class="thHead" colspan="2">{L_EDIT_REPORT_MODULE}</th>
</tr>
<tr>
<tr>
<td class="row1" width="40%" valign="top"><span class="gen">{L_REPORT_MODULE}:</span></td>
<td class="row2">
<span class="gen">{MODULE_TITLE}</span><br />

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

@ -42,7 +42,7 @@
</tr>
<!-- END switch_no_modules -->
<!-- END installed_modules -->
<!-- BEGIN inactive_modules -->
<tr class="row3 med">
<td colspan="3" class="catTitle">{L_INACTIVE_MODULES}</td>

4
upload/templates/admin/report_reason_edit_body.tpl
View file

@ -1,7 +1,7 @@
<form action="{S_REPORT_ACTION}" method="post">
<!-- BEGIN switch_report_errors -->
<table cellpadding="4" cellspacing="1" border="0" width="100%" align="center" class="forumline">
<tr>
<tr>
<td class="row1" align="center"><span class="gen">
<!-- BEGIN report_errors -->
{switch_report_errors.report_errors.MESSAGE}<br />
@ -11,7 +11,7 @@
</table>
<br />
<!-- END switch_report_errors -->
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
<th class="thHead" colspan="2">{L_ADD_REASON}</th>

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

@ -139,7 +139,7 @@ a.seed:visited, a.seedmed:visited, a.seedsmall:visited {
color: #006600; text-decoration: none;
}
a.points, a.pointsmed, a.pointssmall,
a.points:visited, a.pointsmed:visited, a.pointssmall:visited, .points
a.points:visited, a.pointsmed:visited, a.pointssmall:visited, .points
{
color: blue; text-decoration: none;
}
@ -1532,5 +1532,4 @@ div#autocomplete_popup span.regenerate {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
background-repeat: repeat-x;
border-color: #dca7a7;
}
}

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

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

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

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

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

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

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

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

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_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 -->

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

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

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

@ -29,7 +29,6 @@
<!--========================================================================-->
<!-- ENDIF / TPL_ADD_ATTACHMENT -->
<!-- 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">
<tr>
<td>
<table class="forumline">
<tr>
<th>{L_EMOTICONS}</th>
</tr>
<tr>
<td class="row1">
<table class="borderless w100" cellpadding="5">
<!-- BEGIN smilies_row -->
<tr align="center">
<!-- 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>
<!-- END smilies_col -->
</tr>
<!-- END smilies_row -->
<!-- BEGIN switch_smilies_extra -->
<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>
</tr>
<!-- END switch_smilies_extra -->
</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 class="forumline">
<tr>
<th>{L_EMOTICONS}</th>
</tr>
<tr>
<td class="row1">
<table class="borderless w100" cellpadding="5">
<!-- BEGIN smilies_row -->
<tr align="center">
<!-- 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>
<!-- END smilies_col -->
</tr>
<!-- END smilies_row -->
<!-- BEGIN switch_smilies_extra -->
<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>
</tr>
<!-- END switch_smilies_extra -->
</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>
</tr>
</table>

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

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

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

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

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

@ -1,5 +1,5 @@
<table cellspacing="2" cellpadding="2" border="0" width="100%">
<tr>
<tr>
<td class="nav"><a href="{U_INDEX}" class="nav">{T_INDEX}</a></td>
</tr>
</table>

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

@ -1,13 +1,13 @@
<form action="{S_REPORT_ACTION}" method="post">
<table cellpadding="2" cellspacing="2" border="0" width="100%" align="center">
<tr>
<tr>
<td class="nav"><a href="{U_INDEX}" class="nav">{T_INDEX}</a></td>
</tr>
</table>
<!-- BEGIN switch_report_errors -->
<table cellpadding="4" cellspacing="1" border="0" width="80%" align="center" class="forumline">
<tr>
<tr>
<td class="row1" align="center"><span class="gen">
<!-- BEGIN report_errors -->
{switch_report_errors.report_errors.MESSAGE}<br />
@ -17,9 +17,9 @@
</table>
<br />
<!-- END switch_report_errors -->
<table cellpadding="4" cellspacing="1" border="0" width="80%" align="center" class="forumline">
<tr>
<tr>
<th class="thHead" colspan="2">{L_WRITE_REPORT}</th>
</tr>
<tr>

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

@ -6,7 +6,7 @@
<td class="row1" style="padding: 10px">
<span class="maintitle">{L_STATISTICS}:</span><br /><br />
<table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="forumline">
<tr>
<tr>
<th class="thCornerL" width="50%">{L_STATISTIC}</th>
<th class="thCornerR">{L_VALUE}</th>
</tr>
@ -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>
@ -60,16 +57,16 @@
</tr>
</table>
</form>
<table cellspacing="2" cellpadding="2" border="0" width="90%" align="center">
<tr>
<tr>
<td class="gensmall">
<a href="javascript:checked_toggle('report_list_deleted',true)" class="gensmall">{L_MARK_ALL}</a> ::
<a href="javascript:checked_switch('report_list_deleted')" class="gensmall">{L_INVERT_SELECT}</a>
</td>
</tr>
</table>
<br />
<!-- END switch_deleted_reports -->
</td>

4
upload/templates/default/report_open_body.tpl
View file

@ -39,7 +39,7 @@ function checked_toggle(form, status)
</script>
<table cellpadding="2" cellspacing="2" border="0" width="80%" align="center">
<tr>
<tr>
<td class="nav"><a href="{U_INDEX}" class="nav">{L_HOME}</a></td>
</tr>
</table>
@ -81,7 +81,7 @@ function checked_toggle(form, status)
</form>
<table cellspacing="2" cellpadding="2" border="0" width="80%" align="center">
<tr>
<tr>
<td class="gensmall">
<a href="javascript:checked_toggle('report_list_open',true)" class="gensmall">{L_MARK_ALL}</a> ::
<a href="javascript:checked_switch('report_list_open')" class="gensmall">{L_INVERT_SELECT}</a>

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

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

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

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

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

@ -63,12 +63,12 @@ document.write('<input type="hidden" name="user_timezone" value="'+tz+'" />');
<tr>
<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 -->
<span id="check_name"></span></td>
<span id="check_name"></span></td>
</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><input id="email" onBlur="ajax.exec({ action: 'user_register', mode: 'check_email', email: $('#email').val()}); return false;" type="text" name="user_email" size="35" maxlength="40" value="{USER_EMAIL}" <!-- IF EDIT_PROFILE --><!-- IF $bb_cfg['emailer_disabled'] -->readonly="readonly" style="color: gray;"<!-- ENDIF --><!-- ENDIF --> />
<span id="check_email"></span></td>
<span id="check_email"></span></td>
</tr>
<!-- IF EDIT_PROFILE and not ADM_EDIT -->
<tr>
@ -79,16 +79,16 @@ document.write('<input type="hidden" name="user_timezone" value="'+tz+'" />');
<tr>
<td class="prof-title"><!-- IF EDIT_PROFILE -->{L_NEW_PASSWORD}: * <br /><h6>{L_PASSWORD_IF_CHANGED}</h6><!-- ELSE -->{L_PASSWORD}: *<!-- ENDIF --></td>
<td>
<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>
<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>
</td>
</tr>
<tr>
<td class="prof-title">{L_CONFIRM_PASSWORD}: * <!-- IF EDIT_PROFILE --><br /><h6>{L_PASSWORD_CONFIRM_IF_CHANGED}</h6><!-- ENDIF --></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="" />
<span id="check_pass"></span>
</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="" />
<span id="check_pass"></span>
</td>
</tr>
<!-- IF CAPTCHA_HTML -->
<tr>

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

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

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

@ -115,22 +115,23 @@ ajax.callback.manage_user = function(data) {
<script type="text/javascript">
ajax.ip_load = false;
ajax.mod_action = function(mode) {
if(!ajax.ip_load) {
ajax.exec({
action : 'mod_action',
mode : mode,
user_id : {PROFILE_USER_ID}
});
if (!ajax.ip_load) {
ajax.exec({
action : 'mod_action',
mode : mode,
user_id : {PROFILE_USER_ID}
});
}
else
{
$('#ip_list').toggle();
$('#ip_list').toggle();
}};
ajax.callback.mod_action = function(data) {
$('#ip_list').html(data.ip_list_html);
$('#ip_list').html(data.ip_list_html);
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; }
@ -314,25 +314,26 @@ ajax.callback.gen_passkey = function(data){
<span class="editable bold">{USER_REGDATE}</span>
<!-- IF IS_ADMIN -->
[ <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">
<fieldset class="mrg_6">
<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: '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_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>
<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>
<label><input type="checkbox" name="dis_passkey"/>{L_DOWNLOAD_TORRENT}</label>
<label><input type="checkbox" name="dis_pm"/>{L_SEND_PM}</label>
<label><input type="checkbox" name="dis_post"/>{L_SEND_MESSAGE}</label>
<label><input type="checkbox" name="dis_post_edit"/>{L_EDIT_POST}</label>
<label><input type="checkbox" name="dis_topic"/>{L_NEW_THREADS}</label>
</div>
<div class="menu-sub row1 border bw_TRBL" id="admin">
<fieldset class="mrg_6">
<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: '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_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>
<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>
<label><input type="checkbox" name="dis_passkey"/>{L_DOWNLOAD_TORRENT}</label>
<label><input type="checkbox" name="dis_pm"/>{L_SEND_PM}</label>
<label><input type="checkbox" name="dis_post"/>{L_SEND_MESSAGE}</label>
<label><input type="checkbox" name="dis_post_edit"/>{L_EDIT_POST}</label>
<label><input type="checkbox" name="dis_topic"/>{L_NEW_THREADS}</label>
</div>
</fieldset>
<div id="user-opt-save" class="hidden tCenter">
<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>
</tr>
<tr>
<tr>
<th class="nowrap">{L_LAST_ACTIVITY}:</th>
<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 -->
</td>
</tr>
@ -371,30 +372,30 @@ ajax.callback.gen_passkey = function(data){
</tr>
<tr id="bt_user_ratio" <!-- IF TRAF_STATS -->style="display: none;"<!-- ENDIF -->>
<th>{L_USER_RATIO}:</th>
<td>
<!-- IF DOWN_TOTAL_BYTES gt MIN_DL_BYTES -->
<b id="u_ratio" class="gen">{USER_RATIO}</b>
[<a class="gen" href="#" onclick="toggle_block('ratio-expl'); return false;">?</a>]
<!-- ELSE -->
<span class="med" title="{L_IT_WILL_BE_DOWN} {MIN_DL_FOR_RATIO}"><b>{L_NONE}</b> (DL < {MIN_DL_FOR_RATIO})</span>
<!-- ENDIF -->
<th>{L_USER_RATIO}:</th>
<td>
<!-- IF DOWN_TOTAL_BYTES gt MIN_DL_BYTES -->
<b id="u_ratio" class="gen">{USER_RATIO}</b>
[<a class="gen" href="#" onclick="toggle_block('ratio-expl'); return false;">?</a>]
<!-- ELSE -->
<span class="med" title="{L_IT_WILL_BE_DOWN} {MIN_DL_FOR_RATIO}"><b>{L_NONE}</b> (DL < {MIN_DL_FOR_RATIO})</span>
<!-- ENDIF -->
<!-- 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>
<span id="passkey-gen" class="med" style="display: none;">
<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> ]
<!-- ENDIF -->
</td>
</tr>
</td>
</tr>
<tr id="ratio-expl" style="display: none;">
<td colspan="2" class="med tCenter">
<tr id="ratio-expl" style="display: none;">
<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>
</td>
</tr>
</td>
</tr>
<!-- IF LOCATION -->
<tr>
@ -436,53 +437,50 @@ ajax.callback.gen_passkey = function(data){
<td><b>{AGE}</b></td>
</tr>
<!-- 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>
<th>{L_DOWNLOADED}</th>
<th>{L_UPLOADED}</th>
<th>{L_RELEASED}</th>
<th>{L_BONUS}</th>
<!-- IF $bb_cfg['seed_bonus_enabled'] --><th>{L_SEED_BONUS}</th><!-- ENDIF -->
</tr>
<tr class="row1 stats-ext">
<td>{L_TD_TRAF}</td>
<td class="leech">{TD_DL}</td>
<td class="seed">{TD_UL}</td>
<td class="seed">{TD_REL}</td>
<td class="seed">{TD_BONUS}</td>
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{TD_POINTS}</td><!-- ENDIF -->
</tr>
<tr class="row5 stats-ext">
<td>{L_YS_TRAF}</td>
<td class="leech">{YS_DL}</td>
<td class="seed">{YS_UL}</td>
<td class="seed">{YS_REL}</td>
<td class="seed">{YS_BONUS}</td>
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{YS_POINTS}</td><!-- ENDIF -->
</tr>
<tr class="row1">
<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_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_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 -->
</tr>
<tr class="row5">
<td colspan="1">{L_MAX_SPEED}</td>
<td colspan="2">{L_DL_DL_SPEED}: {SPEED_DOWN}</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 -->
</tr>
</table>
</td>
</tr>
<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>
<th>{L_DOWNLOADED}</th>
<th>{L_UPLOADED}</th>
<th>{L_RELEASED}</th>
<th>{L_BONUS}</th>
<!-- IF $bb_cfg['seed_bonus_enabled'] --><th>{L_SEED_BONUS}</th><!-- ENDIF -->
</tr>
<tr class="row1 stats-ext">
<td>{L_TD_TRAF}</td>
<td class="leech">{TD_DL}</td>
<td class="seed">{TD_UL}</td>
<td class="seed">{TD_REL}</td>
<td class="seed">{TD_BONUS}</td>
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{TD_POINTS}</td><!-- ENDIF -->
</tr>
<tr class="row5 stats-ext">
<td>{L_YS_TRAF}</td>
<td class="leech">{YS_DL}</td>
<td class="seed">{YS_UL}</td>
<td class="seed">{YS_REL}</td>
<td class="seed">{YS_BONUS}</td>
<!-- IF $bb_cfg['seed_bonus_enabled'] --><td class="points">{YS_POINTS}</td><!-- ENDIF -->
</tr>
<tr class="row1">
<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_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_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 -->
</tr>
<tr class="row5">
<td colspan="1">{L_MAX_SPEED}</td>
<td colspan="2">{L_DL_DL_SPEED}: {SPEED_DOWN}</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 -->
</tr>
</table>
</td>
</tr>
</table>
<!--/user_details-->
@ -493,7 +491,7 @@ ajax.callback.gen_passkey = function(data){
<!-- IF SIGNATURE -->
<tr>
<td class="row1 pad_4" colspan="2">
<div class="signature">{SIGNATURE}</div>
<div class="signature">{SIGNATURE}</div>
</td>
</tr>
<!-- ENDIF -->
@ -583,7 +581,7 @@ $(function(){
<!-- IF SHOW_SEARCH_DL -->
<div class="tCenter">
<a class="gen" href="{U_SEARCH}?dlu={PROFILE_USER_ID}&dlw=1">{L_SEARCH_DL_WILL_DOWNLOADS}</a> ::
<a class="gen" href="{U_SEARCH}?dlu={PROFILE_USER_ID}&dlw=1">{L_SEARCH_DL_WILL_DOWNLOADS}</a> ::
<a class="gen" href="{U_SEARCH}?dlu={PROFILE_USER_ID}&dlc=1">{L_SEARCH_DL_COMPLETE_DOWNLOADS}</a>
</div>
<!-- ENDIF -->
<!-- ENDIF -->

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

@ -419,7 +419,7 @@ function build_poll_add_form (src_el)
<!-- IF postrow.SIGNATURE -->{postrow.SIGNATURE}<!-- ENDIF -->
<!-- IF postrow.EDITED_MESSAGE --><div class="last_edited">{postrow.EDITED_MESSAGE}</div><!-- ENDIF -->
</div><!--/post_body-->
<!-- IF AUTH_MOD -->
<div class="menu-sub" id="mc_{postrow.POST_ID}">
<table cellspacing="1" cellpadding="4">
@ -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">

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

@ -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>
@ -204,7 +203,7 @@
<!-- IF $bb_cfg['tor_comment'] -->
<input type="text" id="comment" placeholder="{L_COMMENT}" />
<!-- ENDIF -->
<!-- IF AUTH_MOD -->
<span id="tor-{postrow.attach.tor_reged.ATTACH_ID}">{postrow.attach.tor_reged.TOR_STATUS_SELECT}</span>
<a href="#" onclick="ajax.change_tor_status('status'); return false;"><input type="submit" value="{L_EDIT}" class="liteoption" /></a>

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

@ -1,11 +1,11 @@
<!-- IF postrow.IS_FIRST_POST -->
<!-- IF postrow.IS_FIRST_POST -->
<div>
<fieldset class="attach">
<legend>{L_DOWNLOAD}</legend>
<h1 class="attach_link"><a href="profile.php?mode=register" style="color: brown;">{L_DOWNLOAD_INFO}</a></h1>
<p id="guest-dl-tip" class="attach_comment med">
<a href="{$bb_cfg['how_to_download_url_help']}" class="med"><b>{L_HOW_TO_DOWNLOAD}</b></a> &middot;
<a href="{$bb_cfg['what_is_torrent_url_help']}" class="med"><b>{L_WHAT_IS_A_TORRENT}</b></a> &middot;
<a href="{$bb_cfg['how_to_download_url_help']}" class="med"><b>{L_HOW_TO_DOWNLOAD}</b></a> &middot;
<a href="{$bb_cfg['what_is_torrent_url_help']}" class="med"><b>{L_WHAT_IS_A_TORRENT}</b></a> &middot;
<a href="{$bb_cfg['ratio_url_help']}" class="med"><b>{L_RATINGS_AND_LIMITATIONS}</b></a><br />
</p>
</fieldset>

4
upload/templates/default/viewtopic_torrent.tpl
View file

@ -47,7 +47,7 @@ $(document).ready(function(){
{L_SIZE}:&nbsp; <b>{TOR_SIZE}</b>&nbsp; &nbsp;|&nbsp; &nbsp;
{L_IS_REGISTERED}:&nbsp; <b>{TOR_LONGEVITY}</b>&nbsp; &nbsp;|&nbsp; &nbsp;
{L_COMPLETED}:&nbsp; <b>{TOR_COMPLETED}</b>
</td>
</td>
</tr>
<!-- ENDIF / SHOW_DL_LIST_TOR_INFO -->
@ -109,7 +109,7 @@ $(document).ready(function(){
<tr>
<td colspan="2">
<!-- IF SEEDER_LAST_SEEN -->
<div id="last_seed_info" class="row5 w60 mrg_4 bCenter">
<p class="mrg_10">{SEEDER_LAST_SEEN}</p>

2
upload/viewforum.php
View file

@ -583,7 +583,7 @@ $template->assign_vars(array(
'MOD_REDIRECT_URL' => $mod_redirect_url,
'MODERATION_ON' => $moderation,
'PRUNE_DAYS' => $forum_data['prune_days'],
'CAT_ID' => $forum_data['cat_id'],
'CAT_TITLE' => $forums['cat_title_html'][$forum_data['cat_id']],
'U_VIEWCAT' => CAT_URL . $forum_data['cat_id'],

3
upload/viewtopic.php
View file

@ -227,7 +227,6 @@ if ($moderation)
));
}
if (!$forums = $datastore->get('cat_forums'))
{
$datastore->update('cat_forums');
@ -873,7 +872,7 @@ for($i = 0; $i < $total_posts; $i++)
'MC_CLASS' => $mc_class,
'MC_TITLE' => sprintf($lang['MC_COMMENT'][$mc_type]['title'], $mc_user_id),
'MC_SELECT_TYPE' => build_select("mc_type_$post_id", array_flip($mc_select_type), $mc_type),
));
));
if ($postrow[$i]['post_attachment'] && $is_auth['auth_download'] && function_exists('display_post_attachments'))
{