replace all tabs with four spaces
The PEAR coding standards decree: no tabs, but indent by four spaces. I've done a global search-and-replace on all tabs, replacing them by four spaces. This is a huge change, but it will go a long way to getting us towards phpcs-compliance. And that means better code readability, and that means more participation. darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
This commit is contained in:
Evan Prodromou
@@ -23,265 +23,265 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
|
||||
|
||||
class Twitapidirect_messagesAction extends TwitterapiAction {
|
||||
|
||||
function direct_messages($args, $apidata) {
|
||||
parent::handle($args);
|
||||
return $this->show_messages($args, $apidata, 'received');
|
||||
}
|
||||
function direct_messages($args, $apidata) {
|
||||
parent::handle($args);
|
||||
return $this->show_messages($args, $apidata, 'received');
|
||||
}
|
||||
|
||||
function sent($args, $apidata) {
|
||||
parent::handle($args);
|
||||
return $this->show_messages($args, $apidata, 'sent');
|
||||
}
|
||||
function sent($args, $apidata) {
|
||||
parent::handle($args);
|
||||
return $this->show_messages($args, $apidata, 'sent');
|
||||
}
|
||||
|
||||
function show_messages($args, $apidata, $type) {
|
||||
function show_messages($args, $apidata, $type) {
|
||||
|
||||
$user = $apidata['user'];
|
||||
$user = $apidata['user'];
|
||||
|
||||
$count = $this->arg('count');
|
||||
$since = $this->arg('since');
|
||||
$since_id = $this->arg('since_id');
|
||||
$before_id = $this->arg('before_id');
|
||||
$count = $this->arg('count');
|
||||
$since = $this->arg('since');
|
||||
$since_id = $this->arg('since_id');
|
||||
$before_id = $this->arg('before_id');
|
||||
|
||||
$page = $this->arg('page');
|
||||
$page = $this->arg('page');
|
||||
|
||||
if (!$page) {
|
||||
$page = 1;
|
||||
}
|
||||
if (!$page) {
|
||||
$page = 1;
|
||||
}
|
||||
|
||||
if (!$count) {
|
||||
$count = 20;
|
||||
}
|
||||
if (!$count) {
|
||||
$count = 20;
|
||||
}
|
||||
|
||||
$message = new Message();
|
||||
$message = new Message();
|
||||
|
||||
$title = null;
|
||||
$subtitle = null;
|
||||
$link = null;
|
||||
$server = common_root_url();
|
||||
$title = null;
|
||||
$subtitle = null;
|
||||
$link = null;
|
||||
$server = common_root_url();
|
||||
|
||||
if ($type == 'received') {
|
||||
$message->to_profile = $user->id;
|
||||
$title = sprintf(_("Direct messages to %s"), $user->nickname);
|
||||
$subtitle = sprintf(_("All the direct messages sent to %s"), $user->nickname);
|
||||
$link = $server . $user->nickname . '/inbox';
|
||||
} else {
|
||||
$message->from_profile = $user->id;
|
||||
$title = _('Direct Messages You\'ve Sent');
|
||||
$subtitle = sprintf(_("All the direct messages sent from %s"), $user->nickname);
|
||||
$link = $server . $user->nickname . '/outbox';
|
||||
}
|
||||
if ($type == 'received') {
|
||||
$message->to_profile = $user->id;
|
||||
$title = sprintf(_("Direct messages to %s"), $user->nickname);
|
||||
$subtitle = sprintf(_("All the direct messages sent to %s"), $user->nickname);
|
||||
$link = $server . $user->nickname . '/inbox';
|
||||
} else {
|
||||
$message->from_profile = $user->id;
|
||||
$title = _('Direct Messages You\'ve Sent');
|
||||
$subtitle = sprintf(_("All the direct messages sent from %s"), $user->nickname);
|
||||
$link = $server . $user->nickname . '/outbox';
|
||||
}
|
||||
|
||||
if ($before_id) {
|
||||
$message->whereAdd("id < $before_id");
|
||||
}
|
||||
if ($before_id) {
|
||||
$message->whereAdd("id < $before_id");
|
||||
}
|
||||
|
||||
if ($since_id) {
|
||||
$message->whereAdd("id > $since_id");
|
||||
}
|
||||
if ($since_id) {
|
||||
$message->whereAdd("id > $since_id");
|
||||
}
|
||||
|
||||
$since = strtotime($this->arg('since'));
|
||||
$since = strtotime($this->arg('since'));
|
||||
|
||||
if ($since) {
|
||||
$d = date('Y-m-d H:i:s', $since);
|
||||
$message->whereAdd("created > '$d'");
|
||||
}
|
||||
if ($since) {
|
||||
$d = date('Y-m-d H:i:s', $since);
|
||||
$message->whereAdd("created > '$d'");
|
||||
}
|
||||
|
||||
$message->orderBy('created DESC, id DESC');
|
||||
$message->limit((($page-1)*20), $count);
|
||||
$message->find();
|
||||
$message->orderBy('created DESC, id DESC');
|
||||
$message->limit((($page-1)*20), $count);
|
||||
$message->find();
|
||||
|
||||
switch($apidata['content-type']) {
|
||||
case 'xml':
|
||||
$this->show_xml_dmsgs($message);
|
||||
break;
|
||||
case 'rss':
|
||||
$this->show_rss_dmsgs($message, $title, $link, $subtitle);
|
||||
break;
|
||||
case 'atom':
|
||||
$this->show_atom_dmsgs($message, $title, $link, $subtitle);
|
||||
break;
|
||||
case 'json':
|
||||
$this->show_json_dmsgs($message);
|
||||
break;
|
||||
default:
|
||||
common_user_error(_('API method not found!'), $code = 404);
|
||||
}
|
||||
switch($apidata['content-type']) {
|
||||
case 'xml':
|
||||
$this->show_xml_dmsgs($message);
|
||||
break;
|
||||
case 'rss':
|
||||
$this->show_rss_dmsgs($message, $title, $link, $subtitle);
|
||||
break;
|
||||
case 'atom':
|
||||
$this->show_atom_dmsgs($message, $title, $link, $subtitle);
|
||||
break;
|
||||
case 'json':
|
||||
$this->show_json_dmsgs($message);
|
||||
break;
|
||||
default:
|
||||
common_user_error(_('API method not found!'), $code = 404);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// had to change this from "new" to "create" to avoid PHP reserved word
|
||||
function create($args, $apidata) {
|
||||
parent::handle($args);
|
||||
// had to change this from "new" to "create" to avoid PHP reserved word
|
||||
function create($args, $apidata) {
|
||||
parent::handle($args);
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
|
||||
$this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
|
||||
return;
|
||||
}
|
||||
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
|
||||
$this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
|
||||
return;
|
||||
}
|
||||
|
||||
$user = $apidata['user'];
|
||||
$source = $this->trimmed('source'); // Not supported by Twitter.
|
||||
$user = $apidata['user'];
|
||||
$source = $this->trimmed('source'); // Not supported by Twitter.
|
||||
|
||||
$reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
|
||||
if (!$source || in_array($source, $reserved_sources)) {
|
||||
$source = 'api';
|
||||
}
|
||||
if (!$source || in_array($source, $reserved_sources)) {
|
||||
$source = 'api';
|
||||
}
|
||||
|
||||
$content = $this->trimmed('text');
|
||||
$content = $this->trimmed('text');
|
||||
|
||||
if (!$content) {
|
||||
$this->client_error(_('No message text!'), $code = 406, $apidata['content-type']);
|
||||
} else {
|
||||
$content_shortened = common_shorten_links($content);
|
||||
if (mb_strlen($content_shortened) > 140) {
|
||||
$this->client_error(_('That\'s too long. Max message size is 140 chars.'),
|
||||
$code = 406, $apidata['content-type']);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (!$content) {
|
||||
$this->client_error(_('No message text!'), $code = 406, $apidata['content-type']);
|
||||
} else {
|
||||
$content_shortened = common_shorten_links($content);
|
||||
if (mb_strlen($content_shortened) > 140) {
|
||||
$this->client_error(_('That\'s too long. Max message size is 140 chars.'),
|
||||
$code = 406, $apidata['content-type']);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$other = $this->get_user($this->trimmed('user'));
|
||||
$other = $this->get_user($this->trimmed('user'));
|
||||
|
||||
if (!$other) {
|
||||
$this->client_error(_('Recipient user not found.'), $code = 403, $apidata['content-type']);
|
||||
return;
|
||||
} else if (!$user->mutuallySubscribed($other)) {
|
||||
$this->client_error(_('Can\'t send direct messages to users who aren\'t your friend.'),
|
||||
$code = 403, $apidata['content-type']);
|
||||
return;
|
||||
} else if ($user->id == $other->id) {
|
||||
// Sending msgs to yourself is allowed by Twitter
|
||||
$this->client_error(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'),
|
||||
$code = 403, $apidata['content-type']);
|
||||
return;
|
||||
}
|
||||
if (!$other) {
|
||||
$this->client_error(_('Recipient user not found.'), $code = 403, $apidata['content-type']);
|
||||
return;
|
||||
} else if (!$user->mutuallySubscribed($other)) {
|
||||
$this->client_error(_('Can\'t send direct messages to users who aren\'t your friend.'),
|
||||
$code = 403, $apidata['content-type']);
|
||||
return;
|
||||
} else if ($user->id == $other->id) {
|
||||
// Sending msgs to yourself is allowed by Twitter
|
||||
$this->client_error(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'),
|
||||
$code = 403, $apidata['content-type']);
|
||||
return;
|
||||
}
|
||||
|
||||
$message = Message::saveNew($user->id, $other->id,
|
||||
html_entity_decode($content, ENT_NOQUOTES, 'UTF-8'), $source);
|
||||
$message = Message::saveNew($user->id, $other->id,
|
||||
html_entity_decode($content, ENT_NOQUOTES, 'UTF-8'), $source);
|
||||
|
||||
if (is_string($message)) {
|
||||
$this->server_error($message);
|
||||
return;
|
||||
}
|
||||
if (is_string($message)) {
|
||||
$this->server_error($message);
|
||||
return;
|
||||
}
|
||||
|
||||
$this->notify($user, $other, $message);
|
||||
$this->notify($user, $other, $message);
|
||||
|
||||
if ($apidata['content-type'] == 'xml') {
|
||||
$this->show_single_xml_dmsg($message);
|
||||
} elseif ($apidata['content-type'] == 'json') {
|
||||
$this->show_single_json_dmsg($message);
|
||||
}
|
||||
if ($apidata['content-type'] == 'xml') {
|
||||
$this->show_single_xml_dmsg($message);
|
||||
} elseif ($apidata['content-type'] == 'json') {
|
||||
$this->show_single_json_dmsg($message);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function destroy($args, $apidata) {
|
||||
parent::handle($args);
|
||||
common_server_error(_('API method under construction.'), $code=501);
|
||||
}
|
||||
function destroy($args, $apidata) {
|
||||
parent::handle($args);
|
||||
common_server_error(_('API method under construction.'), $code=501);
|
||||
}
|
||||
|
||||
function show_xml_dmsgs($message) {
|
||||
function show_xml_dmsgs($message) {
|
||||
|
||||
$this->init_document('xml');
|
||||
common_element_start('direct-messages', array('type' => 'array'));
|
||||
$this->init_document('xml');
|
||||
common_element_start('direct-messages', array('type' => 'array'));
|
||||
|
||||
if (is_array($messages)) {
|
||||
foreach ($message as $m) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($m);
|
||||
$this->show_twitter_xml_dmsg($twitter_dm);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($message);
|
||||
$this->show_twitter_xml_dmsg($twitter_dm);
|
||||
}
|
||||
}
|
||||
if (is_array($messages)) {
|
||||
foreach ($message as $m) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($m);
|
||||
$this->show_twitter_xml_dmsg($twitter_dm);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($message);
|
||||
$this->show_twitter_xml_dmsg($twitter_dm);
|
||||
}
|
||||
}
|
||||
|
||||
common_element_end('direct-messages');
|
||||
$this->end_document('xml');
|
||||
common_element_end('direct-messages');
|
||||
$this->end_document('xml');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function show_json_dmsgs($message) {
|
||||
function show_json_dmsgs($message) {
|
||||
|
||||
$this->init_document('json');
|
||||
$this->init_document('json');
|
||||
|
||||
$dmsgs = array();
|
||||
$dmsgs = array();
|
||||
|
||||
if (is_array($message)) {
|
||||
foreach ($message as $m) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($m);
|
||||
array_push($dmsgs, $twitter_dm);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($message);
|
||||
array_push($dmsgs, $twitter_dm);
|
||||
}
|
||||
}
|
||||
if (is_array($message)) {
|
||||
foreach ($message as $m) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($m);
|
||||
array_push($dmsgs, $twitter_dm);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$twitter_dm = $this->twitter_dmsg_array($message);
|
||||
array_push($dmsgs, $twitter_dm);
|
||||
}
|
||||
}
|
||||
|
||||
$this->show_json_objects($dmsgs);
|
||||
$this->end_document('json');
|
||||
$this->show_json_objects($dmsgs);
|
||||
$this->end_document('json');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function show_rss_dmsgs($message, $title, $link, $subtitle) {
|
||||
function show_rss_dmsgs($message, $title, $link, $subtitle) {
|
||||
|
||||
$this->init_document('rss');
|
||||
$this->init_document('rss');
|
||||
|
||||
common_element_start('channel');
|
||||
common_element('title', NULL, $title);
|
||||
common_element_start('channel');
|
||||
common_element('title', NULL, $title);
|
||||
|
||||
common_element('link', NULL, $link);
|
||||
common_element('description', NULL, $subtitle);
|
||||
common_element('language', NULL, 'en-us');
|
||||
common_element('ttl', NULL, '40');
|
||||
common_element('link', NULL, $link);
|
||||
common_element('description', NULL, $subtitle);
|
||||
common_element('language', NULL, 'en-us');
|
||||
common_element('ttl', NULL, '40');
|
||||
|
||||
if (is_array($message)) {
|
||||
foreach ($message as $m) {
|
||||
$entry = $this->twitter_rss_dmsg_array($m);
|
||||
$this->show_twitter_rss_item($entry);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$entry = $this->twitter_rss_dmsg_array($message);
|
||||
$this->show_twitter_rss_item($entry);
|
||||
}
|
||||
}
|
||||
if (is_array($message)) {
|
||||
foreach ($message as $m) {
|
||||
$entry = $this->twitter_rss_dmsg_array($m);
|
||||
$this->show_twitter_rss_item($entry);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$entry = $this->twitter_rss_dmsg_array($message);
|
||||
$this->show_twitter_rss_item($entry);
|
||||
}
|
||||
}
|
||||
|
||||
common_element_end('channel');
|
||||
$this->end_twitter_rss();
|
||||
common_element_end('channel');
|
||||
$this->end_twitter_rss();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function show_atom_dmsgs($message, $title, $link, $subtitle) {
|
||||
function show_atom_dmsgs($message, $title, $link, $subtitle) {
|
||||
|
||||
$this->init_document('atom');
|
||||
$this->init_document('atom');
|
||||
|
||||
common_element('title', NULL, $title);
|
||||
$siteserver = common_config('site', 'server');
|
||||
common_element('id', NULL, "tag:$siteserver,2008:DirectMessage");
|
||||
common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), NULL);
|
||||
common_element('updated', NULL, common_date_iso8601(strftime('%c')));
|
||||
common_element('subtitle', NULL, $subtitle);
|
||||
common_element('title', NULL, $title);
|
||||
$siteserver = common_config('site', 'server');
|
||||
common_element('id', NULL, "tag:$siteserver,2008:DirectMessage");
|
||||
common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), NULL);
|
||||
common_element('updated', NULL, common_date_iso8601(strftime('%c')));
|
||||
common_element('subtitle', NULL, $subtitle);
|
||||
|
||||
if (is_array($message)) {
|
||||
foreach ($message as $m) {
|
||||
$entry = $this->twitter_rss_dmsg_array($m);
|
||||
$this->show_twitter_atom_entry($entry);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$entry = $this->twitter_rss_dmsg_array($message);
|
||||
$this->show_twitter_atom_entry($entry);
|
||||
}
|
||||
}
|
||||
if (is_array($message)) {
|
||||
foreach ($message as $m) {
|
||||
$entry = $this->twitter_rss_dmsg_array($m);
|
||||
$this->show_twitter_atom_entry($entry);
|
||||
}
|
||||
} else {
|
||||
while ($message->fetch()) {
|
||||
$entry = $this->twitter_rss_dmsg_array($message);
|
||||
$this->show_twitter_atom_entry($entry);
|
||||
}
|
||||
}
|
||||
|
||||
$this->end_document('atom');
|
||||
}
|
||||
$this->end_document('atom');
|
||||
}
|
||||
|
||||
// swiped from MessageAction. Should it be place in util.php?
|
||||
function notify($from, $to, $message) {
|
||||
mail_notify_message($message, $from, $to);
|
||||
# XXX: Jabber, SMS notifications... probably queued
|
||||
}
|
||||
// swiped from MessageAction. Should it be place in util.php?
|
||||
function notify($from, $to, $message) {
|
||||
mail_notify_message($message, $from, $to);
|
||||
# XXX: Jabber, SMS notifications... probably queued
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user