allow specification of event

AndrewPoppe · May 27, 2022 · 303f690 · 303f690
1 parent 3c4f2c2
commit 303f690
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 21 deletions.
diff --git a/CASLogin.php b/CASLogin.php
@@ -30,9 +30,16 @@ function redcap_survey_page_top($project_id, $record, $instrument,
 
         $projectSettings = $this->getProjectSettings();
 
-        $index = array_search($instrument, $projectSettings["survey"], true);
+        foreach ($projectSettings["survey"] as $index => $surveyName) {
+
+            if ($projectSettings["event"][$index] !== null && $projectSettings["event"][$index] !== $event_id) {
+                continue;
+            }
+
+            if ($projectSettings["survey"][$index] !== $instrument) {
+                continue;
+            }
 
-        if ($index !== FALSE) {
             try {
                 $id = $this->authenticate();
             }

diff --git a/config.json b/config.json
@@ -18,40 +18,46 @@
             "name": "<strong>Full Hostname of your CAS Server</strong>:<br>e.g., secure.its.yale.edu",
             "required": true,
             "type": "text"
-         },
-         {
+        },
+        {
             "key": "cas-context",
             "name": "<strong>Context of the CAS Server</strong>:<br>e.g., /cas",
             "required": true,
             "type": "text"
-         },
-         {
+        },
+        {
             "key": "cas-port",
             "name": "<strong>Port of your CAS server</strong>:<br>Normally for a https server it's 443",
             "required": true,
             "type": "text"
-         },
-         {
+        },
+        {
             "key": "cas-server-ca-cert-pem",
             "name": "<strong>CA cert pem file</strong>:<br>e.g., cacert.pem",
             "required": true,
             "type": "file"
-         },
-         {
-             "key": "server-force-https",
-             "name": "<strong>HTTPS Override</strong>:<br>Check this if you experience the CAS server redirecting to http despite your REDCap server using https protocol",
-             "required": false,
-             "type": "checkbox"
-         }
+        },
+        {
+            "key": "server-force-https",
+            "name": "<strong>HTTPS Override</strong>:<br>Check this if you experience the CAS server redirecting to http despite your REDCap server using https protocol",
+            "required": false,
+            "type": "checkbox"
+        }
     ],
     "project-settings": [
         {
             "key": "survey-subsettings",
             "name": "<strong>Select surveys to add CAS to</strong>",
             "required": true,
             "type": "sub_settings",
-            "repeatable":true,
-            "sub_settings":[
+            "repeatable": true,
+            "sub_settings": [
+                {
+                    "key": "event",
+                    "name": "<strong>Event</strong>:<br>Leave blank if not applicable or if CAS should apply to the chosen survey across all events",
+                    "required": false,
+                    "type": "event-list"
+                },
                 {
                     "key": "survey",
                     "name": "<strong>Survey</strong>",
@@ -63,13 +69,13 @@
                     "name": "<strong>ID Field</strong>:<br>If you want to store the id of the person who logged in with CAS, select the field to store it here (it should be a text input field on the same survey)",
                     "required": false,
                     "type": "field-list"
-                }   
+                }
             ]
-         }
+        }
     ],
-    "framework-version": 5,
+    "framework-version": 8,
     "compatibility": {
-        "redcap-version-min": "9.10.0",
+        "redcap-version-min": "12.0.0",
         "redcap-version-max": ""
     }
 }