diff --git a/ReadMe.txt b/ReadMe.txt index b373b8fb8..60315cd3d 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -47,4 +47,4 @@ extension=php_tidy.dll ** Необходимый запуск cron.php ** ************************************ -Подробнее в теме (ссылка будет чуть позднее) \ No newline at end of file +Подробнее в теме http://torrentpier.me/threads/Отвязка-запуск-крона.52/ \ No newline at end of file diff --git a/other/recover/converter/functions.php b/other/recover/converter/functions.php index 917e8c606..8a61f47ca 100644 --- a/other/recover/converter/functions.php +++ b/other/recover/converter/functions.php @@ -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) @@ -94,9 +76,7 @@ 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) { @@ -209,58 +181,52 @@ 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, ), ); @@ -452,16 +409,12 @@ 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; } diff --git a/other/recover/recover.php b/other/recover/recover.php index e7c738eb5..51cee1f43 100644 --- a/other/recover/recover.php +++ b/other/recover/recover.php @@ -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']}"); } diff --git a/upload/admin/index.php b/upload/admin/index.php index 93b13a94f..17e3483a0 100644 --- a/upload/admin/index.php +++ b/upload/admin/index.php @@ -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&" . 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", )); } } diff --git a/upload/config.php b/upload/config.php index a1f9a7517..1891d775f 100644 --- a/upload/config.php +++ b/upload/config.php @@ -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 diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index ebc855a94..2c3075764 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -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'); } diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index ab49fc189..469dc1715 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -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'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index e13e700f7..09b044a65 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -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'] = 'Последнее изменение'; diff --git a/upload/misc.php b/upload/misc.php index 297203f84..8ef20c2d6 100644 --- a/upload/misc.php +++ b/upload/misc.php @@ -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) diff --git a/upload/modcp.php b/upload/modcp.php index b7c47ed6e..2fd205df7 100644 --- a/upload/modcp.php +++ b/upload/modcp.php @@ -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\n
  • \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&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=$ip_this_post&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&p=$post_id&t=$topic_id" : PROFILE_URL . $id, 'U_SEARCHPOSTS' => "search.php?search_author=1&uid=$id", )); diff --git a/upload/opensearch_desc.xml b/upload/opensearch_desc.xml index 55481b783..333743dfe 100644 --- a/upload/opensearch_desc.xml +++ b/upload/opensearch_desc.xml @@ -3,6 +3,6 @@ TorrentPier (Forum) TorrentPier (Forum) UTF-8 -http://site.ru/favicon.ico - +http://torrentpier.me/favicon.ico + \ No newline at end of file diff --git a/upload/opensearch_desc_bt.xml b/upload/opensearch_desc_bt.xml index 60651011e..98dda60b2 100644 --- a/upload/opensearch_desc_bt.xml +++ b/upload/opensearch_desc_bt.xml @@ -3,6 +3,6 @@ TorrentPier (Tracker) TorrentPier (Tracker) UTF-8 -http://site.ru/favicon.ico - +http://torrentpier.me/favicon.ico + \ No newline at end of file diff --git a/upload/posting.php b/upload/posting.php index 710af58f0..7dca362d6 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -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) @@ -812,58 +802,9 @@ $template->assign_vars(array( 'CAPTCHA_HTML' => (IS_GUEST) ? CAPTCHA()->get_html() : '', '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&postorder=desc") : '', - + 'S_NOTIFY_CHECKED' => ( $notify_user ) ? 'checked="checked"' : '', 'S_TYPE_TOGGLE' => $topic_type_toggle, 'S_TOPIC_ID' => $topic_id, @@ -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('"', '"', $option_text), - 'S_POLL_OPTION_NUM' => $option_id) ); } diff --git a/upload/privmsg.php b/upload/privmsg.php index 76dc34965..280485e50 100644 --- a/upload/privmsg.php +++ b/upload/privmsg.php @@ -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() ); } } diff --git a/upload/report.php b/upload/report.php index 753d557df..0c4f2d3fd 100644 --- a/upload/report.php +++ b/upload/report.php @@ -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'); @@ -411,13 +408,10 @@ 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]) ); // @@ -451,13 +445,10 @@ else 'S_REPORT_ACTION' => append_sid("report.php"), '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']]) ); } // diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl index 52e27afc3..3766e99ec 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/templates/admin/index.tpl @@ -6,7 +6,7 @@ - Administration + {L_ADMIN} @@ -147,15 +147,15 @@ table.forumline { margin: 0 auto; } - - - + + + - - - + + + @@ -165,7 +165,7 @@ table.forumline { margin: 0 auto; } - +
     {L_USERNAME}  {L_LOGIN}
    {L_LAST_UPDATE}     		 {L_IP_ADDRESS} {L_USERNAME}{L_LOGIN} / {L_LAST_UPDATE}{L_IP_ADDRESS}
     {reg_user_row.USERNAME}  {reg_user_row.STARTED}-{reg_user_row.LASTUPDATE}  {reg_user_row.IP_ADDRESS} {reg_user_row.USERNAME}{reg_user_row.STARTED}-{reg_user_row.LASTUPDATE}{reg_user_row.IP_ADDRESS}
     {guest_user_row.USERNAME}   {guest_user_row.STARTED}-{guest_user_row.LASTUPDATE}  {guest_user_row.IP_ADDRESS}  {guest_user_row.IP_ADDRESS} 
    diff --git a/upload/templates/default/attach_rules.tpl b/upload/templates/default/attach_rules.tpl index d9c0ca1f7..19161800e 100644 --- a/upload/templates/default/attach_rules.tpl +++ b/upload/templates/default/attach_rules.tpl @@ -2,11 +2,11 @@ - + - + diff --git a/upload/templates/default/modcp.tpl b/upload/templates/default/modcp.tpl index 750023a09..91f4ab0c7 100644 --- a/upload/templates/default/modcp.tpl +++ b/upload/templates/default/modcp.tpl @@ -10,7 +10,7 @@ - + - + - + @@ -81,10 +81,10 @@ diff --git a/upload/templates/default/posting.tpl b/upload/templates/default/posting.tpl index 8be0330d0..1752dfcc7 100644 --- a/upload/templates/default/posting.tpl +++ b/upload/templates/default/posting.tpl @@ -131,7 +131,7 @@ - +
    {L_RULES_TITLE}{L_ATTACH_RULES_TITLE}
    {L_EMPTY_GROUP_PERMS}{L_NOTE_USER_EMPTY_GROUP_PERMISSIONS}
    {L_IP_INFO}
    {L_THIS_POST_IP}{L_THIS_POSTS_IP}
    @@ -19,19 +19,19 @@
    {L_OTHER_USERS}{L_USERS_THIS_IP}

    {userrow.USERNAME}

    [ {L_POSTS}: {userrow.POSTS} ]

    -

    [ {userrow.L_SEARCH_POSTS} ] 

    +

    [ {userrow.L_SEARCH_USER_POSTS_SHORT} ] 
    {L_OTHER_IPS}{L_OTHER_IP_THIS_USER}
    -

    +

    -

    +

    diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl index c1323d1c6..4c8ec9541 100644 --- a/upload/templates/default/posting_editor.tpl +++ b/upload/templates/default/posting_editor.tpl @@ -11,7 +11,7 @@ ajax.callback.posts = function(data){
          {L_DAYS}   - {L_POLL_LENGTH_EXPLAIN} + {L_POLL_FOR_EXPLAIN} - {L_POLL_DELETE} + {L_DELETE_POLL} diff --git a/upload/templates/default/privmsgs.tpl b/upload/templates/default/privmsgs.tpl index 433ec13e0..56f7f77a6 100644 --- a/upload/templates/default/privmsgs.tpl +++ b/upload/templates/default/privmsgs.tpl @@ -91,7 +91,7 @@ - {L_NO_MESSAGES} + {L_NO_MESSAGES_FOLDER} diff --git a/upload/templates/default/privmsgs_read.tpl b/upload/templates/default/privmsgs_read.tpl index c567a3540..b952c333c 100644 --- a/upload/templates/default/privmsgs_read.tpl +++ b/upload/templates/default/privmsgs_read.tpl @@ -54,8 +54,8 @@ -   -   +   +   diff --git a/upload/templates/default/report_form_body.tpl b/upload/templates/default/report_form_body.tpl index 51f5e91ea..7026386e5 100644 --- a/upload/templates/default/report_form_body.tpl +++ b/upload/templates/default/report_form_body.tpl @@ -27,7 +27,7 @@ - {L_SUBJECT}: + {L_REPORT_SUBJECT}: @@ -53,7 +53,7 @@ - + diff --git a/upload/templates/default/report_index_body.tpl b/upload/templates/default/report_index_body.tpl index 70811834c..3eb915aad 100644 --- a/upload/templates/default/report_index_body.tpl +++ b/upload/templates/default/report_index_body.tpl @@ -35,7 +35,7 @@ {switch_deleted_reports.deleted_reports.TITLE}
    - {L_BY} {switch_deleted_reports.deleted_reports.AUTHOR} + {L_REPORT_BY} {switch_deleted_reports.deleted_reports.AUTHOR} {switch_deleted_reports.deleted_reports.TYPE} @@ -47,7 +47,7 @@ - + @@ -64,7 +64,7 @@ diff --git a/upload/templates/default/report_list_body.tpl b/upload/templates/default/report_list_body.tpl index 7c87c913b..7dfce5056 100644 --- a/upload/templates/default/report_list_body.tpl +++ b/upload/templates/default/report_list_body.tpl @@ -71,7 +71,7 @@ function checked_toggle(form, status) - {L_BY} {report_modules.reports.AUTHOR} + {L_REPORT_BY} {report_modules.reports.AUTHOR} @@ -90,7 +90,7 @@ function checked_toggle(form, status) - + @@ -104,7 +104,7 @@ function checked_toggle(form, status)
    - {L_SELECT_ALL} :: + {L_MARK_ALL} :: {L_INVERT_SELECT}
    - {L_SELECT_ALL} :: + {L_MARK_ALL} :: {L_INVERT_SELECT} diff --git a/upload/templates/default/report_open_body.tpl b/upload/templates/default/report_open_body.tpl index 84a41262b..2f8514aa0 100644 --- a/upload/templates/default/report_open_body.tpl +++ b/upload/templates/default/report_open_body.tpl @@ -55,7 +55,7 @@ function checked_toggle(form, status) {open_reports.TITLE}
    - {L_BY} {open_reports.AUTHOR} + {L_REPORT_BY} {open_reports.AUTHOR} @@ -66,7 +66,7 @@ function checked_toggle(form, status) - + @@ -83,7 +83,7 @@ function checked_toggle(form, status) diff --git a/upload/templates/default/report_view_body.tpl b/upload/templates/default/report_view_body.tpl index 448234bd3..d075b2e8f 100644 --- a/upload/templates/default/report_view_body.tpl +++ b/upload/templates/default/report_view_body.tpl @@ -19,7 +19,7 @@
    - {L_SELECT_ALL} :: + {L_MARK_ALL} :: {L_INVERT_SELECT}
    - + diff --git a/upload/templates/default/viewonline.tpl b/upload/templates/default/viewonline.tpl index 2a1a09ad7..483ae55d3 100644 --- a/upload/templates/default/viewonline.tpl +++ b/upload/templates/default/viewonline.tpl @@ -1,28 +1,35 @@

    {T_INDEX}

    -
    {L_SUBJECT}:{L_REPORT_SUBJECT}: @@ -46,7 +46,7 @@ {L_REPORTED_BY}: {REPORT_AUTHOR}  - [ {L_SEND_PRIVMSG} ] + [ {L_SEND_PRIVATE_MESSAGE} ]
    +
    + - - + + + - + + + + - + + +
    {L_USERNAME}{L_LAST_UPDATE}{L_USERNAME}{L_LAST_UPDATED}{L_IP_ADDRESS}
    {TOTAL_REGISTERED_USERS_ONLINE}{TOTAL_REGISTERED_USERS_ONLINE} | {L_ALL_USERS} {TOTAL_USERS_ONLINE}
    {reg_user_row.USERNAME} {reg_user_row.LASTUPDATE}{reg_user_row.USERIP}
    {TOTAL_GUEST_USERS_ONLINE}{TOTAL_GUEST_USERS_ONLINE}
    {guest_user_row.USERNAME} {guest_user_row.LASTUPDATE}{guest_user_row.USERIP}
    diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl index a70fe6cec..dca8763a2 100644 --- a/upload/templates/default/viewtopic.tpl +++ b/upload/templates/default/viewtopic.tpl @@ -114,7 +114,7 @@ function set_hid_chbox (id) | - {L_SELECT_PPP} + {L_SELECT_POSTS_PER_PAGE}
    {SELECT_PPP}
    diff --git a/upload/viewonline.php b/upload/viewonline.php index 7eb2c2375..fe4faa5ee 100644 --- a/upload/viewonline.php +++ b/upload/viewonline.php @@ -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&" . 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)) ); diff --git a/upload/viewtopic.php b/upload/viewtopic.php index 4fb3e1849..8807dcb5a 100644 --- a/upload/viewtopic.php +++ b/upload/viewtopic.php @@ -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),