Skip to content

Commit 36dacba

Browse files
stefanhaerterstefanhaerter
committed
Merge branch 'rel-11_1' into issue-#4432-cleanup_znunyhelper_v2
2 parents 63bbcb4 + e2e81a5 commit 36dacba

53 files changed

Lines changed: 3683 additions & 1416 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Kernel/Config/Defaults.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2475,7 +2475,7 @@ sub SyncWithS3 {
24752475
while (1) {
24762476

24772477
# run a blocking GET request to S3, getting all keys below the prefix
2478-
# The keys are the pathes of files relative to Kernel/Config/Files
2478+
# The keys are the paths of files relative to Kernel/Config/Files
24792479
my %SubPath2Properties = $StorageS3Object->ListObjects(
24802480
Prefix => "$FilesPrefix/",
24812481
Delimiter => '',

‎Kernel/Config/Files/XML/Framework.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9819,10 +9819,10 @@ via the Preferences button after logging in.
98199819
</Item>
98209820
<Item Key="AttributeHeader">
98219821
<Hash>
9822-
<Item Key="TicketNumber">Ticket#</Item>
9823-
<Item Key="Title">Title</Item>
9824-
<Item Key="Queue">Queue</Item>
9825-
<Item Key="Age">Age</Item>
9822+
<Item Key="TicketNumber" Translatable="1">Ticket Number</Item>
9823+
<Item Key="Title" Translatable="1">Ticket Title</Item>
9824+
<Item Key="Queue" Translatable="1">Queue</Item>
9825+
<Item Key="Age" Translatable="1">Age</Item>
98269826
</Hash>
98279827
</Item>
98289828
</Hash>
@@ -9843,9 +9843,9 @@ via the Preferences button after logging in.
98439843
</Item>
98449844
<Item Key="AttributeHeader">
98459845
<Hash>
9846-
<Item Key="CustomerCompanyName">Name</Item>
9847-
<Item Key="CustomerID">ID</Item>
9848-
<Item Key="CustomerCompanyComment">Comment</Item>
9846+
<Item Key="CustomerCompanyName" Translatable="1">Customer Name</Item>
9847+
<Item Key="CustomerID" Translatable="1">Customer ID</Item>
9848+
<Item Key="CustomerCompanyComment" Translatable="1">Comment</Item>
98499849
</Hash>
98509850
</Item>
98519851
</Hash>
@@ -9867,10 +9867,10 @@ via the Preferences button after logging in.
98679867
</Item>
98689868
<Item Key="AttributeHeader">
98699869
<Hash>
9870-
<Item Key="UserLogin">Login</Item>
9871-
<Item Key="UserFirstname">Name</Item>
9872-
<Item Key="UserLastname">Name</Item>
9873-
<Item Key="UserEmail">Email</Item>
9870+
<Item Key="UserLogin" Translatable="1">Login</Item>
9871+
<Item Key="UserFirstname" Translatable="1">Firstname</Item>
9872+
<Item Key="UserLastname" Translatable="1">Lastname</Item>
9873+
<Item Key="UserEmail" Translatable="1">Email</Item>
98749874
</Hash>
98759875
</Item>
98769876
</Hash>

‎Kernel/Modules/AdminDynamicFieldDateTime.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ sub _ChangeAction {
542542
}
543543
}
544544

545-
# return to change screen if errors occured
545+
# return to change screen if errors occurred
546546
if (%Errors) {
547547
return $Self->_ShowScreen(
548548
%Param,

‎Kernel/Modules/AdminNotificationEvent.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# OTOBO is a web-based ticketing system for service organisations.
33
# --
44
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
5-
# Copyright (C) 2019-2025 Rother OSS GmbH, https://otobo.io/
5+
# Copyright (C) 2019-2026 Rother OSS GmbH, https://otobo.io/
66
# --
77
# This program is free software: you can redistribute it and/or modify it under
88
# the terms of the GNU General Public License as published by the Free Software
@@ -817,7 +817,6 @@ sub Run {
817817
# challenge token check for write action
818818
$LayoutObject->ChallengeTokenCheck();
819819

820-
my $FormID = $ParamObject->GetParam( Param => 'FormID' ) || '';
821820
my %UploadStuff = $ParamObject->GetUploadAll(
822821
Param => 'FileUpload',
823822
Source => 'string',
@@ -958,7 +957,8 @@ sub _Edit {
958957

959958
$Param{RecipientsStrg} = $LayoutObject->BuildSelection(
960959
Data => {
961-
AgentCreateBy => Translatable('Agent who created the ticket'),
960+
AgentCreateBy => Translatable('Agent who created the first article'),
961+
AgentCreateByTicket => Translatable('Agent who created the ticket'),
962962
AgentOwner => Translatable('Agent who owns the ticket'),
963963
AgentResponsible => Translatable('Agent who is responsible for the ticket'),
964964
AgentWatcher => Translatable('All agents watching the ticket'),

‎Kernel/Modules/AdminPostMasterFilter.pm‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# OTOBO is a web-based ticketing system for service organisations.
33
# --
44
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
5-
# Copyright (C) 2019-2025 Rother OSS GmbH, https://otobo.io/
5+
# Copyright (C) 2019-2026 Rother OSS GmbH, https://otobo.io/
66
# --
77
# This program is free software: you can redistribute it and/or modify it under
88
# the terms of the GNU General Public License as published by the Free Software
@@ -355,8 +355,9 @@ sub Run {
355355
$LayoutObject->Block(
356356
Name => 'OverviewResultRow',
357357
Data => {
358-
Name => $Key,
359-
Valid => $ValidList{ $Data{ValidID} },
358+
Name => $Key,
359+
StopAfterMatch => $Data{StopAfterMatch} ? 'Yes' : 'No',
360+
Valid => $ValidList{ $Data{ValidID} },
360361
},
361362
);
362363
}

‎Kernel/Modules/AdminRegistration.pm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ sub Run {
276276
Data => {
277277
FQDN => $ConfigObject->Get('FQDN'),
278278
OTOBOVersion => $ConfigObject->Get('Version'),
279-
PerlVersion => sprintf( '%vd', $^V ),
279+
PerlVersion => sprintf( "%vd", $^V ),
280280
%Param,
281281
%GetParam,
282282
%OSInfo,
@@ -421,15 +421,15 @@ sub Run {
421421
# check SupportDataSending if it is enable
422422
$Param{SupportDataSendingChecked} = '';
423423
if ( $RegistrationData{SupportDataSending} eq 'Yes' ) {
424-
$Param{SupportDataSendingChecked} = 'checked ';
424+
$Param{SupportDataSendingChecked} = 'checked="checked"';
425425
}
426426

427427
$LayoutObject->Block(
428428
Name => 'Edit',
429429
Data => {
430430
FQDN => $ConfigObject->Get('FQDN'),
431431
OTOBOVersion => $ConfigObject->Get('Version'),
432-
PerlVersion => sprintf( '%vd', $^V ),
432+
PerlVersion => sprintf( "%vd", $^V ),
433433
%Param,
434434
},
435435
);
@@ -606,7 +606,7 @@ sub _SentDataOverview {
606606
my $ConfigObject = $Kernel::OM->Get('Kernel::Config');
607607
my %OSInfo = $Kernel::OM->Get('Kernel::System::Environment')->OSInfoGet();
608608
my %System = (
609-
PerlVersion => sprintf( '%vd', $^V ),
609+
PerlVersion => sprintf( "%vd", $^V ),
610610
OSType => $OSInfo{OS},
611611
OSVersion => $OSInfo{OSName},
612612
OTOBOVersion => $ConfigObject->Get('Version'),

‎Kernel/Modules/AgentTicketActionCommon.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# OTOBO is a web-based ticketing system for service organisations.
33
# --
44
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
5-
# Copyright (C) 2019-2025 Rother OSS GmbH, https://otobo.io/
5+
# Copyright (C) 2019-2026 Rother OSS GmbH, https://otobo.io/
66
# --
77
# This program is free software: you can redistribute it and/or modify it under
88
# the terms of the GNU General Public License as published by the Free Software
@@ -1670,7 +1670,7 @@ sub Run {
16701670
if ( $DynamicFieldConfig->{Config}{MultiValue} && ref $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"} eq 'ARRAY' ) {
16711671
for my $i ( 0 .. $#{ $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"} } ) {
16721672
my $DataValues = $DynFieldStates{Fields}{$Name}{NotACLReducible}
1673-
? $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"}[$i]
1673+
? ( $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"}[$i] // '' )
16741674
:
16751675
(
16761676
$DynamicFieldBackendObject->BuildSelectionDataGet(
@@ -1726,7 +1726,7 @@ sub Run {
17261726
if ( $DynamicFieldConfig->{Config}{MultiValue} && ref $SetField->{Values}{$FrontendName} eq 'ARRAY' ) {
17271727
for my $i ( 0 .. $#{ $SetField->{Values}{$FrontendName} } ) {
17281728
my $DataValues = $SetField->{FieldStates}{$FrontendName}{NotACLReducible}
1729-
? $SetField->{Values}{$FrontendName}[$i]
1729+
? ( $SetField->{Values}{$FrontendName}[$i] // '' )
17301730
:
17311731
(
17321732
$DynamicFieldBackendObject->BuildSelectionDataGet(

‎Kernel/Modules/AgentTicketEmail.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# OTOBO is a web-based ticketing system for service organisations.
33
# --
44
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
5-
# Copyright (C) 2019-2025 Rother OSS GmbH, https://otobo.io/
5+
# Copyright (C) 2019-2026 Rother OSS GmbH, https://otobo.io/
66
# --
77
# This program is free software: you can redistribute it and/or modify it under
88
# the terms of the GNU General Public License as published by the Free Software
@@ -2456,7 +2456,7 @@ sub Run {
24562456
if ( $DynamicFieldConfig->{Config}{MultiValue} && ref $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"} eq 'ARRAY' ) {
24572457
for my $i ( 0 .. $#{ $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"} } ) {
24582458
my $DataValues = $DynFieldStates{Fields}{$Name}{NotACLReducible}
2459-
? $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"}[$i]
2459+
? ( $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"}[$i] // '' )
24602460
:
24612461
(
24622462
$DynamicFieldBackendObject->BuildSelectionDataGet(
@@ -2512,7 +2512,7 @@ sub Run {
25122512
if ( $DynamicFieldConfig->{Config}{MultiValue} && ref $SetField->{Values}{$FrontendName} eq 'ARRAY' ) {
25132513
for my $i ( 0 .. $#{ $SetField->{Values}{$FrontendName} } ) {
25142514
my $DataValues = $SetField->{FieldStates}{$FrontendName}{NotACLReducible}
2515-
? $SetField->{Values}{$FrontendName}[$i]
2515+
? ( $SetField->{Values}{$FrontendName}[$i] // '' )
25162516
:
25172517
(
25182518
$DynamicFieldBackendObject->BuildSelectionDataGet(

‎Kernel/Modules/AgentTicketPhone.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# OTOBO is a web-based ticketing system for service organisations.
33
# --
44
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
5-
# Copyright (C) 2019-2025 Rother OSS GmbH, https://otobo.io/
5+
# Copyright (C) 2019-2026 Rother OSS GmbH, https://otobo.io/
66
# --
77
# This program is free software: you can redistribute it and/or modify it under
88
# the terms of the GNU General Public License as published by the Free Software
@@ -2247,7 +2247,7 @@ sub Run {
22472247
if ( $DynamicFieldConfig->{Config}{MultiValue} && ref $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"} eq 'ARRAY' ) {
22482248
for my $i ( 0 .. $#{ $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"} } ) {
22492249
my $DataValues = $DynFieldStates{Fields}{$Name}{NotACLReducible}
2250-
? $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"}[$i]
2250+
? ( $GetParam{DynamicField}{"DynamicField_$DynamicFieldConfig->{Name}"}[$i] // '' )
22512251
:
22522252
(
22532253
$DynamicFieldBackendObject->BuildSelectionDataGet(
@@ -2303,7 +2303,7 @@ sub Run {
23032303
if ( $DynamicFieldConfig->{Config}{MultiValue} && ref $SetField->{Values}{$FrontendName} eq 'ARRAY' ) {
23042304
for my $i ( 0 .. $#{ $SetField->{Values}{$FrontendName} } ) {
23052305
my $DataValues = $SetField->{FieldStates}{$FrontendName}{NotACLReducible}
2306-
? $SetField->{Values}{$FrontendName}[$i]
2306+
? ( $SetField->{Values}{$FrontendName}[$i] // '' )
23072307
:
23082308
(
23092309
$DynamicFieldBackendObject->BuildSelectionDataGet(

‎Kernel/Modules/AgentTicketPlain.pm‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# OTOBO is a web-based ticketing system for service organisations.
33
# --
44
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
5-
# Copyright (C) 2019-2025 Rother OSS GmbH, https://otobo.io/
5+
# Copyright (C) 2019-2026 Rother OSS GmbH, https://otobo.io/
66
# --
77
# This program is free software: you can redistribute it and/or modify it under
88
# the terms of the GNU General Public License as published by the Free Software
@@ -120,21 +120,21 @@ sub Run {
120120
$Plain =~ s/^(From .*)/<span class="Error">$1<\/span>/gm;
121121
$Plain =~ s/^(X-OTOBO.*)/<span class="Error">$1<\/span>/gmi;
122122

123-
my $Output = $LayoutObject->Header(
124-
Type => 'Small',
125-
);
126-
$Output .= $LayoutObject->Output(
127-
TemplateFile => 'AgentTicketPlain',
128-
Data => {
129-
Text => $Plain,
130-
%Ticket,
131-
%Article,
132-
},
133-
);
134-
$Output .= $LayoutObject->Footer(
135-
Type => 'Small',
136-
);
137-
return $Output;
123+
return join '',
124+
$LayoutObject->Header(
125+
Type => 'Small',
126+
),
127+
$LayoutObject->Output(
128+
TemplateFile => 'AgentTicketPlain',
129+
Data => {
130+
Text => $Plain,
131+
%Ticket,
132+
%Article,
133+
},
134+
),
135+
$LayoutObject->Footer(
136+
Type => 'Small',
137+
);
138138
}
139139

140140
1;

0 commit comments

Comments
 (0)