[Phpbb-checkins] CVS: phpBB2/includes usercp_register.php,1.18,1.19 usercp_sendpasswd.php,1.5,1.6

[Jonathan H. <the...@us...>]

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

Modified Files:
	usercp_register.php usercp_sendpasswd.php 
Log Message:
Shorten the activation, key to allow for less than 77 characters..,yet still keep it as long as possible.


Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_register.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** usercp_register.php	31 Mar 2002 00:06:34 -0000	1.18
--- usercp_register.php	1 Apr 2002 19:19:47 -0000	1.19
***************
*** 396,399 ****
--- 396,402 ----
  				$user_active = 0;
  				$user_actkey = gen_rand_string(true);
+ 				$key_len = 54 - (strlen($server_url));
+ 				$key_len = ($key_len > 6) ? $key_len : 6;
+ 				$user_actkey = substr($user_actkey, 0, $key_len);
  
  				if ( $userdata['session_logged_in'] )
***************
*** 490,493 ****
--- 493,499 ----
  			{
  				$user_actkey = gen_rand_string(true);
+ 				$key_len = 54 - (strlen($server_url));
+ 				$key_len = ( $key_len > 6 ) ? $key_len : 6;
+ 				$user_actkey = substr($user_actkey, 0, $key_len);
  				$sql .= "0, '" . str_replace("\'", "''", $user_actkey) . "')";
  			}
***************
*** 923,925 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 929,931 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

Index: usercp_sendpasswd.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/usercp_sendpasswd.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** usercp_sendpasswd.php	31 Mar 2002 00:06:34 -0000	1.5
--- usercp_sendpasswd.php	1 Apr 2002 19:19:49 -0000	1.6
***************
*** 49,52 ****
--- 49,55 ----
  
  			$user_actkey = gen_rand_string(true);
+ 			$key_len = 54 - strlen($server_url);
+ 			$key_len = ( $str_len > 6 ) ? $key_len : 6;
+ 			$user_actkey = substr($user_actkey, 0, $key_len);
  			$user_password = gen_rand_string(false);
  			
***************
*** 129,131 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 132,134 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>