aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-07 02:23:17 -0700
committerFriendika <info@friendika.com>2011-09-07 02:23:17 -0700
commitf17d91844f9825c3effcf47c5b65b645b15939c5 (patch)
treeee85d31a6afe3e4437798c0d5ed6c88e22e66dbe
parent65d5d0b0cb5d912ac32a29aaf84293e9b3b022b0 (diff)
downloadvolse-hubzilla-f17d91844f9825c3effcf47c5b65b645b15939c5.tar.gz
volse-hubzilla-f17d91844f9825c3effcf47c5b65b645b15939c5.tar.bz2
volse-hubzilla-f17d91844f9825c3effcf47c5b65b645b15939c5.zip
part of bug #143
-rw-r--r--mod/dfrn_confirm.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 4dacb5d81..180e8ff31 100644
--- 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);