smeserver-subversion/contribs7/smeserver-subversion-1.4-ImplementReadWriteAccess2.patch

--- smeserver-subversion-1.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/subversion.pm.ImplementReadWriteAccess2       2008-02-22 15:27:09.000000000 +0100
+++ smeserver-subversion-1.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/subversion.pm 2008-02-22 15:35:57.000000000 +0100
@@ -447,10 +447,14 @@
 
            $q->param(-name=>'description',
                -value=>$rec->prop('Description'));
-           $q->param(-name=>'groups',
-               -value=>join(FS, split(FS, $rec->prop('Groups'))));
-           $q->param(-name=>'users',
-               -value=>join(FS, split(FS, $rec->prop('Users'))));
+           $q->param(-name=>'groupsRead',
+               -value=>join(FS, split(FS, $rec->prop('GroupsRead'))));
+           $q->param(-name=>'usersRead',
+               -value=>join(FS, split(FS, $rec->prop('UsersRead'))));
+           $q->param(-name=>'groupsWrite',
+               -value=>join(FS, split(FS, $rec->prop('GroupsWrite'))));
+           $q->param(-name=>'usersWrite',
+               -value=>join(FS, split(FS, $rec->prop('UsersWrite'))));
             $q->param(-name=>'authentification_required',
                -value=>$rec->prop('AuthentificationRequired'));
             $q->param(-name=>'access_type',
@@ -621,31 +625,53 @@
         return $self->error($msg);
     }
 
-    my $g_list;
-    my @groups = $self->cgi->param('groups');
-    foreach my $g (@groups) {
-        if ($g_list) {
-            $g_list .= "," . $g;
+    my $gr_list;
+    my @groupsRead = $self->cgi->param('groupsRead');
+    foreach my $gr (@groupsRead) {
+        if ($gr_list) {
+            $gr_list .= "," . $gr;
         } else {
-            $g_list = $g;
+            $gr_list = $gr;
         }
     }
 
-    my $u_list;
-    my @users = $self->cgi->param('users');
-    foreach my $u (@users) {
-        if ($u_list) {
-            $u_list .= "," . $u;
+    my $ur_list;
+    my @usersRead = $self->cgi->param('usersRead');
+    foreach my $ur (@usersRead) {
+        if ($ur_list) {
+            $ur_list .= "," . $ur;
+        } else {
+            $ur_list = $ur;
+        }
+    }
+
+    my $gw_list;
+    my @groupsWrite = $self->cgi->param('groupsWrite');
+    foreach my $gw (@groupsWrite) {
+        if ($gw_list) {
+            $gw_list .= "," . $gw;
+        } else {
+            $gw_list = $gw;
+        }
+    }
+
+    my $uw_list;
+    my @usersWrite = $self->cgi->param('usersWrite');
+    foreach my $uw (@usersWrite) {
+        if ($uw_list) {
+            $uw_list .= "," . $uw;
         } else {
-            $u_list = $u;
+            $uw_list = $uw;
         }
     }
 
     my $uid  = $accountdb->get_next_uid();
     if (my $acct = $accountdb->new_record($name, {
             Description              => $self->cgi->param('description'),
-            Groups                   => "$g_list",
-            Users                    => "$u_list",
+            GroupsRead               => "$gr_list",
+            UsersRead                => "$ur_list",
+            GroupsWrite              => "$gw_list",
+            UsersWrite               => "$uw_list",
            Modifiable               => 'yes',
             Removable                => 'yes',
             ForceSSL                 => $self->cgi->param('force_ssl'),
@@ -715,23 +741,43 @@
         return $self->error($msg);
     }
 
-    my $g_list;
-    my @groups = $self->cgi->param('groups');
-    foreach my $g (@groups) {
-        if ($g_list) {
-            $g_list .= "," . $g;
+    my $gr_list;
+    my @groupsRead = $self->cgi->param('groupsRead');
+    foreach my $gr (@groupsRead) {
+        if ($gr_list) {
+            $gr_list .= "," . $gr;
         } else {
-            $g_list = $g;
+            $gr_list = $gr;
         }
     }
 
-    my $u_list;
-    my @users = $self->cgi->param('users');
-    foreach my $u (@users) {
-        if ($u_list) {
-            $u_list .= "," . $u;
+    my $ur_list;
+    my @usersRead = $self->cgi->param('usersRead');
+    foreach my $ur (@usersRead) {
+        if ($ur_list) {
+            $ur_list .= "," . $ur;
+        } else {
+            $ur_list = $ur;
+        }
+    }
+
+    my $gw_list;
+    my @groupsWrite = $self->cgi->param('groupsWrite');
+    foreach my $gw (@groupsWrite) {
+        if ($gw_list) {
+            $gw_list .= "," . $gw;
+        } else {
+            $gw_list = $gw;
+        }
+    }
+
+    my $uw_list;
+    my @usersWrite = $self->cgi->param('usersWrite');
+    foreach my $uw (@usersWrite) {
+        if ($uw_list) {
+            $uw_list .= "," . $uw;
         } else {
-            $u_list = $u;
+            $uw_list = $uw;
         }
     }
 
@@ -740,8 +786,10 @@
 
             $acct->merge_props(
             Description              => $self->cgi->param('description'),
-            Groups                   => $g_list,
-            Users                    => $u_list,
+            GroupsRead               => $gr_list,
+            UsersRead                => $ur_list,
+            GroupsWrite              => $gr_list,
+            UsersWrite               => $ur_list,
             ForceSSL                 => $self->cgi->param('force_ssl'),
             AccessType               => $self->cgi->param('access_type'),
             AuthentificationRequired => $self->cgi->param('authentification_required'),
--- smeserver-subversion-1.4/root/etc/e-smith/web/functions/subversion.ImplementReadWriteAccess2        2008-02-22 15:27:09.000000000 +0100
+++ smeserver-subversion-1.4/root/etc/e-smith/web/functions/subversion  2008-02-22 15:29:19.000000000 +0100
@@ -152,7 +152,7 @@
         
         <field 
             type="select" 
-            id="groups" 
+            id="groupsRead" 
             options="group_list()" 
             multiple="1" size="5">
             <label>GROUPS</label>
@@ -160,7 +160,23 @@
 
         <field 
            type="select" 
-           id="users" 
+           id="usersRead" 
+            options="user_list()" 
+           multiple="1" size="5">
+            <label>USERS</label>
+        </field>
+        
+        <field 
+            type="select" 
+            id="groupsWrite" 
+            options="group_list()" 
+            multiple="1" size="5">
+            <label>GROUPS</label>
+        </field>
+
+        <field 
+           type="select" 
+           id="usersWrite" 
             options="user_list()" 
            multiple="1" size="5">
             <label>USERS</label>
1	slords	1.1	--- smeserver-subversion-1.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/subversion.pm.ImplementReadWriteAccess2 2008-02-22 15:27:09.000000000 +0100
2			+++ smeserver-subversion-1.4/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/subversion.pm 2008-02-22 15:35:57.000000000 +0100
3			@@ -447,10 +447,14 @@
4
5			$q->param(-name=>'description',
6			-value=>$rec->prop('Description'));
7			- $q->param(-name=>'groups',
8			- -value=>join(FS, split(FS, $rec->prop('Groups'))));
9			- $q->param(-name=>'users',
10			- -value=>join(FS, split(FS, $rec->prop('Users'))));
11			+ $q->param(-name=>'groupsRead',
12			+ -value=>join(FS, split(FS, $rec->prop('GroupsRead'))));
13			+ $q->param(-name=>'usersRead',
14			+ -value=>join(FS, split(FS, $rec->prop('UsersRead'))));
15			+ $q->param(-name=>'groupsWrite',
16			+ -value=>join(FS, split(FS, $rec->prop('GroupsWrite'))));
17			+ $q->param(-name=>'usersWrite',
18			+ -value=>join(FS, split(FS, $rec->prop('UsersWrite'))));
19			$q->param(-name=>'authentification_required',
20			-value=>$rec->prop('AuthentificationRequired'));
21			$q->param(-name=>'access_type',
22			@@ -621,31 +625,53 @@
23			return $self->error($msg);
24			}
25
26			- my $g_list;
27			- my @groups = $self->cgi->param('groups');
28			- foreach my $g (@groups) {
29			- if ($g_list) {
30			- $g_list .= "," . $g;
31			+ my $gr_list;
32			+ my @groupsRead = $self->cgi->param('groupsRead');
33			+ foreach my $gr (@groupsRead) {
34			+ if ($gr_list) {
35			+ $gr_list .= "," . $gr;
36			} else {
37			- $g_list = $g;
38			+ $gr_list = $gr;
39			}
40			}
41
42			- my $u_list;
43			- my @users = $self->cgi->param('users');
44			- foreach my $u (@users) {
45			- if ($u_list) {
46			- $u_list .= "," . $u;
47			+ my $ur_list;
48			+ my @usersRead = $self->cgi->param('usersRead');
49			+ foreach my $ur (@usersRead) {
50			+ if ($ur_list) {
51			+ $ur_list .= "," . $ur;
52			+ } else {
53			+ $ur_list = $ur;
54			+ }
55			+ }
56			+
57			+ my $gw_list;
58			+ my @groupsWrite = $self->cgi->param('groupsWrite');
59			+ foreach my $gw (@groupsWrite) {
60			+ if ($gw_list) {
61			+ $gw_list .= "," . $gw;
62			+ } else {
63			+ $gw_list = $gw;
64			+ }
65			+ }
66			+
67			+ my $uw_list;
68			+ my @usersWrite = $self->cgi->param('usersWrite');
69			+ foreach my $uw (@usersWrite) {
70			+ if ($uw_list) {
71			+ $uw_list .= "," . $uw;
72			} else {
73			- $u_list = $u;
74			+ $uw_list = $uw;
75			}
76			}
77
78			my $uid = $accountdb->get_next_uid();
79			if (my $acct = $accountdb->new_record($name, {
80			Description => $self->cgi->param('description'),
81			- Groups => "$g_list",
82			- Users => "$u_list",
83			+ GroupsRead => "$gr_list",
84			+ UsersRead => "$ur_list",
85			+ GroupsWrite => "$gw_list",
86			+ UsersWrite => "$uw_list",
87			Modifiable => 'yes',
88			Removable => 'yes',
89			ForceSSL => $self->cgi->param('force_ssl'),
90			@@ -715,23 +741,43 @@
91			return $self->error($msg);
92			}
93
94			- my $g_list;
95			- my @groups = $self->cgi->param('groups');
96			- foreach my $g (@groups) {
97			- if ($g_list) {
98			- $g_list .= "," . $g;
99			+ my $gr_list;
100			+ my @groupsRead = $self->cgi->param('groupsRead');
101			+ foreach my $gr (@groupsRead) {
102			+ if ($gr_list) {
103			+ $gr_list .= "," . $gr;
104			} else {
105			- $g_list = $g;
106			+ $gr_list = $gr;
107			}
108			}
109
110			- my $u_list;
111			- my @users = $self->cgi->param('users');
112			- foreach my $u (@users) {
113			- if ($u_list) {
114			- $u_list .= "," . $u;
115			+ my $ur_list;
116			+ my @usersRead = $self->cgi->param('usersRead');
117			+ foreach my $ur (@usersRead) {
118			+ if ($ur_list) {
119			+ $ur_list .= "," . $ur;
120			+ } else {
121			+ $ur_list = $ur;
122			+ }
123			+ }
124			+
125			+ my $gw_list;
126			+ my @groupsWrite = $self->cgi->param('groupsWrite');
127			+ foreach my $gw (@groupsWrite) {
128			+ if ($gw_list) {
129			+ $gw_list .= "," . $gw;
130			+ } else {
131			+ $gw_list = $gw;
132			+ }
133			+ }
134			+
135			+ my $uw_list;
136			+ my @usersWrite = $self->cgi->param('usersWrite');
137			+ foreach my $uw (@usersWrite) {
138			+ if ($uw_list) {
139			+ $uw_list .= "," . $uw;
140			} else {
141			- $u_list = $u;
142			+ $uw_list = $uw;
143			}
144			}
145
146			@@ -740,8 +786,10 @@
147
148			$acct->merge_props(
149			Description => $self->cgi->param('description'),
150			- Groups => $g_list,
151			- Users => $u_list,
152			+ GroupsRead => $gr_list,
153			+ UsersRead => $ur_list,
154			+ GroupsWrite => $gr_list,
155			+ UsersWrite => $ur_list,
156			ForceSSL => $self->cgi->param('force_ssl'),
157			AccessType => $self->cgi->param('access_type'),
158			AuthentificationRequired => $self->cgi->param('authentification_required'),
159			--- smeserver-subversion-1.4/root/etc/e-smith/web/functions/subversion.ImplementReadWriteAccess2 2008-02-22 15:27:09.000000000 +0100
160			+++ smeserver-subversion-1.4/root/etc/e-smith/web/functions/subversion 2008-02-22 15:29:19.000000000 +0100
161			@@ -152,7 +152,7 @@
162
163			<field
164			type="select"
165			- id="groups"
166			+ id="groupsRead"
167			options="group_list()"
168			multiple="1" size="5">
169			<label>GROUPS</label>
170			@@ -160,7 +160,23 @@
171
172			<field
173			type="select"
174			- id="users"
175			+ id="usersRead"
176			+ options="user_list()"
177			+ multiple="1" size="5">
178			+ <label>USERS</label>
179			+ </field>
180			+
181			+ <field
182			+ type="select"
183			+ id="groupsWrite"
184			+ options="group_list()"
185			+ multiple="1" size="5">
186			+ <label>GROUPS</label>
187			+ </field>
188			+
189			+ <field
190			+ type="select"
191			+ id="usersWrite"
192			options="user_list()"
193			multiple="1" size="5">
194			<label>USERS</label>