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

Author: bschmalhofer

COPYING-Third-Party

@@ -364,3 +364,8 @@ o Name:    Spectrum
 o Name:    DejaVu Fonts
   Web:     https://dejavu-fonts.github.io/
   License: Free License - https://dejavu-fonts.github.io/License.html
+
+o Name:    Wikipedia Logo
+  Web:     https://commons.wikimedia.org/wiki/File:Antu_wikipedia.svg
+  License: Creative Commons Attribution-Share Alike 3.0 Unported - https://creativecommons.org/licenses/by-sa/3.0/deed.en
+  Note:    This file is from the Antü Plasma Suite. No changes were made. Path to file is var/httpd/htdocs/skins/Customer/default/img/sample_wikipedia.png.

Kernel/Config/Files/XML/Framework.xml

@@ -494,7 +494,7 @@
         <Description Translatable="1">Defines the URL rich text editor path.</Description>
         <Navigation>Frontend::Base</Navigation>
         <Value>
-            <Item ValueType="String" ValueRegex="">&lt;OTOBO_CONFIG_Frontend::WebPath&gt;js/thirdparty/ckeditor5-47.3.0/</Item>
+            <Item ValueType="String" ValueRegex="">&lt;OTOBO_CONFIG_Frontend::WebPath&gt;js/thirdparty/ckeditor5-47.6.1/</Item>
         </Value>
     </Setting>
     <Setting Name="Frontend::RichTextWidth" Required="1" Valid="1">
@@ -522,14 +522,14 @@
         <Description Translatable="1">Path to CKEditor content CSS file. Changes to this setting will only consistently apply after deleting the OTOBO Cache via the Maint::Cache::Delete command!</Description>
         <Navigation>Frontend::Base</Navigation>
         <Value>
-            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.3.0-content.css</Item>
+            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.6.1-content.css</Item>
         </Value>
     </Setting>
     <Setting Name="Frontend::RichTextEditorStyles" Required="1" Valid="1" ConfigLevel="200">
         <Description Translatable="1">Path to CKEditor editor CSS file. Changes to this setting will only consistently apply after deleting the OTOBO Cache via the Maint::Cache::Delete command!</Description>
         <Navigation>Frontend::Base</Navigation>
         <Value>
-            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.3.0-editor.css</Item>
+            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.6.1-editor.css</Item>
         </Value>
     </Setting>
     <Setting Name="CustomerFrontend::RichText::DefaultCSS" Required="1" Valid="1">
@@ -543,14 +543,14 @@
         <Description Translatable="1">Path to CKEditor content CSS file. Changes to this setting will only consistently apply after deleting the OTOBO Cache via the Maint::Cache::Delete command!</Description>
         <Navigation>Frontend::Base</Navigation>
         <Value>
-            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.3.0-content.css</Item>
+            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.6.1-content.css</Item>
         </Value>
     </Setting>
     <Setting Name="CustomerFrontend::RichTextEditorStyles" Required="1" Valid="1" ConfigLevel="200">
         <Description Translatable="1">Path to CKEditor editor CSS file. Changes to this setting will only consistently apply after deleting the OTOBO Cache via the Maint::Cache::Delete command!</Description>
         <Navigation>Frontend::Base</Navigation>
         <Value>
-            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.3.0-editor.css</Item>
+            <Item ValueType="String" ValueRegex="">common/css/ckeditor5-47.6.1-editor.css</Item>
         </Value>
     </Setting>
     <Setting Name="Frontend::RichText::EnhancedMode" Required="1" Valid="1">
@@ -7661,16 +7661,23 @@ via the Preferences button after logging in.
                         <Item Key="TextColor">#00023c</Item>
                         <Item Key="Links">
                             <Hash>
-                                <Item Key="https://duckduckgo.com/">1</Item>
-                                <Item Key="https://www.wikipedia.org">2</Item>
-                                <Item Key="https://www.openstreetmap.org">3</Item>
+                                <Item Key="https://www.otobo.io">1</Item>
+                                <Item Key="https://www.openstreetmap.org">2</Item>
+                                <Item Key="https://www.wikipedia.org">3</Item>
                             </Hash>
                         </Item>
                         <Item Key="Images">
                             <Hash>
-                                <Item Key="https://cdn3.iconfinder.com/data/icons/social-media-logos-flat-colorful-1/2048/5364_-_DuckDuckGo-512.png">1</Item>
-                                <Item Key="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjwhRE9DVFlQRSBzdmcgIFBVQkxJQyAnLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4nICAnaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkJz48c3ZnIGhlaWdodD0iNTEycHgiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDUxMiA1MTI7IiB2ZXJzaW9uPSIxLjEiIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiB3aWR0aD0iNTEycHgiIHhtbDpzcGFjZT0icHJlc2VydmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxnIGlkPSJfeDMzXzc3LXdpa2lwZWRpYS13Ij48Zz48cGF0aCBkPSJNNDg1Ljk5OSwxMDguODUxbC0wLjIxNCw4Ljc2N2MtMjAuMTkzLDAuNTc2LTMyLjM0MSwxMS4zNTUtNDAuMTAxLDI4Ljk2MmMtMTcuOTY2LDQxLjUzOC03NC4yMzUsMTcyLjQ3Mi0xMTEuNjA0LDI1Ny43MDMgICAgaC05Ljc3M2wtNTguODU3LTEzOC43N2MtMjMuMzU1LDQ1LjcwNS00OS4wODIsOTMuNDI0LTcxLjI4NywxMzguNzdjLTAuMjE3LDAuMjE2LTEwLjc4LDAtMTAuNzgtMC4yMTYgICAgYy0zMy43MDQtNzguODM1LTY5LjA2MS0xNTcuMDk0LTEwMi44MzgtMjM2LjE0NWMtOC4xOTEtMTkuMTg3LTM1LjUtNTAuMzA0LTU0LjMyNy01MC4wODhjMC0yLjIyOC0wLjIxNi03LjE4Ni0wLjIxNi0xMC4yMDUgICAgaDExNi4zNDd2OS45ODljLTEzLjc5OCwwLjc5LTM3Ljk0Myw5LjU1OC0zMS4xMTcsMjQuNTc3YzE1LjczNywzNS43MTYsNzQuNDUxLDE3Mi42ODgsOTAuMjYsMjA3LjM5OSAgICBjMTAuNzgtMjEuMzQ0LDQxLjUzOC03OC40NzUsNTQuMTE0LTEwMi42MjJjLTkuOTg4LTIwLjMzNi00Mi4xMTItOTYuMjI1LTUyLjMxNy0xMTQuOTgxYy02Ljk3MS0xMi43OTItMjUuOTQxLTEzLjk0MS00MC4xLTE0LjE1NyAgICB2LTkuOTg5bDEwMi40MDYsMC4yMTZ2OS40MTRjLTEzLjk0MSwwLjQzMi0yNy4zNzksNS42MDUtMjEuMTI4LDE4Ljc1NmMxMy41ODEsMjguNzQ2LDIxLjk4OSw0OC45MzksMzQuNTY2LDc1LjI0MSAgICBjNC4wMjQtNy43NjIsMjQuOTM4LTQ5Ljg3MywzNC41NjYtNzIuNDM5YzYuMzk3LTE0LjgwMy0yLjgwNC0yMC41NTMtMjcuNzM5LTIxLjEyNmMwLjIxNS0yLjU4OCwwLTcuNDAyLDAuMjE1LTkuNzc1ICAgIGMzMS45MDgtMC4yMTUsNzkuODQyLTAuMjE1LDg4LjQ2NS0wLjQzMXY5Ljc3M2MtMTYuMTcsMC41NzUtMzIuOTEzLDkuMTk4LTQxLjc1MywyMi43ODFsLTQyLjU0Miw4OC4yNDkgICAgYzQuNTk4LDExLjU3MSw0NS40ODgsMTAyLjYyLDQ5LjcyNywxMTIuNjEybDg3Ljk2My0yMDMuMDg4Yy02LjE4LTE2LjYwMS0yNi4xNTgtMjAuMTk0LTMzLjkyLTIwLjMzOHYtOS45ODlsOTEuODQyLDAuNzkgICAgTDQ4NS45OTksMTA4Ljg1MXoiLz48L2c+PC9nPjxnIGlkPSJMYXllcl8xIi8+PC9zdmc+">2</Item>
-                                <Item Key="https://cdn4.iconfinder.com/data/icons/logos-brands-5/24/openstreetmap-512.png">3</Item>
+                                <Item Key="/otobo-web/skins/Customer/default/img/sample_otobo.png">1</Item>
+                                <Item Key="/otobo-web/skins/Customer/default/img/sample_openstreetmap.png">2</Item>
+                                <Item Key="/otobo-web/skins/Customer/default/img/sample_wikipedia.png">3</Item>
+                            </Hash>
+                        </Item>
+                        <Item Key="Titles">
+                            <Hash>
+                                <Item Key="OTOBO">1</Item>
+                                <Item Key="OpenStreetMap">2</Item>
+                                <Item Key="Wikipedia">3</Item>
                             </Hash>
                         </Item>
                     </Hash>

Kernel/GenericInterface/Transport/HTTP/SOAP.pm

@@ -28,6 +28,7 @@ use PerlIO;    ## no perlimports, not sure whether this is needed
 use HTTP::Status    qw(status_message);
 use Plack::Response ();
 use SOAP::Lite;    # for enabling debugging import +trace => 'all'
+use Text::Trim qw(rtrim);
 
 # OTOBO modules
 use Kernel::System::VariableCheck  qw(:all);
@@ -211,6 +212,10 @@ sub ProviderProcessRequest {
         Data    => $Content,
     );
 
+    # Normalize Content by removing trailing white space.
+    # This make SOAP::Lite work with XML::Parser >= 1.48.
+    rtrim($Content);
+
     # Deserialize data.
     my $Deserialized      = eval { SOAP::Deserializer->deserialize($Content); };
     my $DeserializedFault = $@ || '';

Kernel/Modules/CustomerDashboardCommon.pm

@@ -50,9 +50,40 @@ sub Run {
 
     my $Output = $LayoutObject->CustomerHeader();
 
+    # validate that each tile has a valid and unique Order
+    # tiles with invalid or duplicate Order are moved to the end by giving them top Order values
+    my $MaxOrder = 0;
+    my %OrderUsed;
+    my @InvalidOrderTiles;
+    for my $Tile ( sort { $UsedTiles->{$a}->{Order} <=> $UsedTiles->{$b}->{Order} } keys $UsedTiles->%* ) {
+
+        # check if the Order is valid and unique
+        my $Order = $UsedTiles->{$Tile}{Order};
+        if ( $Order !~ m/^\d+$/ || $OrderUsed{$Order} ) {
+            push @InvalidOrderTiles, $Tile;
+            my $Message = $LayoutObject->{LanguageObject}->Translate(
+                'Registration for tile \'%s\' of CustomerDashboard is invalid! Order needs to be a number and unique.',
+                $Tile,
+            );
+            $Kernel::OM->Get('Kernel::System::Log')->Log(
+                Priority => 'error',
+                Message  => $Message,
+            );
+        }
+        else {
+            if ( $Order > $MaxOrder ) {
+                $MaxOrder = $Order;
+            }
+            $OrderUsed{$Order} = 1;
+        }
+    }
+
+    for my $Tile (@InvalidOrderTiles) {
+        $UsedTiles->{$Tile}{Order} = ++$MaxOrder;
+    }
+
     # generate the HTML of the individual tiles
     my $TileHTML = '';
-    my %OrderUsed;
     for my $Tile ( sort { $UsedTiles->{$a}->{Order} <=> $UsedTiles->{$b}->{Order} } keys $UsedTiles->%* ) {
 
         # check if the registration for each tile is valid
@@ -93,21 +124,6 @@ sub Run {
         # create a backend object
         my $BackendObject = $BackendModule->new();
 
-        # check if the Order is an unique number
-        my $TileID = sprintf '%02d', $UsedTiles->{$Tile}{Order};    # assuming Order being less than 100
-        if ( $TileID !~ m/^\d+$/ || ++$OrderUsed{$TileID} > 1 ) {
-            my $Message = $LayoutObject->{LanguageObject}->Translate(
-                'Registration for tile %s of CustomerDashboard is invalid! Order needs to be a unique number.',
-                $Tile,
-            );
-            $Kernel::OM->Get('Kernel::System::Log')->Log(
-                Priority => 'error',
-                Message  => $Message,
-            );
-
-            return $LayoutObject->ErrorScreen( Message => $Message );
-        }
-
         # replace the OTOBO_CONFIG macro in the config, for settings like:
         #   <Item Key="BackgroundImage">&lt;OTOBO_CONFIG_Frontend::WebPath&gt;common/img/Dashboard/dashboard_bgfl.png</Item>
         my $Config = $UsedTiles->{$Tile}->{Config} || {};
@@ -119,6 +135,8 @@ sub Run {
             $Config->{$Key} =~ s{<OTOBO_CONFIG_(.+?)>}{$ConfigObject->Get($1)}egx;
         }
 
+        my $TileID = sprintf '%02d', $UsedTiles->{$Tile}{Order};    # assuming Order being less than 100
+
         # get the HTML
         $TileHTML .= $BackendObject->Run(
             TileID   => $TileID,

Kernel/Modules/CustomerTicketMessage.pm

@@ -823,7 +823,6 @@ sub Run {
                 );
             }
 
-            $Output .= $LayoutObject->CustomerNavigationBar();
             $Output .= $Self->_MaskNew(
                 Attachments => \@Attachments,
                 %GetParam,

Kernel/Output/HTML/CustomerDashboard/TileToolBox.pm

@@ -40,13 +40,15 @@ sub Run {
 
     my %Links  = reverse %{ $Param{Config}{Links} };
     my %Images = reverse %{ $Param{Config}{Images} };
+    my %Titles = reverse %{ $Param{Config}{Titles} // {} };
 
     for my $Key ( sort { $a <=> $b } keys %Links ) {
         $LayoutObject->Block(
             Name => 'Link',
             Data => {
                 Link  => $Links{$Key},
                 Image => $Images{$Key},
+                Title => $Titles{$Key} // '',
             },
         );
     }

Kernel/Output/HTML/Templates/Standard/Dashboard/TileToolBox.tt

@@ -17,7 +17,7 @@
     <h2 style="color: [% Data.TextColor | html %]">[% Translate(Data.Text) | html %]</h2>
     <div>
 [% RenderBlockStart("Link") %]
-        <a href="[% Data.Link | html %]" style="background-image: url([% Data.Image | html %])" target="_blank"></a>
+        <a href="[% Data.Link | html %]" style="background-image: url([% Data.Image | html %])" title="[% Data.Title | html %]" target="_blank"></a>
 [% RenderBlockEnd("Link") %]
     </div>
 </div>

Kernel/System/DynamicField/Driver/CustomerUser.pm

@@ -38,9 +38,9 @@ use Kernel::System::VariableCheck qw(IsArrayRefWithData IsHashRefWithData);
 our @ObjectDependencies = (
     'Kernel::Config',
     'Kernel::System::CustomerUser',
-    'Kernel::System::Group',
     'Kernel::System::DynamicField',
     'Kernel::System::DynamicField::Backend',
+    'Kernel::System::Group',
     'Kernel::System::Log',
 );
 
@@ -95,6 +95,72 @@ sub new {
     return $Self;
 }
 
+sub FieldValueValidate {
+    my ( $Self, %Param ) = @_;
+
+    # Check for defined value.
+    if ( !defined $Param{Value} ) {
+        $Kernel::OM->Get('Kernel::System::Log')->Log(
+            Priority => 'error',
+            Message  => "Need Value in $Param{DynamicFieldConfig}->{FieldType} DynamicField!",
+        );
+
+        return;
+    }
+
+    # validate values via SearchObjects
+    #   driver prevents usage of PossibleValuesGet on purpose for performance reasons
+    if ( length $Param{Value} ) {
+        my @Values;
+        if ( ref $Param{Value} eq 'ARRAY' ) {
+            @Values = @{ $Param{Value} };
+        }
+        else {
+            push @Values, $Param{Value};
+        }
+
+        if ( $Param{ExternalSource} && $Param{DynamicFieldConfig}{Config}{ImportSearchAttribute} ) {
+            my $TransformedValues = $Self->_TransformExternalSource(
+                DynamicFieldConfig => $Param{DynamicFieldConfig},
+                ValueArray         => \@Values,
+                UserID             => $Param{UserID},
+            );
+            VALUE:
+            for my $Value ( $TransformedValues->@* ) {
+
+                # empty values are considered valid
+                next VALUE unless $Value;
+
+                my @SearchResult = $Self->SearchObjects(
+                    DynamicFieldConfig => $Param{DynamicFieldConfig},
+                    ObjectID           => $Value,
+                    UserID             => $Param{UserID},
+                );
+
+                return unless @SearchResult;
+            }
+        }
+        else {
+            VALUE:
+            for my $Value (@Values) {
+
+                # empty values are considered valid
+                next VALUE unless $Value;
+
+                my @SearchResult = $Self->SearchObjects(
+                    DynamicFieldConfig => $Param{DynamicFieldConfig},
+                    ObjectID           => $Value,
+                    UserID             => $Param{UserID},
+                );
+
+                return unless @SearchResult;
+            }
+        }
+    }
+
+    return 1;
+}
+
 sub PossibleValuesGet {
 
     # this field makes no use of PossibleValuesGet for performance purpose - instead, values are checked via CustomerUserDataGet
@@ -159,8 +225,8 @@ sub GetFieldTypeSettings {
             Explanation     => Translatable('When set via an external source (e.g. web service or import / export), the value will be interpreted as this attribute.'),
             InputType       => 'Selection',
             SelectionData   => {
-                'UserLogin' => 'Login',
-                'UserEmail' => 'E-Mail',
+                'UserLogin'        => 'Login',
+                'PostMasterSearch' => 'E-Mail',
             },
             PossibleNone => 1,
             Multiple     => 0,
@@ -458,8 +524,6 @@ sub _GetHTTPLink {
                 $AccessRo = 1;
             }
         }
-
-        return;
     }
 
     if ( $AccessRo || $AccessRw ) {

Kernel/System/Ticket/FieldRestrictions.pm

@@ -269,9 +269,11 @@ sub GetFieldStates {
 
             # values of visible fields turning invisible are deleted or set to values of ticket data if present
             my $UpdateRequired = !defined $DFParam->{"DynamicField_$DFName"} ? 0 :
-                ref( $DFParam->{"DynamicField_$DFName"} ) ?
-                    ( IsArrayRefWithData( $DFParam->{"DynamicField_$DFName"} ) ? 1 : 0 ) :
-                    $DFParam->{"DynamicField_$DFName"} =~ m/^-?$/ ? 0 : 1;
+                ref( $DFParam->{"DynamicField_$DFName"} )
+                ?
+                ( IsArrayRefWithData( $DFParam->{"DynamicField_$DFName"} ) ? 1 : 0 )
+                :
+                $DFParam->{"DynamicField_$DFName"} =~ m/^-?$/ ? 0 : 1;
 
             my %TicketData;
             if ( $Param{TicketID} ) {
@@ -754,6 +756,8 @@ sub SetACLPreselectionCache {
         SLA              => 'SLAID',
         StandardTemplate => 'StandardTemplateID',
         CustomerUser     => 'ServiceID',            # for some unknown reason the changed element upon customer user change is always ServiceID
+        CustomerUserID   => 'CustomerUserID',
+        CustomerID       => 'CustomerID',
     );
 
     # dynamic fields