add OpenID settings to settings menu

[quix0rs-gnu-social.git] / lib / omb.php

diff --git a/lib/omb.php b/lib/omb.php
index 5f34e9e132677c217741d9ba48bba97305b790d2..9b0b1fd24e52d3984cdd8b63c036d388647c0ab7 100644 (file)
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -184,7 +184,7 @@ function omb_broadcast_profile($profile) {
        # First, get remote users subscribed to this profile
        # XXX: use a join here rather than looping through results
        $sub = new Subscription();
-       $sub->subscribed = $notice->profile_id;
+       $sub->subscribed = $profile->id;
        if ($sub->find()) {
                $updated = array();
                while ($sub->fetch()) {
@@ -202,10 +202,10 @@ function omb_broadcast_profile($profile) {
 
 function omb_update_profile($profile, $remote_profile, $subscription) {
        global $config; # for license URL
-       $user = User::staticGet('id', $notice->profile_id);
+       $user = User::staticGet($profile->id);
        $con = omb_oauth_consumer();
        $token = new OAuthToken($subscription->token, $subscription->secret);
-       $url = $remote_profile->postnoticeurl;
+       $url = $remote_profile->updateprofileurl;
        $parsed = parse_url($url);
        $params = array();
        parse_str($parsed['query'], $params);
@@ -213,8 +213,8 @@ function omb_update_profile($profile, $remote_profile, $subscription) {
                                                                                                 "POST", $url, $params);
        $req->set_parameter('omb_version', OMB_VERSION_01);
        $req->set_parameter('omb_listenee', $user->uri);
-       $req->set_parameter('omb_listenee_profile', common_profile_url($user->nickname));
-       $req->set_parameter('omb_listenee_nickname', $user->nickname);
+       $req->set_parameter('omb_listenee_profile', common_profile_url($profile->nickname));
+       $req->set_parameter('omb_listenee_nickname', $profile->nickname);
        
        # We use blanks to force emptying any existing values in these optional fields
        
@@ -237,9 +237,13 @@ function omb_update_profile($profile, $remote_profile, $subscription) {
 
        $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
 
+       common_debug('request URL = '.$req->get_normalized_http_url(), __FILE__);
+       common_debug('postdata = '.$req->to_postdata(), __FILE__);
        $result = $fetcher->post($req->get_normalized_http_url(),
                                                         $req->to_postdata());
 
+       common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
+       
        if ($result->status == 403) { # not authorized, don't send again
                common_debug('403 result, deleting subscription', __FILE__);
                $subscription->delete();