diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2008-12-11 13:55:25 -0500 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2008-12-11 13:55:25 -0500 |
commit | 06f99d4b55f7542bb27930e46ff99785e6dda823 (patch) | |
tree | 6578642cfb005400c7ddf9ee039536da9d636bf9 /lib | |
parent | 897aa87c8a3aa331051bd8a6b31fa2ec02eb8b5b (diff) |
add User-Agent to OMB requests
darcs-hash:20081211185525-5ed1f-ea300a9f824163ea7989baae4e4b439e58fd0881.gz
Diffstat (limited to 'lib')
-rw-r--r-- | lib/omb.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/omb.php b/lib/omb.php index 8d33fee15..96736b4d4 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) { @@ -158,17 +158,17 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) { } $con = omb_oauth_consumer(); - + $token = new OAuthToken($tk, $secret); - + $url = $postnoticeurl; $parsed = parse_url($url); $params = array(); parse_str($parsed['query'], $params); - + $req = OAuthRequest::from_consumer_and_token($con, $token, 'POST', $url, $params); - + $req->set_parameter('omb_version', OMB_VERSION_01); $req->set_parameter('omb_listenee', $user->uri); $req->set_parameter('omb_notice', $notice->uri); @@ -177,23 +177,24 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) { array('notice' => $notice->id))); $req->set_parameter('omb_notice_license', common_config('license', 'url')); - + $user->free(); unset($user); - + $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(); if (!$fetcher) { common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__); return false; } - + $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__); @@ -275,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__); |