diff --git a/upload/config.php b/upload/config.php index 7e4b730dc..bcde5c7a4 100644 --- a/upload/config.php +++ b/upload/config.php @@ -68,8 +68,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Version info $bb_cfg['tp_version'] = '2.0.9 (RC)'; -$bb_cfg['tp_release_date'] = '30-07-2014'; -$bb_cfg['tp_release_state'] = 'R592'; +$bb_cfg['tp_release_date'] = '07-08-2014'; +$bb_cfg['tp_release_state'] = 'R593'; // Database $charset = 'utf8'; diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index 080ffda67..fb30f8cf8 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -46,7 +46,6 @@ if (defined('SHOW_ONLINE') && SHOW_ONLINE) 'LOGGED_IN_USER_LIST' => ${$online_list}['userlist'], 'USERS_ONLINE_COUNTS' => ${$online_list}['cnt'], 'RECORD_USERS' => sprintf($lang['RECORD_ONLINE_USERS'], $bb_cfg['record_online_users'], bb_date($bb_cfg['record_online_date'])), - 'U_VIEWONLINE' => "viewonline.php", )); } diff --git a/upload/language/en/main.php b/upload/language/en/main.php index 15ffd9e05..65aff8699 100644 --- a/upload/language/en/main.php +++ b/upload/language/en/main.php @@ -843,10 +843,6 @@ $lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum.
Please co // // Viewonline // -$lang['REG_USERS_ONLINE'] = 'Who is online registered users: %d and '; -$lang['HIDDEN_USERS_ONLINE'] = 'hidden users: %d'; -$lang['GUEST_USERS_ONLINE'] = 'Online Guests: %d'; -$lang['ALL_USERS_ONLINE'] = 'All users:'; $lang['ONLINE_EXPLAIN'] = 'users active over the past five minutes'; $lang['LAST_UPDATED'] = 'Last Updated'; diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php index 09610704f..544f96749 100644 --- a/upload/language/ru/main.php +++ b/upload/language/ru/main.php @@ -843,10 +843,6 @@ $lang['YOU_BEEN_BANNED'] = 'Вам был закрыт доступ к фору // // Viewonline // -$lang['REG_USERS_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: %d и '; -$lang['HIDDEN_USERS_ONLINE'] = 'скрытых пользователей: %d'; -$lang['GUEST_USERS_ONLINE'] = 'Сейчас на сайте гостей: %d'; -$lang['ALL_USERS_ONLINE'] = 'Всех:'; $lang['ONLINE_EXPLAIN'] = 'данные за последние пять минут'; $lang['LAST_UPDATED'] = 'Последнее изменение'; diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php index 73d4cf208..98635f753 100644 --- a/upload/language/ua/main.php +++ b/upload/language/ua/main.php @@ -843,10 +843,6 @@ $lang['YOU_BEEN_BANNED'] = 'Вам був закритий доступ до ф // // Viewonline // -$lang['REG_USERS_ONLINE'] = 'Зараз на сайті зареєстрованих користувачів: %d '; -$lang['HIDDEN_USERS_ONLINE'] = 'прихованих користувачів: %d'; -$lang['GUEST_USERS_ONLINE'] = 'Зараз на сайті гостей: %d'; -$lang['ALL_USERS_ONLINE'] = 'Усіх:'; $lang['ONLINE_EXPLAIN'] = "дані за останні п'ять хвилин"; $lang['LAST_UPDATED'] = 'Остання зміна'; diff --git a/upload/robots.txt b/upload/robots.txt index f5d49b1f6..57f3228a1 100644 --- a/upload/robots.txt +++ b/upload/robots.txt @@ -7,7 +7,6 @@ Disallow: /modcp.php Disallow: /posting.php Disallow: /privmsg.php Disallow: /profile.php -Disallow: /viewonline.php Host: torrentpier.me -Sitemap: http://torrentpier.me/sitemap.php \ No newline at end of file +Sitemap: http://torrentpier.me/sitemap/sitemap.xml \ No newline at end of file diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl index c9126a77c..c7f718a49 100644 --- a/upload/templates/default/index.tpl +++ b/upload/templates/default/index.tpl @@ -151,7 +151,7 @@
-

{L_WHOSONLINE}

+

{L_WHOSONLINE}

diff --git a/upload/templates/default/viewonline.tpl b/upload/templates/default/viewonline.tpl deleted file mode 100644 index d1937bcff..000000000 --- a/upload/templates/default/viewonline.tpl +++ /dev/null @@ -1,47 +0,0 @@ -

{T_INDEX}

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_USERNAME}{L_LAST_UPDATED}{L_IP_ADDRESS}
{TOTAL_REGISTERED_USERS_ONLINE} | {L_ALL_USERS_ONLINE} {TOTAL_USERS_ONLINE}
{reg_user_row.USER}{reg_user_row.LASTUPDATE_RAW}{reg_user_row.LASTUPDATE}{reg_user_row.USERIP}
{TOTAL_GUEST_USERS_ONLINE}
{guest_user_row.USER}{guest_user_row.LASTUPDATE}{guest_user_row.USERIP}
- -
- -
- -

{L_ONLINE_EXPLAIN}

- -
-

{CURRENT_TIME}

-

{S_TIMEZONE}

-
-
- -
\ No newline at end of file diff --git a/upload/viewonline.php b/upload/viewonline.php deleted file mode 100644 index 518e811dc..000000000 --- a/upload/viewonline.php +++ /dev/null @@ -1,118 +0,0 @@ -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'], -)); - -// -// Get auth data -// -$is_auth_ary = array(); -$is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata); - -// -// Get user list -// -$sql = "SELECT u.user_id, u.username, u.user_opt, u.user_rank, s.session_logged_in, s.session_time, s.session_ip - FROM ".BB_USERS." u, ".BB_SESSIONS." s - WHERE u.user_id = s.session_user_id - AND s.session_time >= ".( TIMENOW - 300 ) . " - ORDER BY u.username ASC, s.session_ip ASC"; -if (!($result = DB()->sql_query($sql))) -{ - bb_die('Could not obtain regd user / online information'); -} - -$guest_users = 0; -$registered_users = 0; -$hidden_users = 0; - -$reg_counter = 0; -$guest_counter = 0; -$prev_user = 0; -$prev_ip = ''; - -$user_id = 0; - -while ($row = DB()->sql_fetchrow($result)) -{ - $view_online = false; - - if ($row['session_logged_in']) - { - $user_id = $row['user_id']; - - if ($user_id != $prev_user) - { - $username = profile_url($row); - - if (bf($row['user_opt'], 'user_opt', 'user_viewonline')) - { - $view_online = IS_AM; - $hidden_users++; - - $username = '' . $username . ''; - } - else - { - $view_online = true; - $registered_users++; - } - - $which_counter = 'reg_counter'; - $which_row = 'reg_user_row'; - $prev_user = $user_id; - } - } - else - { - if ($row['session_ip'] != $prev_ip) - { - $username = $lang['GUEST']; - $view_online = true; - $guest_users++; - - $which_counter = 'guest_counter'; - $which_row = 'guest_user_row'; - } - } - - $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'; - - $template->assign_block_vars("$which_row", array( - 'ROW_CLASS' => $row_class, - 'USER' => $username, - 'LASTUPDATE' => bb_date($row['session_time']), - 'LASTUPDATE_RAW' => $row['session_time'], - 'USERIP' => $user_ip, - 'U_WHOIS_IP' => $bb_cfg['whois_info'] . $user_ip, - )); - - $which_counter++; - } -} - -$template->assign_vars(array( - 'TOTAL_USERS_ONLINE' => $registered_users + $hidden_users + $guest_users, - 'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($lang['REG_USERS_ONLINE'], $registered_users) . sprintf($lang['HIDDEN_USERS_ONLINE'], $hidden_users), - 'TOTAL_GUEST_USERS_ONLINE' => sprintf($lang['GUEST_USERS_ONLINE'], $guest_users)) -); - -print_page('viewonline.tpl'); \ No newline at end of file