aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Group.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-01-28 02:48:57 -0800
committerzotlabs <mike@macgirvin.com>2019-01-28 02:48:57 -0800
commit043f7bf2abe069c7ac504e0b944db3c0e4318688 (patch)
treef9634791642a874745c079643b340c9396b64cd7 /Zotlabs/Module/Group.php
parent625cdde9a40d13b47a794c6202add2c8f647aebe (diff)
parente3d39fbf3fe99c6ce9de256290e83c49fea8808b (diff)
downloadvolse-hubzilla-043f7bf2abe069c7ac504e0b944db3c0e4318688.tar.gz
volse-hubzilla-043f7bf2abe069c7ac504e0b944db3c0e4318688.tar.bz2
volse-hubzilla-043f7bf2abe069c7ac504e0b944db3c0e4318688.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Group.php')
-rw-r--r--Zotlabs/Module/Group.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php
index 3dcf903ad..12edf8428 100644
--- a/Zotlabs/Module/Group.php
+++ b/Zotlabs/Module/Group.php
@@ -66,6 +66,9 @@ class Group extends Controller {
$groupname = notags(trim($_POST['groupname']));
$public = intval($_POST['public']);
+ $hookinfo = [ 'pgrp_extras' => '', 'group'=>$group['id'] ];
+ call_hooks ('privacygroup_extras_post',$hookinfo);
+
if((strlen($groupname)) && (($groupname != $group['gname']) || ($public != $group['visible']))) {
$r = q("UPDATE pgrp SET gname = '%s', visible = %d WHERE uid = %d AND id = %d",
dbesc($groupname),
@@ -76,8 +79,6 @@ class Group extends Controller {
if($r)
info( t('Privacy group updated.') . EOL );
- $hookinfo = [ 'pgrp_extras' => '', 'group'=>$group['id'] ];
- call_hooks ('privacygroup_extras_post',$hookinfo);
build_sync_packet(local_channel(),null,true);
}
@@ -242,6 +243,10 @@ class Group extends Controller {
}
}
+ $hookinfo = [ 'pgrp_extras' => '', 'group'=>$group['id'] ];
+ call_hooks ('privacygroup_extras',$hookinfo);
+ $pgrp_extras = $hookinfo['pgrp_extras'];
+
$context = $context + array(
'$title' => sprintf(t('Privacy Group: %s'), $group['gname']),
'$details_label' => t('Edit'),
@@ -252,6 +257,7 @@ class Group extends Controller {
'$form_security_token_edit' => get_form_security_token('group_edit'),
'$delete' => t('Delete Group'),
'$form_security_token_drop' => get_form_security_token("group_drop"),
+ '$pgrp_extras' => $pgrp_extras,
);
}
@@ -295,6 +301,7 @@ class Group extends Controller {
$context['$groupeditor'] = $groupeditor;
$context['$desc'] = t('Click a channel to toggle membership');
+ $context['$pgrp_extras'] = $pgrp_extras;
if($change) {
$tpl = get_markup_template('groupeditor.tpl');