From d16e4f1c0a14f699dd9910be000ca3bf1f719de4 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
Date: Tue, 24 May 2016 01:04:34 +0200
Subject: Change PreFilter to PostFilter

PreFilter are removed in otrs-5.0.
---
 DefaultRecipient.sopm                              |   2 +-
 Kernel/Config/Files/DefaultRecipient.xml           |   4 +-
 .../Output/HTML/ArticleCompose/DefaultRecipient.pm | 117 +++++++++++++++++++++
 Kernel/Output/HTML/DefaultRecipient.pm             | 109 -------------------
 4 files changed, 120 insertions(+), 112 deletions(-)
 create mode 100644 Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm
 delete mode 100644 Kernel/Output/HTML/DefaultRecipient.pm

diff --git a/DefaultRecipient.sopm b/DefaultRecipient.sopm
index 815ccdc..88e750a 100644
--- a/DefaultRecipient.sopm
+++ b/DefaultRecipient.sopm
@@ -16,7 +16,7 @@
     <File Permission="644" Location="Kernel/Language/de_AgentDefaultRecipient.pm"/>
     <File Permission="644" Location="Kernel/Modules/AdminDefaultRecipient.pm"/>
     <File Permission="644" Location="Kernel/Modules/AdminDefaultRecipientTemplates.pm"/>
-    <File Permission="644" Location="Kernel/Output/HTML/DefaultRecipient.pm"/>
+    <File Permission="644" Location="Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm"/>
     <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipient.tt"/>
     <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/AdminDefaultRecipientTemplates.tt"/>
     <File Permission="644" Location="Kernel/System/DefaultRecipient.pm"/>
diff --git a/Kernel/Config/Files/DefaultRecipient.xml b/Kernel/Config/Files/DefaultRecipient.xml
index a4a0bac..b8292c8 100644
--- a/Kernel/Config/Files/DefaultRecipient.xml
+++ b/Kernel/Config/Files/DefaultRecipient.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <otrs_config version="1.0" init="Config">
-    <ConfigItem Name="Frontend::Output::FilterElementPre###DefaultRecipient" Required="0" Valid="1">
+    <ConfigItem Name="Frontend::Output::FilterElementPost###DefaultRecipient" Required="0" Valid="1">
         <Description Translatable="1">Change the default To address, based on the response template.</Description>
         <Group>Ticket</Group>
         <SubGroup>Frontend::Agent::Ticket::ViewCompose</SubGroup>
         <Setting>
             <Hash>
-                <Item Key="Module">Kernel::Output::HTML::DefaultRecipient</Item>
+                <Item Key="Module">Kernel::Output::HTML::ArticleCompose::DefaultRecipient</Item>
                 <Item Key="Templates">
                     <Hash>
                         <Item Key="AgentTicketCompose">1</Item>
diff --git a/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm b/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm
new file mode 100644
index 0000000..aa50e49
--- /dev/null
+++ b/Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm
@@ -0,0 +1,117 @@
+# --
+# Kernel/Output/HTML/ArticleCompose/DefaultRecipient.pm
+# Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
+# --
+
+package Kernel::Output::HTML::ArticleCompose::DefaultRecipient;
+
+use strict;
+use warnings;
+
+our @ObjectDependencies = qw(
+    Kernel::Output::HTML::Layout
+    Kernel::System::DefaultRecipient
+    Kernel::System::Log
+);
+
+sub new {
+    my ( $Type, %Param ) = @_;
+
+    # allocate new hash for object
+    my $Self = {};
+    bless( $Self, $Type );
+
+    return $Self;
+}
+
+sub Run {
+    my ( $Self, %Param ) = @_;
+    my $LayoutObject = $Kernel::OM->Get('Kernel::Output::HTML::Layout');;
+
+    # check needed stuff
+    if ( !defined $Param{Data} ) {
+        my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
+        $LogObject->Log(
+            Priority => 'error',
+            Message => 'Need Data!'
+        );
+        $LayoutObject->FatalDie();
+    }
+
+    my $BlockData = $LayoutObject->{BlockData};
+
+    # get ticket data
+    my $Ticket;
+    BLOCK:
+    for my $block ( @$BlockData ) {
+        if ( $block->{Name} eq 'TicketBack' ) {
+            $Ticket = $block->{Data};
+            last BLOCK;
+        }
+    } 
+
+    # return if not generated from template
+    unless ($Ticket->{ResponseID}) {
+        my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
+        $LogObject->Log(
+            Priority => 'error',
+            Message => 'Need Data!'
+        );
+        $LayoutObject->FatalDie();
+    }
+    return unless $Ticket->{ResponseID};
+
+    # get all DefaultRecipient
+    my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+    my %MappedDefaultRecipient = $DefaultRecipientObject->MappingList(
+        TemplateID => $Ticket->{ResponseID},
+    );
+
+    my $RemoveTo = 0;
+    my %Addresses = ( To => [], Cc => [], Bcc => [] );
+    foreach my $ID ( values %MappedDefaultRecipient ) {
+        my %DefaultRecipient = $DefaultRecipientObject->Get(
+            ID => $ID,
+        );
+
+        $RemoveTo = 1 if $DefaultRecipient{RemoveTo};
+
+        for my $addr (qw(To Cc Bcc)) {
+            if ( $DefaultRecipient{ $addr } ne '' ) {
+                push @{$Addresses{ $addr }}, $DefaultRecipient{ $addr };
+            }
+        }
+    }
+
+    if ( $RemoveTo ) {
+        # remove preselected "To" address
+        for my $block ( @$BlockData ) {
+            if ( $block->{Name} eq 'PreFilledToRow' ) {
+                $block->{Data} = undef;
+            }
+        }
+
+        $LayoutObject->{BlockData} = $BlockData;
+    }
+
+    # add new addresses
+    for my $addr (qw(To Cc Bcc)) {
+        for my $Address ( @{$Addresses{ $addr }} ) {
+            $LayoutObject->AddJSOnDocumentComplete(
+                Code => 'Core.Agent.CustomerSearch.AddTicketCustomer( '
+                      . "'${addr}Customer', "
+                      . $LayoutObject->JSONEncode( Data => $Address )
+                      . ' );',
+            );
+        }
+    }
+
+    # set focus to text field
+    $LayoutObject->AddJSOnDocumentComplete(
+        Code => "\$('#RichText').focus();"
+    );
+
+    return $Param{Data};
+}
+
+1;
diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm
deleted file mode 100644
index 9b72bc6..0000000
--- a/Kernel/Output/HTML/DefaultRecipient.pm
+++ /dev/null
@@ -1,109 +0,0 @@
-# --
-# Kernel/Output/HTML/DefaultRecipient.pm
-# Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
-# --
-
-package Kernel::Output::HTML::DefaultRecipient;
-
-use strict;
-use warnings;
-
-our @ObjectDependencies = qw(
-    Kernel::System::Log
-    Kernel::System::DefaultRecipient
-);
-
-sub new {
-    my ( $Type, %Param ) = @_;
-
-    # allocate new hash for object
-    my $Self = {};
-    $Self->{LayoutObject} = $Param{LayoutObject} || die "Got no LayoutObject!";
-    bless( $Self, $Type );
-
-    return $Self;
-}
-
-sub Run {
-    my ( $Self, %Param ) = @_;
-    return if !$Self->{LayoutObject};
-
-    # check needed stuff
-    if ( !defined $Param{Data} ) {
-        my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
-        $LogObject->Log(
-            Priority => 'error',
-            Message => 'Need Data!'
-        );
-        $Self->{LayoutObject}->FatalDie();
-    }
-
-    my $BlockData = $Self->{LayoutObject}->{BlockData};
-
-    # get ticket data
-    my $Ticket;
-    BLOCK:
-    for my $block ( @$BlockData ) {
-        if ( $block->{Name} eq 'TicketBack' ) {
-            $Ticket = $block->{Data};
-            last BLOCK;
-        }
-    } 
-
-    # return if not generated from template
-    return unless $Ticket->{ResponseID};
-
-    # get all DefaultRecipient
-    my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
-    my %MappedDefaultRecipient = $DefaultRecipientObject->MappingList(
-        TemplateID => $Ticket->{ResponseID},
-    );
-
-    my $RemoveTo = 0;
-    my %Addresses = ( To => [], Cc => [], Bcc => [] );
-    foreach my $ID ( values %MappedDefaultRecipient ) {
-        my %DefaultRecipient = $DefaultRecipientObject->Get(
-            ID => $ID,
-        );
-
-        $RemoveTo = 1 if $DefaultRecipient{RemoveTo};
-
-        for my $addr (qw(To Cc Bcc)) {
-            if ( $DefaultRecipient{ $addr } ne '' ) {
-                push $Addresses{ $addr }, $DefaultRecipient{ $addr };
-            }
-        }
-    }
-
-    if ( $RemoveTo ) {
-        # remove preselected "To" address
-        for my $block ( @$BlockData ) {
-            if ( $block->{Name} eq 'PreFilledToRow' ) {
-                $block->{Data} = undef;
-            }
-        }
-
-        $Self->{LayoutObject}->{BlockData} = $BlockData;
-    }
-
-    # add new addresses
-    for my $addr (qw(To Cc Bcc)) {
-        for my $Address ( @{$Addresses{ $addr }} ) {
-            $Self->{LayoutObject}->AddJSOnDocumentComplete(
-                Code => 'Core.Agent.CustomerSearch.AddTicketCustomer( '
-                      . "'${addr}Customer', "
-                      . $Self->{LayoutObject}->JSONEncode( Data => $Address )
-                      . ' );',
-            );
-        }
-    }
-
-    # set focus to text field
-    $Self->{LayoutObject}->AddJSOnDocumentComplete(
-        Code => "\$('#RichText').focus();"
-    );
-
-    return $Param{Data};
-}
-
-1;
-- 
cgit v1.2.3-1-g7c22