--- a/include/db/trip-dao.inc.php
+++ b/include/db/trip-dao.inc.php
@@ -4,15 +4,17 @@
 	global $conn;
 	$query = "Select * from trips
 	join routes on trips.route_id = routes.route_id
-	where trip_id = '$tripID'
+	where trip_id =	:tripID
 	LIMIT 1";
 	debug($query, "database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
-		return Array();
-	}
-	return pg_fetch_assoc($result);
+	$query = $conn->prepare($query);
+	$query->bindParam(":tripID", $tripID);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	return $query->fetch(PDO::FETCH_ASSOC);
 }
 function getTripShape()
 {
@@ -58,14 +60,16 @@
 join trips on trips.trip_id = stop_times.trip_id
 join routes on trips.route_id = routes.route_id
 join stops on stops.stop_id = stop_times.stop_id
-WHERE trips.trip_id = '$tripID' $range ORDER BY stop_sequence";
-	debug($query, "database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
-		return Array();
-	}
-	$stopTimes = pg_fetch_all($result);
+WHERE trips.trip_id = :tripID $range ORDER BY stop_sequence";
+	debug($query, "database");
+	$query = $conn->prepare($query);
+	$query->bindParam(":tripID", $tripID);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	$stopTimes = $query->fetchAll();
 	$cur_timepoint = Array();
 	$next_timepoint = Array();
 	$distance_between_timepoints = 0.0;
@@ -73,114 +77,158 @@
 	$rv = Array();
 	foreach ($stopTimes as $i => $stopTime) {
 		if ($stopTime['arrival_time'] != "") {
-		    // is timepoint
+			// is timepoint
 			$cur_timepoint = $stopTime;
 			$distance_between_timepoints = 0.0;
 			$distance_traveled_between_timepoints = 0.0;
 			if ($i + 1 < sizeof($stopTimes)) {
 				$k = $i + 1;
-				$distance_between_timepoints += distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]);
+				$distance_between_timepoints+= distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]);
 				while ($stopTimes[$k]["arrival_time"] == "" && $k + 1 < sizeof($stopTimes)) {
-					$k += 1;
+					$k+= 1;
 					//echo "k".$k;
-					$distance_between_timepoints += distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]);
+					$distance_between_timepoints+= distance($stopTimes[$k - 1]["stop_lat"], $stopTimes[$k - 1]["stop_lon"], $stopTimes[$k]["stop_lat"], $stopTimes[$k]["stop_lon"]);
 				}
 				$next_timepoint = $stopTimes[$k];
 				$rv[] = $stopTime;
 			}
 		}
 		else {
-		    // is untimed point
-		    //echo "i".$i;
-			$distance_traveled_between_timepoints += distance($stopTimes[$i - 1]["stop_lat"], $stopTimes[$i - 1]["stop_lon"], $stopTimes[$i]["stop_lat"], $stopTimes[$i]["stop_lon"]);
+			// is untimed point
+			//echo "i".$i;
+			$distance_traveled_between_timepoints+= distance($stopTimes[$i - 1]["stop_lat"], $stopTimes[$i - 1]["stop_lon"], $stopTimes[$i]["stop_lat"], $stopTimes[$i]["stop_lon"]);
 			//echo "$distance_traveled_between_timepoints / $distance_between_timepoints<br>";
 			$distance_percent = $distance_traveled_between_timepoints / $distance_between_timepoints;
 			if ($next_timepoint["arrival_time"] != "") {
-			$total_time = strtotime($next_timepoint["arrival_time"]) - strtotime($cur_timepoint["arrival_time"]);
-			//echo strtotime($next_timepoint["arrival_time"])." - ".strtotime($cur_timepoint["arrival_time"])."<br>";
-			$time_estimate = ($distance_percent * $total_time) + strtotime($cur_timepoint["arrival_time"]);
-			$stopTime["arrival_time"] = date("H:i:s", $time_estimate);
-			} else {
-			    $stopTime["arrival_time"] = $cur_timepoint["arrival_time"];
+				$total_time = strtotime($next_timepoint["arrival_time"]) - strtotime($cur_timepoint["arrival_time"]);
+				//echo strtotime($next_timepoint["arrival_time"])." - ".strtotime($cur_timepoint["arrival_time"])."<br>";
+				$time_estimate = ($distance_percent * $total_time) + strtotime($cur_timepoint["arrival_time"]);
+				$stopTime["arrival_time"] = date("H:i:s", $time_estimate);
+			}
+			else {
+				$stopTime["arrival_time"] = $cur_timepoint["arrival_time"];
 			}
 			$rv[] = $stopTime;
 			//var_dump($rv);
+			
 		}
 	}
 	return $rv;
 }
-function getTimeInterpolatedTripAtStop($tripID, $stop_sequence)
-{
-    global $conn;
-    // limit interpolation to between nearest actual points.
-    $prevTimePoint = pg_fetch_assoc(pg_query($conn," SELECT trip_id,stop_id,
+function getTripPreviousTimePoint($tripID, $stop_sequence)
+{
+	global $conn;
+	$query = " SELECT trip_id,stop_id,
 	stop_sequence
 FROM stop_times
-WHERE trip_id = '$tripID' and stop_sequence < $stop_sequence and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence DESC LIMIT 1"));
-    $nextTimePoint = pg_fetch_assoc(pg_query($conn," SELECT trip_id,stop_id,
+WHERE trip_id = :tripID and stop_sequence < :stop_sequence
+and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence DESC LIMIT 1";
+	debug($query, "database");
+	$query = $conn->prepare($query);
+	$query->bindParam(":tripID", $tripID);
+	$query->bindParam(":stop_sequence", $stop_sequence);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	return $query->fetch(PDO::FETCH_ASSOC);
+}
+function getTripNextTimePoint($tripID, $stop_sequence)
+{
+	global $conn;
+	$query = " SELECT trip_id,stop_id,
 	stop_sequence
 FROM stop_times
-WHERE trip_id = '$tripID' and stop_sequence > $stop_sequence and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence LIMIT 1"));
-    $range = "AND stop_sequence >= '{$prevTimePoint['stop_sequence']}' AND stop_sequence <= '{$nextTimePoint['stop_sequence']}'";
-    	foreach (getTimeInterpolatedTrip($tripID,$range) as $tripStop) {
+WHERE trip_id = :tripID and stop_sequence > :stop_sequence
+and stop_times.arrival_time IS NOT NULL ORDER BY stop_sequence LIMIT 1";
+	debug($query, "database");
+	$query = $conn->prepare($query);
+	$query->bindParam(":tripID", $tripID);
+	$query->bindParam(":stop_sequence", $stop_sequence);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	return $query->fetch(PDO::FETCH_ASSOC);
+}
+function getTimeInterpolatedTripAtStop($tripID, $stop_sequence)
+{
+	global $conn;
+	// limit interpolation to between nearest actual points.
+	$prevTimePoint = getTripPreviousTimePoint($tripID, $stop_sequence);
+	$nextTimePoint = getTripNextTimePoint($tripID, $stop_sequence);
+	$range = "AND stop_sequence >= '{$prevTimePoint['stop_sequence']}' AND stop_sequence <= '{$nextTimePoint['stop_sequence']}'";
+	foreach (getTimeInterpolatedTrip($tripID, $range) as $tripStop) {
 		if ($tripStop['stop_sequence'] == $stop_sequence) return $tripStop;
 	}
 	return Array();
 }
 function getTripStartTime($tripID)
 {
-    	global $conn;
+	global $conn;
 	$query = "Select * from stop_times
-	where trip_id = '$tripID'
+	where trip_id = :tripID
 	AND arrival_time IS NOT NULL
 	AND stop_sequence = '1'";
 	debug($query, "database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
-		return Array();
-	}
-	$r = pg_fetch_assoc($result);
+	$query = $conn->prepare($query);
+	$query->bindParam(":tripID", $tripID);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	$r = $query->fetch(PDO::FETCH_ASSOC);
 	return $r['arrival_time'];
 }
 function getActiveTrips($time)
 {
-    	global $conn;
+	global $conn;
 	if ($time == "") $time = current_time();
 	$query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL
 AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times
-WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND $time > start_times.arrival_time  AND $time < end_times.arrival_time";
-	debug($query, "database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
-		return Array();
-	}
-	return pg_fetch_all($result);
-}
-
-function viaPoints($tripid, $stop_sequence = "")
+WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND :time > start_times.arrival_time  AND :time < end_times.arrival_time";
+	debug($query, "database");
+	$query = $conn->prepare($query);
+	$query->bindParam(":time", $time);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	return $query->fetchAll();
+}
+function viaPoints($tripID, $stop_sequence = "")
 {
 	global $conn;
 	$query = "SELECT stops.stop_id, stop_name, arrival_time
 FROM stop_times join stops on stops.stop_id = stop_times.stop_id
-WHERE stop_times.trip_id = '$tripid'
-".($stop_sequence != "" ? "AND stop_sequence > '$stop_sequence'" : "").
-"AND substr(stop_code,1,2) != 'Wj' ORDER BY stop_sequence";
-	debug($query, "database");
-	$result = pg_query($conn, $query);
-	if (!$result) {
-		databaseError(pg_result_error($result));
-		return Array();
-	}
-	return pg_fetch_all($result);
+WHERE stop_times.trip_id = :tripID
+" . ($stop_sequence != "" ? " AND stop_sequence > :stop_sequence " : "") . "AND substr(stop_code,1,2) != 'Wj' ORDER BY stop_sequence";
+	debug($query, "database");
+	$query = $conn->prepare($query);
+	if ($stop_sequence != "") $query->bindParam(":stop_sequence", $stop_sequence);
+	$query->bindParam(":tripID", $tripID);
+	$query->execute();
+	if (!$query) {
+		databaseError($conn->errorInfo());
+		return Array();
+	}
+	return $query->fetchAll();
 }
 function viaPointNames($tripid, $stop_sequence = "")
 {
 	$viaPointNames = Array();
-	foreach(viaPoints($tripid, $stop_sequence) as $point) {
+	foreach (viaPoints($tripid, $stop_sequence) as $point) {
 		$viaPointNames[] = $point['stop_name'];
 	}
-	return r_implode(", ", $viaPointNames);
+	if (sizeof($viaPointNames) > 0) {
+		return r_implode(", ", $viaPointNames);
+	}
+	else {
+		return "";
+	}
 }
 ?>