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

r154

Browse source 
добавление недостающей сортировки в viewonline обновление whois в админке + добавление IP во зачистка от мусора git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@154 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2011-07-26 05:05:46 +00:00
commit a0e8f73835
32 changed files with 138 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ReadMe.txt
View file

@ -47,4 +47,4 @@ extension=php_tidy.dll
** Необходимый запуск cron.php **
************************************
Подробнее в теме (ссылка будет чуть позднее)
Подробнее в теме http://torrentpier.me/threads/Отвязка-запуск-крона.52/

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

@ -22,50 +22,32 @@ function hex2bin($h)
function get_max_val($table_name, $column)
{
global $db;
$row = $db->fetch_row("SELECT MAX($column) AS $column FROM $table_name LIMIT 1");
$row = DB()->fetch_row("SELECT MAX($column) AS $column FROM $table_name LIMIT 1");
return $row[$column];
}
function get_count($table_name, $column)
{
global $db;
$row = $db->fetch_row("SELECT COUNT($column) AS $column FROM $table_name LIMIT 1");
$row = DB()->fetch_row("SELECT COUNT($column) AS $column FROM $table_name LIMIT 1");
return $row[$column];
}
function set_auto_increment($table_name, $column, $val = null)
{
global $db;
if (empty($val))
{
$row = $db->fetch_row("SELECT MAX($column) AS val FROM $table_name LIMIT 1");
$db->sql_freeresult();
$row = DB()->fetch_row("SELECT MAX($column) AS val FROM $table_name LIMIT 1");
DB()->sql_freeresult();
$val = (int) $row['val'] + 1;
}
$db->query("ALTER TABLE $table_name auto_increment = $val");
DB()->query("ALTER TABLE $table_name auto_increment = $val");
}
//Users functions
function tp_users_cleanup()
{
global $db;
/*
if (!function_exists('user_delete')) require_once('./includes/functions_admin.php');
if ($row = $db->fetch_row("SELECT user_id FROM ". USERS_TABLE ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .');'))
{
foreach ($row as $user)
{
user_delete($user['user_id']);
}
}*/
$db->query('DELETE FROM '. USERS_TABLE .' WHERE user_id NOT IN('. EXCLUDED_USERS_CSV .')');
$db->query('TRUNCATE '. BT_USERS_TABLE);
DB()->query('DELETE FROM '. BB_USERS .' WHERE user_id NOT IN('. EXCLUDED_USERS_CSV .')');
DB()->query('TRUNCATE '. BB_BT_USERS);
}
function tp_user_level($tb_class)
@ -95,8 +77,6 @@ function tp_user_level($tb_class)
function convert_user($user)
{
global $db;
$user_data = array(
"user_id" => $user['id'],
"user_active" => ($user['enabled'] == 'yes') ? true : false,
@ -107,15 +87,15 @@ function convert_user($user)
"user_level" => tp_user_level($user['class']),
"user_lang" => $user['language'],
"user_dateformat" => "Y-m-d H:i",
//"user_opt" => ,
"user_opt" => $user['opt'], // Added
"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_icq" => $user['icq'],
"user_aim" => $user['aim'],
"user_yim" => $user['yahoo'],
"user_msnm" => $user['msn'],
"user_skype" => $user['skype'], // Added
"user_gender" => $user['gender'], // Added
"user_birthday" => $user['user_birthday'], // Added
);
$columns = $values = array();
@ -123,12 +103,12 @@ function convert_user($user)
foreach ($user_data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
$db->query("INSERT IGNORE INTO ". USERS_TABLE . " ($sql_columns) VALUES($sql_values);");
DB()->query("INSERT IGNORE INTO ". BB_USERS . " ($sql_columns) VALUES ($sql_values);");
$bt_user_data = array(
"user_id" => $user['id'],
@ -141,63 +121,55 @@ function convert_user($user)
foreach ($bt_user_data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_bt_columns = implode(',', $columns);
$sql_bt_values = implode(',', $values);
$db->query("INSERT IGNORE INTO ". BT_USERS_TABLE . " ($sql_bt_columns) VALUES($sql_bt_values);");
DB()->query("INSERT IGNORE INTO ". BB_BT_USERS . " ($sql_bt_columns) VALUES ($sql_bt_values);");
}
//Torrents and categories functions
function tp_categories_cleanup()
{
global $db;
$db->query('DELETE FROM '. CATEGORIES_TABLE);
DB()->query('DELETE FROM '. BB_CATEGORIES);
}
function tp_add_category_old($id, $cat_title)
{
global $db;
$db->query("INSERT IGNORE INTO ". CATEGORIES_TABLE ." (cat_id, cat_title)
VALUES ($id, '". $db->escape($cat_title) ."')");
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES ." (cat_id, cat_title)
VALUES ($id, '". DB()->escape($cat_title) ."')");
return;
}
function tp_add_category($cat_data)
{
global $db;
$columns = $values = array();
foreach ($cat_data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_bt_columns = implode(',', $columns);
$sql_bt_values = implode(',', $values);
$db->query("INSERT IGNORE INTO ". CATEGORIES_TABLE . " ($sql_bt_columns) VALUES($sql_bt_values);");
DB()->query("INSERT IGNORE INTO ". BB_CATEGORIES . " ($sql_bt_columns) VALUES ($sql_bt_values);");
}
function tp_topics_cleanup()
{
global $db;
$db->query("TRUNCATE ". ATTACHMENTS_TABLE);
$db->query("TRUNCATE ". ATTACHMENTS_DESC_TABLE);
$db->query("TRUNCATE ". BT_TORRENTS_TABLE);
$db->query("TRUNCATE ". POSTS_TABLE);
$db->query("TRUNCATE ". POSTS_HTML_TABLE);
$db->query("TRUNCATE ". POSTS_SEARCH_TABLE);
$db->query("TRUNCATE ". POSTS_TEXT_TABLE);
$db->query("TRUNCATE ". TOPICS_TABLE);
DB()->query("TRUNCATE ". BB_ATTACHMENTS);
DB()->query("TRUNCATE ". BB_ATTACHMENTS_DESC);
DB()->query("TRUNCATE ". BB_BT_TORRENTS);
DB()->query("TRUNCATE ". BB_POSTS);
DB()->query("TRUNCATE ". BB_POSTS_HTML);
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_TABLE))
if ($row = DB()->fetch_row("SELECT topic_id FROM ". TOPICS))
{
foreach ($row as $topic)
{
@ -210,57 +182,51 @@ function tp_topics_cleanup()
function tp_add_topic($topic_data)
{
global $db;
$columns = $values = array();
foreach ($topic_data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
$db->query("INSERT IGNORE INTO ". TOPICS_TABLE . " ($sql_columns) VALUES($sql_values);");
DB()->query("INSERT IGNORE INTO ". BB_TOPICS . " ($sql_columns) VALUES ($sql_values);");
return;
}
function tp_add_post($post_data)
{
global $db;
foreach ($post_data as $key => $data)
{
$columns = $values = array();
foreach ($data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
$db->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES($sql_values);");
DB()->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES ($sql_values);");
}
return;
}
function tp_add_attach($attach_data)
{
global $db;
foreach ($attach_data as $key => $data)
{
$columns = $values = array();
foreach ($data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
$db->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES($sql_values);");
DB()->query("INSERT IGNORE INTO bb_{$key} ($sql_columns) VALUES ($sql_values);");
}
return;
}
@ -312,8 +278,6 @@ function append_images($tor)
function convert_torrent($torrent)
{
global $db;
$topic_data = array(
"topic_id" => $torrent['topic_id'],
"forum_id" => $torrent['category'],
@ -330,9 +294,7 @@ function convert_torrent($torrent)
);
tp_add_topic($topic_data);
$bbcode_uid = make_bbcode_uid();
//$post_text = prepare_message($torrent['descr'], true, true, $bbcode_uid);
$post_text = stripslashes(prepare_message(addslashes(unprepare_message($torrent['descr'])), true, true, $bbcode_uid));
$post_text = stripslashes(prepare_message(addslashes(unprepare_message($torrent['descr'])), true, true));
$post_data = array(
"posts" => array(
@ -345,7 +307,6 @@ function convert_torrent($torrent)
),
"posts_text" => array(
"post_id" => $torrent['post_id'],
"bbcode_uid" => $bbcode_uid,
"post_text" => $post_text,
),
"posts_search" => array(
@ -386,7 +347,7 @@ function convert_torrent($torrent)
$tor = bdecode_file($filename);
$info = ($tor['info']) ? $tor['info'] : array();
$info_hash = pack('H*', sha1(bencode($info)));
$info_hash_sql = rtrim($db->escape($info_hash), ' ');
$info_hash_sql = rtrim(DB()->escape($info_hash), ' ');
}
else
{
@ -411,22 +372,19 @@ function convert_torrent($torrent)
foreach ($torrent_data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_columns = implode(', ', $columns);
$sql_values = implode(', ', $values);
$db->query("INSERT IGNORE INTO ". BT_TORRENTS_TABLE . " ($sql_columns) VALUES($sql_values);");
DB()->query("INSERT IGNORE INTO ". BB_BT_TORRENTS . " ($sql_columns) VALUES($sql_values);");
return;
}
//Comments functions
function convert_comment($comment)
{
global $db;
$bbcode_uid = make_bbcode_uid();
$post_text = prepare_message($comment['text'], true, true, $bbcode_uid);
$post_text = prepare_message($comment['text'], true, true);
$post_data = array(
"posts" => array(
@ -441,7 +399,6 @@ function convert_comment($comment)
),
"posts_text" => array(
"post_id" => $comment['id'],
"bbcode_uid" => $bbcode_uid,
"post_text" => $post_text,
),
);
@ -453,15 +410,11 @@ function convert_comment($comment)
//Forums functions
function tp_forums_cleanup()
{
global $db;
$db->query('TRUNCATE '. FORUMS_TABLE);
DB()->query('TRUNCATE '. BB_FORUMS);
}
function convert_cat($forum, $allow_torrents = true)
{
global $db;
$forum_data = array(
"forum_id" => $forum['id'],
"cat_id" => $forum['cat_id'],
@ -476,11 +429,11 @@ function convert_cat($forum, $allow_torrents = true)
foreach ($forum_data as $column => $value)
{
$columns[] = $column;
$values[] = "'". $db->escape($value) ."'";
$values[] = "'". DB()->escape($value) ."'";
}
$sql_columns = implode(',', $columns);
$sql_values = implode(',', $values);
$db->query("INSERT IGNORE INTO ". FORUMS_TABLE . " ($sql_columns) VALUES($sql_values);");
DB()->query("INSERT IGNORE INTO ". BB_FORUMS . " ($sql_columns) VALUES ($sql_values);");
return;
}

14
other/recover/recover.php
View file

@ -44,7 +44,7 @@ else
@ini_set('memory_limit', '512M');
@ini_set('max_execution_time', @ini_get('max_execution_time') + 1200);
$torrents_count = (int) get_count(BT_TORRENTS_TABLE, 'attach_id');
$torrents_count = (int) get_count(BB_BT_TORRENTS, 'attach_id');
$loops = (int) ceil($torrents_count / C_TORRENTS_PER_ONCE);
$not_exist = array();
@ -58,13 +58,13 @@ for ($i = 0; $i < $loops; $i++)
$sql = "SELECT
tor.attach_id, tor.topic_id, ad.physical_filename
FROM ". BT_TORRENTS_TABLE ." tor
LEFT JOIN ". ATTACHMENTS_DESC_TABLE ." ad ON(ad.attach_id = tor.attach_id)
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();
$torrents = DB()->fetch_rowset($sql);
DB()->sql_freeresult();
foreach ($torrents as $torrent)
{
@ -78,9 +78,9 @@ for ($i = 0; $i < $loops; $i++)
$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), ' ');
$info_hash_sql = rtrim(DB()->escape($info_hash), ' ');
$db->query("UPDATE ". BT_TORRENTS_TABLE ."
DB()->query("UPDATE ". BB_BT_TORRENTS ."
SET info_hash = '$info_hash_sql'
WHERE attach_id = {$torrent['attach_id']}");
}

4
upload/admin/index.php
View file

@ -314,7 +314,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
"LASTUPDATE" => bb_date($onlinerow_reg[$i]['user_session_time'], 'H:i'),
"IP_ADDRESS" => $reg_ip,
"U_WHOIS_IP" => "http://www.dnsstuff.com/tools/whois/?ip=$reg_ip",
"U_WHOIS_IP" => "http://ip-whois.net/ip_geo.php?ip=$reg_ip",
"U_USER_PROFILE" => append_sid("profile.php?mode=editprofile&amp;" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
));
}
@ -351,7 +351,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' )
"LASTUPDATE" => bb_date($onlinerow_guest[$i]['session_time'], 'H:i'),
"IP_ADDRESS" => $guest_ip,
"U_WHOIS_IP" => "http://www.dnsstuff.com/tools/whois/?ip=$guest_ip",
"U_WHOIS_IP" => "http://ip-whois.net/ip_geo.php?ip=$guest_ip",
));
}
}

2
upload/config.php
View file

@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.0.2';
$bb_cfg['tp_release_state'] = 'TP II r153';
$bb_cfg['tp_release_state'] = 'TP II r154';
$bb_cfg['tp_release_date'] = '26-07-2011';
$bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

2
upload/includes/init_bb.php
View file

@ -583,5 +583,5 @@ $dl_status_css = array(
// Show 'Board is disabled' message if needed.
if ($bb_cfg['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN'))
{
message_die(GENERAL_MESSAGE, 'BOARD_DISABLE', 'Information');
message_die(GENERAL_MESSAGE, 'BOARD_DISABLE');
}

1
upload/language/lang_english/lang_main.php
View file

@ -856,6 +856,7 @@ $lang['GUEST_USERS_ONLINE'] = 'There are %d Guest users online'; // There are 10
$lang['GUEST_USERS_ZERO_ONLINE'] = 'There are 0 Guest users online'; // There are 10 Guest users online
$lang['GUEST_USER_ONLINE'] = 'There is %d Guest user online'; // There is 1 Guest user online
$lang['NO_USERS_BROWSING'] = 'There are no users currently browsing this forum';
$lang['ALL_USERS'] = 'All users:';
$lang['ONLINE_EXPLAIN'] = 'users active over the past five minutes';
$lang['LAST_UPDATED'] = 'Last Updated';

2
upload/language/lang_russian/lang_main.php
View file

@ -864,6 +864,8 @@ $lang['GUEST_USERS_ONLINE'] = 'Сейчас на форуме гостей: %d';
$lang['GUEST_USERS_ZERO_ONLINE'] = 'Сейчас на форуме гостей: 0'; // There are 10 Guest users online
$lang['GUEST_USER_ONLINE'] = 'Сейчас на форуме гостей: %d';
$lang['NO_USERS_BROWSING'] = 'Этот форум сейчас никто не просматривает';
$lang['ALL_USERS'] = 'Всех:';
$lang['ONLINE_EXPLAIN'] = 'данные за последние пять минут';
$lang['LAST_UPDATED'] = 'Последнее изменение';

4
upload/misc.php
View file

@ -96,9 +96,7 @@ if ($do == 'attach_rules')
}
$template->assign_vars(array(
'PAGE_TITLE' => $lang['ATTACH_RULES_TITLE'],
'L_RULES_TITLE' => $lang['ATTACH_RULES_TITLE'],
'L_EMPTY_GROUP_PERMS' => $lang['NOTE_USER_EMPTY_GROUP_PERMISSIONS'])
'PAGE_TITLE' => $lang['ATTACH_RULES_TITLE'])
);
if ($nothing)

7
upload/modcp.php
View file

@ -296,14 +296,11 @@ switch ($mode)
'TPL_MODCP_MOVE' => true,
'SHOW_LEAVESHADOW' => $is_moderator,
'SHOW_BOT_OPTIONS' => $is_moderator,
'L_LEAVE_MSG' => $lang['BOT_LEAVE_MSG_MOVED'],
'MESSAGE_TITLE' => $lang['CONFIRM'],
'MESSAGE_TEXT' => $lang['CONFIRM_MOVE_TOPIC'],
'TOPIC_TITLES' => join("\n</li>\n<li>\n", $topic_titles),
'L_LEAVESHADOW' => $lang['LEAVE_SHADOW_TOPIC'],
'S_FORUM_SELECT' => $forum_select,
'S_MODCP_ACTION' => "modcp.php",
'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields),
@ -658,9 +655,6 @@ switch ($mode)
$template->assign_vars(array(
'TPL_MODCP_IP' => true,
'L_THIS_POST_IP' => $lang['THIS_POSTS_IP'],
'L_OTHER_IPS' => $lang['OTHER_IP_THIS_USER'],
'L_OTHER_USERS' => $lang['USERS_THIS_IP'],
'IP' => $ip_this_post,
'U_LOOKUP_IP' => "modcp.php?mode=ip&amp;" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=$ip_this_post&amp;sid=" . $userdata['session_id'])
);
@ -739,7 +733,6 @@ switch ($mode)
'ROW_CLASS' => !($i % 2) ? 'row4' : 'row5',
'USERNAME' => wbr($username),
'POSTS' => $row['postings'],
'L_SEARCH_POSTS' => $lang['SEARCH_USER_POSTS_SHORT'],
'U_PROFILE' => ($id == ANONYMOUS) ? "modcp.php?mode=ip&amp;p=$post_id&amp;t=$topic_id" : PROFILE_URL . $id,
'U_SEARCHPOSTS' => "search.php?search_author=1&amp;uid=$id",
));

4
upload/opensearch_desc.xml
View file

@ -3,6 +3,6 @@
<ShortName>TorrentPier (Forum)</ShortName>
<Description>TorrentPier (Forum)</Description>
<InputEncoding>UTF-8</InputEncoding>
<Image height="16" width="16" type="image/x-icon">http://site.ru/favicon.ico</Image>
<Url type="text/html" template="http://site.ru/search.php?mode=results&amp;show_results=topics&amp;search_keywords={searchTerms}"/>
<Image height="16" width="16" type="image/x-icon">http://torrentpier.me/favicon.ico</Image>
<Url type="text/html" template="http://torrentpier.me/search.php?mode=results&amp;show_results=topics&amp;search_keywords={searchTerms}"/>
</OpenSearchDescription>

4
upload/opensearch_desc_bt.xml
View file

@ -3,6 +3,6 @@
<ShortName>TorrentPier (Tracker)</ShortName>
<Description>TorrentPier (Tracker)</Description>
<InputEncoding>UTF-8</InputEncoding>
<Image height="16" width="16" type="image/x-icon">http://site.ru/favicon.ico</Image>
<Url type="text/html" template="http://site.ru/tracker.php?submit=1&amp;o=13&amp;nm={searchTerms}"/>
<Image height="16" width="16" type="image/x-icon">http://torrentpier.me/favicon.ico</Image>
<Url type="text/html" template="http://torrentpier.me/tracker.php?submit=1&amp;o=13&amp;nm={searchTerms}"/>
</OpenSearchDescription>

70
upload/posting.php
View file

@ -49,16 +49,6 @@ $tracking_forums = get_tracks('forum');
// Start session management
$user->session_start();
// Quick Reply
$template->assign_vars(array(
'L_FONT_SEL' => $lang['QR_FONT_SEL'],
'L_FONT_COLOR_SEL' => $lang['QR_COLOR_SEL'],
'L_FONT_SIZE_SEL' => $lang['QR_SIZE_SEL'],
'L_STEEL_BLUE' => $lang['COLOR_STEEL_BLUE'],
'L_COLOR_GRAY' => $lang['COLOR_GRAY'],
'L_COLOR_DARK_GREEN' => $lang['COLOR_DARK_GREEN'],
));
// What auth type do we need to check?
$is_auth = array();
switch ($mode)
@ -813,55 +803,6 @@ $template->assign_vars(array(
'SUBJECT' => $subject,
'MESSAGE' => $message,
'L_SUBJECT' => $lang['SUBJECT'],
'L_MESSAGE_BODY' => $lang['MESSAGE_BODY'],
'L_CONFIRM_DELETE' => $lang['CONFIRM_DELETE'],
'L_DISABLE_BBCODE' => $lang['DISABLE_BBCODE_POST'],
'L_DISABLE_SMILIES' => $lang['DISABLE_SMILIES_POST'],
'L_NOTIFY_ON_REPLY' => $lang['NOTIFY'],
'L_DELETE_POST' => $lang['DELETE_POST'],
'L_UPDATE_POST_TIME' => $lang['UPDATE_POST_TIME'],
'L_BBCODE_B_HELP' => $lang['BBCODE_B_HELP'],
'L_BBCODE_I_HELP' => $lang['BBCODE_I_HELP'],
'L_BBCODE_U_HELP' => $lang['BBCODE_U_HELP'],
'L_BBCODE_Q_HELP' => $lang['BBCODE_Q_HELP'],
'L_BBCODE_C_HELP' => $lang['BBCODE_C_HELP'],
'L_BBCODE_L_HELP' => $lang['BBCODE_L_HELP'],
'L_BBCODE_O_HELP' => $lang['BBCODE_O_HELP'],
'L_BBCODE_P_HELP' => $lang['BBCODE_P_HELP'],
'L_BBCODE_W_HELP' => $lang['BBCODE_W_HELP'],
'L_BBCODE_A_HELP' => $lang['BBCODE_A_HELP'],
'L_BBCODE_S_HELP' => $lang['BBCODE_S_HELP'],
'L_BBCODE_F_HELP' => $lang['BBCODE_F_HELP'],
'L_EMPTY_MESSAGE' => $lang['EMPTY_MESSAGE'],
'L_FONT_COLOR' => $lang['FONT_COLOR'],
'L_COLOR_DEFAULT' => $lang['COLOR_DEFAULT'],
'L_COLOR_DARK_RED' => $lang['COLOR_DARK_RED'],
'L_COLOR_RED' => $lang['COLOR_RED'],
'L_COLOR_ORANGE' => $lang['COLOR_ORANGE'],
'L_COLOR_BROWN' => $lang['COLOR_BROWN'],
'L_COLOR_YELLOW' => $lang['COLOR_YELLOW'],
'L_COLOR_GREEN' => $lang['COLOR_GREEN'],
'L_COLOR_OLIVE' => $lang['COLOR_OLIVE'],
'L_COLOR_CYAN' => $lang['COLOR_CYAN'],
'L_COLOR_BLUE' => $lang['COLOR_BLUE'],
'L_COLOR_DARK_BLUE' => $lang['COLOR_DARK_BLUE'],
'L_COLOR_INDIGO' => $lang['COLOR_INDIGO'],
'L_COLOR_VIOLET' => $lang['COLOR_VIOLET'],
'L_COLOR_WHITE' => $lang['COLOR_WHITE'],
'L_COLOR_BLACK' => $lang['COLOR_BLACK'],
'L_FONT_SIZE' => $lang['FONT_SIZE'],
'L_FONT_TINY' => $lang['FONT_TINY'],
'L_FONT_SMALL' => $lang['FONT_SMALL'],
'L_FONT_NORMAL' => $lang['FONT_NORMAL'],
'L_FONT_LARGE' => $lang['FONT_LARGE'],
'L_FONT_HUGE' => $lang['FONT_HUGE'],
'L_STYLES_TIP' => $lang['STYLES_TIP'],
'U_VIEWTOPIC' => ( $mode == 'reply' ) ? append_sid("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&amp;postorder=desc") : '',
'S_NOTIFY_CHECKED' => ( $notify_user ) ? 'checked="checked"' : '',
@ -877,16 +818,6 @@ $template->assign_vars(array(
if( ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['edit_poll']) ) && $is_auth['auth_pollcreate'] )
{
$template->assign_vars(array(
'L_ADD_A_POLL' => $lang['ADD_POLL'],
'L_ADD_POLL_EXPLAIN' => $lang['ADD_POLL_EXPLAIN'],
'L_POLL_QUESTION' => $lang['POLL_QUESTION'],
'L_POLL_OPTION' => $lang['POLL_OPTION'],
'L_ADD_OPTION' => $lang['ADD_OPTION'],
'L_POLL_LENGTH' => $lang['POLL_FOR'],
'L_DAYS' => $lang['DAYS'],
'L_POLL_LENGTH_EXPLAIN' => $lang['POLL_FOR_EXPLAIN'],
'L_POLL_DELETE' => $lang['DELETE_POLL'],
'POLL_TITLE' => @$poll_title,
'POLL_LENGTH' => @$poll_length)
);
@ -902,7 +833,6 @@ if( ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['edit_poll']) )
{
$template->assign_block_vars('poll_option_rows', array(
'POLL_OPTION' => str_replace('"', '&quot;', $option_text),
'S_POLL_OPTION_NUM' => $option_id)
);
}

16
upload/privmsg.php
View file

@ -75,10 +75,6 @@ else if (IS_GROUP_MEMBER)
$template->assign_vars(array(
'IN_PM' => true,
'L_FONT_COLOR_SEL' => $lang['QR_COLOR_SEL'],
'L_FONT_SEL' => $lang['QR_FONT_SEL'],
'L_FONT_SIZE_SEL' => $lang['QR_SIZE_SEL'],
'L_STEEL_BLUE' => $lang['COLOR_STEEL_BLUE'],
'QUICK_REPLY' => ($bb_cfg['show_quick_reply'] && $folder == 'inbox' && $mode == 'read'),
));
@ -436,14 +432,8 @@ if ( $mode == 'read' )
'SENTBOX' => $sentbox_url,
'OUTBOX' => $outbox_url,
'SAVEBOX' => $savebox_url,
'BOX_NAME' => $l_box_name,
'L_SENTBOX' => $lang['SENT'],
'L_SAVEBOX' => $lang['SAVED'],
'L_SAVE_MSG' => $lang['SAVE_MESSAGE'],
'L_DELETE_MSG' => $lang['DELETE_MESSAGE'],
'S_PRIVMSGS_ACTION' => append_sid("privmsg.php?folder=$folder"),
'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
@ -1659,8 +1649,6 @@ else
'BOX_SIZE_STATUS' => ($l_box_size_status) ? $l_box_size_status : '',
'L_SENTBOX' => $lang['SENT'],
'L_SAVEBOX' => $lang['SAVED'],
'L_FROM_OR_TO' => ( $folder == 'inbox' || $folder == 'savebox' ) ? $lang['FROM'] : $lang['TO'],
'S_PRIVMSGS_ACTION' => append_sid("privmsg.php?folder=$folder"),
@ -1739,10 +1727,6 @@ else
}
else
{
$template->assign_vars(array(
'L_NO_MESSAGES' => $lang['NO_MESSAGES_FOLDER'])
);
$template->assign_block_vars("switch_no_messages", array() );
}
}

20
upload/report.php
View file

@ -199,10 +199,7 @@ if (isset($report_module))
'L_WRITE_REPORT' => $report_module->lang['WRITE_REPORT'],
'L_WRITE_REPORT_EXPLAIN' => $report_module->lang['WRITE_REPORT_EXPLAIN'],
'REPORT_TITLE' => (!method_exists($report_module, 'subject_obtain') && isset($report_title)) ? stripslashes($report_title) : '',
'REPORT_DESC' => (isset($report_desc)) ? stripslashes($report_desc) : '',
'L_TITLE' => $lang['POST_SUBJECT'],
'L_SUBJECT' => $lang['REPORT_SUBJECT'])
'REPORT_DESC' => (isset($report_desc)) ? stripslashes($report_desc) : '')
);
$template->pparse('body');
@ -412,12 +409,9 @@ else
$template->assign_vars(array(
'S_REPORT_ACTION', append_sid("report.php"),
'L_BY' => $lang['REPORT_BY'],
'L_MARK' => $lang['REPORT_MARK'],
'L_STATUS_CLEARED' => $lang['REPORT_STATUS'][REPORT_CLEARED],
'L_STATUS_IN_PROCESS' => $lang['REPORT_STATUS'][REPORT_IN_PROCESS],
'L_STATUS_OPEN' => $lang['REPORT_STATUS'][REPORT_OPEN],
'L_SELECT_ALL' => $lang['MARK_ALL'])
'L_STATUS_OPEN' => $lang['REPORT_STATUS'][REPORT_OPEN])
);
//
@ -452,12 +446,9 @@ else
'U_REPORT_INDEX' => append_sid("report.php"),
'L_BY' => $lang['REPORT_BY'],
'L_MARK' => $lang['REPORT_MARK'],
'L_STATUS_CLEARED' => $lang['REPORT_STATUS'][REPORT_CLEARED],
'L_STATUS_IN_PROCESS' => $lang['REPORT_STATUS'][REPORT_IN_PROCESS],
'L_STATUS_OPEN' => $lang['REPORT_STATUS'][REPORT_OPEN],
'L_SELECT_ALL' => $lang['MARK_ALL'])
'L_STATUS_OPEN' => $lang['REPORT_STATUS'][REPORT_OPEN])
);
$cat = (isset($_GET[POST_CAT_URL])) ? (int) $_GET[POST_CAT_URL] : null;
@ -719,10 +710,7 @@ else
'REPORT_TIME' => bb_date($report['report_time']),
'REPORT_DESC' => bbcode2html($report['report_desc']),
'REPORT_STATUS' => $lang['REPORT_STATUS'][$report['report_status']],
'REPORT_STATUS_CLASS' => $report_status_classes[$report['report_status']],
'L_SUBJECT' => $lang['REPORT_SUBJECT'],
'L_SEND_PRIVMSG' => $lang['SEND_PRIVATE_MESSAGE'])
'REPORT_STATUS_CLASS' => $report_status_classes[$report['report_status']])
);
}
//

16
upload/templates/admin/index.tpl
View file

@ -6,7 +6,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset={L_CONTENT_ENCODING}" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<title>Administration</title>
<title>{L_ADMIN}</title>
</head>
<frameset cols="220,*" rows="*" border="1" framespacing="1" frameborder="yes">
@ -147,15 +147,15 @@ table.forumline { margin: 0 auto; }
<!-- IF SHOW_USERS_ONLINE -->
<table class="forumline">
<tr>
<th>&nbsp;{L_USERNAME}&nbsp;</th>
<th>&nbsp;{L_LOGIN}<br />{L_LAST_UPDATE}&nbsp;</th>
<th>&nbsp;{L_IP_ADDRESS}&nbsp;</th>
<th>{L_USERNAME}</th>
<th>{L_LOGIN} / {L_LAST_UPDATE}</th>
<th>{L_IP_ADDRESS}</th>
</tr>
<!-- BEGIN reg_user_row -->
<tr>
<td nowrap="nowrap" class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span>&nbsp;</td>
<td align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen">{reg_user_row.STARTED}-{reg_user_row.LASTUPDATE}</span>&nbsp;</td>
<td class="{reg_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_phpbbwhois">{reg_user_row.IP_ADDRESS}</a></span>&nbsp;</td>
<td nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></td>
<td align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}">{reg_user_row.STARTED}-{reg_user_row.LASTUPDATE}</td>
<td class="{reg_user_row.ROW_CLASS} tCenter"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_blank">{reg_user_row.IP_ADDRESS}</a></td>
</tr>
<!-- END reg_user_row -->
<tr>
@ -165,7 +165,7 @@ table.forumline { margin: 0 auto; }
<tr>
<td nowrap="nowrap" class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen">{guest_user_row.USERNAME}</span>&nbsp;</td>
<td align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen">{guest_user_row.STARTED}-{guest_user_row.LASTUPDATE}</span>&nbsp;</td>
<td class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{guest_user_row.U_WHOIS_IP}" target="_phpbbwhois">{guest_user_row.IP_ADDRESS}</a></span>&nbsp;</td>
<td class="{guest_user_row.ROW_CLASS}">&nbsp;<span class="gen"><a href="{guest_user_row.U_WHOIS_IP}" target="_blank">{guest_user_row.IP_ADDRESS}</a></span>&nbsp;</td>
</tr>
<!-- END guest_user_row -->
</table>

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

@ -2,11 +2,11 @@
<table class="forumline wAuto">
<tr>
<th>{L_RULES_TITLE}</th>
<th>{L_ATTACH_RULES_TITLE}</th>
</tr>
<!-- BEGIN switch_nothing -->
<tr>
<td class="row1 tCenter">{L_EMPTY_GROUP_PERMS}</td>
<td class="row1 tCenter">{L_NOTE_USER_EMPTY_GROUP_PERMISSIONS}</td>
</tr>
<!-- END switch_nothing -->
<!-- BEGIN group_row -->

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

@ -10,7 +10,7 @@
<th>{L_IP_INFO}</th>
</tr>
<tr>
<td class="catTitle">{L_THIS_POST_IP}</td>
<td class="catTitle">{L_THIS_POSTS_IP}</td>
</tr>
<tr>
<td class="row1 pad_6">
@ -19,19 +19,19 @@
</td>
</tr>
<tr>
<td class="catTitle">{L_OTHER_USERS}</td>
<td class="catTitle">{L_USERS_THIS_IP}</td>
</tr>
<!-- BEGIN userrow -->
<tr>
<td class="{userrow.ROW_CLASS} pad_4 nowrap">
<p class="floatL" style="width: 160px;"><a href="{userrow.U_PROFILE}"><b>{userrow.USERNAME}</b></a></p>
<p class="floatL">[ {L_POSTS}: {userrow.POSTS} ]</p>
<p class="floatR">[ <a href="{userrow.U_SEARCHPOSTS}">{userrow.L_SEARCH_POSTS}</a> ]&nbsp;</p>
<p class="floatR">[ <a href="{userrow.U_SEARCHPOSTS}">{userrow.L_SEARCH_USER_POSTS_SHORT}</a> ]&nbsp;</p>
</td>
</tr>
<!-- END userrow -->
<tr>
<td class="catTitle">{L_OTHER_IPS}</td>
<td class="catTitle">{L_OTHER_IP_THIS_USER}</td>
</tr>
<!-- BEGIN iprow -->
<tr>
@ -81,10 +81,10 @@
<tr>
<td class="nowrap">
<!-- IF SHOW_LEAVESHADOW -->
<p class="mrg_2"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" /><label for="move_leave_shadow">{L_LEAVESHADOW}</label></p>
<p class="mrg_2"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" /><label for="move_leave_shadow">{L_LEAVE_SHADOW_TOPIC}</label></p>
<!-- ENDIF -->
<!-- IF SHOW_BOT_OPTIONS -->
<p class="mrg_2"><input type="checkbox" name="insert_bot_msg" id="insert_bot_msg" checked="checked" /><label for="insert_bot_msg">{L_LEAVE_MSG}</label></p>
<p class="mrg_2"><input type="checkbox" name="insert_bot_msg" id="insert_bot_msg" checked="checked" /><label for="insert_bot_msg">{L_BOT_LEAVE_MSG_MOVED}</label></p>
<!-- ENDIF -->
</td>
</tr>

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

@ -131,7 +131,7 @@
<!-- IF SHOW_NOTIFY_CHECKBOX -->
<tr>
<td><input type="checkbox" id="notify" name="notify" {S_NOTIFY_CHECKED} /></td>
<td><label for="notify">{L_NOTIFY_ON_REPLY}</label></td>
<td><label for="notify">{L_NOTIFY}</label></td>
</tr>
<!-- ENDIF -->
</table>

8
upload/templates/default/posting_editor.tpl
View file

@ -11,7 +11,7 @@ ajax.callback.posts = function(data){
</script>
<div class="mrg_4" style="padding-left:2px;">
<select name="fontFace">
<option style="font-family: Verdana" value="-1" selected="selected">{L_FONT_SEL}:</option>
<option style="font-family: Verdana" value="-1" selected="selected">{L_QR_FONT_SEL}:</option>
<option style="font-family: Courier" value="Courier">&nbsp;Courier</option>
<option style="font-family: 'Courier New'" value="'Courier New'">&nbsp;Courier New</option>
<option style="font-family: monospace" value="monospace">&nbsp;monospace</option>
@ -28,7 +28,7 @@ ajax.callback.posts = function(data){
</select>
&nbsp;
<select name="codeColor" class="text_color">
<option style="color: black; background: #fff;" value="black" selected="selected">{L_FONT_COLOR_SEL}:</option>
<option style="color: black; background: #fff;" value="black" selected="selected">{L_QR_COLOR_SEL}:</option>
<option style="color: darkred;" value="darkred">&nbsp;{L_COLOR_DARK_RED}</option>
<option style="color: brown;" value="brown">&nbsp;{L_COLOR_BROWN}</option>
<option style="color: #996600;" value="#996600">&nbsp;{L_COLOR_ORANGE}</option>
@ -41,11 +41,11 @@ ajax.callback.posts = function(data){
<option style="color: blue;" value="blue">&nbsp;{L_COLOR_BLUE}</option>
<option style="color: darkblue;" value="darkblue">&nbsp;{L_COLOR_DARK_BLUE}</option>
<option style="color: indigo;" value="indigo">&nbsp;{L_COLOR_INDIGO}</option>
<option style="color: #006699;" value="#006699">&nbsp;{L_STEEL_BLUE}</option>
<option style="color: #006699;" value="#006699">&nbsp;{L_COLOR_STEEL_BLUE}</option>
</select>
&nbsp;
<select name="codeSize" class="text_size">
<option value="12" selected="selected">{L_FONT_SIZE_SEL}:</option>
<option value="12" selected="selected">{L_QR_SIZE_SEL}:</option>
<option value="9" class="em">{L_FONT_SMALL}</option>
<option value="10">&nbsp;size=10</option>
<option value="11">&nbsp;size=11</option>

8
upload/templates/default/posting_poll.tpl
View file

@ -1,6 +1,6 @@
<tbody class="pad_4">
<tr>
<th colspan="2" class="thHead">{L_ADD_A_POLL}</th>
<th colspan="2" class="thHead">{L_ADD_POLL}</th>
</tr>
<tr>
<td><b>{L_POLL_QUESTION}</b></td>
@ -24,16 +24,16 @@
</td>
</tr>
<tr>
<td><b>{L_POLL_LENGTH}</b></td>
<td><b>{L_POLL_FOR}</b></td>
<td>
<input type="text" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" />&nbsp;
<b>{L_DAYS}</b>&nbsp;&nbsp;
<span class="small">{L_POLL_LENGTH_EXPLAIN}</span>
<span class="small">{L_POLL_FOR_EXPLAIN}</span>
</td>
</tr>
<!-- BEGIN switch_poll_delete_toggle -->
<tr>
<td><b>{L_POLL_DELETE}</b></td>
<td><b>{L_DELETE_POLL}</b></td>
<td><input type="checkbox" name="poll_delete" /></td>
</tr>
<!-- END switch_poll_delete_toggle -->

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

@ -91,7 +91,7 @@
<!-- END listrow -->
<!-- BEGIN switch_no_messages -->
<tr>
<td class="row1 pad_10 tCenter" colspan="5">{L_NO_MESSAGES}</td>
<td class="row1 pad_10 tCenter" colspan="5">{L_NO_MESSAGES_FOLDER}</td>
</tr>
<!-- END switch_no_messages -->
<tfoot>

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

@ -54,8 +54,8 @@
</tr>
<tr>
<td colspan="2" class="catBottom pad_4">
<input type="submit" name="save" value="{L_SAVE_MSG}" class="liteoption" />&nbsp;
<input type="submit" name="delete" value="{L_DELETE_MSG}" class="liteoption" />&nbsp;
<input type="submit" name="save" value="{L_SAVE_MESSAGE}" class="liteoption" />&nbsp;
<input type="submit" name="delete" value="{L_DELETE_MESSAGE}" class="liteoption" />&nbsp;
</td>
</tr>
</tbody>

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

@ -27,7 +27,7 @@
</tr>
<!-- BEGIN switch_report_subject -->
<tr>
<td class="row1" width="25%"><span class="genmed">{L_SUBJECT}:</span></td>
<td class="row1" width="25%"><span class="genmed">{L_REPORT_SUBJECT}:</span></td>
<td class="row2"><span class="genmed">
<!-- BEGIN switch_url -->
<a href="{U_REPORT_SUBJECT}" class="genmed">
@ -53,7 +53,7 @@
<!-- END switch_report_reasons -->
<!-- BEGIN switch_report_title -->
<tr>
<td class="row1" width="25%"><label for="title" class="genmed">{L_TITLE}:</label></td>
<td class="row1" width="25%"><label for="title" class="genmed">{L_POST_SUBJECT}:</label></td>
<td class="row2"><input type="text" class="post" name="title" id="title" size="50" maxlength="255" style="width: 100%" value="{REPORT_TITLE}" /></td>
</tr>
<!-- END switch_report_title -->

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

@ -35,7 +35,7 @@
<td class="report_delete" width="70%">
<a href="{switch_deleted_reports.deleted_reports.U_SHOW}" class="gen">{switch_deleted_reports.deleted_reports.TITLE}</a><br />
<span class="gensmall">
{L_BY} <a href="{switch_deleted_reports.deleted_reports.U_AUTHOR}" class="gensmall">{switch_deleted_reports.deleted_reports.AUTHOR}</a>
{L_REPORT_BY} <a href="{switch_deleted_reports.deleted_reports.U_AUTHOR}" class="gensmall">{switch_deleted_reports.deleted_reports.AUTHOR}</a>
</span>
</td>
<td class="report_delete" align="center" width="30%"><span class="gen">{switch_deleted_reports.deleted_reports.TYPE}</span></td>
@ -47,7 +47,7 @@
<option value="" selected="selected">{L_ACTION}</option>
<option value="" disabled="disabled"></option>
<option value="delete">{L_DELETE}</option>
<optgroup label="{L_MARK}">
<optgroup label="{L_REPORT_MARK}">
<option value="clear" class="report_cleared">{L_STATUS_CLEARED}</option>
<option value="process" class="report_process">{L_STATUS_IN_PROCESS}</option>
<option value="open" class="report_open">{L_STATUS_OPEN}</option>
@ -64,7 +64,7 @@
<table cellspacing="2" cellpadding="2" border="0" width="90%" align="center">
<tr>
<td class="gensmall">
<a href="javascript:checked_toggle('report_list_deleted',true)" class="gensmall">{L_SELECT_ALL}</a> ::
<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>

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

@ -71,7 +71,7 @@ function checked_toggle(form, status)
</strong>
<!-- END switch_current -->
<span class="gensmall">
{L_BY} <a href="{report_modules.reports.U_AUTHOR}" class="gensmall">{report_modules.reports.AUTHOR}</a>
{L_REPORT_BY} <a href="{report_modules.reports.U_AUTHOR}" class="gensmall">{report_modules.reports.AUTHOR}</a>
</span>
</td>
</tr>
@ -90,7 +90,7 @@ function checked_toggle(form, status)
<!-- BEGIN switch_global_delete_option -->
<option value="delete">{L_DELETE}</option>
<!-- END switch_global_delete_option -->
<optgroup label="{L_MARK}">
<optgroup label="{L_REPORT_MARK}">
<option value="clear" class="report_cleared">{L_STATUS_CLEARED}</option>
<option value="process" class="report_process">{L_STATUS_IN_PROCESS}</option>
<option value="open" class="report_open">{L_STATUS_OPEN}</option>
@ -104,7 +104,7 @@ function checked_toggle(form, status)
</table>
</form>
<span class="gensmall">
<a href="javascript:checked_toggle('report_list',true)" class="gensmall">{L_SELECT_ALL}</a> ::
<a href="javascript:checked_toggle('report_list',true)" class="gensmall">{L_MARK_ALL}</a> ::
<a href="javascript:checked_switch('report_list')" class="gensmall">{L_INVERT_SELECT}</a>
</span>
</td>

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

@ -55,7 +55,7 @@ function checked_toggle(form, status)
<td class="{open_reports.ROW_CLASS}" width="100%">
<a href="{open_reports.U_SHOW}" class="gen">{open_reports.TITLE}</a><br />
<span class="gensmall">
{L_BY} <a href="{open_reports.U_AUTHOR}" class="gensmall">{open_reports.AUTHOR}</a>
{L_REPORT_BY} <a href="{open_reports.U_AUTHOR}" class="gensmall">{open_reports.AUTHOR}</a>
</span>
</td>
</tr>
@ -66,7 +66,7 @@ function checked_toggle(form, status)
<option value="" selected="selected">{L_ACTION}</option>
<option value="" disabled="disabled"></option>
<option value="delete">{L_DELETE}</option>
<optgroup label="{L_MARK}">
<optgroup label="{L_REPORT_MARK}">
<option value="clear" class="report_cleared">{L_STATUS_CLEARED}</option>
<option value="process" class="report_process">{L_STATUS_IN_PROCESS}</option>
<option value="open" class="report_open">{L_STATUS_OPEN}</option>
@ -83,7 +83,7 @@ function checked_toggle(form, status)
<table cellspacing="2" cellpadding="2" border="0" width="80%" align="center">
<tr>
<td class="gensmall">
<a href="javascript:checked_toggle('report_list_open',true)" class="gensmall">{L_SELECT_ALL}</a> ::
<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>
</td>
</tr>

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

@ -19,7 +19,7 @@
<table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="bodyline">
<!-- BEGIN switch_subject -->
<tr>
<td class="row2" valign="top" width="25%"><span class="gen">{L_SUBJECT}:</span></td>
<td class="row2" valign="top" width="25%"><span class="gen">{L_REPORT_SUBJECT}:</span></td>
<td class="row2"><span class="gen">
<!-- BEGIN switch_url -->
<a href="{U_REPORT_SUBJECT}" class="gen"{S_REPORT_SUBJECT_TARGET}>
@ -46,7 +46,7 @@
<td class="row2" width="25%"><span class="genmed">{L_REPORTED_BY}:</span></td>
<td class="row2"><span class="genmed">
<a href="{U_REPORT_AUTHOR}" class="genmed">{REPORT_AUTHOR}</a>&nbsp;
[ <a href="{U_REPORT_AUTHOR_PRIVMSG}" class="genmed">{L_SEND_PRIVMSG}</a> ]
[ <a href="{U_REPORT_AUTHOR_PRIVMSG}" class="genmed">{L_SEND_PRIVATE_MESSAGE}</a> ]
</span></td>
</tr>
<tr>

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

@ -1,28 +1,35 @@
<p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p>
<table class="forumline">
<table class="forumline tablesorter">
<thead>
<tr>
<th>{L_USERNAME}</th>
<th>{L_LAST_UPDATE}</th>
<th width="35%" class="{sorter: 'text'}"><b class="tbs-text">{L_USERNAME}</b></th>
<th width="35%" class="{sorter: 'digit'}"><b class="tbs-text">{L_LAST_UPDATED}</b></th>
<!-- IF IS_ADMIN --><th width="30%" class="{sorter: 'digit'}"><b class="tbs-text">{L_IP_ADDRESS}</b></th><!-- ENDIF -->
</tr>
<tr>
<td class="catTitle" colspan="2">{TOTAL_REGISTERED_USERS_ONLINE}</td>
<td class="catTitle" colspan="3">{TOTAL_REGISTERED_USERS_ONLINE} | {L_ALL_USERS} {TOTAL_USERS_ONLINE}</td>
</tr>
</thead>
<!-- BEGIN reg_user_row -->
<tr class="{reg_user_row.ROW_CLASS}">
<td><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></td>
<td class="tCenter">{reg_user_row.LASTUPDATE}</td>
<!-- IF IS_ADMIN --><td class="tCenter"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_blank">{reg_user_row.USERIP}</a></td><!-- ENDIF -->
</tr>
<!-- END reg_user_row -->
<tfoot>
<tr>
<td class="catTitle" colspan="2">{TOTAL_GUEST_USERS_ONLINE}</td>
<td class="catTitle" colspan="3">{TOTAL_GUEST_USERS_ONLINE}</td>
</tr>
<!-- BEGIN guest_user_row -->
<tr class="{guest_user_row.ROW_CLASS}">
<td>{guest_user_row.USERNAME}</td>
<td class="tCenter">{guest_user_row.LASTUPDATE}</td>
<!-- IF SHOW_ADMIN_OPTIONS --><td class="tCenter"><a href="{guest_user_row.U_WHOIS_IP}" class="gen" target="_blank">{guest_user_row.USERIP}</a></td><!-- ENDIF -->
</tr>
<!-- END guest_user_row -->
</tfoot>
</table>
<div class="spacer_4"></div>

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

@ -114,7 +114,7 @@ function set_hid_chbox (id)
</td>
<!-- IF SELECT_PPP -->
<td class="med" style="padding: 0px 4px 2px 4px;">|</td>
<td class="small nowrap" style="padding: 0px 0px 0px 0px;">{L_SELECT_PPP}</td>
<td class="small nowrap" style="padding: 0px 0px 0px 0px;">{L_SELECT_POSTS_PER_PAGE}</td>
<td class="small nowrap" style="padding: 0px 0px 0px 3px;">
<form id="ppp" action="{PAGE_URL_PPP}" method="post">{SELECT_PPP}</form>
</td>

11
upload/viewonline.php
View file

@ -7,13 +7,13 @@ require(BB_ROOT ."common.php");
// Start session management
$user->session_start(array('req_login' => true));
$page_cfg['use_tablesorter'] = true;
//
// Output page header and load viewonline template
//
$template->assign_vars(array(
'PAGE_TITLE' => $lang['WHOSONLINE'],
'L_LAST_UPDATE' => $lang['LAST_UPDATED'],
));
//
@ -104,20 +104,22 @@ while ( $row = DB()->sql_fetchrow($result) )
}
$prev_ip = $row['session_ip'];
$user_ip = hexdec(substr($prev_ip, 0, 2)) . '.' . hexdec(substr($prev_ip, 2, 2)) . '.' . hexdec(substr($prev_ip, 4, 2)) . '.' . hexdec(substr($prev_ip, 6, 2));
if ( $view_online )
{
$row_class = !($$which_counter % 2) ? 'row1' : 'row2';
$row_class = !($which_counter % 2) ? 'row1' : 'row2';
$template->assign_block_vars("$which_row", array(
'ROW_CLASS' => $row_class,
'USERNAME' => $username,
'LASTUPDATE' => bb_date($row['session_time']),
'USERIP' => $user_ip,
'U_WHOIS_IP' => "http://ip-whois.net/ip_geo.php?ip=$user_ip",
'U_USER_PROFILE' => ((isset($user_id)) ? append_sid("profile.php?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $user_id) : ''),
));
$$which_counter++;
$which_counter++;
}
}
@ -161,6 +163,7 @@ else
}
$template->assign_vars(array(
'TOTAL_USERS_ONLINE' => $l_r_user_s + $registered_users + $l_h_user_s + $hidden_users + $l_g_user_s + $guest_users,
'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users),
'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users))
);

1
upload/viewtopic.php
View file

@ -593,7 +593,6 @@ $template->assign_vars(array(
'AUTH_MOD' => $is_auth['auth_mod'],
'IN_MODERATION' => $moderation,
'L_SELECT_PPP' => $lang['SELECT_POSTS_PER_PAGE'],
'SELECT_PPP' => ($moderation && $select_ppp && $total_replies > $posts_per_page) ? build_select('ppp', $select_ppp, $posts_per_page, null, null, 'onchange="$(\'#ppp\').submit();"') : '',
'S_SELECT_POST_DAYS' => build_select('postdays', array_flip($sel_previous_days), $post_days),