small cleanup

diff --git a/include/items.php b/include/items.php
index e656fc2449333ed5b33ae2559e6603726789ee4a..a88246cd6b6b00efe6179f037cae455410c09a8c 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -3683,7 +3683,7 @@ function store_diaspora_retract_sig($item, $user, $baseurl) {
        }
        else {
                $r = q("SELECT `nick`, `url` FROM `contact` WHERE `id` = '%d' LIMIT 1",
-                       $item['contact-id']
+                       $item['contact-id'] // If this function gets called, drop_item() has already checked remote_user() == $item['contact-id']
                );
                if(count($r)) {
                        // The below handle only works for NETWORK_DFRN. I think that's ok, because this function

diff --git a/mod/item.php b/mod/item.php
index 554e97fe46a0d595b2df122a3c32b5c3f4830865..da9185cb8ed6d13626f4ef55f19cf49dbd95b444 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -1039,16 +1039,11 @@ function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item,
        require_once('include/bb2diaspora.php');
        $signed_body = html_entity_decode(bb2diaspora($datarray['body']));
 
-//     $myaddr = $user['nickname'] . '@' . substr($baseurl, strpos($baseurl,'://') + 3);
-//     if( $author['network'] === NETWORK_DIASPORA)
-//             $diaspora_handle = $author['addr'];
-//     else {
        // Only works for NETWORK_DFRN
        $contact_baseurl_start = strpos($author['url'],'://') + 3;
        $contact_baseurl_length = strpos($author['url'],'/profile') - $contact_baseurl_start;
        $contact_baseurl = substr($author['url'], $contact_baseurl_start, $contact_baseurl_length);
        $diaspora_handle = $author['nick'] . '@' . $contact_baseurl;
-//     }
 
        $signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $diaspora_handle;
 

diff --git a/mod/like.php b/mod/like.php
index 1176c31101000390043e8da0e441bfede9d1c3cf..5519bffdb85c50b0e289668765d5fc2527fbcffe 100755 (executable)
--- a/mod/like.php
+++ b/mod/like.php
@@ -245,9 +245,6 @@ function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact)
        if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
                $signed_text = $like_item['guid'] . ';' . 'Like';
 
-//             if( $contact['network'] === NETWORK_DIASPORA)
-//                     $diaspora_handle = $contact['addr'];
-//             else {
                // Only works for NETWORK_DFRN
                $contact_baseurl_start = strpos($contact['url'],'://') + 3;
                $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
@@ -268,7 +265,6 @@ function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact)
                        if( $r)
                                $authorsig = base64_encode(rsa_sign($signed_text,$r['prvkey'],'sha256'));
                }
-//             }
 
                if(! isset($authorsig))
                        $authorsig = '';
@@ -299,9 +295,6 @@ function store_diaspora_like_sig($activity, $post_type, $contact, $post_id) {
        logger('mod_like: storing diaspora like signature');
 
        if(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
-//             if( $contact['network'] === NETWORK_DIASPORA)
-//                     $diaspora_handle = $contact['addr'];
-//             else {
                // Only works for NETWORK_DFRN
                $contact_baseurl_start = strpos($contact['url'],'://') + 3;
                $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
@@ -322,7 +315,6 @@ function store_diaspora_like_sig($activity, $post_type, $contact, $post_id) {
                        if( $r)
                                $contact_uprvkey = $r['prvkey'];
                }
-//             }
 
                $r = q("SELECT guid, parent FROM `item` WHERE id = %d LIMIT 1",
                        intval($post_id)