[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.72,1.73

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory sc8-pr-cvs1:/tmp/cvs-serv23045

Modified Files:
	viewonline.php 
Log Message:
Line feeds again ... also wondering if, given what this does it may be better integrated with memberlist?

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** viewonline.php	17 Mar 2003 00:54:10 -0000	1.72
--- viewonline.php	18 Mar 2003 17:43:21 -0000	1.73
***************
*** 1,289 ****
! <?php
! /***************************************************************************
!  *                              viewonline.php
!  *                            -------------------
!  *   begin                : Saturday, Feb 13, 2001
!  *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
!  *
!  *   $Id$
!  *
!  ***************************************************************************/
! 
! /***************************************************************************
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2 of the License, or
!  *   (at your option) any later version.
!  *
!  ***************************************************************************/
! 
! define('IN_PHPBB', true);
! $phpbb_root_path = './';
! include($phpbb_root_path . 'extension.inc');
! include($phpbb_root_path . 'common.'.$phpEx);
! 
! // Start session management
! $user->start();
! $user->setup();
! $auth->acl($user->data);
! // End session management
! 
! // Forum info
! $sql = "SELECT forum_id, forum_name
! 	FROM " . FORUMS_TABLE;
! $result = $db->sql_query($sql);
! 
! while ($row = $db->sql_fetchrow($result))
! {
! 	$forum_data[$row['forum_id']] = $row['forum_name'];
! }
! 
! // Get user list
! $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_colour, s.session_time, s.session_page, s.session_ip, s.session_allow_viewonline
! 	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
! 	WHERE u.user_id = s.session_user_id
! 		AND s.session_time >= ".(time() - 300) . "
! 	ORDER BY u.username ASC, s.session_ip ASC, s.session_time DESC";
! $result = $db->sql_query($sql);
! 
! $guest_users = 0;
! $registered_users = 0;
! $hidden_users = 0;
! 
! $reg_counter = 0;
! $guest_counter = 0;
! $prev_user = 0;
! $prev_ip = '';
! 
! while ($row = $db->sql_fetchrow($result))
! {
! 	$view_online = false;
! 
! 	if ($row['user_id'] != ANONYMOUS)
! 	{
! 		$user_id = $row['user_id'];
! 
! 		if ($user_id != $prev_user)
! 		{
! 			$username = $row['username'];
! 
! 			if ($row['user_colour'])
! 			{
! 				$username = '<b style="color:#' . $row['user_colour'] . '">' . $username . '</b>';
! 			}
! 
! 			if (!$row['user_allow_viewonline'] || !$row['session_allow_viewonline'])
! 			{
! 				$view_online = ($auth->acl_gets('u_viewonline', 'a_')) ? true : false;
! 				$hidden_users++;
! 
! 				$username = '<i>' . $username . '</i>';
! 			}
! 			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 = $user->lang['GUEST'];
! 			$view_online = true;
! 			$guest_users++;
! 
! 			$which_counter = 'guest_counter';
! 			$which_row = 'guest_user_row';
! 		}
! 	}
! 
! 	$prev_ip = $row['session_ip'];
! 
! 	if ($view_online)
! 	{
! 		preg_match('#([a-z]+)#', $row['session_page'], $on_page);
! 
! 		switch ($on_page[1])
! 		{
! 			case 'index':
! 				$location = $user->lang['Forum_index'];
! 				$location_url = "index.$phpEx$SID";
! 				break;
! 
! 			case 'posting':
! 			case 'viewforum':
! 			case 'viewtopic':
! 				preg_match('#f=([0-9]+)#', $row['session_page'], $forum_id);
! 				$forum_id = $forum_id[1];
! 
! 				if ($auth->acl_gets('f_list', 'a_', $forum_id))
! 				{
! 					$location = '';
! 					switch ($on_page[1])
! 					{
! 						case 'posting':
! 							preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page);
! 							
! 							switch ($on_page[1])
! 							{
! 								case 'reply':
! 								case 'topicreview':
! 									$location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]);
! 									break;
! 								default:
! 									$location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]);
! 									break;
! 							}
! 							break;
! 
! 						case 'viewtopic':
! 							$location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]);
! 							break;
! 
! 						case 'viewforum':
! 							$location .= sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]);
! 							break;
! 					}
! 
! 					$location_url = "viewforum.$phpEx$SID&amp;f=$forum_id";
! 				}
! 				else
! 				{
! 					$location = $user->lang['Forum_index'];
! 					$location_url = "index.$phpEx$SID";
! 				}
! 				break;
! 
! 			case 'search':
! 				$location = $user->lang['Searching_forums'];
! 				$location_url = "search.$phpEx$SID";
! 				break;
! 
! 			case 'profile':
! 				$location = $user->lang['Viewing_profile'];
! 				$location_url = "index.$phpEx$SID";
! 				break;
! 
! 			case 'faq':
! 				$location = $user->lang['Viewing_FAQ'];
! 				$location_url = "faq.$phpEx$SID";
! 				break;
! 
! 			case 'viewonline':
! 				$location = $user->lang['Viewing_online'];
! 				$location_url = "viewonline.$phpEx$SID";
! 				break;
! 
! 			case 'memberslist':
! 				$location = $user->lang['Viewing_member_list'];
! 				$location_url = "memberlist.$phpEx$SID";
! 				break;
! 
! 			default:
! 				$location = $user->lang['Forum_index'];
! 				$location_url = "index.$phpEx$SID";
! 				break;
! 		}
! 
! 		$template->assign_block_vars($which_row, array(
! 			'USERNAME' 		=> $username,
! 			'LASTUPDATE' 	=> $user->format_date($row['session_time']),
! 			'FORUM_LOCATION'=> $location,
! 
! 			'S_ROW_COUNT'	=> $$which_counter,
! 
! 			'U_USER_PROFILE'	=> "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $user_id,
! 			'U_FORUM_LOCATION'	=> $location_url)
! 		);
! 
! 		$$which_counter++;
! 	}
! }
! 
! if($registered_users == 0)
! {
! 	$l_r_user_s = $user->lang['Reg_users_zero_online'];
! }
! else if($registered_users == 1)
! {
! 	$l_r_user_s = $user->lang['Reg_user_online'];
! }
! else
! {
! 	$l_r_user_s = $user->lang['Reg_users_online'];
! }
! 
! if($hidden_users == 0)
! {
! 	$l_h_user_s = $user->lang['Hidden_users_zero_online'];
! }
! else if($hidden_users == 1)
! {
! 	$l_h_user_s = $user->lang['Hidden_user_online'];
! }
! else
! {
! 	$l_h_user_s = $user->lang['Hidden_users_online'];
! }
! 
! if($guest_users == 0)
! {
! 	$l_g_user_s = $user->lang['Guest_users_zero_online'];
! }
! else if($guest_users == 1)
! {
! 	$l_g_user_s = $user->lang['Guest_user_online'];
! }
! else
! {
! 	$l_g_user_s = $user->lang['Guest_users_online'];
! }
! 
! // Grab group details for legend display
! $sql = "SELECT group_name, group_colour, group_type  
! 	FROM " . GROUPS_TABLE . " 
! 	WHERE group_colour <> '' 
! 		AND group_display = 1";
! $result = $db->sql_query($sql);
! 
! $legend = '';
! while ($row = $db->sql_fetchrow($result))
! {
! 	$legend .= (($legend != '') ? ', ' : '') . '<span style="color:#' . $row['group_colour'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</span>';
! }
! 
! $template->assign_vars(array(
! 	'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),
! 	'LEGEND'						=> $legend, 
! 
! 	'META' => '<meta http-equiv="refresh" content="60; url=viewonline.' . $phpEx . $SID . '">',
! 
! 	'L_WHOSONLINE' => $user->lang['Who_is_online'],
! 	'L_ONLINE_EXPLAIN' => $user->lang['Online_explain'],
! 	'L_USERNAME' => $user->lang['Username'],
! 	'L_FORUM_LOCATION' => $user->lang['Forum_Location'],
! 	'L_LAST_UPDATE' => $user->lang['Last_updated'],
! 	'L_NO_GUESTS_BROWSING' => $user->lang['No_users_browsing'],
! 	'L_NO_REGISTERED_USERS_BROWSING' => $user->lang['No_users_browsing'])
! );
! 
! $page_title = $user->lang['Who_is_online'];
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! 
! $template->set_filenames(array(
! 	'body' => 'viewonline_body.html')
! );
! make_jumpbox('viewforum.'.$phpEx);
! 
! include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! 
  ?>
--- 1,288 ----
! <?php
! /***************************************************************************
!  *                              viewonline.php
!  *                            -------------------
!  *   begin                : Saturday, Feb 13, 2001
!  *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
!  *
!  *   $Id$
!  *
!  ***************************************************************************/
! 
! /***************************************************************************
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2 of the License, or
!  *   (at your option) any later version.
!  *
!  ***************************************************************************/
! 
! define('IN_PHPBB', true);
! $phpbb_root_path = './';
! include($phpbb_root_path . 'extension.inc');
! include($phpbb_root_path . 'common.'.$phpEx);
! 
! // Start session management
! $user->start();
! $user->setup();
! $auth->acl($user->data);
! 
! // Forum info
! $sql = "SELECT forum_id, forum_name
! 	FROM " . FORUMS_TABLE;
! $result = $db->sql_query($sql);
! 
! while ($row = $db->sql_fetchrow($result))
! {
! 	$forum_data[$row['forum_id']] = $row['forum_name'];
! }
! 
! // Get user list
! $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_colour, s.session_time, s.session_page, s.session_ip, s.session_allow_viewonline
! 	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
! 	WHERE u.user_id = s.session_user_id
! 		AND s.session_time >= ".(time() - 300) . "
! 	ORDER BY u.username ASC, s.session_ip ASC, s.session_time DESC";
! $result = $db->sql_query($sql);
! 
! $guest_users = 0;
! $registered_users = 0;
! $hidden_users = 0;
! 
! $reg_counter = 0;
! $guest_counter = 0;
! $prev_user = 0;
! $prev_ip = '';
! 
! while ($row = $db->sql_fetchrow($result))
! {
! 	$view_online = false;
! 
! 	if ($row['user_id'] != ANONYMOUS)
! 	{
! 		$user_id = $row['user_id'];
! 
! 		if ($user_id != $prev_user)
! 		{
! 			$username = $row['username'];
! 
! 			if ($row['user_colour'])
! 			{
! 				$username = '<b style="color:#' . $row['user_colour'] . '">' . $username . '</b>';
! 			}
! 
! 			if (!$row['user_allow_viewonline'] || !$row['session_allow_viewonline'])
! 			{
! 				$view_online = ($auth->acl_gets('u_viewonline', 'a_')) ? true : false;
! 				$hidden_users++;
! 
! 				$username = '<i>' . $username . '</i>';
! 			}
! 			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 = $user->lang['GUEST'];
! 			$view_online = true;
! 			$guest_users++;
! 
! 			$which_counter = 'guest_counter';
! 			$which_row = 'guest_user_row';
! 		}
! 	}
! 
! 	$prev_ip = $row['session_ip'];
! 
! 	if ($view_online)
! 	{
! 		preg_match('#([a-z]+)#', $row['session_page'], $on_page);
! 
! 		switch ($on_page[1])
! 		{
! 			case 'index':
! 				$location = $user->lang['Forum_index'];
! 				$location_url = "index.$phpEx$SID";
! 				break;
! 
! 			case 'posting':
! 			case 'viewforum':
! 			case 'viewtopic':
! 				preg_match('#f=([0-9]+)#', $row['session_page'], $forum_id);
! 				$forum_id = $forum_id[1];
! 
! 				if ($auth->acl_gets('f_list', 'a_', $forum_id))
! 				{
! 					$location = '';
! 					switch ($on_page[1])
! 					{
! 						case 'posting':
! 							preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page);
! 							
! 							switch ($on_page[1])
! 							{
! 								case 'reply':
! 								case 'topicreview':
! 									$location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]);
! 									break;
! 								default:
! 									$location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]);
! 									break;
! 							}
! 							break;
! 
! 						case 'viewtopic':
! 							$location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]);
! 							break;
! 
! 						case 'viewforum':
! 							$location .= sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]);
! 							break;
! 					}
! 
! 					$location_url = "viewforum.$phpEx$SID&amp;f=$forum_id";
! 				}
! 				else
! 				{
! 					$location = $user->lang['Forum_index'];
! 					$location_url = "index.$phpEx$SID";
! 				}
! 				break;
! 
! 			case 'search':
! 				$location = $user->lang['Searching_forums'];
! 				$location_url = "search.$phpEx$SID";
! 				break;
! 
! 			case 'profile':
! 				$location = $user->lang['Viewing_profile'];
! 				$location_url = "index.$phpEx$SID";
! 				break;
! 
! 			case 'faq':
! 				$location = $user->lang['Viewing_FAQ'];
! 				$location_url = "faq.$phpEx$SID";
! 				break;
! 
! 			case 'viewonline':
! 				$location = $user->lang['Viewing_online'];
! 				$location_url = "viewonline.$phpEx$SID";
! 				break;
! 
! 			case 'memberslist':
! 				$location = $user->lang['Viewing_member_list'];
! 				$location_url = "memberlist.$phpEx$SID";
! 				break;
! 
! 			default:
! 				$location = $user->lang['Forum_index'];
! 				$location_url = "index.$phpEx$SID";
! 				break;
! 		}
! 
! 		$template->assign_block_vars($which_row, array(
! 			'USERNAME' 		=> $username,
! 			'LASTUPDATE' 	=> $user->format_date($row['session_time']),
! 			'FORUM_LOCATION'=> $location,
! 
! 			'S_ROW_COUNT'	=> $$which_counter,
! 
! 			'U_USER_PROFILE'	=> "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $user_id,
! 			'U_FORUM_LOCATION'	=> $location_url)
! 		);
! 
! 		$$which_counter++;
! 	}
! }
! 
! if($registered_users == 0)
! {
! 	$l_r_user_s = $user->lang['Reg_users_zero_online'];
! }
! else if($registered_users == 1)
! {
! 	$l_r_user_s = $user->lang['Reg_user_online'];
! }
! else
! {
! 	$l_r_user_s = $user->lang['Reg_users_online'];
! }
! 
! if($hidden_users == 0)
! {
! 	$l_h_user_s = $user->lang['Hidden_users_zero_online'];
! }
! else if($hidden_users == 1)
! {
! 	$l_h_user_s = $user->lang['Hidden_user_online'];
! }
! else
! {
! 	$l_h_user_s = $user->lang['Hidden_users_online'];
! }
! 
! if($guest_users == 0)
! {
! 	$l_g_user_s = $user->lang['Guest_users_zero_online'];
! }
! else if($guest_users == 1)
! {
! 	$l_g_user_s = $user->lang['Guest_user_online'];
! }
! else
! {
! 	$l_g_user_s = $user->lang['Guest_users_online'];
! }
! 
! // Grab group details for legend display
! $sql = "SELECT group_name, group_colour, group_type  
! 	FROM " . GROUPS_TABLE . " 
! 	WHERE group_colour <> '' 
! 		AND group_display = 1";
! $result = $db->sql_query($sql);
! 
! $legend = '';
! while ($row = $db->sql_fetchrow($result))
! {
! 	$legend .= (($legend != '') ? ', ' : '') . '<span style="color:#' . $row['group_colour'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</span>';
! }
! 
! $template->assign_vars(array(
! 	'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),
! 	'LEGEND'						=> $legend, 
! 
! 	'META' => '<meta http-equiv="refresh" content="60; url=viewonline.' . $phpEx . $SID . '">',
! 
! 	'L_WHOSONLINE' => $user->lang['Who_is_online'],
! 	'L_ONLINE_EXPLAIN' => $user->lang['Online_explain'],
! 	'L_USERNAME' => $user->lang['Username'],
! 	'L_FORUM_LOCATION' => $user->lang['Forum_Location'],
! 	'L_LAST_UPDATE' => $user->lang['Last_updated'],
! 	'L_NO_GUESTS_BROWSING' => $user->lang['No_users_browsing'],
! 	'L_NO_REGISTERED_USERS_BROWSING' => $user->lang['No_users_browsing'])
! );
! 
! $page_title = $user->lang['Who_is_online'];
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! 
! $template->set_filenames(array(
! 	'body' => 'viewonline_body.html')
! );
! make_jumpbox('viewforum.'.$phpEx);
! 
! include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! 
  ?>