diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-19 14:04:24 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-19 14:04:24 +0200 |
| commit | 9a940786c18c1c2bd772aec93f1828f67dc45667 (patch) | |
| tree | 54114a005e74c8a6d8bad8a490e1d1e41bc4178f /include/group.php | |
| parent | f2c0c40f6e488f1a8e62bda9449b28115f343cac (diff) | |
| parent | 513ef2410d9b892c8ebcb7ceac96b97023c3b5a5 (diff) | |
| download | volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.gz volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.bz2 volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/group.php')
| -rw-r--r-- | include/group.php | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/include/group.php b/include/group.php index edb547de6..854ac06a9 100644 --- a/include/group.php +++ b/include/group.php @@ -97,8 +97,9 @@ function group_rmv_member($uid,$name,$member) { } -function group_add_member($uid,$name,$member) { - $gid = group_byname($uid,$name); +function group_add_member($uid,$name,$member,$gid = 0) { + if(! $gid) + $gid = group_byname($uid,$name); if((! $gid) || (! $uid) || (! $member)) return false; @@ -154,6 +155,32 @@ function group_public_members($gid) { } +function mini_group_select($uid,$gid = 0) { + + $grps = array(); + $o = ''; + + $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", + intval($uid) + ); + $grps[] = array('name' => '', 'id' => '0', 'selected' => ''); + if(count($r)) { + foreach($r as $rr) { + $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : '')); + } + + } + logger('groups: ' . print_r($grps,true)); + + $o = replace_macros(get_markup_template('group_selection.tpl'), array( + '$label' => t('Default privacy group for new contacts'), + '$groups' => $grps + )); + return $o; +} + + + function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) { |