Remove the add prefix in AddTo, AddCc and AddBcc.

5 files changed, 37 insertions, 37 deletions

diff --git a/DefaultRecipient.sopm b/DefaultRecipient.sopm
index 4ee8dd0..2f4e56a 100644
--- a/DefaultRecipient.sopm
+++ b/DefaultRecipient.sopm
@@ -24,9 +24,9 @@
       <Column Name="id" Required="true" PrimaryKey="true" AutoIncrement="true" Type="BIGINT"/>
       <Column Name="title" Required="true" Size="250" Type="VARCHAR"/>
       <Column Name="remove_to" Required="true" Type="SMALLINT"/>
-      <Column Name="add_to" Required="false" Size="255" Type="VARCHAR"/>
-      <Column Name="add_cc" Required="false" Size="255" Type="VARCHAR"/>
-      <Column Name="add_bcc" Required="false" Size="255" Type="VARCHAR"/>
+      <Column Name="to" Required="false" Size="255" Type="VARCHAR"/>
+      <Column Name="cc" Required="false" Size="255" Type="VARCHAR"/>
+      <Column Name="bcc" Required="false" Size="255" Type="VARCHAR"/>
       <Column Name="comments" Required="false" Size="250" Type="VARCHAR"/>
       <Column Name="create_time" Required="true" Type="DATE"/>
       <Column Name="create_by" Required="true" Type="INTEGER"/>
diff --git a/Kernel/Modules/AdminDefaultRecipient.pm b/Kernel/Modules/AdminDefaultRecipient.pm
index 1704bd1..6b697de 100644
--- a/Kernel/Modules/AdminDefaultRecipient.pm
+++ b/Kernel/Modules/AdminDefaultRecipient.pm
@@ -74,7 +74,7 @@ sub Run {
         my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
         my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' );
         my ( %GetParam, %Errors );
-        for my $Parameter (qw(ID Title RemoveTo AddTo AddCc AddBcc Comment)) {
+        for my $Parameter (qw(ID Title RemoveTo To Cc Bcc Comment)) {
             $GetParam{$Parameter} = $Self->{ParamObject}->GetParam(
                 Param => $Parameter
             );
@@ -164,7 +164,7 @@ sub Run {
         my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' );
         my ( %GetParam, %Errors );
 
-        for my $Parameter (qw(ID Title RemoveTo AddTo AddCc AddBcc Comment)) {
+        for my $Parameter (qw(ID Title RemoveTo To Cc Bcc Comment)) {
             $GetParam{$Parameter} = $Self->{ParamObject}->GetParam( Param => $Parameter );
         }
 
diff --git a/Kernel/Output/HTML/DefaultRecipient.pm b/Kernel/Output/HTML/DefaultRecipient.pm
index 3965d9a..80b12b2 100644
--- a/Kernel/Output/HTML/DefaultRecipient.pm
+++ b/Kernel/Output/HTML/DefaultRecipient.pm
@@ -73,14 +73,14 @@ sub Run {
         );
 
         $RemoveTo = 1 if $DefaultRecipient{RemoveTo};
-        if ( $DefaultRecipient{AddTo} ne '' ) {
-            push @ToAddresses, $DefaultRecipient{AddTo};
+        if ( $DefaultRecipient{To} ne '' ) {
+            push @ToAddresses, $DefaultRecipient{To};
         }
-        if ( $DefaultRecipient{AddCc} ne '' ) {
-            push @CcAddresses, $DefaultRecipient{AddCc};
+        if ( $DefaultRecipient{Cc} ne '' ) {
+            push @CcAddresses, $DefaultRecipient{Cc};
         }
-        if ( $DefaultRecipient{AddBcc} ne '' ) {
-            push @BccAddresses, $DefaultRecipient{AddBcc};
+        if ( $DefaultRecipient{Bcc} ne '' ) {
+            push @BccAddresses, $DefaultRecipient{Bcc};
         }
     }
 
diff --git a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt
index 84d4dbb..82f8db6 100644
--- a/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt
+++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt
@@ -71,9 +71,9 @@
                         <tr>
                             <th>[% Translate("Title") | html %]</th>
                             <th>[% Translate("Remove 'To'") | html %]</th>
-                            <th>[% Translate("New 'To'") | html %]</th>
-                            <th>[% Translate("New 'Cc'") | html %]</th>
-                            <th>[% Translate("New 'Bcc'") | html %]</th>
+                            <th>[% Translate("To") | html %]</th>
+                            <th>[% Translate("Cc") | html %]</th>
+                            <th>[% Translate("Bcc") | html %]</th>
                             <th>[% Translate("Comment") | html %]</th>
                             <th>[% Translate("Changed") | html %]</th>
                             <th>[% Translate("Created") | html %]</th>
@@ -97,9 +97,9 @@
                                 <a class="AsBlock" href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=Change;ID=[% Data.ID | uri %]">[% Data.Title | html %]</a>
                             </td>
                             <td>[% Translate(Data.RemoveToYesNo) | html %]</td>
-                            <td>[% Data.AddTo | html %]</td>
-                            <td>[% Data.AddCc | html %]</td>
-                            <td>[% Data.AddBcc | html %]</td>
+                            <td>[% Data.To | html %]</td>
+                            <td>[% Data.Cc | html %]</td>
+                            <td>[% Data.Bcc | html %]</td>
                             <td title="[% Data.Comment | html %]">[% Data.Comment | truncate(26) | html %]</td>
                             <td>[% Data.ChangeTime | Localize("TimeShort") %]</td>
                             <td>[% Data.CreateTime | Localize("TimeShort") %]</td>
@@ -161,21 +161,21 @@
                         </div>
                         <div class="Clear"></div>
 
-                        <label for="AddTo">[% Translate("New 'To'") | html %]:</label>
+                        <label for="To">[% Translate("To") | html %]:</label>
                         <div class="Field">
-                            <input type="text" name="AddTo" id="AddTo" value="[% Data.AddTo | html %]" class="W50pc" maxlength="200"/>
+                            <input type="text" name="To" id="To" value="[% Data.To | html %]" class="W50pc" maxlength="200"/>
                         </div>
                         <div class="Clear"></div>
 
-                        <label for="AddCc">[% Translate("New 'Cc'") | html %]:</label>
+                        <label for="Cc">[% Translate("Cc") | html %]:</label>
                         <div class="Field">
-                            <input type="text" name="AddCc" id="AddCc" value="[% Data.AddCc | html %]" class="W50pc" maxlength="200"/>
+                            <input type="text" name="Cc" id="Cc" value="[% Data.Cc | html %]" class="W50pc" maxlength="200"/>
                         </div>
                         <div class="Clear"></div>
 
-                        <label for="AddBcc">[% Translate("New 'Bcc'") | html %]:</label>
+                        <label for="Bcc">[% Translate("Bcc") | html %]:</label>
                         <div class="Field">
-                            <input type="text" name="AddBcc" id="AddBcc" value="[% Data.AddBcc | html %]" class="W50pc" maxlength="200"/>
+                            <input type="text" name="Bcc" id="Bcc" value="[% Data.Bcc | html %]" class="W50pc" maxlength="200"/>
                         </div>
                         <div class="Clear"></div>
 
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],