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

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

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

Modified Files:
	profile.php 
Log Message:
Moved agreement text to lang_main

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -r1.153 -r1.154
*** profile.php	2001/12/05 17:54:54	1.153
--- profile.php	2001/12/15 16:51:03	1.154
***************
*** 457,460 ****
--- 457,465 ----
  				$template->assign_vars(array(
  					"COPPA" => $coppa,
+ 					"REGISTRATION" => $lang['Registration'], 
+ 					"AGREEMENT" => $lang['Reg_agreement'], 
+ 					"AGREE_OVER_13" => $lang['Agree_over_13'], 
+ 					"AGREE_UNDER_13" => $lang['Agree_under_13'], 
+ 					"DO_NOT_AGREE" => $lang['Agree_not'], 
  
  					"U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&agreed=true"),
***************
*** 524,527 ****
--- 529,554 ----
  			$user_avatar = ( empty($user_avatar_loc) && $mode == "editprofile" ) ? $userdata['user_avatar'] : "";
  			$user_avatar_type = ( empty($user_avatar_loc) && $mode == "editprofile" ) ? $userdata['user_avatar_type'] : "";
+ 
+ 			if( isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar']) )
+ 			{
+ 				$username = stripslashes($username);
+ 				$email = stripslashes($email);
+ 				$password = "";
+ 				$password_confirm = "";
+ 
+ 				$icq = stripslashes($icq);
+ 				$aim = stripslashes($aim);
+ 				$msn = stripslashes($msn);
+ 				$yim = stripslashes($yim);
+ 
+ 				$website = stripslashes($website);
+ 				$location = stripslashes($location);
+ 				$occupation = stripslashes($occupation);
+ 				$interests = stripslashes($interests);
+ 				$signature = stripslashes($signature);
+ 
+ 				$user_lang = stripslashes($user_lang);
+ 				$user_dateformat = stripslashes($user_dateformat);
+ 			}
  		}
  
***************
*** 1384,1398 ****
  				$s_hidden_vars = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="user_id" value="' . $user_id . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="username" value="' . addslashes($username) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="icq" value="' . addslashes($icq) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="aim" value="' . addslashes($aim) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="msn" value="' . addslashes($msn) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="yim" value="' . addslashes($yim) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="website" value="' . addslashes($website) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="location" value="' . addslashes($location) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="occupation" value="' . addslashes($occupation) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="interests" value="' . addslashes($interests) . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="signature" value="' . addslashes($signature) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="viewemail" value="' . $viewemail . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="notifypm" value="' . $notifypm . '" />';
--- 1411,1425 ----
  				$s_hidden_vars = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="user_id" value="' . $user_id . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="username" value="' . $username . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="email" value="' . $email . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="icq" value="' . $icq . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="aim" value="' . $aim . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="msn" value="' . $msn . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="yim" value="' . $yim . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="website" value="' . $website . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="location" value="' . $location . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="occupation" value="' . $occupation . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="interests" value="' . $interests . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="signature" value="' . $signature . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="viewemail" value="' . $viewemail . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="notifypm" value="' . $notifypm . '" />';
***************
*** 1407,1411 ****
  				$s_hidden_vars .= '<input type="hidden" name="language" value="' . $user_lang . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="timezone" value="' . $user_timezone . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="dateformat" value="' . addslashes($user_dateformat) . '" />';
  
  				$template->assign_vars(array(
--- 1434,1438 ----
  				$s_hidden_vars .= '<input type="hidden" name="language" value="' . $user_lang . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="timezone" value="' . $user_timezone . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="dateformat" value="' . $user_dateformat . '" />';
  
  				$template->assign_vars(array(