Merge branch 'fix-openid' into 0.9.x

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

diff --git a/lib/omb.php b/lib/omb.php
index 0566701ff16990fbc45b6e3003b6e4f67455c5f7..e2a6d9f3f529f6004ef51c3846ad68a1b31143a6 100644 (file)
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -67,7 +67,14 @@ function omb_hmac_sha1()
 function omb_broadcast_notice($notice)
 {
 
-    $omb_notice = notice_to_omb_notice($notice);
+    try {
+        $omb_notice = notice_to_omb_notice($notice);
+    } catch (Exception $e) {
+        // @fixme we should clean up or highlight the problem item
+        common_log(LOG_ERR, 'Invalid OMB outgoing notice for notice ' . $notice->id);
+        common_log(LOG_ERR, 'Error status '.$e);
+        return true;
+    }
 
     /* Get remote users subscribed to this profile. */
     $rp = new Remote_profile();
@@ -87,7 +94,7 @@ function omb_broadcast_notice($notice)
         common_debug('Posting to ' . $rp->postnoticeurl, __FILE__);
 
         /* Post notice. */
-        $service = new Laconica_OMB_Service_Consumer(
+        $service = new StatusNet_OMB_Service_Consumer(
                      array(OMB_ENDPOINT_POSTNOTICE => $rp->postnoticeurl));
         try {
             $service->setToken($rp->token, $rp->secret);
@@ -102,7 +109,7 @@ function omb_broadcast_notice($notice)
         common_debug('Finished to ' . $rp->postnoticeurl, __FILE__);
     }
 
-    return;
+    return true;
 }
 
 function omb_broadcast_profile($profile)