Loading...

XML

Word

Printable

Type: Bug
Resolution: Fixed
Priority: Minor
Fix Version/s: 4.4.5, 4.5.1
Affects Version/s: 3.4.5, 3.5.1, 3.6, 4.4.5, 4.5.1
Component/s: Enrolments
Labels:
- ci
- triaged

Affected Branches:
MOODLE_34_STABLE, MOODLE_35_STABLE, MOODLE_36_STABLE, MOODLE_404_STABLE, MOODLE_405_STABLE
Fixed Branches:
MOODLE_404_STABLE, MOODLE_405_STABLE
Pull from Repository:
https://github.com/paulholden/moodle
Pull 4.4 Branch:
~~MDL-63264~~-404
Pull 4.4 Diff URL:
https://github.com/moodle/moodle/compare/MOODLE_404_STABLE...paulholden:MDL-63264-404
Pull 4.5 Branch:
~~MDL-63264~~-405
Pull 4.5 Diff URL:
https://github.com/moodle/moodle/compare/MOODLE_405_STABLE...paulholden:MDL-63264-405
Pull Main Branch:
~~MDL-63264~~
Pull Main Diff URL:
https://github.com/moodle/moodle/compare/main...paulholden:MDL-63264
Testing Instructions:
Hide

Note: You can setup Mailpit to testing this one easier

Log in as admin

Navigate to Server > Email > Outgoing mail configuration

No-reply address: noreply@example.com

Allowed email domains: example.com

Navigate to profile

Press Edit profile

Email address: admin@example.com

Email visibility: Hidden

Create two users

User 1

User 2

Create a course

Ensure you are a teacher on the course

Manually enrol User 1 on the course

Confirm there are no PHP warnings in your server error log

Check email

Confirm welcome message to User 1 is from address: noreply@example.com

Navigate to profile

Press Edit profile

Email visibility: Visible to everyone

Navigate back to course

Manually enrol User 2 on the course

Confirm there are no PHP warnings in your server error log

Confirm welcome message to User 2 is from address: admin@example.com
Show
Note: You can setup Mailpit to testing this one easier Log in as admin Navigate to Server > Email > Outgoing mail configuration No-reply address: noreply@example.com Allowed email domains: example.com Navigate to profile Press Edit profile Email address: admin@example.com Email visibility: Hidden Create two users User 1 User 2 Create a course Ensure you are a teacher on the course Manually enrol User 1 on the course Confirm there are no PHP warnings in your server error log Check email Confirm welcome message to User 1 is from address: noreply@example.com Navigate to profile Press Edit profile Email visibility: Visible to everyone Navigate back to course Manually enrol User 2 on the course Confirm there are no PHP warnings in your server error log Confirm welcome message to User 2 is from address: admin@example.com
Pre-check results:
Hide

Code verified against automated checks.

Checked ~~MDL-63264~~ using repository: https://github.com/paulholden/moodle

MOODLE_404_STABLE (0 errors / 0 warnings) [branch: MDL-63264-404 | CI Job]

MOODLE_405_STABLE (0 errors / 0 warnings) [branch: MDL-63264-405 | CI Job]

main (0 errors / 0 warnings) [branch: MDL-63264 | CI Job]

_{More information about this report}

Built on: Wed 27 Nov 2024 06:08:02 PM UTC
Show
Code verified against automated checks. Checked MDL-63264 using repository: https://github.com/paulholden/moodle MOODLE_404_STABLE (0 errors / 0 warnings) [branch: MDL-63264-404 | CI Job ] MOODLE_405_STABLE (0 errors / 0 warnings) [branch: MDL-63264-405 | CI Job ] main (0 errors / 0 warnings) [branch: MDL-63264 | CI Job ] More information about this report Built on: Wed 27 Nov 2024 06:08:02 PM UTC
Automated test results:
Hide

Launching automatic jobs for branch ~~MDL-63264~~-404

https://ci.moodle.org/view/Testing/job/DEV.02%20-%20Developer-requested%20PHPUnit/17549/ PHPUnit (sqlsrv)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59751/ Behat (NonJS - boost and classic)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59752/ Behat (Firefox - boost)

Launching automatic jobs for branch ~~MDL-63264~~-405

https://ci.moodle.org/view/Testing/job/DEV.02%20-%20Developer-requested%20PHPUnit/17550/ PHPUnit (sqlsrv)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59753/ Behat (NonJS - boost and classic)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59754/ Behat (Firefox - boost)

Launching automatic jobs for branch ~~MDL-63264~~

https://ci.moodle.org/view/Testing/job/DEV.02%20-%20Developer-requested%20PHPUnit/17551/ PHPUnit (sqlsrv)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59755/ Behat (NonJS - boost and classic)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59756/ Behat (Firefox - boost)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59757/ Behat (Firefox - classic)

https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59758/ App tests (stable app version)

Built on: Wed Nov 27 08:27:13 UTC 2024
Show
Launching automatic jobs for branch MDL-63264 -404 https://ci.moodle.org/view/Testing/job/DEV.02%20-%20Developer-requested%20PHPUnit/17549/ PHPUnit (sqlsrv) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59751/ Behat (NonJS - boost and classic) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59752/ Behat (Firefox - boost) Launching automatic jobs for branch MDL-63264 -405 https://ci.moodle.org/view/Testing/job/DEV.02%20-%20Developer-requested%20PHPUnit/17550/ PHPUnit (sqlsrv) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59753/ Behat (NonJS - boost and classic) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59754/ Behat (Firefox - boost) Launching automatic jobs for branch MDL-63264 https://ci.moodle.org/view/Testing/job/DEV.02%20-%20Developer-requested%20PHPUnit/17551/ PHPUnit (sqlsrv) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59755/ Behat (NonJS - boost and classic) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59756/ Behat (Firefox - boost) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59757/ Behat (Firefox - classic) https://ci.moodle.org/view/Testing/job/DEV.01%20-%20Developer-requested%20Behat/59758/ App tests (stable app version) Built on: Wed Nov 27 08:27:13 UTC 2024

Reproduce

Create a course in Moodle and enroll a teacher
Make sure teacher's email address is in 'Allowed email domains' of Outgoing Mail Configuration
Enable the Self-enrollment method
Ensure the Send course welcome message is set to Course Contact
Have another user self enroll in the course
Course Welcome email includes contact name, but is sent from no-reply address.

Issue

The course welcome messages is not coming from the email address of the course contact, even when specified in the settings and the contact's preferences are set to "Allow everyone to see my email address" and the contact's email is in the Allowed email domains.

Cause

The function can_send_from_real_email_address relies on checking the maildisplay property of the $from parameter. Without this property present, the following warnings are present in the log:

[Tue Nov 12 21:22:20.916008 2024] [php:warn] [pid 35:tid 35] [client 172.18.0.1:47330] PHP Warning:  Undefined property: stdClass::$maildisplay in /var/www/html/lib/moodlelib.php on line 5959, referer: http://localhost:8000/user/index.php?id=2

[Tue Nov 12 21:22:20.916037 2024] [php:warn] [pid 35:tid 35] [client 172.18.0.1:47330] PHP Warning:  Undefined property: stdClass::$maildisplay in /var/www/html/lib/moodlelib.php on line 5960, referer: http://localhost:8000/user/index.php?id=2

In the self enrollment plugin (enrol/self/lib.php), the get_welcome_email_contact does not include this property in the returned user object, so the check always returns false.

Solution

Add the maildisplay property to the returned contact object of get_welcome_email_contact. This will allow the from email address of the course contact to be used if their preference is set to "Allow everyone to see my email address."

See public repo:

https://github.com/zrisha/moodle/tree/MDL-63264-master-fix-welcome-email

- - Sort By Name
  - Sort By Date
  - Ascending
  - Descending
  - Thumbnails
  - List
  - Download All

Screenshot 2024-11-26 at 21-16-57 Mailpit - localhost.png
32 kB
27/Nov/24 4:17 AM
(1) 9 Passed -- (Main)MDL-63264.png
81 kB
28/Nov/24 5:09 PM
(1) 17 Passed -- (Main)MDL-63264.png
51 kB
28/Nov/24 5:09 PM
(1) 16 Passed -- (Main)MDL-63264.png
83 kB
28/Nov/24 5:09 PM
(1) 11 Passed -- (Main)MDL-63264.png
47 kB
28/Nov/24 5:09 PM

has been marked as being related by

MDL-4188 Send course welcome message for manual and self enrolments

Closed

Assignee:: Paul Holden

Reporter:: zrisha

Peer reviewer:: Sara Arjona (@sarjona)

Integrator:: Huong Nguyen

Tester:: Kim Jared Lucas

Participants:: CiBoT, Huong Nguyen, Kim Jared Lucas, Matt Porritt, Paul Holden, Sara Arjona (@sarjona), zrisha

Votes:: 0 Vote for this issue

Watchers:: 7 Start watching this issue

Created:: 31/Aug/18 4:55 AM

Updated:: 29/Nov/24 8:29 PM

Resolved:: 29/Nov/24 8:29 PM

Estimated:

Remaining:

Logged:

2h 41m

Details

Description

Attachments

Attachments

Issue Links

Activity

People

Dates

Time Tracking

Clockify