diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-19 15:46:39 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-19 15:46:39 -0700 |
| commit | ad651c35353021d05ef4a013e57c17d0b885c5dc (patch) | |
| tree | a2f230e754ee6a09e1349d40d81050c4480343ff | |
| parent | 223795a2e430544e9702b1a6a5680fa4b8dfbb76 (diff) | |
| parent | 8dd29246741cc5afc56594802b1fa3fc38b9367e (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline
| -rw-r--r-- | plugins/Facebook/facebookutil.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index 83664995a..ab2d42726 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -104,9 +104,13 @@ function facebookBroadcastNotice($notice) $status = "$prefix $notice->content"; + common_debug("FacebookPlugin - checking for publish_stream permission for user $user->id"); + $can_publish = $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid); + common_debug("FacebookPlugin - checking for status_update permission for user $user->id"); + $can_update = $facebook->api_client->users_hasAppPermission('status_update', $fbuid); if (!empty($attachments) && $can_publish == 1) { @@ -114,15 +118,15 @@ function facebookBroadcastNotice($notice) $facebook->api_client->stream_publish($status, $fbattachment, null, null, $fbuid); common_log(LOG_INFO, - "Posted notice $notice->id w/attachment " . + "FacebookPlugin - Posted notice $notice->id w/attachment " . "to Facebook user's stream (fbuid = $fbuid)."); } elseif ($can_update == 1 || $can_publish == 1) { $facebook->api_client->users_setStatus($status, $fbuid, false, true); common_log(LOG_INFO, - "Posted notice $notice->id to Facebook " . + "FacebookPlugin - Posted notice $notice->id to Facebook " . "as a status update (fbuid = $fbuid)."); } else { - $msg = "Not sending notice $notice->id to Facebook " . + $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " . "because user $user->nickname hasn't given the " . 'Facebook app \'status_update\' or \'publish_stream\' permission.'; common_log(LOG_WARNING, $msg); @@ -138,7 +142,7 @@ function facebookBroadcastNotice($notice) $code = $e->getCode(); - $msg = "Facebook returned error code $code: " . + $msg = "FacebookPlugin - Facebook returned error code $code: " . $e->getMessage() . ' - ' . "Unable to update Facebook status (notice $notice->id) " . "for $user->nickname (user id: $user->id)!"; |