Skip to content

Commit

Permalink
Merge branch 'dev' into dev-ACL_Module_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dennykorsukewitz authored Feb 6, 2024
2 parents 6cf76a3 + ac9c8f0 commit 038d154
Show file tree
Hide file tree
Showing 5,754 changed files with 17,689 additions and 329,209 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ The following persons contributed to Znuny:
* IB Development Team <[email protected]>
* Igor Djuric <[email protected]>
* Jan Steinweg <[email protected]>
* JannisKleinrensing <[email protected]>
* Jaroslav Balaz <[email protected]>
* Jens Bothe <[email protected]>
* Jens Pfeifer <[email protected]>
Expand Down Expand Up @@ -126,6 +127,7 @@ The following persons contributed to Znuny:
* Zoran Ilibasic <[email protected]>
* akmet <[email protected]>
* anonymous <unknown@anonymous>
* arlecchino <[email protected]>
* b1-luettje <[email protected]>
* djurici <[email protected]>
* forwwward <[email protected]>
Expand Down
67 changes: 66 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,38 @@
# 7.0.14 2023-??-??
# 7.0.16 2024-??-??
- 2024-02-05 AdminOAuth2TokenManagement: Added filter for (in)valid entries.
- 2024-02-02 Removed session data from support bundle generator.
- 2024-02-02 Prevent error message 'MissingTicketID' of ArticleList in inbound phone call screen. Thanks to Jannis Kleinrensing (@JannisKleinrensing), maxence. [PR#346](https://github.com/znuny/Znuny/pull/346)
- 2024-02-02 Add html comment end tag into template file. Thanks to @kolbma. [PR#528](https://github.com/znuny/Znuny/pull/528)
- 2024-01-24 Fixed layout of error message in customer interface.

# 7.0.15 2024-01-31
- 2024-01-25 Fixed migration of mention notification.
- 2024-01-18 Exchanged CKEditor 4.22.1 source version with minified version to improve browser loading times. [#533](https://github.com/znuny/Znuny/issues/533)
- 2024-01-15 Updated Transition Action Default Parameters.
- 2024-01-19 Fixed slow regular expression in postmaster attachment detection.
- 2024-01-11 Fixed appointment notifications not being sent if crypting/signing options were configured.
- 2024-01-10 Adjusted styling of file list of an installed package on AdminPackageManager.
- 2024-01-10 Fixed setting default value for time units when using dropdown fields. [#464](https://github.com/znuny/Znuny/issues/464)
- 2024-01-08 Updated AdminSystemFiles: Added additional file check.
- 2024-01-08 Adjustment of Login form.
- 2024-01-08 Fixed rich text editor's field height problems by disabling CKEditor's autogrow plugin. Thanks to Paweł Bogusławski (@pboguslawski). [#526](https://github.com/znuny/Znuny/pull/526)
- 2024-01-02 Fixed Bug - Error in Daemon Scheduler Task Worker (Task: PluginAsynchronous::ConcurrentUser). [#524](https://github.com/znuny/Znuny/issues/524)
- 2024-01-02 Fixed Bug - Empty block (horizontal line) dynamic field group process management. [#513](https://github.com/znuny/Znuny/issues/513)
- 2023-12-28 Fixed AdminACL: Text in MessageBox Notice should link to acl deployment.
- 2023-12-22 Deactivated CKE 4 plugin embedsemantic because it showed the content of a link instead of just the link.
- 2023-10-24 Kernel::System::MailQueue::Send now increases number of attempts before sending an email. This prevents the attempts not being increased if the process dies while trying to send an email.

# 7.0.14 2023-12-13
- 2023-12-11 Increased size of user_id column in table customer_user_customer.
- 2023-12-07 Customer detail search cache for dynamic field values will now be cleared if a customer will be added or updated.
- 2023-12-01 Fixed SearchInArchive parameter not used in the fulltext search of the toolbar. Thanks to Tim Püttmanns (@tipue-dev), maxence. [PR#479](https://github.com/znuny/Znuny/pull/479)
- 2023-11-30 Fixed URL for CustomerID in AgentTicketOverviewMedium. [#506](https://github.com/znuny/Znuny/issues/506)
- 2023-11-28 Fixed hidden text area of RTE not being updated. [#507](https://github.com/znuny/Znuny/issues/507).
- 2023-11-17 Increased size of text columns for standard templates and notification event messages. Thanks for reporting to @BurtGummer. [#504](https://github.com/znuny/Znuny/issues/504)
- 2023-11-17 Pending dashboards now show all pending tickets.
- 2023-11-13 Added option 'send-timeout' to console command Maint::Email::MailQueue.
- 2023-11-10 Sessions will now be removed immediately (instead of by daemon task) if a user will be renamed, leading to a direct logout if a user renames himself.
- 2023-10-25 Fixed error handling in invoker Ticket::Generic.

# 7.0.13 2023-11-15
- 2023-11-09 Added missing links to widget on CustomerUserInformationCenter: create phone ticket, create email ticket, switch to customer.
Expand Down Expand Up @@ -174,6 +206,39 @@
- 2022-08-08 Admin - Added counter of AdminSettingPages per widget and additional focus by filter.
- 2022-07-15 Frontend::ToolBarModule - Refactored the Toolbar registration, position and view.

# 6.5.6 2024-01-31
- 2024-01-25 Fixed migration of mention notification.
- 2024-01-19 Fixed slow regular expression in postmaster attachment detection.
- 2024-01-18 Exchanged CKEditor 4.22.1 source version with minified version to improve browser loading times. [#533](https://github.com/znuny/Znuny/issues/533)
- 2024-01-11 Fixed appointment notifications not being sent if crypting/signing options were configured.
- 2024-01-10 Fixed setting default value for time units when using dropdown fields. [#464](https://github.com/znuny/Znuny/issues/464)
- 2024-01-08 Updated AdminSystemFiles: Added additional file check.
- 2024-01-08 Fixed rich text editor's field height problems by disabling CKEditor's autogrow plugin. Thanks to Paweł Bogusławski (@pboguslawski). [#526](https://github.com/znuny/Znuny/pull/526)
- 2023-12-22 Deactivated CKE 4 plugin embedsemantic because it showed the content of a link instead of just the link.
- 2023-10-24 Kernel::System::MailQueue::Send now increases number of attempts before sending an email. This prevents the attempts not being increased if the process dies while trying to send an email.

# 6.5.5 2023-12-13
- 2023-12-11 Increased size of user_id column in table customer_user_customer.
- 2023-12-07 Customer detail search cache for dynamic field values will now be cleared if a customer will be added or updated.
- 2023-11-30 Fixed URL for CustomerID in AgentTicketOverviewMedium. [#506](https://github.com/znuny/Znuny/issues/506)
- 2023-11-30 Added missing links to widget on CustomerUserInformationCenter: create phone ticket, create email ticket, switch to customer.
- 2023-11-17 Increased size of text columns for standard templates and notification event messages. Thanks for reporting to @BurtGummer. [#504](https://github.com/znuny/Znuny/issues/504)
- 2023-11-17 Pending dashboards now show all pending tickets.
- 2023-11-13 Added option 'send-timeout' to console command Maint::Email::MailQueue.
- 2023-11-10 Sessions will now be removed immediately (instead of by daemon task) if a user will be renamed, leading to a direct logout if a user renames himself.
- 2023-11-06 Sector Nord AG: Fixed encoding of shown changes on subaction ViewDiff of AdminPackageManager. Thanks to Ziggy Trotter (@ZTrotter), Sector Nord AG. [PR#486](https://github.com/znuny/Znuny/pull/486)
- 2023-11-06 Sector Nord AG: Fixed CTRL+left click in ticket overviews. Thanks to Ziggy Trotter (@ZTrotter), Sector Nord AG. [PR#487](https://github.com/znuny/Znuny/pull/487)
- 2023-11-06 Fixed queue_id in ticket history for the initial ticket. Thanks to Tim Püttmanns (@tipue-dev), maxence. [PR#299](https://github.com/znuny/Znuny/pull/299)
- 2023-10-26 Added pagination for ArticlePages on AgentTicketZoom.
- 2023-10-25 Fixed error handling in invoker Ticket::Generic.
- 2023-10-23 Fixed used email address to decrypt S/MIME messages in Kernel::System::PostMaster::Filter::Decrypt.
- 2023-10-10 Updated CKEditor to version 4.22.1.
- 2023-09-29 Added optional caching to web service requests of dynamic field types WebserviceDropdown and WebserviceMultiselect.
- 2023-09-22 Fixed some errors in the customer interface being shown with the agent interface's header navigation. Thanks for reporting/hints to Tim Püttmanns, maxence.
- 2023-09-19 Fixed mixed up content types for article body and signature in generic interface operations TicketCreate and TicketUpdate.
- 2023-08-29 Updated maximum length of generic agent job database fields and their input fields in dialog AdminGenericAgent to prevent errors storing values too long for the database. [#474](https://github.com/znuny/Znuny/issues/474)
- 2023-08-23 Added parameter to enforce account selection for the Microsoft OAuth2 template.

# 6.5.4 2023-08-23
- 2023-08-22 Fixed - Option 'Customer User' should have no breadcrumb and should not show actions.
- 2023-08-17 Updated JS libraries jQuery, jQuery UI and Moment.js.
Expand Down
6 changes: 3 additions & 3 deletions Kernel/Config/Files/XML/Framework.xml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
<Description Translatable="1">Defines the URL rich text editor path.</Description>
<Navigation>Frontend::Base</Navigation>
<Value>
<Item ValueType="String" ValueRegex="">&lt;OTRS_CONFIG_Frontend::WebPath&gt;js/thirdparty/ckeditor-4.22.1/</Item>
<Item ValueType="String" ValueRegex="">&lt;OTRS_CONFIG_Frontend::WebPath&gt;js/thirdparty/ckeditor-4.22.1-min/</Item>
</Value>
</Setting>
<Setting Name="Frontend::RichText::DefaultCSS" Required="1" Valid="1">
Expand Down Expand Up @@ -7769,7 +7769,7 @@ via the Preferences button after logging in.
<Navigation>Frontend::Base::Loader</Navigation>
<Value>
<Array>
<Item>thirdparty/ckeditor-4.22.1/ckeditor.js</Item>
<Item>thirdparty/ckeditor-4.22.1-min/ckeditor.js</Item>
</Array>
</Value>
</Setting>
Expand Down Expand Up @@ -7874,7 +7874,7 @@ via the Preferences button after logging in.
<Navigation>Frontend::Base::Loader</Navigation>
<Value>
<Array>
<Item>thirdparty/ckeditor-4.22.1/ckeditor.js</Item>
<Item>thirdparty/ckeditor-4.22.1-min/ckeditor.js</Item>
</Array>
</Value>
</Setting>
Expand Down
4 changes: 3 additions & 1 deletion Kernel/Config/Files/XML/ProcessManagement.xml
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@
<Item Key="Lock">(* required) unlock|lock</Item>
<Item Key="Owner">(* required) someuserlogin</Item>
<Item Key="PendingTime">2021-09-01 09:00:00</Item>
<Item Key="PendingTimeDiff">123</Item>
<Item Key="PendingTimeDiff">123 (diff in seconds)</Item>
<Item Key="Priority">(* required) 3 normal</Item>
<Item Key="Queue">(* required) Raw</Item>
<Item Key="Responsible">someuserlogin</Item>
Expand Down Expand Up @@ -987,6 +987,8 @@
<Item Key="TicketStateSet">
<Hash>
<Item Key="State">(* required) open</Item>
<Item Key="PendingTime">2021-09-01 09:00:00</Item>
<Item Key="PendingTimeDiff">123 (diff in seconds)</Item>
<Item Key="UserID">1 (use to overwrite the logged user)</Item>
</Hash>
</Item>
Expand Down
9 changes: 9 additions & 0 deletions Kernel/Config/Files/XML/Znuny.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3404,4 +3404,13 @@
</Hash>
</Value>
</Setting>
<!-- PublicModule Template -->
<Setting Name="Loader::Module::PublicModule###000-PublicModuleTemplate" Required="0" Valid="0">
<Description Translatable="1">Loader module registration for the public interface.</Description>
<Navigation>Frontend::Public::ModuleRegistration</Navigation>
<Value>
<Hash>
</Hash>
</Value>
</Setting>
</otrs_config>
53 changes: 34 additions & 19 deletions Kernel/GenericInterface/Invoker/Ticket/Generic.pm
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,15 @@ sub PrepareRequest {
my $GetAllArticleAttachments = $Param{Data}->{GetAllArticleAttachments}
|| $Param{Webservice}->{Config}->{Requester}->{Invoker}->{$InvokerName}->{GetAllArticleAttachments};

my %Ticket = $TicketObject->TicketDeepGet(
TicketID => $Param{Data}->{TicketID},
ArticleID => $Param{Data}->{ArticleID},
GetAllArticleAttachments => $GetAllArticleAttachments,
UserID => 1,
);
my %Ticket;
if ( $Param{Data}->{TicketID} ) {
%Ticket = $TicketObject->TicketDeepGet(
TicketID => $Param{Data}->{TicketID},
ArticleID => $Param{Data}->{ArticleID},
GetAllArticleAttachments => $GetAllArticleAttachments,
UserID => 1,
);
}

# Remove configured fields.
my $OmittedFields = $ConfigObject->Get(
Expand Down Expand Up @@ -168,19 +171,6 @@ sub HandleResponse {
my $TicketObject = $Kernel::OM->Get('Kernel::System::Ticket');
my $ArticleObject = $Kernel::OM->Get('Kernel::System::Ticket::Article');

# if there was an error in the response, forward it
if ( !$Param{ResponseSuccess} ) {
if ( !IsStringWithData( $Param{ResponseErrorMessage} ) ) {
return $Self->{DebuggerObject}->Error(
Summary => 'Got response error, but no response error message!',
);
}
return {
Success => 0,
ErrorMessage => $Param{ResponseErrorMessage},
};
}

# Pass through response if no hash
if ( !IsHashRefWithData( $Param{Data} ) ) {
return {
Expand All @@ -189,6 +179,7 @@ sub HandleResponse {
};
}

# Set data and execute functions even in error case.
RESULT:
for my $Key ( sort keys %{ $Param{Data} } ) {

Expand Down Expand Up @@ -398,10 +389,34 @@ sub HandleResponse {
);
}

# if there was an error in the response, forward it
if ( !$Param{ResponseSuccess} ) {
if ( !IsStringWithData( $Param{ResponseErrorMessage} ) ) {
return $Self->{DebuggerObject}->Error(
Summary => 'Got response error, but no response error message!',
);
}
return {
Success => 0,
ErrorMessage => $Param{ResponseErrorMessage},
};
}

return {
Success => 1,
Data => $Param{Data},
};
}

sub HandleError {
my ( $Self, %Param ) = @_;

# Execute HandleResponse with error data because it might contain further tags
# to set data or execute functions (see HandleResponse above) in error case.
return $Self->HandleResponse(
ResponseSuccess => 0,
Data => $Param{Data},
);
}

1;
16 changes: 7 additions & 9 deletions Kernel/Language/ar_SA.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1548,9 +1548,11 @@ sub Data {
'Date' => 'بيانات',
'List of Files' => '',
'Permission' => '',
'Size' => 'الحجم',
'Problem' => '',
'OK' => '',
'Download file from package!' => '',
'Required' => 'مطلوب',
'Size' => 'الحجم',
'Primary Key' => '',
'Auto Increment' => '',
'SQL' => '',
Expand Down Expand Up @@ -2896,8 +2898,8 @@ sub Data {
'From assigned Customer IDs' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/CustomerError.tt
'Error' => 'خطأ',
'An Error Occurred' => '',
'Error Details' => '',
'Traceback' => 'طباعة',

# TT Template: Kernel/Output/HTML/Templates/Standard/CustomerFooter.tt
Expand Down Expand Up @@ -2936,6 +2938,7 @@ sub Data {
'Request New Password' => '',
'Your User Name' => '',
'A new password will be sent to your email address.' => '',
'Back to login' => '',
'Create Account' => 'إنشاء حساب جديد',
'Please fill out this form to receive login credentials.' => '',
'How we should address you' => '',
Expand Down Expand Up @@ -2999,6 +3002,7 @@ sub Data {
'Ticket fields' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/Error.tt
'Error Details' => '',
'Expand' => 'توسيع',

# TT Template: Kernel/Output/HTML/Templates/Standard/FormElements/AttachmentList.tt
Expand Down Expand Up @@ -3074,7 +3078,6 @@ sub Data {

# TT Template: Kernel/Output/HTML/Templates/Standard/InstallerDBResult.tt
'Done' => 'تم بنجاح',
'Error' => 'خطأ',
'Database setup successful!' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/InstallerDBStart.tt
Expand Down Expand Up @@ -3144,7 +3147,6 @@ sub Data {

# TT Template: Kernel/Output/HTML/Templates/Standard/Login.tt
'Lost your password?' => 'فقدت كلمة المرور؟',
'Back to login' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/MetaFloater.tt
'Scale preview content' => '',
Expand Down Expand Up @@ -3857,7 +3859,6 @@ sub Data {
'No such file %s in package!' => '',
'No such file %s in local file system!' => '',
'Can\'t read %s!' => '',
'File is OK' => '',
'Package has locally modified files.' => '',
'Not Started' => '',
'Updated' => '',
Expand Down Expand Up @@ -5335,10 +5336,6 @@ sub Data {
'Concurrent Users Details' => '',
'Concurrent Users' => '',

# Perl Module: Kernel/System/SupportDataCollector/PluginBase.pm
'OK' => '',
'Problem' => '',

# Perl Module: Kernel/System/SysConfig.pm
'Setting %s does not exists!' => '',
'Setting %s is not locked to this user!' => '',
Expand Down Expand Up @@ -7853,6 +7850,7 @@ sub Data {
'',
'Shows the title field in the NoteToLinkedTicket screen of the agent interface.' =>
'',
'Loader module registration for the public interface.' => '',

# XML Definition: scripts/database/initial_insert.xml
'invalid-temporarily' => 'غير فعال مؤقتاً',
Expand Down
Loading

0 comments on commit 038d154

Please sign in to comment.