X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fomb.php;h=96736b4d47918bd11a25a3092cabfac838695864;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=03450f46b2d8d0132a66f7d3118ebe306f1cbd23;hpb=580c6ddc7bfe1d2f655b2222499140a44a8f1b61;p=quix0rs-gnu-social.git diff --git a/lib/omb.php b/lib/omb.php index 03450f46b2..96736b4d47 100644 --- a/lib/omb.php +++ b/lib/omb.php @@ -128,7 +128,7 @@ function omb_broadcast_remote_subscribers($notice) { if (!$posted[$rp->postnoticeurl]) { common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl); if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) { - common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl); + common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl); $posted[$rp->postnoticeurl] = TRUE; } else { common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl); @@ -138,7 +138,7 @@ function omb_broadcast_remote_subscribers($notice) { $rp->free(); unset($rp); - + return true; } @@ -149,7 +149,7 @@ function omb_post_notice($notice, $remote_profile, $subscription) { function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) { common_debug('Posting notice ' . $notice->id . ' to ' . $postnoticeurl, __FILE__); - + $user = User::staticGet('id', $notice->profile_id); if (!$user) { @@ -157,76 +157,44 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) { return false; } - common_debug('Creating oauth consumer', __FILE__); - $con = omb_oauth_consumer(); - common_debug('Creating oauth token', __FILE__); - $token = new OAuthToken($tk, $secret); - - common_debug('Parsing URL', __FILE__); - + $url = $postnoticeurl; $parsed = parse_url($url); $params = array(); parse_str($parsed['query'], $params); - - common_debug('Creating request', __FILE__); - + $req = OAuthRequest::from_consumer_and_token($con, $token, 'POST', $url, $params); - - common_debug('Setting version parameter', __FILE__); - + $req->set_parameter('omb_version', OMB_VERSION_01); - - common_debug('Setting listenee parameter', __FILE__); - $req->set_parameter('omb_listenee', $user->uri); - - common_debug('Setting notice parameter', __FILE__); - $req->set_parameter('omb_notice', $notice->uri); - - common_debug('Setting notice content parameter', __FILE__); - $req->set_parameter('omb_notice_content', $notice->content); - - common_debug('Setting notice url parameter', __FILE__); - $req->set_parameter('omb_notice_url', common_local_url('shownotice', array('notice' => $notice->id))); - - common_debug('Setting notice license parameter', __FILE__); - $req->set_parameter('omb_notice_license', common_config('license', 'url')); - common_debug('Freeing the user', __FILE__); - $user->free(); unset($user); - - common_debug('Signing the request', __FILE__); - + $req->sign_request(omb_hmac_sha1(), $con, $token); # We re-use this tool's fetcher, since it's pretty good - common_debug('Initializing Yadis fetcher.', __FILE__); - $fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); if (!$fetcher) { common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__); return false; } - - common_debug('Doing the fetch.', __FILE__); $result = $fetcher->post($req->get_normalized_http_url(), - $req->to_postdata()); + $req->to_postdata(), + array('User-Agent' => 'Laconica/' . LACONICA_VERSION)); common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__); @@ -308,7 +276,8 @@ function omb_update_profile($profile, $remote_profile, $subscription) { 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()); + $req->to_postdata(), + array('User-Agent' => 'Laconica/' . LACONICA_VERSION)); common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);