gitphp 0.2.9.1 :: busui.git/commitdiff

file:a/geo/route.kml.php -> file:b/geo/route.kml.php

<?php	<?php
header('Content-Type: application/vnd.google-earth.kml+xml');	header('Content-Type: application/vnd.google-earth.kml+xml');
include ('../include/common.inc.php');	include ('../include/common.inc.php');
echo '<?xml version="1.0" encoding="UTF-8"?>	echo '<?xml version="1.0" encoding="UTF-8"?>
<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"><Document>';	<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"><Document>';
echo '	echo '
<Style id="yellowLineGreenPoly">	<Style id="yellowLineGreenPoly">
<LineStyle>	<LineStyle>
<color>7f00ff00</color>	<color>7f00ff00</color>
<width>4</width>	<width>4</width>
</LineStyle>	</LineStyle>
<PolyStyle>	<PolyStyle>
<color>7f00ffff</color>	<color>7f00ffff</color>
</PolyStyle>	</PolyStyle>
</Style>';	</Style>';
$route = getRoute($routeid);	$route = getRoute($routeid);
echo "\n<Placemark>\n";	echo "\n<Placemark>\n";
$link = curPageURL()."/../trip.php?routeid=".htmlspecialchars ($route["route_id"]);	$link = curPageURL()."/../trip.php?routeid=".htmlspecialchars ($route["route_id"]);
echo "<name>".$route['route_short_name']."</name>";	echo "<name>".$route['route_short_name']."</name>";
echo '<atom:link href="'.$link.'"/>';	echo '<atom:link href="'.$link.'"/>';
echo '<description><![CDATA[ <a href="'.$link.'">'.$route['route_short_name']." ".$route['route_long_name']."</a>]]> </description>";	echo '<description><![CDATA[ <a href="'.$link.'">'.$route['route_short_name']." ".$route['route_long_name']."</a>]]> </description>";
echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";	echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";

$trips = getRouteTrips($routeid);	$trip = getRouteNextTrip($routeid);
echo getTripShape($trips[0]['trip_id']);	echo getTripShape($trip['trip_id']);

echo "</Placemark>\n</Document></kml>\n";	echo "</Placemark>\n</Document></kml>\n";
?>	?>

file:a/include/common-db.inc.php -> file:b/include/common-db.inc.php

file:a/include/common-request.inc.php -> file:b/include/common-request.inc.php

file:a/include/common-session.inc.php -> file:b/include/common-session.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
// you have to open the session to be able to modify or remove it	// you have to open the session to be able to modify or remove it
session_start();	session_start();
if (isset($_REQUEST['service_period'])) {
$_SESSION['service_period'] = filter_var($_REQUEST['service_period'], FILTER_SANITIZE_STRING);
sessionUpdated();
}
if (isset($_REQUEST['time'])) {
$_SESSION['time'] = filter_var($_REQUEST['time'], FILTER_SANITIZE_STRING);
sessionUpdated();
}
if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {	if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {
$geocoded = false;	$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {	if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));	$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));	$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
} else {	} else {
if (startsWith($geolocate, "-")) {	if (startsWith($geolocate, "-")) {
$locateparts = explode(",", $geolocate);	$locateparts = explode(",", $geolocate);
$_SESSION['lat'] = $locateparts[0];	$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];	$_SESSION['lon'] = $locateparts[1];
} else if (strpos($geolocate, "(") !== false) {	} else if (strpos($geolocate, "(") !== false) {
$geoParts = explode("(", $geolocate);	$geoParts = explode("(", $geolocate);
$locateparts = explode(",", str_replace(")", "", $geoParts[1]));	$locateparts = explode(",", str_replace(")", "", $geoParts[1]));
$_SESSION['lat'] = $locateparts[0];	$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];	$_SESSION['lon'] = $locateparts[1];
} else {	} else {
$contents = geocode($geolocate, true);	$contents = geocode($geolocate, true);
print_r($contents);	print_r($contents);
if (isset($contents[0]->centroid)) {	if (isset($contents[0]->centroid)) {
$geocoded = true;	$geocoded = true;
$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];	$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
$_SESSION['lon'] = $contents[0]->centroid->coordinates[1];	$_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
} else {	} else {
$_SESSION['lat'] = "";	$_SESSION['lat'] = "";
$_SESSION['lon'] = "";	$_SESSION['lon'] = "";
}	}
}	}
}	}
sessionUpdated();	sessionUpdated();
}	}

function sessionUpdated() {	function sessionUpdated() {
$_SESSION['lastUpdated'] = time();	$_SESSION['lastUpdated'] = time();
}	}

// timeoutSession	// timeoutSession
$TIMEOUT_LIMIT = 60 * 5; // 5 minutes	$TIMEOUT_LIMIT = 60 * 5; // 5 minutes
if (isset($_SESSION['lastUpdated']) && $_SESSION['lastUpdated'] + $TIMEOUT_LIMIT < time()) {	if (isset($_SESSION['lastUpdated']) && $_SESSION['lastUpdated'] + $TIMEOUT_LIMIT < time()) {
debug("Session timeout " . ($_SESSION['lastUpdated'] + $TIMEOUT_LIMIT) . ">" . time(), "session");	debug("Session timeout " . ($_SESSION['lastUpdated'] + $TIMEOUT_LIMIT) . ">" . time(), "session");
session_destroy();	session_destroy();
session_start();	session_start();
}	}

//debug(print_r($_SESSION, true) , "session");	//debug(print_r($_SESSION, true) , "session");
function current_time() {	function current_time() {
return ($_SESSION['time'] ? $_SESSION['time'] : date("H:i:s"));	return ($_REQUEST['time'] ? $_REQUEST['time'] : date("H:i:s"));
}	}

?>	?>

file:a/include/common-transit.inc.php -> file:b/include/common-transit.inc.php

<

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
$service_periods = Array(	$service_periods = Array(
'sunday',	'sunday',
'saturday',	'saturday',
'weekday'	'weekday'
);	);
	function service_period_day ($spid) {
	$idParts = explode("-",$spid);
	return strtolower($idParts[2]);
	}
function service_period($date = "") {	function service_period($date = "") {

if (isset($_SESSION['service_period']))	if (isset($_REQUEST['service_period']))
return $_SESSION['service_period'];	return $_REQUEST['service_period'];
$override = getServiceOverride($date);	$override = getServiceOverride($date);
if ($override['service_id']) {	if ($override['service_id']) {
$idParts = explode("-",$override['service_id']);	return service_period_day ($override['service_id']);
return strtolower($idParts[2]);
}	}

switch (date('w', ($date != "" ? $date : time()))) {	switch (date('w', ($date != "" ? $date : time()))) {
case 0:	case 0:
return 'sunday';	return 'sunday';
case 6:	case 6:
return 'saturday';	return 'saturday';
default:	default:
return 'weekday';	return 'weekday';
}	}
}	}
function service_ids($service_period) {	function service_ids($service_period) {
switch ($service_period) {	switch ($service_period) {
case 'sunday':	case 'sunday':
return Array("2010-TUGGSUN-Sunday-20","2010-BELCSUN-Sunday-19");	return Array("2010-TUGGSUN-Sunday-20","2010-BELCSUN-Sunday-19");
case 'saturday':	case 'saturday':
return Array("2010-BELCSAT-Saturday-19","2010-TUGGSAT-Saturday-19");	return Array("2010-BELCSAT-Saturday-19","2010-TUGGSAT-Saturday-19");
default:	default:
//return 'weekday';	//return 'weekday';
return Array("2010-BELCMAST-Weekday-15","2010-TUGGMAST-Weekday-14");	return Array("2010-BELCMAST-Weekday-15","2010-TUGGMAST-Weekday-14");
}	}
	}
	function valid_service_ids() {
	return array_merge(service_ids(""),service_ids('saturday'),service_ids('sunday'));
}	}

function midnight_seconds($time = "") {	function midnight_seconds($time = "") {
// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html	// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
if ($time != "") {	if ($time != "") {
return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);	return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
}	}
if (isset($_SESSION['time'])) {	if (isset($_SESSION['time'])) {
$time = strtotime($_SESSION['time']);	$time = strtotime($_SESSION['time']);
return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);	return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
}	}
return (date("G") * 3600) + (date("i") * 60) + date("s");	return (date("G") * 3600) + (date("i") * 60) + date("s");
}	}

function midnight_seconds_to_time($seconds) {	function midnight_seconds_to_time($seconds) {
if ($seconds > 0) {	if ($seconds > 0) {
$midnight = mktime(0, 0, 0, date("n"), date("j"), date("Y"));	$midnight = mktime(0, 0, 0, date("n"), date("j"), date("Y"));
return date("h:ia", $midnight + $seconds);	return date("h:ia", $midnight + $seconds);
} else {	} else {
return "";	return "";
}	}
}	}

if ($GTFSREnabled) {	if ($GTFSREnabled) {
$serviceAlertCause = Array(	$serviceAlertCause = Array(
"UNKNOWN_CAUSE" => "Unknown cause",	"UNKNOWN_CAUSE" => "Unknown cause",
"OTHER_CAUSE" => "Other cause",	"OTHER_CAUSE" => "Other cause",
"TECHNICAL_PROBLEM" => "Technical problem",	"TECHNICAL_PROBLEM" => "Technical problem",
"STRIKE" => "Strike",	"STRIKE" => "Strike",
"DEMONSTRATION" => "Demonstration",