[Phpbb-checkins] CVS: phpBB2 profile.php,1.114,1.115 viewtopic.php,1.117,1.118

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

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

Modified Files:
	profile.php viewtopic.php 
Log Message:
Preliminary avatar gallery support

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** profile.php	2001/10/11 11:05:06	1.114
--- profile.php	2001/10/11 22:01:10	1.115
***************
*** 272,282 ****
  		}
  
! 		if( $profiledata['user_avatar'] != "" && $profiledata['user_id'] != ANONYMOUS )
  		{
! 			$avatar_img = (eregi("http", $profiledata['user_avatar']) && $board_config['allow_avatar_remote']) ? "<img src=\"" . $profiledata['user_avatar'] . "\">" : "<img src=\"" . $board_config['avatar_path'] . "/" . $profiledata['user_avatar'] . "\" alt=\"\" />";;
  		}
  		else
  		{
! 			$avatar_img = "&nbsp;";
  		}
[...1154 lines suppressed...]
+ 			if( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] )
+ 			{
+ 				$template->assign_block_vars("avatarblock", array() );
+ 
+ 				if($board_config['allow_avatar_upload'])
+ 				{
+ 					$template->assign_block_vars("avatarblock.avatarupload", array() );
+ 				}
+ 				if($board_config['allow_avatar_remote'])
+ 				{
+ 					$template->assign_block_vars("avatarblock.avatarremote", array() );
+ 				}
+ 				if($board_config['allow_avatar_local'])
+ 				{
+ 					$template->assign_block_vars("avatarblock.avatargallery", array() );
+ 				}
+ 
+ 			}
  		}
  

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -r1.117 -r1.118
*** viewtopic.php	2001/10/10 23:18:13	1.117
--- viewtopic.php	2001/10/11 22:01:10	1.118
***************
*** 382,386 ****
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, p.*,  pt.post_text, pt.post_subject
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
--- 382,386 ----
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, p.*,  pt.post_text, pt.post_subject
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
***************
*** 666,672 ****
  	$poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
  
! 	if($postrow[$i]['user_avatar'] != "" && $poster_id != ANONYMOUS)
  	{
! 		$poster_avatar = (eregi("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "<br /><img src=\"" . $postrow[$i]['user_avatar'] . "\"><br />" : "<br /><img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" /><br />";
  	}
  	else
--- 666,683 ----
  	$poster_joined = ($postrow[$i]['user_id'] != ANONYMOUS) ? $lang['Joined'] . ": " . create_date($board_config['default_dateformat'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : "";
  
! 	if( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS )
  	{
! 		switch( $postrow[$i]['user_avatar_type'] )
! 		{
! 			case USER_AVATAR_UPLOAD:
! 				$poster_avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
! 				break;
! 			case USER_AVATAR_REMOTE:
! 				$poster_avatar = "<img src=\"" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
! 				break;
! 			case USER_AVATAR_GALLERY:
! 				$poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $postrow[$i]['user_avatar'] . "\" alt=\"\" />";
! 				break;
! 		}
  	}
  	else