smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-fix_encrypted_share_list.patch

diff -Nur smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm
--- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm 2011-07-18 13:30:00.000000000 +0200
+++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm     2011-07-18 13:38:10.000000000 +0200
@@ -24,6 +24,7 @@
 our $accountdb = esmith::AccountsDB->open();
 our $user = $ENV{'REMOTE_USER'};
 $user = $1 if ($user =~ /^([a-z][\-a-z0-9]*)$/);
+our @usergroups = $accountdb->user_group_list($user);
 
 *wherenext = \&CGI::FormMagick::wherenext;
 
@@ -44,9 +45,8 @@
     my @encfs = ();
 
     foreach (@shares){
-        my @sharegroups = $_->prop('WriteGroups'), $_->prop('ReadGroups');
+        my @sharegroups = split(/[,;]/, ($_->prop('WriteGroups') || '') .','. ($_->prop('ReadGroups') || ''));
         @sharegroups = keys %{{ map { $_ => 1 } @sharegroups }};
-        my @usergroups = $accountdb->user_group_list($user);
 
         my %count = ();
         my @intersection = ();
@@ -59,7 +59,7 @@
         # and the user has at least read access
         if ((($_->prop('Encryption') || 'disabled') eq 'enabled') &&
             ((scalar @intersection > 0 ) || $user eq 'admin')){
-            push @encfs, $_ if (($_->prop('Encryption') || 'disabled') eq 'enabled');
+            push @encfs, $_;
         }
     }
     unless ( scalar @encfs )
1	vip-ire	1.1	diff -Nur smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm
2			--- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm 2011-07-18 13:30:00.000000000 +0200
3			+++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm 2011-07-18 13:38:10.000000000 +0200
4			@@ -24,6 +24,7 @@
5			our $accountdb = esmith::AccountsDB->open();
6			our $user = $ENV{'REMOTE_USER'};
7			$user = $1 if ($user =~ /^([a-z][\-a-z0-9]*)$/);
8			+our @usergroups = $accountdb->user_group_list($user);
9
10			*wherenext = \&CGI::FormMagick::wherenext;
11
12			@@ -44,9 +45,8 @@
13			my @encfs = ();
14
15			foreach (@shares){
16			- my @sharegroups = $_->prop('WriteGroups'), $_->prop('ReadGroups');
17			+ my @sharegroups = split(/[,;]/, ($_->prop('WriteGroups') \|\| '') .','. ($_->prop('ReadGroups') \|\| ''));
18			@sharegroups = keys %{{ map { $_ => 1 } @sharegroups }};
19			- my @usergroups = $accountdb->user_group_list($user);
20
21			my %count = ();
22			my @intersection = ();
23			@@ -59,7 +59,7 @@
24			# and the user has at least read access
25			if ((($_->prop('Encryption') \|\| 'disabled') eq 'enabled') &&
26			((scalar @intersection > 0 ) \|\| $user eq 'admin')){
27			- push @encfs, $_ if (($_->prop('Encryption') \|\| 'disabled') eq 'enabled');
28			+ push @encfs, $_;
29			}
30			}
31			unless ( scalar @encfs )