Merge branch 'rel-11_0' into rel-11_1

RotherOSS · Jan 3, 2025 · 0301ac2 · 0301ac2
2 parents 6a41219 + 82dc314
commit 0301ac2
Show file tree

Hide file tree

Showing 6 changed files with 149 additions and 133 deletions.
diff --git a/Kernel/Modules/AgentTicketEmailOutbound.pm b/Kernel/Modules/AgentTicketEmailOutbound.pm
@@ -190,19 +190,6 @@ sub Run {
         my $CustomerUser = $Ticket{CustomerUserID};
         my $QueueID      = $Ticket{QueueID};
 
-        # get dynamic field values form http request
-        my %DynamicFieldValues;
-
-        # convert dynamic field values into a structure for ACLs
-        my %DynamicFieldACLParameters;
-        DYNAMICFIELD:
-        for my $DynamicFieldItem ( sort keys %DynamicFieldValues ) {
-            next DYNAMICFIELD if !$DynamicFieldItem;
-            next DYNAMICFIELD if !defined $DynamicFieldValues{$DynamicFieldItem};
-
-            $DynamicFieldACLParameters{ 'DynamicField_' . $DynamicFieldItem } = $DynamicFieldValues{$DynamicFieldItem};
-        }
-
         # get config object
         my $ConfigObject = $Kernel::OM->Get('Kernel::Config');
 
@@ -221,9 +208,6 @@ sub Run {
             QueueID        => $QueueID,
         );
 
-        # update Dynamic Fields Possible Values via AJAX
-        my @DynamicFieldAJAX;
-
         # get dynamic field backend object
         my $DynamicFieldBackendObject = $Kernel::OM->Get('Kernel::System::DynamicField::Backend');
 
@@ -263,24 +247,6 @@ sub Run {
                 # convert Filer key => key back to key => value using map
                 %{$PossibleValues} = map { $_ => $PossibleValues->{$_} } keys %Filter;
             }
-
-            my $DataValues = $DynamicFieldBackendObject->BuildSelectionDataGet(
-                DynamicFieldConfig => $DynamicFieldConfig,
-                PossibleValues     => $PossibleValues,
-                Value              => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
-            ) || $PossibleValues;
-
-            # add dynamic field to the list of fields to update
-            push(
-                @DynamicFieldAJAX,
-                {
-                    Name        => 'DynamicField_' . $DynamicFieldConfig->{Name},
-                    Data        => $DataValues,
-                    SelectedID  => $DynamicFieldValues{ $DynamicFieldConfig->{Name} },
-                    Translation => $DynamicFieldConfig->{Config}->{TranslatableValues} || 0,
-                    Max         => 100,
-                }
-            );
         }
 
         my $StandardTemplates = $Self->_GetStandardTemplates(
@@ -413,7 +379,6 @@ sub Run {
                     Translation  => 1,
                     Max          => 100,
                 },
-                @DynamicFieldAJAX,
                 @TemplateAJAX,
             ],
         );

diff --git a/Kernel/System/Auth/Sync/LDAP.pm b/Kernel/System/Auth/Sync/LDAP.pm
@@ -103,7 +103,7 @@ sub new {
         $Self->{Params} = {};
     }
 
-    $Self->{StartTLS} = $ConfigObject->Get( 'AuthModule::LDAP::StartTLS' . $Param{Count} ) || '';
+    $Self->{StartTLS} = $ConfigObject->Get( 'AuthSyncModule::LDAP::StartTLS' . $Param{Count} ) || '';
 
     return $Self;
 }

diff --git a/Kernel/System/DynamicField.pm b/Kernel/System/DynamicField.pm
@@ -1766,7 +1766,7 @@ sub _DynamicFieldReorder {
             $Kernel::OM->Get('Kernel::System::Log')->Log(
                 Priority => 'error',
                 Message  => 'An error was detected while re ordering the field list on field '
-                    . "DynamicField->{Name}!",
+                    . "$DynamicField->{Name}!",
             );
             return;
         }

diff --git a/Kernel/System/DynamicField/Driver/Date.pm b/Kernel/System/DynamicField/Driver/Date.pm
@@ -144,8 +144,8 @@ sub ValueSet {
 
         $Kernel::OM->Get('Kernel::System::Log')->Log(
             Priority => 'error',
-            Message  => "The value $ValueItem for the field Date is invalid!\n"
-                . "The date must be in format 0000-00-00 and the time must be 00:00:00",
+            Message  => "The value $Param{Value} for the field Date is invalid!\n"
+                . "The date must be in format YYYY-MM-DD and the time must be 00:00:00",
         );
 
         return;

diff --git a/Kernel/System/Email.pm b/Kernel/System/Email.pm
@@ -564,6 +564,7 @@ sub Send {
             );
 
             my $Parser = MIME::Parser->new();
+            $Parser->output_to_core('ALL');
 
             $Parser->output_dir( $ConfigObject->Get('TempDir') );
             $Entity = $Parser->parse_data( $Header . $EncryptedMessage );