gitphp 0.2.9.1 :: busui.git/commitdiff

Fix service alerts code standards

2 files changed: (show all)
aws/busuidb.sh
rtpis/servicealert_editor.php

file:a/aws/busuidb.sh -> file:b/aws/busuidb.sh

file:a/rtpis/servicealert_editor.php -> file:b/rtpis/servicealert_editor.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');
auth();	auth();
include_header("Service Alert Editor", "serviceAlertEditor");	include_header("Service Alert Editor", "serviceAlertEditor");
/**	/**
* Currently support:	* Currently support:
* network inform	* network inform
* stop remove: route patch, stop remove	* stop remove: route patch, stop remove
* - stop search	* - stop search
* street inform: route inform, stop inform	* street inform: route inform, stop inform
* - street search	* - street search
*/	*/
if (isset($_REQUEST['saveedit'])) {	if (isset($_REQUEST['saveedit'])) {

if ($_REQUEST['saveedit'] != "") {	if ($_REQUEST['saveedit'] != "") {
updateServiceAlert($_REQUEST['saveedit'], $_REQUEST);	updateServiceAlert($_REQUEST['saveedit'], $_REQUEST);
} else {	} else {
addServiceAlert($_REQUEST);	addServiceAlert($_REQUEST);
}	}
echo "Saved " . $_REQUEST['saveedit'];	echo "Saved " . $_REQUEST['saveedit'];
die();	die();
}	}
if ($_REQUEST['delete']) {	if (isset($_REQUEST['delete'])) {
$deleteParts = explode(";", $_REQUEST['delete']);	$deleteParts = explode(";", $_REQUEST['delete']);
deleteInformedAlert($deleteParts[0], $deleteParts[1], $deleteParts[2]);	deleteInformedAlert($deleteParts[0], $deleteParts[1], $deleteParts[2]);
echo "Deleted network inform for {$deleteParts[0]} ({$deleteParts[1]},{$deleteParts[2]})<br>\n";	echo "Deleted network inform for {$deleteParts[0]} ({$deleteParts[1]},{$deleteParts[2]})<br>\n";
die();	die();
}	}
if ($_REQUEST['networkinform']) {	if (isset($_REQUEST['networkinform'])) {
addInformedAlert($_REQUEST['networkinform'], "agency", "0", "inform");	addInformedAlert($_REQUEST['networkinform'], "agency", "0", "inform");
echo "Added network inform for" . $_REQUEST['networkinform'];	echo "Added network inform for" . $_REQUEST['networkinform'];
die();	die();
}	}
if ($_REQUEST['stopsearch']) {	if (isset($_REQUEST['stopsearch'])) {
addInformedAlert($_REQUEST['stopsearch'], "stop", $_REQUEST['stopid'], "remove");	addInformedAlert($_REQUEST['stopsearch'], "stop", $_REQUEST['stopid'], "remove");
echo "Added stop remove for" . $_REQUEST['stopsearch'] . ", stop" . $_REQUEST['stopid'] . "<br>\n";	echo "Added stop remove for" . $_REQUEST['stopsearch'] . ", stop" . $_REQUEST['stopid'] . "<br>\n";

foreach ($service_periods as $sp) {	foreach ($service_periods as $sp) {
echo "Remove from $sp routes<br>\n";	echo "Remove from $sp routes<br>\n";
foreach (getStopRoutes($_REQUEST['stopid'], $sp) as $route) {	foreach (getStopRoutes($_REQUEST['stopid'], $sp) as $route) {
addInformedAlert($_REQUEST['stopsearch'], "route", $route['route_id'], "patch");	addInformedAlert($_REQUEST['stopsearch'], "route", $route['route_id'], "patch");
echo "Added route patch for" . $_REQUEST['stopsearch'] . ", route" . $route['route_id'] . "<br>\n";	echo "Added route patch for" . $_REQUEST['stopsearch'] . ", route" . $route['route_id'] . "<br>\n";
}	}
}	}
die();	die();
}	}
if ($_REQUEST['streetsearch']) {	if (isset($_REQUEST['streetsearch'])) {

echo "Informing stops of street<br>\n";	echo "Informing stops of street<br>\n";
foreach (getStopsByName($_REQUEST['street']) as $stop) {	foreach (getStopsByName($_REQUEST['street']) as $stop) {
addInformedAlert($_REQUEST['streetsearch'], "stop", $stop['stop_id'], "inform");	addInformedAlert($_REQUEST['streetsearch'], "stop", $stop['stop_id'], "inform");
echo "Added stop inform for" . $_REQUEST['streetsearch'] . ", stop" . $stop['stop_id'] . " ". $stop['stop_name']."<br>\n";	echo "Added stop inform for" . $_REQUEST['streetsearch'] . ", stop" . $stop['stop_id'] . " ". $stop['stop_name']."<br>\n";

foreach ($service_periods as $sp) {	foreach ($service_periods as $sp) {
echo "Informing $sp routes<br>\n";	echo "Informing $sp routes<br>\n";
foreach (getStopRoutes($stop['stop_id'], $sp) as $route) {	foreach (getStopRoutes($stop['stop_id'], $sp) as $route) {
addInformedAlert($_REQUEST['streetsearch'], "route", $route['route_id'], "inform");	addInformedAlert($_REQUEST['streetsearch'], "route", $route['route_id'], "inform");
echo "Added route inform for stop" . $_REQUEST['streetsearch'] . ", route" . $route['route_id'] . "<br>\n";	echo "Added route inform for stop" . $_REQUEST['streetsearch'] . ", route" . $route['route_id'] . "<br>\n";
}	}
}	}
}	}

die();	die();
}	}
?>	?>
Active and Future Alerts:	Active and Future Alerts:
<table>	<table>
<?php	<?php
foreach (getFutureAlerts() as $alert) {	foreach (getFutureAlerts() as $alert) {
echo "<tr><td>" . date("c", $alert['start']) . "</td><td>" . date("c", $alert['end']) . "</td><td>" . substr($alert['description'], 0, 999) . '</td><td><a href="?edit=' . $alert['id'] . '">edit</a></td></tr>';	echo "<tr><td>" . date("c", $alert['start']) . "</td><td>" . date("c", $alert['end']) . "</td><td>" . substr($alert['description'], 0, 999) . '</td><td><a href="?edit=' . $alert['id'] . '">edit</a></td></tr>';
}	}
?>	?>
</table>	</table>
<?php	<?php
$alert = getServiceAlert($_REQUEST['edit']);	$alert = getServiceAlert((isset($_REQUEST['edit'])?$_REQUEST['edit']:""));
?>	?>
<form action="<?php echo basename(__FILE__);	<form action="<?php echo basename(__FILE__);
?>" method="get">	?>" method="get">

<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="startdate"> Start Date</label>	<label for="startdate"> Start Date</label>
<input type="text" name="startdate" id="startdate" value="<?php	<input type="text" name="startdate" id="startdate" value="<?php
if ($alert['start'])	if ($alert['start']) {
echo date("c", $alert['start']);	echo date("c", $alert['start']);
else	} else {
echo date("c", strtotime("0:00"));	echo date("c", strtotime("0:00"));
	}
?>" />	?>" />
</div>	</div>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="enddate"> End Date </label>	<label for="enddate"> End Date </label>
<input type="text" name="enddate" id="enddate" value="<?php	<input type="text" name="enddate" id="enddate" value="<?php
if ($alert['end'])	if ($alert['end']) {
echo date("c", $alert['end']);	echo date("c", $alert['end']);
else	} else {
echo date("c", strtotime("23:59"));	echo date("c", strtotime("23:59"));
	}
?>" />	?>" />
</div>	</div>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="header">Header</label>	<label for="header">Header</label>
<input type="text" name="header" id="header" value="<?php echo $alert['header']; ?>" />	<input type="text" name="header" id="header" value="<?php echo $alert['header']; ?>" />
</div>	</div>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="description">Description</label>	<label for="description">Description</label>
<textarea name="description"><?php echo $alert['description']; ?></textarea>	<textarea name="description"><?php echo $alert['description']; ?></textarea>
</div>	</div>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="url">URL</label>	<label for="url">URL</label>
<input type="text" name="url" id="url" value="<?php echo $alert['url']; ?>" />	<input type="text" name="url" id="url" value="<?php echo $alert['url']; ?>" />
</div>	</div>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="cause"> Cause: </label>	<label for="cause"> Cause: </label>
<select name="cause" id="cause">	<select name="cause" id="cause">

<?php	<?php
foreach ($serviceAlertCause as $key => $value) {	foreach ($serviceAlertCause as $key => $value) {
echo "<option value=\"$key\"" . ($key === $alert['cause'] ? " SELECTED" : "") . '>' . $value . '</option>';	echo "<option value=\"$key\"" . ($key === $alert['cause'] ? " SELECTED" : "") . '>' . $value . '</option>';
}	}
?>	?>
</select></div>	</select></div>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="effect"> Effect: </label>	<label for="effect"> Effect: </label>
<select name="effect" id="effect">	<select name="effect" id="effect">
<?php	<?php
foreach ($serviceAlertEffect as $key => $value) {	foreach ($serviceAlertEffect as $key => $value) {
echo "<option value=\"$key\"" . ($key === $alert['effect'] ? " SELECTED" : "") . '>' . $value . '</option>';	echo "<option value=\"$key\"" . ($key === $alert['effect'] ? " SELECTED" : "") . '>' . $value . '</option>';
}	}
?>	?>
</select></div>	</select></div>
<input type="hidden" name="saveedit" value="<?php echo $_REQUEST['edit']; ?>"/>	<input type="hidden" name="saveedit" value="<?php if (isset($_REQUEST['edit']))echo $_REQUEST['edit']; ?>"/>
<input type="submit" value="Save"/>	<input type="submit" value="Save"/>
</div></form>	</div></form>

<?php	<?php
if ($_REQUEST['edit']) {	if (isset($_REQUEST['edit'])) {
echo "Informed Entities for ID {$_REQUEST['edit']}:";	echo "Informed Entities for ID {$_REQUEST['edit']}:";
echo '<table>';	echo '<table>';
foreach (getInformedAlerts($_REQUEST['edit'], "", "") as $informed) {	foreach (getInformedAlerts($_REQUEST['edit'], "", "") as $informed) {
echo "<tr><td>{$informed['informed_class']}</td><td>{$informed['informed_id']}</td><td>{$informed['informed_action']}" . '</td><td><a href="?delete=' . $_REQUEST['edit'] . ';' . $informed['informed_class'] . ';' . $informed['informed_id'] . '">delete</a></td></tr>';	echo "<tr><td>{$informed['informed_class']}</td><td>{$informed['informed_id']}</td><td>{$informed['informed_action']}" . '</td><td><a href="?delete=' . $_REQUEST['edit'] . ';' . $informed['informed_class'] . ';' . $informed['informed_id'] . '">delete</a></td></tr>';
}	}
echo '</table>';	echo '</table>';
?>	?>
<form action="<?php echo basename(__FILE__);	<form action="<?php echo basename(__FILE__);
?>" method="get">	?>" method="get">
<input type="hidden" name="networkinform" value="<?php echo $_REQUEST['edit'];	<input type="hidden" name="networkinform" value="<?php echo $_REQUEST['edit'];
?>"/>	?>"/>
<input type="submit" value="Add Network Inform"/>	<input type="submit" value="Add Network Inform"/>
</form>	</form>
<form action="<?php echo basename(__FILE__);	<form action="<?php echo basename(__FILE__);
?>" method="get">	?>" method="get">
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="stopid">StopID to remove</label>	<label for="stopid">StopID to remove</label>
<input type="text" name="stopid" />	<input type="text" name="stopid" />
</div>	</div>
<input type="hidden" name="stopsearch" value="<?php echo $_REQUEST['edit'];	<input type="hidden" name="stopsearch" value="<?php echo $_REQUEST['edit'];
?>"/>	?>"/>
<input type="submit" value="Stop Search"/>	<input type="submit" value="Stop Search"/>
</form>	</form>
<form action="<?php echo basename(__FILE__);	<form action="<?php echo basename(__FILE__);
?>" method="get">	?>" method="get">
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="street">Street to inform</label>	<label for="street">Street to inform</label>
<input type="text" name="street" />	<input type="text" name="street" />
</div>	</div>
<input type="hidden" name="streetsearch" value="<?php echo $_REQUEST['edit'];	<input type="hidden" name="streetsearch" value="<?php echo $_REQUEST['edit'];
?>"/>	?>"/>
<input type="submit" value="Street Search"/>	<input type="submit" value="Street Search"/>
</form>	</form>
<?php	<?php
}	}
include_footer();	include_footer();
?>	?>

createdb transitdata	createdb transitdata
createlang -d transitdata plpgsql	createlang -d transitdata plpgsql
psql -d transitdata -f /var/www/lib/postgis.sql	psql -d transitdata -f /var/www/lib/postgis.sql
# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz	# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz
#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz	#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz
gunzip /var/www/transitdata.cbrfeed.sql.gz	gunzip /var/www/transitdata.cbrfeed.sql.gz
psql -d transitdata -f /var/www/transitdata.cbrfeed.sql	psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
#createuser transitdata -SDRP	#createuser transitdata -SDRP
#password transitdata	#password transitdata
#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips\	#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;"
#,servicealerts_alerts,servicealerts_informed TO transitdata;"	#psql -d transitdata -c "GRANT SELECT,INSERT ON TABLE myway_observations,myway_timingdeltas,myway_routes,myway_stops TO transitdata;"
#psql -d transitdata -c "GRANT SELECT,INSERT ON TABLE myway_observations,myway_routes,myway_stops,myway_timingdeltas TO transitdata;"	#psql -d transitdata -c "GRANT SELECT,INSERT,UPDATE ON TABLE servicealerts_alerts,servicealerts_informed TO transitdata;"
#psql -d transitdata -c "GRANT SELECT,INSERT,UPDATE ON TABLE myway_routes,myway_stops TO transitdata;"	#psql -d transitdata -c "GRANT USAGE,SELECT ON SEQUENCE servicealerts_alerts_id_seq TO transitdata;"
##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"	##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"
## INSERT INTO geometry_columns(f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, "type")	## INSERT INTO geometry_columns(f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, "type")
##SELECT '', 'public', 'shapes', 'shape_pt', ST_CoordDim(shape_pt), ST_SRID(shape_pt), GeometryType(shape_pt)	##SELECT '', 'public', 'shapes', 'shape_pt', ST_CoordDim(shape_pt), ST_SRID(shape_pt), GeometryType(shape_pt)
##FROM shapes LIMIT 1;	##FROM shapes LIMIT 1;
php /var/www/updatedb.php	php /var/www/updatedb.php