Commit a66c7889 authored by Franco Fichtner's avatar Franco Fichtner

users: the infamous all group kicks the proverbial bucket

The all group was previously removed from the root account due
to the fact that it won't be applied to new user accounts anymore.
This isn't bad as far as we've seen so we went a bit further,
removing the group altogether.  Nice side effect is that a lot of
conditional code just disappears, so I doubt anyone will have any
hard feelings later.
parent ee5672b9
......@@ -192,12 +192,6 @@
<domain>localdomain</domain>
<dnsserver/>
<dnsallowoverride/>
<group>
<name>all</name>
<description><![CDATA[All Users]]></description>
<scope>system</scope>
<gid>1998</gid>
</group>
<group>
<name>admins</name>
<description><![CDATA[System Administrators]]></description>
......
......@@ -140,8 +140,7 @@ if (isset($_POST['save'])) {
if (empty($_POST['members'])) {
unset($group['member']);
} elseif ($group['gid'] != 1998) {
// all group
} else {
$group['member'] = $_POST['members'];
}
......@@ -301,10 +300,6 @@ function presubmit() {
<?=gettext("Group description, for your own information only");?>
</td>
</tr>
<?php
if ($pconfig['gid'] != 1998) :
// all users group
?>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td>
<td width="78%" class="vtable" align="center">
......@@ -375,7 +370,6 @@ function presubmit() {
</td>
</tr>
<?php
endif;
if ($act != "new") :
?>
<th colspan="2" valign="top" class="vncell"><?=gettext("Assigned Privileges");?></th>
......
......@@ -606,10 +606,6 @@ function import_ldap_users() {
<?php
$rowIndex = 0;
foreach ($config['system']['group'] as $group) :
if ($group['gid'] == 1998) {
/* all users group */
continue;
}
if (is_array($pconfig['groups']) && in_array($group['name'], $pconfig['groups'])) {
continue;
}
......@@ -645,10 +641,6 @@ function import_ldap_users() {
$rowIndex = 0;
if (is_array($pconfig['groups'])) :
foreach ($config['system']['group'] as $group) :
if ($group['gid'] == 1998) {
/* all users group */
continue;
}
if (!in_array($group['name'], $pconfig['groups'])) {
continue;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment