[Phpbb-checkins] CVS: phpBB2 profile.php,1.152,1.153

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

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

Modified Files:
	profile.php 
Log Message:
Various issues, removed META upon successfull registration, rank changes, etc.

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -r1.152 -r1.153
*** profile.php	2001/12/03 17:37:52	1.152
--- profile.php	2001/12/05 17:54:54	1.153
***************
*** 272,276 ****
  		}
  
! 		if( $profiledata['user_avatar_type'] )
  		{
  			switch( $profiledata['user_avatar_type'] )
--- 272,276 ----
  		}
  
! 		if( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
  		{
  			switch( $profiledata['user_avatar_type'] )
***************
*** 299,303 ****
  			for($j = 0; $j < count($ranksrow); $j++)
  			{
! 				if( $profiledata['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'])
  				{
  					$poster_rank = $ranksrow[$j]['rank_title'];
--- 299,303 ----
  			for($j = 0; $j < count($ranksrow); $j++)
  			{
! 				if( $profiledata['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'] )
  				{
  					$poster_rank = $ranksrow[$j]['rank_title'];
***************
*** 310,314 ****
  			for($j = 0; $j < count($ranksrow); $j++)
  			{
! 				if( $profiledata['user_posts'] > $ranksrow[$j]['rank_min'] && $profiledata['user_posts'] < $ranksrow[$j]['rank_max'] && !$ranksrow[$j]['rank_special'])
  				{
  					$poster_rank = $ranksrow[$j]['rank_title'];
--- 310,314 ----
  			for($j = 0; $j < count($ranksrow); $j++)
  			{
! 				if( $profiledata['user_posts'] > $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'] )
  				{
  					$poster_rank = $ranksrow[$j]['rank_title'];
***************
*** 694,699 ****
  
  			$avatar_sql = "";
! 			if( $board_config['allow_avatar_upload'] && !$error )
  			{
  				//
  				// Only allow one type of upload, either a
--- 694,710 ----
  
  			$avatar_sql = "";
! 			if( isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile" )
  			{
+ 				if( $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "" )
+ 				{
+ 					if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
+ 					{
+ 						@unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
+ 					}
+ 				}
+ 				$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
+ 			}
+ 			else if( $board_config['allow_avatar_upload'] && !$error )
+ 			{
  				//
  				// Only allow one type of upload, either a
***************
*** 710,725 ****
  				}
  
! 				if( isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile" )
! 				{
! 					if( $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "" )
! 					{
! 						if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
! 						{
! 							@unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
! 						}
! 					}
! 					$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
! 				}
! 				else if( $user_avatar_loc != "" && $board_config['allow_avatar_upload'] )
  				{
  					if( file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
--- 721,725 ----
  				}
  
! 				if( $user_avatar_loc != "" && $board_config['allow_avatar_upload'] )
  				{
  					if( file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
***************
*** 804,808 ****
  					// exist assume port 80 (http)
  					//
! 					preg_match("/^(http:\/\/)?([a-z0-9\.]+)\:?([0-9]*)\/(.*)$/", $user_avatar_url, $url_ary);
  
  					if( !empty($url_ary[4]) )
--- 804,808 ----
  					// exist assume port 80 (http)
  					//
! 					preg_match("/^(http:\/\/)?([\w\-\.]+)\:?([0-9]*)\/(.*)$/", $user_avatar_url, $url_ary);
  
  					if( !empty($url_ary[4]) )
***************
*** 933,938 ****
  				}
  			}
! 
! 			if( $board_config['allow_avatar_remote'] && !$error )
  			{
  				if($user_avatar_remoteurl != "" && $avatar_sql == "")
--- 933,937 ----
  				}
  			}
! 			else if( $board_config['allow_avatar_remote'] && !$error )
  			{
  				if($user_avatar_remoteurl != "" && $avatar_sql == "")
***************
*** 954,959 ****
  				}
  			}
! 
! 			if( $board_config['allow_avatar_local'] && !$error )
  			{
  				if( $user_avatar_local != "" && $avatar_sql == "" )
--- 953,957 ----
  				}
  			}
! 			else if( $board_config['allow_avatar_local'] && !$error )
  			{
  				if( $user_avatar_local != "" && $avatar_sql == "" )
***************
*** 1057,1061 ****
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  						);
  
--- 1055,1059 ----
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  						);
  
***************
*** 1196,1203 ****
  								}
  
- 								$template->assign_vars(array(
- 									"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
- 								);
- 
  								$message = $message . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
  
--- 1194,1197 ----
***************
*** 1634,1638 ****
  			// it works well :)
  			//
! 			if( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] )
  			{
  				$template->assign_block_vars("avatarblock", array() );
--- 1628,1632 ----
  			// it works well :)
  			//
! 			if( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
  			{
  				$template->assign_block_vars("avatarblock", array() );
***************
*** 1650,1654 ****
  					$template->assign_block_vars("avatarblock.avatargallery", array() );
  				}
- 
  			}
  		}
--- 1644,1647 ----
***************
*** 1733,1737 ****
  
  				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  				);
  
--- 1726,1730 ----
  
  				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  				);
  
***************
*** 1832,1836 ****
  
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  							);
  
--- 1825,1829 ----
  
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  							);
  
***************
*** 1840,1844 ****
  						{
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  							);
  
--- 1833,1837 ----
  						{
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  							);