-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
[5] add2scheduler-privacyconsents #40553
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
88 commits
Select commit
Hold shift + click to select a range
b275546
2task
alikon dda25ac
Update plugins/task/privacyconsent/privacyconsent.xml
alikon 3c3c85e
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon c1b9e8c
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 8aef2ee
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon e25641d
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 11d80e8
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon a6eb623
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 56aea53
Update plugins/task/privacyconsent/privacyconsent.xml
alikon 9c3049b
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 0e469a8
Merge branch '5.0-dev' into add2scheduler-privacy
alikon e6d195c
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 26c23cf
remove plg_system_privacyconsents
alikon 066990a
Update base.sql
alikon eb7ca95
Update base.sql
alikon c08ca1a
re-add system privacyconsent
alikon e87782c
consentexpirationdays
alikon 3479301
re-add system privacyconsent
alikon 84c2b07
move 2 task
alikon 6543c14
update & core plugin
alikon 4e7318b
nomore expiration fieldset
alikon 4c862a9
Merge branch '5.0-dev' into add2scheduler-privacy
alikon d3784e9
redesign
alikon c315a2e
Merge branch 'add2scheduler-privacy' of https://github.com/alikon/joo…
alikon ac957e3
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 445aa2c
mail
alikon bb1d997
Merge branch 'add2scheduler-privacy' of https://github.com/alikon/joo…
alikon 9bc7f52
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 52517e0
mail_templates
alikon 24eb761
Update libraries/src/Extension/ExtensionHelper.php
alikon c068e49
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 765dc04
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon c46c0b5
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 0842120
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 1fd0c2f
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon c4e744d
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon dd31eff
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 78277b1
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 9523b4d
Update plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
alikon 7d51450
Merge branch '5.0-dev' into add2scheduler-privacy
alikon b7d5fbc
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 28d0a4c
migratePrivacyconsentConfiguration
alikon b08dc83
Merge branch 'add2scheduler-privacy' of https://github.com/alikon/joo…
alikon f6f7283
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 39ceb62
PrivacyConsent migr
alikon 9b58f41
Merge branch '5.0-dev' into add2scheduler-privacy
alikon f2736b7
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 b1cd814
Merge branch '5.0-dev' into add2scheduler-privacy
alikon eb8db88
Merge branch '5.0-dev' into add2scheduler-privacy
alikon f4129cb
Rename 5.0.0-2023-06-13.sql to 5.0.0-2023-08-03.sql
alikon 7a2bb32
Rename 5.0.0-2023-03-13.sql to 5.0.0-2023-08-03.sql
alikon cfb5030
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 5f26266
Merge branch '5.0-dev' into add2scheduler-privacy
alikon a907d51
Merge branch '5.0-dev' into add2scheduler-privacy
alikon 76fe197
Rename 5.0.0-2023-08-03.sql to 5.0.0-2023-08-23.sql
alikon eedbdf8
Rename 5.0.0-2023-08-03.sql to 5.0.0-2023-08-23.sql
alikon a883428
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 a349b6e
userfactory
alikon 0daca7d
userfactory
alikon 32d3c7b
delete mail_template
alikon 8079f5b
delete mail_template
alikon 14ff53d
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 da8a9c1
Rename 5.0.0-2023-08-23.sql to 5.0.0-2023-08-30.sql
richard67 969d8e4
Rename 5.0.0-2023-08-23.sql to 5.0.0-2023-08-30.sql
richard67 87940ee
Deprecate language strings
richard67 78e6151
One more deprecated language string
richard67 94396dd
Do not add task when consent expiration was disabled
richard67 75b0dbc
Use Registry when using get method later.
richard67 3a98c21
My mistake from previous commit
richard67 d39745d
Add missing use statement for my previos commits
richard67 0cee5fe
Cachetimeout was given in days in the system plugin, and default was 30.
richard67 50bf3d6
Don't migrate if the system plugin was not found
richard67 5a81838
Single quotes
richard67 0cf9f73
Remove extra reference assignment for dispatcher argument
richard67 e267a3f
Rename 5.0.0-2023-08-30.sql to 5.0.0-2023-09-02.sql
richard67 11d8276
Rename 5.0.0-2023-08-30.sql to 5.0.0-2023-09-02.sql
richard67 b49fe06
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 cf92794
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 6edd491
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 a294e6b
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 464fa5a
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 5441152
Fix lastrun default on update
richard67 a22ecd7
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 3e14111
Merge branch '5.0-dev' into add2scheduler-privacy
richard67 8ddf28d
Fix previous conflict resolution
richard67 e35d7f0
Forgotten fix
richard67 d827f71
Use the right language strings in the form
richard67 25c8a4b
Fix update SQL scripts missing column value
richard67 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-02.sql
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| 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 | ||
| ('plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0), | ||
| ('plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0), | ||
| ('plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0); | ||
|
|
||
| INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subject`, `body`, `htmlbody`, `attachments`, `params`) VALUES | ||
| ('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"]}'), | ||
| ('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'); | ||
|
|
||
| DELETE FROM `#__mail_templates` WHERE `template_id` = 'plg_system_updatenotification.mail'; | ||
| DELETE FROM `#__mail_templates` WHERE `template_id` IN ('plg_system_privacyconsent.request.reminder', 'plg_system_updatenotification.mail'); | ||
|
|
||
| DELETE FROM `#__postinstall_messages` WHERE `condition_file` = 'site://plugins/system/updatenotification/postinstall/updatecachetime.php'; |
5 changes: 4 additions & 1 deletion
5
administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-02.sql
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| 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 | ||
| ('plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0), | ||
| ('plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0), | ||
| ('plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0); | ||
|
|
||
| INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subject", "body", "htmlbody", "attachments", "params") VALUES | ||
| ('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"]}'), | ||
| ('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'); | ||
|
|
||
| DELETE FROM "#__mail_templates" WHERE "template_id" = 'plg_system_updatenotification.mail'; | ||
| DELETE FROM "#__mail_templates" WHERE "template_id" IN ('plg_system_privacyconsent.request.reminder', 'plg_system_updatenotification.mail'); | ||
|
|
||
| DELETE FROM "#__postinstall_messages" WHERE "condition_file" = 'site://plugins/system/updatenotification/postinstall/updatecachetime.php'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| ; Joomla! Project | ||
| ; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org> | ||
| ; License GNU General Public License version 2 or later; see LICENSE.txt | ||
| ; Note : All ini files need to be saved as UTF-8 | ||
|
|
||
| PLG_TASK_PRIVACYCONSENT="Task - Privacy Consents" | ||
| PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_DESC="Number of days after which the privacy consent shall expire." | ||
| PLG_TASK_PRIVACYCONSENT_CONSENTEXPIRATIONDAYS_LABEL="Expiration" | ||
| PLG_TASK_PRIVACYCONSENT_INVALIDATE_TITLE ="Expiration of privacy consents" | ||
| PLG_TASK_PRIVACYCONSENT_INVALIDATE_DESC ="Manage the expiration of privacy consents" | ||
| PLG_TASK_PRIVACYCONSENT_REMIND_DESC="Manage the remind of expiration of privacy consents" | ||
| PLG_TASK_PRIVACYCONSENT_REMIND_TITLE="Remind" | ||
| 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>" | ||
| PLG_TASK_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed." | ||
| PLG_TASK_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)" | ||
| PLG_TASK_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}'>{username}</a> consented to the privacy policy." | ||
|
|
||
| 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." | ||
| PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT="Privacy Consent at {SITENAME}" | ||
| PLG_TASK_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL="Expiration" | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_ARTICLE_DESC="Select the article from the list or create a new one." | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_ARTICLE_LABEL="Privacy Article" | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration." | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable" | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_ERROR="Agreement to the site's Privacy Policy is required." | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_LABEL="Privacy Policy" | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_MENU_ITEM_LABEL="Privacy Menu Item" | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_ARTICLE="Article" | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_LABEL="Privacy Type" | ||
| PLG_TASK_PRIVACYCONSENT_FIELD_TYPE_MENU_ITEM="Menu Item" | ||
| PLG_TASK_PRIVACYCONSENT_LABEL="Website Privacy" | ||
| PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_DESC="Reminder to renew the privacy consent for this website." | ||
| PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_TITLE="System - Privacy Consent: Renew Consent" | ||
| 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." | ||
| PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_DESC="A summary of the site's privacy policy. If left blank then the default message will be used." | ||
| PLG_TASK_PRIVACYCONSENT_NOTE_FIELD_LABEL="Short Privacy Policy" | ||
| PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE="Privacy consent has expired for %1$s." | ||
| PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT="Privacy Consent Expired" | ||
| PLG_TASK_PRIVACYCONSENT_OPTION_AGREE="I agree" | ||
| PLG_TASK_PRIVACYCONSENT_OPTION_DO_NOT_AGREE="I do not agree" | ||
| PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_DEFAULT="Please confirm that you consent to this website storing your information by agreeing to the privacy policy." | ||
| PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed on redirect. If left blank then the default message will be used." | ||
| PLG_TASK_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message" | ||
| PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent." | ||
| PLG_TASK_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind" | ||
| PLG_TASK_PRIVACYCONSENT_SUBJECT="Privacy Policy" | ||
| PLG_TASK_PRIVACYCONSENT_XML_DESCRIPTION="Task for remind expired consents and delete expired consents" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ; Joomla! Project | ||
| ; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org> | ||
| ; License GNU General Public License version 2 or later; see LICENSE.txt | ||
| ; Note : All ini files need to be saved as UTF-8 | ||
|
|
||
| PLG_TASK_PRIVACYCONSENT="Task - Privacy Consents" | ||
| PLG_TASK_PRIVACYCONSENT_XML_DESCRIPTION="Task for remind expired consents and delete expired consents." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.