diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-09-08 20:15:27 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-09-08 20:15:27 +0200 |
| commit | d284f8017cefb79571fe51c4ae3f85b9b4e517c9 (patch) | |
| tree | fbf1902147b237649048e2ab6ac8a84ffe0bf838 /mod/dfrn_confirm.php | |
| parent | 2fabf8d2188516a36589487bfa2ca01dea0c5ca2 (diff) | |
| parent | 68c23f6c86e2f2e24548b179f00b5bcd5ab8ba87 (diff) | |
| download | volse-hubzilla-d284f8017cefb79571fe51c4ae3f85b9b4e517c9.tar.gz volse-hubzilla-d284f8017cefb79571fe51c4ae3f85b9b4e517c9.tar.bz2 volse-hubzilla-d284f8017cefb79571fe51c4ae3f85b9b4e517c9.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'mod/dfrn_confirm.php')
| -rw-r--r-- | mod/dfrn_confirm.php | 7 |
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); |