Skip to content

fix(mailcollector): ask for the passwd only if one exists #21571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 11.0/bugfixes
Choose a base branch
from
+10 −5
Open

fix(mailcollector): ask for the passwd only if one exists #21571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ajax/mailcollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@

if (!empty($input['mail_server'])) {
$input["host"] = Toolbox::constructMailServerConfig($input);
if (!isset($input['passwd'])) {
// In some case (like oauth imap) provide password is not possible
// So, ask for password only if there is one stored in database
if (!isset($input['passwd']) && !empty($mailcollector->fields['passwd'])) {
$exception = new AccessDeniedHttpException();
$exception->setMessageToDisplay(__('Password is required to list mail folders.'));
throw $exception;
Expand Down
11 changes: 7 additions & 4 deletions templates/pages/setup/mailcollector/setup_form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,13 @@
// Force empty value for server_mailbox
data += '&server_mailbox=';

// Ask for password if missing
if ($(this).closest('form').find('input[name=\"passwd\"]').val() == '') {
var passwd = prompt(__('Please enter password to list folders'));
data += '&passwd=' + encodeURIComponent(passwd);
// In some case (like oauth imap) provide password is not possible
// So, ask for password only if there is one stored in database
var passwdField = $(this).closest('form').find('input[name="passwd"]');
var hasStoredPassword = {{ (item.fields['passwd'] is defined and item.fields['passwd']) ? 'true' : 'false' }};
if (hasStoredPassword && passwdField.val() == '') {
var passwd = prompt(__('Please enter password to list folders'));
data += '&passwd=' + encodeURIComponent(passwd);
}

glpi_ajax_dialog({
Expand Down
Loading