eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

single flag for private groups

Browse Source
This commit is contained in:
Evan Prodromou 2011-04-04 16:58:52 -04:00
parent 51dc0e1c9b
commit b41c62a27c
4 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/editgroup.php
View File

@ -185,7 +185,15 @@ class EditgroupAction extends GroupDesignAction
$description = $this->trimmed('description'); $description = $this->trimmed('description');
$location = $this->trimmed('location'); $location = $this->trimmed('location');
$aliasstring = $this->trimmed('aliases'); $aliasstring = $this->trimmed('aliases');
$join_policy = intval($this->arg('join_policy')); $private = $this->boolean('private');
if ($private) {
$force_scope = 1;
$join_policy = User_group::JOIN_POLICY_MODERATE;
} else {
$force_scope = 0;
$join_policy = User_group::JOIN_POLICY_OPEN;
}
if ($this->nicknameExists($nickname)) { if ($this->nicknameExists($nickname)) {
// TRANS: Group edit form validation error. // TRANS: Group edit form validation error.
@ -267,6 +275,7 @@ class EditgroupAction extends GroupDesignAction
$this->group->location = $location; $this->group->location = $location;
$this->group->mainpage = common_local_url('showgroup', array('nickname' => $nickname)); $this->group->mainpage = common_local_url('showgroup', array('nickname' => $nickname));
$this->group->join_policy = $join_policy; $this->group->join_policy = $join_policy;
$this->group->force_scope = $force_scope;
$result = $this->group->update($orig); $result = $this->group->update($orig);

11
actions/newgroup.php
View File

@ -130,8 +130,8 @@ class NewgroupAction extends Action
$homepage = $this->trimmed('homepage'); $homepage = $this->trimmed('homepage');
$description = $this->trimmed('description'); $description = $this->trimmed('description');
$location = $this->trimmed('location'); $location = $this->trimmed('location');
$private = $this->boolean('private');
$aliasstring = $this->trimmed('aliases'); $aliasstring = $this->trimmed('aliases');
$join_policy = intval($this->arg('join_policy'));
if ($this->nicknameExists($nickname)) { if ($this->nicknameExists($nickname)) {
// TRANS: Group create form validation error. // TRANS: Group create form validation error.
@ -203,6 +203,14 @@ class NewgroupAction extends Action
} }
} }
if ($private) {
$force_scope = 1;
$join_policy = User_group::JOIN_POLICY_MODERATE;
} else {
$force_scope = 0;
$join_policy = User_group::JOIN_POLICY_OPEN;
}
$cur = common_current_user(); $cur = common_current_user();
// Checked in prepare() above // Checked in prepare() above
@ -217,6 +225,7 @@ class NewgroupAction extends Action
'aliases' => $aliases, 'aliases' => $aliases,
'userid' => $cur->id, 'userid' => $cur->id,
'join_policy' => $join_policy, 'join_policy' => $join_policy,
'force_scope' => $force_scope,
'local' => true)); 'local' => true));
$this->group = $group; $this->group = $group;

13
classes/User_group.php
View File

@ -515,12 +515,19 @@ class User_group extends Memcached_DataObject
$group->uri = $uri; $group->uri = $uri;
$group->mainpage = $mainpage; $group->mainpage = $mainpage;
$group->created = common_sql_now(); $group->created = common_sql_now();
if (isset($fields['join_policy'])) { if (isset($fields['join_policy'])) {
$group->join_policy = intval($fields['join_policy']); $group->join_policy = intval($fields['join_policy']);
} else { } else {
$group->join_policy = 0; $group->join_policy = 0;
} }
if (isset($fields['force_scope'])) {
$group->force_scope = intval($fields['force_scope']);
} else {
$group->force_scope = 0;
}
if (Event::handle('StartGroupSave', array(&$group))) { if (Event::handle('StartGroupSave', array(&$group))) {
$result = $group->insert(); $result = $group->insert();
@ -644,4 +651,10 @@ class User_group extends Memcached_DataObject
} }
parent::delete(); parent::delete();
} }
function isPrivate()
{
return ($this->join_policy == self::JOIN_POLICY_MODERATE &&
$this->force_scope == 1);
}
} }

15
lib/groupeditform.php
View File

@ -202,17 +202,10 @@ class GroupEditForm extends Form
$this->out->elementEnd('li'); $this->out->elementEnd('li');
} }
$this->out->elementStart('li'); $this->out->elementStart('li');
$this->out->dropdown('join_policy', $this->out->checkbox('private', _('Private'),
// TRANS: Dropdown fieldd label on group edit form. ($this->out->arg('private')) ? $this->out->arg('private') :
_('Membership policy'), ((!empty($this->group)) ? $this->group->isPrivate() : false),
// TRANS: Group membership policy option. _('New members must be approved by admin and all posts are forced to be private'));
array(User_group::JOIN_POLICY_OPEN => _('Open to all'),
// TRANS: Group membership policy option.
User_group::JOIN_POLICY_MODERATE => _('Admin must approve all members')),
// TRANS: Dropdown field title on group edit form.
_('Whether admin approval is required to join this group.'),
false,
(empty($this->group->join_policy)) ? User_group::JOIN_POLICY_OPEN : $this->group->join_policy);
$this->out->elementEnd('li'); $this->out->elementEnd('li');
Event::handle('EndGroupEditFormData', array($this)); Event::handle('EndGroupEditFormData', array($this));
} }