--- trunk/admin/include/forms.php	2004/03/04 22:43:17	41
+++ trunk/admin/include/forms.php	2004/03/04 22:43:50	42
@@ -113,8 +113,8 @@
 		rf.feature_id = f.feature_id ORDER BY feature";
 
 	// Fetch the current selections
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$feature = $row["feature"];
 		$feature_id = $row["feature_id"];
 		printf("<option value = \"%s\">%s</option>", $feature_id, $feature);
@@ -194,8 +194,8 @@
 		rl.location_id = l.location_id ORDER BY location";
 
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$location = $row["location"];
 		$location_id = $row["location_id"];
 		printf("<option value = \"%s\">%s</option>", $location_id, $location);
@@ -275,8 +275,8 @@
 		rm.mastersubject_id = m.mastersubject_id ORDER BY mastersubject";
 
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$mastersubject = $row["mastersubject"];
 		$mastersubject_id = $row["mastersubject_id"];
 		printf("<option value = \"%s\">%s</option>", $mastersubject_id, $mastersubject);
@@ -358,8 +358,8 @@
 		sl.location_id = l.location_id ORDER BY location";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$location = $row["location"];
 		$location_id = $row["location_id"];
 		printf("<option value = \"%s\">%s</option>", $location_id, $location);
@@ -441,8 +441,8 @@
 		st.servicetype_id = t.servicetype_id ORDER BY servicetype";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$servicetype = $row["servicetype"];
 		$servicetype_id = $row["servicetype_id"];
 		printf("<option value = \"%s\">%s</option>", $servicetype_id, $servicetype);
@@ -525,8 +525,8 @@
 		sc.coursesub_id = c.coursesub_id ORDER BY coursesub_descr";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$coursesub = $row["coursesub"];
 		$coursesub_id = $row["coursesub_id"];
 		$coursesub_descr = $row["coursesub_descr"];
@@ -614,8 +614,8 @@
 		sl.location_id = l.location_id ORDER BY location";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$location = $row["location"];
 		$location_id = $row["location_id"];
 		printf("<option value = \"%s\">%s</option>", $location_id, $location);
@@ -697,8 +697,8 @@
 		sm.mastersubject_id = m.mastersubject_id ORDER BY mastersubject";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$mastersubject = $row["mastersubject"];
 		$mastersubject_id = $row["mastersubject_id"];
 		printf("<option value = \"%s\">%s</option>", $mastersubject_id, $mastersubject);
@@ -778,8 +778,8 @@
 		ORDER BY s.subject";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$othersub = $row["subject"];
 		$othersub_id = $row["othersub_id"];
 		
@@ -860,8 +860,8 @@
 		ORDER BY p.page_title";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$page_title = $row["page_title"];
 		$page_id = $row["page_id"];
 		
@@ -947,8 +947,8 @@
 		st.staff_id = t.staff_id ORDER BY last_name, first_name";
 
  	// Fetch the values
- 	$rs = mysql_query($sql, $con);
- 	while ($row = mysql_fetch_array ($rs)) {
+ 	$rs = xx_query($sql, $con);
+ 	while ($row = xx_fetch_array ($rs)) {
  		$first_name = $row["first_name"];
  		$last_name = $row["last_name"];
  		$staff_id = $row["staff_id"];
@@ -1030,8 +1030,8 @@
 		// If the user is editing an existing record, fetch previous values
 		if ($coursesub_id > 0 && $exists == 1) {
 			$sql = "SELECT * FROM coursesub WHERE coursesub_id = " . $coursesub_id;
-		        $rs = mysql_query($sql, $con);
-       		 	$row = mysql_fetch_array ($rs);
+		        $rs = xx_query($sql, $con);
+       		 	$row = xx_fetch_array ($rs);
 
 			// Fetch existing values
 			$coursesub_id = $row["coursesub_id"];
@@ -1159,8 +1159,8 @@
         		. " = "
         		. $key_id;
         
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array($rs);
 		$oldValue = Trim($row[$display_field]);
 
 		// Table definition
@@ -1229,8 +1229,8 @@
 			WHERE
 			faculty_id = " . $faculty_id;
 
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array($rs);
 		
 		// Fetch results
 		$faculty_firstname = Trim($row["faculty_firstname"]);
@@ -1335,8 +1335,8 @@
 	
 		// Fetch existing values	
 		$sql = "SELECT * FROM feature WHERE feature_id = " . $key_id;
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array ($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array ($rs);
 		$feature_id = $row["feature_id"];
 		$feature = $row["feature"];
 		$image_path = $row["image_path"];
@@ -1449,8 +1449,8 @@
 
 		// Fetch existing values	
 		$sql = "SELECT * from infotype where infotype_id = " . $key_id;
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array ($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array ($rs);
 		$infotype_id = $row["infotype_id"];
 		$infotype = $row["infotype"];
 		$masterinfotype_id = $row["masterinfotype_id"];
@@ -1577,8 +1577,8 @@
 
 		// Fetch existing values
 		$sql = "SELECT * from location where location_id = " . $key_id;
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array ($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array ($rs);
 		$location_id = $row["location_id"];
 		$location = $row["location"];
 		$location_descr = $row["location_descr"];
@@ -1853,8 +1853,8 @@
 		if ($key_id > 0 && $exists == 1) {
 		
 			$sql = "SELECT * from resource where resource_id = " . $key_id;
-		        $rs = mysql_query($sql, $con);
-       		 	$row = mysql_fetch_array ($rs);
+		        $rs = xx_query($sql, $con);
+       		 	$row = xx_fetch_array ($rs);
 
 			// Fetch existing values
 			$resource_id = $row["resource_id"];
@@ -2171,8 +2171,8 @@
 
 		// Fetch existing values
 		$sql = "SELECT * from service where service_id = " . $key_id;
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array ($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array ($rs);
 		$service_id = $row["service_id"];
 		$service = $row["service"];
 		$serviceURL = $row["serviceURL"];
@@ -2367,8 +2367,8 @@
 	
 		// Fetch existing values	
 		$sql = "SELECT * from style where style_id = " . $key_id;
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array ($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array ($rs);
 		$style_id = $row["style_id"];
 		$style_title = $row["style_title"];
 		$header_file = $row["header_file"];
@@ -2486,8 +2486,8 @@
 	
 		// If the user is editing an existing record, fetch previous values
 		$sql = "SELECT * from subject where subject_id = " . $key_id;
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array ($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array ($rs);
 
 		// Fetch existing values
 		$subject_id = $row["subject_id"];
@@ -2650,8 +2650,8 @@
 		ORDER BY last_name, first_name";
 
  	// Fetch the values
- 	$rs = mysql_query($sql, $con);
- 	while ($row = mysql_fetch_array ($rs)) {
+ 	$rs = xx_query($sql, $con);
+ 	while ($row = xx_fetch_array ($rs)) {
  		$first_name = $row["first_name"];
  		$last_name = $row["last_name"];
  		$staff_id = $row["staff_id"];
@@ -2734,8 +2734,8 @@
 		ORDER BY l.libunit";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$libunit = $row["libunit"];
 		$libunit_id = $row["libunit_id"];
 		printf("<option value = \"%s\">%s</option>", $libunit_id, $libunit);
@@ -2817,8 +2817,8 @@
 		ORDER BY s.subject";
 	
 	// Fetch the values
-	$rs = mysql_query($sql, $con);
-	while ($row = mysql_fetch_array ($rs)) {
+	$rs = xx_query($sql, $con);
+	while ($row = xx_fetch_array ($rs)) {
 		$subject = $row["subject"];
 		$subject_id = $row["subject_id"];
 		printf("<option value = \"%s\">%s</option>\n", $subject_id, $subject);
@@ -2863,8 +2863,8 @@
 			WHERE
 			libunit_id = " . $libunit_id;
 
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array($rs);
 		
 		// Fetch values
 		$libunit = Trim($row["libunit"]);
@@ -3014,8 +3014,8 @@
 		FROM staff s
 		WHERE s.password IS NOT NULL and staff_id = " . $staff_id;
 
-	$rs = mysql_query($sql, $con);
-	$row = mysql_fetch_array($rs);
+	$rs = xx_query($sql, $con);
+	$row = xx_fetch_array($rs);
 
 	// Fetch values
 	$pass_set = Trim($row["pass_set"]);
@@ -3095,8 +3095,8 @@
 			s.stafftitle_id = t.stafftitle_id AND
 			staff_id=" . $staff_id;
 
-		$rs = mysql_query($sql, $con);
-		$row = mysql_fetch_array($rs);
+		$rs = xx_query($sql, $con);
+		$row = xx_fetch_array($rs);
 		
 		// Fetch results
 		$first_name = Trim($row["first_name"]);