diff options
| author | Mario <mario@mariovavti.com> | 2019-07-02 22:02:15 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-07-02 22:02:15 +0200 |
| commit | 001734a72540e87feb512705f31d282ff5014d93 (patch) | |
| tree | f0ad9e956422867dd1e728e5876cf849b3cc9e58 /Zotlabs | |
| parent | 019afe2a1abc72c092afda2023c0d83f9630bafb (diff) | |
| parent | 276ab3eae32458b019af9261b49acf31739ed09e (diff) | |
| download | volse-hubzilla-001734a72540e87feb512705f31d282ff5014d93.tar.gz volse-hubzilla-001734a72540e87feb512705f31d282ff5014d93.tar.bz2 volse-hubzilla-001734a72540e87feb512705f31d282ff5014d93.zip | |
Merge branch 'dev' into 'dev'
begin directory migration to zot6, see the code comments
See merge request hubzilla/core!1687
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Apschema.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Channel.php | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php index ef2264bc0..12cc0e00a 100644 --- a/Zotlabs/Module/Apschema.php +++ b/Zotlabs/Module/Apschema.php @@ -41,8 +41,11 @@ class Apschema extends \Zotlabs\Web\Controller { ], 'ostatus' => 'http://ostatus.org#', - 'conversation' => 'ostatus:conversation' + 'conversation' => 'ostatus:conversation', + 'diaspora' => 'https://diasporafoundation.org/ns/', + 'guid' => 'diaspora:guid' + ] ]; diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index afd82ed2f..b1639b213 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -111,6 +111,17 @@ class Channel extends Controller { // we start loading content profile_load($which,$profile); + + App::$page['htmlhead'] .= '<meta property="og:title" content="' . htmlspecialchars($channel['channel_name']) . '">' . "\r\n"; + App::$page['htmlhead'] .= '<meta property="og:image" content="' . $channel['xchan_photo_l'] . '">' . "\r\n"; + + if(App::$profile['about'] && perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) { + App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(App::$profile['about']) . '">' . "\r\n"; + } + else { + App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(sprintf( t('This is the home page of %s.'), $channel['channel_name'])) . '">' . "\r\n"; + } + } function get($update = 0, $load = false) { |