keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some cleanup of obsolete code

Browse source
This commit is contained in:
Zach Prezkuta 2012-06-16 10:41:25 -06:00
parent 0946c4a375
commit 577cfdd314
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
include/diaspora.php
View file

@ -1094,21 +1094,6 @@ function diaspora_comment($importer,$xml,$msg) {
// our post, so he/she must be a contact of ours and his/her public key // our post, so he/she must be a contact of ours and his/her public key
// should be in $msg['key'] // should be in $msg['key']
/* if(strcasecmp($diaspora_handle,$msg['author']) == 0) {
$person = $contact;
$key = $msg['key'];
}
else {
$person = find_diaspora_person_by_handle($diaspora_handle);
if(is_array($person) && x($person,'pubkey'))
$key = $person['pubkey'];
else {
logger('diaspora_comment: unable to find author details');
return;
}
}*/
$author_signature = base64_decode($author_signature); $author_signature = base64_decode($author_signature);
if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) { if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) {
@ -1119,7 +1104,9 @@ function diaspora_comment($importer,$xml,$msg) {
// Phew! Everything checks out. Now create an item. // Phew! Everything checks out. Now create an item.
// Find the original comment author information // Find the original comment author information.
// We need this to make sure we display the comment author
// information (name and avatar) correctly.
if(strcasecmp($diaspora_handle,$msg['author']) == 0) if(strcasecmp($diaspora_handle,$msg['author']) == 0)
$person = $contact; $person = $contact;
else { else {
@ -1692,20 +1679,6 @@ function diaspora_like($importer,$xml,$msg) {
// our post, so he/she must be a contact of ours and his/her public key // our post, so he/she must be a contact of ours and his/her public key
// should be in $msg['key'] // should be in $msg['key']
/* if(strcasecmp($diaspora_handle,$msg['author']) == 0) {
$person = $contact;
$key = $msg['key'];
}
else {
$person = find_diaspora_person_by_handle($diaspora_handle);
if(is_array($person) && x($person,'pubkey'))
$key = $person['pubkey'];
else {
logger('diaspora_like: unable to find author details');
return;
}
}*/
$author_signature = base64_decode($author_signature); $author_signature = base64_decode($author_signature);
if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) { if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) {
@ -1716,7 +1689,9 @@ function diaspora_like($importer,$xml,$msg) {
// Phew! Everything checks out. Now create an item. // Phew! Everything checks out. Now create an item.
// Find the original like author information // Find the original comment author information.
// We need this to make sure we display the comment author
// information (name and avatar) correctly.
if(strcasecmp($diaspora_handle,$msg['author']) == 0) if(strcasecmp($diaspora_handle,$msg['author']) == 0)
$person = $contact; $person = $contact;
else { else {