[Phpbb-checkins] CVS: phpBB2 profile.php,1.141,1.142

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

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

Modified Files:
	profile.php 
Log Message:
stripslash email messages + remove  's from usernames, email addresses

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -r1.141 -r1.142
*** profile.php	2001/11/25 23:31:04	1.141
--- profile.php	2001/11/26 01:27:00	1.142
***************
*** 471,478 ****
  			{
  				$user_id = intval($HTTP_POST_VARS['user_id']);
! 				$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
  			}
! 			$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
! 			$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
  
  			$password_current = (!empty($HTTP_POST_VARS['cur_password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['cur_password']))) : "";
--- 471,479 ----
  			{
  				$user_id = intval($HTTP_POST_VARS['user_id']);
! 				$current_email = trim(strip_tags(htmlspecialchars(str_replace(" ", " ",$HTTP_POST_VARS['current_email']))));
  			}
! 
! 			$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags(str_replace(" ", " ", $HTTP_POST_VARS['username']))) : "";
! 			$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars(str_replace(" ", " ",$HTTP_POST_VARS['email'])))) : "";
  
  			$password_current = (!empty($HTTP_POST_VARS['cur_password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['cur_password']))) : "";
***************
*** 775,780 ****
  								else
  								{
  									$error = true;
! 									$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
  								}
  							}
--- 776,783 ----
  								else
  								{
+ 									$l_avatar_size = sprintf($lang['Avatar_imagesize'], $board_config['avatar_max_width'], $board_config['avatar_max_height']);
+ 
  									$error = true;
! 									$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $l_avatar_size : $l_avatar_size;
  								}
  							}
***************
*** 782,788 ****
  						else
  						{
  							$error = true;
! 							$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! 							$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
  						}
  					}
--- 785,792 ----
  						else
  						{
+ 							$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
+ 
  							$error = true;
! 							$error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $l_avatar_size : $l_avatar_size;
  						}
  					}
***************
*** 1113,1117 ****
  								$emailer->use_template($email_template);
  								$emailer->email_address($email);
! 								$emailer->set_subject($lang['Welcome_subject']);
  								$emailer->extra_headers($email_headers);
  
--- 1117,1121 ----
  								$emailer->use_template($email_template);
  								$emailer->email_address($email);
! 								$emailer->set_subject(sprintf($lang['Welcome_subject'], $board_config['sitename']));
  								$emailer->extra_headers($email_headers);
  
***************
*** 1119,1123 ****
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => $lang['Welcome_subject'],
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
--- 1123,1127 ----
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => sprintf($lang['Welcome_subject'], $board_config['sitename']),
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
***************
*** 1141,1145 ****
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => $lang['Welcome_subject'],
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
--- 1145,1149 ----
  								{
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => sprintf($lang['Welcome_subject'], $board_config['sitename']),
  										"USERNAME" => $username,
  										"PASSWORD" => $password_confirm,
***************
*** 1161,1165 ****
  
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => $lang['Welcome_subject'],
  										"USERNAME" => $username,
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
--- 1165,1169 ----
  
  									$emailer->assign_vars(array(
! 										"WELCOME_MSG" => sprintf($lang['Welcome_subject'], $board_config['sitename']),
  										"USERNAME" => $username,
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
***************
*** 1862,1866 ****
  					if( !empty($HTTP_POST_VARS['subject']) )
  					{
! 						$subject = trim(strip_tags($HTTP_POST_VARS['subject']));
  					}
  					else
--- 1866,1870 ----
  					if( !empty($HTTP_POST_VARS['subject']) )
  					{
! 						$subject = trim(strip_tags(stripslashes($HTTP_POST_VARS['subject'])));
  					}
  					else
***************
*** 1872,1876 ****
  					if( !empty($HTTP_POST_VARS['message']) )
  					{
! 						$message = trim(strip_tags($HTTP_POST_VARS['message']));
  					}
  					else
--- 1876,1880 ----
  					if( !empty($HTTP_POST_VARS['message']) )
  					{
! 						$message = trim(strip_tags(stripslashes($HTTP_POST_VARS['message'])));
  					}
  					else