X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fgroupeditform.php;h=9061af2336844e75930501484d1f3e5065570b69;hb=642f7f850da2694c1b94269b27f059423317b560;hp=1adfdea4ee79c8559e55c2188d058433ec2fe040;hpb=0c3f8208cdccc4a402d976a53628f00652b2e50e;p=quix0rs-gnu-social.git

diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index 1adfdea4ee..9061af2336 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -144,10 +144,14 @@ class GroupEditForm extends Form
             $this->out->elementStart('li');
             $this->out->hidden('groupid', $id);
             // TRANS: Field label on group edit form.
-            $this->out->input('nickname', _('Nickname'),
-                              ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
+            $this->out->input('newnickname', _('Nickname'),
+                              ($this->out->arg('newnickname')) ? $this->out->arg('newnickname') : $nickname,
                               // TRANS: Field title on group edit form.
-                              _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
+                              _('1-64 lowercase letters or numbers, no punctuation or spaces.'),
+                              null, false,
+                              $this->group instanceof User_group && !common_config('profile', 'changenick')
+                                    ? array('disabled'=>'disabled') // can't change nickname
+                                    : array()); // either we can change nickname, or we're creating a new group.
             $this->out->elementEnd('li');
             $this->out->elementStart('li');
             // TRANS: Field label on group edit form.
@@ -202,15 +206,12 @@ class GroupEditForm extends Form
                 $this->out->elementEnd('li');
             }
             $this->out->elementStart('li');
-            $this->out->dropdown('join_policy',
-                                 // TRANS: Dropdown fieldd label on group edit form.
-                                 _('Membership policy'),
-                                 array(User_group::JOIN_POLICY_OPEN     => _('Open to all'),
-                                       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);
+            // TRANS: Checkbox field label on group edit form to mark a group private.
+            $this->out->checkbox('private', _m('LABEL','Private'), 
+                                  ($this->out->arg('private')) ? $this->out->arg('private') :
+                                 ((!empty($this->group)) ? $this->group->isPrivate() : false),
+                                 // TRANS: Checkbox field title on group edit form to mark a group private.
+                                 _('New members must be approved by admin and all posts are forced to be private.'));
             $this->out->elementEnd('li');
             Event::handle('EndGroupEditFormData', array($this));
         }