moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44257-master' of git://github.com/lameze/moodle

Browse source
This commit is contained in:
Damyon Wiese 2014-09-16 14:58:48 +08:00
commit c4006c851a
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/moodlelib.php
View file

@ -5888,7 +5888,16 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '',
} else { } else {
require_once($CFG->libdir.'/filelib.php'); require_once($CFG->libdir.'/filelib.php');
$mimetype = mimeinfo('type', $attachname); $mimetype = mimeinfo('type', $attachname);
$mail->addAttachment($CFG->dataroot .'/'. $attachment, $attachname, 'base64', $mimetype);
$attachmentpath = $attachment;
// If the attachment is a full path to a file in the tempdir, use it as is,
// otherwise assume it is a relative path from the dataroot (for backwards compatibility reasons).
if (strpos($attachmentpath, $CFG->tempdir) !== 0) {
$attachmentpath = $CFG->dataroot . '/' . $attachmentpath;
}
$mail->addAttachment($attachmentpath, $attachname, 'base64', $mimetype);
} }
} }

5
lib/tests/messagelib_test.php
View file

@ -760,6 +760,11 @@ class core_messagelib_testcase extends advanced_testcase {
$email = reset($emails); $email = reset($emails);
$this->assertTrue(strpos($email->body, 'Content-Disposition: attachment;') !== false); $this->assertTrue(strpos($email->body, 'Content-Disposition: attachment;') !== false);
$this->assertTrue(strpos($email->body, 'emailtest.txt') !== false); $this->assertTrue(strpos($email->body, 'emailtest.txt') !== false);
// Check if the stored file still exists after remove the temporary attachment.
$storedfileexists = $fs->file_exists($filerecord['contextid'], $filerecord['component'], $filerecord['filearea'],
$filerecord['itemid'], $filerecord['filepath'], $filerecord['filename']);
$this->assertTrue($storedfileexists);
} }
/** /**

7
message/output/email/message_output_email.php
View file

@ -77,8 +77,7 @@ class message_output_email extends message_output {
} else { } else {
// Copy attachment file to a temporary directory and get the file path. // Copy attachment file to a temporary directory and get the file path.
$attachment = $eventdata->attachment->copy_content_to_temp(); $attachment = $eventdata->attachment->copy_content_to_temp();
// Function email_to_user() adds $CFG->dataroot to file path, so removing it here.
$attachment = str_replace($CFG->dataroot, '', $attachment);
// Get attachment file name. // Get attachment file name.
$attachname = clean_filename($eventdata->attachname); $attachname = clean_filename($eventdata->attachname);
} }
@ -88,7 +87,9 @@ class message_output_email extends message_output {
$eventdata->fullmessagehtml, $attachment, $attachname); $eventdata->fullmessagehtml, $attachment, $attachname);
// Remove an attachment file if any. // Remove an attachment file if any.
@unlink($attachment); if (!empty($attachment) && file_exists($attachment)) {
unlink($attachment);
}
return $result; return $result;
} }