part of bug #143

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 4dacb5d81707c9528ae6d9729be42a80dbb2b956..180e8ff31c7a587ab5eb1770a7b8de3d2f45cf60 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -566,7 +566,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                dbesc($newurl),
                                intval($local_uid)
                        );
-                       if(! count($r)) {
+                       if(! count($ret)) {
                                // this is either a bogus confirmation (?) or we deleted the original introduction.
                                $message = t('Contact record was not found for you on our site.');
                                xml_status(3,$message);
@@ -581,6 +581,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $foreign_pubkey = $ret[0]['site-pubkey'];
                $dfrn_record    = $ret[0]['id'];
 
+               if(! $foreign_pubkey) {
+                       $message = sprintf( t('Site public key not available in contact record for URL %s.'), $newurl);
+                       xml_status(3,$message);
+               }
+
                $decrypted_dfrn_id = "";
                openssl_public_decrypt($dfrn_id,$decrypted_dfrn_id,$foreign_pubkey);