Skip to content

Commit

Permalink
Accepted CodePolicy suggestions.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanhaerter committed Mar 27, 2024
1 parent 7cb428d commit 1db1f36
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 11 deletions.
4 changes: 4 additions & 0 deletions Custom/Kernel/System/MailAccount.pm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ sub new {
return $Self;
}

# Rother OSS / MailAccount-OAuth2
=for stopwords OSS EO
# EO MailAccount-OAuth2
=head2 MailAccountAdd()
adds a new mail account
Expand Down
10 changes: 7 additions & 3 deletions Kernel/Language/de_MailAccountOAuth2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# OTOBO is a web-based ticketing system for service organisations.
# --
# Copyright (C) 2019–2021 Efflux GmbH, https://efflux.de/
# Copyright (C) 2019-2021 Rother OSS GmbH, https://otobo.de/
# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.de/
# --
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand All @@ -25,10 +25,14 @@ sub Data {

# Template: AdminMailAccount
$Self->{Translation}->{'Profiles'} = 'Profile';
$Self->{Translation}->{'Profiles can be specified in the system configuration under the setting "OAuth2::MailAccount::Profiles".'} = 'Profile können in der Systemkonfiguration unter der Einstellung "OAuth2::MailAccount::Profiles" festgelegt werden.';
$Self->{Translation}->{'Profiles can be specified in the system configuration under the setting "OAuth2::MailAccount::Profiles".'}
= 'Profile können in der Systemkonfiguration unter der Einstellung "OAuth2::MailAccount::Profiles" festgelegt werden.';

# SysConfig
$Self->{Translation}->{'Configure custom OAuth 2 application profiles. "Name" should be unique and will be displayed on the Mail Account Management screen. "ProviderName" can be "MicrosoftAzure", "GoogleWorkspace" or a custom provider like "Custom1" (see OAuth2::MailAccount::Providers).'} = 'Konfiguration von OAuth 2 Anwendungsprofilen. "Name" wird in der E-Mail-Kontenverwaltung angezeigt und sollte eindeutig sein. "ProviderName" kann "MicrosoftAzure", "GoogleWorkspace" oder ein benutzerdefinierter Anbieter wie "Custom1" sein (siehe OAuth2::MailAccount::Providers).';
$Self->{Translation}->{
'Configure custom OAuth 2 application profiles. "Name" should be unique and will be displayed on the Mail Account Management screen. "ProviderName" can be "MicrosoftAzure", "GoogleWorkspace" or a custom provider like "Custom1" (see OAuth2::MailAccount::Providers).'
}
= 'Konfiguration von OAuth 2 Anwendungsprofilen. "Name" wird in der E-Mail-Kontenverwaltung angezeigt und sollte eindeutig sein. "ProviderName" kann "MicrosoftAzure", "GoogleWorkspace" oder ein benutzerdefinierter Anbieter wie "Custom1" sein (siehe OAuth2::MailAccount::Providers).';
$Self->{Translation}->{'Custom authorization server settings.'} = 'Benutzerdefinierte Einstellungen für Autorisierungsserver.';
}

Expand Down
10 changes: 5 additions & 5 deletions Kernel/System/MailAccount/IMAPOAuth2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# --
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
# Copyright (C) 2019–2021 Efflux GmbH, https://efflux.de/
# Copyright (C) 2019-2021 Rother OSS GmbH, https://otobo.de/
# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.de/
# --
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down Expand Up @@ -69,10 +69,10 @@ sub Connect {

# connect to host
my $IMAPObject = Mail::IMAPClient->new(
Server => $Param{Host},
Ssl => 1,
Debug => $Param{Debug},
Uid => 1,
Server => $Param{Host},
Ssl => 1,
Debug => $Param{Debug},
Uid => 1,

# see bug#8791: needed for some Microsoft Exchange backends
Ignoresizeerrors => 1,
Expand Down
2 changes: 1 addition & 1 deletion Kernel/System/MailAccount/POP3OAuth2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# --
# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
# Copyright (C) 2019–2021 Efflux GmbH, https://efflux.de/
# Copyright (C) 2019-2021 Rother OSS GmbH, https://otobo.de/
# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.de/
# --
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
2 changes: 1 addition & 1 deletion Kernel/System/OAuth2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# OTOBO is a web-based ticketing system for service organisations.
# --
# Copyright (C) 2019–2021 Efflux GmbH, https://efflux.de/
# Copyright (C) 2019-2021 Rother OSS GmbH, https://otobo.de/
# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.de/
# --
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down
4 changes: 3 additions & 1 deletion Kernel/System/OAuth2/MailAccount.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# OTOBO is a web-based ticketing system for service organisations.
# --
# Copyright (C) 2019–2021 Efflux GmbH, https://efflux.de/
# Copyright (C) 2019-2021 Rother OSS GmbH, https://otobo.de/
# Copyright (C) 2019-2024 Rother OSS GmbH, https://otobo.de/
# --
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Expand Down Expand Up @@ -277,6 +277,8 @@ sub GetAccessToken {
return $Response{access_token};
}

=for stopwords contoso.com
=head2 GetProfiles()
Return an array ref with profiles that can be selected in the mail account creation.
Expand Down

0 comments on commit 1db1f36

Please sign in to comment.