aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-21 20:42:55 -0700
committerfriendica <info@friendica.com>2014-08-21 20:42:55 -0700
commit05515e3b10d2dcc6cf306e1749c1717e96dfcff2 (patch)
tree764053cae2e030015e5c8df623ab9f88ec6cbf68
parente524835463fa0411723d2ec57276d1ac13c3aca6 (diff)
downloadvolse-hubzilla-05515e3b10d2dcc6cf306e1749c1717e96dfcff2.tar.gz
volse-hubzilla-05515e3b10d2dcc6cf306e1749c1717e96dfcff2.tar.bz2
volse-hubzilla-05515e3b10d2dcc6cf306e1749c1717e96dfcff2.zip
D* receive endpoint is receive/users/$guid - where $guid is really the channel_guid, not the channel_hash. We'll allow this to be truncated for older D* sites or those that can't process our 64 character guids.
-rw-r--r--mod/receive.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/mod/receive.php b/mod/receive.php
index c5a2dc4e0..4071b169b 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -4,8 +4,6 @@
* Diaspora endpoint
*/
-
-//require_once('include/salmon.php');
require_once('include/crypto.php');
require_once('include/diaspora.php');
@@ -31,8 +29,11 @@ function receive_post(&$a) {
$guid = argv(2);
- $r = q("SELECT * FROM channel left join account on account_id = channel_account_id WHERE channel_guid = '%s' AND account_flags = 0 LIMIT 1",
- dbesc($guid)
+ // Diaspora sites *may* provide a truncated guid.
+
+ $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_guid like '%s' AND NOT (channel_pageflags & %d ) LIMIT 1",
+ dbesc($guid . '%'),
+ intval(PAGE_REMOVED)
);
if(! $r)
http_status_exit(500);