diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/notifier.php | 8 | ||||
| -rw-r--r-- | include/poller.php | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/notifier.php b/include/notifier.php index 6986deb96..25a082a90 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -15,7 +15,7 @@ require_once("datetime.php"); if($argc < 3) exit; -//dbg(3); +dbg(3); $baseurl = $argv[1]; $a->set_baseurl($argv[1]); @@ -215,12 +215,14 @@ if($argc < 3) // delivery loop foreach($r as $rr) { - if($rr['self']) continue; if(! strlen($rr['dfrn-id'])) continue; + + + $url = $rr['notify'] . '?dfrn_id=' . $rr['dfrn-id']; $xml = fetch_url($url); @@ -240,7 +242,7 @@ echo $xml; openssl_public_decrypt($challenge,$postvars['challenge'],$rr['pubkey']); - if(strlen($rr['dfrn-id']) && (! $rr['blocked'])) + if(strlen($rr['dfrn-id']) && (! ($rr['blocked']) || ($rr['readonly']))) $postvars['data'] = $atom; else $postvars['data'] = $atom_nowrite; diff --git a/include/poller.php b/include/poller.php index c7108d13c..d1fc898d5 100644 --- a/include/poller.php +++ b/include/poller.php @@ -95,7 +95,7 @@ echo "Length:" . strlen($xml) . "\r\n"; if(count($r)) { if($r[0]['uri'] == $r[0]['parent-uri']) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s' - WHERE `parent-uri` = '%s'" + WHERE `parent-uri` = '%s'", dbesc($when), dbesc($r[0]['uri']) ); |