[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.57,1.58

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

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

Modified Files:
	groupcp.php 
Log Message:
Fix missing var preventing display of email link to users when browsing groups as group moderator or admin

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** groupcp.php	31 Mar 2002 00:06:33 -0000	1.57
--- groupcp.php	3 Apr 2002 22:24:56 -0000	1.58
***************
*** 28,32 ****
  // -------------------------
  //
! function generate_user_info(&$row, $date_format, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
  {
  	global $lang, $images, $board_config;
--- 28,32 ----
  // -------------------------
  //
! function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
  {
  	global $lang, $images, $board_config;
***************
*** 53,57 ****
  	}
  
! 	if ( !empty($row['user_viewemail']) || $userdata['user_level'] == ADMIN )
  	{
  		$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email'];
--- 53,57 ----
  	}
  
! 	if ( !empty($row['user_viewemail']) || $group_mod )
  	{
  		$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email'];
***************
*** 892,896 ****
  	$user_id = $group_moderator['user_id'];
  
! 	generate_user_info($group_moderator, $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  	$template->assign_vars(array(
--- 892,896 ----
  	$user_id = $group_moderator['user_id'];
  
! 	generate_user_info($group_moderator, $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  	$template->assign_vars(array(
***************
*** 981,985 ****
  		$user_id = $group_members[$i]['user_id'];
  
! 		generate_user_info($group_members[$i], $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  		if ( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
--- 981,985 ----
  		$user_id = $group_members[$i]['user_id'];
  
! 		generate_user_info($group_members[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  		if ( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
***************
*** 1074,1078 ****
  				$user_id = $modgroup_pending_list[$i]['user_id'];
  
! 				generate_user_info($modgroup_pending_list[$i], $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  				$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
--- 1074,1078 ----
  				$user_id = $modgroup_pending_list[$i]['user_id'];
  
! 				generate_user_info($modgroup_pending_list[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
  
  				$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];