[Netpass-devel] NetPass/www/htdocs/Admin auth.mhtml,1.7,1.8 greset.mhtml,1.4,1.5

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/www/htdocs/Admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8611/www/htdocs/Admin

Modified Files:
	auth.mhtml greset.mhtml 
Log Message:
bug fixes

Index: auth.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/auth.mhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- auth.mhtml	3 Aug 2005 02:44:39 -0000	1.7
+++ auth.mhtml	10 Aug 2005 19:52:16 -0000	1.8
@@ -41,11 +41,12 @@
 
 $m->comp('/Admin/LockConfig', 'enableWhenLocked' => [ 'submitButton' ], 'init' => 0);
 my $lstat = $np->db->isConfigLocked();
-
+</%perl>
 Radius and LDAP servers are shared. If you select Radius for both Client and Admin
 authentication, you will see two "Radius Server" configuration areas, but they
 both refer to the same information. So if you add a Radius server to one, it will 
-appear in both.
+appear in both.<P>
+<%perl>
 
 if ($submitButton eq "Commit Changes") {
 	_log("DEBUG", "$whoami is changing system auth settings\n");

Index: greset.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/greset.mhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- greset.mhtml	3 Aug 2005 02:44:39 -0000	1.4
+++ greset.mhtml	10 Aug 2005 19:52:16 -0000	1.5
@@ -39,9 +39,11 @@
 
 <%perl>
 
-my ($isRoot, $junk)   = $m->comp('/Admin/MemberOf', 'acl' => [ 'Admin' ], 'group' => 'default');
+my ($isRoot, $junk) = $m->comp('/Admin/MemberOf', 'acl' => [ 'Admin' ], 'group' => 'default');
+my $isRW;
+($isRW, $junk)   = $m->comp('/Admin/MemberOf', 'acl' => [ 'QuarAdmin' ], 'group' => 'default');
 
-if (! $isRoot ) {
+if (! $isRoot && ! $isRW ) {
         print $q->p({-class=>'error'}, "Sorry, you don't have access to this form.<P>");
         return;
 }