github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 22:03:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r442

Browse source 
чистка git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@442 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2012-07-09 22:35:43 +00:00
commit 2ed135aad0
4 changed files with 10 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
upload/config.php
View file

@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.5 Beta'; $bb_cfg['tp_version'] = '2.5 Beta';
$bb_cfg['tp_release_state'] = 'R441'; $bb_cfg['tp_release_state'] = 'R442';
$bb_cfg['tp_release_date'] = '06-07-2012'; $bb_cfg['tp_release_date'] = '10-07-2012';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';

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

@ -887,18 +887,10 @@ $lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum.<br />Please co
// //
// Viewonline // Viewonline
// //
$lang['REG_USERS_ZERO_ONLINE'] = 'There are 0 Registered users and '; // There are 5 Registered and $lang['REG_USERS_ONLINE'] = 'Who is online registered users: %d and ';
$lang['REG_USERS_ONLINE'] = 'There are %d Registered users and '; // There are 5 Registered and $lang['HIDDEN_USERS_ONLINE'] = 'hidden users: %d';
$lang['REG_USER_ONLINE'] = 'There is %d Registered user and '; // There is 1 Registered and $lang['GUEST_USERS_ONLINE'] = 'Online Guests: %d';
$lang['HIDDEN_USERS_ZERO_ONLINE'] = '0 Hidden users online'; // 6 Hidden users online
$lang['HIDDEN_USERS_ONLINE'] = '%d Hidden users online'; // 6 Hidden users online
$lang['HIDDEN_USER_ONLINE'] = '%d Hidden user online'; // 6 Hidden users online
$lang['GUEST_USERS_ONLINE'] = 'There are %d Guest users online'; // There are 10 Guest users online
$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['ALL_USERS'] = 'All users:';
$lang['ONLINE_EXPLAIN'] = 'users active over the past five minutes'; $lang['ONLINE_EXPLAIN'] = 'users active over the past five minutes';
$lang['LAST_UPDATED'] = 'Last Updated'; $lang['LAST_UPDATED'] = 'Last Updated';

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

@ -894,19 +894,10 @@ $lang['YOU_BEEN_BANNED'] = 'Вам был закрыт доступ к фору
// //
// Viewonline // Viewonline
// //
$lang['REG_USERS_ZERO_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: 0 и '; // There ae 5 Registered and $lang['REG_USERS_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: %d и ';
$lang['REG_USERS_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: %d и '; // There ae 5 Registered and
$lang['REG_USER_ONLINE'] = 'Сейчас на сайте зарегистрированных пользователей: %d и ';
$lang['HIDDEN_USERS_ZERO_ONLINE'] = 'скрытых пользователей: 0'; // 6 Hidden users online
$lang['HIDDEN_USERS_ONLINE'] = 'скрытых пользователей: %d'; $lang['HIDDEN_USERS_ONLINE'] = 'скрытых пользователей: %d';
$lang['HIDDEN_USER_ONLINE'] = 'скрытых пользователей: %d'; // 6 Hidden users online
$lang['GUEST_USERS_ONLINE'] = 'Сейчас на сайте гостей: %d'; $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['ALL_USERS'] = 'Всех:';
$lang['ONLINE_EXPLAIN'] = 'данные за последние пять минут'; $lang['ONLINE_EXPLAIN'] = 'данные за последние пять минут';
$lang['LAST_UPDATED'] = 'Последнее изменение'; $lang['LAST_UPDATED'] = 'Последнее изменение';

61
upload/viewonline.php
View file

@ -3,7 +3,7 @@
define('IN_PHPBB', true); define('IN_PHPBB', true);
define('BB_SCRIPT', 'online'); define('BB_SCRIPT', 'online');
define('BB_ROOT', './'); define('BB_ROOT', './');
require(BB_ROOT ."common.php"); require(BB_ROOT .'common.php');
// Start session management // Start session management
$user->session_start(array('req_login' => true)); $user->session_start(array('req_login' => true));
@ -109,63 +109,10 @@ while ( $row = DB()->sql_fetchrow($result) )
} }
} }
if( $registered_users == 0 )
{
$l_r_user_s = $lang['REG_USERS_ZERO_ONLINE'];
}
else if( $registered_users == 1 )
{
$l_r_user_s = $lang['REG_USER_ONLINE'];
}
else
{
$l_r_user_s = $lang['REG_USERS_ONLINE'];
}
if( $hidden_users == 0 )
{
$l_h_user_s = $lang['HIDDEN_USERS_ZERO_ONLINE'];
}
else if( $hidden_users == 1 )
{
$l_h_user_s = $lang['HIDDEN_USER_ONLINE'];
}
else
{
$l_h_user_s = $lang['HIDDEN_USERS_ONLINE'];
}
if( $guest_users == 0 )
{
$l_g_user_s = $lang['GUEST_USERS_ZERO_ONLINE'];
}
else if( $guest_users == 1 )
{
$l_g_user_s = $lang['GUEST_USER_ONLINE'];
}
else
{
$l_g_user_s = $lang['GUEST_USERS_ONLINE'];
}
$template->assign_vars(array( $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_USERS_ONLINE' => $registered_users + $hidden_users + $guest_users,
'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users), 'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($lang['REG_USERS_ONLINE'], $registered_users) . sprintf($lang['HIDDEN_USERS_ONLINE'], $hidden_users),
'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users)) 'TOTAL_GUEST_USERS_ONLINE' => sprintf($lang['GUEST_USERS_ONLINE'], $guest_users))
); );
if ( $registered_users + $hidden_users == 0 )
{
$template->assign_vars(array(
'L_NO_REGISTERED_USERS_BROWSING' => $lang['NO_USERS_BROWSING'])
);
}
if ( $guest_users == 0 )
{
$template->assign_vars(array(
'L_NO_GUESTS_BROWSING' => $lang['NO_USERS_BROWSING'])
);
}
print_page('viewonline.tpl'); print_page('viewonline.tpl');