aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-28 18:28:02 -0700
committerzotlabs <mike@macgirvin.com>2017-06-28 18:28:02 -0700
commit8ca5a65dcfd9dc5875f76cbec7b6a8601abc7128 (patch)
treeeeb5c3497c0a396e48d7c22bd8dbb6e3cfdbbb3a
parent798a03c2ab3d848fb7ba09027e968a99b67e7d95 (diff)
downloadvolse-hubzilla-8ca5a65dcfd9dc5875f76cbec7b6a8601abc7128.tar.gz
volse-hubzilla-8ca5a65dcfd9dc5875f76cbec7b6a8601abc7128.tar.bz2
volse-hubzilla-8ca5a65dcfd9dc5875f76cbec7b6a8601abc7128.zip
minor weirdness in zot finger results after deleting a clone from a channel that was on a site which was previously migrated from http to https and still had the old hubloc
-rw-r--r--include/zot.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/include/zot.php b/include/zot.php
index 4c180ee59..a8aecc6fa 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3929,6 +3929,7 @@ function zotinfo($arr) {
$ret['photo_updated'] = $e['xchan_photo_date'];
$ret['url'] = $e['xchan_url'];
$ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']);
+ $ret['follow_url'] = $e['xchan_follow'];
$ret['target'] = $ztarget;
$ret['target_sig'] = $zsig;
$ret['searchable'] = $searchable;
@@ -3936,19 +3937,22 @@ function zotinfo($arr) {
$ret['public_forum'] = $public_forum;
if($deleted)
$ret['deleted'] = $deleted;
+
if(intval($e['channel_removed']))
$ret['deleted_locally'] = true;
+
+
// premium or other channel desiring some contact with potential followers before connecting.
// This is a template - %s will be replaced with the follow_url we discover for the return channel.
- if($special_channel)
- $ret['connect_url'] = z_root() . '/connect/' . $e['channel_address'];
-
+ if($special_channel) {
+ $ret['connect_url'] = (($e['xchan_connpage']) ? $e['xchan_connpage'] : z_root() . '/connect/' . $e['channel_address']);
+ }
// This is a template for our follow url, %s will be replaced with a webbie
- $ret['follow_url'] = z_root() . '/follow?f=&url=%s';
-
+ if(! $ret['follow_url'])
+ $ret['follow_url'] = z_root() . '/follow?f=&url=%s';
$permissions = get_all_perms($e['channel_id'],$ztarget_hash,false);