diff --git a/composer.json b/composer.json index bdfe7961..a54a3ef3 100644 --- a/composer.json +++ b/composer.json @@ -108,7 +108,6 @@ "drupal/jquery_ui_button": "^2.1", "drupal/jsonapi_extras": "^3.21", "drupal/login_history": "^2.0", - "drupal/login_tracker": "^2.0", "drupal/logout_token": "^2.0", "drupal/mailjet": "^4.0", "drupal/maillog": "^1.1", @@ -131,7 +130,7 @@ "drupal/simplenews_mailjet_subscriptions": "^1.3", "drupal/social_media_links": "^2.8", "drupal/straw": "^2.0@beta", - "drupal/string_translation_ui": "^2.0", + "drupal/string_translation_ui": "2.0.x-dev", "drupal/structure_sync": "^2.0", "drupal/symfony_mailer": "^1", "drupal/synonyms": "^2.0.0-beta2", @@ -140,10 +139,9 @@ "drupal/term_reference_tree": "~2.0.3", "drupal/unique_content_field_validation": "^2.0", "drupal/upgrade_status": "^5.0", - "drupal/user_csv_import": "^2.0", + "drupal/user_csv_import": "2.0.x-dev", "drupal/user_email_verification": "^1.2", "drupal/user_history": "^1.0", - "drupal/vde_drush": "^2.1", "drupal/views_conditional": "^1.10", "drupal/views_data_export": "^1.1", "drupal/views_field_view": "^1.0@beta", @@ -266,6 +264,9 @@ }, "drupal/term_reference_tree": { "Term Reference Tree: Re-implement Track List https://www.drupal.org/project/term_reference_tree/issues/3064280": "https://www.drupal.org/files/issues/2026-09-24/term_reference_tree-3064280-tracklist-2.0.3.patch" + }, + "drupal/workflow": { + "Restore ^11 on submodule info.yml, lost in #3607490 regression https://www.drupal.org/project/workflow/issues/3607490": "./patches/workflow-3607490-submodule-info-d11-2.1.13.patch" } }, "archived-patches": { diff --git a/composer.lock b/composer.lock index 5a72552e..3a396059 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "64917c54b7a55ce7aa9a4965a56a94db", + "content-hash": "8b08d553431365cf9c172686bf725b77", "packages": [ { "name": "asm89/stack-cors", @@ -7948,50 +7948,6 @@ "issues": "https://www.drupal.org/project/issues/login_history" } }, - { - "name": "drupal/login_tracker", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/login_tracker.git", - "reference": "2.0.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/login_tracker-2.0.0.zip", - "reference": "2.0.0", - "shasum": "a4cc93ba4c6b5f1a1c89b3b1e54e0f2bb0d0797b" - }, - "require": { - "drupal/core": "^8.9 || ^9 || ^10" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.0.0", - "datestamp": "1669817729", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "leewillis77", - "homepage": "https://www.drupal.org/user/1588990" - } - ], - "description": "Track user logins", - "homepage": "https://www.drupal.org/project/login_tracker", - "support": { - "source": "https://git.drupalcode.org/project/login_tracker" - } - }, { "name": "drupal/logout_token", "version": "2.0.1", @@ -8666,29 +8622,26 @@ }, { "name": "drupal/path_alias_xt", - "version": "2.0.0", + "version": "dev-2.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/path_alias_xt.git", - "reference": "2.0.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/path_alias_xt-2.0.0.zip", - "reference": "2.0.0", - "shasum": "0ddc29884cbcec038f2daa63378e1321bcc7543c" + "reference": "c1cc60481833e31a002eb691588d100bb2499976" }, "require": { - "drupal/core": "^10" + "drupal/core": "^10 || ^11" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + }, "drupal": { - "version": "2.0.0", - "datestamp": "1710255077", + "version": "2.0.0+1-dev", + "datestamp": "1746999964", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -8702,7 +8655,7 @@ "homepage": "https://www.drupal.org/user/1962106" }, { - "name": "RdeBoer", + "name": "rdeboer", "homepage": "https://www.drupal.org/user/404007" }, { @@ -10396,29 +10349,26 @@ }, { "name": "drupal/string_translation_ui", - "version": "2.0.1", + "version": "dev-2.0.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/string_translation_ui.git", - "reference": "2.0.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/string_translation_ui-2.0.1.zip", - "reference": "2.0.1", - "shasum": "4e8194f5de875447280c8280adb21f031ea57b42" + "reference": "08f301c4a01388093909683c5baf6c7685399950" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^8 || ^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-2.0.x": "2.0.x-dev" + }, "drupal": { - "version": "2.0.1", - "datestamp": "1690828322", + "version": "2.0.1+1-dev", + "datestamp": "1720528628", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -10448,7 +10398,7 @@ "homepage": "https://www.drupal.org/user/1902738" }, { - "name": "rafaelMattioni", + "name": "rafaelmattioni", "homepage": "https://www.drupal.org/user/3073853" }, { @@ -11196,32 +11146,29 @@ }, { "name": "drupal/user_csv_import", - "version": "2.0.3", + "version": "dev-2.0.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/user_csv_import.git", - "reference": "2.0.3" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/user_csv_import-2.0.3.zip", - "reference": "2.0.3", - "shasum": "40ae8fa07c3b3aba3dc859ea836224bf07f25db3" + "reference": "c812973fce3e506940f13ef52ca409f5d65cc264" }, "require": { - "drupal/core": "^8.8 || ^9 || ^10" + "drupal/core": "^10 || ^11" }, "require-dev": { "drupal/roleassign": "*" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-2.0.x": "2.0.x-dev" + }, "drupal": { - "version": "2.0.3", - "datestamp": "1680894733", + "version": "2.0.3+8-dev", + "datestamp": "1767564013", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -11347,82 +11294,6 @@ "issues": "https://www.drupal.org/project/issues/user_history" } }, - { - "name": "drupal/vde_drush", - "version": "2.1.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/vde_drush.git", - "reference": "2.1.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/vde_drush-2.1.0.zip", - "reference": "2.1.0", - "shasum": "bc99096c54212bc8d3fff689628748148b683e52" - }, - "require": { - "drupal/core": "^8 || ^9 || ^10", - "drupal/views_data_export": "*", - "php": ">=7.1.0" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.1.0", - "datestamp": "1685073341", - "security-coverage": { - "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" - } - }, - "drush": { - "services": { - "drush.services.yml": "^9" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Alexander Domasevich", - "homepage": "https://www.drupal.org/user/3547980", - "email": "domaalex@gmail.com" - }, - { - "name": "Artem Ilyin", - "homepage": "https://www.drupal.org/user/3332157", - "email": "kupnoh25@gmail.com" - }, - { - "name": "Anton Lupov", - "homepage": "https://www.drupal.org/user/3557055", - "email": "anthony.lupow@gmail.com" - }, - { - "name": "Pavel Vashchyla", - "homepage": "https://www.drupal.org/user/3557962", - "email": "empty.12.95@gmail.com" - }, - { - "name": "Sergey Semchyk", - "homepage": "https://www.drupal.org/user/3534805", - "email": "ygstand77@gmail.com" - }, - { - "name": "smulvih2", - "homepage": "https://www.drupal.org/user/795442" - } - ], - "description": "Drush support for Views Data Export.", - "homepage": "https://www.drupal.org/project/vde_drush", - "support": { - "source": "https://git.drupalcode.org/project/vde_drush" - } - }, { "name": "drupal/video_embed_field", "version": "3.1.0", @@ -20009,14 +19880,17 @@ "drupal/flag": 10, "drupal/flag_lists": 5, "drupal/inline_entity_form": 5, + "drupal/path_alias_xt": 20, "drupal/pathologic": 15, "drupal/pwa": 10, "drupal/session_limit": 10, "drupal/smtp": 10, "drupal/straw": 10, + "drupal/string_translation_ui": 20, "drupal/telephone_formatter": 10, "drupal/translation_views": 15, "drupal/ultimate_cron": 15, + "drupal/user_csv_import": 20, "drupal/views_field_view": 10 }, "prefer-stable": true, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 122f31e5..38b87164 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -212,7 +212,6 @@ module: user_csv_import: 0 user_email_verification: 0 user_history: 0 - vde_drush: 0 video_embed_field: 0 views_bulk_edit: 0 views_bulk_operations: 0 diff --git a/patches/workflow-3607490-submodule-info-d11-2.1.13.patch b/patches/workflow-3607490-submodule-info-d11-2.1.13.patch new file mode 100644 index 00000000..af112e44 --- /dev/null +++ b/patches/workflow-3607490-submodule-info-d11-2.1.13.patch @@ -0,0 +1,39 @@ +diff --git a/modules/workflow_field/workflowfield.info.yml b/modules/workflow_field/workflowfield.info.yml +index ae6c27f..6eb99d7 100644 +--- a/modules/workflow_field/workflowfield.info.yml ++++ b/modules/workflow_field/workflowfield.info.yml +@@ -3,7 +3,7 @@ type: module + description: 'A residual submodule. No need to enable this module for installations with workflow 8.x-1.0-beta6 and later.' + package: Workflow + core: 8.x +-core_version_requirement: ^8 || ^9 || ^10 ++core_version_requirement: ^8 || ^9 || ^10 || ^11 + + hidden: TRUE + +diff --git a/modules/workflow_operations/workflow_operations.info.yml b/modules/workflow_operations/workflow_operations.info.yml +index 166bfe0..4374f5f 100644 +--- a/modules/workflow_operations/workflow_operations.info.yml ++++ b/modules/workflow_operations/workflow_operations.info.yml +@@ -3,7 +3,7 @@ type: module + description: 'Adds lesser-used Transition permissions (edit comment, revert transition). Obsolete. Incorporated in main module.' + package: Workflow + core: 8.x +-core_version_requirement: ^8 || ^9 || ^10 ++core_version_requirement: ^8 || ^9 || ^10 || ^11 + + dependencies: + - workflow:workflow +diff --git a/modules/workflow_ui/workflow_ui.info.yml b/modules/workflow_ui/workflow_ui.info.yml +index 67c71c7..f51ab32 100644 +--- a/modules/workflow_ui/workflow_ui.info.yml ++++ b/modules/workflow_ui/workflow_ui.info.yml +@@ -3,7 +3,7 @@ type: module + description: 'Administrative UI for Workflow. Obsolete. Incorporated in main module.' + package: Workflow + core: 8.x +-core_version_requirement: ^8 || ^9 || ^10 ++core_version_requirement: ^8 || ^9 || ^10 || ^11 + + configure: entity.workflow_type.collection + dependencies: diff --git a/web/modules/custom/login_tracker/LICENSE.txt b/web/modules/custom/login_tracker/LICENSE.txt new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/web/modules/custom/login_tracker/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/web/modules/custom/login_tracker/README.md b/web/modules/custom/login_tracker/README.md new file mode 100644 index 00000000..fc403d42 --- /dev/null +++ b/web/modules/custom/login_tracker/README.md @@ -0,0 +1,28 @@ +# Login Tracker +A simple module that tracks each time a user logs in and stores a historical +record in your database. This data is then exposed to views so you can report on +it if required. + +Note: User 1 will not be tracked by default. + +## Installation +Install, and activate the module as you would any other module. As soon as the +module is active, then logins will be recorded in your database. + +If you wish to exclude certain roles from being tracked, then you can assign the +role the permission *Excluded from login tracking* and their logins will not be +tracked. + +## Fine grained control over login tracking +If you need finer grained control over which logins are tracked, then you can +implement your required login in hook_login_tracker_track_login_alter() to +override whether a login is tracked for an individual instance. + +## Storage of additional data +You can store additional data along with the login tracking by implementing +hook_login_tracker_login_data. The default value is an empty array, so you may +add to that as required. + +## Views integration +You can access the data in the login tracker tables either as a base view, or +more usefully as a relationship against the user table. diff --git a/web/modules/custom/login_tracker/login_tracker.api.php b/web/modules/custom/login_tracker/login_tracker.api.php new file mode 100644 index 00000000..0331f994 --- /dev/null +++ b/web/modules/custom/login_tracker/login_tracker.api.php @@ -0,0 +1,41 @@ + [ + 'record_id' => [ + 'type' => 'serial', + 'not null' => TRUE, + 'description' => 'Unique ID for this record.', + ], + 'uid' => [ + 'type' => 'int', + 'not null' => TRUE, + 'description' => 'UID of user.', + ], + 'login_timestamp' => [ + 'type' => 'int', + 'not null' => TRUE, + 'description' => "Timestamp for the user's login.", + ], + 'data' => [ + 'type' => 'text', + 'size' => 'medium', + 'not null' => TRUE, + 'description' => "Additional data stored at time of login.", + ], + ], + 'indexes' => [ + 'login_tracker_uid' => ['uid'], + 'login_tracker_login_timestamp' => ['login_timestamp'], + ], + 'foreign keys' => [ + 'uid' => [ + 'table' => 'users', + 'columns' => ['uid' => 'uid'], + ], + ], + 'primary key' => ['record_id'], + ]; + return $schema; +} diff --git a/web/modules/custom/login_tracker/login_tracker.links.menu.yml b/web/modules/custom/login_tracker/login_tracker.links.menu.yml new file mode 100644 index 00000000..92939e96 --- /dev/null +++ b/web/modules/custom/login_tracker/login_tracker.links.menu.yml @@ -0,0 +1,6 @@ +login_tracker.set_admin: + title: 'Login tracker settings' + parent: user.admin_index + description: 'Configure settings related to tracking of user logins.' + weight: 0 + route_name: login_tracker.settings_form diff --git a/web/modules/custom/login_tracker/login_tracker.module b/web/modules/custom/login_tracker/login_tracker.module new file mode 100644 index 00000000..e397c61a --- /dev/null +++ b/web/modules/custom/login_tracker/login_tracker.module @@ -0,0 +1,75 @@ +hasPermission('excluded_from_login_tracking'); + + // Allow other modules to override whether or not we're tracking this + // login. + \Drupal::moduleHandler()->alter('login_tracker_track_login', $track_login, $account); + + if (!$track_login) { + return; + } + + $data = []; + \Drupal::moduleHandler()->alter('login_tracker_login_data', $data, $account); + $data = serialize($data); + + $keys = [ + 'record_id' => NULL, + ]; + $fields = [ + 'uid' => $account->id(), + 'login_timestamp' => \Drupal::time()->getRequestTime(), + 'data' => $data, + ]; + + \Drupal::database()->merge('login_tracker') + ->key($keys) + ->fields($fields) + ->execute(); +} + +/** + * Implements hook_cron(). + */ +function login_tracker_cron() { + $settings = \Drupal::state()->get('login_tracker_settings', []); + if (!empty($settings['purge_interval'])) { + $query = \Drupal::database()->delete('login_tracker'); + $query->condition('login_timestamp', time() - $settings['purge_interval'], '<='); + $results = $query->execute(); + + if ($results) { + \Drupal::logger('login_tracker')->notice( + t( + '@logs records have been purged with success from table @table', + ['@logs' => $results, '@table' => 'login_tracker'] + ) + ); + } + else { + \Drupal::logger('login_tracker')->notice(t('Nothing to purge from table @table', ['@table' => 'login_tracker'])); + } + } +} diff --git a/web/modules/custom/login_tracker/login_tracker.permissions.yml b/web/modules/custom/login_tracker/login_tracker.permissions.yml new file mode 100644 index 00000000..8052848b --- /dev/null +++ b/web/modules/custom/login_tracker/login_tracker.permissions.yml @@ -0,0 +1,6 @@ +excluded_from_login_tracking: + title: 'Excluded from login tracking' + description: 'Assign this permission to roles, and any logins by users of that role will not be tracked.' +manage_login_tracker_settings: + title: 'Manage settings for login tracking' + description: 'Users with this permission will be able to manage settings for login tracking.' diff --git a/web/modules/custom/login_tracker/login_tracker.routing.yml b/web/modules/custom/login_tracker/login_tracker.routing.yml new file mode 100644 index 00000000..6e8be8c4 --- /dev/null +++ b/web/modules/custom/login_tracker/login_tracker.routing.yml @@ -0,0 +1,7 @@ +login_tracker.settings_form: + path: '/admin/config/login-tracker' + defaults: + _form: '\Drupal\login_tracker\Form\LoginTrackerSettings' + _title: 'Login Tracker settings' + requirements: + _permission: 'manage_login_tracker_settings' diff --git a/web/modules/custom/login_tracker/login_tracker.views.inc b/web/modules/custom/login_tracker/login_tracker.views.inc new file mode 100644 index 00000000..c9d2ca85 --- /dev/null +++ b/web/modules/custom/login_tracker/login_tracker.views.inc @@ -0,0 +1,92 @@ + 'record_id', + 'title' => t('User logins'), + 'help' => t('Contains data about user logins.'), + ]; + $data['login_tracker']['table']['join'] = [ + 'users_field_data' => [ + 'left_field' => 'uid', + 'field' => 'uid', + ], + ]; + // The UID field. + $data['login_tracker']['record_id'] = [ + 'title' => t('Login record ID'), + 'help' => t("The unique ID referring to this login record."), + 'field' => [ + 'id' => 'numeric', + ], + 'sort' => [ + 'id' => 'standard', + ], + 'filter' => [ + 'title' => t('Record ID'), + 'id' => 'numeric', + ], + ]; + $data['login_tracker']['uid'] = [ + 'title' => t('UID'), + 'help' => t("The user's UID."), + 'field' => [ + 'id' => 'numeric', + ], + 'sort' => [ + 'id' => 'standard', + ], + 'filter' => [ + 'title' => t('UID'), + 'id' => 'numeric', + ], + 'relationship' => [ + 'title' => t('User who logged in'), + 'help' => t('The user associated with the login record.'), + 'id' => 'standard', + 'base' => 'users_field_data', + 'base field' => 'uid', + 'field' => 'uid', + 'label' => t('User who logged in'), + ], + ]; + // The login timestamp field. + $data['login_tracker']['login_timestamp'] = [ + 'title' => t('Login timestamp'), + 'help' => t('The timestamp that the user logged in at.'), + 'field' => [ + 'id' => 'date', + ], + 'sort' => [ + 'id' => 'date', + ], + 'filter' => [ + 'id' => 'date', + ], + ]; + $data['login_tracker']['data'] = [ + 'title' => t('Login data'), + 'help' => t('Login record information.'), + 'field' => [ + 'id' => 'serialized', + 'click sortable' => FALSE, + ], + 'sort' => [ + 'id' => 'standard', + ], + 'filter' => [ + 'id' => 'string', + ], + ]; + return $data; +} diff --git a/web/modules/custom/login_tracker/src/Form/LoginTrackerSettings.php b/web/modules/custom/login_tracker/src/Form/LoginTrackerSettings.php new file mode 100644 index 00000000..05277c79 --- /dev/null +++ b/web/modules/custom/login_tracker/src/Form/LoginTrackerSettings.php @@ -0,0 +1,96 @@ +state = $state; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('state') + ); + } + + /** + * {@inheritdoc} + */ + public function getFormId() { + return 'login_tracker_settings_form'; + } + + /** + * {@inheritdoc} + */ + public function buildForm(array $form, FormStateInterface $form_state) { + + $settings = $this->state->get('login_tracker_settings', []); + $options = [ + 0 => $this->t('Never'), + 3600 => $this->t('1 hour'), + 86400 => $this->t('1 day'), + 604800 => $this->t('1 week'), + 2678400 => $this->t('1 month'), + 5097600 => $this->t('2 months'), + 10364400 => $this->t('4 months'), + 15634800 => $this->t('6 months'), + ]; + + $form['purge_interval'] = [ + '#type' => 'select', + '#title' => $this->t('Periodically purge records older than'), + '#description' => $this->t('Records older than this interval will be deleted via Cron.'), + '#default_value' => $settings['purge_interval'] ?? 0, + '#options' => $options, + '#required' => TRUE, + ]; + + $form['submit'] = [ + '#type' => 'submit', + '#value' => $this->t('Save settings'), + ]; + + return $form; + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + + $this->messenger()->addMessage($this->t('The configuration has been saved'), 'status'); + + $values = $form_state->getValues(); + $new_values['purge_interval'] = $values['purge_interval']; + + // Set State. + $this->state->set('login_tracker_settings', $new_values); + } + +} diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 2baf8b5b..bf6efa37 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 2baf8b5b799ffb7ebbc9a5aa0072c68a0748e6af +Subproject commit bf6efa37dd61df2716d79b83440eb53a522c21ac