diff options
author | Federico Marani <federico.marani@ymail.com> | 2009-03-07 13:54:54 +0000 |
---|---|---|
committer | Federico Marani <federico.marani@ymail.com> | 2009-03-07 13:54:54 +0000 |
commit | bab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (patch) | |
tree | 559729d3330991c0c68da96350b71434ca4f6f87 /lib/omb.php | |
parent | a389f157baddafa91347c27194805580b1373e30 (diff) | |
parent | 13c183e2f4e0738233658ca79103bbe4a6d57992 (diff) |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:
lib/util.php
Diffstat (limited to 'lib/omb.php')
-rw-r--r-- | lib/omb.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/omb.php b/lib/omb.php index f2dbef5ba..befcf4666 100644 --- a/lib/omb.php +++ b/lib/omb.php @@ -206,7 +206,7 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) $result = $fetcher->post($req->get_normalized_http_url(), $req->to_postdata(), - array('User-Agent' => 'Laconica/' . LACONICA_VERSION)); + array('User-Agent: Laconica/' . LACONICA_VERSION)); common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__); @@ -239,7 +239,7 @@ function omb_broadcast_profile($profile) while ($sub->fetch()) { $rp = Remote_profile::staticGet('id', $sub->subscriber); if ($rp) { - if (!$updated[$rp->updateprofileurl]) { + if (!array_key_exists($rp->updateprofileurl, $updated)) { if (omb_update_profile($profile, $rp, $sub)) { $updated[$rp->updateprofileurl] = true; } @@ -291,11 +291,13 @@ function omb_update_profile($profile, $remote_profile, $subscription) common_debug('postdata = '.$req->to_postdata(), __FILE__); $result = $fetcher->post($req->get_normalized_http_url(), $req->to_postdata(), - array('User-Agent' => 'Laconica/' . LACONICA_VERSION)); + array('User-Agent: Laconica/' . LACONICA_VERSION)); common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__); - if ($result->status == 403) { # not authorized, don't send again + if (empty($result) || $result) { + common_debug("Unable to contact " . $req->get_normalized_http_url()); + } else if ($result->status == 403) { # not authorized, don't send again common_debug('403 result, deleting subscription', __FILE__); $subscription->delete(); return false; |