account expiration structures

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 4b1cc333bd9f48854291a22fdcaeacd365faf621..313324a16a667f38424eb5b2d6bd523caf63e89a 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -8,15 +8,18 @@ require_once('include/contact_selectors.php');
 
 function diaspora_dispatch_public($msg) {
 
-       $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `uid` FROM `contact` WHERE `network` = '%s' AND `addr` = '%s' ) ",
+       $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) ",
                dbesc(NETWORK_DIASPORA),
                dbesc($msg['author'])
        );
        if(count($r)) {
                foreach($r as $rr) {
+                       logger('diaspora_public: delivering to: ' . $rr['username']);
                        diaspora_dispatch($rr,$msg);
                }
        }
+       else
+               logger('diaspora_public: no subscribers');
 }
 
 
@@ -165,15 +168,15 @@ EOT;
 
 $magic_env = <<< EOT
 <?xml version='1.0' encoding='UTF-8'?>
-<entry xmlns='http://www.w3.org/2005/Atom'>
+<diaspora xmlns="https://joindiaspora.org/protocol" xmlns:me="http://salmon-protocol.org/ns/magic-env" >
   $encrypted_header
-  <me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
+  <me:env>
     <me:encoding>base64url</me:encoding>
     <me:alg>RSA-SHA256</me:alg>
     <me:data type="application/xml">$data</me:data>
     <me:sig>$sig</me:sig>
   </me:env>
-</entry>
+</diaspora>
 EOT;
 
        logger('diaspora_msg_build: magic_env: ' . $magic_env, LOGGER_DATA);
@@ -205,7 +208,7 @@ function diaspora_decode($importer,$xml) {
 
        if($children->header) {
                $public = true;
-               $author_link = str_replace('acct:','',$children->author_id);
+               $author_link = str_replace('acct:','',$children->header->author_id);
        }
        else {