Skip to content
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

Jump to bottom

Recipient placeholder in email wrapper #1297

Merged
merged 14 commits into from Aug 26, 2022
Merged

Recipient placeholder in email wrapper #1297

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5e3e63f
Added more placeholder to email wrapper, changed the way of how to se…
Aug 13, 2022
d76dc49
Cleanup and removed not needed settings due to this changes.
marchorst Aug 14, 2022
5b22993
Revert settings
marchorst Aug 18, 2022
c24ae19
Added old logic and extend to check of bulk/single setting
marchorst Aug 18, 2022
421ecbd
Extended documentation
marchorst Aug 19, 2022
a76239f
// WIP added Language
marchorst Aug 19, 2022
adf0f6a
Only show mail options for bcc/to when SendingMode is BULK
marchorst Aug 19, 2022
52745ee
Added default preferences
marchorst Aug 19, 2022
4d7b8a0
Changed and added language
marchorst Aug 19, 2022
2382197
Fixed methods due to change of signature in addRecipient
marchorst Aug 21, 2022
f853786
SendCopyMail restored because it was deleted unintentionally
marchorst Aug 21, 2022
24a2096
Changed show/hide to js handled
marchorst Aug 21, 2022
100e510
Changed Name to LastName in several variables
marchorst Aug 25, 2022
a3845a0
Updated texts and translations
marchorst Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 37 additions & 23 deletions adm_program/modules/preferences/preferences.php
View file
Open in desktop
Expand Up @@ -513,6 +513,24 @@ function getPreferencePanel($group, $id, $parentId, $title, $icon, $body)
$formValues['mail_sendmail_name'],
array('maxLength' => 50, 'helpTextIdInline' => 'SYS_SENDER_NAME_DESC')
);

// Add js to show or hide mail options
$page->addJavascript('
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if this is the best place to add it or if there is any "default" js how to handle things like this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

until now we have no default to handle things like this. But a default could be useful :-)

$(function(){
var fieldsToHideOnSingleMode = "#mail_recipients_with_roles_group, #mail_into_to_group, #mail_number_recipients_group";
if($("#mail_sending_mode").val() == 1) {
$(fieldsToHideOnSingleMode).hide();
}
$("#mail_sending_mode").on("change", function() {
if($("#mail_sending_mode").val() == 1) {
$(fieldsToHideOnSingleMode).hide();
} else {
$(fieldsToHideOnSingleMode).show();
}
});
});
');

$selectBoxEntries = array(0 => $gL10n->get('SYS_MAIL_BULK'), 1 => $gL10n->get('SYS_MAIL_SINGLE'));
$formEmailDispatch->addSelectBox(
'mail_sending_mode',
Expand All @@ -521,30 +539,26 @@ function getPreferencePanel($group, $id, $parentId, $title, $icon, $body)
array('defaultValue' => $formValues['mail_sending_mode'], 'showContextDependentFirstEntry' => false, 'helpTextIdInline' => 'SYS_MAIL_SENDING_MODE_DESC')
);

$sendingMode = $gSettingsManager->getInt('mail_sending_mode');
$selectBoxEntries = array(0 => $gL10n->get('SYS_HIDDEN'), 1 => $gL10n->get('SYS_SENDER'), 2 => $gL10n->get('SYS_ADMINISTRATOR'));
$formEmailDispatch->addSelectBox(
'mail_recipients_with_roles',
$gL10n->get('SYS_MULTIPLE_RECIPIENTS'),
$selectBoxEntries,
array('defaultValue' => $formValues['mail_recipients_with_roles'], 'showContextDependentFirstEntry' => false, 'helpTextIdInline' => 'SYS_MULTIPLE_RECIPIENTS_DESC')
);
$formEmailDispatch->addCheckbox(
'mail_into_to',
$gL10n->get('SYS_INTO_TO'),
(bool) $formValues['mail_into_to'],
array('helpTextIdInline' => 'SYS_INTO_TO_DESC')
);
$formEmailDispatch->addInput(
'mail_number_recipients',
$gL10n->get('SYS_NUMBER_RECIPIENTS'),
$formValues['mail_number_recipients'],
array('type' => 'number', 'minNumber' => 0, 'maxNumber' => 9999, 'step' => 1, 'helpTextIdInline' => 'SYS_NUMBER_RECIPIENTS_DESC')
);

// Only show this options if SendingMode = 0 / SYS_MAIL_BULK
if($sendingMode == 0) {
$selectBoxEntries = array(0 => $gL10n->get('SYS_HIDDEN'), 1 => $gL10n->get('SYS_SENDER'), 2 => $gL10n->get('SYS_ADMINISTRATOR'));
$formEmailDispatch->addSelectBox(
'mail_recipients_with_roles',
$gL10n->get('SYS_MULTIPLE_RECIPIENTS'),
$selectBoxEntries,
array('defaultValue' => $formValues['mail_recipients_with_roles'], 'showContextDependentFirstEntry' => false, 'helpTextIdInline' => 'SYS_MULTIPLE_RECIPIENTS_DESC')
);
$formEmailDispatch->addCheckbox(
'mail_into_to',
$gL10n->get('SYS_INTO_TO'),
(bool) $formValues['mail_into_to'],
array('helpTextIdInline' => 'SYS_INTO_TO_DESC')
);
$formEmailDispatch->addInput(
'mail_number_recipients',
$gL10n->get('SYS_NUMBER_RECIPIENTS'),
$formValues['mail_number_recipients'],
array('type' => 'number', 'minNumber' => 0, 'maxNumber' => 9999, 'step' => 1, 'helpTextIdInline' => 'SYS_NUMBER_RECIPIENTS_DESC')
);
}
$selectBoxEntries = array('iso-8859-1' => $gL10n->get('SYS_ISO_8859_1'), 'utf-8' => $gL10n->get('SYS_UTF8'));
$formEmailDispatch->addSelectBox(
'mail_character_encoding',
Expand Down