46,59c46,47
< 		// get the equivelent content from the database
< 		$query = "select `fname`, `mname`, `lname`, `suffix` from `users` where `id`='$memid' and `deleted`=0";
< 		$res = mysql_query($query);
< 		$row = mysql_fetch_assoc($res);
< 		$cacert_name_parts = array( $row['fname'], $row['mname'], $row['lname'], $row['suffix'] );
< 		$cacert_name = implode( " ", $cacert_name_parts );
< 		// replace punctuation
< 		$cacert_name = strtr( $cacert_name, ",.", "  " );
< 		// replace all double spaces - in case ", " was changed to "  ", for example
< 		while(strstr($cacert_name, "  "))
< 			$cacert_name = str_replace("  ", " ", $cacert_name);
< 		// now do the trim - this was moved in case of a period in the suffix, for example
< 		$cacert_name = trim( $cacert_name );
< 		$cacert_bits = explode( " ", $cacert_name );
---
> 		$firstname = $bits["0"];
> 		$lastname = $bits[count($bits) - 1];
61c49,50
< 		if (count($bits) != count($cacert_bits))
---
> 		$query = "select * from `users` where `fname`='$firstname' and `lname`='$lastname' and `id`='$memid'";
> 		if(mysql_num_rows(mysql_query($query)) <= 0)
64,74d52
< 		} else {
< 			for( $i = 0 ; $continue == 1 && $i < count($bits)  ; $i++ )
< 			{
< 				if ( $bits[$i] != $cacert_bits[$i] )
< 				{
< 					$continue = 0;
< 				}
< 			}
< 		}
< 		if ( $continue != 1 )
< 		{