/[smecontribs]/rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-print_group_table_with_manual_perms.patch
ViewVC logotype

Annotation of /rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-print_group_table_with_manual_perms.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Wed Dec 15 14:25:48 2010 UTC (13 years, 11 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-shared-folders-0_1-43_el4_sme, smeserver-shared-folders-0_1-39_el4_sme, smeserver-shared-folders-0_1-40_el4_sme, smeserver-shared-folders-0_1-71_el4_sme, smeserver-shared-folders-0_1-61_el4_sme, smeserver-shared-folders-0_1-70_el4_sme, smeserver-shared-folders-0_1-66_el4_sme, smeserver-shared-folders-0_1-65_el4_sme, smeserver-shared-folders-0_1-51_el4_sme, smeserver-shared-folders-0_1-50_el4_sme, smeserver-shared-folders-0_1-59_el4_sme, smeserver-shared-folders-0_1-48_el4_sme, smeserver-shared-folders-0_1-56_el4_sme, smeserver-shared-folders-0_1-35_el4_sme, smeserver-shared-folders-0_1-37_el4_sme, smeserver-shared-folders-0_1-42_el4_sme, smeserver-shared-folders-0_1-60_el4_sme, smeserver-shared-folders-0_1-47_el4_sme, smeserver-shared-folders-0_1-77_el4_sme, smeserver-shared-folders-0_1-32_el4_sme, smeserver-shared-folders-0_1-74_el4_sme, smeserver-shared-folders-0_1-78_el4_sme, smeserver-shared-folders-0_1-41_el4_sme, smeserver-shared-folders-0_1-34_el4_sme, smeserver-shared-folders-0_1-62_el4_sme, smeserver-shared-folders-0_1-58_el4_sme, smeserver-shared-folders-0_1-63_el4_sme, smeserver-shared-folders-0_1-75_el4_sme, smeserver-shared-folders-0_1-76_el4_sme, smeserver-shared-folders-0_1-68_el4_sme, smeserver-shared-folders-0_1-69_el4_sme, smeserver-shared-folders-0_1-57_el4_sme, smeserver-shared-folders-0_1-54_el4_sme, smeserver-shared-folders-0_1-49_el4_sme, smeserver-shared-folders-0_1-46_el4_sme, smeserver-shared-folders-0_1-33_el4_sme, smeserver-shared-folders-0_1-44_el4_sme, smeserver-shared-folders-0_1-45_el4_sme, smeserver-shared-folders-0_1-52_el4_sme, smeserver-shared-folders-0_1-72_el4_sme, smeserver-shared-folders-0_1-73_el4_sme, smeserver-shared-folders-0_1-38_el4_sme, smeserver-shared-folders-0_1-64_el4_sme, smeserver-shared-folders-0_1-36_el4_sme, smeserver-shared-folders-0_1-67_el4_sme, smeserver-shared-folders-0_1-79_el4_sme, smeserver-shared-folders-0_1-55_el4_sme, smeserver-shared-folders-0_1-53_el4_sme, HEAD 
* Wed Dec 15 2010  Daniel Berteaud <daniel@firewall-services.com> 0.1-32.sme
- Print the group table when ManualPermissions is enabled
- Fix a warning in httpd.conf templates
- Use www as group owner of the root dir if httpAccess is enabled
1 vip-ire 1.1 diff -Nur smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm
2     --- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2010-12-15 08:46:06.000000000 +0100
3     +++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2010-12-15 08:54:01.000000000 +0100
4     @@ -252,56 +252,58 @@
5     my $ReadGroups = $q->param('ReadGroups') || '';
6     my $share = $q->param('share');
7     my $manualPerm = $q->param('manualPerm') || '';
8     + my $out = '';
9    
10     if (($manualPerm eq 'yes') || ($manualPerm eq 'enabled')){
11     - return $fm->localise('MANUAL_PERMS');
12     + $out .= $fm->localise('MANUAL_PERMS');
13     }
14     - else {
15     - my %WriteGroups;
16     - my %ReadGroups;
17     - foreach my $group ( split ( /[,;]/, $WriteGroups ) ) {
18     - $WriteGroups{$group} = 1;
19     - }
20     - foreach my $group ( split ( /[,;]/, $ReadGroups ) ) {
21     - $ReadGroups{$group} = 1;
22     - }
23     - my @groups = sort { $a->key() cmp $b->key() } $accountdb->groups();
24     -
25     - my $out = "<tr><td class=\"sme-noborders-label\">" .
26     - $fm->localise('PERMISSIONS') .
27     - "</td><td>\n".
28     - $q->start_table({-class => "sme-border"})."\n".
29     - $q->Tr(
30     - esmith::cgi::genSmallCell($q, $fm->localise('GROUPS'),"header"),
31     - esmith::cgi::genSmallCell($q, $fm->localise('WRITE_PERM'),"header"),
32     - esmith::cgi::genSmallCell($q, $fm->localise('READ_PERM'),"header")
33     - );
34    
35     - foreach my $group (@groups) {
36     - my $write = "";
37     - my $read = "";
38     - my $name = $group->key();
39     - if ( $WriteGroups{$name} ) {
40     - $write = "checked";
41     - }
42     - if ( $ReadGroups{$name} ) {
43     - $read = "checked";
44     - }
45     + my %WriteGroups;
46     + my %ReadGroups;
47     +
48     + foreach my $group ( split ( /[,;]/, $WriteGroups ) ) {
49     + $WriteGroups{$group} = 1;
50     + }
51     + foreach my $group ( split ( /[,;]/, $ReadGroups ) ) {
52     + $ReadGroups{$group} = 1;
53     + }
54     + my @groups = sort { $a->key() cmp $b->key() } $accountdb->groups();
55    
56     - $out .= $q->Tr(
57     - esmith::cgi::genSmallCell($q, $name, "normal"),
58     - esmith::cgi::genSmallCell($q,"<input type=\"checkbox\""
59     - . " name=\"write\""
60     - . " $write value=\"$name\">", "normal"),
61     - esmith::cgi::genSmallCell($q,"<input type=\"checkbox\""
62     - . " name=\"read\""
63     - . " $read value=\"$name\">", "normal")
64     - );
65     + $out .= "<tr><td class=\"sme-noborders-label\">" .
66     + $fm->localise('PERMISSIONS') .
67     + "</td><td>\n".
68     + $q->start_table({-class => "sme-border"})."\n".
69     + $q->Tr(
70     + esmith::cgi::genSmallCell($q, $fm->localise('GROUPS'),"header"),
71     + esmith::cgi::genSmallCell($q, $fm->localise('WRITE_PERM'),"header"),
72     + esmith::cgi::genSmallCell($q, $fm->localise('READ_PERM'),"header")
73     + );
74     +
75     + foreach my $group (@groups) {
76     + my $write = "";
77     + my $read = "";
78     + my $name = $group->key();
79     + if ( $WriteGroups{$name} ) {
80     + $write = "checked";
81     + }
82     + if ( $ReadGroups{$name} ) {
83     + $read = "checked";
84     }
85    
86     - $out .= "</table></td></tr>\n";
87     - return $out;
88     + $out .= $q->Tr(
89     + esmith::cgi::genSmallCell($q, $name, "normal"),
90     +
91     + esmith::cgi::genSmallCell($q,"<input type=\"checkbox\""
92     + . " name=\"write\""
93     + . " $write value=\"$name\">", "normal"),
94     + esmith::cgi::genSmallCell($q,"<input type=\"checkbox\""
95     + . " name=\"read\""
96     + . " $read value=\"$name\">", "normal")
97     + );
98     }
99     +
100     + $out .= "</table></td></tr>\n";
101     + return $out;
102     }
103    
104     # Print a section bar
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed