[Stud-cvs] stud admin_booking,1.29,1.30

[Peter B. <mr_...@us...>]

Update of /cvsroot/stud/stud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22802

Modified Files:
	admin_booking 
Log Message:
RFE:1220361. Minor fix so that removal of priviligies for a user does not need to be a valid user (any more).

Index: admin_booking
===================================================================
RCS file: /cvsroot/stud/stud/admin_booking,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** admin_booking	31 Oct 2005 11:17:57 -0000	1.29
--- admin_booking	31 Oct 2005 13:59:33 -0000	1.30
***************
*** 1768,1777 ****
    my ($info, $dummy);
  
!   unless (!$db->authenticate_user($user) && $password &&
! 	  !$db->authenticate_user($administrator)) {
      user_error("<b>You did not give at least these data</b>\n<ul>",
! 	       "- Valid user id<br>",
! 	       "- Valid password<br>",
! 	       "- Valid administrator id: '$administrator'</ul>");
      return;
    }
--- 1768,1782 ----
    my ($info, $dummy);
  
!   if ($is_granting) {
!     unless (!$db->authenticate_user($administrator)) {
!       user_error("<b>You did not give a valid administrator id: '$administrator'</b>\n<ul>");
!       return;
!     }
!   }
! 
!   unless ($password && !$db->authenticate_user($user)) {
      user_error("<b>You did not give at least these data</b>\n<ul>",
!                "- Valid user id<br>",
! 	       "- Valid password<br>");
      return;
    }