Commit a752bd91 authored by Franco Fichtner's avatar Franco Fichtner

users: remove the `all' group; refs #312

parent 309ecdae
...@@ -190,13 +190,6 @@ ...@@ -190,13 +190,6 @@
<hostname>OPNsense</hostname> <hostname>OPNsense</hostname>
<domain>localdomain</domain> <domain>localdomain</domain>
<dnsallowoverride/> <dnsallowoverride/>
<group>
<name>all</name>
<description><![CDATA[All Users]]></description>
<scope>system</scope>
<gid>1998</gid>
<member>0</member>
</group>
<group> <group>
<name>admins</name> <name>admins</name>
<description><![CDATA[System Administrators]]></description> <description><![CDATA[System Administrators]]></description>
......
...@@ -140,8 +140,7 @@ if (isset($_POST['save'])) { ...@@ -140,8 +140,7 @@ if (isset($_POST['save'])) {
if (empty($_POST['members'])) { if (empty($_POST['members'])) {
unset($group['member']); unset($group['member']);
} elseif ($group['gid'] != 1998) { } else {
// all group
$group['member'] = $_POST['members']; $group['member'] = $_POST['members'];
} }
...@@ -301,10 +300,6 @@ function presubmit() { ...@@ -301,10 +300,6 @@ function presubmit() {
<?=gettext("Group description, for your own information only");?> <?=gettext("Group description, for your own information only");?>
</td> </td>
</tr> </tr>
<?php
if ($pconfig['gid'] != 1998) :
// all users group
?>
<tr> <tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td> <td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td>
<td width="78%" class="vtable" align="center"> <td width="78%" class="vtable" align="center">
...@@ -375,7 +370,6 @@ function presubmit() { ...@@ -375,7 +370,6 @@ function presubmit() {
</td> </td>
</tr> </tr>
<?php <?php
endif;
if ($act != "new") : if ($act != "new") :
?> ?>
<th colspan="2" valign="top" class="vncell"><?=gettext("Assigned Privileges");?></th> <th colspan="2" valign="top" class="vncell"><?=gettext("Assigned Privileges");?></th>
......
...@@ -606,10 +606,6 @@ function import_ldap_users() { ...@@ -606,10 +606,6 @@ function import_ldap_users() {
<?php <?php
$rowIndex = 0; $rowIndex = 0;
foreach ($config['system']['group'] as $group) : 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'])) { if (is_array($pconfig['groups']) && in_array($group['name'], $pconfig['groups'])) {
continue; continue;
} }
...@@ -645,10 +641,6 @@ function import_ldap_users() { ...@@ -645,10 +641,6 @@ function import_ldap_users() {
$rowIndex = 0; $rowIndex = 0;
if (is_array($pconfig['groups'])) : if (is_array($pconfig['groups'])) :
foreach ($config['system']['group'] as $group) : foreach ($config['system']['group'] as $group) :
if ($group['gid'] == 1998) {
/* all users group */
continue;
}
if (!in_array($group['name'], $pconfig['groups'])) { if (!in_array($group['name'], $pconfig['groups'])) {
continue; 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