[mxbb-commits] mx_import_tools/admin admin_import_members.php,1.1,1.2

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_import_tools/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11758/modules/mx_import_tools/admin

Modified Files:
	admin_import_members.php 
Log Message:
updates

Index: admin_import_members.php
===================================================================
RCS file: /cvsroot/mxbb/mx_import_tools/admin/admin_import_members.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_import_members.php	9 Jan 2005 21:39:39 -0000	1.1
--- admin_import_members.php	22 Sep 2005 10:26:27 -0000	1.2
***************
*** 95,99 ****
  			$email = $member_data[1];
  			$user_password = $member_data[2];
! */
  
  			$username = $member_data[0];
--- 95,99 ----
  			$email = $member_data[1];
  			$user_password = $member_data[2];
! 			*/
  
  			$username = $member_data[0];
***************
*** 110,113 ****
--- 110,114 ----
  			{ 
  				// Add to usergroup
+ 				// Get group id
  				$user->add_to_group( $group_id );
  			}
***************
*** 115,122 ****
  			$user_check = $user->validate_user();
  
! 			if ( $user_check )
  			{
  				$user->insert_user();
  			}
  		}
  	} 
--- 116,145 ----
  			$user_check = $user->validate_user();
  
! 			if ( $user_check['is_ok'] )
  			{
+ 				//
+ 				// Inserts new user (and adds to a group if $add_to_group == 'yes' )
+ 				//
+ 				echo('<br>username inserted: ' . $this->username );
  				$user->insert_user();
  			}
+ 			else if ( !$user_check['username_ok'])
+ 			{
+ 				//
+ 				// If user already exists, update the user info
+ 				//
+ 				echo('<br>username updated: ' . $this->username );
+ 				$user->update_user();;
+ 			}
+ 
+ 			if ( !$user_check['username_ok'] && $add_to_group == 'yes' )
+ 			{
+ 				//
+ 				// If user already exists, add/move the user to new group
+ 				//
+ 				echo('<br>username moved: ' . $this->username );
+ 				$user->move_user();;
+ 			}
+ 
  		}
  	}