diff options
author | Alexander Sulfrian <alex@spline.inf.fu-berlin.de> | 2015-01-24 21:41:48 +0100 |
---|---|---|
committer | Alexander Sulfrian <alex@spline.inf.fu-berlin.de> | 2015-01-24 21:50:45 +0100 |
commit | 40a1b4002e1619d9e9112f08ba198dc847f3e0f1 (patch) | |
tree | 407ca6366fe6968e10cf2fa28ef48f27169b636a /Kernel/Modules | |
parent | 47b9f45622c01a92525c2bbee07eab356da4e6d4 (diff) | |
download | DefaultRecipient-40a1b4002e1619d9e9112f08ba198dc847f3e0f1.tar.gz DefaultRecipient-40a1b4002e1619d9e9112f08ba198dc847f3e0f1.tar.bz2 DefaultRecipient-40a1b4002e1619d9e9112f08ba198dc847f3e0f1.zip |
Rename to DefaultRecipient.
There are only two hard things in Computer Science: cache invalidation
and naming things.
Diffstat (limited to 'Kernel/Modules')
-rw-r--r-- | Kernel/Modules/AdminDefaultRecipient.pm (renamed from Kernel/Modules/AdminDefaultTo.pm) | 62 | ||||
-rw-r--r-- | Kernel/Modules/AdminDefaultRecipientTemplates.pm (renamed from Kernel/Modules/AdminDefaultToTemplates.pm) | 96 |
2 files changed, 79 insertions, 79 deletions
diff --git a/Kernel/Modules/AdminDefaultTo.pm b/Kernel/Modules/AdminDefaultRecipient.pm index e6951e8..29097b3 100644 --- a/Kernel/Modules/AdminDefaultTo.pm +++ b/Kernel/Modules/AdminDefaultRecipient.pm @@ -1,5 +1,5 @@ # -- -# Kernel/Modules/AdminDefaultTo.pm - provides admin DefaultTo module +# Kernel/Modules/AdminDefaultRecipient.pm - provides admin DefaultRecipient module # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de> # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see @@ -7,7 +7,7 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -package Kernel::Modules::AdminDefaultTo; +package Kernel::Modules::AdminDefaultRecipient; use strict; use warnings; @@ -17,7 +17,7 @@ our @ObjectDependencies = qw( Kernel::Output::HTML::Layout Kernel::System::DB Kernel::System::Web::Request - Kernel::System::DefaultTo + Kernel::System::DefaultRecipient ); sub new { @@ -45,8 +45,8 @@ sub Run { # ------------------------------------------------------------ # if ( $Self->{Subaction} eq 'Change' ) { my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' ) || ''; - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); - my %Data = $DefaultToObject->Get( + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %Data = $DefaultRecipientObject->Get( ID => $ID, ); @@ -57,7 +57,7 @@ sub Run { %Data, ); $Output .= $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultTo', + TemplateFile => 'AdminDefaultRecipient', Data => \%Param, ); $Output .= $Self->{LayoutObject}->Footer(); @@ -71,7 +71,7 @@ sub Run { # challenge token check for write action $Self->{LayoutObject}->ChallengeTokenCheck(); - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' ); my ( %GetParam, %Errors ); for my $Parameter (qw(ID Title RemoveDefault AddNew NewAddress @@ -84,8 +84,8 @@ sub Run { # check needed data $Errors{TitleInvalid} = 'ServerError' if !$GetParam{Title}; - # check if a DefaultTo entry exist with this title - my $TitleExists = $DefaultToObject->TitleExistsCheck( + # check if a DefaultRecipient entry exist with this title + my $TitleExists = $DefaultRecipientObject->TitleExistsCheck( Title => $GetParam{Title}, ID => $GetParam{ID} ); @@ -98,7 +98,7 @@ sub Run { # if no errors occurred if ( !%Errors ) { - if ( $DefaultToObject->Update( + if ( $DefaultRecipientObject->Update( %GetParam, UserID => $Self->{UserID}, ) @@ -109,7 +109,7 @@ sub Run { $Output .= $Self->{LayoutObject}->NavigationBar(); $Output .= $Self->{LayoutObject}->Notify( Info => 'Template updated!' ); $Output .= $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultTo', + TemplateFile => 'AdminDefaultRecipient', Data => \%Param, ); $Output .= $Self->{LayoutObject}->Footer(); @@ -127,7 +127,7 @@ sub Run { %GetParam, ); $Output .= $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultTo', + TemplateFile => 'AdminDefaultRecipient', Data => \%Param, ); $Output .= $Self->{LayoutObject}->Footer(); @@ -147,7 +147,7 @@ sub Run { Title => $Title, ); $Output .= $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultTo', + TemplateFile => 'AdminDefaultRecipient', Data => \%Param, ); $Output .= $Self->{LayoutObject}->Footer(); @@ -161,7 +161,7 @@ sub Run { # challenge token check for write action $Self->{LayoutObject}->ChallengeTokenCheck(); - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' ); my ( %GetParam, %Errors ); @@ -173,8 +173,8 @@ sub Run { # check needed data $Errors{TitleInvalid} = 'ServerError' if !$GetParam{Title}; - # check if a DefaultTo entry exists with this title - my $TitleExists = $DefaultToObject->TitleExistsCheck( Title => $GetParam{Title} ); + # check if a DefaultRecipient entry exists with this title + my $TitleExists = $DefaultRecipientObject->TitleExistsCheck( Title => $GetParam{Title} ); if ($TitleExists) { $Errors{TitleExists} = 1; $Errors{TitleInvalid} = 'ServerError'; @@ -183,8 +183,8 @@ sub Run { # if no errors occurred if ( !%Errors ) { - # add DefaultTo entry - my $ID = $DefaultToObject->Add( + # add DefaultRecipient entry + my $ID = $DefaultRecipientObject->Add( %GetParam, UserID => $Self->{UserID}, ); @@ -195,7 +195,7 @@ sub Run { $Output .= $Self->{LayoutObject}->NavigationBar(); $Output .= $Self->{LayoutObject}->Notify( Info => 'Template added!' ); $Output .= $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultTo', + TemplateFile => 'AdminDefaultRecipient', Data => \%Param, ); $Output .= $Self->{LayoutObject}->Footer(); @@ -213,7 +213,7 @@ sub Run { %GetParam, ); $Output .= $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultTo', + TemplateFile => 'AdminDefaultRecipient', Data => \%Param, ); $Output .= $Self->{LayoutObject}->Footer(); @@ -227,10 +227,10 @@ sub Run { # challenge token check for write action $Self->{LayoutObject}->ChallengeTokenCheck(); - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' ); - my $Delete = $DefaultToObject->Delete( + my $Delete = $DefaultRecipientObject->Delete( ID => $ID, ); if ( !$Delete ) { @@ -248,7 +248,7 @@ sub Run { my $Output = $Self->{LayoutObject}->Header(); $Output .= $Self->{LayoutObject}->NavigationBar(); $Output .= $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultTo', + TemplateFile => 'AdminDefaultRecipient', Data => \%Param, ); $Output .= $Self->{LayoutObject}->Footer(); @@ -268,21 +268,21 @@ sub _Edit { $Self->{LayoutObject}->Block( Name => 'ActionList' ); $Self->{LayoutObject}->Block( Name => 'ActionOverview' ); - $Param{DefaultToTitleString} = ''; + $Param{DefaultRecipientTitleString} = ''; - $Param{DefaultToRemoveDefaultOption} = $Self->{LayoutObject}->BuildSelection( + $Param{DefaultRecipientRemoveDefaultOption} = $Self->{LayoutObject}->BuildSelection( Data => $Self->{ConfigObject}->Get('YesNoOptions'), Name => 'RemoveDefault', SelectedID => $Param{RemoveDefault} || 0, ); - $Param{DefaultToAddNewOption} = $Self->{LayoutObject}->BuildSelection( + $Param{DefaultRecipientAddNewOption} = $Self->{LayoutObject}->BuildSelection( Data => $Self->{ConfigObject}->Get('YesNoOptions'), Name => 'AddNew', SelectedID => $Param{AddNew} || 0, ); - $Param{DefaultToNewAddressString} = ''; + $Param{DefaultRecipientNewAddressString} = ''; $Self->{LayoutObject}->Block( Name => 'OverviewUpdate', @@ -328,19 +328,19 @@ sub _Overview { Data => \%Param, ); - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); - my %List = $DefaultToObject->List(); + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %List = $DefaultRecipientObject->List(); for my $ID ( sort { $List{$a} cmp $List{$b} } keys %List ) { - my %DefaultTo = $DefaultToObject->Get( + my %DefaultRecipient = $DefaultRecipientObject->Get( ID => $ID, ); $Self->{LayoutObject}->Block( Name => 'OverviewResultRow', Data => { - %DefaultTo, + %DefaultRecipient, }, ); } diff --git a/Kernel/Modules/AdminDefaultToTemplates.pm b/Kernel/Modules/AdminDefaultRecipientTemplates.pm index af49b00..b83f30f 100644 --- a/Kernel/Modules/AdminDefaultToTemplates.pm +++ b/Kernel/Modules/AdminDefaultRecipientTemplates.pm @@ -1,5 +1,5 @@ # -- -# Kernel/Modules/AdminDefaultToTemplates.pm - to manage DefaultTo <-> templates assignments +# Kernel/Modules/AdminDefaultRecipientTemplates.pm - to manage DefaultRecipient <-> templates assignments # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de> # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see @@ -7,7 +7,7 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -package Kernel::Modules::AdminDefaultToTemplates; +package Kernel::Modules::AdminDefaultRecipientTemplates; use strict; use warnings; @@ -15,7 +15,7 @@ use warnings; our @ObjectDependencies = qw( Kernel::Output::HTML::Layout Kernel::System::DB - Kernel::System::DefaultTo + Kernel::System::DefaultRecipient Kernel::System::StandardTemplate Kernel::System::Web::Request ); @@ -41,7 +41,7 @@ sub Run { my ( $Self, %Param ) = @_; # ------------------------------------------------------------ # - # template <-> DefaultTo 1:n + # template <-> DefaultRecipient 1:n # ------------------------------------------------------------ # if ( $Self->{Subaction} eq 'Template' ) { @@ -54,17 +54,17 @@ sub Run { ); my $Name = $StandardTemplateType . ' - ' . $StandardTemplateData{Name}; - # get DefaultTo data - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); - my %DefaultToData = $DefaultToObject->List(); - my %Member = $DefaultToObject->MappingList( + # get DefaultRecipient data + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %DefaultRecipientData = $DefaultRecipientObject->List(); + my %Member = $DefaultRecipientObject->MappingList( TemplateID => $ID, ); my $Output = $Self->{LayoutObject}->Header(); $Output .= $Self->{LayoutObject}->NavigationBar(); $Output .= $Self->_Change( - Data => \%DefaultToData, + Data => \%DefaultRecipientData, ID => $ID, Name => $Name, Mapping => \%Member, @@ -75,13 +75,13 @@ sub Run { } # ------------------------------------------------------------ # - # templates <-> DefaultTo n:1 + # templates <-> DefaultRecipient n:1 # ------------------------------------------------------------ # - elsif ( $Self->{Subaction} eq 'DefaultTo' ) { + elsif ( $Self->{Subaction} eq 'DefaultRecipient' ) { my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' ); - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); - my %DefaultToData = $DefaultToObject->Get( ID => $ID ); + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %DefaultRecipientData = $DefaultRecipientObject->Get( ID => $ID ); # get templates my $StandardTemplateObject = $Kernel::OM->Get('Kernel::System::StandardTemplate'); @@ -102,8 +102,8 @@ sub Run { } # get assigned templates - my %Member = $DefaultToObject->MappingList( - DefaultToID => $ID, + my %Member = $DefaultRecipientObject->MappingList( + DefaultRecipientID => $ID, ); my $Output = $Self->{LayoutObject}->Header(); @@ -111,27 +111,27 @@ sub Run { $Output .= $Self->_Change( Data => \%StandardTemplateData, ID => $ID, - Name => $DefaultToData{Title}, + Name => $DefaultRecipientData{Title}, Mapping => \%Member, - Type => 'DefaultTo', + Type => 'DefaultRecipient', ); $Output .= $Self->{LayoutObject}->Footer(); return $Output; } # ------------------------------------------------------------ # - # add templates to DefaultTo + # add templates to DefaultRecipient # ------------------------------------------------------------ # - elsif ( $Self->{Subaction} eq 'ChangeDefaultTo' ) { + elsif ( $Self->{Subaction} eq 'ChangeDefaultRecipient' ) { # challenge token check for write action $Self->{LayoutObject}->ChallengeTokenCheck(); # get current mapping my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' ); - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); - my %Mapping = $DefaultToObject->MappingList( - DefaultToID => $ID, + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %Mapping = $DefaultRecipientObject->MappingList( + DefaultRecipientID => $ID, ); # get new templates @@ -145,15 +145,15 @@ sub Run { for my $TemplateID (@TemplatesAll) { if ( $TemplatesSelected{$TemplateID} ) { if ( ! $Mapping{$TemplateID} ) { - $DefaultToObject->MappingAdd( + $DefaultRecipientObject->MappingAdd( TemplateID => $TemplateID, - DefaultToID => $ID, + DefaultRecipientID => $ID, ); } } else { if ( $Mapping{$TemplateID} ) { - $DefaultToObject->MappingDelete( + $DefaultRecipientObject->MappingDelete( ID => $Mapping{$TemplateID}, ); } @@ -173,8 +173,8 @@ sub Run { # get current mapping my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' ); - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); - my %Mapping = $DefaultToObject->MappingList( + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %Mapping = $DefaultRecipientObject->MappingList( TemplateID => $ID, ); @@ -186,19 +186,19 @@ sub Run { my %Selected = map { $_ => 1 } @Selected; # check all used queues - for my $DefaultToID (@All) { - if ( $Selected{$DefaultToID} ) { - if ( ! $Mapping{$DefaultToID} ) { - $DefaultToObject->MappingAdd( + for my $DefaultRecipientID (@All) { + if ( $Selected{$DefaultRecipientID} ) { + if ( ! $Mapping{$DefaultRecipientID} ) { + $DefaultRecipientObject->MappingAdd( TemplateID => $ID, - DefaultToID => $DefaultToID, + DefaultRecipientID => $DefaultRecipientID, ); } } else { - if ( $Mapping{$DefaultToID} ) { - $DefaultToObject->MappingDelete( - ID => $Mapping{$DefaultToID}, + if ( $Mapping{$DefaultRecipientID} ) { + $DefaultRecipientObject->MappingDelete( + ID => $Mapping{$DefaultRecipientID}, ); } } @@ -223,8 +223,8 @@ sub _Change { my %Data = %{ $Param{Data} }; my %Mapping = %{ $Param{Mapping} }; my $Type = $Param{Type} || 'Template'; - my $NeType = 'DefaultTo'; - $NeType = 'Template' if $Type eq 'DefaultTo'; + my $NeType = 'DefaultRecipient'; + $NeType = 'Template' if $Type eq 'DefaultRecipient'; $Self->{LayoutObject}->Block( Name => 'Overview' ); $Self->{LayoutObject}->Block( Name => 'ActionList' ); @@ -260,7 +260,7 @@ sub _Change { } return $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultToTemplates', + TemplateFile => 'AdminDefaultRecipientTemplates', Data => \%Param, ); } @@ -276,7 +276,7 @@ sub _Overview { # no actions in action list # $Self->{LayoutObject}->Block(Name=>'ActionList'); $Self->{LayoutObject}->Block( Name => 'FilterTemplate' ); - $Self->{LayoutObject}->Block( Name => 'FilterDefaultTo' ); + $Self->{LayoutObject}->Block( Name => 'FilterDefaultRecipient' ); $Self->{LayoutObject}->Block( Name => 'OverviewResult' ); # get std template list @@ -323,14 +323,14 @@ sub _Overview { } # get queue data - my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo'); - my %DefaultToData = $DefaultToObject->List(); + my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient'); + my %DefaultRecipientData = $DefaultRecipientObject->List(); # if there are results to show - if (%DefaultToData) { + if (%DefaultRecipientData) { for my $ID ( - sort { uc( $DefaultToData{$a} ) cmp uc( $DefaultToData{$b} ) } - keys %DefaultToData + sort { uc( $DefaultRecipientData{$a} ) cmp uc( $DefaultRecipientData{$b} ) } + keys %DefaultRecipientData ) { @@ -338,8 +338,8 @@ sub _Overview { $Self->{LayoutObject}->Block( Name => 'Listn1', Data => { - Name => $DefaultToData{$ID}, - Subaction => 'DefaultTo', + Name => $DefaultRecipientData{$ID}, + Subaction => 'DefaultRecipient', ID => $ID, }, ); @@ -349,14 +349,14 @@ sub _Overview { # otherwise it displays a no data found message else { $Self->{LayoutObject}->Block( - Name => 'NoDefaultToFoundMsg', + Name => 'NoDefaultRecipientFoundMsg', Data => {}, ); } # return output return $Self->{LayoutObject}->Output( - TemplateFile => 'AdminDefaultToTemplates', + TemplateFile => 'AdminDefaultRecipientTemplates', Data => \%Param, ); } |