diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
| commit | 4b656f47dff2bd6eed4dcfad060b8434d052d883 (patch) | |
| tree | 6acc353a739f712ecbca9d825dcb7fa16f429ff1 /lib/omb.php | |
| parent | 67921b1c1871e881f71f8f15aa7fc9c2b11da64d (diff) | |
Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
Diffstat (limited to 'lib/omb.php')
| -rw-r--r-- | lib/omb.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/omb.php b/lib/omb.php index 89d7f4145..0bc537db3 100644 --- a/lib/omb.php +++ b/lib/omb.php @@ -152,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 @@ -163,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); @@ -216,22 +216,22 @@ function omb_update_profile($profile, $remote_profile, $subscription) { $req->set_parameter('omb_listenee', $user->uri); $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 @@ -244,13 +244,13 @@ function omb_update_profile($profile, $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); |