Skip to content

pull request to add option for disabling attachments when sending files via clampmail #61

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
moodleismylms wants to merge 7 commits into
base: main
Choose a base branch
from
Open

pull request to add option for disabling attachments when sending files via clampmail #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
919a3a5
Update settings.php
moodleismylms Jan 18, 2023
ebc8714
update lan file to include attachment option
moodleismylms Jan 18, 2023
90ef28a
add check whether admin setting attachfile is enabled and dependent o…
moodleismylms Jan 18, 2023
5370826
fix line indentation and remove too many whitespaces
moodleismylms Jan 22, 2023
bde419f
fix line indentation error
moodleismylms Jan 22, 2023
5a7970a
update line indentation
moodleismylms Jan 24, 2023
3620383
update line indentation in line 246
moodleismylms Jan 31, 2023
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
14 changes: 9 additions & 5 deletions classes/email_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,15 @@ public function definition() {
$mform->addElement('static', 'selectors', '', \html_writer::table($table));
$mform->setType('selectors', PARAM_RAW);

$mform->addElement('filemanager', 'attachments', get_string('attachment', 'block_clampmail'), null,
array(
'areamaxbytes' => get_max_upload_file_size($CFG->maxbytes, $COURSE->maxbytes, get_config('block_clampmail', 'maxbytes'))
));
$mform->setType('attachments', PARAM_FILE);
$attachpossible = get_config('block_clampmail', 'attachfile');

if ($attachpossible) {
$mform->addElement('filemanager', 'attachments', get_string('attachment', 'block_clampmail'), null,
array(
'areamaxbytes' => get_max_upload_file_size($CFG->maxbytes, $COURSE->maxbytes, get_config('block_clampmail', 'maxbytes'))
));
$mform->setType('attachments', PARAM_FILE);
}

$mform->addElement('text', 'subject', get_string('subject', 'block_clampmail'));
$mform->setType('subject', PARAM_TEXT);
Expand Down
2 changes: 2 additions & 0 deletions lang/en/block_clampmail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
$string['alternate_waiting'] = 'Waiting';
$string['alternate'] = 'Alternate emails';
$string['are_you_sure'] = 'Are you sure you want to delete {$a->title}? This action cannot be reversed.';
$string['attachfile_help'] = 'Allow attaching of files to email';
$string['attachfile'] = 'Allow attachements being sent';
$string['attachment'] = 'Attachment(s)';
$string['clampmail:addinstance'] = 'Add a new Quickmail block';
$string['clampmail:allowalternate'] = 'Allows users to add an alternate email for courses.';
Expand Down
7 changes: 7 additions & 0 deletions settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@
)
);

$settings->add(
new admin_setting_configselect('block_clampmail/attachfile',
get_string('attachfile', 'block_clampmail'), get_string('attachfile_help', 'block_clampmail'),
1, $select
)
);

$choices = array();
$choices[NOGROUPS] = get_string('groupsnone', 'group');
$choices[SEPARATEGROUPS] = get_string('groupsseparate', 'group');
Expand Down