[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.51,1.52

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

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

Modified Files:
	admin_users.php 
Log Message:
Oops typo... Plus admin_users needed functions_validate as well, which did away with the need to have the extra fields validation function here in admin_users...


Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** admin_users.php	18 Mar 2002 19:09:42 -0000	1.51
--- admin_users.php	18 Mar 2002 19:16:44 -0000	1.52
***************
*** 39,43 ****
  include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
  include($phpbb_root_dir . 'includes/post.'.$phpEx);
! include($phpbb_root_dir . 'includes/funtions_selects.'.$phpEx);
  //
  //
--- 39,44 ----
  include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
  include($phpbb_root_dir . 'includes/post.'.$phpEx);
! include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
! include($phpbb_root_dir . 'includes/functions_validate.'.$phpEx);
  //
  //
***************
*** 51,129 ****
  	$mode = "";
  }
- 
- // ---------
- // Functions
- //
- function validate_optional_fields(&$icq, &$aim, &$msnm, &$yim, &$website, &$location, &$occupation, &$interests, &$sig)
- {
- 	// ICQ number has to be only numbers.
- 	if (!preg_match("/^[0-9]+$/", $icq))
- 	{
- 		$icq = "";
- 	}
- 	
- 	// AIM address has to have length >= 2.
- 	if (strlen($aim) < 2)
- 	{
- 		$aim = "";
- 	}
- 	
- 	// MSNM address has to have length >= 2.
- 	if (strlen($msnm) < 2)
- 	{
- 		$msnm = "";
- 	}
- 	
- 	// YIM address has to have length >= 2.
- 	if (strlen($yim) < 2)
- 	{
- 		$yim = "";
- 	}
- 
- 	// website has to start with http://, followed by something with length at least 3 that
- 	// contains at least one dot.
- 	if($website != "")
- 	{
- 		if( !preg_match("#^http:\/\/#i", $website) )
- 		{
- 			$website = "http://" . $website;
- 		}
- 
- 		if ( !preg_match("#^http\\:\\/\\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+#i", $website) )
- 		{
- 			$website = "";
- 		}
- 	}
- 	
- 	// location has to have length >= 2.
- 	if (strlen($location) < 2)
- 	{
- 		$location = "";
- 	}
- 	
- 	// occupation has to have length >= 2.
- 	if (strlen($occupation) < 2)
- 	{
- 		$occupation = "";
- 	}
- 	
- 	// interests has to have length >= 2.
- 	if (strlen($interests) < 2)
- 	{
- 		$interests = "";
- 	}
- 	
- 	// sig has to have length >= 2.
- 	if (strlen($sig) < 2)
- 	{
- 		$sig = "";
- 	}
- 	
- 	return;
- }
- //
- // End Functions
- //
- 
  
  //
--- 52,55 ----