From e59750e8de72e5d54356d69f68b6590ff17ee84b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 18 Dec 2023 13:10:44 +0100 Subject: Add active addons and blocked sites to siteinfo (html) This adds information about addons activated on the hub, as well as which other sites this hub won't federate with in the HTML version of siteinfo. Based on suggestions by @rockyiii@huby.infozoo.de. --- Zotlabs/Module/Siteinfo.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php index ac33747f8..18eb703a2 100644 --- a/Zotlabs/Module/Siteinfo.php +++ b/Zotlabs/Module/Siteinfo.php @@ -38,6 +38,8 @@ class Siteinfo extends \Zotlabs\Web\Controller { '$prj_srctxt' => t('Developer homepage'), '$prj_link' => \Zotlabs\Lib\System::get_project_link(), '$prj_src' => \Zotlabs\Lib\System::get_project_srclink(), + '$addons' => array( t('Active addons'), \App::$plugins ), + '$blocked_sites' => array( t('Blocked sites'), \Zotlabs\Lib\Config::Get('system', 'blacklisted_sites') ) ] ); -- cgit v1.2.3 From 3aefe23184c25c1fc0865313d13902cabfb934d3 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 20 Dec 2023 12:15:24 +0000 Subject: changelog --- Zotlabs/Module/Share.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php index 716f7229b..576a415af 100644 --- a/Zotlabs/Module/Share.php +++ b/Zotlabs/Module/Share.php @@ -68,6 +68,7 @@ class Share extends \Zotlabs\Web\Controller { $owner_uid = $r[0]['uid']; $owner_aid = $r[0]['aid']; +/* $can_comment = false; if((array_key_exists('owner',$item)) && intval($item['owner']['abook_self'])) $can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments'); @@ -78,6 +79,7 @@ class Share extends \Zotlabs\Web\Controller { notice( t('Permission denied') . EOL); killme(); } +*/ $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($item['owner_xchan']) @@ -113,7 +115,7 @@ class Share extends \Zotlabs\Web\Controller { $arr['owner_xchan'] = $item['author_xchan']; $arr['obj'] = Activity::encode_item($item); $arr['obj_type'] = $item['obj_type']; - $arr['verb'] = ACTIVITY_SHARE; + $arr['verb'] = 'Announce'; //ACTIVITY_SHARE; $post = item_store($arr); -- cgit v1.2.3 From 4761857157281046c96a7bbf0fe87491bafd4696 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 20 Dec 2023 12:15:42 +0000 Subject: Revert "changelog" This reverts commit 3aefe23184c25c1fc0865313d13902cabfb934d3. --- Zotlabs/Module/Share.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php index 576a415af..716f7229b 100644 --- a/Zotlabs/Module/Share.php +++ b/Zotlabs/Module/Share.php @@ -68,7 +68,6 @@ class Share extends \Zotlabs\Web\Controller { $owner_uid = $r[0]['uid']; $owner_aid = $r[0]['aid']; -/* $can_comment = false; if((array_key_exists('owner',$item)) && intval($item['owner']['abook_self'])) $can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments'); @@ -79,7 +78,6 @@ class Share extends \Zotlabs\Web\Controller { notice( t('Permission denied') . EOL); killme(); } -*/ $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($item['owner_xchan']) @@ -115,7 +113,7 @@ class Share extends \Zotlabs\Web\Controller { $arr['owner_xchan'] = $item['author_xchan']; $arr['obj'] = Activity::encode_item($item); $arr['obj_type'] = $item['obj_type']; - $arr['verb'] = 'Announce'; //ACTIVITY_SHARE; + $arr['verb'] = ACTIVITY_SHARE; $post = item_store($arr); -- cgit v1.2.3