[otrs-cvs] ITSMTicket/Kernel/Modules AgentTicketEmail.pm, 1.5.2.7, 1.5.2.8

[CVS commits notifications of OTRS.org]

Comments:
Update of /home/cvs/ITSMTicket/Kernel/Modules
In directory lancelot:/tmp/cvs-serv3300/Kernel/Modules

Modified Files:
      Tag: rel-1_0
	AgentTicketEmail.pm 
Log Message:
Updated file to framework version 1.43.2.6.

Author: mh

Index: AgentTicketEmail.pm
===================================================================
RCS file: /home/cvs/ITSMTicket/Kernel/Modules/AgentTicketEmail.pm,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -C2 -d -r1.5.2.7 -r1.5.2.8
*** AgentTicketEmail.pm	27 Mar 2008 15:51:26 -0000	1.5.2.7
--- AgentTicketEmail.pm	6 May 2008 09:58:04 -0000	1.5.2.8
***************
*** 544,549 ****
          foreach (qw(To Cc Bcc)) {
              if ($GetParam{$_}) {
!                 foreach my $Email (Mail::Address->parse($GetParam{$_})) {
!                     if (!$Self->{CheckItemObject}->CheckEmail(Address => $Email->address())) {
                          $Error{"$_ invalid"} .= $Self->{CheckItemObject}->CheckError();
                      }
--- 544,554 ----
          foreach (qw(To Cc Bcc)) {
              if ($GetParam{$_}) {
!                 EMAIL:
!                 for my $Email ( Mail::Address->parse( $GetParam{$_} ) ) {
!                     # skip check if the email address is not fully RFC 2822 compilant
!                     next EMAIL if !$Email->host();
!                     next EMAIL if !$Email->user();
! 
!                     if ( !$Self->{CheckItemObject}->CheckEmail( Address => $Email->address() ) ) {
                          $Error{"$_ invalid"} .= $Self->{CheckItemObject}->CheckError();
                      }
***************
*** 1116,1136 ****
              Cached => 1,
          );
!         foreach (keys %Tos) {
!             if ($UserGroups{$Self->{QueueObject}->GetQueueGroupID(QueueID => $_)}) {
!                 $NewTos{$_} = $Tos{$_};
!             }
!         }
          # build selection string
!         foreach (keys %NewTos) {
!             my %QueueData = $Self->{QueueObject}->QueueGet(ID => $_);
!             my $Srting = $Self->{ConfigObject}->Get('Ticket::Frontend::NewQueueSelectionString') || '<Realname> <<Email>> - Queue: <Queue>';
!             $Srting =~ s/<Queue>/$QueueData{Name}/g;
!             $Srting =~ s/<QueueComment>/$QueueData{Comment}/g;
!             if ($Self->{ConfigObject}->Get('Ticket::Frontend::NewQueueSelectionType') ne 'Queue') {
!                 my %SystemAddressData = $Self->{SystemAddress}->SystemAddressGet(ID => $NewTos{$_});
!                 $Srting =~ s/<Realname>/$SystemAddressData{Realname}/g;
!                 $Srting =~ s/<Email>/$SystemAddressData{Name}/g;
              }
!             $NewTos{$_} = $Srting;
          }
      }
--- 1121,1145 ----
              Cached => 1,
          );
! 
          # build selection string
!         for my $QueueID ( keys %Tos ) {
!             my %QueueData = $Self->{QueueObject}->QueueGet( ID => $QueueID, Cache => 1 );
! 
!             # permission check, can we create new tickets in queue
!             next if !$UserGroups{ $QueueData{GroupID} };
! 
!             my $String = $Self->{ConfigObject}->Get('Ticket::Frontend::NewQueueSelectionString')
!                 || '<Realname> <<Email>> - Queue: <Queue>';
!             $String =~ s/<Queue>/$QueueData{Name}/g;
!             $String =~ s/<QueueComment>/$QueueData{Comment}/g;
!             if ( $Self->{ConfigObject}->Get('Ticket::Frontend::NewQueueSelectionType') ne 'Queue' )
!             {
!                 my %SystemAddressData = $Self->{SystemAddress}->SystemAddressGet(
!                     ID => $Tos{$QueueID},
!                 );
!                 $String =~ s/<Realname>/$SystemAddressData{Realname}/g;
!                 $String =~ s/<Email>/$SystemAddressData{Name}/g;
              }
!             $NewTos{$QueueID} = $String;
          }
      }