From ddf239bf290202977b3db870f9a443f343359d7b Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Jan 2015 17:17:13 +0100 Subject: Remove the add prefix in AddTo, AddCc and AddBcc. --- DefaultRecipient.sopm | 6 ++--- Kernel/Modules/AdminDefaultRecipient.pm | 4 ++-- Kernel/Output/HTML/DefaultRecipient.pm | 12 +++++----- .../Output/HTML/Standard/AdminDefaultRecipient.tt | 24 +++++++++---------- Kernel/System/DefaultRecipient.pm | 28 +++++++++++----------- 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 @@ - - - + + + 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 @@ [% Translate("Title") | html %] [% Translate("Remove 'To'") | html %] - [% Translate("New 'To'") | html %] - [% Translate("New 'Cc'") | html %] - [% Translate("New 'Bcc'") | html %] + [% Translate("To") | html %] + [% Translate("Cc") | html %] + [% Translate("Bcc") | html %] [% Translate("Comment") | html %] [% Translate("Changed") | html %] [% Translate("Created") | html %] @@ -97,9 +97,9 @@ [% Data.Title | html %] [% Translate(Data.RemoveToYesNo) | html %] - [% Data.AddTo | html %] - [% Data.AddCc | html %] - [% Data.AddBcc | html %] + [% Data.To | html %] + [% Data.Cc | html %] + [% Data.Bcc | html %] [% Data.Comment | truncate(26) | html %] [% Data.ChangeTime | Localize("TimeShort") %] [% Data.CreateTime | Localize("TimeShort") %] @@ -161,21 +161,21 @@
- +
- +
- +
- +
- +
- +
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