Add other languages to drop down

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

diff --git a/lib/omb.php b/lib/omb.php
index 5f34e9e132677c217741d9ba48bba97305b790d2..0bc537db36417d018758069762ae9eb4cbb68ee4 100644 (file)
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -130,6 +130,7 @@ function omb_broadcast_remote_subscribers($notice) {
                        }
                }
        }
+       return true;
 }
 
 function omb_post_notice($notice, $remote_profile, $subscription) {
@@ -151,7 +152,7 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
                                                                                                                   array('notice' =>
                                                                                                                                 $notice->id)));
        $req->set_parameter('omb_notice_license', $config['license']['url']);
-       
+
        $req->sign_request(omb_hmac_sha1(), $con, $token);
 
        # We re-use this tool's fetcher, since it's pretty good
@@ -162,13 +163,13 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
                                                         $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();
                return false;
        } else if ($result->status != 200) {
-               common_debug('Error status '.$result->status, __FILE__);                
+               common_debug('Error status '.$result->status, __FILE__);
                return false;
        } else { # success!
                parse_str($result->body, $return);
@@ -184,7 +185,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 +203,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,39 +214,43 @@ 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
-       
+
        $req->set_parameter('omb_listenee_fullname',
                                                ($profile->fullname) ? $profile->fullname : '');
-       $req->set_parameter('omb_listenee_homepage', 
+       $req->set_parameter('omb_listenee_homepage',
                                                ($profile->homepage) ? $profile->homepage : '');
-       $req->set_parameter('omb_listenee_bio', 
+       $req->set_parameter('omb_listenee_bio',
                                                ($profile->bio) ? $profile->bio : '');
        $req->set_parameter('omb_listenee_location',
                                                ($profile->location) ? $profile->location : '');
-       
+
        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-       $req->set_parameter('omb_listenee_avatar', 
+       $req->set_parameter('omb_listenee_avatar',
                                                ($avatar) ? $avatar->url : '');
-       
+
        $req->sign_request(omb_hmac_sha1(), $con, $token);
 
        # We re-use this tool's fetcher, since it's pretty good
 
        $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();
                return false;
        } else if ($result->status != 200) {
-               common_debug('Error status '.$result->status, __FILE__);                
+               common_debug('Error status '.$result->status, __FILE__);
                return false;
        } else { # success!
                parse_str($result->body, $return);