From edc6b5a18c5341b46e49f725225a2d997a2e1160 Mon Sep 17 00:00:00 2001
From: LiamStanziani <LiamStanziani1@outlook.com>
Date: Mon, 22 Sep 2025 16:56:22 -0400
Subject: [PATCH 1/2] Fixed possible null ref issues with if conditionals in
 the Frm2Action class

---
 src/main/java/ca/openosp/openo/form/Frm2Action.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ca/openosp/openo/form/Frm2Action.java b/src/main/java/ca/openosp/openo/form/Frm2Action.java
index d913a43a09c..051890dbf2b 100644
--- a/src/main/java/ca/openosp/openo/form/Frm2Action.java
+++ b/src/main/java/ca/openosp/openo/form/Frm2Action.java
@@ -109,7 +109,7 @@ public String execute() {
                 newID = formId;
             }
             //if we are printing all pages of form, grab info from db and merge with current page info
-            else if (request.getParameter("submit").equals("printAll") || request.getParameter("submit").equals("printAllJasperReport")) {
+            else if ("printAll".equals(request.getParameter("submit")) || "printAllJasperReport".equals(request.getParameter("submit"))) {
 
                 if (rec instanceof JasperReportPdfPrint) {
                     boolean isRourkeForm2020 = true;
@@ -146,7 +146,7 @@ else if (request.getParameter("submit").equals("printAll") || request.getParamet
                     }
                     newID = formId;
                 }
-            } else if (request.getParameter("update") != null && request.getParameter("update").equals("true")) {
+            } else if ("true".equals(request.getParameter("update"))) {
                 boolean bMulPage = request.getParameter("c_lastVisited") != null;
                 String name;
 
@@ -180,10 +180,10 @@ else if (request.getParameter("submit").equals("printAll") || request.getParamet
                 newID = rec.saveFormRecord(props);
                 LogAction.addLog((String) request.getSession().getAttribute("user"), LogConst.UPDATE, request
                         .getParameter("form_class"), "" + newID, request.getRemoteAddr(), request.getParameter("demographic_no"));
-            } else if (request.getParameter("submit").equals("autosaveAjax")) {
+            } else if ("autosaveAjax".equals(request.getParameter("submit"))) {
                 quickSaveForm(rec, request, response);
                 return null;
-            } else if (request.getParameter("submit").equals("saveFormLetter")) {
+            } else if ("saveFormLetter".equals(request.getParameter("submit"))) {
                 for (Enumeration varEnum = request.getParameterNames(); varEnum.hasMoreElements(); ) {
                     String name = (String) varEnum.nextElement();
                     props.setProperty(name, request.getParameter(name));

From 4b808d7365bdc6c34eab40e257d81502bf51bd8a Mon Sep 17 00:00:00 2001
From: LiamStanziani <LiamStanziani1@outlook.com>
Date: Tue, 23 Sep 2025 08:44:39 -0400
Subject: [PATCH 2/2] Fixed null rourke submit types due to old styleId on
 forms in 2009, 2017, 2020, ran make lock to fix jna dependency diff issue

---
 dependencies-lock.json                          | 4 ++--
 src/main/webapp/form/formrourke2009complete.jsp | 2 +-
 src/main/webapp/form/formrourke2017complete.jsp | 2 +-
 src/main/webapp/form/formrourke2020complete.jsp | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dependencies-lock.json b/dependencies-lock.json
index 5fb05bae1ab..13b50198dcc 100644
--- a/dependencies-lock.json
+++ b/dependencies-lock.json
@@ -1333,11 +1333,11 @@
   }, {
     "groupId" : "net.java.dev.jna",
     "artifactId" : "jna",
-    "version" : "5.17.0",
+    "version" : "5.18.0",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:M/NSUo/HCgf/yRhP+AZHsCxR6ibOsRznDupK29lBmm+BG8EXRtxz3fQP8qIdrtvqq9NJ6QHzDsXoQaH1/G8bUg=="
+    "integrity" : "sha512:FQsMRq9urazfh8ZNyrEJ+sWotSJG6nARKnQlCkgDeAdVdyFCnIFBPE4DgTQcT2Wmvi83/HBlEzJ9ok1ukmPNTg=="
   }, {
     "groupId" : "net.sf.ezmorph",
     "artifactId" : "ezmorph",
diff --git a/src/main/webapp/form/formrourke2009complete.jsp b/src/main/webapp/form/formrourke2009complete.jsp
index e9cfa2f4efa..9b7854b0f3b 100644
--- a/src/main/webapp/form/formrourke2009complete.jsp
+++ b/src/main/webapp/form/formrourke2009complete.jsp
@@ -736,7 +736,7 @@
     </script>
 </head>
 <body onload="init()">
-<form styleId="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
+<form id="frmP1" name="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
     <table>
         <tr>
             <td id="cp1">
diff --git a/src/main/webapp/form/formrourke2017complete.jsp b/src/main/webapp/form/formrourke2017complete.jsp
index 4035c804e90..bd7bc5294b3 100644
--- a/src/main/webapp/form/formrourke2017complete.jsp
+++ b/src/main/webapp/form/formrourke2017complete.jsp
@@ -709,7 +709,7 @@
 </head>
 <body onload="init()">
 
-<form styleId="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
+<form id="frmP1" name="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
     <div id="rourke2017-tabs">
         <ul id="tab-list">
             <li><a href="#tab-cp1">Page I</a></li>
diff --git a/src/main/webapp/form/formrourke2020complete.jsp b/src/main/webapp/form/formrourke2020complete.jsp
index b37c0af1d6a..40c8190381f 100644
--- a/src/main/webapp/form/formrourke2020complete.jsp
+++ b/src/main/webapp/form/formrourke2020complete.jsp
@@ -285,7 +285,6 @@
         }
 
         function onPrintAll() {
-
             document.forms["frmP1"].action = "<%= request.getContextPath() %>/form/formname.do?__title=Rourke+Baby+Report&__cfgfile=Rourke2020printCfgPg1&__cfgfile=Rourke2020printCfgPg2&__cfgfile=Rourke2020printCfgPg3&__cfgfile=Rourke2020printCfgPg4&__template=Rourke2020";
             document.forms["frmP1"].action += "&submit=printAllJasperReport";
             document.forms["frmP1"].target = "_blank";
@@ -737,7 +736,7 @@
     </style>
 </head>
 <body onload="init()">
-<form styleId="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
+<form id="frmP1" name="frmP1" action="${pageContext.request.contextPath}/form/formname.do" method="post">
     <div id="rourke2020-tabs">
         <ul id="tab-list">
             <li><a href="#tab-cp1">Page I</a></li>