Fixes for Admin Group and Admin User forms when dealing with inherite…

…d groups

- Updated User Group Administration to seperate out Inherited Group
Members.
- Updated Group Editor to show inherited Groups as disabled.
- Updated test in Admin group forms to better explain inherited groups
and users.
Further fixes for #803.

language/english.php

@@ -1556,7 +1556,7 @@
     'permmsg' => 'NOTE: members is all logged in members of the site and anonymous is all users browsing the site that aren\'t logged in.',
     'securitygroups' => 'Security Groups',
     'editrootmsg' => "Even though you are a User Administrator, you can't edit a root user without first being a root user yourself.  You can edit all other users except root users. Please note that all attempts to illegally edit root users are logged.  Please go back to the <a href=\"{$_CONF['site_admin_url']}/user.php\">User Administration page</a>.",
-    'securitygroupsmsg' => 'Select the checkboxes for the groups you want the user to belong to.',
+    'securitygroupsmsg' => 'Select the checkboxes for the groups you want the user to belong to. Groups that are checked but disabled are either required or are inherited from other groups the user belongs too.',
     'groupeditor' => 'Group Editor',
     'description' => 'Description',
     'name' => 'Name',
@@ -1570,9 +1570,9 @@
     'yes' => 'Yes',
     'no' => 'No',
     'corerightsdescr' => "This group is a core {$_CONF['site_name']} Group.  Therefore the rights for this group cannot be edited.  Below is a read-only list of the rights this group has access to.",
-    'groupmsg' => 'Security Groups on this site are hierarchical.  By adding this group to any of the groups below you will be giving this group the same rights that those groups have.  Where possible it is encouraged you use the groups below to give rights to a group.  If you need this group to have custom rights then you can select the rights to various site features in the section below called \'Rights\'.  To add this group to any of the ones below simply check the box next to the group(s) that you want.',
+    'groupmsg' => 'Security Groups on this site are hierarchical.  By adding this group to any of the groups below you will be giving this group the same rights that those groups have.  Where possible it is encouraged you use the groups below to give rights to a group.  If you need this group to have custom rights then you can select the rights to various site features in the section below called \'Rights\'.  To add this group to any of the ones below simply check the box next to the group(s) that you want. Groups that are checked but disabled are inherited groups from other groups that belongs directly to this group.',
     'coregroupmsg' => "This group is a core {$_CONF['site_name']} Group.  Therefore the groups that this group belongs to cannot be edited.  Below is a read-only list of the groups this group belongs to.",
-    'rightsdescr' => 'A group\'s access to a certain right below can be given directly to the group OR to a different group that this group is a part of.  The ones you see below without a checkbox are the rights that have been given to this group because it belongs to another group with that right.  The rights with checkboxes below are rights that can be given directly to this group.',
+    'rightsdescr' => 'A group\'s access to a certain right below can be given directly to the group OR to a different group that this group is a part of.  The ones you see below with a disabled checkbox (that is checked) are the rights that have been given to this group because it belongs to another group with that right.  The rights with checkboxes below are rights that can be given directly to this group.',
     'lock' => 'Lock',
     'members' => 'Members',
     'anonymous' => 'Anonymous',
@@ -1593,14 +1593,16 @@
     'listusers' => 'Members',
     'listthem' => 'list',
     'usersingroup' => 'Users in group "%s"',
+    'usersingroupmsg' => 'A list of users that belong to the group. Users lists here may belong directly to the group or are inherited from another group that has been added to this group.',
     'usergroupadmin' => 'User Group Administration',
     'add' => 'Add',
     'remove' => 'Remove',
     'availmembers' => 'Available Members',
     'groupmembers' => 'Group Members',
+    'inheritmembers' => 'Inherited Group Members',
     'canteditgroup' => 'To edit this group, you have to be a member of the group. Please contact the system administrator if you feel this is an error.',
     'cantlistgroup' => 'To see the members of this group, you have to be a member yourself. Please contact the system administrator if you feel this is an error.',
-    'editgroupmsg' => 'To modify the group membership, click on the member names(s) and use the add or remove buttons. If the member is a member of the group, their name will appear on the right side only. Once you are complete - press <b>Save</b> to update the group and return to the main group admin page.',
+    'editgroupmsg' => 'To modify the group membership, click on the member names(s) and use the add or remove buttons. If the member is a member of the group, their name will appear on the right side only. Once you are complete - press <b>Save</b> to update the group and return to the main group admin page.<br><br>Inherited group members can only be removed by editing the group they actually belong too and are only shown here for informational purposes. Remember a user can be both a member of the actual group and still be inherited from another group.',
     'listgroupmsg' => 'Listing of all current members in the group: <b>%s</b>',
     'search' => 'Search',
     'submit' => 'Submit',

language/english_utf-8.php

@@ -1556,7 +1556,7 @@
     'permmsg' => 'NOTE: members is all logged in members of the site and anonymous is all users browsing the site that aren\'t logged in.',
     'securitygroups' => 'Security Groups',
     'editrootmsg' => "Even though you are a User Administrator, you can't edit a root user without first being a root user yourself.  You can edit all other users except root users. Please note that all attempts to illegally edit root users are logged.  Please go back to the <a href=\"{$_CONF['site_admin_url']}/user.php\">User Administration page</a>.",
-    'securitygroupsmsg' => 'Select the checkboxes for the groups you want the user to belong to.',
+    'securitygroupsmsg' => 'Select the checkboxes for the groups you want the user to belong to. Groups that are checked but disabled are either required or are inherited from other groups the user belongs too.',
     'groupeditor' => 'Group Editor',
     'description' => 'Description',
     'name' => 'Name',
@@ -1570,9 +1570,9 @@
     'yes' => 'Yes',
     'no' => 'No',
     'corerightsdescr' => "This group is a core {$_CONF['site_name']} Group.  Therefore the rights for this group cannot be edited.  Below is a read-only list of the rights this group has access to.",
-    'groupmsg' => 'Security Groups on this site are hierarchical.  By adding this group to any of the groups below you will be giving this group the same rights that those groups have.  Where possible it is encouraged you use the groups below to give rights to a group.  If you need this group to have custom rights then you can select the rights to various site features in the section below called \'Rights\'.  To add this group to any of the ones below simply check the box next to the group(s) that you want.',
+    'groupmsg' => 'Security Groups on this site are hierarchical.  By adding this group to any of the groups below you will be giving this group the same rights that those groups have.  Where possible it is encouraged you use the groups below to give rights to a group.  If you need this group to have custom rights then you can select the rights to various site features in the section below called \'Rights\'.  To add this group to any of the ones below simply check the box next to the group(s) that you want. Groups that are checked but disabled are inherited groups from other groups that belongs directly to this group.',
     'coregroupmsg' => "This group is a core {$_CONF['site_name']} Group.  Therefore the groups that this group belongs to cannot be edited.  Below is a read-only list of the groups this group belongs to.",
-    'rightsdescr' => 'A group\'s access to a certain right below can be given directly to the group OR to a different group that this group is a part of.  The ones you see below without a checkbox are the rights that have been given to this group because it belongs to another group with that right.  The rights with checkboxes below are rights that can be given directly to this group.',
+    'rightsdescr' => 'A group\'s access to a certain right below can be given directly to the group OR to a different group that this group is a part of.  The ones you see below with a disabled checkbox (that is checked) are the rights that have been given to this group because it belongs to another group with that right.  The rights with checkboxes below are rights that can be given directly to this group.',
     'lock' => 'Lock',
     'members' => 'Members',
     'anonymous' => 'Anonymous',
@@ -1593,14 +1593,16 @@
     'listusers' => 'Members',
     'listthem' => 'list',
     'usersingroup' => 'Users in group "%s"',
+    'usersingroupmsg' => 'A list of users that belong to the group. Users lists here may belong directly to the group or are inherited from another group that has been added to this group.',
     'usergroupadmin' => 'User Group Administration',
     'add' => 'Add',
     'remove' => 'Remove',
     'availmembers' => 'Available Members',
     'groupmembers' => 'Group Members',
+    'inheritmembers' => 'Inherited Group Members',
     'canteditgroup' => 'To edit this group, you have to be a member of the group. Please contact the system administrator if you feel this is an error.',
     'cantlistgroup' => 'To see the members of this group, you have to be a member yourself. Please contact the system administrator if you feel this is an error.',
-    'editgroupmsg' => 'To modify the group membership, click on the member names(s) and use the add or remove buttons. If the member is a member of the group, their name will appear on the right side only. Once you are complete - press <b>Save</b> to update the group and return to the main group admin page.',
+    'editgroupmsg' => 'To modify the group membership, click on the member names(s) and use the add or remove buttons. If the member is a member of the group, their name will appear on the right side only. Once you are complete - press <b>Save</b> to update the group and return to the main group admin page.<br><br>Inherited group members can only be removed by editing the group they actually belong too and are only shown here for informational purposes. Remember a user can be both a member of the actual group and still be inherited from another group.',
     'listgroupmsg' => 'Listing of all current members in the group: <b>%s</b>',
     'search' => 'Search',
     'submit' => 'Submit',

language/japanese_utf-8.php

@@ -1571,9 +1571,9 @@
     'yes' => 'はい',
     'no' => 'いいえ',
     'corerightsdescr' => "このグループは、{$_CONF['site_name']}の「コア(中核)グループ」です。そのため、このグループの権限を編集することはできません。このグループの権限リストを読み取り専用で以下に表示しています。",
-    'groupmsg' => '本サイトのセキュリティグループは階層的になっています。本グループを以下のグループに追加すると、そのグループの持つ権限と同じ権限を本グループにも与えます。可能であれば、本グループに権限を与える場合、以下のグループの権限を継承させることを推奨します。本グループに個別に権限を与える場合は、以下の「権限」の部分から様々な機能に関する権限を選択できます。本グループを追加するには以下のグループの横にあるボックスをチェックするだけです。',
+    'groupmsg' => 'Security Groups on this site are hierarchical.  By adding this group to any of the groups below you will be giving this group the same rights that those groups have.  Where possible it is encouraged you use the groups below to give rights to a group.  If you need this group to have custom rights then you can select the rights to various site features in the section below called \'Rights\'.  To add this group to any of the ones below simply check the box next to the group(s) that you want. Groups that are checked but disabled are inherited groups from other groups that belongs directly to this group.',
     'coregroupmsg' => "本グループは{$_CONF['site_name']}の「コア(中核)グループ」です。そのため、本グループの所属するグループは編集できません。このグループの権限リストを読み取り専用で以下に表示しています。",
-    'rightsdescr' => 'グループのアクセス権は以下の権限で直接指定するか、グループが所属する異なるグループの権限を継承します。以下でチェックのない権限はこのグループが所属するグループから継承した権限です。チェックのある権限はこのグループに直接指定している権限です。',
+    'rightsdescr' => 'A group\'s access to a certain right below can be given directly to the group OR to a different group that this group is a part of.  The ones you see below with a disabled checkbox (that is checked) are the rights that have been given to this group because it belongs to another group with that right.  The rights with checkboxes below are rights that can be given directly to this group.',
     'lock' => 'ロック',
     'members' => 'メンバー',
     'anonymous' => 'ゲストユーザー',
@@ -1594,14 +1594,16 @@
     'listusers' => 'ユーザーの表示と編集',
     'listthem' => 'リスト',
     'usersingroup' => '"%s"に含まれるユーザーの一覧',
+    'usersingroupmsg' => 'A list of users that belong to the group. Users lists here may belong directly to the group or are inherited from another group that has been added to this group.',
     'usergroupadmin' => 'グループ管理',
     'add' => '追加',
     'remove' => '削除',
     'availmembers' => 'ユーザー一覧',
     'groupmembers' => 'グループメンバー',
+    'inheritmembers' => 'Inherited Group Members',
     'canteditgroup' => 'グループを編集するためには、グループのメンバーでなければなりません。これがエラーだと思う場合はシステムの管理者に連絡してください。',
     'cantlistgroup' => 'メンバーリストを見るには、グループのメンバーでなければなりません。これがエラーだと思う場合はシステムの管理者に連絡してください。',
-    'editgroupmsg' => 'グループメンバーを変更するには、メンバー名をクリックして「追加」または「削除」ボタンをクリックしてください。ユーザーがグループメンバーの場合は、名前を右側にだけ表示します。作業を終えましたら、「保存」ボタンをクリックすると管理画面に戻ります。',
+    'editgroupmsg' => 'To modify the group membership, click on the member names(s) and use the add or remove buttons. If the member is a member of the group, their name will appear on the right side only. Once you are complete - press <b>Save</b> to update the group and return to the main group admin page.<br><br>Inherited group members can only be removed by editing the group they actually belong too and are only shown here for informational purposes. Remember a user can be both a member of the actual group and still be inherited from another group.',
     'listgroupmsg' => 'グループ<strong>%s</strong>に含まれるユーザー:',
     'search' => '検索',
     'submit' => '実行',