From ab8bb4d79e5f267323440b8cee01458b393ce2d1 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Fri, 26 Feb 2010 04:07:58 -0500
Subject: [PATCH] more cleanup

---
 plugins/OStatus/classes/Ostatus_profile.php |  2 +-
 plugins/OStatus/lib/discovery.php           |  4 ++++
 plugins/OStatus/lib/magicenvelope.php       | 21 +++++++++++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 4a9aafce1e..091056c541 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1305,7 +1305,7 @@ class Ostatus_profile extends Memcached_DataObject
             case Discovery::UPDATESFROM:
                 $feedUrl = $link['href'];
                 break;
-            case Webfinger::HCARD:
+            case Discovery::HCARD:
                 $hcardUrl = $link['href'];
                 break;
             default:
diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index 1ab6e51bda..388df0a28f 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -111,6 +111,10 @@ class Discovery
     }
 
     public static function getService($links, $service) {
+        if (!is_array($links)) {
+            return false;
+        }
+        
         foreach ($links as $link) {
             if ($link['rel'] == $service) {
                 return $link;
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index c642af5488..457c0fba22 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -52,12 +52,17 @@ class MagicEnvelope
     {
         $disco = new Discovery();
 
-        $xrd = $disco->lookup($signer_uri);
-        if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) {
-            list($type, $keypair) = explode(';', $link['href']);
-            return $keypair;
+        try {
+            $xrd = $disco->lookup($signer_uri);
+        } catch (Exception $e) {
+            return false;
+        }
+        if ($xrd->links) {
+            if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) {
+                list($type, $keypair) = explode(';', $link['href']);
+                return $keypair;
+            }
         }
-
         throw new Exception('Unable to locate signer public key');
     }
 
@@ -70,7 +75,11 @@ class MagicEnvelope
             throw new Exception("Unable to determine entry author.");
         }
 
-        $signature_alg = Magicsig::fromString($this->getKeyPair($signer_uri));
+        $keypair = $this->getKeyPair($signer_uri);
+        if (!$keypair) {
+            throw new Exception("Unable to retrive keypair for ". $signer_uri);
+        }
+        $signature_alg = Magicsig::fromString($keypair);
         $armored_text = base64_encode($text);
 
         return array(