diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/finishremotesubscribe.php | 23 | ||||
| -rw-r--r-- | actions/remotesubscribe.php | 2 |
2 files changed, 20 insertions, 5 deletions
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php index 1ec842f26..eb105c1e7 100644 --- a/actions/finishremotesubscribe.php +++ b/actions/finishremotesubscribe.php @@ -140,21 +140,34 @@ class FinishremotesubscribeAction extends Action { } else { $profile->created = DB_DataObject_Cast::dateTime(); # current time $id = $profile->insert(); + if (!$id) { + common_server_error(_t('Error inserting new profile')); + return; + } $remote->id = $id; } if ($avatar_url) { - $this->add_avatar($profile, $avatar_url); + if (!$this->add_avatar($profile, $avatar_url)) { + common_server_error(_t('Error inserting avatar')); + return; + } } - $remote->postnoticeurl = $omb[OMB_ENDPOINT_POSTNOTICE]; - $remote->updateprofileurl = $omb[OMB_ENDPOINT_UPDATEPROFILE]; + $remote->postnoticeurl = $omb['post_notice_url']; + $remote->updateprofileurl = $omb['update_profile_url']; if ($exists) { - $remote->update($orig_remote); + if (!$remote->update($orig_remote)) { + common_server_error(_t('Error updating remote profile')); + return; + } } else { $remote->created = DB_DataObject_Cast::dateTime(); # current time - $remote->insert; + if (!$remote->insert()) { + common_server_error(_t('Error inserting remote profile')); + return; + } } $sub = new Subscription(); diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 8baa3b7af..214bd863a 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -313,6 +313,8 @@ class RemotesubscribeAction extends Action { $omb['secret'] = $secret; # call doesn't work after bounce back so we cache; maybe serialization issue...? $omb['access_token_url'] = omb_service_uri($omb[OAUTH_ENDPOINT_ACCESS]); + $omb['post_notice_url'] = omb_service_uri($omb[OMB_ENDPOINT_POSTNOTICE]); + $omb['update_profile_url'] = omb_service_uri($omb[OMB_ENDPOINT_UPDATEPROFILE]); $_SESSION['oauth_authorization_request'] = $omb; |