projects / busui.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
fix servicealert editor due to "end" field master
fix servicealert editor due to "end" field

file:a/include/db/servicealert-dao.inc.php -> file:b/include/db/servicealert-dao.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.
*/ */
   
function getServiceOverride($date = '') { function getServiceOverride($date = '') {
global $conn; global $conn;
$query = 'Select * from calendar_dates where date = :date and exception_type = \'1\' LIMIT 1'; $query = 'Select * from calendar_dates where date = :date and exception_type = \'1\' LIMIT 1';
// debug($query,'database'); // debug($query,'database');
$query = $conn->prepare($query); // Create a prepared statement $query = $conn->prepare($query); // Create a prepared statement
$date = date('Ymd', ($date != '' ? $date : time())); $date = date('Ymd', ($date != '' ? $date : time()));
$query->bindParam(':date', $date); $query->bindParam(':date', $date);
$query->execute(); $query->execute();
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetch(PDO :: FETCH_ASSOC); return $query->fetch(PDO :: FETCH_ASSOC);
} }
   
function getServiceAlert($alertID) { function getServiceAlert($alertID) {
global $conn; global $conn;
$query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as \\\'end\\\',cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id'; $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id';
debug($query, 'database'); debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
$query->bindParam(':servicealert_id', $alertID); $query->bindParam(':servicealert_id', $alertID);
$query->execute(); $query->execute();
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetch(PDO :: FETCH_ASSOC); return $query->fetch(PDO :: FETCH_ASSOC);
} }
   
function updateServiceAlert($alertID, $alert) { function updateServiceAlert($alertID, $alert) {
global $conn; global $conn;
$query = 'update servicealerts_alerts set start=:start, "end"=:end, header=:header, description=:description, url=:url, cause=:cause, effect=:effect where id = :servicealert_id'; $query = 'update servicealerts_alerts set start=:start, "end"=:end, header=:header, description=:description, url=:url, cause=:cause, effect=:effect where id = :servicealert_id';
debug($query, 'database'); debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
$query->bindValue(':servicealert_id', $alertID); $query->bindValue(':servicealert_id', $alertID);
$query->bindValue(':start', $alert['startdate']); $query->bindValue(':start', $alert['startdate']);
$query->bindValue(':end', $alert['enddate']); $query->bindValue(':end', $alert['enddate']);
$query->bindValue(':header', $alert['header']); $query->bindValue(':header', $alert['header']);
$query->bindValue(':description', $alert['description']); $query->bindValue(':description', $alert['description']);
$query->bindValue(':url', $alert['url']); $query->bindValue(':url', $alert['url']);
$query->bindValue(':cause', $alert['cause']); $query->bindValue(':cause', $alert['cause']);
$query->bindValue(':effect', $alert['effect']); $query->bindValue(':effect', $alert['effect']);
$query->execute(); $query->execute();
   
print_r($conn->errorInfo()); print_r($conn->errorInfo());
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetch(PDO :: FETCH_ASSOC); return $query->fetch(PDO :: FETCH_ASSOC);
} }
   
function addServiceAlert($alert) { function addServiceAlert($alert) {
global $conn; global $conn;
$query = 'INSERT INTO servicealerts_alerts (start, "end", header, description, url,cause,effect) VALUES (:start, :end, :header, :description, :url,:cause,:effect) '; $query = 'INSERT INTO servicealerts_alerts (start, "end", header, description, url,cause,effect) VALUES (:start, :end, :header, :description, :url,:cause,:effect) ';
debug($query, 'database'); debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
//print_r($alert); //print_r($alert);
$query->bindValue(':start', $alert['startdate']); $query->bindValue(':start', $alert['startdate']);
$query->bindValue(':end', $alert['enddate']); $query->bindValue(':end', $alert['enddate']);
$query->bindValue(':header', $alert['header']); $query->bindValue(':header', $alert['header']);
$query->bindValue(':description', $alert['description']); $query->bindValue(':description', $alert['description']);
$query->bindValue(':url', $alert['url']); $query->bindValue(':url', $alert['url']);
$query->bindValue(':cause', $alert['cause']); $query->bindValue(':cause', $alert['cause']);
$query->bindValue(':effect', $alert['effect']); $query->bindValue(':effect', $alert['effect']);
$query->execute(); $query->execute();
   
print_r($conn->errorInfo()); print_r($conn->errorInfo());
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetch(PDO :: FETCH_ASSOC); return $query->fetch(PDO :: FETCH_ASSOC);
} }
   
function getCurrentAlerts() { function getCurrentAlerts() {
global $conn; global $conn;
$query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as "end",cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < "end"'; $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < "end"';
// debug($query, 'database'); // debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
$query->execute(); $query->execute();
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetchAll(); return $query->fetchAll();
} }
   
function getFutureAlerts() { function getFutureAlerts() {
global $conn; global $conn;
$query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as "end",cause,effect,header,description,url from servicealerts_alerts where NOW() < "end"'; $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts where NOW() < "end"';
// debug($query, 'database'); // debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
$query->execute(); $query->execute();
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetchAll(); return $query->fetchAll();
} }
   
function getAllAlerts() { function getAllAlerts() {
global $conn; global $conn;
$query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as "end",cause,effect,header,description,url from servicealerts_alerts'; $query = 'SELECT id,extract(\'epoch\' from start) as start, extract(\'epoch\' from "end") as end,cause,effect,header,description,url from servicealerts_alerts';
// debug($query, 'database'); // debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
$query->execute(); $query->execute();
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetchAll(); return $query->fetchAll();
} }
   
function getInformedAlerts($id, $filter_class, $filter_id) { function getInformedAlerts($id, $filter_class, $filter_id) {
   
global $conn; global $conn;
//echo '$id, $filter_class, $filter_id\n'; //echo '$id, $filter_class, $filter_id\n';
$query = 'SELECT * from servicealerts_informed where servicealert_id = :servicealert_id'; $query = 'SELECT * from servicealerts_informed where servicealert_id = :servicealert_id';
   
if ($filter_class != '') { if ($filter_class != '') {
$query .= ' AND informed_class = :informed_class '; $query .= ' AND informed_class = :informed_class ';
} }
if ($filter_id != '') { if ($filter_id != '') {
$query .= ' AND informed_id = :informed_id '; $query .= ' AND informed_id = :informed_id ';
} }
// debug($query, 'database'); // debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
if ($filter_class != '') { if ($filter_class != '') {
$query->bindParam(':informed_class', $filter_class); $query->bindParam(':informed_class', $filter_class);
} }
if ($filter_id != '') { if ($filter_id != '') {
$query->bindParam(':informed_id', $filter_id); $query->bindParam(':informed_id', $filter_id);
} }
$query->bindParam(':servicealert_id', $id); $query->bindParam(':servicealert_id', $id);
$query->execute(); $query->execute();
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return $query->fetchAll(); return $query->fetchAll();
} }
   
function deleteInformedAlert($serviceAlertID, $class, $id) { function deleteInformedAlert($serviceAlertID, $class, $id) {
global $conn; global $conn;
$query = 'DELETE from servicealerts_informed where servicealert_id = :servicealert_id and informed_class = :informed_class AND informed_id = :informed_id'; $query = 'DELETE from servicealerts_informed where servicealert_id = :servicealert_id and informed_class = :informed_class AND informed_id = :informed_id';
debug($query, 'database'); debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
$query->bindParam(':servicealert_id', $serviceAlertID); $query->bindParam(':servicealert_id', $serviceAlertID);
$query->bindParam(':informed_class', $class); $query->bindParam(':informed_class', $class);
$query->bindParam(':informed_id', $id); $query->bindParam(':informed_id', $id);
$query->execute(); $query->execute();
print_r($conn->errorInfo()); print_r($conn->errorInfo());
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return null; return null;
} }
   
function addInformedAlert($serviceAlertID, $class, $id, $action) { function addInformedAlert($serviceAlertID, $class, $id, $action) {
global $conn; global $conn;
$query = 'INSERT INTO servicealerts_informed (servicealert_id , informed_class , informed_id, informed_action) $query = 'INSERT INTO servicealerts_informed (servicealert_id , informed_class , informed_id, informed_action)
VALUES(:servicealert_id ,:informed_class, :informed_id, :informed_action)'; VALUES(:servicealert_id ,:informed_class, :informed_id, :informed_action)';
debug($query, 'database'); debug($query, 'database');
$query = $conn->prepare($query); $query = $conn->prepare($query);
$query->bindParam(':servicealert_id', $serviceAlertID); $query->bindParam(':servicealert_id', $serviceAlertID);
$query->bindParam(':informed_class', $class); $query->bindParam(':informed_class', $class);
$query->bindParam(':informed_id', $id); $query->bindParam(':informed_id', $id);
$query->bindParam(':informed_action', $action); $query->bindParam(':informed_action', $action);
$query->execute(); $query->execute();
   
print_r($conn->errorInfo()); print_r($conn->errorInfo());
if (!$query) { if (!$query) {
databaseError($conn->errorInfo()); databaseError($conn->errorInfo());
return Array(); return Array();
} }
return null; return null;
} }
   
file:a/rtpis/siri.php -> file:b/rtpis/siri.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.
*/ */
include ('include/common.inc.php'); include ('include/common.inc.php');
function accept_header($header = false) { function accept_header($header = false) {
// http://jrgns.net/parse_http_accept_header // http://jrgns.net/parse_http_accept_header
$toret = null; $toret = null;
$header = $header ? $header : (array_key_exists('HTTP_ACCEPT', $_SERVER) ? $_SERVER['HTTP_ACCEPT']: false); $header = $header ? $header : (array_key_exists('HTTP_ACCEPT', $_SERVER) ? $_SERVER['HTTP_ACCEPT']: false);
if ($header) { if ($header) {
$types = explode(',', $header); $types = explode(',', $header);
$types = array_map('trim', $types); $types = array_map('trim', $types);
foreach ($types as $one_type) { foreach ($types as $one_type) {
$one_type = explode(';', $one_type); $one_type = explode(';', $one_type);
$type = array_shift($one_type); $type = array_shift($one_type);
if ($type) { if ($type) {
list($precedence, $tokens) = self::accept_header_options($one_type); list($precedence, $tokens) = self::accept_header_options($one_type);
list($main_type, $sub_type) = array_map('trim', explode('/', $type)); list($main_type, $sub_type) = array_map('trim', explode('/', $type));
$toret[] = array('main_type' => $main_type, 'sub_type' => $sub_type, 'precedence' => (float)$precedence, 'tokens' => $tokens); $toret[] = array('main_type' => $main_type, 'sub_type' => $sub_type, 'precedence' => (float)$precedence, 'tokens' => $tokens);
} }
} }
usort($toret, array('Parser', 'compare_media_ranges')); usort($toret, array('Parser', 'compare_media_ranges'));
} }
return $toret; return $toret;
} }
function usage() { function usage() {
echo "Usage notes: Must specify format json/xml. If callback is specified, will provide jsonp. Can filter with parmaters filter_class route/stop and filter_id with the id specified in GTFS." echo "Usage notes: Must specify format json/xml. If callback is specified, will provide jsonp. Can filter with parmaters filter_class route/stop and filter_id with the id specified in GTFS.";
die(); die();
} }
$json_types = Array("application/json","application/x-javascript","text/javascript","text/x-javascript","text/x-json"); $json_types = Array("application/json","application/x-javascript","text/javascript","text/x-javascript","text/x-json");
if ($_REQUEST['json']) { if ($_REQUEST['json']) {
if ($_REQUEST['alerts']) { if ($_REQUEST['alerts']) {
$return = getServiceAlertsAsJSON($_REQUEST['filter_class'], $_REQUEST['filter_id']); $return = getServiceAlertsAsJSON($_REQUEST['filter_class'], $_REQUEST['filter_id']);
} else if ($_REQUEST['updates']) { } else if ($_REQUEST['updates']) {
$return = getTripUpdatesAsJSON($_REQUEST['filter_class'], $_REQUEST['filter_id']); $return = getTripUpdatesAsJSON($_REQUEST['filter_class'], $_REQUEST['filter_id']);
} else { } else {
usage(); usage();
} }
header('Content-Type: application/json; charset=utf8'); header('Content-Type: application/json; charset=utf8');
// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/'); // header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
header('Access-Control-Max-Age: 3628800'); header('Access-Control-Max-Age: 3628800');
header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE'); header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
if (isset($_GET['callback'])) { if (isset($_GET['callback'])) {
$json = '(' . $return . ');'; //must wrap in parens and end with semicolon $json = '(' . $return . ');'; //must wrap in parens and end with semicolon
//print_r($_GET['callback'] . $json); //callback is prepended for json-p //print_r($_GET['callback'] . $json); //callback is prepended for json-p
} }
else { else {
echo $return; echo $return;
} }
} else if ($_REQUEST['xml']) { } else if ($_REQUEST['xml']) {
if ($_REQUEST['alerts']) { if ($_REQUEST['alerts']) {
$return = getServiceAlertsAsBinary($_REQUEST['filter_class'], $_REQUEST['filter_id']); $return = getServiceAlertsAsBinary($_REQUEST['filter_class'], $_REQUEST['filter_id']);
} else if ($_REQUEST['updates']) { } else if ($_REQUEST['updates']) {
$return = getTripUpdatesAsBinary($_REQUEST['filter_class'], $_REQUEST['filter_id']); $return = getTripUpdatesAsBinary($_REQUEST['filter_class'], $_REQUEST['filter_id']);
} else { } else {
usage(); usage();
} }
header('Content-Type: application/json; charset=utf8'); header('Content-Type: application/json; charset=utf8');
// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/'); // header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
header('Access-Control-Max-Age: 3628800'); header('Access-Control-Max-Age: 3628800');
header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE'); header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
echo $return; echo $return;
} else { } else {
usage(); usage();
} }
?> ?>
   
Unnamed repository; edit this file to name it for gitweb.
GitPHP by Chris Han