group_public_members sql query typo

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 6cba0ecec10d145af9c884c7109188c4a7722ba4..6d070ecba4f2f0a9b6ae3cb717a10e9886b200e1 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -140,10 +140,9 @@ EOT;
        $encrypted_outer_key_bundle = '';
        openssl_public_encrypt($outer_json,$encrypted_outer_key_bundle,$pubkey);
 
-       logger('outer_bundle_encrypt: ' . openssl_error_string());
        $b64_encrypted_outer_key_bundle = base64_encode($encrypted_outer_key_bundle);
 
-       logger('outer_bundle: ' . $b64_encrypted_outer_key_bundle . ' key: ' . $pubkey);
+       logger('outer_bundle: ' . $b64_encrypted_outer_key_bundle . ' key: ' . $pubkey, LOGGER_DATA);
 
        $encrypted_header_json_object = json_encode(array('aes_key' => base64_encode($encrypted_outer_key_bundle), 
                'ciphertext' => base64_encode($ciphertext)));
@@ -223,7 +222,7 @@ function diaspora_decode($importer,$xml) {
         *  </decrypted_header>
         */
 
-       logger('decrypted: ' . $decrypted);
+       logger('decrypted: ' . $decrypted, LOGGER_DEBUG);
        $idom = parse_xml_string($decrypted,false);
 
        $inner_iv = base64_decode($idom->iv);
@@ -399,6 +398,7 @@ function diaspora_request($importer,$xml) {
 
 function diaspora_post($importer,$xml) {
 
+       $a = get_app();
        $guid = notags(unxmlify($xml->guid));
        $diaspora_handle = notags(unxmlify($xml->diaspora_handle));
 
@@ -418,8 +418,10 @@ function diaspora_post($importer,$xml) {
                dbesc($message_id),
                dbesc($guid)
        );
-       if(count($r))
+       if(count($r)) {
+               logger('diaspora_post: message exists: ' . $guid);
                return;
+       }
 
     // allocate a guid on our system - we aren't fixing any collisions.
        // we're ignoring them
@@ -456,7 +458,14 @@ function diaspora_post($importer,$xml) {
        $datarray['body'] = $body;
        $datarray['app']  = 'Diaspora';
 
-       item_store($datarray);
+       $message_id = item_store($datarray);
+
+       if($message_id) {
+               q("update item set plink = '%s' where id = %d limit 1",
+                       dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
+                       intval($message_id)
+               );
+       }
 
        return;
 
@@ -464,6 +473,7 @@ function diaspora_post($importer,$xml) {
 
 function diaspora_comment($importer,$xml,$msg) {
 
+       $a = get_app();
        $guid = notags(unxmlify($xml->guid));
        $parent_guid = notags(unxmlify($xml->parent_guid));
        $diaspora_handle = notags(unxmlify($xml->diaspora_handle));
@@ -476,8 +486,10 @@ function diaspora_comment($importer,$xml,$msg) {
        $text = $xml->text;
 
        $contact = diaspora_get_contact_by_handle($importer['uid'],$msg['author']);
-       if(! $contact)
+       if(! $contact) {
+               logger('diaspora_comment: cannot find contact: ' . $msg['author']);
                return;
+       }
 
        if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
                logger('diaspora_comment: Ignoring this author.');
@@ -490,7 +502,7 @@ function diaspora_comment($importer,$xml,$msg) {
                dbesc($guid)
        );
        if(count($r)) {
-               logger('daspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid);
+               logger('diaspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid);
                return;
        }
 
@@ -573,6 +585,13 @@ function diaspora_comment($importer,$xml,$msg) {
 
        $message_id = item_store($datarray);
 
+       if($message_id) {
+               q("update item set plink = '%s' where id = %d limit 1",
+                       dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
+                       intval($message_id)
+               );
+       }
+
        if(! $parent_author_signature) {
                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
                        intval($message_id),
@@ -592,6 +611,7 @@ function diaspora_comment($importer,$xml,$msg) {
 
 function diaspora_photo($importer,$xml,$msg) {
 
+       $a = get_app();
        $remote_photo_path = notags(unxmlify($xml->remote_photo_path));
 
        $remote_photo_name = notags(unxmlify($xml->remote_photo_name));
@@ -659,8 +679,10 @@ function diaspora_like($importer,$xml,$msg) {
                return;
 
        $contact = diaspora_get_contact_by_handle($importer['uid'],$msg['author']);
-       if(! $contact)
+       if(! $contact) {
+               logger('diaspora_like: cannot find contact: ' . $msg['author']);
                return;
+       }
 
        if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
                logger('diaspora_like: Ignoring this author.');
@@ -727,8 +749,8 @@ function diaspora_like($importer,$xml,$msg) {
        }
 
        if($parent_author_signature) {
-//             $owner_signed_data = $guid . ';' . $parent_guid . ';' . $target_type . ';' . $positive . ';' . $msg['author'];
-               $owner_signed_data = $guid . ';' . $parent_guid . ';' . $target_type . ';' . $positive . ';' . $diaspora_handle;
+
+               $owner_signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
 
                $parent_author_signature = base64_decode($parent_author_signature);
 
@@ -800,6 +822,14 @@ EOT;
 
        $message_id = item_store($arr);
 
+
+       if($message_id) {
+               q("update item set plink = '%s' where id = %d limit 1",
+                       dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
+                       intval($message_id)
+               );
+       }
+
        if(! $parent_author_signature) {
                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
                        intval($message_id),
@@ -916,7 +946,7 @@ function diaspora_send_status($item,$owner,$contact) {
        $public = (($item['private']) ? 'false' : 'true');
 
        require_once('include/datetime.php');
-       $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d h:i:s \U\T\C');
+       $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
 
        $tpl = get_markup_template('diaspora_post.tpl');
        $msg = replace_macros($tpl, array(
@@ -968,7 +998,7 @@ function diaspora_send_images($item,$owner,$contact,$images) {
                        '$guid' => xmlify($r[0]['guid']),
                        '$handle' => xmlify($image['handle']),
                        '$public' => xmlify($public),
-                       '$created_at' => xmlify(datetime_convert('UTC','UTC',$r[0]['created'],'Y-m-d h:i:s \U\T\C'))
+                       '$created_at' => xmlify(datetime_convert('UTC','UTC',$r[0]['created'],'Y-m-d H:i:s \U\T\C'))
                ));
 
 
@@ -1066,9 +1096,11 @@ function diaspora_send_relay($item,$owner,$contact) {
        $text = html_entity_decode(bb2diaspora($body));
 
        // fetch the original signature if somebody sent the post to us to relay
-       // If we are relaying for a reply originating here, there wasn't a 'send to relay'
+       // If we are relaying for a reply originating on our own account, there wasn't a 'send to relay'
        // action. It wasn't needed. In that case create the original signature and the 
        // owner (parent author) signature
+       // comments from other networks will be relayed under our name, with a brief 
+       // preamble to describe what's happening and noting the real author
 
        $r = q("select * from sign where iid = %d limit 1",
                intval($item['id'])
@@ -1077,6 +1109,7 @@ function diaspora_send_relay($item,$owner,$contact) {
                $orig_sign = $r[0];
                $signed_text = $orig_sign['signed_text'];
                $authorsig = $orig_sign['signature'];
+               $handle = $orig_sign['signer'];
        }
        else {
 
@@ -1106,7 +1139,7 @@ function diaspora_send_relay($item,$owner,$contact) {
                                dbesc(base64_encode($authorsig)),
                                dbesc($myaddr)
                        );
-
+                       $handle = $myaddr;
                }
        }
 
@@ -1122,7 +1155,7 @@ function diaspora_send_relay($item,$owner,$contact) {
                '$parentsig' => xmlify($parentauthorsig),
                '$body' => xmlify($text),
                '$positive' => xmlify($positive),
-               '$handle' => xmlify($myaddr)
+               '$handle' => xmlify($handle)
        ));
 
        logger('diaspora_relay_comment: base message: ' . $msg, LOGGER_DATA);