diff options
author | zotlabs <mike@macgirvin.com> | 2018-03-15 17:51:24 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-03-15 17:51:24 -0700 |
commit | 91b710b07d5fc2b48b5d56d1801a36532008d1e9 (patch) | |
tree | 02a78ba2053a839944487a59951b5fcdaf53eb5a /Zotlabs/Module/Share.php | |
parent | 34fee2a7909674ced6aea91e60f8ff77e8345e8b (diff) | |
download | volse-hubzilla-91b710b07d5fc2b48b5d56d1801a36532008d1e9.tar.gz volse-hubzilla-91b710b07d5fc2b48b5d56d1801a36532008d1e9.tar.bz2 volse-hubzilla-91b710b07d5fc2b48b5d56d1801a36532008d1e9.zip |
add auth flag to share attributes so we can make a costly determination to use zid at post submission time instead of making multiple calls to is_matrix_url() at render time
Diffstat (limited to 'Zotlabs/Module/Share.php')
-rw-r--r-- | Zotlabs/Module/Share.php | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php index 7f4d8b1eb..c6d0be051 100644 --- a/Zotlabs/Module/Share.php +++ b/Zotlabs/Module/Share.php @@ -14,10 +14,15 @@ class Share extends \Zotlabs\Web\Controller { if(! $post_id) killme(); - echo '[share=' . $post_id . '][/share]'; killme(); + + /** + * The remaining code is deprecated and handled in Zotlabs/Lib/Share.php at post + * submission time. + */ + if(! (local_channel() || remote_channel())) killme(); @@ -60,12 +65,14 @@ class Share extends \Zotlabs\Web\Controller { $pos = strpos($r[0]['body'], "[share"); $o = substr($r[0]['body'], $pos); } else { - $o = "[share author='".urlencode($r[0]['author']['xchan_name']). - "' profile='".$r[0]['author']['xchan_url'] . - "' avatar='".$r[0]['author']['xchan_photo_s']. - "' link='".$r[0]['plink']. - "' posted='".$r[0]['created']. - "' message_id='".$r[0]['mid']."']"; + $o = "[share author='" . urlencode($r[0]['author']['xchan_name']) . + "' profile='" . $r[0]['author']['xchan_url'] . + "' avatar='" . $r[0]['author']['xchan_photo_s'] . + "' link='" . $r[0]['plink'] . + "' auth='" . (($r[0]['author']['network'] === 'zot') ? 'true' : 'false') . + "' posted='" . $r[0]['created'] . + "' message_id='" . $r[0]['mid'] . + "']"; if($r[0]['title']) $o .= '[b]'.$r[0]['title'].'[/b]'."\r\n"; $o .= (($is_photo) ? $photo_bb . "\r\n" . $r[0]['body'] : $r[0]['body']); |