aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-10-09 12:16:55 +0000
committerMario <mario@mariovavti.com>2020-10-09 12:16:55 +0000
commit1215618589636fd433d69fa5d81f2aca264beef5 (patch)
treed2416deaa8c2d10f437b786569873f3ba72aad5c
parent67533ee47871df2871fb1e2bf58101e278f791d6 (diff)
downloadvolse-hubzilla-1215618589636fd433d69fa5d81f2aca264beef5.tar.gz
volse-hubzilla-1215618589636fd433d69fa5d81f2aca264beef5.tar.bz2
volse-hubzilla-1215618589636fd433d69fa5d81f2aca264beef5.zip
add zot6 to the authenticatable options and fix array key in reshare header
-rw-r--r--Zotlabs/Lib/Share.php2
-rw-r--r--Zotlabs/Module/Oep.php8
-rwxr-xr-xinclude/items.php3
3 files changed, 7 insertions, 6 deletions
diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php
index f8b636c10..419e6ed5f 100644
--- a/Zotlabs/Lib/Share.php
+++ b/Zotlabs/Lib/Share.php
@@ -128,7 +128,7 @@ class Share {
"' profile='" . $this->item['author']['xchan_url'] .
"' avatar='" . $this->item['author']['xchan_photo_s'] .
"' link='" . $this->item['plink'] .
- "' auth='" . (($this->item['author']['network'] === 'zot') ? 'true' : 'false') .
+ "' auth='" . ((in_array($this->item['author']['xchan_network'], ['zot6', 'zot'])) ? 'true' : 'false') .
"' posted='" . $this->item['created'] .
"' message_id='" . $this->item['mid'] .
"']";
diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php
index 3977ac8dd..75304161b 100644
--- a/Zotlabs/Module/Oep.php
+++ b/Zotlabs/Module/Oep.php
@@ -125,7 +125,7 @@ class Oep extends \Zotlabs\Web\Controller {
"' profile='".$p[0]['author']['xchan_url'] .
"' avatar='".$p[0]['author']['xchan_photo_s'].
"' link='".$p[0]['plink'].
- "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') .
+ "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
"' posted='".$p[0]['created'].
"' message_id='".$p[0]['mid']."']";
if($p[0]['title'])
@@ -213,7 +213,7 @@ class Oep extends \Zotlabs\Web\Controller {
"' profile='".$p[0]['author']['xchan_url'] .
"' avatar='".$p[0]['author']['xchan_photo_s'].
"' link='".$p[0]['plink'].
- "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') .
+ "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
"' posted='".$p[0]['created'].
"' message_id='".$p[0]['mid']."']";
if($p[0]['title'])
@@ -299,7 +299,7 @@ class Oep extends \Zotlabs\Web\Controller {
"' profile='".$p[0]['author']['xchan_url'] .
"' avatar='".$p[0]['author']['xchan_photo_s'].
"' link='".$p[0]['plink'].
- "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') .
+ "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
"' posted='".$p[0]['created'].
"' message_id='".$p[0]['mid']."']";
if($p[0]['title'])
@@ -374,7 +374,7 @@ class Oep extends \Zotlabs\Web\Controller {
"' profile='".$p[0]['author']['xchan_url'] .
"' avatar='".$p[0]['author']['xchan_photo_s'].
"' link='".$p[0]['plink'].
- "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') .
+ "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
"' posted='".$p[0]['created'].
"' message_id='".$p[0]['mid']."']";
if($p[0]['title'])
diff --git a/include/items.php b/include/items.php
index 0cfa2a340..960aa3580 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3175,6 +3175,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
// This MAY cause you to run afoul of copyright law.
$rewrite_author = intval(get_abconfig($channel['channel_id'],$item['owner_xchan'],'system','rself'));
+
if($rewrite_author) {
$item['author_xchan'] = $channel['channel_hash'];
@@ -3246,7 +3247,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
"' portable_id='" . $item['author']['xchan_hash'] .
"' avatar='" . $item['author']['xchan_photo_s'] .
"' link='" . $item['plink'] .
- "' auth='" . ((in_array($item['author']['network'], ['zot','zot6'])) ? 'true' : 'false') .
+ "' auth='" . ((in_array($item['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
"' posted='" . $item['created'] .
"' message_id='" . $item['mid'] .
"']";