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 2012-10-11 10:11:38.677576616 +0200 |
3 |
|
|
+++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelEncfs.pm 2012-10-11 10:12:47.802118276 +0200 |
4 |
|
|
@@ -46,6 +46,7 @@ |
5 |
|
|
|
6 |
|
|
foreach (@shares){ |
7 |
|
|
my @sharegroups = split(/[,;]/, ($_->prop('WriteGroups') || '') .','. ($_->prop('ReadGroups') || '')); |
8 |
|
|
+ my @shareusers = split(/[,;]/, ($_->prop('WriteUsers') || '') .','. ($_->prop('ReadUsers') || '')); |
9 |
|
|
@sharegroups = keys %{{ map { $_ => 1 } @sharegroups }}; |
10 |
|
|
|
11 |
|
|
my %count = (); |
12 |
|
|
@@ -58,7 +59,7 @@ |
13 |
|
|
# Only display the share in the list if encryption is enabled |
14 |
|
|
# and the user has at least read access |
15 |
|
|
if ((($_->prop('Encryption') || 'disabled') eq 'enabled') && |
16 |
|
|
- ((scalar @intersection > 0 ) || $user eq 'admin')){ |
17 |
|
|
+ ((scalar @intersection > 0 ) || (grep { $_ eq $user} @shareusers) || ($user eq 'admin'))){ |
18 |
|
|
push @encfs, $_; |
19 |
|
|
} |
20 |
|
|
} |