--- trunk/public_controls.php	2003/12/15 20:58:38	6
+++ trunk/public_controls.php	2004/03/04 22:43:50	42
@@ -50,8 +50,8 @@
 		WHERE
 		page_id = " . $page_id;
 	
-	$rs = mysql_query($sql, $con);
-	$row = mysql_fetch_array ($rs);
+	$rs = xx_query($sql, $con);
+	$row = xx_fetch_array ($rs);
 
 	$course_id = $row["course_id"];	
 	$staff_id_created = $row["staff_id_created"];
@@ -150,10 +150,10 @@
 		WHERE
 		course_id = " . $course_id . " ORDER BY personnel_id";
 	
-	$rs = mysql_query($sql, $con);
+	$rs = xx_query($sql, $con);
 	
 	// See how many in this record set
-	$num_personnel = mysql_num_rows($rs);
+	$num_personnel = xx_num_rows($rs);
 
 	if ($num_personnel > 0) {
 
@@ -162,7 +162,7 @@
 		printf("<b>Personnel:</b><br>\n");
 
 
-		while ($row = mysql_fetch_array ($rs)) {
+		while ($row = xx_fetch_array ($rs)) {
 
 			// Initialize
 			$last_name = "";
@@ -242,8 +242,8 @@
         		. $subject_id
     			. " AND sp.page_id = p.page_id ORDER BY p.page_title";
         
-        $rs = mysql_query($sql, $con);
-        while ($row = mysql_fetch_array ($rs)) {
+        $rs = xx_query($sql, $con);
+        while ($row = xx_fetch_array ($rs)) {
 		$page_id = $row["page_id"];
 		$page_title = $row["page_title"];
 
@@ -279,8 +279,8 @@
         	. $subject_id
         	. " AND so.othersub_id = s.subject_id ORDER BY s.subject";
         	
-        $rs = mysql_query($sql, $con);
-        while ($row = mysql_fetch_array ($rs)) {
+        $rs = xx_query($sql, $con);
+        while ($row = xx_fetch_array ($rs)) {
 		$othersub_id = $row["othersub_id"];
 		$subject = $row["subject"];	
 
@@ -311,8 +311,8 @@
 	// Calculate number of elements
 	$sql = "SELECT COUNT(*) as num_elements FROM element WHERE indent_level < 1 AND page_id = "
 		. $page_id;
-	$rs = mysql_query($sql, $con);
-	$row = mysql_fetch_array ($rs);
+	$rs = xx_query($sql, $con);
+	$row = xx_fetch_array ($rs);
 	$num_elements = $row["num_elements"];
 
 	// Calculate midpoint element	
@@ -351,7 +351,7 @@
 			. $page_id
 			. " AND e.indent_level < 1 ORDER BY e.element_order";
 
-		$rs = mysql_query($sql, $con);
+		$rs = xx_query($sql, $con);
 
 		// Build a general ToC anchor
 		printf("<a name=\"toc\"></a>\n");
@@ -366,7 +366,7 @@
 		
 		$row_num = 0;
 		
-		while ($row = mysql_fetch_array ($rs)) {
+		while ($row = xx_fetch_array ($rs)) {
 		
 			// Check for the midpoint
 			if ($row_num  == $midpoint && $wrap_toc == 1) {
@@ -477,8 +477,8 @@
 */
         
         
-        $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"];
 		
                 printf("<option value = \"%s\"", $coursesub);
@@ -534,8 +534,8 @@
         	. " ORDER BY faculty_lastname, faculty_firstname";
 */
         
-        $rs = mysql_query($sql, $con);
-        while ($row = mysql_fetch_array ($rs)) {
+        $rs = xx_query($sql, $con);
+        while ($row = xx_fetch_array ($rs)) {
 		$faculty_id = $row["faculty_id"];
 		$faculty_lastname = $row["faculty_lastname"];
 		$faculty_firstname = $row["faculty_firstname"];
@@ -589,8 +589,8 @@
 		. $where
                 . " ORDER BY "
                 . $field_display;
-        $rs = mysql_query($sql, $con);
-        while ($row = mysql_fetch_array ($rs)) {
+        $rs = xx_query($sql, $con);
+        while ($row = xx_fetch_array ($rs)) {
                 $field_display_item = $row[$field_display];
 		if (strlen($field_display_item) > 40) $field_display_item = substr($field_display_item, 0, 39) . "...";                
                 $field_value_item = $row[$field_value];
@@ -641,8 +641,8 @@
         // Debugging
         //printf("sql was: %s<BR>", $sql);
         
-        $rs = mysql_query($sql, $con);
-        while ($row = mysql_fetch_array ($rs)) {
+        $rs = xx_query($sql, $con);
+        while ($row = xx_fetch_array ($rs)) {
                 $field_display_item = $row[$field_display];
                 $field_value_item = $row[$field_value];
 		if (strlen($field_display_item) > 50) $field_display_item = substr($field_display_item, 0, 49) . "...";
@@ -687,8 +687,8 @@
 		. "="
 		. $limit_id;
 
-        $rs = mysql_query($sql, $con);
-        $rowcount = mysql_num_rows($rs);
+        $rs = xx_query($sql, $con);
+        $rowcount = xx_num_rows($rs);
 	if ($rowcount >= 1){
 		$rowcount = 1;
 	}
@@ -723,8 +723,8 @@
 		. $resource_id
 		. " AND rl.location_id = l.location_id ORDER BY location";
 
-        $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"];
 		if ($first == 1) {
 			$first = 0;
@@ -769,9 +769,9 @@
 		. "='"
 		. $key_value
 		. "'";
-        $rs = mysql_query($sql, $con);
-        $row = mysql_fetch_array ($rs);
-        if (mysql_num_rows($rs) == 1) $result = $row[$desc_field];
+        $rs = xx_query($sql, $con);
+        $row = xx_fetch_array ($rs);
+        if (xx_num_rows($rs) == 1) $result = $row[$desc_field];
 	else $result = "";
 	
 	return $result;
@@ -797,8 +797,8 @@
 
         $sql = "SELECT first_name, last_name FROM staff WHERE staff_id = "
         	. $staff_id;
-        $rs = mysql_query($sql, $con);
-        $row = mysql_fetch_array ($rs);
+        $rs = xx_query($sql, $con);
+        $row = xx_fetch_array ($rs);
 	$last_name = $row["last_name"];
 	$first_name = $row["first_name"];
 	
@@ -842,13 +842,13 @@
 			. $user_ip
 			. "')";
 
-	if (!mysql_query($sql, $con)){
+	if (!xx_query($sql, $con)){
 		sql_err($con);
-		mysql_query ("UNLOCK TABLES", $con);
+		xx_query ("UNLOCK TABLES", $con);
 		bailout();
 	} // bad write
 	else {
-		mysql_query("UNLOCK TABLES", $con);
+		xx_query("UNLOCK TABLES", $con);
 
 	} // good write to the pagestats table
 
@@ -911,13 +911,13 @@
 			. $user_ip
 			. "')";
 
-	if (!mysql_query($sql, $con)){
+	if (!xx_query($sql, $con)){
 		sql_err($con);
-		mysql_query ("UNLOCK TABLES", $con);
+		xx_query ("UNLOCK TABLES", $con);
 		bailout();
 	} // bad write
 	else {
-		mysql_query("UNLOCK TABLES", $con);
+		xx_query("UNLOCK TABLES", $con);
 
 	} // good write to the substats table