From ddf239bf290202977b3db870f9a443f343359d7b Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
Date: Sun, 25 Jan 2015 17:17:13 +0100
Subject: Remove the add prefix in AddTo, AddCc and AddBcc.

---
 Kernel/System/DefaultRecipient.pm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'Kernel/System')

diff --git a/Kernel/System/DefaultRecipient.pm b/Kernel/System/DefaultRecipient.pm
index 7bee4af..fec60fd 100644
--- a/Kernel/System/DefaultRecipient.pm
+++ b/Kernel/System/DefaultRecipient.pm
@@ -31,7 +31,7 @@ sub Add {
     my ( $Self, %Param ) = @_;
 
     # check needed stuff
-    for my $Needed (qw(Title RemoveTo AddTo AddCc AddBcc Comment UserID)) {
+    for my $Needed (qw(Title RemoveTo To Cc Bcc Comment UserID)) {
         if ( ! defined $Param{$Needed} ) {
             my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
             $LogObject->Log(
@@ -47,16 +47,16 @@ sub Add {
     # insert new DefaultRecipient
     return if !$DBObject->Do(
         SQL => 'INSERT INTO default_recipient '
-             . '(title, remove_to, add_to, add_cc, add_bcc, comments, '
+             . '(title, remove_to, to, cc, bcc, comments, '
              . ' create_time, create_by, change_time, change_by) '
              . 'VALUES (?, ?, ?, ?, ?, ?, '
              . 'current_timestamp, ?, current_timestamp, ?)',
         Bind => [
             \$Param{Title},
             \$Param{RemoveTo},
-            \$Param{AddTo},
-            \$Param{AddCc},
-            \$Param{AddBcc},
+            \$Param{To},
+            \$Param{Cc},
+            \$Param{Bcc},
             \$Param{Comment},
             \$Param{UserID},
             \$Param{UserID},
@@ -89,7 +89,7 @@ sub Update {
     my ( $Self, %Param ) = @_;
 
     # check needed stuff
-    for my $Needed (qw(ID Title RemoveTo AddTo AddCc AddBcc Comment UserID)) {
+    for my $Needed (qw(ID Title RemoveTo To Cc Bcc Comment UserID)) {
         if ( ! defined $Param{$Needed} ) {
             my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
             $LogObject->Log(
@@ -105,15 +105,15 @@ sub Update {
     # insert new DefaultRecipient
     return if !$DBObject->Do(
         SQL => 'UPDATE default_recipient SET title = ?, remove_to = ?, '
-             . 'add_to = ?, add_cc = ?, add_bcc = ?, comments = ?, '
+             . 'to = ?, cc = ?, bcc = ?, comments = ?, '
              . 'change_by = ?, change_time = current_timestamp '
              . 'WHERE id = ?',
         Bind => [
             \$Param{Title},
             \$Param{RemoveTo},
-            \$Param{AddTo},
-            \$Param{AddCc},
-            \$Param{AddBcc},
+            \$Param{To},
+            \$Param{Cc},
+            \$Param{Bcc},
             \$Param{Comment},
             \$Param{UserID},
             \$Param{ID},
@@ -140,7 +140,7 @@ sub Get {
 
     # get RrsponseChangeDefaultTO obejct
     return if !$DBObject->Prepare(
-        SQL => 'SELECT id, title, remove_to, add_to, add_cc, add_bcc, '
+        SQL => 'SELECT id, title, remove_to, to, cc, bcc, '
              . 'comments, create_time, create_by, change_time, change_by '
              . 'FROM default_recipient WHERE id = ?',
         Bind  => [ \$Param{ID} ],
@@ -153,9 +153,9 @@ sub Get {
             ID         => $Data[0],
             Title      => $Data[1],
             RemoveTo   => $Data[2],
-            AddTo      => $Data[3],
-            AddCc      => $Data[4],
-            AddBcc     => $Data[5],
+            To         => $Data[3],
+            Cc         => $Data[4],
+            Bcc        => $Data[5],
             Comment    => $Data[6],
             CreateTime => $Data[7],
             CreateBy   => $Data[8],
-- 
cgit v1.2.3-1-g7c22