mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
More minor changes
git-svn-id: file:///svn/phpbb/trunk@2465 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
parent
1fdfa98674
commit
7807598bd4
1 changed files with 168 additions and 172 deletions
|
|
@ -90,207 +90,203 @@ if ( !($result = $db->sql_query($sql)) )
|
||||||
message_die(GENERAL_ERROR, 'Could not obtain regd user/online information', '', __LINE__, __FILE__, $sql);
|
message_die(GENERAL_ERROR, 'Could not obtain regd user/online information', '', __LINE__, __FILE__, $sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $row = $db->sql_fetchrow($result) )
|
$guest_users = 0;
|
||||||
|
$registered_users = 0;
|
||||||
|
$hidden_users = 0;
|
||||||
|
|
||||||
|
$reg_counter = 0;
|
||||||
|
$guest_counter = 0;
|
||||||
|
$prev_user = 0;
|
||||||
|
$prev_ip = 0;
|
||||||
|
|
||||||
|
while ( $row = $db->sql_fetchrow($result) )
|
||||||
{
|
{
|
||||||
$guest_users = 0;
|
$view_online = 0;
|
||||||
$registered_users = 0;
|
|
||||||
$hidden_users = 0;
|
|
||||||
|
|
||||||
$reg_counter = 0;
|
if ( $row['session_logged_in'] )
|
||||||
$guest_counter = 0;
|
|
||||||
$prev_user = 0;
|
|
||||||
$prev_ip = 0;
|
|
||||||
|
|
||||||
do
|
|
||||||
{
|
{
|
||||||
$view_online = 0;
|
$user_id = $row['user_id'];
|
||||||
|
|
||||||
if ( $row['session_logged_in'] )
|
if ( $user_id != $prev_user )
|
||||||
{
|
{
|
||||||
$user_id = $row['user_id'];
|
$username = $row['username'];
|
||||||
|
|
||||||
if ( $user_id != $prev_user )
|
$style_color = '';
|
||||||
|
if ( $row['user_level'] == ADMIN )
|
||||||
{
|
{
|
||||||
$username = $row['username'];
|
$username = '<b style="color:#' . $theme['fontcolor3'] . '">' . $username . '</b>';
|
||||||
|
}
|
||||||
|
else if ( $row['user_level'] == MOD )
|
||||||
|
{
|
||||||
|
$username = '<b style="color:#' . $theme['fontcolor2'] . '">' . $username . '</b>';
|
||||||
|
}
|
||||||
|
|
||||||
$style_color = '';
|
if ( !$row['user_allow_viewonline'] )
|
||||||
if ( $row['user_level'] == ADMIN )
|
{
|
||||||
{
|
$view_online = ( $userdata['user_level'] == ADMIN ) ? 1 : 0;
|
||||||
$username = '<b style="color:#' . $theme['fontcolor3'] . '">' . $username . '</b>';
|
$hidden_users++;
|
||||||
}
|
|
||||||
else if ( $row['user_level'] == MOD )
|
|
||||||
{
|
|
||||||
$username = '<b style="color:#' . $theme['fontcolor2'] . '">' . $username . '</b>';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( !$row['user_allow_viewonline'] )
|
$username = '<i>' . $username . '<i>';
|
||||||
{
|
}
|
||||||
$view_online = ( $userdata['user_level'] == ADMIN ) ? 1 : 0;
|
else
|
||||||
$hidden_users++;
|
{
|
||||||
|
$view_online = 1;
|
||||||
|
$registered_users++;
|
||||||
|
}
|
||||||
|
|
||||||
$username = '<i>' . $username . '<i>';
|
$last_update = $row['user_session_time'];
|
||||||
}
|
$user_page = $row['user_session_page'];
|
||||||
else
|
|
||||||
{
|
|
||||||
$view_online = 1;
|
|
||||||
$registered_users++;
|
|
||||||
}
|
|
||||||
|
|
||||||
$last_update = $row['user_session_time'];
|
$which_counter = 'reg_counter';
|
||||||
$user_page = $row['user_session_page'];
|
$which_row = 'reg_user_row';
|
||||||
|
$prev_user = $user_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if ( $row['session_ip'] != $prev_ip )
|
||||||
|
{
|
||||||
|
$view_online = 1;
|
||||||
|
$guest_users++;
|
||||||
|
|
||||||
$which_counter = 'reg_counter';
|
$username = $lang['Guest'];
|
||||||
$which_row = 'reg_user_row';
|
$last_update = $row['session_time'];
|
||||||
$prev_user = $user_id;
|
$user_page = $row['session_page'];
|
||||||
|
|
||||||
|
$which_counter = 'guest_counter';
|
||||||
|
$which_row = 'guest_user_row';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$prev_ip = $row['session_ip'];
|
||||||
|
|
||||||
|
if ( $view_online )
|
||||||
|
{
|
||||||
|
if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
|
||||||
|
{
|
||||||
|
switch( $user_page )
|
||||||
|
{
|
||||||
|
case PAGE_INDEX:
|
||||||
|
$location = $lang['Forum_index'];
|
||||||
|
$location_url = "index.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_POSTING:
|
||||||
|
$location = $lang['Posting_message'];
|
||||||
|
$location_url = "index.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_LOGIN:
|
||||||
|
$location = $lang['Logging_on'];
|
||||||
|
$location_url = "index.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_SEARCH:
|
||||||
|
$location = $lang['Searching_forums'];
|
||||||
|
$location_url = "search.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_PROFILE:
|
||||||
|
$location = $lang['Viewing_profile'];
|
||||||
|
$location_url = "index.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_VIEWONLINE:
|
||||||
|
$location = $lang['Viewing_online'];
|
||||||
|
$location_url = "viewonline.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_VIEWMEMBERS:
|
||||||
|
$location = $lang['Viewing_member_list'];
|
||||||
|
$location_url = "memberlist.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_PRIVMSGS:
|
||||||
|
$location = $lang['Viewing_priv_msgs'];
|
||||||
|
$location_url = "privmsg.$phpEx";
|
||||||
|
break;
|
||||||
|
case PAGE_FAQ:
|
||||||
|
$location = $lang['Viewing_FAQ'];
|
||||||
|
$location_url = "faq.$phpEx";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
$location = $lang['Forum_index'];
|
||||||
|
$location_url = "index.$phpEx";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ( $row['session_ip'] != $prev_ip )
|
$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
|
||||||
{
|
$location = $forum_data[$user_page];
|
||||||
$view_online = 1;
|
|
||||||
$guest_users++;
|
|
||||||
|
|
||||||
$username = $lang['Guest'];
|
|
||||||
$last_update = $row['session_time'];
|
|
||||||
$user_page = $row['session_page'];
|
|
||||||
|
|
||||||
$which_counter = 'guest_counter';
|
|
||||||
$which_row = 'guest_user_row';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$prev_ip = $row['session_ip'];
|
$row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
|
||||||
|
$row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
|
||||||
|
|
||||||
if ( $view_online )
|
$template->assign_block_vars("$which_row", array(
|
||||||
{
|
'ROW_COLOR' => '#' . $row_color,
|
||||||
if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
|
'ROW_CLASS' => $row_class,
|
||||||
{
|
'USERNAME' => $username,
|
||||||
switch( $user_page )
|
'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
|
||||||
{
|
'FORUM_LOCATION' => $location,
|
||||||
case PAGE_INDEX:
|
|
||||||
$location = $lang['Forum_index'];
|
|
||||||
$location_url = "index.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_POSTING:
|
|
||||||
$location = $lang['Posting_message'];
|
|
||||||
$location_url = "index.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_LOGIN:
|
|
||||||
$location = $lang['Logging_on'];
|
|
||||||
$location_url = "index.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_SEARCH:
|
|
||||||
$location = $lang['Searching_forums'];
|
|
||||||
$location_url = "search.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_PROFILE:
|
|
||||||
$location = $lang['Viewing_profile'];
|
|
||||||
$location_url = "index.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_VIEWONLINE:
|
|
||||||
$location = $lang['Viewing_online'];
|
|
||||||
$location_url = "viewonline.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_VIEWMEMBERS:
|
|
||||||
$location = $lang['Viewing_member_list'];
|
|
||||||
$location_url = "memberlist.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_PRIVMSGS:
|
|
||||||
$location = $lang['Viewing_priv_msgs'];
|
|
||||||
$location_url = "privmsg.$phpEx";
|
|
||||||
break;
|
|
||||||
case PAGE_FAQ:
|
|
||||||
$location = $lang['Viewing_FAQ'];
|
|
||||||
$location_url = "faq.$phpEx";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$location = $lang['Forum_index'];
|
|
||||||
$location_url = "index.$phpEx";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
|
|
||||||
$location = $forum_data[$user_page];
|
|
||||||
}
|
|
||||||
|
|
||||||
$row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
|
'U_USER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id),
|
||||||
$row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
|
'U_FORUM_LOCATION' => append_sid($location_url))
|
||||||
|
);
|
||||||
|
|
||||||
$template->assign_block_vars("$which_row", array(
|
$$which_counter++;
|
||||||
'ROW_COLOR' => '#' . $row_color,
|
}
|
||||||
'ROW_CLASS' => $row_class,
|
}
|
||||||
'USERNAME' => $username,
|
|
||||||
'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
|
|
||||||
'FORUM_LOCATION' => $location,
|
|
||||||
|
|
||||||
'U_USER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id),
|
if( $registered_users == 0 )
|
||||||
'U_FORUM_LOCATION' => append_sid($location_url))
|
{
|
||||||
);
|
$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'];
|
||||||
|
}
|
||||||
|
|
||||||
$$which_counter++;
|
if( $hidden_users == 0 )
|
||||||
}
|
{
|
||||||
}
|
$l_h_user_s = $lang['Hidden_users_zero_online'];
|
||||||
while ( $row = $db->sql_fetchrow($result) );
|
}
|
||||||
|
else if( $hidden_users == 1 )
|
||||||
|
{
|
||||||
|
$l_h_user_s = $lang['Hidden_user_online'];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$l_h_user_s = $lang['Hidden_users_online'];
|
||||||
|
}
|
||||||
|
|
||||||
if( $registered_users == 0 )
|
if( $guest_users == 0 )
|
||||||
{
|
{
|
||||||
$l_r_user_s = $lang['Reg_users_zero_online'];
|
$l_g_user_s = $lang['Guest_users_zero_online'];
|
||||||
}
|
}
|
||||||
else if( $registered_users == 1 )
|
else if( $guest_users == 1 )
|
||||||
{
|
{
|
||||||
$l_r_user_s = $lang['Reg_user_online'];
|
$l_g_user_s = $lang['Guest_user_online'];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$l_r_user_s = $lang['Reg_users_online'];
|
$l_g_user_s = $lang['Guest_users_online'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if( $hidden_users == 0 )
|
$template->assign_vars(array(
|
||||||
{
|
'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users),
|
||||||
$l_h_user_s = $lang['Hidden_users_zero_online'];
|
'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users))
|
||||||
}
|
);
|
||||||
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'];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if ( $registered_users + $hidden_users == 0 )
|
||||||
|
{
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users),
|
'L_NO_REGISTERED_USERS_BROWSING' => $lang['No_users_browsing'])
|
||||||
'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users))
|
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if ( $registered_users + $hidden_users == 0 )
|
if ( $guest_users == 0 )
|
||||||
{
|
{
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'L_NO_REGISTERED_USERS_BROWSING' => $lang['No_users_browsing'])
|
'L_NO_GUESTS_BROWSING' => $lang['No_users_browsing'])
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
if ( $guest_users == 0 )
|
|
||||||
{
|
|
||||||
$template->assign_vars(array(
|
|
||||||
'L_NO_GUESTS_BROWSING' => $lang['No_users_browsing'])
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$template->pparse('body');
|
$template->pparse('body');
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue