Skip to content

Commit

Permalink
chore: remove patch and update user_expire module
Browse files Browse the repository at this point in the history
Refs: OPS-11223
  • Loading branch information
lazysoundsystem committed Jan 16, 2025
1 parent 9d8cfc4 commit bc781cc
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 197 deletions.
179 changes: 0 additions & 179 deletions PATCHES/user_expire/customize-notification-email.patch

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
"drupal/token": "^1.9",
"drupal/token_filter": "^2.0",
"drupal/tome": "^1.4",
"drupal/user_expire": "^1.0",
"drupal/user_expire": "^2",
"drupal/username_enumeration_prevention": "^1.3",
"drupal/userprotect": "^1.1",
"drupal/video_embed_field": "^2.4",
Expand Down
40 changes: 24 additions & 16 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion composer.patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"Add missing schema - 3459880": "https://www.drupal.org/files/issues/2024-07-08/compat-10.3-missing-schema.patch"
},
"drupal/user_expire": {
"Allow the notification email to be customised": "PATCHES/user_expire/customize-notification-email.patch",
"Reset expiration when user is reactivated": "PATCHES/user_expire/reset-expiration-on-reactivation.patch"
},
"drupal/username_enumeration_prevention": {
Expand Down
9 changes: 9 additions & 0 deletions config/user_expire.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,12 @@ frequency: 432000
offset: 604800
user_expire_roles:
authenticated: 15552000
send_expiration_warnings: true
expiration_warning_mail:
subject: "[site:name]: Account expiration warning"
body: |-
Hello [user:display-name]
Because you have not logged in recently, your account at [site:name] will be blocked in the near future. If you still use this site, log in now [site:login-url] to prevent your account being blocked.
-- [site:name] team

0 comments on commit bc781cc

Please sign in to comment.