Issue #2251: Accepting code policy suggestions.

RotherOSS · Apr 24, 2023 · 33b2c19 · 33b2c19
1 parent 3e2547e
commit 33b2c19
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 89 deletions.
diff --git a/Kernel/Modules/AdminDynamicFieldCheckbox.pm b/Kernel/Modules/AdminDynamicFieldCheckbox.pm
@@ -586,7 +586,7 @@ sub _ShowScreen {
 
     # create translatable values option list
     my $MultiValueStrg = $LayoutObject->BuildSelection(
-        Data       => {
+        Data => {
             0 => Translatable('No'),
             1 => Translatable('Yes'),
         },

diff --git a/Kernel/Modules/AdminDynamicFieldDB.pm b/Kernel/Modules/AdminDynamicFieldDB.pm
@@ -632,7 +632,7 @@ sub _ShowScreen {
     );
 
     my $MultiValueStrg = $LayoutObject->BuildSelection(
-        Data       => {
+        Data => {
             0 => Translatable('No'),
             1 => Translatable('Yes'),
         },
@@ -1089,7 +1089,7 @@ sub _GetPossibleValues {
         $ValueListfield     = ( defined $ValueListfield     ? $ValueListfield     : '' );
 
         # Check for removed values.
-        if ( !IsStringWithData( $ValueFieldName ) || !IsStringWithData( $ValueFieldLabel ) || !IsStringWithData( $ValueFieldDatatype ) ) {
+        if ( !IsStringWithData($ValueFieldName) || !IsStringWithData($ValueFieldLabel) || !IsStringWithData($ValueFieldDatatype) ) {
             next VALUEINDEX;
         }
 

diff --git a/Kernel/Modules/AdminDynamicFieldDateTime.pm b/Kernel/Modules/AdminDynamicFieldDateTime.pm
@@ -126,8 +126,6 @@ sub _AddAction {
 
     my $DynamicFieldObject = $Kernel::OM->Get('Kernel::System::DynamicField');
 
-
-
     if ( $GetParam{FieldOrder} ) {
 
         # check if field order is numeric and positive
@@ -646,7 +644,7 @@ sub _ShowScreen {
     );
 
     my $MultiValueStrg = $LayoutObject->BuildSelection(
-        Data       => {
+        Data => {
             0 => Translatable('No'),
             1 => Translatable('Yes'),
         },

diff --git a/Kernel/Modules/AdminDynamicFieldDropdown.pm b/Kernel/Modules/AdminDynamicFieldDropdown.pm
@@ -698,7 +698,7 @@ sub _ShowScreen {
 
     # create translatable values option list
     my $MultiValueStrg = $LayoutObject->BuildSelection(
-        Data       => {
+        Data => {
             0 => Translatable('No'),
             1 => Translatable('Yes'),
         },

diff --git a/Kernel/Modules/AdminDynamicFieldText.pm b/Kernel/Modules/AdminDynamicFieldText.pm
@@ -654,7 +654,7 @@ sub _ShowScreen {
     );
 
     my $MultiValueStrg = $LayoutObject->BuildSelection(
-        Data       => {
+        Data => {
             0 => Translatable('No'),
             1 => Translatable('Yes'),
         },
@@ -682,8 +682,6 @@ sub _ShowScreen {
         );
     }
 
-
-
     my %ValidList = $Kernel::OM->Get('Kernel::System::Valid')->ValidList();
 
     # create the Validity select

diff --git a/Kernel/System/DynamicField/Driver/BaseDatabase.pm b/Kernel/System/DynamicField/Driver/BaseDatabase.pm
@@ -301,8 +301,8 @@ sub EditFieldRender {
         %Param,
     );
     if ( defined $FieldValue ) {
-        if ( IsArrayRefWithData( $FieldValue ) ) {
-            $Value = join $ItemSeparator, $FieldValue->@*;
+        if ( IsArrayRefWithData($FieldValue) ) {
+            $Value  = join $ItemSeparator, $FieldValue->@*;
             @Values = $FieldValue->@*;
         }
         elsif ( ref $FieldValue eq 'STRING' ) {
@@ -388,14 +388,14 @@ sub EditFieldRender {
 
     my @ResultHTML;
     if ( $FieldConfig->{MultiValue} && @Values ) {
-        for my $ValueIndex (0 .. $#Values ) {
-            if ( $ValueIndex ) {
+        for my $ValueIndex ( 0 .. $#Values ) {
+            if ($ValueIndex) {
                 $FieldTemplateData{FieldID} = $FieldTemplateData{FieldName} . '_' . $ValueIndex;
             }
             $FieldTemplateData{Value} = $Values[$ValueIndex];
             push @ResultHTML, $Param{LayoutObject}->Output(
                 'TemplateFile' => $FieldTemplateFile,
-                'Data' => \%FieldTemplateData,
+                'Data'         => \%FieldTemplateData,
             );
         }
     }
@@ -427,8 +427,8 @@ sub EditFieldRender {
     };
 
     if ( $FieldConfig->{MultiValue} ) {
-        $Data->{MultiValue}         = \@ResultHTML,
-        $Data->{MultiValueTemplate} = $TemplateHTML,
+        $Data->{MultiValue}         = \@ResultHTML;
+        $Data->{MultiValueTemplate} = $TemplateHTML;
     }
     else {
         $Data->{Field} = $ResultHTML[0];
@@ -456,7 +456,7 @@ sub EditFieldValueGet {
         )
     {
         my @Data = $Param{ParamObject}->GetArray( Param => $FieldName );
-        $Value   = \@Data;
+        $Value = \@Data;
     }
 
     if ( defined $Param{ReturnTemplateStructure} && $Param{ReturnTemplateStructure} eq '1' ) {

diff --git a/Kernel/System/DynamicField/Driver/BaseDateTime.pm b/Kernel/System/DynamicField/Driver/BaseDateTime.pm
@@ -203,7 +203,7 @@ sub EditFieldRender {
     }
 
     if ( !ref $Value ) {
-        $Value = [ $Value ];
+        $Value = [$Value];
     }
 
     for my $ValueItem ( $Value->@* ) {
@@ -237,7 +237,7 @@ sub EditFieldRender {
             @ValueParts = $FieldValues->@*;
         }
         else {
-            @ValueParts = ( $FieldValues );
+            @ValueParts = ($FieldValues);
         }
 
     }
@@ -295,8 +295,8 @@ sub EditFieldRender {
 
     if ( $Param{ServerError} ) {
 
-        $FieldTemplateData{ServerError}      = $Param{ServerError};
-        $FieldTemplateData{ErrorMessage}     = Translatable( $Param{ErrorMessage} || 'This field is required.' );
+        $FieldTemplateData{ServerError}  = $Param{ServerError};
+        $FieldTemplateData{ErrorMessage} = Translatable( $Param{ErrorMessage} || 'This field is required.' );
 
     }
 
@@ -308,7 +308,7 @@ sub EditFieldRender {
     my @ResultHTML;
     for my $ValueIndex ( 0 .. $#ValueParts ) {
 
-        my $Suffix                           = $ValueIndex ? '_' . $ValueIndex : '';
+        my $Suffix = $ValueIndex ? '_' . $ValueIndex : '';
         $FieldTemplateData{DivID}            = $FieldName . $Suffix;
         $FieldTemplateData{DivIDMandatory}   = $FieldName . 'UsedError' . $Suffix;
         $FieldTemplateData{DivIDServerError} = $FieldName . 'UsedServerError' . $Suffix;
@@ -414,15 +414,17 @@ sub EditFieldValueGet {
         if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
             my @DataAll = ();
             my %FetchedData;
+
             # retrieve value parts as arrays
             for my $Type (qw(Used Year Month Day Hour Minute)) {
-                $FetchedData{ $Type }->@* = $Param{ParamObject}->GetArray( Param => $Prefix . $Type );
+                $FetchedData{$Type}->@* = $Param{ParamObject}->GetArray( Param => $Prefix . $Type );
             }
+
             # transform value arrays into rows
             for my $Index ( 0 .. $#{ $FetchedData{Used} } ) {
                 my %ValueRow;
                 for my $Type (qw(Used Year Month Day Hour Minute)) {
-                    $ValueRow{ $Prefix . $Type } = $FetchedData{ $Type }[ $Index ];
+                    $ValueRow{ $Prefix . $Type } = $FetchedData{$Type}[$Index];
                 }
                 push @DataAll, \%ValueRow;
             }
@@ -441,6 +443,7 @@ sub EditFieldValueGet {
     if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
         my $IsEmpty = 1;
         for my $ValueData ( $DynamicFieldValues->@* ) {
+
             # return if the field is empty (e.g. initial screen)
             if (
                 $ValueData->{ $Prefix . 'Used' }
@@ -449,7 +452,8 @@ sub EditFieldValueGet {
                 || $ValueData->{ $Prefix . 'Day' }
                 || $ValueData->{ $Prefix . 'Hour' }
                 || $ValueData->{ $Prefix . 'Minute' }
-            ) {
+                )
+            {
                 $IsEmpty = 0;
             }
         }
@@ -465,7 +469,6 @@ sub EditFieldValueGet {
             && !$DynamicFieldValues->{ $Prefix . 'Minute' };
     }
 
-
     # check if need and can transform dates
     # transform the dates early for ReturnValueStructure or ManualTimeStamp Bug#8452
     if ( $Param{TransformDates} && $Param{LayoutObject} ) {
@@ -508,7 +511,6 @@ sub EditFieldValueGet {
         $DynamicFieldValues->{ 'DynamicField_' . $Param{DynamicFieldConfig}->{Name} . 'Second' } = 0;
     }
 
-
     my $ManualTimeStamp;
 
     if ( $Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
@@ -587,7 +589,7 @@ sub EditFieldValueValidate {
     my $ValueCount = $Param{ValueCount} || 1;
 
     if ( !$Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
-        $Value = [ $Value ];
+        $Value = [$Value];
     }
 
     # set the date time prefix as field name
@@ -603,7 +605,7 @@ sub EditFieldValueValidate {
 
     # get time object
     my $DateTimeObject = $Kernel::OM->Create('Kernel::System::DateTime');
-    my $SystemTime = $DateTimeObject->ToEpoch();
+    my $SystemTime     = $DateTimeObject->ToEpoch();
     for my $ValueItem ( $Value->@* ) {
         if ( $ValueItem->{ $Prefix . 'Used' } && $DateRestriction ) {
 
@@ -657,7 +659,7 @@ sub DisplayValueRender {
     }
 
     # convert date to localized string
-    for my $ValueItem ( @Values ) {
+    for my $ValueItem (@Values) {
         $ValueItem //= '';
         $ValueItem = $Param{LayoutObject}->{LanguageObject}->FormatTimeString(
             $ValueItem,
@@ -1311,14 +1313,14 @@ sub ReadableValueRender {
     }
 
     # only keep date and time without seconds or milliseconds
-    for my $ValueItem ( @Values ) {
+    for my $ValueItem (@Values) {
         $ValueItem =~ s{\A (\d{4} - \d{2} - \d{2} [ ] \d{2} : \d{2} ) }{$1}xms;
     }
 
     # set new line separator
     my $ItemSeparator = ',';
 
-    $Value = join( $ItemSeparator, @Values ):
+    $Value = join( $ItemSeparator, @Values );
 
     # Title is always equal to Value
     my $Title = $Value;

diff --git a/Kernel/System/DynamicField/Driver/BaseSelect.pm b/Kernel/System/DynamicField/Driver/BaseSelect.pm
@@ -83,7 +83,8 @@ sub ValueSet {
     }
 
     my @ValueText;
-    for my $Value ( @Values ) {
+    for my $Value (@Values) {
+
         # check for valid possible values list
         if ( !$Param{DynamicFieldConfig}->{Config}->{PossibleValues} ) {
             $Kernel::OM->Get('Kernel::System::Log')->Log(
@@ -118,7 +119,7 @@ sub ValueValidate {
     }
 
     my $Success;
-    for my $Value ( @Values ) {
+    for my $Value (@Values) {
         $Success = $Kernel::OM->Get('Kernel::System::DynamicFieldValue')->ValueValidate(
             Value => {
                 ValueText => $Param{Value},
@@ -226,7 +227,7 @@ sub EditFieldRender {
     }
 
     if ( !ref $Value ) {
-        $Value = [ $Value ];
+        $Value = [$Value];
     }
 
     # check and set class if necessary
@@ -292,22 +293,22 @@ sub EditFieldRender {
         ? 'DynamicField/Customer/BaseSelect' : 'DynamicField/Agent/BaseSelect';
 
     my @ResultHTML;
-    for my $ValueIndex ( 0 .. $#{ $Value } ) {
+    for my $ValueIndex ( 0 .. $#{$Value} ) {
         my $FieldID = $ValueIndex ? $FieldName . '_' . $ValueIndex : $FieldName;
 
         # TODO: is this necessary?
         my $DataValues = $Self->BuildSelectionDataGet(
             DynamicFieldConfig => $Param{DynamicFieldConfig},
             PossibleValues     => $PossibleValues,
-            Value              => $Value->[ $ValueIndex ],
+            Value              => $Value->[$ValueIndex],
         );
 
         my $SelectionHTML = $Param{LayoutObject}->BuildSelection(
             Data        => $DataValues || {},
             Disabled    => $Param{ReadOnly},
             Name        => $FieldName,
             ID          => $FieldID,
-            SelectedID  => $Value->[ $ValueIndex ],
+            SelectedID  => $Value->[$ValueIndex],
             Translation => $FieldConfig->{TranslatableValues} || 0,
             Class       => $FieldClass,
             Size        => $Size,
@@ -325,6 +326,7 @@ sub EditFieldRender {
 
     my $TemplateHTML;
     if ( $FieldConfig->{MultiValue} && !$Param{ReadOnly} ) {
+
         # TODO: is this necessary?
         my $DataValues = $Self->BuildSelectionDataGet(
             DynamicFieldConfig => $Param{DynamicFieldConfig},
@@ -390,7 +392,7 @@ EOF
     };
 
     if ( $FieldConfig->{MultiValue} ) {
-        $Data->{MultiValue}    = \@ResultHTML;
+        $Data->{MultiValue}         = \@ResultHTML;
         $Data->{MultiValueTemplate} = $TemplateHTML;
     }
     else {
@@ -424,7 +426,7 @@ sub EditFieldValueGet {
 
             # delete empty values (can happen if the user has selected the "-" entry)
             my $Index = 0;
-            for my $Item ( @DataAll ) {
+            for my $Item (@DataAll) {
                 push @Data, $Item // '';
             }
             $Value = \@Data;
@@ -462,7 +464,7 @@ sub EditFieldValueValidate {
     my $ValueCount = $Param{ValueCount} || 1;
 
     if ( !$Param{DynamicFieldConfig}->{Config}->{MultiValue} ) {
-        $Value = [ $Value ];
+        $Value = [$Value];
     }
 
     if ( $Param{Mandatory} && ( $ValueCount > scalar $Value->@* ) ) {
@@ -471,7 +473,8 @@ sub EditFieldValueValidate {
         };
     }
 
-    for my $ValueItem ( @{ $Value } ) {
+    for my $ValueItem ( @{$Value} ) {
+
         # perform necessary validations
         if ( $Param{Mandatory} && !$ValueItem ) {
             return {
@@ -524,7 +527,7 @@ sub DisplayValueRender {
     }
 
     my @ReadableValues;
-    for my $ValueItem ( @Values ) {
+    for my $ValueItem (@Values) {
 
         $ValueItem //= '';