Merge branch 'release/3.0.1'

Author: pbchase

README.md

@@ -2,7 +2,7 @@
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3561122.svg)](https://doi.org/10.5281/zenodo.3561122)
 
-A REDCap external module that will warn users of pending suspensions and provide an easy opportunity to extend the life of REDCap accounts.
+A REDCap external module that warns users of pending account suspensions and provides a simple way for REDCap users to extend their account lifetimes.
 
 ## Installation
 - Obtain this module from the Consortium [REDCap Repo](https://redcap.vumc.org/consortium/modules/index.php) from the REDCap Control Center.
@@ -54,10 +54,12 @@ from redcap_user_information
 order by user_lastlogin desc;
 ```
 
-Your username should be near the top of the list, `user_lastlogin` should reflect the precise time of your login. If `user_lastlogin` is not updating, access the system configuration of the WUPS module and check `Update user_lastlogin on main REDCap pages`. 
+Your username should be near the top of the list and `user_lastlogin` should reflect the precise time of your login. If `user_lastlogin` is not updating, access the system configuration of the WUPS module and check `Update user_lastlogin on main REDCap pages`.
 
 ## How to Implement WUPS
 
+**Note:** If you have already enabled _Auto-suspend users after period of inactivity_, you can ignore this section. Otherwise, please read this section carefully.
+
 Implementing WUPS and/or activating REDCap account suspensions can require some careful planning to avoid annoying your users who have not logged in recently.  If you have never used account suspension on your REDCap host, activating it will cause all accounts that have not logged in within the _Period of inactivity_ to be suspended within 24 hours. If those people want their accounts reenabled they will have to ask the REDCap admin to reenable them.  That generates the kind of help desk workload WUPS was designed to _prevent_.
 
 To avoid the chaos of hundreds of accounts getting prematurely suspended, you can run a few SQL queries to adjust the last login dates for your REDCap users.  Done correctly, you can use WUPS to warn these users of the pending suspension, allow interested REDCap users to renew their account, and let the rest suspend normally.

WarnUsersOfPendingSuspension.php

@@ -47,9 +47,8 @@ function extend_suspension_time($username='')
 			$message = "Unable to extend account suspension time: you need to log in with your credentials.";
 		}
 		else {
-			$sql = "update redcap_user_information set user_lastlogin = NOW() where username ='$username';";
-
-			db_query($sql);
+			# Update the user's last login time to now
+			$result = $this->query("update redcap_user_information set user_lastlogin = NOW() where username = ?;", [$username]);
 		}
 
         if ($message) {
@@ -95,9 +94,9 @@ function warn_users_account_suspension_cron()
 					from redcap_user_information
 					where user_suspended_time is null
 					) as my_user_info
-					where '$suspend_users_inactive_days' - DATEDIFF(NOW(), user_last_date) = '$day';";
+					where ? - DATEDIFF(NOW(), user_last_date) = ?;";
 
-			$q = $this->query($sql);
+					$q = $this->query($sql, [$suspend_users_inactive_days, $day]);
 
 			while ($row = db_fetch_assoc($q))
 			{

config.json

@@ -1,11 +1,8 @@
 {
     "name": "Warn Users of Pending Suspension",
     "namespace": "UF_CTSI\\WarnUsersOfPendingSuspension",
-    "description": "A REDCap external module that will warn users of pending suspensions and provide an easy opportunity to extend the life of REDCap accounts.",
-
-    "permissions": [
-        "redcap_every_page_top"
-    ],
+    "description": "A REDCap external module that warns users of pending account suspensions and provides a simple way for REDCap users to extend their account lifetimes.",
+    "framework-version": 15,
     "enable-every-page-hooks-on-system-pages": true,
     "authors": [
         {