--- trunk/admin/include/validate_mysql.php	2004/03/04 22:43:50	42
+++ trunk/admin/include/validate_mysql.php	2004/03/18 20:33:37	72
@@ -1,8 +1,8 @@
 <?php
 /**********************************************************
 Function Library: validate_mysql.php
-Original Author: Paul Bramscher <brams006@tc.umn.edu>
-Last Modified: 09.30.2003 by Paul Bramscher
+Original Author: Paul Bramscher <brams006@umn.edu>
+Last Modified: 03.11.2004 by Paul Bramscher
 ***********************************************************
 Comments:
 This library handles initial login of the user to LibData.
@@ -10,17 +10,15 @@
 it's been pulled out of other libraries.
 ***********************************************************
 Table of Contents:
-
 validateUser
-
 **********************************************************/
 
 
 
 /**********************************************************
-Function: validateUser($con, $pass, $user)
+Function: validateUser($pass, $user)
 Author: Paul Bramscher
-Last Modified: 09.30.2003
+Last Modified: 03.01.2004
 ***********************************************************
 Incoming:
 $password			Password, 6 char. minimum
@@ -40,7 +38,7 @@
 can't be used.
 **********************************************************/
 
-function validateUser($con, $pass, $user){
+function validateUser($pass, $user){
 
 	// Assume the user is not valid 
 	$validated = 0;
@@ -61,8 +59,9 @@
 			. "')";
 
 		// Fetch the results
-		$rs = xx_query($sql, $con);
-		$row = xx_fetch_array ($rs);
+		$rs = xx_tryquery($sql);
+		
+		$row = xx_fetch_array ($rs, xx_ASSOC);
 		$last_login = Trim($row["last_login"]);
 		$last_ip = Trim($row["last_ip"]);
 		$access_id = (int) $row["access_id"];
@@ -86,18 +85,11 @@
 				. "' WHERE staff.staff_account = '"
 				. $user
 				. "'";
-			if (!xx_query ($sql, $con)){
-				sql_err($sql);
-				xx_query ("UNLOCK TABLES", $con);
-				bailout();
-			}
-			else {
-				xx_query ("UNLOCK TABLES", $con);
-			}
+			xx_tryquery($sql);
 		}	
 
 	} // password > 5 characters in length
 
 	return $validated;
 }
-?>
+?>
\ No newline at end of file