[Phpbb-checkins] CVS: phpBB2 profile.php,1.170,1.171

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

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

Modified Files:
	profile.php 
Log Message:
This version has an added advantage ... it works ... I think.

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -r1.170 -r1.171
*** profile.php	2002/01/24 03:05:32	1.170
--- profile.php	2002/01/24 03:19:36	1.171
***************
*** 1289,1294 ****
  			$allowviewonline = $userdata['user_allow_viewonline'];
  
! 			$user_avatar = $userdata['user_avatar'];
! 			$user_avatar_type = $userdata['user_avatar_type'];
  			$user_style = $userdata['user_style'];
  			$user_lang = $userdata['user_lang'];
--- 1289,1295 ----
  			$allowviewonline = $userdata['user_allow_viewonline'];
  
! 			$user_avatar = ( $userdata['user_allowavatar'] ) ? $userdata['user_avatar'] : "";
! 			$user_avatar_type = ( $userdata['user_allowavatar'] ) ? $userdata['user_avatar_type'] : USER_AVATAR_NONE;
! 
  			$user_style = $userdata['user_style'];
  			$user_lang = $userdata['user_lang'];
***************
*** 1467,1470 ****
--- 1468,1472 ----
  			$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
  
+ 			$avatar_img = "";
  			if( $user_avatar_type )
  			{
***************
*** 1472,1488 ****
  				{
  					case USER_AVATAR_UPLOAD:
! 						$avatar_img = "<img src=\"" . $board_config['avatar_path'] . "/" . $user_avatar . "\" alt=\"\" />";
  						break;
  					case USER_AVATAR_REMOTE:
! 						$avatar_img = "<img src=\"$user_avatar\" alt=\"\" />";
  						break;
  					case USER_AVATAR_GALLERY:
! 						$avatar_img = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $user_avatar . "\" alt=\"\" />";
  						break;
  				}
- 			}
- 			else
- 			{
- 				$avatar_img = "";
  			}
  
--- 1474,1486 ----
  				{
  					case USER_AVATAR_UPLOAD:
! 						$avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $board_config['avatar_path'] . "/" . $user_avatar . '" alt="" />' : '';
  						break;
  					case USER_AVATAR_REMOTE:
! 						$avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="' . $user_avatar . '" alt="" />' : '';
  						break;
  					case USER_AVATAR_GALLERY:
! 						$avatar_img = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $board_config['avatar_gallery_path'] . "/" . $user_avatar . '" alt="" />' : '';
  						break;
  				}
  			}