summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-25 22:10:55 +0000
committerBrion Vibber <brion@pobox.com>2009-11-25 22:22:21 +0000
commit4d71dbe98c0aa6347415d72b49378ae9b6f73f3f (patch)
treeabb2a3326d8f00a2d422c33c8945f572389cd9ca
parent1ea5ccc5c1bcf3113164c67f552508e4c24041e6 (diff)
Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
DB_DataObject hides errors by silently returning null for any non-existent method call, making it harder to tell what the heck's going on... the rights check for blocked remote users returned null for the check for subscribe rights, thus eval'ing to false. We now log a note in this circumstance, which would have cut about 3 hours off of the debug time.
-rw-r--r--classes/Remote_profile.php10
-rw-r--r--lib/oauthstore.php1
2 files changed, 11 insertions, 0 deletions
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index 9f7bfeadc..0a1676a6a 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -43,4 +43,14 @@ class Remote_profile extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
+
+ function hasRight($right)
+ {
+ $profile = Profile::staticGet($this->id);
+ if ($profile) {
+ return $profile->hasright($right);
+ } else {
+ throw new Exception("Missing profile");
+ }
+ }
}
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index b04bcbb8b..e34bf8a5e 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -463,6 +463,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$subscriber = $this->_getAnyProfile($subscriber_uri);
if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
+ common_log(LOG_INFO, __METHOD__ . ": remote subscriber banned ($subscriber_uri subbing to $subscribed_user_uri)");
return _('You have been banned from subscribing.');
}