--- a/include/db/trip-dao.inc.php
+++ b/include/db/trip-dao.inc.php
@@ -143,10 +143,26 @@
 	$r = pg_fetch_assoc($result);
 	return $r['arrival_time'];
 }
-function viaPointNames($tripid, $stop_sequence = "")
+function getActiveTrips($time)
+{
+    	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 = "")
 {
 	global $conn;
-	$query = "SELECT stop_name
+	$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'" : "").
@@ -157,7 +173,14 @@
 		databaseError(pg_result_error($result));
 		return Array();
 	}
-	$pointNames = pg_fetch_all($result);
-	return r_implode(", ", $pointNames);
+	return pg_fetch_all($result);
+}
+function viaPointNames($tripid, $stop_sequence = "")
+{
+	$viaPointNames = Array();
+	foreach(viaPoints($tripid, $stop_sequence) as $point) {
+		$viaPointNames[] = $point['stop_name'];
+	}
+	return r_implode(", ", $viaPointNames);
 }
 ?>