git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 061af8fa authored by Zach Copley's avatar Zach Copley

CamelCase all function names in the API code

parent b08d16ef
......@@ -73,7 +73,7 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
$reset = new DateTime();
$reset->modify('+1 hour');
$this->init_document($this->format);
$this->initDocument($this->format);
if ($this->format == 'xml') {
$this->elementStart('hash');
......@@ -101,7 +101,7 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
print json_encode($out);
}
$this->end_document($this->format);
$this->endDocument($this->format);
}
}
......
......@@ -100,9 +100,9 @@ class ApiBlockCreateAction extends ApiAuthAction
if ($this->user->hasBlocked($this->other)
|| $this->user->block($this->other)
) {
$this->init_document($this->format);
$this->show_profile($this->other, $this->format);
$this->end_document($this->format);
$this->initDocument($this->format);
$this->showProfile($this->other, $this->format);
$this->endDocument($this->format);
} else {
$this->serverError(_('Block user failed.'), 500, $this->format);
}
......
......@@ -99,9 +99,9 @@ class ApiBlockDestroyAction extends ApiAuthAction
if (!$this->user->hasBlocked($this->other)
|| $this->user->unblock($this->other)
) {
$this->init_document($this->format);
$this->show_profile($this->other, $this->format);
$this->end_document($this->format);
$this->initDocument($this->format);
$this->showProfile($this->other, $this->format);
$this->endDocument($this->format);
} else {
$this->serverError(_('Unblock user failed.'));
}
......
......@@ -230,7 +230,7 @@ class ApiDirectMessageAction extends ApiAuthAction
function showXmlDirectMessages()
{
$this->init_document('xml');
$this->initDocument('xml');
$this->elementStart('direct-messages', array('type' => 'array'));
foreach ($this->messages as $m) {
......@@ -239,7 +239,7 @@ class ApiDirectMessageAction extends ApiAuthAction
}
$this->elementEnd('direct-messages');
$this->end_document('xml');
$this->endDocument('xml');
}
/**
......@@ -250,7 +250,7 @@ class ApiDirectMessageAction extends ApiAuthAction
function showJsonDirectMessages()
{
$this->init_document('json');
$this->initDocument('json');
$dmsgs = array();
......@@ -259,8 +259,8 @@ class ApiDirectMessageAction extends ApiAuthAction
array_push($dmsgs, $dm_array);
}
$this->show_json_objects($dmsgs);
$this->end_document('json');
$this->showJsonObjects($dmsgs);
$this->endDocument('json');
}
/**
......@@ -271,7 +271,7 @@ class ApiDirectMessageAction extends ApiAuthAction
function showRssDirectMessages()
{
$this->init_document('rss');
$this->initDocument('rss');
$this->element('title', null, $this->title);
......@@ -292,10 +292,10 @@ class ApiDirectMessageAction extends ApiAuthAction
foreach ($this->messages as $m) {
$entry = $this->rssDirectMessageArray($m);
$this->show_twitter_rss_item($entry);
$this->showTwitterRssItem($entry);
}
$this->end_twitter_rss();
$this->endTwitterRss();
}
/**
......@@ -306,7 +306,7 @@ class ApiDirectMessageAction extends ApiAuthAction
function showAtomDirectMessages()
{
$this->init_document('atom');
$this->initDocument('atom');
$this->element('title', null, $this->title);
$this->element('id', null, $this->id);
......@@ -334,7 +334,7 @@ class ApiDirectMessageAction extends ApiAuthAction
$this->showTwitterAtomEntry($entry);
}
$this->end_document('atom');
$this->endDocument('atom');
}
/**
......
......@@ -135,7 +135,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
$this->user->blowFavesCache();
if ($this->format == 'xml') {
$this->show_single_xml_status($this->notice);
$this->showSingleXmlStatus($this->notice);
} elseif ($this->format == 'json') {
$this->show_single_json_status($this->notice);
}
......
......@@ -138,7 +138,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
$this->user->blowFavesCache();
if ($this->format == 'xml') {
$this->show_single_xml_status($this->notice);
$this->showSingleXmlStatus($this->notice);
} elseif ($this->format == 'json') {
$this->show_single_json_status($this->notice);
}
......
......@@ -126,9 +126,9 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
return;
}
$this->init_document($this->format);
$this->show_profile($this->other, $this->format);
$this->end_document($this->format);
$this->initDocument($this->format);
$this->showProfile($this->other, $this->format);
$this->endDocument($this->format);
}
}
......@@ -128,9 +128,9 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
return;
}
$this->init_document($this->format);
$this->show_profile($this->other, $this->format);
$this->end_document($this->format);
$this->initDocument($this->format);
$this->showProfile($this->other, $this->format);
$this->endDocument($this->format);
}
}
......@@ -107,14 +107,14 @@ class ApiFriendshipsExistsAction extends ApiAction
switch ($this->format) {
case 'xml':
$this->init_document('xml');
$this->initDocument('xml');
$this->element('friends', null, $result);
$this->end_document('xml');
$this->endDocument('xml');
break;
case 'json':
$this->init_document('json');
$this->initDocument('json');
print json_encode($result);
$this->end_document('json');
$this->endDocument('json');
break;
default:
break;
......
......@@ -143,18 +143,18 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
return;
}
$result = $this->twitter_relationship_array($this->source, $this->target);
$result = $this->twitterRelationshipArray($this->source, $this->target);
switch ($this->format) {
case 'xml':
$this->init_document('xml');
$this->show_twitter_xml_relationship($result[relationship]);
$this->end_document('xml');
$this->initDocument('xml');
$this->showTwitterXmlRelationship($result[relationship]);
$this->endDocument('xml');
break;
case 'json':
$this->init_document('json');
$this->initDocument('json');
print json_encode($result);
$this->end_document('json');
$this->endDocument('json');
break;
default:
break;
......
......@@ -95,14 +95,14 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
switch($this->format) {
case 'xml':
$this->init_document('xml');
$this->initDocument('xml');
$this->element('is_member', null, $is_member);
$this->end_document('xml');
$this->endDocument('xml');
break;
case 'json':
$this->init_document('json');
$this->show_json_objects(array('is_member' => $is_member));
$this->end_document('json');
$this->initDocument('json');
$this->showJsonObjects(array('is_member' => $is_member));
$this->endDocument('json');
break;
default:
$this->clientError(
......
......@@ -143,7 +143,7 @@ class ApiGroupJoinAction extends ApiAuthAction
$this->show_single_xml_group($this->group);
break;
case 'json':
$this->show_single_json_group($this->group);
$this->showSingleJsonGroup($this->group);
break;
default:
$this->clientError(
......
......@@ -129,7 +129,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
$this->show_single_xml_group($this->group);
break;
case 'json':
$this->show_single_json_group($this->group);
$this->showSingleJsonGroup($this->group);
break;
default:
$this->clientError(
......
......@@ -101,15 +101,15 @@ class ApiGroupListAction extends ApiBareAuthAction
switch($this->format) {
case 'xml':
$this->show_xml_groups($this->groups);
$this->showXmlGroups($this->groups);
break;
case 'rss':
$this->show_rss_groups($this->groups, $title, $link, $subtitle);
$this->showRssGroups($this->groups, $title, $link, $subtitle);
break;
case 'atom':
$selfuri = common_root_url() . 'api/statusnet/groups/list/' .
$this->user->id . '.atom';
$this->show_atom_groups(
$this->showAtomGroups(
$this->groups,
$title,
$id,
......@@ -119,7 +119,7 @@ class ApiGroupListAction extends ApiBareAuthAction
);
break;
case 'json':
$this->show_json_groups($this->groups);
$this->showJsonGroups($this->groups);
break;
default:
$this->clientError(
......
......@@ -89,15 +89,15 @@ class ApiGroupListAllAction extends ApiAction
switch($this->format) {
case 'xml':
$this->show_xml_groups($this->groups);
$this->showXmlGroups($this->groups);
break;
case 'rss':
$this->show_rss_groups($this->groups, $title, $link, $subtitle);
$this->showRssGroups($this->groups, $title, $link, $subtitle);
break;
case 'atom':
$selfuri = common_root_url() .
'api/statusnet/groups/list_all.atom';
$this->show_atom_groups(
$this->showAtomGroups(
$this->groups,
$title,
$id,
......@@ -107,7 +107,7 @@ class ApiGroupListAllAction extends ApiAction
);
break;
case 'json':
$this->show_json_groups($this->groups);
$this->showJsonGroups($this->groups);
break;
default:
$this->clientError(
......
......@@ -85,10 +85,10 @@ class ApiGroupMembershipAction extends ApiAction
switch($this->format) {
case 'xml':
$this->show_twitter_xml_users($this->profiles);
$this->showTwitterXmlUsers($this->profiles);
break;
case 'json':
$this->show_json_users($this->profiles);
$this->showJsonUsers($this->profiles);
break;
default:
$this->clientError(
......
......@@ -93,7 +93,7 @@ class ApiGroupShowAction extends ApiAction
$this->show_single_xml_group($this->group);
break;
case 'json':
$this->show_single_json_group($this->group);
$this->showSingleJsonGroup($this->group);
break;
default:
$this->clientError(_('API method not found!'), 404, $this->format);
......
......@@ -74,13 +74,13 @@ class ApiHelpTestAction extends ApiAction
parent::handle($args);
if ($this->format == 'xml') {
$this->init_document('xml');
$this->initDocument('xml');
$this->element('ok', null, 'true');
$this->end_document('xml');
$this->endDocument('xml');
} elseif ($this->format == 'json') {
$this->init_document('json');
$this->initDocument('json');
print '"ok"';
$this->end_document('json');
$this->endDocument('json');
} else {
$this->clientError(
_('API method not found!'),
......
......@@ -112,7 +112,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
$this->notice->delete();
if ($this->format == 'xml') {
$this->show_single_xml_status($this->notice);
$this->showSingleXmlStatus($this->notice);
} elseif ($this->format == 'json') {
$this->show_single_json_status($this->notice);
}
......@@ -134,7 +134,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
{
if (!empty($this->notice)) {
if ($this->format == 'xml') {
$this->show_single_xml_status($this->notice);
$this->showSingleXmlStatus($this->notice);
} elseif ($this->format == 'json') {
$this->show_single_json_status($this->notice);
}
......
......@@ -110,7 +110,7 @@ class ApiStatusesShowAction extends ApiAction
{
if (!empty($this->notice)) {
if ($this->format == 'xml') {
$this->show_single_xml_status($this->notice);
$this->showSingleXmlStatus($this->notice);
} elseif ($this->format == 'json') {
$this->show_single_json_status($this->notice);
}
......
......@@ -201,7 +201,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
{
if (!empty($this->notice)) {
if ($this->format == 'xml') {
$this->show_single_xml_status($this->notice);
$this->showSingleXmlStatus($this->notice);
} elseif ($this->format == 'json') {
$this->show_single_json_status($this->notice);
}
......
......@@ -88,7 +88,7 @@ class ApiStatusnetConfigAction extends ApiAction
switch ($this->format) {
case 'xml':
$this->init_document('xml');
$this->initDocument('xml');
$this->elementStart('config');
// XXX: check that all sections and settings are legal XML elements
......@@ -111,7 +111,7 @@ class ApiStatusnetConfigAction extends ApiAction
$this->elementEnd($section);
}
$this->elementEnd('config');
$this->end_document('xml');
$this->endDocument('xml');
break;
case 'json':
$result = array();
......@@ -122,9 +122,9 @@ class ApiStatusnetConfigAction extends ApiAction
= common_config($section, $setting);
}
}
$this->init_document('json');
$this->show_json_objects($result);
$this->end_document('json');
$this->initDocument('json');
$this->showJsonObjects($result);
$this->endDocument('json');
break;
default:
$this->clientError(
......
......@@ -77,14 +77,14 @@ class ApiStatusnetVersionAction extends ApiAction
switch ($this->format) {
case 'xml':
$this->init_document('xml');
$this->initDocument('xml');
$this->element('version', null, STATUSNET_VERSION);
$this->end_document('xml');
$this->endDocument('xml');
break;
case 'json':
$this->init_document('json');
$this->initDocument('json');
print '"'.STATUSNET_VERSION.'"';
$this->end_document('json');
$this->endDocument('json');
break;
default:
$this->clientError(
......
......@@ -108,7 +108,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
return;
}
$this->init_document($this->format);
$this->initDocument($this->format);
if (isset($this->ids_only)) {
$this->showIds();
......@@ -116,7 +116,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
$this->showProfiles(isset($this->lite) ? false : true);
}
$this->end_document($this->format);
$this->endDocument($this->format);
}
/**
......@@ -204,7 +204,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
case 'xml':
$this->elementStart('users', array('type' => 'array'));
foreach ($this->profiles as $profile) {
$this->show_profile(
$this->showProfile(
$profile,
$this->format,
null,
......@@ -216,7 +216,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
case 'json':
$arrays = array();
foreach ($this->profiles as $profile) {
$arrays[] = $this->twitter_user_array(
$arrays[] = $this->twitterUserArray(
$profile,
$include_statuses
);
......
......@@ -121,21 +121,21 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
switch($this->format) {
case 'xml':
$this->show_xml_timeline($this->notices);
$this->showXmlTimeline($this->notices);
break;
case 'rss':
$this->show_rss_timeline($this->notices, $title, $link, $subtitle);
$this->showRssTimeline($this->notices, $title, $link, $subtitle);
break;
case 'atom':
$selfuri = common_root_url() .
ltrim($_SERVER['QUERY_STRING'], 'p=');
$this->show_atom_timeline(
$this->showAtomTimeline(
$this->notices, $title, $id, $link, $subtitle,
null, $selfuri
);
break;
case 'json':
$this->show_json_timeline($this->notices);
$this->showJsonTimeline($this->notices);
break;
default:
$this->clientError(_('API method not found!'), $code = 404);
......
......@@ -112,10 +112,10 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
switch($this->format) {
case 'xml':
$this->show_xml_timeline($this->notices);
$this->showXmlTimeline($this->notices);
break;
case 'rss':
$this->show_rss_timeline($this->notices, $title, $link, $subtitle);
$this->showRssTimeline($this->notices, $title, $link, $subtitle);
break;
case 'atom':
......@@ -130,13 +130,13 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
'api/statuses/friends_timeline.atom';
}
$this->show_atom_timeline(
$this->showAtomTimeline(
$this->notices, $title, $id, $link,
$subtitle, null, $selfuri
);
break;
case 'json':
$this->show_json_timeline($this->notices);
$this->showJsonTimeline($this->notices);
break;
default:
$this->clientError(_('API method not found!'), $code = 404);
......
......@@ -108,16 +108,16 @@ class ApiTimelineGroupAction extends ApiAction
switch($this->format) {
case 'xml':
$this->show_xml_timeline($this->notices);
$this->showXmlTimeline($this->notices);
break;
case 'rss':
$this->show_rss_timeline($this->notices, $title, $link, $subtitle);
$this->showRssTimeline($this->notices, $title, $link, $subtitle);
break;
case 'atom':
$selfuri = common_root_url() .
'api/statusnet/groups/timeline/' .
$this->group->nickname . '.atom';
$this->show_atom_timeline(
$this->showAtomTimeline(
$this->notices,
$title,
$id,
......@@ -128,7 +128,7 @@ class ApiTimelineGroupAction extends ApiAction
);
break;
case 'json':
$this->show_json_timeline($this->notices);
$this->showJsonTimeline($this->notices);
break;
default:
$this->clientError(
......
......@@ -118,21 +118,21 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
switch($this->format) {
case 'xml':
$this->show_xml_timeline($this->notices);
$this->showXmlTimeline($this->notices);
break;
case 'rss':
$this->show_rss_timeline($this->notices, $title, $link, $subtitle);
$this->showRssTimeline($this->notices, $title, $link, $subtitle);
break;
case 'atom':
$selfuri = common_root_url() .
ltrim($_SERVER['QUERY_STRING'], 'p=');
$this->show_atom_timeline(
$this->showAtomTimeline(
$this->notices, $title, $id, $link, $subtitle,
null, $selfuri
);
break;
case 'json':
$this->show_json_timeline($this->notices);
$this->showJsonTimeline($this->notices);
break;
default:
$this->clientError(_('API method not found!'), $code = 404);
......
......@@ -99,20 +99,20 @@ class ApiTimelinePublicAction extends ApiAction
switch($this->format) {
case 'xml':
$this->show_xml_timeline($this->notices);
$this->showXmlTimeline($this->notices);
break;
case 'rss':
$this->show_rss_timeline($this->notices, $title, $link, $subtitle);
$this->showRssTimeline($this->notices, $title, $link, $subtitle);
break;
case 'atom':
$selfuri = common_root_url() . 'api/statuses/public_timeline.atom';
$this->show_atom_timeline(
$this->showAtomTimeline(
$this->notices, $title, $id, $link,
$subtitle, null, $selfuri
);
break;
case 'json':
$this->show_json_timeline($this->notices);
$this->showJsonTimeline($this->notices);
break;
default:
$this->clientError(_('API method not found!'), $code = 404);
......
......@@ -107,16 +107,16 @@ class ApiTimelineTagAction extends ApiAction
switch($this->format) {
case 'xml':
$this->show_xml_timeline($this->notices);
$this->showXmlTimeline($this->notices);
break;
case 'rss':
$this->show_rss_timeline($this->notices, $title, $link, $subtitle);
$this->showRssTimeline($this->notices, $title, $link, $subtitle);
break;
case 'atom':
$selfuri = common_root_url() .
'api/statusnet/tags/timeline/' .
$this->tag . '.atom';
$this->show_atom_timeline(
$this->showAtomTimeline(
$this->notices,
$title,
$id,
......@@ -127,7 +127,7 @@ class ApiTimelineTagAction extends ApiAction
);
break;
case 'json':
$this->show_json_timeline($this->notices);
$this->showJsonTimeline($this->notices);
break;
default:
$this->clientError(_('API method not found!'), $code = 404);
......
......@@ -123,10 +123,10 @@ class ApiTimelineUserAction extends ApiBareAuthAction
switch($this->format) {
case 'xml':
$this->show_xml_timeline($this->notices);
$this->showXmlTimeline($this->notices);
break;
case 'rss':
$this->show_rss_timeline(
$this->showRssTimeline(
$this->notices, $title, $link,
$subtitle, $suplink
);
......@@ -140,13 +140,13 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$selfuri = common_root_url() .
'api/statuses/user_timeline.atom';
}
$this->show_atom_timeline(
$this->showAtomTimeline(
$this->notices, $title, $id, $link,
$subtitle, $suplink, $selfuri
);
break;
case 'json':
$this->show_json_timeline($this->notices);
$this->showJsonTimeline($this->notices);
break;
default:
$this->clientError(_('API method not found!'), $code = 404);
......
......@@ -105,16 +105,16 @@ class ApiUserShowAction extends ApiAction
return;
}
$twitter_user = $this->twitter_user_array($this->user->getProfile(), true);
$twitter_user = $this->twitterUserArray($this->user->getProfile(), true);
if ($this->format == 'xml') {
$this->init_document('xml');
$this->show_twitter_xml_user($twitter_user);
$this->end_document('xml');
$this->initDocument('xml');
$this->showTwitterXmlUser($twitter_user);
$this->endDocument('xml');
} elseif ($this->format == 'json') {
$this->init_document('json');
$this->show_json_objects($twitter_user);
$this->end_document('json');
$this->initDocument('json');
$this->showJsonObjects($twitter_user);
$this->endDocument('json');
}
}
......
......@@ -340,7 +340,7 @@ class TwitapisearchatomAction extends ApiAction
// TODO: Here is where we'd put in a link to an atom feed for threads
$this->element("twitter:source", null,
htmlentities($this->source_link($notice->source)));
htmlentities($this->sourceLink($notice->source)));
$this->elementStart('author');
......
......@@ -134,9 +134,9 @@ class TwitapisearchjsonAction extends ApiAction
$results = new JSONSearchResultsList($notice, $q, $this->rpp, $this->page);