[Rt-commit] r5187 - in rt/branches/3.4-RELEASE: .

[jesse at bestpractical.com]

Author: jesse
Date: Tue May  9 00:48:10 2006
New Revision: 5187

Modified:
   rt/branches/3.4-RELEASE/   (props changed)
   rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm

Log:
 r13332 at hualien:  jesse | 2006-05-09 00:47:49 -0400
 * Mismatched parens


Modified: rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/Interface/Email.pm	Tue May  9 00:48:10 2006
@@ -574,12 +574,8 @@
     $args{'ticket'} ||= ParseTicketId($Subject);
 
     $SystemTicket = RT::Ticket->new($RT::SystemUser);
-    if ( $args{'ticket'} ) {
-        $SystemTicket->Load( $args{'ticket'} );
-    }
+    $SystemTicket->Load( $args{'ticket'} ) if ( $args{'ticket'} ) ;
     if ( $SystemTicket->id ) {
-
-        # if there's an existing ticket, this must be a reply
         $Right = 'ReplyToTicket';
     } else {
         $Right = 'CreateTicket';
@@ -591,8 +587,7 @@
 
     # We can safely have no queue of we have a known-good ticket
     unless ( $SystemTicket->id || $SystemQueueObj->id ) {
-        return ( -75, "RT couldn't find the queue: " . $args{'queue'},
-            undef );
+        return ( -75, "RT couldn't find the queue: " . $args{'queue'}, undef );
     }
 
    # Authentication Level ($AuthStat)
@@ -617,14 +612,13 @@
             $Class = "RT::Interface::Email::" . $_
                 unless $_ =~ /^RT::Interface::Email::/;
             $Class->require;
+        }
             no strict 'refs';
-            if ( !defined( $Code = *{ $Class . "::GetCurrentUser" }{CODE} ) )
-            {
-                $RT::Logger->crit(
-                    "No GetCurrentUser code found in $Class module");
+            if ( !defined( $Code = *{ $Class . "::GetCurrentUser" }{CODE} ) ) {
+                $RT::Logger->crit( "No GetCurrentUser code found in $Class module");
                 next;
             }
-        }
+        
 
         foreach my $action (@actions) {
             ( $CurrentUser, $NewAuthStat ) = $Code->(
@@ -647,9 +641,8 @@
 
         last if $AuthStat == -1;
     }
-
     # {{{ If authentication fails and no new user was created, get out.
-    if ( !$CurrentUser or !$CurrentUser->Id or $AuthStat == -1 ) {
+    if ( not $CurrentUser || not $CurrentUser->id ||  $AuthStat == -1 ) {
 
         # If the plugins refused to create one, they lose.
         unless ( $AuthStat == -1 ) {
@@ -697,7 +690,6 @@
 
     my $Ticket = RT::Ticket->new($CurrentUser);
 
-    # {{{ If we don't have a ticket Id, we're creating a new ticket
     if (( !$SystemTicket || !$SystemTicket->Id )
         && grep /^(comment|correspond)$/,
         @actions
@@ -736,7 +728,6 @@
         @actions = grep !/^(comment|correspond)$/, @actions;
         $args{'ticket'} = $id;
 
-        # }}}
     } else {
 
         $Ticket->Load( $args{'ticket'} );