]> git.mxchange.org Git - friendica.git/commitdiff
Testing code removed
authorMichael Vogel <icarus@dabo.de>
Sun, 12 Jul 2015 09:22:36 +0000 (11:22 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 12 Jul 2015 09:22:36 +0000 (11:22 +0200)
include/items.php

index 8fd1cbcb48d9ec5a19d61f67b9f049b9a0f3a720..45d25e379f84713931de7ba41653b6a2c826a681 100644 (file)
@@ -2064,11 +2064,11 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
                || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
                openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
                openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-       } elseif($contact['prvkey']) {
+       }
+       else {
                openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
                openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
-       } else
-               logger("No private or public key for contact ".$contact['id']." ".$contact['url']);
+       }
 
        $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));