summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormillette <millette@controlyourself.ca>2008-12-10 12:37:26 -0500
committermillette <millette@controlyourself.ca>2008-12-10 12:37:26 -0500
commit9553072e49518c8902a0ff7bc66bb18130dcf521 (patch)
treeaad1e1d6bf50ac7f179477c6df3678b9a90ef253
parenta143b6466641901db0536794e51cbfba756c4afd (diff)
api posts cannot use one of the reserved sources: web, omb, mail or xmpp.
darcs-hash:20081210173726-099f7-5fc908c7330ec8b21d101c1498d5b78ab09ee490.gz
-rw-r--r--actions/twitapidirect_messages.php3
-rw-r--r--actions/twitapistatuses.php4
2 files changed, 4 insertions, 3 deletions
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index ed2d5c5d1..a04ae5fa7 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -104,7 +104,8 @@ class Twitapidirect_messagesAction extends TwitterapiAction {
$user = $apidata['user'];
$source = $this->trimmed('source'); // Not supported by Twitter.
- if (!$source) {
+ $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
+ if (!$source || in_array($source, $reserved_sources)) {
$source = 'api';
}
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 1b095079a..6d6d5266f 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -239,8 +239,8 @@ class TwitapistatusesAction extends TwitterapiAction {
$status = $this->trimmed('status');
$source = $this->trimmed('source');
$in_reply_to_status_id = intval($this->trimmed('in_reply_to_status_id'));
-
- if (!$source) {
+ $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
+ if (!$source || in_array($source, $reserved_sources)) {
$source = 'api';
}