--- a/include/common.inc.php +++ b/include/common.inc.php @@ -1,24 +1,23 @@ <?php date_default_timezone_set('Australia/ACT'); -$APIurl = "http://localhost:8765"; $debugOkay = Array( "session", "json", "phperror", - //"awsgtfs", "awsotp", //"squallotp", - //"vanilleotp", + "vanilleotp", + "database", "other" ); -if (isDebug("awsgtfs")) { - $APIurl = "http://bus-main.lambdacomplex.org:8765"; -} $cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6"; $googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q"; $otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/'; if (isDebug("awsotp") || php_uname('n') == "maxious.xen.prgmr.com") { $otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/'; +} +if (isDebug("dotcloudotp") || php_uname('n') == "actbus-www") { + $otpAPIurl = 'http://otp.actbus.dotcloud.com/opentripplanner-api-webapp/'; } if (isDebug("squallotp")) { $otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/'; @@ -31,9 +30,10 @@ include_once ("common-geo.inc.php"); include_once ("common-net.inc.php"); include_once ("common-transit.inc.php"); - include_once ("common-session.inc.php"); +include_once ("common-db.inc.php"); include_once ("common-template.inc.php"); +include_once ("common-request.inc.php"); function isDebugServer() { @@ -143,5 +143,42 @@ if ($sort_ascending) $array = array_reverse($temp_array); else $array = $temp_array; } +function sktimesort(&$array, $subkey = "id", $sort_ascending = false) +{ + if (count($array)) $temp_array[key($array) ] = array_shift($array); + foreach ($array as $key => $val) { + $offset = 0; + $found = false; + foreach ($temp_array as $tmp_key => $tmp_val) { + if (!$found and strtotime($val[$subkey]) > strtotime($tmp_val[$subkey])) { + $temp_array = array_merge((array)array_slice($temp_array, 0, $offset) , array( + $key => $val + ) , array_slice($temp_array, $offset)); + $found = true; + } + $offset++; + } + if (!$found) $temp_array = array_merge($temp_array, array( + $key => $val + )); + } + if ($sort_ascending) $array = array_reverse($temp_array); + else $array = $temp_array; +} +function r_implode( $glue, $pieces ) +{ + foreach( $pieces as $r_pieces ) + { + if( is_array( $r_pieces ) ) + { + $retVal[] = r_implode( $glue, $r_pieces ); + } + else + { + $retVal[] = $r_pieces; + } + } + return implode( $glue, $retVal ); +} ?>