Module config option to hide deleted user and group.

diff --git a/quota/CHANGELOG b/quota/CHANGELOG
index d07fc2b..8ffaf4b 100644 (file)
--- a/quota/CHANGELOG
+++ b/quota/CHANGELOG
@@ -39,3 +39,5 @@ Converted all pages to use the new Webmin UI library, for a more consistent look
 Converted commands in the module's API file to POD format, and added more details about each function.
 ---- Changes since 1.470 ----
 Added a module access control option to restrict allowed groups by GID range.
+---- Changes since 1.530 ----
+Added a Module Config option to hide quotas for deleted users and groups.

diff --git a/quota/config-*-linux b/quota/config-*-linux
index 3248dbf..370c3c8 100644 (file)
--- a/quota/config-*-linux
+++ b/quota/config-*-linux
@@ -22,3 +22,4 @@ block_size=1024
 show_grace=1
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-freebsd b/quota/config-freebsd
index 5e15772..35d7da4 100644 (file)
--- a/quota/config-freebsd
+++ b/quota/config-freebsd
@@ -19,3 +19,4 @@ block_mode=1
 show_grace=0
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-hpux b/quota/config-hpux
index 7ffe003..26c9ea4 100644 (file)
--- a/quota/config-hpux
+++ b/quota/config-hpux
@@ -12,3 +12,4 @@ block_mode=1
 show_grace=0
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-irix b/quota/config-irix
index 66a7424..5bb26f7 100644 (file)
--- a/quota/config-irix
+++ b/quota/config-irix
@@ -10,3 +10,4 @@ block_mode=1
 show_grace=0
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-macos b/quota/config-macos
index 5e15772..35d7da4 100644 (file)
--- a/quota/config-macos
+++ b/quota/config-macos
@@ -19,3 +19,4 @@ block_mode=1
 show_grace=0
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-netbsd b/quota/config-netbsd
index 5e15772..35d7da4 100644 (file)
--- a/quota/config-netbsd
+++ b/quota/config-netbsd
@@ -19,3 +19,4 @@ block_mode=1
 show_grace=0
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-openbsd b/quota/config-openbsd
index 5e15772..35d7da4 100644 (file)
--- a/quota/config-openbsd
+++ b/quota/config-openbsd
@@ -19,3 +19,4 @@ block_mode=1
 show_grace=0
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-solaris b/quota/config-solaris
index 5a04d32..de32378 100644 (file)
--- a/quota/config-solaris
+++ b/quota/config-solaris
@@ -12,3 +12,4 @@ block_mode=1
 show_grace=1
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config-unixware b/quota/config-unixware
index 7ffe003..26c9ea4 100644 (file)
--- a/quota/config-unixware
+++ b/quota/config-unixware
@@ -12,3 +12,4 @@ block_mode=1
 show_grace=0
 email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 pc_show=1
+hide_uids=0

diff --git a/quota/config.info b/quota/config.info
index 7e33bca..0f5dfca 100644 (file)
--- a/quota/config.info
+++ b/quota/config.info
@@ -4,6 +4,7 @@ threshold_pc=Threshold percentage to highlight used quota,3,Don't show
 pc_show=Usage percentages to show,1,2-Hard and soft,1-Hard only,0-Soft only
 sort_mode=Sort users and groups by,1,0-Blocks used,2-Name,1-Order from repquota,3-Hard block quota,4-Soft block quota,5-Percent of hard quota used,6-Percent of soft quota used
 block_mode=Show quotas in,1,1-Kilobytes (where possible),0-Blocks
+hide_uids=Show deleted users?,1,0-Yes,1-No
 line1.1=Quota email messages,11
 email_msg=Email message for users over quota,9,80,5,\t
 email_subject=Subject for email message to users,3,Default

diff --git a/quota/list_groups.cgi b/quota/list_groups.cgi
index 2f19ec2..502a66c 100755 (executable)
--- a/quota/list_groups.cgi
+++ b/quota/list_groups.cgi
@@ -144,6 +144,8 @@ elsif ($n) {
        # Generate table of groups
        foreach $i (@order) {
                next if (!&can_edit_group($group{$i,'group'}));
+               next if ($config{'hide_uids'} &&
+                        $group{$i,'group'} =~ /^#/);
                local @cols;
                if ($access{'ro'}) {
                        push(@cols, $group{$i,'group'});

diff --git a/quota/list_users.cgi b/quota/list_users.cgi
index 220ec7c..fafb21b 100755 (executable)
--- a/quota/list_users.cgi
+++ b/quota/list_users.cgi
@@ -146,6 +146,8 @@ elsif ($n) {
        # Generate table of users
        foreach $i (@order) {
                next if (!&can_edit_user($user{$i,'user'}));
+               next if ($config{'hide_uids'} &&
+                        $user{$i,'user'} =~ /^#/);
                local @cols;
                if ($access{'ro'}) {
                        push(@cols, $user{$i,'user'});