From 8bef0bbf83f40068e5b338a435e35606bfd08526 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Mon, 25 Feb 2013 09:17:11 +0100 Subject: [PATCH] Fixed Perl::Critic errors in Kernel/Modules --- .../AdminGenericInterfaceMappingSimple.pm | 2 +- .../AdminGenericInterfaceTransportHTTPSOAP.pm | 2 +- .../AdminGenericInterfaceWebservice.pm | 4 +-- Kernel/Modules/AdminPackageManager.pm | 4 +-- Kernel/Modules/AdminProcessManagement.pm | 6 ++-- .../Modules/AdminProcessManagementActivity.pm | 4 +-- .../AdminProcessManagementActivityDialog.pm | 8 ++--- Kernel/Modules/AdminProcessManagementPath.pm | 4 +-- .../AdminProcessManagementTransition.pm | 4 +-- .../AdminProcessManagementTransitionAction.pm | 4 +-- Kernel/Modules/AdminSMIME.pm | 3 +- Kernel/Modules/AdminSysConfig.pm | 4 +-- Kernel/Modules/AgentTicketAttachment.pm | 6 ++-- Kernel/Modules/AgentTicketPhone.pm | 9 ++++-- Kernel/Modules/Installer.pm | 30 +++++++++++-------- 15 files changed, 51 insertions(+), 43 deletions(-) diff --git a/Kernel/Modules/AdminGenericInterfaceMappingSimple.pm b/Kernel/Modules/AdminGenericInterfaceMappingSimple.pm index 3455d716503..7e0c7b6c645 100644 --- a/Kernel/Modules/AdminGenericInterfaceMappingSimple.pm +++ b/Kernel/Modules/AdminGenericInterfaceMappingSimple.pm @@ -193,7 +193,7 @@ sub Run { $Self->{LayoutObject}->ChallengeTokenCheck(); # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # if there is an error return to edit screen if ( $GetParam->{Error} ) { diff --git a/Kernel/Modules/AdminGenericInterfaceTransportHTTPSOAP.pm b/Kernel/Modules/AdminGenericInterfaceTransportHTTPSOAP.pm index 418f0869851..ce734a7e120 100644 --- a/Kernel/Modules/AdminGenericInterfaceTransportHTTPSOAP.pm +++ b/Kernel/Modules/AdminGenericInterfaceTransportHTTPSOAP.pm @@ -112,7 +112,7 @@ sub Run { } # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # check required parameters my %Error; diff --git a/Kernel/Modules/AdminGenericInterfaceWebservice.pm b/Kernel/Modules/AdminGenericInterfaceWebservice.pm index b0b72892154..f775f6ac1b1 100644 --- a/Kernel/Modules/AdminGenericInterfaceWebservice.pm +++ b/Kernel/Modules/AdminGenericInterfaceWebservice.pm @@ -118,7 +118,7 @@ sub Run { } # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new confguration $WebserviceData->{Name} = $GetParam->{Name}; @@ -246,7 +246,7 @@ sub Run { my $WebserviceData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new confguration $WebserviceData->{Name} = $GetParam->{Name}; diff --git a/Kernel/Modules/AdminPackageManager.pm b/Kernel/Modules/AdminPackageManager.pm index 9bdf23c15e3..0fd232c004a 100644 --- a/Kernel/Modules/AdminPackageManager.pm +++ b/Kernel/Modules/AdminPackageManager.pm @@ -55,8 +55,8 @@ sub Run { # ------------------------------------------------------------ # if ( exists $ENV{MOD_PERL} ) { - if ( defined $mod_perl::VERSION ) { - if ( $mod_perl::VERSION >= 1.99 ) { + if ( defined $mod_perl::VERSION ) { ## no critic + if ( $mod_perl::VERSION >= 1.99 ) { ## no critic # check if Apache::Reload is loaded my $ApacheReload = 0; diff --git a/Kernel/Modules/AdminProcessManagement.pm b/Kernel/Modules/AdminProcessManagement.pm index bf5313d2e65..ffc6d889380 100644 --- a/Kernel/Modules/AdminProcessManagement.pm +++ b/Kernel/Modules/AdminProcessManagement.pm @@ -629,7 +629,7 @@ sub Run { ->{Config}->{Fields}->{$AssignedField} }; if ( $Values{Config} ) { - $Values{Config} = Dumper( $Values{Config} ); + $Values{Config} = Dumper( $Values{Config} ); ## no critic $Values{Config} =~ s{ \s* \$VAR1 \s* =}{}xms; $Values{Config} =~ s{\s+\{}{\{}xms; } @@ -1007,7 +1007,7 @@ sub Run { my $ProcessData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new confguration $ProcessData->{Name} = $GetParam->{Name}; @@ -1165,7 +1165,7 @@ sub Run { my $ProcessData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new confguration $ProcessData->{Name} = $GetParam->{Name}; diff --git a/Kernel/Modules/AdminProcessManagementActivity.pm b/Kernel/Modules/AdminProcessManagementActivity.pm index f2b850ee580..2a62b996e87 100644 --- a/Kernel/Modules/AdminProcessManagementActivity.pm +++ b/Kernel/Modules/AdminProcessManagementActivity.pm @@ -99,7 +99,7 @@ sub Run { my $ActivityData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new configuration $ActivityData->{Name} = $GetParam->{Name}; @@ -321,7 +321,7 @@ sub Run { my $ActivityData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new configuration $ActivityData->{Name} = $GetParam->{Name}; diff --git a/Kernel/Modules/AdminProcessManagementActivityDialog.pm b/Kernel/Modules/AdminProcessManagementActivityDialog.pm index 3bf655e36ed..5b1b78717ec 100644 --- a/Kernel/Modules/AdminProcessManagementActivityDialog.pm +++ b/Kernel/Modules/AdminProcessManagementActivityDialog.pm @@ -140,7 +140,7 @@ sub Run { my $ActivityDialogData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new confguration $ActivityDialogData->{Name} = $GetParam->{Name}; @@ -212,7 +212,7 @@ sub Run { } # check if permission exists - if ( defined $GetParam->{Permission} and $GetParam->{Permission} ne '' ) { + if ( defined $GetParam->{Permission} && $GetParam->{Permission} ne '' ) { my $PermissionList = $Self->{ConfigObject}->Get('System::Permission'); my %PermissionLookup = map { $_ => 1 } @{$PermissionList}; @@ -394,7 +394,7 @@ sub Run { my $ActivityDialogData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new confguration $ActivityDialogData->{Name} = $GetParam->{Name}; @@ -475,7 +475,7 @@ sub Run { } # check if permission exists - if ( defined $GetParam->{Permission} and $GetParam->{Permission} ne '' ) { + if ( defined $GetParam->{Permission} && $GetParam->{Permission} ne '' ) { my $PermissionList = $Self->{ConfigObject}->Get('System::Permission'); diff --git a/Kernel/Modules/AdminProcessManagementPath.pm b/Kernel/Modules/AdminProcessManagementPath.pm index 0468c59222a..f92e22130e7 100644 --- a/Kernel/Modules/AdminProcessManagementPath.pm +++ b/Kernel/Modules/AdminProcessManagementPath.pm @@ -86,7 +86,7 @@ sub Run { my $PathData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); $PathData->{ProcessEntityID} = $GetParam->{ProcessEntityID} || $GetParam->{ID}; $PathData->{TransitionEntityID} = $GetParam->{TransitionEntityID} || $GetParam->{EntityID}; @@ -113,7 +113,7 @@ sub Run { my $TransferData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # merge changed data into process config $TransferData->{ProcessEntityID} = $GetParam->{ProcessEntityID}; diff --git a/Kernel/Modules/AdminProcessManagementTransition.pm b/Kernel/Modules/AdminProcessManagementTransition.pm index 6db19d1946a..369013dc56d 100644 --- a/Kernel/Modules/AdminProcessManagementTransition.pm +++ b/Kernel/Modules/AdminProcessManagementTransition.pm @@ -93,7 +93,7 @@ sub Run { my $TransitionData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new configuration $TransitionData->{Name} = $GetParam->{Name}; @@ -278,7 +278,7 @@ sub Run { my $TransitionData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new configuration $TransitionData->{Name} = $GetParam->{Name}; diff --git a/Kernel/Modules/AdminProcessManagementTransitionAction.pm b/Kernel/Modules/AdminProcessManagementTransitionAction.pm index 5cb905ec20c..3f8db6e5243 100644 --- a/Kernel/Modules/AdminProcessManagementTransitionAction.pm +++ b/Kernel/Modules/AdminProcessManagementTransitionAction.pm @@ -91,7 +91,7 @@ sub Run { my $TransitionActionData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new configuration $TransitionActionData->{Name} = $GetParam->{Name}; @@ -290,7 +290,7 @@ sub Run { my $TransitionActionData; # get parameter from web browser - my $GetParam = $Self->_GetParams; + my $GetParam = $Self->_GetParams(); # set new configuration $TransitionActionData->{Name} = $GetParam->{Name}; diff --git a/Kernel/Modules/AdminSMIME.pm b/Kernel/Modules/AdminSMIME.pm index 496dae78987..0174f2c339b 100644 --- a/Kernel/Modules/AdminSMIME.pm +++ b/Kernel/Modules/AdminSMIME.pm @@ -669,7 +669,8 @@ sub _SignerCertificateOverview { my @SignerCertResults = $Self->{CryptObject}->PrivateSearch( Search => $Param{CertFingerprint}, ); - my %SignerCert = %{ $SignerCertResults[0] } if @SignerCertResults; + my %SignerCert; + %SignerCert = %{ $SignerCertResults[0] } if @SignerCertResults; # get all certificates my @AvailableCerts = $Self->{CryptObject}->CertificateSearch(); diff --git a/Kernel/Modules/AdminSysConfig.pm b/Kernel/Modules/AdminSysConfig.pm index 0eda44e5779..d8321fe90f1 100644 --- a/Kernel/Modules/AdminSysConfig.pm +++ b/Kernel/Modules/AdminSysConfig.pm @@ -434,7 +434,7 @@ sub Run { my $TypeKey = $Self->{ParamObject}->GetParam( Param => $ElementKey . 'LoaderType' . ( $Index + 1 ) ) || 'JavaScript'; - if ( $TypeKey and ( $Key eq $TypeKey ) ) { + if ( $TypeKey && ( $Key eq $TypeKey ) ) { push @LoaderArray, $Loader[$Index]; } } @@ -715,7 +715,7 @@ sub Run { # if running under PerlEx, reload the application (and thus the configuration) if ( exists $ENV{'GATEWAY_INTERFACE'} - and $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx" + && $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx" ) { PerlEx::ReloadAll(); diff --git a/Kernel/Modules/AgentTicketAttachment.pm b/Kernel/Modules/AgentTicketAttachment.pm index 36dbf6a764c..43978384ef6 100644 --- a/Kernel/Modules/AgentTicketAttachment.pm +++ b/Kernel/Modules/AgentTicketAttachment.pm @@ -111,8 +111,8 @@ sub Run { # write tmp file my $FileTempObject = Kernel::System::FileTemp->new( %{$Self} ); my ( $FH, $Filename ) = $FileTempObject->TempFile(); - if ( open( my $ViewerDataFH, '>', $Filename ) ) { - print $ViewerDataFH $Data{Content}; + if ( open( my $ViewerDataFH, '>', $Filename ) ) { ## no critic + print $ViewerDataFH $Data{Content}; ## no critic close $ViewerDataFH; } else { @@ -127,7 +127,7 @@ sub Run { # use viewer my $Content = ''; - if ( open( my $ViewerFH, "$Viewer $Filename |" ) ) { + if ( open( my $ViewerFH, "-|", "$Viewer $Filename" ) ) { ## no critic while (<$ViewerFH>) { $Content .= $_; } diff --git a/Kernel/Modules/AgentTicketPhone.pm b/Kernel/Modules/AgentTicketPhone.pm index ea186a72686..8032dd27bca 100644 --- a/Kernel/Modules/AgentTicketPhone.pm +++ b/Kernel/Modules/AgentTicketPhone.pm @@ -303,9 +303,12 @@ sub Run { # multiple addresses list # check email address my $CountFrom = scalar @MultipleCustomer || 1; - my %CustomerDataFrom = $Self->{CustomerUserObject}->CustomerUserDataGet( - User => $Article{CustomerUserID}, - ) if $Article{CustomerUserID}; + my %CustomerDataFrom; + if ( $Article{CustomerUserID} ) { + %CustomerDataFrom = $Self->{CustomerUserObject}->CustomerUserDataGet( + User => $Article{CustomerUserID}, + ); + } for my $Email ( Mail::Address->parse($ArticleFrom) ) { diff --git a/Kernel/Modules/Installer.pm b/Kernel/Modules/Installer.pm index d441976c002..6ee0153e03a 100644 --- a/Kernel/Modules/Installer.pm +++ b/Kernel/Modules/Installer.pm @@ -80,8 +80,8 @@ sub Run { if ( -f '/etc/SuSE-release' ) { $Dist{Vendor} = 'SuSE'; if ( exists $ENV{MOD_PERL} ) { - eval 'require mod_perl'; - if ( defined $mod_perl::VERSION ) { + eval 'require mod_perl'; ## no critic + if ( defined $mod_perl::VERSION ) { ## no critic $Dist{Webserver} = 'rcapache2 restart'; } } @@ -94,8 +94,8 @@ sub Run { $Dist{Webserver} = 'service httpd restart'; } elsif ( exists $ENV{MOD_PERL} ) { - eval 'require mod_perl'; - if ( defined $mod_perl::VERSION ) { + eval 'require mod_perl'; ## no critic + if ( defined $mod_perl::VERSION ) { ## no critic $Dist{Webserver} = 'Apache2 + mod_perl2'; } } @@ -347,7 +347,7 @@ sub Run { Name => 'DatabaseResultBack', Data => {}, ); - print STDERR "ERR: $DBI::errstr - $_\n"; + print STDERR "ERR: $DBI::errstr - $_\n"; ## no critic $Output .= $Self->{LayoutObject}->Output( TemplateFile => 'Installer', Data => {}, @@ -387,7 +387,7 @@ sub Run { Name => 'DatabaseResultBack', Data => {}, ); - print STDERR "ERR: $DBI::errstr - $_\n"; + print STDERR "ERR: $DBI::errstr - $_\n"; ## no critic $Output .= $Self->{LayoutObject}->Output( TemplateFile => 'Installer', Data => {}, @@ -424,7 +424,7 @@ sub Run { Name => 'DatabaseResultBack', Data => {}, ); - print STDERR "ERR: $DBI::errstr - $_\n"; + print STDERR "ERR: $DBI::errstr - $_\n"; ## no critic $Output .= $Self->{LayoutObject}->Output( TemplateFile => 'Installer', Data => {}, @@ -983,8 +983,10 @@ sub ReConfigure { # read config file my $ConfigFile = "$Self->{Path}/Kernel/Config.pm"; + ## no critic open( my $In, '<', $ConfigFile ) || return "Can't open $ConfigFile: $!"; + ## use critic my $Config = ''; while (<$In>) { if ( $_ =~ /^#/ ) { @@ -1010,9 +1012,11 @@ sub ReConfigure { close $In; # write new config file + ## no critic open( my $Out, '>', $ConfigFile ) || return "Can't open $ConfigFile: $!"; print $Out $Config; + ## use critic close $Out; return; @@ -1022,23 +1026,23 @@ sub ParseSQLFile { my ( $Self, $File ) = @_; my @SQL; - if ( open( my $In, '<', $File ) ) { + if ( open( my $In, '<', $File ) ) { ## no critic my $SQLEnd = 0; - my $SQLSingel = ''; + my $SQLStatement = ''; while (<$In>) { if ( $_ !~ /^(#|--)/ ) { if ( $_ =~ /^(.*)(;|;\s)$/ || $_ =~ /^(\));/ ) { - $SQLSingel .= $1; + $SQLStatement .= $1; $SQLEnd = 1; } else { - $SQLSingel .= $_; + $SQLStatement .= $_; } } if ($SQLEnd) { - push @SQL, $SQLSingel; + push @SQL, $SQLStatement; $SQLEnd = 0; - $SQLSingel = ''; + $SQLStatement = ''; } } close $In;