# HG changeset patch
# User Matthias Förste foerste@schlittermann.de
# Date 1323764520 -3600
# Node ID e0895d4224f212b27dd3a23301291ae24a0e8906
# Parent  3293084cfdd98e702a8912bc876e54c827bc041a
indicate global & group acl; fixed error message; made error message a bit more verbose

diff -r 3293084cfdd9 -r e0895d4224f2 acl.pm
--- a/acl.pm	Mon Dec 12 15:13:54 2011 +0100
+++ b/acl.pm	Tue Dec 13 09:22:00 2011 +0100
@@ -94,7 +94,7 @@
     if    ( $Cf->list )   { _list() }
     elsif ( $Cf->modify ) { _modify() }
     elsif ( $Cf->delete ) { $Cf->acl('delete') ; _modify() }
-    else { die "Need action (--modify|--list)\n" }
+    else { die "Need action (--delete|--modify|--list)\n" }
 
 }
 
@@ -263,7 +263,7 @@
             for my $f ( @{$folders} ) {
 
                 #next if '\\Noselect' ~~ $f->[0];
-                my $perms = $imap->getacl( $f ) or die $@;
+                my $perms = $imap->getacl( $f ) or die "Can't getacl '$f': $@";
                 my ($u, $p);
                 while ($u = shift @{$perms} and $p = shift @{$perms}) { 
                     next unless $u eq $uid;
@@ -295,13 +295,11 @@
         my ($u, $p);
         while ($u = shift @{$perms} and $p = shift @{$perms}) {
 
-#        use Data::Dumper;
-#        warn Dumper([ $Cf->acl_admin, $Cf->imap_admin, '#' . $Cf->acl_admin, '#' . $Cf->imap_admin ]);
-
             # '#user' will be listed when we have a global acl for 'user'
-            next if $u ~~ [ $Cf->acl_admin, $Cf->imap_admin, '#' . $Cf->acl_admin, '#' . $Cf->imap_admin ];
+            my $gl = $u =~ /^#/ ? ' [global acl]' : '';
+            my $gr = $u =~ /^\$/ ? ' [group acl]' : '';
             $hasacl = 1;
-            print "\t$u [$p]\n";
+            print "\t$u [$p]$gr$gl\n";
         }
 
         print "\tno acl found\n" unless $hasacl;