[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.53,1.54

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

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv27811/includes

Modified Files:
	page_header.php 
Log Message:
Changed logged in block to a logged in and logged out block

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** page_header.php	2001/09/08 18:24:34	1.53
--- page_header.php	2001/10/14 18:20:40	1.54
***************
*** 66,70 ****
  if($userdata['session_logged_in'])
  {
! 	$u_login_logout = "login.$phpEx?submit=logout";
  	$l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . "";
  }
--- 66,70 ----
  if($userdata['session_logged_in'])
  {
! 	$u_login_logout = "login.$phpEx?logout=true";
  	$l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . "";
  }
***************
*** 97,105 ****
  $guests_online = 0;
  
! while($row = $db->sql_fetchrow($result))
  {
! 	if($row['session_logged_in'])
  	{
! 		if($row['user_allow_viewonline'])
  		{
  			$userlist_ary[] = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
--- 97,105 ----
  $guests_online = 0;
  
! while( $row = $db->sql_fetchrow($result) )
  {
! 	if( $row['session_logged_in'] )
  	{
! 		if( $row['user_allow_viewonline'] )
  		{
  			$userlist_ary[] = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
***************
*** 145,165 ****
  // if user is logged in
  //
! if($userdata['session_logged_in'])
  {
  	$sql = "SELECT COUNT(privmsgs_type) AS new_messages
  		FROM " . PRIVMSGS_TABLE . "
! 		WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
  			AND privmsgs_to_userid = " . $userdata['user_id'];
! 	$result_pm = $db->sql_query($sql);
! 	if(!$result_pm)
  	{
  		message_die(GENERAL_MESSAGE, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
  	}
! 	if($pm_result = $db->sql_fetchrow($result_pm))
  	{
! 		$new_messages = $pm_result['new_messages'];
  
! 		$l_message_new = ($new_messages == 1) ? $lang['message'] : $lang['messages'];
! 		$l_privmsgs_text = $lang['You_have'] . " $new_messages " . $lang['new'] . " $l_message_new";
  	}
  	else
--- 145,165 ----
  // if user is logged in
  //
! if( $userdata['session_logged_in'] )
  {
  	$sql = "SELECT COUNT(privmsgs_type) AS new_messages
  		FROM " . PRIVMSGS_TABLE . "
! 		WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " 
  			AND privmsgs_to_userid = " . $userdata['user_id'];
! 	if( !$result_pm = $db->sql_query($sql) )
  	{
  		message_die(GENERAL_MESSAGE, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
  	}
! 
! 	if( $pm_result = $db->sql_fetchrow($result_pm) )
  	{
! 		$new_pm_messages = $pm_result['new_messages'];
  
! 		$l_message_new = ( $new_pm_messages == 1 ) ? $lang['message'] : $lang['messages'];
! 		$l_privmsgs_text = $lang['You_have'] . " $new_pm_messages " . $lang['new'] . " $l_message_new";
  	}
  	else
***************
*** 181,188 ****
  	"SITENAME" => $board_config['sitename'],
  	"PAGE_TITLE" => $page_title,
- 	"META_INFO" => $meta_tags,
  	"TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s ". $lang['and'] . " $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'],
  	"LOGGED_IN_USER_LIST" => $online_userlist,
  	"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
  	"LAST_VISIT_DATE" => $s_last_visit,
  
--- 181,188 ----
  	"SITENAME" => $board_config['sitename'],
  	"PAGE_TITLE" => $page_title,
  	"TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s ". $lang['and'] . " $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'],
  	"LOGGED_IN_USER_LIST" => $online_userlist,
  	"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
+ 	"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session, 
  	"LAST_VISIT_DATE" => $s_last_visit,
  
***************
*** 236,240 ****
  	"S_TIMEZONE" => $lang['All_times'] . " " . $lang[$board_config['board_timezone']],
  	"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
- 	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"),
  	"S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']),
  
--- 236,239 ----
***************
*** 282,288 ****
  // Login box?
  //
! if(!$userdata['session_logged_in'])
  {
! 	$template->assign_block_vars("loginbox", array());
  }
  
--- 281,291 ----
  // Login box?
  //
! if( !$userdata['session_logged_in'] )
! {
! 	$template->assign_block_vars("user_logged_out", array());
! }
! else
  {
! 	$template->assign_block_vars("user_logged_in", array());
  }