Fix for issue #1060 (Missing Entries in Archive Dropdown)

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 3673b1fc2e308aada6fcbc949c27c61d91449035..8b85e7b9552c2158b71a81b2d56c8cca5955e427 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -329,7 +329,7 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false)
        $b_outer_aes_key = base64_encode($outer_aes_key);
        $outer_iv = random_string(16);
        $b_outer_iv = base64_encode($outer_iv);
-       
+
        $handle = $user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 
        $padded_data = pkcs5_pad($msg,16);
@@ -425,7 +425,7 @@ function diaspora_decode($importer,$xml) {
        else {
 
                $encrypted_header = json_decode(base64_decode($children->encrypted_header));
-       
+
                $encrypted_aes_key_bundle = base64_decode($encrypted_header->aes_key);
                $ciphertext = base64_decode($encrypted_header->ciphertext);
 
@@ -872,7 +872,8 @@ function diaspora_post($importer,$xml,$msg) {
        $datarray['uid'] = $importer['uid'];
        $datarray['contact-id'] = $contact['id'];
        $datarray['wall'] = 0;
-       $datarray['network']  = NETWORK_DIASPORA;
+       $datarray['network'] = NETWORK_DIASPORA;
+       $datarray['verb'] = ACTIVITY_POST;
        $datarray['guid'] = $guid;
        $datarray['uri'] = $datarray['parent-uri'] = $message_id;
        $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created);
@@ -1346,6 +1347,7 @@ function diaspora_comment($importer,$xml,$msg) {
        $datarray['type'] = 'remote-comment';
        $datarray['wall'] = $parent_item['wall'];
        $datarray['network']  = NETWORK_DIASPORA;
+       $datarray['verb'] = ACTIVITY_POST;
        $datarray['gravity'] = GRAVITY_COMMENT;
        $datarray['guid'] = $guid;
        $datarray['uri'] = $message_id;
@@ -1371,12 +1373,13 @@ function diaspora_comment($importer,$xml,$msg) {
 
        $message_id = item_store($datarray);
 
-       if($message_id) {
-               q("update item set plink = '%s' where id = %d",
-                       dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
-                       intval($message_id)
-               );
-       }
+       //if($message_id) {
+               //q("update item set plink = '%s' where id = %d",
+               //      //dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
+               //      dbesc($a->get_baseurl().'/display/'.$datarray['guid']),
+               //      intval($message_id)
+               //);
+       //}
 
        if(($parent_item['origin']) && (! $parent_author_signature)) {
                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
@@ -1420,7 +1423,7 @@ function diaspora_comment($importer,$xml,$msg) {
                                'to_email'     => $importer['email'],
                                'uid'          => $importer['uid'],
                                'item'         => $datarray,
-                               'link'             => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id,
+                               'link'             => $a->get_baseurl().'/display/'.urlencode($datarray['guid']),
                                'source_name'  => $datarray['author-name'],
                                'source_link'  => $datarray['author-link'],
                                'source_photo' => $datarray['author-avatar'],
@@ -1868,8 +1871,12 @@ function diaspora_like($importer,$xml,$msg) {
                $parent_author_signature = base64_decode($parent_author_signature);
 
                if(! rsa_verify($signed_data,$parent_author_signature,$key,'sha256')) {
-                       logger('diaspora_like: top-level owner verification failed.');
-                       return;
+                       if (intval(get_config('system','ignore_diaspora_like_signature')))
+                               logger('diaspora_like: top-level owner verification failed. Proceeding anyway.');
+                       else {
+                               logger('diaspora_like: top-level owner verification failed.');
+                               return;
+                       }
                }
        }
        else {
@@ -1881,8 +1888,12 @@ function diaspora_like($importer,$xml,$msg) {
                $author_signature = base64_decode($author_signature);
 
                if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) {
-                       logger('diaspora_like: like creator verification failed.');
-                       return;
+                       if (intval(get_config('system','ignore_diaspora_like_signature')))
+                               logger('diaspora_like: like creator verification failed. Proceeding anyway');
+                       else {
+                               logger('diaspora_like: like creator verification failed.');
+                               return;
+                       }
                }
        }
 
@@ -1947,7 +1958,8 @@ EOT;
 
        $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
        $alink = '[url=' . $parent_item['author-link'] . ']' . $parent_item['author-name'] . '[/url]';
-       $plink = '[url=' . $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $parent_item['id'] . ']' . $post_type . '[/url]';
+       //$plink = '[url=' . $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $parent_item['id'] . ']' . $post_type . '[/url]';
+       $plink = '[url='.$a->get_baseurl().'/display/'.urlencode($guid).']'.$post_type.'[/url]';
        $arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
 
        $arr['app']  = 'Diaspora';
@@ -1963,12 +1975,13 @@ EOT;
        $message_id = item_store($arr);
 
 
-       if($message_id) {
-               q("update item set plink = '%s' where id = %d",
-                       dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
-                       intval($message_id)
-               );
-       }
+       //if($message_id) {
+       //      q("update item set plink = '%s' where id = %d",
+       //              //dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
+       //              dbesc($a->get_baseurl().'/display/'.$guid),
+       //              intval($message_id)
+       //      );
+       //}
 
        if(! $parent_author_signature) {
                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",