arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

use 'events' and 'locations' instead of 'list' in the return object

Browse Source
This commit is contained in:
james 2010-09-28 20:24:32 +00:00
parent 0a02525d14
commit b5ed7c174f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api.php
View File

@ -43,12 +43,12 @@ switch($request[0]) {
case 'list': case 'list':
/* APIDOC: locations/list /* APIDOC: locations/list
description(lists locations at the current conference) description(lists locations at the current conference)
return(list array) return(locations array)
*/ */
$locationData = getLocationList($_SESSION['conferences_id']); $locationData = getLocationList($_SESSION['conferences_id']);
if(is_array($locationData)){ if(is_array($locationData)){
$ret['status'] = 'ok'; $ret['status'] = 'ok';
$ret['list'] = $locationData; $ret['locations'] = $locationData;
}else{ }else{
$ret['status'] = 'error'; $ret['status'] = 'error';
$ret['error'] = $locationData; $ret['error'] = $locationData;
@ -74,12 +74,12 @@ switch($request[0]) {
case 'list': case 'list':
/* APIDOC: events/list /* APIDOC: events/list
description(gets a list of all events at the current conference, and team information if applicable) description(gets a list of all events at the current conference, and team information if applicable)
return(list array) return(events array)
*/ */
$eventData = getEventList($_SESSION['conferences_id'], $school_id); $eventData = getEventList($_SESSION['conferences_id'], $school_id);
if(is_array($eventData)){ if(is_array($eventData)){
$ret['status'] = 'ok'; $ret['status'] = 'ok';
$ret['list'] = $eventData; $ret['events'] = $eventData;
}else{ }else{
$ret['status'] = 'error'; $ret['status'] = 'error';
$ret['error'] = $eventData; $ret['error'] = $eventData;