[Rt-commit] r4331 - in rt/branches/QUEBEC-EXPERIMENTAL: . lib/RT

[alexmv at bestpractical.com]

Author: alexmv
Date: Mon Dec 19 15:15:17 2005
New Revision: 4331

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/   (props changed)
   rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
Log:
 r7856 at zoq-fot-pik:  chmrr | 2005-12-19 15:14:45 -0500
  * Checking Principal isn't enough to know if this is the current user
 -- we could be being passed our own email address, instead of our own
 principal.


Modified: rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	Mon Dec 19 15:15:17 2005
@@ -1317,7 +1317,8 @@
 
     # {{{ Check ACLS
     #If the watcher we're trying to add is for the current user
-    if ( $self->CurrentUser->PrincipalId  eq $args{'PrincipalId'}) {
+    if ( $self->CurrentUser->PrincipalId  eq $args{'PrincipalId'}
+       or $self->CurrentUser->UserObj->EmailAddress eq $args{'Email'}) {
         #  If it's an AdminCc and they don't have 
         #   'WatchAsAdminCc' or 'ModifyTicket', bail
         if ( $args{'Type'} eq 'AdminCc' ) {