Skip to content

Commit 82b790f

Browse files
alikonsandewtrichard67
authored
[5] add2scheduler-privacyconsents (#40553)
* 2task * Update plugins/task/privacyconsent/privacyconsent.xml Co-authored-by: jsanders <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/privacyconsent.xml Co-authored-by: jsanders <[email protected]> * remove plg_system_privacyconsents * Update base.sql * Update base.sql * re-add system privacyconsent * consentexpirationdays * re-add system privacyconsent * move 2 task * update & core plugin * nomore expiration fieldset * redesign * mail * mail_templates * Update libraries/src/Extension/ExtensionHelper.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php Co-authored-by: Richard Fath <[email protected]> * migratePrivacyconsentConfiguration * PrivacyConsent migr * Rename 5.0.0-2023-06-13.sql to 5.0.0-2023-08-03.sql shift * Rename 5.0.0-2023-03-13.sql to 5.0.0-2023-08-03.sql shift * Rename 5.0.0-2023-08-03.sql to 5.0.0-2023-08-23.sql * Rename 5.0.0-2023-08-03.sql to 5.0.0-2023-08-23.sql * userfactory * userfactory * delete mail_template * delete mail_template * Rename 5.0.0-2023-08-23.sql to 5.0.0-2023-08-30.sql * Rename 5.0.0-2023-08-23.sql to 5.0.0-2023-08-30.sql * Deprecate language strings * One more deprecated language string * Do not add task when consent expiration was disabled * Use Registry when using get method later. * My mistake from previous commit * Add missing use statement for my previos commits * Cachetimeout was given in days in the system plugin, and default was 30. * Don't migrate if the system plugin was not found * Single quotes * Remove extra reference assignment for dispatcher argument * Rename 5.0.0-2023-08-30.sql to 5.0.0-2023-09-02.sql * Rename 5.0.0-2023-08-30.sql to 5.0.0-2023-09-02.sql * Fix lastrun default on update * Fix previous conflict resolution * Forgotten fix * Use the right language strings in the form * Fix update SQL scripts missing column value --------- Co-authored-by: jsanders <[email protected]> Co-authored-by: Richard Fath <[email protected]> Co-authored-by: Richard Fath <[email protected]>
1 parent d157efc commit 82b790f

File tree

17 files changed

+523
-336
lines changed

17 files changed

+523
-336
lines changed

administrator/components/com_admin/script.php

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,11 +2346,86 @@ public function postflight($action, $installer)
23462346
return false;
23472347
}
23482348

2349+
if (!$this->migratePrivacyconsentConfiguration()) {
2350+
return false;
2351+
}
2352+
23492353
$this->setGuidedToursUid();
23502354

23512355
return true;
23522356
}
23532357

2358+
/**
2359+
* Migrate privacyconsents system plugin configuration
2360+
*
2361+
* @return boolean True on success
2362+
*
2363+
* @since 5.0.0
2364+
*/
2365+
private function migratePrivacyconsentConfiguration(): bool
2366+
{
2367+
$db = Factory::getDbo();
2368+
2369+
try {
2370+
// Get the PrivacyConsent system plugin's parameters
2371+
$row = $db->setQuery(
2372+
$db->getQuery(true)
2373+
->select($db->quotename('enabled'), $db->quoteName('params'))
2374+
->from($db->quoteName('#__extensions'))
2375+
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
2376+
->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
2377+
->where($db->quoteName('element') . ' = ' . $db->quote('privacyconsent'))
2378+
)->loadObject();
2379+
} catch (Exception $e) {
2380+
echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
2381+
2382+
return false;
2383+
}
2384+
2385+
// If not existing or disbled there is nothing to migrate
2386+
if (!$row || !$row->enabled) {
2387+
return true;
2388+
}
2389+
2390+
$params = new Registry($row->params);
2391+
2392+
// If consent expiration was disbled there is nothing to migrate
2393+
if (!$params->get('enabled', 0)) {
2394+
return true;
2395+
}
2396+
2397+
/** @var SchedulerComponent $component */
2398+
$component = Factory::getApplication()->bootComponent('com_scheduler');
2399+
2400+
/** @var TaskModel $model */
2401+
$model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
2402+
$task = [
2403+
'title' => 'PrivacyConsent',
2404+
'type' => 'privacy.consent',
2405+
'execution_rules' => [
2406+
'rule-type' => 'interval-days',
2407+
'interval-days' => $params->get('cachetimeout', 30),
2408+
'exec-time' => gmdate('H:i', $params->get('lastrun', time())),
2409+
'exec-day' => gmdate('d'),
2410+
],
2411+
'state' => 1,
2412+
'params' => [
2413+
'consentexpiration' => $params->get('consentexpiration', 360),
2414+
'remind' => $params->get('remind', 30),
2415+
],
2416+
];
2417+
2418+
try {
2419+
$model->save($task);
2420+
} catch (Exception $e) {
2421+
echo Text::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br>';
2422+
2423+
return false;
2424+
}
2425+
2426+
return true;
2427+
}
2428+
23542429
/**
23552430
* Migrate TinyMCE editor plugin configuration
23562431
*
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
2+
('plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
23
('plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
34
('plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0);
45

56
INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subject`, `body`, `htmlbody`, `attachments`, `params`) VALUES
7+
('plg_task_privacyconsent.request.reminder', 'plg_task_privacyconsent', '', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
68
('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}');
79

8-
DELETE FROM `#__mail_templates` WHERE `template_id` = 'plg_system_updatenotification.mail';
10+
DELETE FROM `#__mail_templates` WHERE `template_id` IN ('plg_system_privacyconsent.request.reminder', 'plg_system_updatenotification.mail');
11+
912
DELETE FROM `#__postinstall_messages` WHERE `condition_file` = 'site://plugins/system/updatenotification/postinstall/updatecachetime.php';
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
2+
('plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
23
('plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
34
('plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0);
45

56
INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subject", "body", "htmlbody", "attachments", "params") VALUES
7+
('plg_task_privacyconsent.request.reminder', 'plg_task_privacyconsent', '', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
68
('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}');
79

8-
DELETE FROM "#__mail_templates" WHERE "template_id" = 'plg_system_updatenotification.mail';
10+
DELETE FROM "#__mail_templates" WHERE "template_id" IN ('plg_system_privacyconsent.request.reminder', 'plg_system_updatenotification.mail');
11+
912
DELETE FROM "#__postinstall_messages" WHERE "condition_file" = 'site://plugins/system/updatenotification/postinstall/updatecachetime.php';

administrator/language/en-GB/plg_system_privacyconsent.ini

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,11 @@
55

66
PLG_SYSTEM_PRIVACYCONSENT="System - Privacy Consent"
77
PLG_SYSTEM_PRIVACYCONSENT_BODY="<p>The user consented to storing their user information using the IP address <strong>%s</strong></p><p>The user agent string of the user's browser was:<br>%s</p><p>This information was automatically recorded when the user submitted their details on the website and checked the confirm box</p>"
8-
PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed."
9-
PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
108
PLG_SYSTEM_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}'>{username}</a> consented to the privacy policy."
11-
PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_DESC="Number of days after which the privacy consent shall expire."
12-
PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_LABEL="Expiration"
139
PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY="Your Privacy Consent given at {URL} will expire in few days, you can renew the privacy consent for this website.\n\nIn order to do this, you can complete one of the following tasks:\n\n1. Visit the following URL: {TOKENURL}\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: {FORMURL}\nToken: {TOKEN}\n\nPlease note that this token is only valid for this account."
1410
PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT="Privacy Consent at {SITENAME}"
15-
PLG_SYSTEM_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL="Expiration"
1611
PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_DESC="Select the article from the list or create a new one."
1712
PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_LABEL="Privacy Article"
18-
PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration."
19-
PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
2013
PLG_SYSTEM_PRIVACYCONSENT_FIELD_ERROR="Agreement to the site's Privacy Policy is required."
2114
PLG_SYSTEM_PRIVACYCONSENT_FIELD_LABEL="Privacy Policy"
2215
PLG_SYSTEM_PRIVACYCONSENT_FIELD_MENU_ITEM_LABEL="Privacy Menu Item"
@@ -36,7 +29,16 @@ PLG_SYSTEM_PRIVACYCONSENT_OPTION_DO_NOT_AGREE="I do not agree"
3629
PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT="Please confirm that you consent to this website storing your information by agreeing to the privacy policy."
3730
PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed on redirect. If left blank then the default message will be used."
3831
PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
39-
PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent."
40-
PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind"
4132
PLG_SYSTEM_PRIVACYCONSENT_SUBJECT="Privacy Policy"
4233
PLG_SYSTEM_PRIVACYCONSENT_XML_DESCRIPTION="Basic plugin to request user's consent to the site's privacy policy. Existing users who have not consented yet will be redirected on login to update their profile."
34+
35+
; All the following strings are deprecated and will be removed with 6.0
36+
PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed."
37+
PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
38+
PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_DESC="Number of days after which the privacy consent shall expire."
39+
PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_LABEL="Expiration"
40+
PLG_SYSTEM_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL="Expiration"
41+
PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration."
42+
PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
43+
PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent."
44+
PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind"
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
; Joomla! Project
2+
; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
3+
; License GNU General Public License version 2 or later; see LICENSE.txt
4+
; Note : All ini files need to be saved as UTF-8
5+
6+
PLG_TASK_PRIVACYCONSENT="Task - Privacy Consents"
7+
PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_DESC="Number of days after which the privacy consent shall expire."
8+
PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_LABEL="Expiration"
9+
PLG_TASK_PRIVACYCONSENT_INVALIDATE_TITLE ="Expiration of privacy consents"
10+
PLG_TASK_PRIVACYCONSENT_INVALIDATE_DESC ="Manage the expiration of privacy consents"
11+
PLG_TASK_PRIVACYCONSENT_REMIND_DESC="Manage the remind of expiration of privacy consents"
12+
PLG_TASK_PRIVACYCONSENT_REMIND_TITLE="Remind"
13+
PLG_TASK_PRIVACYCONSENT_BODY="<p>The user consented to storing their user information using the IP address <strong>%s</strong></p><p>The user agent string of the user's browser was:<br>%s</p><p>This information was automatically recorded when the user submitted their details on the website and checked the confirm box</p>"
14+
PLG_TASK_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed."
15+
PLG_TASK_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
16+
PLG_TASK_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}'>{username}</a> consented to the privacy policy."
17+
18+
PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_BODY="Your Privacy Consent given at {URL} will expire in few days, you can renew the privacy consent for this website.\n\nIn order to do this, you can complete one of the following tasks:\n\n1. Visit the following URL: {TOKENURL}\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: {FORMURL}\nToken: {TOKEN}\n\nPlease note that this token is only valid for this account."
19+
PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT="Privacy Consent at {SITENAME}"
20+
PLG_TASK_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL="Expiration"
21+
PLG_TASK_PRIVACYCONSENT_FIELD_ARTICLE_DESC="Select the article from the list or create a new one."
22+
PLG_TASK_PRIVACYCONSENT_FIELD_ARTICLE_LABEL="Privacy Article"
23+
PLG_TASK_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration."
24+
PLG_TASK_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
25+
PLG_TASK_PRIVACYCONSENT_FIELD_ERROR="Agreement to the site's Privacy Policy is required."
26+
PLG_TASK_PRIVACYCONSENT_FIELD_LABEL="Privacy Policy"
27+
PLG_TASK_PRIVACYCONSENT_FIELD_MENU_ITEM_LABEL="Privacy Menu Item"
28+
PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_ARTICLE="Article"
29+
PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_LABEL="Privacy Type"
30+
PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_MENU_ITEM="Menu Item"
31+
PLG_TASK_PRIVACYCONSENT_LABEL="Website Privacy"
32+
PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_DESC="Reminder to renew the privacy consent for this website."
33+
PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_TITLE="System - Privacy Consent: Renew Consent"
34+
PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_DEFAULT="By signing up to this website and agreeing to the Privacy Policy you agree to this website storing your information."
35+
PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_DESC="A summary of the site's privacy policy. If left blank then the default message will be used."
36+
PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_LABEL="Short Privacy Policy"
37+
PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE="Privacy consent has expired for %1$s."
38+
PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT="Privacy Consent Expired"
39+
PLG_TASK_PRIVACYCONSENT_OPTION_AGREE="I agree"
40+
PLG_TASK_PRIVACYCONSENT_OPTION_DO_NOT_AGREE="I do not agree"
41+
PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT="Please confirm that you consent to this website storing your information by agreeing to the privacy policy."
42+
PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed on redirect. If left blank then the default message will be used."
43+
PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
44+
PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent."
45+
PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind"
46+
PLG_TASK_PRIVACYCONSENT_SUBJECT="Privacy Policy"
47+
PLG_TASK_PRIVACYCONSENT_XML_DESCRIPTION="Task for remind expired consents and delete expired consents"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
; Joomla! Project
2+
; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
3+
; License GNU General Public License version 2 or later; see LICENSE.txt
4+
; Note : All ini files need to be saved as UTF-8
5+
6+
PLG_TASK_PRIVACYCONSENT="Task - Privacy Consents"
7+
PLG_TASK_PRIVACYCONSENT_XML_DESCRIPTION="Task for remind expired consents and delete expired consents."

installation/sql/mysql/base.sql

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,10 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
366366
(0, 'plg_task_checkfiles', 'plugin', 'checkfiles', 'task', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
367367
(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
368368
(0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
369-
(0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
370-
(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
371-
(0, 'plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
369+
(0, 'plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
370+
(0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
371+
(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
372+
(0, 'plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
372373
(0, 'plg_multifactorauth_totp', 'plugin', 'totp', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 1, 0),
373374
(0, 'plg_multifactorauth_yubikey', 'plugin', 'yubikey', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 2, 0),
374375
(0, 'plg_multifactorauth_webauthn', 'plugin', 'webauthn', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 3, 0),

installation/sql/mysql/supports.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subjec
431431
('com_users.registration.admin.new_notification', 'com_users', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
432432
('com_users.registration.user.admin_activated', 'com_users', '', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
433433
('com_users.registration.admin.verification_request', 'com_users', '', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","email","username","activate"]}'),
434-
('plg_system_privacyconsent.request.reminder', 'plg_system_privacyconsent', '', 'PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
434+
('plg_task_privacyconsent.request.reminder', 'plg_task_privacyconsent', '', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
435435
('com_messages.new_message', 'com_messages', '', 'COM_MESSAGES_NEW_MESSAGE', 'COM_MESSAGES_NEW_MESSAGE_BODY', '', '', '{"tags":["subject","message","fromname","sitename","siteurl","fromemail","toname","toemail"]}'),
436436
('plg_system_tasknotification.failure_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FAILURE_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FAILURE_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title", "exit_code", "exec_data_time", "task_output"]}'),
437437
('plg_system_tasknotification.fatal_recovery_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'),

installation/sql/postgresql/base.sql

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,10 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
372372
(0, 'plg_task_checkfiles', 'plugin', 'checkfiles', 'task', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
373373
(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 0, '', '{}', '', 2, 0),
374374
(0, 'plg_task_requests', 'plugin', 'requests', 'task', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
375-
(0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
376-
(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
377-
(0, 'plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
375+
(0, 'plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
376+
(0, 'plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
377+
(0, 'plg_task_sitestatus', 'plugin', 'sitestatus', 'task', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
378+
(0, 'plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
378379
(0, 'plg_multifactorauth_totp', 'plugin', 'totp', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 1, 0),
379380
(0, 'plg_multifactorauth_yubikey', 'plugin', 'yubikey', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 2, 0),
380381
(0, 'plg_multifactorauth_webauthn', 'plugin', 'webauthn', 'multifactorauth', 0, 1, 1, 0, 1, '', '', '', 3, 0),

0 commit comments

Comments
 (0)