|
- <%=StringEscapeUtils.escapeHtml(nameage)%>
+ <%=StringEscapeUtils.escapeHtml4(nameage)%>
|
@@ -1516,7 +1516,7 @@
} else if (second != null) {
ret = second;
}
- return StringEscapeUtils.escapeHtml(ret);
+ return StringEscapeUtils.escapeHtml4(ret);
}
String checked(String first, String second) {
diff --git a/src/main/webapp/oscarPrevention/AddPreventionDataDisambiguate.jsp b/src/main/webapp/oscarPrevention/AddPreventionDataDisambiguate.jsp
index c0407d83ccb..4276276d97e 100644
--- a/src/main/webapp/oscarPrevention/AddPreventionDataDisambiguate.jsp
+++ b/src/main/webapp/oscarPrevention/AddPreventionDataDisambiguate.jsp
@@ -30,7 +30,7 @@
<%@page import="org.oscarehr.common.dao.CVCImmunizationDao" %>
<%@page import="org.oscarehr.common.dao.CVCMappingDao" %>
<%@page import="org.oscarehr.common.model.CVCMedicationLotNumber" %>
-<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang3.StringUtils" %>
<%@page import="org.oscarehr.common.model.CVCImmunization" %>
<%@page import="org.oscarehr.managers.CanadianVaccineCatalogueManager" %>
<%@page import="org.oscarehr.util.LoggedInInfo" %>
diff --git a/src/main/webapp/oscarPrevention/PreventionReporting.jsp b/src/main/webapp/oscarPrevention/PreventionReporting.jsp
index 48d7730eb05..5c8e6308e47 100644
--- a/src/main/webapp/oscarPrevention/PreventionReporting.jsp
+++ b/src/main/webapp/oscarPrevention/PreventionReporting.jsp
@@ -26,7 +26,7 @@
<%@page import="org.oscarehr.util.LoggedInInfo" %>
-<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang3.StringUtils" %>
<%@page import="oscar.oscarDemographic.data.*,java.util.*,oscar.oscarPrevention.*,oscar.oscarProvider.data.*,oscar.util.*,oscar.oscarReport.data.*,oscar.oscarPrevention.pageUtil.*,java.net.*,oscar.eform.*" %>
<%@page import="oscar.OscarProperties, org.oscarehr.util.SpringUtils, org.oscarehr.common.dao.BillingONCHeader1Dao" %>
<%@ page import="org.owasp.encoder.Encode" %>
diff --git a/src/main/webapp/oscarPrevention/display_remote_prevention.jsp b/src/main/webapp/oscarPrevention/display_remote_prevention.jsp
index 61494a6d5a6..ddf6ea45dbb 100644
--- a/src/main/webapp/oscarPrevention/display_remote_prevention.jsp
+++ b/src/main/webapp/oscarPrevention/display_remote_prevention.jsp
@@ -56,7 +56,7 @@
<%@page import="org.oscarehr.caisi_integrator.ws.CachedFacility" %>
<%@page import="org.oscarehr.caisi_integrator.ws.CachedProvider" %>
<%@page import="org.oscarehr.caisi_integrator.ws.FacilityIdStringCompositePk" %>
-<%@page import="org.apache.commons.lang.time.DateFormatUtils" %>
+<%@page import="org.apache.commons.lang3.time.DateFormatUtils" %>
<%@page import="java.util.List" %>
diff --git a/src/main/webapp/oscarPrevention/index.jsp b/src/main/webapp/oscarPrevention/index.jsp
index a135fa8c378..70ea17a7af8 100644
--- a/src/main/webapp/oscarPrevention/index.jsp
+++ b/src/main/webapp/oscarPrevention/index.jsp
@@ -24,12 +24,12 @@
--%>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="org.oscarehr.common.model.UserProperty" %>
<%@page import="org.oscarehr.common.dao.UserPropertyDAO" %>
<%@page import="org.oscarehr.common.model.CVCMapping" %>
<%@page import="org.oscarehr.common.dao.CVCMappingDao" %>
-<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang3.StringUtils" %>
<%@page import="org.oscarehr.common.model.DHIRSubmissionLog" %>
<%@page import="org.oscarehr.managers.DHIRSubmissionManager" %>
<%@page import="org.oscarehr.common.model.Consent" %>
@@ -920,18 +920,18 @@
%>
-- Date:<%=StringEscapeUtils.escapeHtml((String)hdata.get("prevention_date_no_time"))%>] body=[<%=StringEscapeUtils.escapeHtml((String)hExt.get("comments"))%><br/>Administered By: <%=StringEscapeUtils.escapeHtml((String)hdata.get("provider_name"))%>]">
+ title="fade=[on] header=[<%=StringEscapeUtils.escapeHtml4((String)hdata.get("age"))%> -- Date:<%=StringEscapeUtils.escapeHtml4((String)hdata.get("prevention_date_no_time"))%>] body=[<%=StringEscapeUtils.escapeHtml4((String)hExt.get("comments"))%><br/>Administered By: <%=StringEscapeUtils.escapeHtml4((String)hdata.get("provider_name"))%>]">
>
- Age: <%=StringEscapeUtils.escapeHtml((String)hdata.get("age"))%> <%if(result!=null && result.equals("abnormal")){out.print("result:"+StringEscapeUtils.escapeHtml(result));}%>
+ Age: <%=StringEscapeUtils.escapeHtml4((String)hdata.get("age"))%> <%if(result!=null && result.equals("abnormal")){out.print("result:"+StringEscapeUtils.escapeHtml4(result));}%>
- Date: <%=StringEscapeUtils.escapeHtml((String)hdata.get("prevention_date_no_time"))%>
+ Date: <%=StringEscapeUtils.escapeHtml4((String)hdata.get("prevention_date_no_time"))%>
<%if (hExt.get("comments") != null && (hExt.get("comments")).length()>0) {
if (oscar.OscarProperties.getInstance().getBooleanProperty("prevention_show_comments","yes")){%>
<% } else { %>
@@ -1011,14 +1011,14 @@
%>
&demographic_no=<%=demographic_no%>','addPreventionData')"
- title="fade=[on] header=[<%=StringEscapeUtils.escapeHtml((String)hdata.get("age"))%> -- Date:<%=StringEscapeUtils.escapeHtml((String)hdata.get("prevention_date_no_time"))%>] body=[<%=StringEscapeUtils.escapeHtml((String)hExt.get("comments"))%><br/>Administered By: <%=StringEscapeUtils.escapeHtml((String)hdata.get("provider_name"))%>]">
+ title="fade=[on] header=[<%=StringEscapeUtils.escapeHtml4((String)hdata.get("age"))%> -- Date:<%=StringEscapeUtils.escapeHtml4((String)hdata.get("prevention_date_no_time"))%>] body=[<%=StringEscapeUtils.escapeHtml4((String)hExt.get("comments"))%><br/>Administered By: <%=StringEscapeUtils.escapeHtml4((String)hdata.get("provider_name"))%>]">
>Age: <%=hdata.get("age")%>
- Date: <%=StringEscapeUtils.escapeHtml((String)hdata.get("prevention_date_no_time"))%>
+ Date: <%=StringEscapeUtils.escapeHtml4((String)hdata.get("prevention_date_no_time"))%>
<%if (hExt.get("comments") != null && (hExt.get("comments")).length()>0) {
if (oscar.OscarProperties.getInstance().getBooleanProperty("prevention_show_comments","yes")){ %>
<% } else { %>
@@ -1102,7 +1102,7 @@
>Age: <%=hdata.get("age")%>
- Date: <%=StringEscapeUtils.escapeHtml((String) hdata.get("prevention_date_no_time"))%>
+ Date: <%=StringEscapeUtils.escapeHtml4((String) hdata.get("prevention_date_no_time"))%>
<%=getFromFacilityMsg(hdata)%>
@@ -1160,61 +1160,61 @@
value="<%=hdata.get("age")%>">
">
+ value="<%=StringEscapeUtils.escapeHtml4((String)hdata.get("prevention_date_no_time"))%>">
<% String comments = hExt.get("comments");
if (comments != null && !comments.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(comments)%>">
<% } %>
<% String result = hExt.get("result");
if (result != null && !result.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(result)%>">
<% } %>
<% String reason = hExt.get("reason");
if (reason != null && !reason.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(reason)%>">
<% } %>
<% String nameOfVaccine = hExt.get("name");
if (nameOfVaccine != null && !nameOfVaccine.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(nameOfVaccine)%>">
<% } %>
<% String manufacture = hExt.get("manufacture");
if (manufacture != null && !manufacture.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(manufacture)%>">
<% } %>
<% String lotID = hExt.get("lot");
if (lotID != null && !lotID.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(lotID)%>">
<% } %>
<% String doseAdministered = hExt.get("dose");
if (doseAdministered != null && !doseAdministered.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(doseAdministered)%>">
<% } %>
<% String locationOfShot = hExt.get("location");
if (locationOfShot != null && !locationOfShot.isEmpty()) {%>
+ value="<%=StringEscapeUtils.escapeHtml4(locationOfShot)%>">
<% }
}
}
diff --git a/src/main/webapp/oscarPrevention/review.jsp b/src/main/webapp/oscarPrevention/review.jsp
index 80a57ffa336..5c0ad64b8af 100644
--- a/src/main/webapp/oscarPrevention/review.jsp
+++ b/src/main/webapp/oscarPrevention/review.jsp
@@ -47,7 +47,7 @@
<%@page import="org.oscarehr.common.dao.CVCImmunizationDao" %>
<%@page import="org.oscarehr.common.dao.CVCMappingDao" %>
<%@page import="org.oscarehr.common.model.CVCMedicationLotNumber" %>
-<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang3.StringUtils" %>
<%@page import="org.oscarehr.common.model.CVCImmunization" %>
<%@page import="org.oscarehr.managers.CanadianVaccineCatalogueManager" %>
<%@page import="org.oscarehr.util.LoggedInInfo" %>
diff --git a/src/main/webapp/oscarReport/CDSOneTimeConsultReport.jsp b/src/main/webapp/oscarReport/CDSOneTimeConsultReport.jsp
index 07ca0aab617..b21a78cb259 100644
--- a/src/main/webapp/oscarReport/CDSOneTimeConsultReport.jsp
+++ b/src/main/webapp/oscarReport/CDSOneTimeConsultReport.jsp
@@ -41,7 +41,7 @@
<%@page import="org.oscarehr.util.LoggedInInfo" %>
<%@ page
- import="org.apache.commons.lang.StringUtils,org.apache.commons.lang.StringEscapeUtils,java.util.*,oscar.oscarReport.data.*,oscar.util.*,oscar.oscarDB.*,java.sql.*,oscar.oscarDemographic.data.*,oscar.eform.*,org.oscarehr.common.model.Provider,org.oscarehr.managers.ProviderManager2,org.oscarehr.util.SpringUtils" %>
+ import="org.apache.commons.lang3.StringUtils,org.apache.commons.text.StringEscapeUtils,java.util.*,oscar.oscarReport.data.*,oscar.util.*,oscar.oscarDB.*,java.sql.*,oscar.oscarDemographic.data.*,oscar.eform.*,org.oscarehr.common.model.Provider,org.oscarehr.managers.ProviderManager2,org.oscarehr.util.SpringUtils" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -169,7 +169,7 @@
}
%>
- ><%=StringEscapeUtils.escapeHtml(provider.getFormattedName())%>
+ ><%=StringEscapeUtils.escapeHtml4(provider.getFormattedName())%>
<%
}
diff --git a/src/main/webapp/oscarReport/OSISReport.jsp b/src/main/webapp/oscarReport/OSISReport.jsp
index 5f4e721bad8..7015019a23d 100644
--- a/src/main/webapp/oscarReport/OSISReport.jsp
+++ b/src/main/webapp/oscarReport/OSISReport.jsp
@@ -41,7 +41,7 @@
<%@page import="org.oscarehr.util.LoggedInInfo" %>
<%@ page
- import="org.apache.commons.lang.StringUtils,org.apache.commons.lang.StringEscapeUtils,java.util.*,oscar.util.*,oscar.oscarReport.data.*,oscar.oscarDB.*,java.sql.*,oscar.oscarDemographic.data.*,oscar.eform.*,org.oscarehr.common.model.Provider,org.oscarehr.managers.ProviderManager2,org.oscarehr.util.SpringUtils" %>
+ import="org.apache.commons.lang3.StringUtils,org.apache.commons.text.StringEscapeUtils,java.util.*,oscar.util.*,oscar.oscarReport.data.*,oscar.oscarDB.*,java.sql.*,oscar.oscarDemographic.data.*,oscar.eform.*,org.oscarehr.common.model.Provider,org.oscarehr.managers.ProviderManager2,org.oscarehr.util.SpringUtils" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -174,7 +174,7 @@
}
%>
- ><%=StringEscapeUtils.escapeHtml(provider.getFormattedName())%>
+ ><%=StringEscapeUtils.escapeHtml4(provider.getFormattedName())%>
<%
}
diff --git a/src/main/webapp/oscarReport/cbi_report_form.jsp b/src/main/webapp/oscarReport/cbi_report_form.jsp
index c5d1cc152a4..813dc7ad2a0 100644
--- a/src/main/webapp/oscarReport/cbi_report_form.jsp
+++ b/src/main/webapp/oscarReport/cbi_report_form.jsp
@@ -50,7 +50,7 @@
<%@page import="org.oscarehr.util.LoggedInInfo" %>
<%@page import="java.util.GregorianCalendar" %>
<%@page import="java.text.DateFormatSymbols" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="oscar.util.CBIUtil" %>
<%@page import="java.util.Date" %>
@@ -202,7 +202,7 @@
if (provider.getProviderNo().equals(Provider.SYSTEM_PROVIDER_NO)) continue;
%>
-
<%
}
@@ -217,7 +217,7 @@
for (Program program : programs) {
%>
-
<%
}
diff --git a/src/main/webapp/oscarReport/cbi_report_results.jsp b/src/main/webapp/oscarReport/cbi_report_results.jsp
index c1395bbaabd..d0dec13d223 100644
--- a/src/main/webapp/oscarReport/cbi_report_results.jsp
+++ b/src/main/webapp/oscarReport/cbi_report_results.jsp
@@ -54,13 +54,13 @@
<%@page import="java.text.SimpleDateFormat" %>
<%@page import="java.text.DateFormat" %>
-<%@page import="org.apache.commons.lang.time.DateFormatUtils" %>
+<%@page import="org.apache.commons.lang3.time.DateFormatUtils" %>
<%@page import="java.util.HashSet" %>
<%@page import="org.oscarehr.PMmodule.model.Program" %>
<%@page import="org.oscarehr.PMmodule.dao.ProgramDao" %>
<%@page import="org.oscarehr.PMmodule.service.ProgramManager" %>
-<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang3.StringUtils" %>
<%@page import="org.oscarehr.common.model.Provider" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
<%@page import="org.oscarehr.managers.ProviderManager2" %>
@@ -68,7 +68,7 @@
<%@page import="org.oscarehr.common.model.CdsFormOption" %>
<%@page import="org.oscarehr.web.Cds4ReportUIBean" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%
CBIUtil cbiUtil = new CBIUtil();
diff --git a/src/main/webapp/oscarReport/cbi_submit_form.jsp b/src/main/webapp/oscarReport/cbi_submit_form.jsp
index 9f291255f0c..9d8196d3717 100644
--- a/src/main/webapp/oscarReport/cbi_submit_form.jsp
+++ b/src/main/webapp/oscarReport/cbi_submit_form.jsp
@@ -47,7 +47,7 @@
<%@page import="org.oscarehr.PMmodule.dao.*" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
<%@page import="java.text.DateFormatSymbols" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="org.oscarehr.web.*" %>
<%@page import="oscar.util.CBIUtil" %>
diff --git a/src/main/webapp/oscarReport/cds_4_report_form.jsp b/src/main/webapp/oscarReport/cds_4_report_form.jsp
index 946afae8680..ecfa5612171 100755
--- a/src/main/webapp/oscarReport/cds_4_report_form.jsp
+++ b/src/main/webapp/oscarReport/cds_4_report_form.jsp
@@ -50,7 +50,7 @@
<%@page import="org.oscarehr.util.LoggedInInfo" %>
<%@page import="java.util.GregorianCalendar" %>
<%@page import="java.text.DateFormatSymbols" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@ include file="/taglibs.jsp" %>
-
<%
}
@@ -198,7 +198,7 @@
for (Program program : programs) {
%>
-
<%
}
diff --git a/src/main/webapp/oscarReport/cds_4_report_results.jsp b/src/main/webapp/oscarReport/cds_4_report_results.jsp
index 7f454faac5a..27b8c1a8be3 100755
--- a/src/main/webapp/oscarReport/cds_4_report_results.jsp
+++ b/src/main/webapp/oscarReport/cds_4_report_results.jsp
@@ -39,11 +39,11 @@
%>
<%@page import="org.oscarehr.util.LoggedInInfo" %>
-<%@page import="org.apache.commons.lang.time.DateFormatUtils" %>
+<%@page import="org.apache.commons.lang3.time.DateFormatUtils" %>
<%@page import="java.text.SimpleDateFormat" %>
<%@page import="org.oscarehr.PMmodule.model.Program" %>
<%@page import="java.util.HashSet" %>
-<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang3.StringUtils" %>
<%@page import="org.oscarehr.PMmodule.service.ProgramManager" %>
<%@page import="org.oscarehr.common.model.Provider" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
@@ -52,7 +52,7 @@
<%@page import="java.util.List" %>
<%@page import="org.oscarehr.common.model.CdsFormOption" %>
<%@page import="org.oscarehr.web.Cds4ReportUIBean" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%
LoggedInInfo loggedInInfo = LoggedInInfo.getLoggedInInfoFromSession(request);
ProviderManager2 providerManager = (ProviderManager2) SpringUtils.getBean(ProviderManager2.class);
@@ -110,14 +110,14 @@
<%
if (providerIdList != null) {
%>
-Providers : <%=StringEscapeUtils.escapeHtml(providerNamesList.toString())%>
+Providers : <%=StringEscapeUtils.escapeHtml4(providerNamesList.toString())%>
<%
}
if (programIds != null) {
%>
-Programs : <%=StringEscapeUtils.escapeHtml(programNamesList.toString())%>
+Programs : <%=StringEscapeUtils.escapeHtml4(programNamesList.toString())%>
<%
}
@@ -146,9 +146,9 @@
int[] dataRow = cds4ReportUIBean.getDataRow(cdsFormOption);
%>
- | <%=StringEscapeUtils.escapeHtml(cdsFormOption.getCdsDataCategory())%>
+ | <%=StringEscapeUtils.escapeHtml4(cdsFormOption.getCdsDataCategory())%>
|
- <%=StringEscapeUtils.escapeHtml(cdsFormOption.getCdsDataCategoryName())%>
+ | <%=StringEscapeUtils.escapeHtml4(cdsFormOption.getCdsDataCategoryName())%>
|
<%
for (int dataElement : dataRow) {
diff --git a/src/main/webapp/oscarReport/mis_report_form.jsp b/src/main/webapp/oscarReport/mis_report_form.jsp
index 108a6d13748..6d9e07359de 100755
--- a/src/main/webapp/oscarReport/mis_report_form.jsp
+++ b/src/main/webapp/oscarReport/mis_report_form.jsp
@@ -50,7 +50,7 @@
<%@page import="java.text.DateFormatSymbols" %>
<%@page import="org.oscarehr.PMmodule.dao.ProgramDao" %>
<%@page import="org.oscarehr.PMmodule.model.Program" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%
LoggedInInfo loggedInInfo = LoggedInInfo.getLoggedInInfoFromSession(request);
@@ -101,7 +101,7 @@
<%
for (FunctionalCentre functionalCentre : functionalCentres) {
%>
-
<%
}
@@ -121,7 +121,7 @@
for (Program program : programs) {
if (program.isBed() || program.isService()) {
%>
-
<%
}
diff --git a/src/main/webapp/oscarReport/ocan_iar.jsp b/src/main/webapp/oscarReport/ocan_iar.jsp
index 8555aa34c6f..b6a70987e0c 100755
--- a/src/main/webapp/oscarReport/ocan_iar.jsp
+++ b/src/main/webapp/oscarReport/ocan_iar.jsp
@@ -48,7 +48,7 @@
<%@page import="org.oscarehr.PMmodule.dao.*" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
<%@page import="java.text.DateFormatSymbols" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="org.oscarehr.web.*" %>
<%@ include file="/taglibs.jsp" %>
diff --git a/src/main/webapp/oscarReport/ocan_iar_detail.jsp b/src/main/webapp/oscarReport/ocan_iar_detail.jsp
index 47ebe71d018..98295b19f3e 100755
--- a/src/main/webapp/oscarReport/ocan_iar_detail.jsp
+++ b/src/main/webapp/oscarReport/ocan_iar_detail.jsp
@@ -48,7 +48,7 @@
<%@page import="org.oscarehr.PMmodule.dao.*" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
<%@page import="java.text.DateFormatSymbols" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="org.oscarehr.web.*" %>
<%@ include file="/taglibs.jsp" %>
diff --git a/src/main/webapp/oscarReport/ocan_report_form.jsp b/src/main/webapp/oscarReport/ocan_report_form.jsp
index 1536d7f8db4..23f32b3466e 100755
--- a/src/main/webapp/oscarReport/ocan_report_form.jsp
+++ b/src/main/webapp/oscarReport/ocan_report_form.jsp
@@ -47,7 +47,7 @@
<%@page import="org.oscarehr.PMmodule.dao.*" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
<%@page import="java.text.DateFormatSymbols" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@ include file="/taglibs.jsp" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
<%@page import="java.text.DateFormatSymbols" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="org.oscarehr.web.OcanReportingBean" %>
<%@page import="org.oscarehr.common.model.Demographic" %>
diff --git a/src/main/webapp/oscarReport/provider_service_report_export.jsp b/src/main/webapp/oscarReport/provider_service_report_export.jsp
index 596e7748908..bc215d1c9be 100755
--- a/src/main/webapp/oscarReport/provider_service_report_export.jsp
+++ b/src/main/webapp/oscarReport/provider_service_report_export.jsp
@@ -47,7 +47,7 @@
<%@page import="org.oscarehr.common.model.*" %>
<%@page import="org.oscarehr.util.*" %>
<%@page import="java.text.*" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%
String agencyName = oscar.OscarProperties.getInstance().getProperty("db_name", "");
String startDateString = request.getParameter("startDate");
diff --git a/src/main/webapp/oscarReport/reportByTemplate/addEditTemplate.jsp b/src/main/webapp/oscarReport/reportByTemplate/addEditTemplate.jsp
index 78387c6796f..42cbb2db165 100644
--- a/src/main/webapp/oscarReport/reportByTemplate/addEditTemplate.jsp
+++ b/src/main/webapp/oscarReport/reportByTemplate/addEditTemplate.jsp
@@ -29,7 +29,7 @@
String roleName$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
%>
-<%@ page import="oscar.oscarReport.reportByTemplate.*, java.sql.*, org.apache.commons.lang.StringUtils" %>
+<%@ page import="oscar.oscarReport.reportByTemplate.*, java.sql.*, org.apache.commons.lang3.StringUtils" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
diff --git a/src/main/webapp/oscarReport/reportByTemplate/resultReport.jsp b/src/main/webapp/oscarReport/reportByTemplate/resultReport.jsp
index b2b114ed265..756cb175390 100644
--- a/src/main/webapp/oscarReport/reportByTemplate/resultReport.jsp
+++ b/src/main/webapp/oscarReport/reportByTemplate/resultReport.jsp
@@ -30,7 +30,7 @@
%>
<%@ page
- import="java.util.*,oscar.oscarReport.reportByTemplate.*,java.sql.*, org.apache.commons.lang.StringEscapeUtils" %>
+ import="java.util.*,oscar.oscarReport.reportByTemplate.*,java.sql.*, org.apache.commons.text.StringEscapeUtils" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
@@ -151,7 +151,7 @@
<%}%>
-
+
@@ -171,7 +171,7 @@
<%
for (int x = 0; x < sqlList.size(); x++) {
- out.println((x + 1) + ")" + org.apache.commons.lang.StringEscapeUtils.escapeHtml(sqlList.get(x).trim()));
+ out.println((x + 1) + ")" + org.apache.commons.text.StringEscapeUtils.escapeHtml4(sqlList.get(x).trim()));
}
%>
diff --git a/src/main/webapp/oscarReport/reportByTemplate/viewTemplate.jsp b/src/main/webapp/oscarReport/reportByTemplate/viewTemplate.jsp
index 73cef8c6aba..47ede50817f 100644
--- a/src/main/webapp/oscarReport/reportByTemplate/viewTemplate.jsp
+++ b/src/main/webapp/oscarReport/reportByTemplate/viewTemplate.jsp
@@ -29,7 +29,7 @@
String roleName$ = (String) session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
%>
-<%@ page import="oscar.oscarReport.reportByTemplate.*, org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="oscar.oscarReport.reportByTemplate.*, org.apache.commons.text.StringEscapeUtils" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
@@ -78,7 +78,7 @@
<%}%>
- <%=StringEscapeUtils.escapeHtml(xml)%>
+ <%=StringEscapeUtils.escapeHtml4(xml)%>
diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/currentCodeList.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/currentCodeList.jsp
index ab4a413e3d3..dc9586d42bb 100644
--- a/src/main/webapp/oscarResearch/oscarDxResearch/currentCodeList.jsp
+++ b/src/main/webapp/oscarResearch/oscarDxResearch/currentCodeList.jsp
@@ -71,7 +71,7 @@
for (int i = 0; i < patientDxA.size(); i++) {
String desc = patientDxA.get(i).getDescription();
if (len != -1) {
- desc = org.apache.commons.lang.StringUtils.abbreviate(desc, len);
+ desc = org.apache.commons.lang3.StringUtils.abbreviate(desc, len);
}
%>>
- <%=desc%>
diff --git a/src/main/webapp/oscarRx/DisplayRxRecord.jsp b/src/main/webapp/oscarRx/DisplayRxRecord.jsp
index 413bc533c69..f3ef386ec0c 100644
--- a/src/main/webapp/oscarRx/DisplayRxRecord.jsp
+++ b/src/main/webapp/oscarRx/DisplayRxRecord.jsp
@@ -35,7 +35,7 @@
<%@page import="org.oscarehr.util.LoggedInInfo" %>
<%@page import="java.text.SimpleDateFormat" %>
<%@page import="java.util.List" %>
-<%@page import="org.apache.commons.lang.StringUtils" %>
+<%@page import="org.apache.commons.lang3.StringUtils" %>
<%@page import="org.oscarehr.common.dao.DrugDao,org.oscarehr.common.model.Drug,org.oscarehr.util.MiscUtils,org.oscarehr.util.SpringUtils,org.oscarehr.PMmodule.dao.ProviderDao,org.oscarehr.common.dao.DemographicDao" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
diff --git a/src/main/webapp/oscarRx/HsfoPreview.jsp b/src/main/webapp/oscarRx/HsfoPreview.jsp
index e1d6e39b33e..f0fadeb27e6 100755
--- a/src/main/webapp/oscarRx/HsfoPreview.jsp
+++ b/src/main/webapp/oscarRx/HsfoPreview.jsp
@@ -29,7 +29,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="oscar.oscarProvider.data.*" %>
-<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%@ page import="oscar.*,java.lang.*" %>
<%@ page import="org.oscarehr.util.LoggedInInfo" %>
@@ -100,14 +100,14 @@
clinicTitle += provider.getClinicAddress() + "
";
clinicTitle += provider.getClinicCity() + " " + provider.getClinicPostal();
%>
+ value="<%= StringEscapeUtils.escapeHtml4(doctorName) %>"/>
)","\\\n")) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(clinicTitle.replaceAll("(
)","\\\n")) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(provider.getClinicPhone()) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(provider.getClinicFax()) %>"/>
"/>
"/>
+ value="<%= StringEscapeUtils.escapeHtml4(patient.getFirstName())+ " " +StringEscapeUtils.escapeHtml4(patient.getSurname()) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(patient.getAddress()) %>"/>
"/>
+ value="<%= StringEscapeUtils.escapeHtml4(patient.getCity())+ " " + StringEscapeUtils.escapeHtml4(patient.getPostal())%>"/>
"/>
+ value="<%= "Tel: " + StringEscapeUtils.escapeHtml4(patient.getPhone()) %>"/>
"/>
+ value="<%= StringEscapeUtils.escapeHtml4(oscar.oscarRx.util.RxUtil.DateToString(oscar.oscarRx.util.RxUtil.Today(), "MMMM d, yyyy")) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(doctorName) %>"/>
"/>
+ value="<%= StringEscapeUtils.escapeHtml4(strRx.replaceAll(";","\\\n")) %>"/>
|
diff --git a/src/main/webapp/oscarRx/ListDrugs.jsp b/src/main/webapp/oscarRx/ListDrugs.jsp
index 5bc8e81722f..0f03a3bc901 100644
--- a/src/main/webapp/oscarRx/ListDrugs.jsp
+++ b/src/main/webapp/oscarRx/ListDrugs.jsp
@@ -25,7 +25,7 @@
--%>
<%@page import="org.oscarehr.common.model.PartialDate" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="org.oscarehr.casemgmt.web.PrescriptDrug" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -363,7 +363,7 @@
if (prescriptDrug.getRemoteFacilityId() == null) {
%>
+ onclick="window.open('<%= request.getContextPath() %>/annotation/annotation.jsp?display=<%=annotation_display%>&table_id=<%=prescriptIdInt%>&demo=<%=bean.getDemographicNo()%>&drugSpecial=<%=StringEscapeUtils.escapeEcmaScript(specialText)%>','anwin','width=400,height=500');">
<%if (!isPrevAnnotation) {%>  %>/images/notes.gif) <%} else {%> %>/images/filledNotes.gif) <%}%>
@@ -529,7 +529,7 @@
codeDescr = codingSystemManager.getCodeDescription(drugReason.getCodingSystem(), drugReason.getCode());
}
if (codeDescr != null) {
- sb.append(StringEscapeUtils.escapeHtml(codeDescr));
+ sb.append(StringEscapeUtils.escapeHtml4(codeDescr));
} else {
sb.append(drugReason.getCode());
}
diff --git a/src/main/webapp/oscarRx/Preview.jsp b/src/main/webapp/oscarRx/Preview.jsp
index d5c0d85c9b6..787f1076c2d 100644
--- a/src/main/webapp/oscarRx/Preview.jsp
+++ b/src/main/webapp/oscarRx/Preview.jsp
@@ -29,7 +29,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="oscar.oscarProvider.data.*, oscar.log.*" %>
-<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%@ page import="org.apache.logging.log4j.Logger" %>
<%@ page import="oscar.*,java.lang.*,java.util.Date" %>
<%@ page import="org.oscarehr.util.LoggedInInfo" %>
@@ -150,14 +150,14 @@
clinicTitle += provider.getClinicAddress() + "
";
clinicTitle += provider.getClinicCity() + " " + provider.getClinicPostal();
%>
+ value="<%= StringEscapeUtils.escapeHtml4(doctorName) %>"/>
)","\\\n")) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(clinicTitle.replaceAll("(
)","\\\n")) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(provider.getClinicPhone()) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(provider.getClinicFax()) %>"/>
"/>
"/>
+ value="<%= StringEscapeUtils.escapeHtml4(patient.getFirstName())+ " " +StringEscapeUtils.escapeHtml4(patient.getSurname()) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(patient.getAddress()) %>"/>
"/>
+ value="<%= StringEscapeUtils.escapeHtml4(patient.getCity())+ ", " + StringEscapeUtils.escapeHtml4(patient.getProvince()) + " " + StringEscapeUtils.escapeHtml4(patient.getPostal())%>"/>
<%=StringEscapeUtils.escapeHtml(patient.getPhone()) %>"/>
+ value="<%=StringEscapeUtils.escapeHtml4(patient.getPhone()) %>"/>
"/>
+ value="<%= StringEscapeUtils.escapeHtml4(oscar.oscarRx.util.RxUtil.DateToString(rxDate, "MMMM d, yyyy")) %>"/>
+ value="<%= StringEscapeUtils.escapeHtml4(doctorName) %>"/>
|
<%=doctorName%>
@@ -247,7 +247,7 @@
strRxNoNewLines.append(rx.getFullOutLine().replaceAll(";", " ") + "\n");
}
%> "/>
+ value="<%= StringEscapeUtils.escapeHtml4(strRx.replaceAll(";","\\\n")) %>"/>
|
diff --git a/src/main/webapp/oscarRx/Preview2.jsp b/src/main/webapp/oscarRx/Preview2.jsp
index cb24fdfa90f..919fa5da0c2 100644
--- a/src/main/webapp/oscarRx/Preview2.jsp
+++ b/src/main/webapp/oscarRx/Preview2.jsp
@@ -29,7 +29,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page import="oscar.oscarProvider.data.ProSignatureData, oscar.oscarProvider.data.ProviderData" %>
<%@ page import="oscar.oscarRx.data.*" %>
-<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="org.apache.commons.text.StringEscapeUtils" %>
<%@ page import="oscar.*,
java.lang.*,
@@ -336,7 +336,7 @@
}
%>
@@ -244,20 +244,20 @@
|
+ cols="60"><%=StringEscapeUtils.escapeHtml4(messageBody)%>
<%
if (filename != null) {
%>
- <%=StringEscapeUtils.escapeHtml(filename)%>
+ <%=StringEscapeUtils.escapeHtml4(filename)%>
- (<%=StringEscapeUtils.escapeHtml(mimeType)%> <%=fileSize%> bytes)
+ (<%=StringEscapeUtils.escapeHtml4(mimeType)%> <%=fileSize%> bytes)
open
download
+ download="<%=StringEscapeUtils.escapeHtml4(filename)%>">download
<%
if (demographic != null) {
%>
diff --git a/src/main/webapp/pregnancy/migrateToSplitOnArEnhancedForm.jsp b/src/main/webapp/pregnancy/migrateToSplitOnArEnhancedForm.jsp
index b76b04a5b20..c660c6e5ba3 100644
--- a/src/main/webapp/pregnancy/migrateToSplitOnArEnhancedForm.jsp
+++ b/src/main/webapp/pregnancy/migrateToSplitOnArEnhancedForm.jsp
@@ -40,7 +40,7 @@
<%@page import="oscar.oscarDB.*" %>
<%@page import="java.sql.*" %>
<%@page import="java.util.*" %>
-<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@page import="org.apache.commons.text.StringEscapeUtils" %>
<%@page import="org.oscarehr.util.DbConnectionFilter" %>
<%@page import="org.oscarehr.util.MiscUtils" %>
<%@page import="org.oscarehr.util.LoggedInInfo" %>
diff --git a/src/main/webapp/provider/appointmentFormsLinks.jspf b/src/main/webapp/provider/appointmentFormsLinks.jspf
index f01c860b31e..5e3bbcccef6 100755
--- a/src/main/webapp/provider/appointmentFormsLinks.jspf
+++ b/src/main/webapp/provider/appointmentFormsLinks.jspf
@@ -1,6 +1,6 @@
<%@page import="org.oscarehr.web.AppointmentProviderAdminDayUIBean"%>
<%@page import="java.util.Collection, java.util.Collections, java.util.List, java.util.ArrayList"%>
-<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@page import="org.apache.commons.text.StringEscapeUtils"%>
<%@page import="org.oscarehr.common.model.ProviderPreference"%>
<%@page import="org.oscarehr.util.LoggedInInfo"%>
<%@page import="org.oscarehr.common.model.EForm"%>
@@ -18,8 +18,8 @@
for (String formNameTemp : formNamesList)
{
- String trimmedEscapedLinkName=StringEscapeUtils.escapeHtml(AppointmentProviderAdminDayUIBean.getLengthLimitedLinkName(loggedInInfo3, formNameTemp));
- String escapedLinkName=StringEscapeUtils.escapeHtml(formNameTemp);
+ String trimmedEscapedLinkName=StringEscapeUtils.escapeHtml4(AppointmentProviderAdminDayUIBean.getLengthLimitedLinkName(loggedInInfo3, formNameTemp));
+ String escapedLinkName=StringEscapeUtils.escapeHtml4(formNameTemp);
%>
| <%=trimmedEscapedLinkName%>
<%
@@ -30,8 +30,8 @@
{
Integer eFormIdTemp = eFormLink.getAppointmentScreenEForm();
EForm eForm=AppointmentProviderAdminDayUIBean.getEForms(eFormIdTemp);
- String trimmedEscapedLinkName=StringEscapeUtils.escapeHtml(AppointmentProviderAdminDayUIBean.getLengthLimitedLinkName(loggedInInfo3, eForm.getFormName()));
- String escapedLinkName=StringEscapeUtils.escapeHtml(eForm.getFormName());
+ String trimmedEscapedLinkName=StringEscapeUtils.escapeHtml4(AppointmentProviderAdminDayUIBean.getLengthLimitedLinkName(loggedInInfo3, eForm.getFormName()));
+ String escapedLinkName=StringEscapeUtils.escapeHtml4(eForm.getFormName());
%>
| <%=trimmedEscapedLinkName%>
<%
@@ -40,14 +40,14 @@
Collection quickLinks=providerPreference.getAppointmentScreenQuickLinks();
for (ProviderPreference.QuickLink quickLink : quickLinks)
{
- String trimmedEscapedLinkName=StringEscapeUtils.escapeHtml(AppointmentProviderAdminDayUIBean.getLengthLimitedLinkName(loggedInInfo3, quickLink.getName()));
+ String trimmedEscapedLinkName=StringEscapeUtils.escapeHtml4(AppointmentProviderAdminDayUIBean.getLengthLimitedLinkName(loggedInInfo3, quickLink.getName()));
String escapedLinkUrl=quickLink.getUrl();
escapedLinkUrl=escapedLinkUrl.replaceAll("\\$\\{contextPath\\}", request.getContextPath());
escapedLinkUrl=escapedLinkUrl.replaceAll("\\$\\{demographicId\\}", String.valueOf(demographic_no));
- escapedLinkUrl=StringEscapeUtils.escapeHtml(escapedLinkUrl);
+ escapedLinkUrl=StringEscapeUtils.escapeHtml4(escapedLinkUrl);
- String escapedLinkName=StringEscapeUtils.escapeHtml(quickLink.getName());
+ String escapedLinkName=StringEscapeUtils.escapeHtml4(quickLink.getName());
%>
|<%=trimmedEscapedLinkName%>
<%
diff --git a/src/main/webapp/provider/appointmentPregnancy.jspf b/src/main/webapp/provider/appointmentPregnancy.jspf
index f8984f049e3..96fdee9362d 100755
--- a/src/main/webapp/provider/appointmentPregnancy.jspf
+++ b/src/main/webapp/provider/appointmentPregnancy.jspf
@@ -1,6 +1,6 @@
<%@page import="org.oscarehr.web.AppointmentProviderAdminDayUIBean"%>
<%@page import="java.util.Collection, java.util.Collections, java.util.List, java.util.ArrayList"%>
-<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@page import="org.apache.commons.text.StringEscapeUtils"%>
<%@page import="org.oscarehr.common.model.ProviderPreference"%>
<%@page import="org.oscarehr.common.dao.PregnancyFormsDao" %>
<%
diff --git a/src/main/webapp/provider/appointmentprovideradminday.jsp b/src/main/webapp/provider/appointmentprovideradminday.jsp
index f77706ef634..119ce45502f 100644
--- a/src/main/webapp/provider/appointmentprovideradminday.jsp
+++ b/src/main/webapp/provider/appointmentprovideradminday.jsp
@@ -60,8 +60,9 @@
<%@page import="org.oscarehr.common.model.ProviderPreference" %>
<%@ page import="org.oscarehr.managers.*" %>
<%@ page import="java.util.*,java.text.*,java.net.*,oscar.*,oscar.util.*" %>
-<%@ page import="org.apache.commons.lang.*" %>
-<%@ page import="org.apache.commons.lang.StringUtils" %>
+<%@ page import="org.apache.commons.lang3.*" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
+<%@ page import="org.apache.commons.text.WordUtils" %>
<%@ page import="org.oscarehr.common.model.*" %>
<%@ page import="org.oscarehr.managers.PreventionManager" %>
<%@ page import="org.owasp.encoder.Encode" %>
@@ -469,7 +470,7 @@
- <%=WordUtils.capitalize(userlastname + ", " + org.apache.commons.lang.StringUtils.substring(userfirstname, 0, 1)) + "-"%><fmt:setBundle basename="oscarResources"/><fmt:message key="provider.appointmentProviderAdminDay.title"/>
+ <%= WordUtils.capitalize(userlastname + ", " + StringUtils.substring(userfirstname, 0, 1)) + "-" %><fmt:setBundle basename="oscarResources"/><fmt:message key="provider.appointmentProviderAdminDay.title"/>
<%@ page import=" org.oscarehr.util.*"%>
<%@ page import="java.util.*, java.net.URLEncoder "%>
-<%@ page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@ page import="org.apache.commons.text.StringEscapeUtils"%>
<%@ page import="org.oscarehr.PMmodule.dao.ProviderDao, org.oscarehr.common.model.Provider" %>
<%@ page import="org.oscarehr.common.dao.DemographicDao" %>
<%@ page import="oscar.OscarProperties" %>
@@ -85,7 +85,7 @@ clH = ["
"));
+ return (StringEscapeUtils.escapeHtml(s).replaceAll("\\n", "
"));
// if (null == S) return S;
// int N = S.length();
diff --git a/src/main/java/oscar/MyDateFormat.java b/src/main/java/oscar/MyDateFormat.java
index fffd29b198d..11bbf72311f 100644
--- a/src/main/java/oscar/MyDateFormat.java
+++ b/src/main/java/oscar/MyDateFormat.java
@@ -31,7 +31,7 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.util.MiscUtils;
import com.quatro.common.KeyConstants;
diff --git a/src/main/java/oscar/eform/EFormLoader.java b/src/main/java/oscar/eform/EFormLoader.java
index 8f247734bb6..4da7f95d372 100644
--- a/src/main/java/oscar/eform/EFormLoader.java
+++ b/src/main/java/oscar/eform/EFormLoader.java
@@ -27,7 +27,7 @@
package oscar.eform;
import org.apache.commons.digester.Digester;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.util.MiscUtils;
import oscar.eform.data.DatabaseAP;
diff --git a/src/main/java/oscar/eform/EFormUtil.java b/src/main/java/oscar/eform/EFormUtil.java
index 05d79f7a03f..0434eb51467 100644
--- a/src/main/java/oscar/eform/EFormUtil.java
+++ b/src/main/java/oscar/eform/EFormUtil.java
@@ -28,9 +28,9 @@
import com.quatro.model.security.Secobjprivilege;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.dao.ProviderDao;
import org.oscarehr.PMmodule.model.ProgramProvider;
diff --git a/src/main/java/oscar/eform/data/DatabaseAP.java b/src/main/java/oscar/eform/data/DatabaseAP.java
index 04f2fec3a48..2d67f1a783b 100644
--- a/src/main/java/oscar/eform/data/DatabaseAP.java
+++ b/src/main/java/oscar/eform/data/DatabaseAP.java
@@ -28,9 +28,7 @@
import java.util.ArrayList;
-import org.apache.commons.text.StringEscapeUtils;
-
-import org.oscarehr.util.SqlEscapeUtil;
+import org.apache.commons.lang.StringEscapeUtils;
public class DatabaseAP {
private String apName;
@@ -171,7 +169,7 @@ public static String parserReplace(String name, String var, DatabaseAP dbap, boo
if (inSql) sql = dbap.getApInSQL();
else sql = dbap.getApSQL();
- var = SqlEscapeUtil.escapeSql(var);
+ var = StringEscapeUtils.escapeSql(var);
sql = DatabaseAP.parserReplace(name, var, sql);
diff --git a/src/main/java/oscar/eform/data/EForm.java b/src/main/java/oscar/eform/data/EForm.java
index a92ac076417..53afff9a5fc 100644
--- a/src/main/java/oscar/eform/data/EForm.java
+++ b/src/main/java/oscar/eform/data/EForm.java
@@ -28,8 +28,8 @@
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
@@ -49,7 +49,6 @@
import oscar.oscarEncounter.oscarMeasurements.util.WriteNewMeasurements;
import oscar.util.StringBuilderUtils;
import oscar.util.UtilDateUtilities;
-import org.oscarehr.util.SqlEscapeUtil;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -725,7 +724,7 @@ public String replaceAllFields(String sql) {
private String getSqlParams(String key) {
if (sql_params.containsKey(key)) {
String val = sql_params.get(key);
- return val == null ? "" : SqlEscapeUtil.escapeSql(val);
+ return val == null ? "" : StringEscapeUtils.escapeSql(val);
}
return "";
}
diff --git a/src/main/java/oscar/entities/Billingmaster.java b/src/main/java/oscar/entities/Billingmaster.java
index 404128c3109..b017d4df13e 100644
--- a/src/main/java/oscar/entities/Billingmaster.java
+++ b/src/main/java/oscar/entities/Billingmaster.java
@@ -39,8 +39,8 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
import org.oscarehr.util.MiscUtils;
import oscar.util.UtilDateUtilities;
diff --git a/src/main/java/oscar/entities/WCB.java b/src/main/java/oscar/entities/WCB.java
index 1b27af4b2e3..f042a5f4255 100644
--- a/src/main/java/oscar/entities/WCB.java
+++ b/src/main/java/oscar/entities/WCB.java
@@ -37,7 +37,7 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import oscar.util.StringUtils;
diff --git a/src/main/java/oscar/form/FrmBCAR2012Record.java b/src/main/java/oscar/form/FrmBCAR2012Record.java
index 0db754bc8ca..d3364817b36 100644
--- a/src/main/java/oscar/form/FrmBCAR2012Record.java
+++ b/src/main/java/oscar/form/FrmBCAR2012Record.java
@@ -29,7 +29,7 @@
import java.util.Date;
import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
diff --git a/src/main/java/oscar/form/FrmBCAR20202Action.java b/src/main/java/oscar/form/FrmBCAR20202Action.java
index 71d4b0ced29..50503cd816d 100644
--- a/src/main/java/oscar/form/FrmBCAR20202Action.java
+++ b/src/main/java/oscar/form/FrmBCAR20202Action.java
@@ -33,7 +33,7 @@
import net.sf.jasperreports.engine.export.JRPdfExporter;
import net.sf.jasperreports.export.SimpleExporterInput;
import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.DemographicDao;
import org.oscarehr.common.dao.PrintResourceLogDao;
diff --git a/src/main/java/oscar/form/FrmBCAR2020Record.java b/src/main/java/oscar/form/FrmBCAR2020Record.java
index 08c58ec6f4f..a567f84266a 100644
--- a/src/main/java/oscar/form/FrmBCAR2020Record.java
+++ b/src/main/java/oscar/form/FrmBCAR2020Record.java
@@ -24,7 +24,7 @@
*/
package oscar.form;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.model.Provider;
import org.oscarehr.util.LoggedInInfo;
diff --git a/src/main/java/oscar/form/FrmLabReq07Record.java b/src/main/java/oscar/form/FrmLabReq07Record.java
index ae91bbc4f3e..19ab906a5ce 100644
--- a/src/main/java/oscar/form/FrmLabReq07Record.java
+++ b/src/main/java/oscar/form/FrmLabReq07Record.java
@@ -36,7 +36,7 @@
import java.util.Locale;
import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
import org.oscarehr.PMmodule.caisi_integrator.IntegratorFallBackManager;
diff --git a/src/main/java/oscar/form/FrmLabReq10Record.java b/src/main/java/oscar/form/FrmLabReq10Record.java
index c0620f310fb..35f39b73cb3 100644
--- a/src/main/java/oscar/form/FrmLabReq10Record.java
+++ b/src/main/java/oscar/form/FrmLabReq10Record.java
@@ -34,7 +34,7 @@
import java.util.Locale;
import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
import org.oscarehr.PMmodule.dao.ProviderDao;
diff --git a/src/main/java/oscar/form/FrmONAREnhancedRecord.java b/src/main/java/oscar/form/FrmONAREnhancedRecord.java
index dfc48dff433..f33c0ee70b1 100644
--- a/src/main/java/oscar/form/FrmONAREnhancedRecord.java
+++ b/src/main/java/oscar/form/FrmONAREnhancedRecord.java
@@ -37,7 +37,7 @@
import java.util.List;
import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.util.DbConnectionFilter;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
diff --git a/src/main/java/oscar/form/FrmRecord.java b/src/main/java/oscar/form/FrmRecord.java
index 5de004fa515..1c047f75bed 100644
--- a/src/main/java/oscar/form/FrmRecord.java
+++ b/src/main/java/oscar/form/FrmRecord.java
@@ -30,7 +30,7 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.common.dao.DemographicExtDao;
import org.oscarehr.common.model.Demographic;
import org.oscarehr.common.model.DemographicExt;
diff --git a/src/main/java/oscar/form/FrmRecordHelp.java b/src/main/java/oscar/form/FrmRecordHelp.java
index 8bbaa62b365..6c7029f15da 100644
--- a/src/main/java/oscar/form/FrmRecordHelp.java
+++ b/src/main/java/oscar/form/FrmRecordHelp.java
@@ -37,7 +37,7 @@
import java.util.List;
import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.util.MiscUtils;
import org.w3c.dom.Document;
diff --git a/src/main/java/oscar/form/pageUtil/FrmForm2Action.java b/src/main/java/oscar/form/pageUtil/FrmForm2Action.java
index b07081e1e80..c32f0f0bdd9 100644
--- a/src/main/java/oscar/form/pageUtil/FrmForm2Action.java
+++ b/src/main/java/oscar/form/pageUtil/FrmForm2Action.java
@@ -48,7 +48,6 @@
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.OscarProperties;
import oscar.form.FrmRecordHelp;
@@ -180,12 +179,15 @@ public String execute()
props.setProperty("surname", demo.getLastName());
props.setProperty("givenName", demo.getFirstName());
- String diagnosisVT = org.oscarehr.util.SqlEscapeUtil.escapeSql((String) this.getValue("diagnosisVT"));
+ String diagnosisVT = org.apache.commons.lang.StringEscapeUtils
+ .escapeSql((String) this.getValue("diagnosisVT"));
- String subjective = org.oscarehr.util.SqlEscapeUtil.escapeSql((String) this.getValue("subjective"));
- String objective = org.oscarehr.util.SqlEscapeUtil.escapeSql((String) this.getValue("objective"));
- String assessment = org.oscarehr.util.SqlEscapeUtil.escapeSql((String) this.getValue("assessment"));
- String plan = org.oscarehr.util.SqlEscapeUtil.escapeSql((String) this.getValue("plan"));
+ String subjective = org.apache.commons.lang.StringEscapeUtils
+ .escapeSql((String) this.getValue("subjective"));
+ String objective = org.apache.commons.lang.StringEscapeUtils.escapeSql((String) this.getValue("objective"));
+ String assessment = org.apache.commons.lang.StringEscapeUtils
+ .escapeSql((String) this.getValue("assessment"));
+ String plan = org.apache.commons.lang.StringEscapeUtils.escapeSql((String) this.getValue("plan"));
// for VTForm
props.setProperty("Diagnosis", diagnosisVT);
@@ -212,7 +214,7 @@ public String execute()
}
String comments = (String) this.getValue(type + "Comments");
- comments = org.oscarehr.util.SqlEscapeUtil.escapeSql(comments);
+ comments = org.apache.commons.lang.StringEscapeUtils.escapeSql(comments);
logger.debug("type: " + type + " inputValue: " + inputValue);
// parse the checkbox value
diff --git a/src/main/java/oscar/form/pageUtil/FrmSetupForm2Action.java b/src/main/java/oscar/form/pageUtil/FrmSetupForm2Action.java
index 05aefa5d7a2..5dcf99cdbe6 100644
--- a/src/main/java/oscar/form/pageUtil/FrmSetupForm2Action.java
+++ b/src/main/java/oscar/form/pageUtil/FrmSetupForm2Action.java
@@ -37,7 +37,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.xmlrpc.XmlRpcClient;
import org.apache.xmlrpc.XmlRpcException;
import org.oscarehr.common.dao.MeasurementDao;
@@ -152,7 +152,7 @@ public String execute() throws Exception {
//String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props);
String decisionSupportURL = getPatientRlt(demo);
MiscUtils.getLogger().debug("decisionSupportURL" + decisionSupportURL);
- request.setAttribute("decisionSupportURL", StringEscapeUtils.escapeHtml4(decisionSupportURL));
+ request.setAttribute("decisionSupportURL", StringEscapeUtils.escapeHtml(decisionSupportURL));
//Get the most updated data from Miles"
String xmlStr = getMostRecentRecord(demo);
diff --git a/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhDrug.java b/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhDrug.java
index 2c92003fa54..8c12bc17a8f 100644
--- a/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhDrug.java
+++ b/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhDrug.java
@@ -25,8 +25,8 @@
package oscar.form.pharmaForms.formBPMH.bean;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ToStringBuilder;
/*
* Author: Dennis Warren
diff --git a/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhForm2Bean.java b/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhForm2Bean.java
index 258385930c7..a6ffd9c3fc7 100644
--- a/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhForm2Bean.java
+++ b/src/main/java/oscar/form/pharmaForms/formBPMH/bean/BpmhForm2Bean.java
@@ -25,7 +25,7 @@
package oscar.form.pharmaForms.formBPMH.bean;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
import org.oscarehr.common.model.Allergy;
import org.oscarehr.common.model.Demographic;
import org.oscarehr.common.model.DemographicCust;
diff --git a/src/main/java/oscar/form/pharmaForms/formBPMH/business/BpmhForm2Handler.java b/src/main/java/oscar/form/pharmaForms/formBPMH/business/BpmhForm2Handler.java
index f3b64b1e6e5..b47406be360 100644
--- a/src/main/java/oscar/form/pharmaForms/formBPMH/business/BpmhForm2Handler.java
+++ b/src/main/java/oscar/form/pharmaForms/formBPMH/business/BpmhForm2Handler.java
@@ -25,7 +25,7 @@
package oscar.form.pharmaForms.formBPMH.business;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.dao.ProviderDao;
import org.oscarehr.common.dao.*;
diff --git a/src/main/java/oscar/form/pharmaForms/formBPMH/util/CaseNoteParser.java b/src/main/java/oscar/form/pharmaForms/formBPMH/util/CaseNoteParser.java
index 2f4f8e8eeff..925f153098d 100644
--- a/src/main/java/oscar/form/pharmaForms/formBPMH/util/CaseNoteParser.java
+++ b/src/main/java/oscar/form/pharmaForms/formBPMH/util/CaseNoteParser.java
@@ -27,7 +27,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
/*
* Author: Dennis Warren
diff --git a/src/main/java/oscar/form/util/FormTransportContainer.java b/src/main/java/oscar/form/util/FormTransportContainer.java
index ba6cf75514f..ccc2bef07cf 100644
--- a/src/main/java/oscar/form/util/FormTransportContainer.java
+++ b/src/main/java/oscar/form/util/FormTransportContainer.java
@@ -35,7 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.documentManager.ConvertToEdoc.DocumentType;
diff --git a/src/main/java/oscar/form/util/FrmXml2VTData.java b/src/main/java/oscar/form/util/FrmXml2VTData.java
index 5f92a98fefb..cfb1c99734c 100644
--- a/src/main/java/oscar/form/util/FrmXml2VTData.java
+++ b/src/main/java/oscar/form/util/FrmXml2VTData.java
@@ -36,7 +36,7 @@
import noNamespace.SitePatientVisitRecordsDocument;
import noNamespace.SitePatientVisitRecordsDocument.SitePatientVisitRecords;
-import org.apache.commons.text.WordUtils;
+import org.apache.commons.lang.WordUtils;
import org.apache.logging.log4j.Logger;
import oscar.form.data.FrmVTData;
diff --git a/src/main/java/oscar/log/LogAction.java b/src/main/java/oscar/log/LogAction.java
index ddad6917151..e20fb800ce0 100644
--- a/src/main/java/oscar/log/LogAction.java
+++ b/src/main/java/oscar/log/LogAction.java
@@ -31,7 +31,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.OscarLogDao;
import org.oscarehr.common.model.OscarLog;
diff --git a/src/main/java/oscar/oscarBilling/ca/bc/Teleplan/WCBCodes.java b/src/main/java/oscar/oscarBilling/ca/bc/Teleplan/WCBCodes.java
index fc30ce0cb81..638a53218ae 100644
--- a/src/main/java/oscar/oscarBilling/ca/bc/Teleplan/WCBCodes.java
+++ b/src/main/java/oscar/oscarBilling/ca/bc/Teleplan/WCBCodes.java
@@ -28,7 +28,7 @@
import java.util.Arrays;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.apache.logging.log4j.Logger;
import org.oscarehr.util.MiscUtils;
diff --git a/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/BillingCreateBilling2Action.java b/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/BillingCreateBilling2Action.java
index 5177508ea86..5d9a6817879 100644
--- a/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/BillingCreateBilling2Action.java
+++ b/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/BillingCreateBilling2Action.java
@@ -26,7 +26,7 @@
package oscar.oscarBilling.ca.bc.pageUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
diff --git a/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/WCBForm.java b/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/WCBForm.java
index c16f6b931a9..703c1cfc35e 100644
--- a/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/WCBForm.java
+++ b/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/WCBForm.java
@@ -26,7 +26,7 @@
package oscar.oscarBilling.ca.bc.pageUtil;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.oscarehr.util.MiscUtils;
import oscar.Misc;
import oscar.entities.WCB;
diff --git a/src/main/java/oscar/oscarBilling/ca/on/bean/BillingEDTOBECOutputSpecificationBeanHandler.java b/src/main/java/oscar/oscarBilling/ca/on/bean/BillingEDTOBECOutputSpecificationBeanHandler.java
index 2bfda360298..63e09212336 100644
--- a/src/main/java/oscar/oscarBilling/ca/on/bean/BillingEDTOBECOutputSpecificationBeanHandler.java
+++ b/src/main/java/oscar/oscarBilling/ca/on/bean/BillingEDTOBECOutputSpecificationBeanHandler.java
@@ -32,7 +32,7 @@
import java.util.List;
import java.util.Vector;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.PMmodule.dao.ProviderDao;
import org.oscarehr.common.dao.BatchEligibilityDao;
import org.oscarehr.common.model.BatchEligibility;
diff --git a/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBilling3rdPartImpl.java b/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBilling3rdPartImpl.java
index 54bebb20f5a..7cf2cf6c8e3 100644
--- a/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBilling3rdPartImpl.java
+++ b/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBilling3rdPartImpl.java
@@ -27,8 +27,8 @@
import java.util.List;
import java.util.Properties;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.billing.CA.ON.model.Billing3rdPartyAddress;
import org.oscarehr.common.dao.Billing3rdPartyAddressDao;
import org.oscarehr.common.dao.BillingONExtDao;
@@ -36,7 +36,6 @@
import org.oscarehr.common.model.BillingONExt;
import org.oscarehr.common.model.BillingPaymentType;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import org.oscarehr.common.dao.ClinicDAO;
import org.oscarehr.common.model.Clinic;
@@ -97,14 +96,14 @@ public Properties get3rdPayMethod() {
// 3rd bill ins. address
public int addOne3rdAddrRecord(Properties val) {
Billing3rdPartyAddress b = new Billing3rdPartyAddress();
- b.setAttention(SqlEscapeUtil.escapeSql(val.getProperty("attention", "")));
- b.setCompanyName(SqlEscapeUtil.escapeSql(val.getProperty("company_name", "")));
- b.setAddress(SqlEscapeUtil.escapeSql(val.getProperty("address", "")));
- b.setCity(SqlEscapeUtil.escapeSql(val.getProperty("city", "")));
- b.setProvince(SqlEscapeUtil.escapeSql(val.getProperty("province", "")));
- b.setPostalCode(SqlEscapeUtil.escapeSql(val.getProperty("postcode", "")));
- b.setTelephone(SqlEscapeUtil.escapeSql(val.getProperty("telephone", "")));
- b.setFax(SqlEscapeUtil.escapeSql(val.getProperty("fax", "")));
+ b.setAttention(StringEscapeUtils.escapeSql(val.getProperty("attention", "")));
+ b.setCompanyName(StringEscapeUtils.escapeSql(val.getProperty("company_name", "")));
+ b.setAddress(StringEscapeUtils.escapeSql(val.getProperty("address", "")));
+ b.setCity(StringEscapeUtils.escapeSql(val.getProperty("city", "")));
+ b.setProvince(StringEscapeUtils.escapeSql(val.getProperty("province", "")));
+ b.setPostalCode(StringEscapeUtils.escapeSql(val.getProperty("postcode", "")));
+ b.setTelephone(StringEscapeUtils.escapeSql(val.getProperty("telephone", "")));
+ b.setFax(StringEscapeUtils.escapeSql(val.getProperty("fax", "")));
dao.persist(b);
@@ -132,14 +131,14 @@ public boolean add3rdBillExt(String billingNo, String demoNo, String key, String
BillingONExt b = new BillingONExt();
b.setBillingNo(Integer.parseInt(billingNo));
b.setDemographicNo(Integer.parseInt(demoNo));
- b.setKeyVal(SqlEscapeUtil.escapeSql(key));
+ b.setKeyVal(StringEscapeUtils.escapeSql(key));
b.setDateTime(new Date());
b.setStatus(ACTIVE.toCharArray()[0]);
if (value == null && extDao.isNumberKey(key)) {
value = "0.00";
}
- b.setValue(SqlEscapeUtil.escapeSql(value));
+ b.setValue(StringEscapeUtils.escapeSql(value));
extDao.persist(b);
@@ -148,7 +147,7 @@ public boolean add3rdBillExt(String billingNo, String demoNo, String key, String
public boolean keyExists(String billingNo, String key) {
List results = extDao.findByBillingNoAndKey(Integer.parseInt(billingNo),
- SqlEscapeUtil.escapeSql(key));
+ StringEscapeUtils.escapeSql(key));
if (results.isEmpty())
return false;
return true;
@@ -156,7 +155,7 @@ public boolean keyExists(String billingNo, String key) {
public boolean updateKeyStatus(String billingNo, String key, String status) {
List results = extDao.findByBillingNoAndKey(Integer.parseInt(billingNo),
- SqlEscapeUtil.escapeSql(key));
+ StringEscapeUtils.escapeSql(key));
for (BillingONExt result : results) {
result.setStatus(status.toCharArray()[0]);
extDao.merge(result);
@@ -169,9 +168,9 @@ public boolean updateKeyStatus(String billingNo, String key, String status) {
*/
public boolean updateKeyValue(String billingNo, String key, String value) {
List results = extDao.findByBillingNoAndKey(Integer.parseInt(billingNo),
- SqlEscapeUtil.escapeSql(key));
+ StringEscapeUtils.escapeSql(key));
for (BillingONExt result : results) {
- result.setValue(SqlEscapeUtil.escapeSql(value));
+ result.setValue(StringEscapeUtils.escapeSql(value));
result.setStatus('1');
extDao.merge(result);
}
diff --git a/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingClaimImpl.java b/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingClaimImpl.java
index 979c355dcb0..4864301d0e1 100644
--- a/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingClaimImpl.java
+++ b/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingClaimImpl.java
@@ -28,8 +28,8 @@
import java.util.Map;
import java.util.Vector;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.billing.CA.ON.dao.BillingONDiskNameDao;
import org.oscarehr.billing.CA.ON.dao.BillingONFilenameDao;
@@ -55,7 +55,6 @@
import org.oscarehr.common.model.BillingPaymentType;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.util.UtilDateUtilities;
@@ -132,7 +131,7 @@ public int addOneClaimHeaderRecord(BillingClaimHeader1Data val) {
b.setAppointmentNo(null);
}
- b.setDemographicName(SqlEscapeUtil.escapeSql(val.demographic_name));
+ b.setDemographicName(StringEscapeUtils.escapeSql(val.demographic_name));
b.setSex(val.sex);
b.setProvince(val.province);
if (val.billing_date.length() > 0)
@@ -158,7 +157,7 @@ public int addOneClaimHeaderRecord(BillingClaimHeader1Data val) {
}
b.setStatus(val.status);
- b.setComment(SqlEscapeUtil.escapeSql(val.comment));
+ b.setComment(StringEscapeUtils.escapeSql(val.comment));
b.setVisitType(val.visittype);
b.setProviderOhipNo(val.provider_ohip_no);
b.setProviderRmaNo(val.provider_rma_no);
@@ -375,8 +374,8 @@ public boolean add3rdBillExt(Map mVal, int id, Vector vecObj) {
BillingONExt billingONExt = new BillingONExt();
billingONExt.setBillingNo(id);
billingONExt.setDemographicNo(Integer.parseInt(demoNo));
- billingONExt.setKeyVal(SqlEscapeUtil.escapeSql(temp[i]));
- billingONExt.setValue(SqlEscapeUtil.escapeSql(val));
+ billingONExt.setKeyVal(StringEscapeUtils.escapeSql(temp[i]));
+ billingONExt.setValue(StringEscapeUtils.escapeSql(val));
billingONExt.setDateTime(new Date());
billingONExt.setStatus('1');
extDao.persist(billingONExt);
diff --git a/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingCorrection.java b/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingCorrection.java
index e9bd38a86ce..e9cfe5560c4 100644
--- a/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingCorrection.java
+++ b/src/main/java/oscar/oscarBilling/ca/on/data/JdbcBillingCorrection.java
@@ -28,7 +28,7 @@
import java.util.List;
import java.util.Vector;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.oscarehr.common.dao.BillingONCHeader1Dao;
import org.oscarehr.common.dao.BillingONEAReportDao;
import org.oscarehr.common.dao.BillingONExtDao;
@@ -44,7 +44,6 @@
import org.oscarehr.common.model.BillingOnTransaction;
import org.oscarehr.common.model.RaDetail;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
public class JdbcBillingCorrection {
@@ -79,7 +78,7 @@ public boolean updateBillingClaimHeader(BillingClaimHeader1Data ch1Obj) throws P
c.setDemographicNo(Integer.parseInt(ch1Obj.getDemographic_no()));
c.setProviderNo(ch1Obj.getProvider_no());
c.setAppointmentNo(Integer.parseInt(ch1Obj.getAppointment_no()));
- c.setDemographicName(SqlEscapeUtil.escapeSql(ch1Obj.getDemographic_name()));
+ c.setDemographicName(StringEscapeUtils.escapeSql(ch1Obj.getDemographic_name()));
c.setSex(ch1Obj.getSex());
c.setProvince(ch1Obj.getProvince());
c.setBillingDate(dateFormatter.parse(ch1Obj.getBilling_date()));
@@ -109,7 +108,7 @@ public boolean updateBillingClaimHeader(BillingClaimHeader1Data ch1Obj) throws P
+ "'," + " demographic_no='" + ch1Obj.getDemographic_no() + "'," + " provider_no='"
+ ch1Obj.getProviderNo() + "'," + " appointment_no='" + ch1Obj.getAppointment_no() + "',"
- + " demographic_name='" + SqlEscapeUtil.escapeSql(ch1Obj.getDemographic_name()) + "'," + " sex='"
+ + " demographic_name='" + StringEscapeUtils.escapeSql(ch1Obj.getDemographic_name()) + "'," + " sex='"
+ ch1Obj.getSex() + "'," + " province='" + ch1Obj.getProvince() + "'," + " billing_date='"
+ ch1Obj.getBilling_date() + "'," + " billing_time='" + ch1Obj.getBilling_time() + "'," + " total='"
+ ch1Obj.getTotal() + "'," + " paid='" + ch1Obj.getPaid() + "'," + " status='" + ch1Obj.getStatus()
diff --git a/src/main/java/oscar/oscarDemographic/data/DemographicData.java b/src/main/java/oscar/oscarDemographic/data/DemographicData.java
index 467c0866c0b..3b979b40354 100644
--- a/src/main/java/oscar/oscarDemographic/data/DemographicData.java
+++ b/src/main/java/oscar/oscarDemographic/data/DemographicData.java
@@ -34,7 +34,7 @@
import java.util.Date;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.common.dao.DemographicCustDao;
import org.oscarehr.common.model.Demographic;
import org.oscarehr.common.model.DemographicCust;
diff --git a/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportAction42Action.java b/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportAction42Action.java
index 432a2b6e2fc..bdc1765992b 100644
--- a/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportAction42Action.java
+++ b/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportAction42Action.java
@@ -57,10 +57,10 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.text.WordUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.WordUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.apache.logging.log4j.Logger;
import org.apache.xmlbeans.XmlOptions;
import org.oscarehr.PMmodule.dao.ProviderDao;
diff --git a/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportHelper.java b/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportHelper.java
index 162c8738ae1..78de26de5a5 100644
--- a/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportHelper.java
+++ b/src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportHelper.java
@@ -28,7 +28,7 @@
import java.util.HashMap;
import java.util.List;
-import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.apache.logging.log4j.Logger;
import org.apache.xmlbeans.XmlOptions;
import org.oscarehr.casemgmt.model.CaseManagementNote;
diff --git a/src/main/java/oscar/oscarDemographic/pageUtil/ImportDemographicDataAction42Action.java b/src/main/java/oscar/oscarDemographic/pageUtil/ImportDemographicDataAction42Action.java
index f0a1f838e14..c608e8e40d4 100644
--- a/src/main/java/oscar/oscarDemographic/pageUtil/ImportDemographicDataAction42Action.java
+++ b/src/main/java/oscar/oscarDemographic/pageUtil/ImportDemographicDataAction42Action.java
@@ -66,8 +66,8 @@
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.xmlbeans.XmlException;
@@ -3003,7 +3003,7 @@ else if (aaReactArray[i].getSeverity() == cdsDt.AdverseReactionSeverity.NO) {
if (StringUtils.empty(encounter)) {
err_data.add("Empty clinical note (" + (i + 1) + ")");
//continue;
- encounter = org.apache.commons.lang3.StringUtils.trimToEmpty(encounter);
+ encounter = org.apache.commons.lang.StringUtils.trimToEmpty(encounter);
}
diff --git a/src/main/java/oscar/oscarEncounter/data/EctFormData.java b/src/main/java/oscar/oscarEncounter/data/EctFormData.java
index 0e9c0da5ed6..ad5928a0693 100644
--- a/src/main/java/oscar/oscarEncounter/data/EctFormData.java
+++ b/src/main/java/oscar/oscarEncounter/data/EctFormData.java
@@ -41,7 +41,7 @@
import javax.persistence.PersistenceException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
import org.oscarehr.PMmodule.caisi_integrator.IntegratorFallBackManager;
diff --git a/src/main/java/oscar/oscarEncounter/data/EctProviderData.java b/src/main/java/oscar/oscarEncounter/data/EctProviderData.java
index fc73e990596..a105c51057f 100644
--- a/src/main/java/oscar/oscarEncounter/data/EctProviderData.java
+++ b/src/main/java/oscar/oscarEncounter/data/EctProviderData.java
@@ -25,7 +25,7 @@
package oscar.oscarEncounter.data;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.oscarehr.PMmodule.dao.ProviderDao;
import org.oscarehr.util.SpringUtils;
diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConConstructSpecialistsScriptsFile.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConConstructSpecialistsScriptsFile.java
index 9508b968783..426dfeefb25 100644
--- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConConstructSpecialistsScriptsFile.java
+++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConConstructSpecialistsScriptsFile.java
@@ -154,8 +154,8 @@ public void makeString(Locale locale) {
}
private String escapeString(String s) {
- s = org.apache.commons.text.StringEscapeUtils.escapeEcmaScript(s);
- // s = org.apache.commons.text.StringEscapeUtils.escapeJava(s);
+ s = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(s);
+ // s = org.apache.commons.lang.StringEscapeUtils.escapeJava(s);
return s;
}
}
diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/ConsultationClinicalData2Action.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/ConsultationClinicalData2Action.java
index 90e35e1b1fd..4413b3f9328 100644
--- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/ConsultationClinicalData2Action.java
+++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/ConsultationClinicalData2Action.java
@@ -30,7 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.text.WordUtils;
+import org.apache.commons.lang.WordUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.casemgmt.model.CaseManagementNote;
import org.oscarehr.casemgmt.model.Issue;
diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Action.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Action.java
index a8dac8f7728..dc09179b982 100644
--- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Action.java
+++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Action.java
@@ -31,9 +31,9 @@
import ca.uhn.hl7v2.model.v26.message.REF_I12;
import com.opensymphony.xwork2.ActionSupport;
import net.sf.json.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.oscarehr.common.dao.*;
@@ -1100,7 +1100,7 @@ public String getOruR01UrlString(HttpServletRequest request) {
sb.append(WebUtils.buildQueryString(queryParameters));
- return (StringEscapeUtils.escapeHtml4(sb.toString()));
+ return (StringEscapeUtils.escapeHtml(sb.toString()));
}
/**
diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Form.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Form.java
index 7a01fce23e1..94403cbce68 100644
--- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Form.java
+++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequest2Form.java
@@ -26,8 +26,8 @@
package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.util.WebUtils;
import javax.servlet.http.HttpServletRequest;
@@ -497,7 +497,7 @@ public String getOruR01UrlString(HttpServletRequest request) {
sb.append(WebUtils.buildQueryString(queryParameters));
- return (StringEscapeUtils.escapeHtml4(sb.toString()));
+ return (StringEscapeUtils.escapeHtml(sb.toString()));
}
/**
diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestForm.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestForm.java
index dfca76e20bb..0d4fda6016c 100644
--- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestForm.java
+++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestForm.java
@@ -26,8 +26,8 @@
package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.util.WebUtils;
import javax.servlet.http.HttpServletRequest;
@@ -497,7 +497,7 @@ public String getOruR01UrlString(HttpServletRequest request) {
sb.append(WebUtils.buildQueryString(queryParameters));
- return (StringEscapeUtils.escapeHtml4(sb.toString()));
+ return (StringEscapeUtils.escapeHtml(sb.toString()));
}
/**
diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java
index fd516178e0e..f121876d933 100644
--- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java
+++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java
@@ -31,7 +31,7 @@
import java.util.List;
import java.util.Vector;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.oscarehr.PMmodule.dao.ProviderDao;
import org.oscarehr.common.dao.ConsultationRequestDao;
import org.oscarehr.common.dao.ConsultationRequestExtDao;
diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequest2Action.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequest2Action.java
index 329334769e1..f36fa98a38a 100644
--- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequest2Action.java
+++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequest2Action.java
@@ -38,7 +38,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.logging.log4j.Logger;
import org.apache.xml.security.exceptions.Base64DecodingException;
import org.apache.xml.security.utils.Base64;
diff --git a/src/main/java/oscar/oscarEncounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java b/src/main/java/oscar/oscarEncounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java
index 89639464f38..6d55170788e 100644
--- a/src/main/java/oscar/oscarEncounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java
+++ b/src/main/java/oscar/oscarEncounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java
@@ -35,7 +35,7 @@
import org.apache.http.HttpStatus;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.MeasurementDao;
import org.oscarehr.common.model.Demographic;
diff --git a/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctMeasurements2Action.java b/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctMeasurements2Action.java
index 2bee7dc82b8..e1bd904f1ab 100644
--- a/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctMeasurements2Action.java
+++ b/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctMeasurements2Action.java
@@ -28,7 +28,7 @@
import com.opensymphony.xwork2.ActionSupport;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.GenericValidator;
import org.apache.struts2.ServletActionContext;
@@ -45,7 +45,6 @@
import org.oscarehr.managers.SecurityInfoManager;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
import oscar.oscarEncounter.data.EctProgram;
@@ -226,7 +225,7 @@ public String execute() throws ServletException, IOException {
inputType = (String) this.getValue(inputTypeName);
mInstrc = (String) this.getValue(mInstrcName);
comments = (String) this.getValue(commentsName);
- comments = org.oscarehr.util.SqlEscapeUtil.escapeSql(comments);
+ comments = org.apache.commons.lang.StringEscapeUtils.escapeSql(comments);
validation = (String) this.getValue(validationName);
dateObserved = (String) this.getValue(dateName);
@@ -332,7 +331,7 @@ public String execute() throws ServletException, IOException {
json.write(response.getWriter());
return null;
} else {
- request.setAttribute("textOnEncounter", StringEscapeUtils.escapeEcmaScript(textOnEncounter));
+ request.setAttribute("textOnEncounter", StringEscapeUtils.escapeJavaScript(textOnEncounter));
return SUCCESS;
}
}
diff --git a/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/FormUpdate2Action.java b/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/FormUpdate2Action.java
index bec60df67c9..a4b2726ccf5 100644
--- a/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/FormUpdate2Action.java
+++ b/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/FormUpdate2Action.java
@@ -32,7 +32,6 @@
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -325,7 +324,7 @@ public boolean doInput(FlowSheetItem item, EctMeasurementTypesBean mtypeBean, Me
}
if (valid) {
- comments = org.oscarehr.util.SqlEscapeUtil.escapeSql(comments);
+ comments = org.apache.commons.lang.StringEscapeUtils.escapeSql(comments);
if (!GenericValidator.isBlankOrNull(inputValue)) {
Measurement measurement = new Measurement();
diff --git a/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/MeasurementGraphAction22Action.java b/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/MeasurementGraphAction22Action.java
index 1f41a4fd562..e5ebb76e97e 100644
--- a/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/MeasurementGraphAction22Action.java
+++ b/src/main/java/oscar/oscarEncounter/oscarMeasurements/pageUtil/MeasurementGraphAction22Action.java
@@ -41,7 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.logging.log4j.Logger;
import org.jfree.chart.ChartFactory;
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDecisionSupportAlerts2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDecisionSupportAlerts2Action.java
index 651924f2684..ce298474093 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDecisionSupportAlerts2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDecisionSupportAlerts2Action.java
@@ -40,7 +40,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.DxresearchDAO;
import org.oscarehr.common.model.Dxresearch;
@@ -174,7 +174,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
//String formattedDate = DateUtils.getDate(date,dateFormat,request.getLocale());
key = StringUtils.maxLenString(dsConsequence.getText(), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES);
item.setLinkTitle(dsGuideline.getTitle());
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
js = "itemColours['" + key + "'] = '" + BGCOLOUR + "'; autoCompleted['" + key + "'] = \"" + url + "\"; autoCompList.push('" + key + "');";
javascript.append(js);
url += "return false;";
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDocs2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDocs2Action.java
index cf54ee1fa51..bdbf88e7f02 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDocs2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayDocs2Action.java
@@ -26,7 +26,7 @@
package oscar.oscarEncounter.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.DocumentDao.DocumentType;
import org.oscarehr.documentManager.EDoc;
@@ -115,7 +115,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
for (int i = 0; i < docList.size(); i++) {
isURLjavaScript = false;
EDoc curDoc = docList.get(i);
- String dispFilename = org.apache.commons.lang3.StringUtils.trimToEmpty(curDoc.getFileName());
+ String dispFilename = org.apache.commons.lang.StringUtils.trimToEmpty(curDoc.getFileName());
String dispStatus = String.valueOf(curDoc.getStatus());
boolean skip = false;
@@ -154,7 +154,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
if (inboxflag) {
String path = oscar.util.plugin.IsPropertiesOn.getProperty("DOCUMENT_DIR");
- url = "popupPage(700,800,'" + hash + "', '" + request.getContextPath() + "/mod/docmgmtComp/FillARForm.do?method=showInboxDocDetails&path=" + path + "&demoNo=" + bean.demographicNo + "&name=" + StringEscapeUtils.escapeHtml4(dispFilename) + "'); return false;";
+ url = "popupPage(700,800,'" + hash + "', '" + request.getContextPath() + "/mod/docmgmtComp/FillARForm.do?method=showInboxDocDetails&path=" + path + "&demoNo=" + bean.demographicNo + "&name=" + StringEscapeUtils.escapeHtml(dispFilename) + "'); return false;";
isURLjavaScript = true;
} else if (curDoc.getRemoteFacilityId() == null && curDoc.isPDF()) {
url = "popupPage(window.screen.width,window.screen.height,'" + hash + "','" + request.getContextPath() + "/documentManager/showDocument.jsp?inWindow=true&segmentID=" + dispDocNo + "&providerNo=" + user + "&searchProviderNo=" + user + "&status=A'); return false;";
@@ -166,7 +166,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
item.setLinkTitle(title + serviceDateStr);
item.setTitle(title);
key = StringUtils.maxLenString(curDoc.getDescription(), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + "(" + serviceDateStr + ")";
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
if (inboxflag) {
if (!EDocUtil.getDocReviewFlag(dispDocNo)) item.setColour("FF0000");
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayEForm2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayEForm2Action.java
index 51364f05c6b..9fa2a6909ac 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayEForm2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayEForm2Action.java
@@ -26,7 +26,7 @@
package oscar.oscarEncounter.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.model.EFormData;
import org.oscarehr.util.LoggedInInfo;
@@ -83,7 +83,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
url = "popupPage(700,800,'" + hash + "','" + request.getContextPath() + "/eform/efmformadd_data.jsp?fid=" + curform.get("fid") + "&demographic_no=" + bean.demographicNo + "&appointment=" + bean.appointmentNo + "&parentAjaxId=" + cmd + "','" + curform.get("fid") + "_" + bean.demographicNo + "');";
logger.debug("SETTING EFORM URL " + url);
key = StringUtils.maxLenString((String) curform.get("formName"), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + " (new)";
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
js = "itemColours['" + key + "'] = '" + BGCOLOUR + "'; autoCompleted['" + key + "'] = \"" + url + "\"; autoCompList.push('" + key + "');";
javascript.append(js);
}
@@ -119,7 +119,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
String formattedDate = DateUtils.formatDate(eFormData.getFormDate(), request.getLocale());
key = StringUtils.maxLenString(eFormData.getFormName(), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + "(" + formattedDate + ")";
item.setLinkTitle(eFormData.getSubject());
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
js = "itemColours['" + key + "'] = '" + BGCOLOUR + "'; autoCompleted['" + key + "'] = \"" + url + "\"; autoCompList.push('" + key + "');";
javascript.append(js);
url += "return false;";
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayForm2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayForm2Action.java
index c02d6a60475..52bbe65c1b2 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayForm2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayForm2Action.java
@@ -26,7 +26,7 @@
package oscar.oscarEncounter.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.EncounterFormDao;
import org.oscarehr.common.model.EncounterForm;
@@ -156,7 +156,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
+ "&formId=latest" + "');");
key = StringUtils.maxLenString(fullTitle, MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + "(" + serviceDateStr + ")";
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
// auto completion arrays and colour code are set
js = "itemColours['" + key + "'] = '" + BGCOLOUR + "'; autoCompList.push('" + key + "'); autoCompleted['" + key + "'] = \"" + url + "\";";
@@ -195,7 +195,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
Dao.addPopUpUrl(url.toString());
key = StringUtils.maxLenString(encounterForm.getFormName(), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + " (new)";
Dao.addPopUpText(encounterForm.getFormName());
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
// auto completion arrays and colour code are set
js = "itemColours['" + key + "'] = '" + BGCOLOUR + "'; autoCompList.push('" + key + "'); autoCompleted['" + key + "'] = \"" + url + ";\";";
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayHRM2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayHRM2Action.java
index 9b038f27e75..ade51a44553 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayHRM2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayHRM2Action.java
@@ -11,7 +11,7 @@
package oscar.oscarEncounter.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.OscarLogDao;
import org.oscarehr.hospitalReportManager.HRMUtil;
@@ -92,7 +92,7 @@ public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDi
item.setLinkTitle(displayHRMName + serviceDateStr);
item.setTitle(labRead + displayHRMName + labRead);
key = StringUtils.maxLenString((String) hrmDocument.get("report_type"), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + "(" + serviceDateStr + ")";
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
js = "itemColours['" + key + "'] = '" + BGCOLOUR + "'; autoCompleted['" + key + "'] = \"" + url + "\"; autoCompList.push('" + key + "');";
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayMeasurements2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayMeasurements2Action.java
index 5f08072d2dc..daa614974cd 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayMeasurements2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayMeasurements2Action.java
@@ -300,7 +300,7 @@ public String padd(String str, String data) {
int maxsize = (str.length() - overflow) > 0 ? str.length() - overflow : 1;
int minsize = maxsize > 3 ? maxsize - 3 : 0;
String ellipses = new String();
- ellipses = org.apache.commons.lang3.StringUtils.rightPad(ellipses, maxsize - minsize, '.');
+ ellipses = org.apache.commons.lang.StringUtils.rightPad(ellipses, maxsize - minsize, '.');
tmp = StringUtils.maxLenString(str, maxsize, minsize, ellipses);
} else tmp = str;
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotos2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotos2Action.java
index 4012e3f480f..f179525868d 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotos2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotos2Action.java
@@ -26,7 +26,7 @@
package oscar.oscarEncounter.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.oscarehr.documentManager.EDoc;
import org.oscarehr.documentManager.EDocUtil;
import org.oscarehr.documentManager.EDocUtil.EDocSort;
@@ -132,12 +132,12 @@ else if (dispStatus.equals("H"))
if (inboxflag) {
String path = oscar.util.plugin.IsPropertiesOn.getProperty("DOCUMENT_DIR");
url = "popupPage(700,800,'" + hash + "', '" + request.getContextPath() +
- "/mod/docmgmtComp/FillARForm.do?method=showInboxDocDetails&path=" + path + "&demoNo=" + bean.demographicNo + "&name=" + StringEscapeUtils.escapeEcmaScript(dispFilename) + "');";
+ "/mod/docmgmtComp/FillARForm.do?method=showInboxDocDetails&path=" + path + "&demoNo=" + bean.demographicNo + "&name=" + StringEscapeUtils.escapeJavaScript(dispFilename) + "');";
}
item.setLinkTitle(title + serviceDateStr);
item.setTitle(title);
key = StringUtils.maxLenString(curDoc.getDescription(), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + "(" + serviceDateStr + ")";
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
if (inboxflag) {
if (!EDocUtil.getDocReviewFlag(dispDocNo))
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotosAction.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotosAction.java
index 43db65e8f56..5eef76f663d 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotosAction.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctDisplayPhotosAction.java
@@ -26,7 +26,7 @@
package oscar.oscarEncounter.pageUtil;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.oscarehr.documentManager.EDoc;
import org.oscarehr.documentManager.EDocUtil;
import org.oscarehr.documentManager.EDocUtil.EDocSort;
@@ -132,12 +132,12 @@ else if (dispStatus.equals("H"))
if (inboxflag) {
String path = oscar.util.plugin.IsPropertiesOn.getProperty("DOCUMENT_DIR");
url = "popupPage(700,800,'" + hash + "', '" + request.getContextPath() +
- "/mod/docmgmtComp/FillARForm.do?method=showInboxDocDetails&path=" + path + "&demoNo=" + bean.demographicNo + "&name=" + StringEscapeUtils.escapeEcmaScript(dispFilename) + "');";
+ "/mod/docmgmtComp/FillARForm.do?method=showInboxDocDetails&path=" + path + "&demoNo=" + bean.demographicNo + "&name=" + StringEscapeUtils.escapeJavaScript(dispFilename) + "');";
}
item.setLinkTitle(title + serviceDateStr);
item.setTitle(title);
key = StringUtils.maxLenString(curDoc.getDescription(), MAX_LEN_KEY, CROP_LEN_KEY, ELLIPSES) + "(" + serviceDateStr + ")";
- key = StringEscapeUtils.escapeEcmaScript(key);
+ key = StringEscapeUtils.escapeJavaScript(key);
if (inboxflag) {
if (!EDocUtil.getDocReviewFlag(dispDocNo))
diff --git a/src/main/java/oscar/oscarEncounter/pageUtil/EctIncomingEncounter2Action.java b/src/main/java/oscar/oscarEncounter/pageUtil/EctIncomingEncounter2Action.java
index 81102d781c8..dac8aeec49a 100644
--- a/src/main/java/oscar/oscarEncounter/pageUtil/EctIncomingEncounter2Action.java
+++ b/src/main/java/oscar/oscarEncounter/pageUtil/EctIncomingEncounter2Action.java
@@ -41,7 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.caisi.dao.DefaultIssueDao;
import org.oscarehr.PMmodule.dao.ProgramAccessDAO;
@@ -197,7 +197,7 @@ public String execute() throws IOException, ServletException {
if (request.getParameter("remyoscarmsg") != null) {
MessageTransfer3 messageTransferOrig = MyOscarMessagesHelper.readMessage(request.getSession(),
Long.parseLong(request.getParameter("remyoscarmsg")));
- dateStr = StringEscapeUtils.escapeHtml4(
+ dateStr = StringEscapeUtils.escapeHtml(
DateUtils.formatDateTime(messageTransferOrig.getSentDate(), request.getLocale()));
MyOscarLoggedInInfo myOscarLoggedInInfo = MyOscarLoggedInInfo
@@ -206,12 +206,12 @@ public String execute() throws IOException, ServletException {
.getMinimalPerson(myOscarLoggedInInfo, messageTransferOrig.getSenderPersonId());
String originalMessageBody = MessageManager.getMessageBody(messageTransferOrig);
messageBeingRepliedTo = props.getString("myoscar.msg.From") + ": "
- + StringEscapeUtils.escapeHtml4(minimalPersonTransfer.getLastName() + ", "
+ + StringEscapeUtils.escapeHtml(minimalPersonTransfer.getLastName() + ", "
+ minimalPersonTransfer.getFirstName())
+ " (" + dateStr + ")\n" + originalMessageBody + "\n-------------\n"
+ props.getString("myoscar.msg.Reply") + ":\n";
} else {
- dateStr = StringEscapeUtils.escapeHtml4(
+ dateStr = StringEscapeUtils.escapeHtml(
DateUtils.formatDateTime(messageTransfer.getSentDate(), request.getLocale()));
MyOscarLoggedInInfo myOscarLoggedInInfo = MyOscarLoggedInInfo
@@ -219,7 +219,7 @@ public String execute() throws IOException, ServletException {
MinimalPersonTransfer2 minimalPersonTransfer = AccountManager
.getMinimalPerson(myOscarLoggedInInfo, messageTransfer.getSenderPersonId());
messageBeingRepliedTo = props.getString("myoscar.msg.From") + ": "
- + StringEscapeUtils.escapeHtml4(minimalPersonTransfer.getLastName() + ", "
+ + StringEscapeUtils.escapeHtml(minimalPersonTransfer.getLastName() + ", "
+ minimalPersonTransfer.getFirstName())
+ " (" + dateStr + ")\n";
}
@@ -227,7 +227,7 @@ public String execute() throws IOException, ServletException {
String subject = MessageManager.getSubject(messageTransfer);
String messageBody = MessageManager.getMessageBody(messageTransfer);
bean.reason = props.getString("myoscar.msg.SubjectPrefix") + " - " + subject;
- bean.myoscarMsgId = messageBeingRepliedTo + StringEscapeUtils.escapeHtml4(messageBody) + "\n";
+ bean.myoscarMsgId = messageBeingRepliedTo + StringEscapeUtils.escapeHtml(messageBody) + "\n";
} catch (Exception myoscarEx) {
bean.oscarMsg = "PHR message was not retrieved";
log.error("ERROR retrieving message", myoscarEx);
diff --git a/src/main/java/oscar/oscarLab/ca/all/Hl7textResultsData.java b/src/main/java/oscar/oscarLab/ca/all/Hl7textResultsData.java
index 37a8476606d..35c33991037 100644
--- a/src/main/java/oscar/oscarLab/ca/all/Hl7textResultsData.java
+++ b/src/main/java/oscar/oscarLab/ca/all/Hl7textResultsData.java
@@ -34,7 +34,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.ConsultDocsDao;
import org.oscarehr.common.dao.ConsultResponseDocDao;
diff --git a/src/main/java/oscar/oscarLab/ca/all/SpireResultsData.java b/src/main/java/oscar/oscarLab/ca/all/SpireResultsData.java
index 8b0c9e21a1e..7bac6e9ede5 100644
--- a/src/main/java/oscar/oscarLab/ca/all/SpireResultsData.java
+++ b/src/main/java/oscar/oscarLab/ca/all/SpireResultsData.java
@@ -27,7 +27,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.Hl7TextInfoDao;
import org.oscarehr.common.dao.PatientLabRoutingDao;
diff --git a/src/main/java/oscar/oscarLab/ca/all/pageUtil/CreateLabelTDIS2Action.java b/src/main/java/oscar/oscarLab/ca/all/pageUtil/CreateLabelTDIS2Action.java
index 621b4f5bc97..a6f7a7c4db8 100644
--- a/src/main/java/oscar/oscarLab/ca/all/pageUtil/CreateLabelTDIS2Action.java
+++ b/src/main/java/oscar/oscarLab/ca/all/pageUtil/CreateLabelTDIS2Action.java
@@ -13,7 +13,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.Hl7TextInfoDao;
import org.oscarehr.managers.SecurityInfoManager;
@@ -64,7 +64,7 @@ public String execute() {
}
logger.info("Label =" + label);
- label = StringEscapeUtils.escapeEcmaScript(label);
+ label = StringEscapeUtils.escapeJavaScript(label);
if (ajaxcall != null && !"null".equalsIgnoreCase(ajaxcall)) {
return null;
}
diff --git a/src/main/java/oscar/oscarLab/ca/all/pageUtil/LabPDFCreator.java b/src/main/java/oscar/oscarLab/ca/all/pageUtil/LabPDFCreator.java
index bc32ae1b705..0209c95b82e 100644
--- a/src/main/java/oscar/oscarLab/ca/all/pageUtil/LabPDFCreator.java
+++ b/src/main/java/oscar/oscarLab/ca/all/pageUtil/LabPDFCreator.java
@@ -54,7 +54,7 @@
import com.lowagie.text.pdf.*;
import com.lowagie.text.rtf.RtfWriter2;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.tika.io.IOUtils;
import org.oscarehr.common.dao.Hl7TextMessageDao;
import org.oscarehr.common.model.Hl7TextMessage;
diff --git a/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Action.java b/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Action.java
index a01619ac133..a91bf13ccac 100644
--- a/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Action.java
+++ b/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Action.java
@@ -28,7 +28,7 @@
import ca.uhn.hl7v2.model.v26.message.ORU_R01;
import com.opensymphony.xwork2.ActionSupport;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.oscarehr.common.dao.ClinicDAO;
diff --git a/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Form.java b/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Form.java
index 444cc3aa7df..281a586fc4d 100644
--- a/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Form.java
+++ b/src/main/java/oscar/oscarLab/ca/all/pageUtil/OruR01Upload2Form.java
@@ -26,7 +26,7 @@
package oscar.oscarLab.ca.all.pageUtil;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
import java.io.File;
diff --git a/src/main/java/oscar/oscarLab/ca/all/pageUtil/SendOruR01UIBean.java b/src/main/java/oscar/oscarLab/ca/all/pageUtil/SendOruR01UIBean.java
index 8e9e32aac1b..13077ef43d6 100644
--- a/src/main/java/oscar/oscarLab/ca/all/pageUtil/SendOruR01UIBean.java
+++ b/src/main/java/oscar/oscarLab/ca/all/pageUtil/SendOruR01UIBean.java
@@ -31,9 +31,9 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.casemgmt.dao.CaseManagementNoteDAO;
import org.oscarehr.casemgmt.model.CaseManagementIssue;
@@ -107,16 +107,16 @@ private void checkForDataFromNotes(HttpServletRequest request) {
// fill demographic info
String demographicId = caseManagementNote.getDemographic_no();
Demographic demographic = demographicManager.getDemographic(LoggedInInfo.getLoggedInInfoFromSession(request), demographicId);
- clientFirstName = StringEscapeUtils.escapeHtml4(StringUtils.trimToEmpty(demographic.getFirstName()));
- clientLastName = StringEscapeUtils.escapeHtml4(StringUtils.trimToEmpty(demographic.getLastName()));
- clientHin = StringEscapeUtils.escapeHtml4(StringUtils.trimToEmpty(demographic.getHin()));
+ clientFirstName = StringEscapeUtils.escapeHtml(StringUtils.trimToEmpty(demographic.getFirstName()));
+ clientLastName = StringEscapeUtils.escapeHtml(StringUtils.trimToEmpty(demographic.getLastName()));
+ clientHin = StringEscapeUtils.escapeHtml(StringUtils.trimToEmpty(demographic.getHin()));
GregorianCalendar cal = demographic.getBirthDay();
if (cal != null)
- clientBirthDate = StringEscapeUtils.escapeHtml4(DateFormatUtils.ISO_DATE_FORMAT.format(cal));
- clientGender = StringEscapeUtils.escapeHtml4(StringUtils.trimToEmpty(demographic.getSex()));
+ clientBirthDate = StringEscapeUtils.escapeHtml(DateFormatUtils.ISO_DATE_FORMAT.format(cal));
+ clientGender = StringEscapeUtils.escapeHtml(StringUtils.trimToEmpty(demographic.getSex()));
// fill note info
- subject = StringEscapeUtils.escapeHtml4("Encounter Note");
+ subject = StringEscapeUtils.escapeHtml("Encounter Note");
StringBuilder sb = new StringBuilder();
sb.append(caseManagementNote.getNote());
@@ -142,7 +142,7 @@ private void checkForDataFromNotes(HttpServletRequest request) {
sb.append("\n---------- No Attached Issues ---------");
}
- textMessage = StringEscapeUtils.escapeHtml4(sb.toString());
+ textMessage = StringEscapeUtils.escapeHtml(sb.toString());
}
}
@@ -191,7 +191,7 @@ public static String getLoggedInProviderDisplayLine(LoggedInInfo loggedInInfo) {
sb.append(provider.getAddress());
}
- return (StringEscapeUtils.escapeHtml4(sb.toString()));
+ return (StringEscapeUtils.escapeHtml(sb.toString()));
}
public static List getRemoteCapableProfessionalSpecialists() {
@@ -220,7 +220,7 @@ public static String getProfessionalSpecialistDisplayString(ProfessionalSpeciali
sb.append(professionalSpecialist.getStreetAddress());
}
- return (StringEscapeUtils.escapeHtml4(sb.toString()));
+ return (StringEscapeUtils.escapeHtml(sb.toString()));
}
public Integer getProfessionalSpecialistId() {
diff --git a/src/main/java/oscar/oscarLab/ca/all/pageUtil/ViewOruR01UIBean.java b/src/main/java/oscar/oscarLab/ca/all/pageUtil/ViewOruR01UIBean.java
index 157439e4a2d..3e16808edbb 100644
--- a/src/main/java/oscar/oscarLab/ca/all/pageUtil/ViewOruR01UIBean.java
+++ b/src/main/java/oscar/oscarLab/ca/all/pageUtil/ViewOruR01UIBean.java
@@ -30,8 +30,8 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.oscarehr.common.hl7.v2.oscar_to_oscar.DataTypeUtils;
import org.oscarehr.common.hl7.v2.oscar_to_oscar.OruR01;
import org.oscarehr.common.hl7.v2.oscar_to_oscar.OscarToOscarUtils;
@@ -102,7 +102,7 @@ private String getProviderDisplayString(String actionRole) throws HL7Exception {
sb.append(provider.getAddress());
}
- return (StringEscapeUtils.escapeHtml4(sb.toString()));
+ return (StringEscapeUtils.escapeHtml(sb.toString()));
}
public String getClientDisplayName() {
@@ -118,12 +118,12 @@ public String getClientDisplayName() {
sb.append(')');
}
- return (StringEscapeUtils.escapeHtml4(sb.toString()));
+ return (StringEscapeUtils.escapeHtml(sb.toString()));
}
public String getHinForDisplay() {
if (demographic.getHin() == null) return ("");
- return (StringEscapeUtils.escapeHtml4(demographic.getHin()));
+ return (StringEscapeUtils.escapeHtml(demographic.getHin()));
}
public String getBirthDayForDisplay() {
@@ -132,12 +132,12 @@ public String getBirthDayForDisplay() {
}
public String getSubjectForDisplay() {
- return (StringEscapeUtils.escapeHtml4(observationData.subject));
+ return (StringEscapeUtils.escapeHtml(observationData.subject));
}
public String getTextMessageForDisplay() {
if (observationData.textMessage == null) return ("");
- return (StringEscapeUtils.escapeHtml4(observationData.textMessage));
+ return (StringEscapeUtils.escapeHtml(observationData.textMessage));
}
public boolean hasBinaryFile() {
@@ -146,7 +146,7 @@ public boolean hasBinaryFile() {
public String getBinaryFilenameForDisplay() {
if (observationData.binaryDataFileName == null) return ("");
- return (StringEscapeUtils.escapeHtml4(observationData.binaryDataFileName));
+ return (StringEscapeUtils.escapeHtml(observationData.binaryDataFileName));
}
public String getFilename() {
diff --git a/src/main/java/oscar/oscarLab/ca/all/parsers/MDSHandler.java b/src/main/java/oscar/oscarLab/ca/all/parsers/MDSHandler.java
index 87bc3a86460..1b3c43c414c 100644
--- a/src/main/java/oscar/oscarLab/ca/all/parsers/MDSHandler.java
+++ b/src/main/java/oscar/oscarLab/ca/all/parsers/MDSHandler.java
@@ -42,7 +42,7 @@
import java.util.Date;
import java.util.HashMap;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.hl7.v2.oscar_to_oscar.DynamicHapiLoaderUtils;
import org.oscarehr.util.MiscUtils;
diff --git a/src/main/java/oscar/oscarLab/ca/all/parsers/OLISHL7Handler.java b/src/main/java/oscar/oscarLab/ca/all/parsers/OLISHL7Handler.java
index 7e964b19585..c782192487a 100644
--- a/src/main/java/oscar/oscarLab/ca/all/parsers/OLISHL7Handler.java
+++ b/src/main/java/oscar/oscarLab/ca/all/parsers/OLISHL7Handler.java
@@ -32,7 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
import org.oscarehr.olis.dao.OLISRequestNomenclatureDao;
diff --git a/src/main/java/oscar/oscarLab/ca/all/parsers/PATHL7Handler.java b/src/main/java/oscar/oscarLab/ca/all/parsers/PATHL7Handler.java
index d84fe67f048..9c87d5e9892 100644
--- a/src/main/java/oscar/oscarLab/ca/all/parsers/PATHL7Handler.java
+++ b/src/main/java/oscar/oscarLab/ca/all/parsers/PATHL7Handler.java
@@ -41,7 +41,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import ca.uhn.hl7v2.HL7Exception;
diff --git a/src/main/java/oscar/oscarLab/ca/all/upload/MessageUploader.java b/src/main/java/oscar/oscarLab/ca/all/upload/MessageUploader.java
index 20f9b8f700f..e503e7487da 100644
--- a/src/main/java/oscar/oscarLab/ca/all/upload/MessageUploader.java
+++ b/src/main/java/oscar/oscarLab/ca/all/upload/MessageUploader.java
@@ -43,8 +43,8 @@
import java.util.regex.Pattern;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.dao.ProviderDao;
import org.oscarehr.common.OtherIdManager;
diff --git a/src/main/java/oscar/oscarLab/ca/all/upload/handlers/IHAHandler.java b/src/main/java/oscar/oscarLab/ca/all/upload/handlers/IHAHandler.java
index 6b10daa9ef1..791e17c1e0f 100755
--- a/src/main/java/oscar/oscarLab/ca/all/upload/handlers/IHAHandler.java
+++ b/src/main/java/oscar/oscarLab/ca/all/upload/handlers/IHAHandler.java
@@ -41,7 +41,7 @@
//*import ca.uhn.hl7v2.model.Segment;
-//*import org.apache.commons.lang3.StringUtils;
+//*import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.hl7.v2.oscar_to_oscar.DynamicHapiLoaderUtils;
import org.oscarehr.util.LoggedInInfo;
diff --git a/src/main/java/oscar/oscarLab/ca/all/upload/handlers/OscarToOscarHl7V2/AdtA09Handler.java b/src/main/java/oscar/oscarLab/ca/all/upload/handlers/OscarToOscarHl7V2/AdtA09Handler.java
index 0d356f2d0a6..48435018766 100644
--- a/src/main/java/oscar/oscarLab/ca/all/upload/handlers/OscarToOscarHl7V2/AdtA09Handler.java
+++ b/src/main/java/oscar/oscarLab/ca/all/upload/handlers/OscarToOscarHl7V2/AdtA09Handler.java
@@ -29,8 +29,8 @@
import java.util.GregorianCalendar;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.OscarAppointmentDao;
import org.oscarehr.common.hl7.v2.oscar_to_oscar.DataTypeUtils;
diff --git a/src/main/java/oscar/oscarLab/ca/on/CML/CMLLabTest.java b/src/main/java/oscar/oscarLab/ca/on/CML/CMLLabTest.java
index f48e80d79b3..6b4fe195f2e 100644
--- a/src/main/java/oscar/oscarLab/ca/on/CML/CMLLabTest.java
+++ b/src/main/java/oscar/oscarLab/ca/on/CML/CMLLabTest.java
@@ -29,7 +29,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.LabPatientPhysicianInfoDao;
import org.oscarehr.common.dao.LabReportInformationDao;
diff --git a/src/main/java/oscar/oscarLab/ca/on/HRMResultsData.java b/src/main/java/oscar/oscarLab/ca/on/HRMResultsData.java
index d1fcd8130dd..a0755887ae6 100644
--- a/src/main/java/oscar/oscarLab/ca/on/HRMResultsData.java
+++ b/src/main/java/oscar/oscarLab/ca/on/HRMResultsData.java
@@ -13,7 +13,7 @@
import java.util.*;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.model.Demographic;
import org.oscarehr.hospitalReportManager.HRMReport;
diff --git a/src/main/java/oscar/oscarLab/ca/on/Spire/SpireLabTest.java b/src/main/java/oscar/oscarLab/ca/on/Spire/SpireLabTest.java
index 79c0bc8d517..15105b41fdd 100755
--- a/src/main/java/oscar/oscarLab/ca/on/Spire/SpireLabTest.java
+++ b/src/main/java/oscar/oscarLab/ca/on/Spire/SpireLabTest.java
@@ -28,7 +28,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.Hl7TextInfoDao;
import org.oscarehr.common.dao.LabPatientPhysicianInfoDao;
diff --git a/src/main/java/oscar/oscarMessenger/data/MsgMessageData.java b/src/main/java/oscar/oscarMessenger/data/MsgMessageData.java
index b985bd16365..1b0aa02643b 100644
--- a/src/main/java/oscar/oscarMessenger/data/MsgMessageData.java
+++ b/src/main/java/oscar/oscarMessenger/data/MsgMessageData.java
@@ -43,7 +43,6 @@
import org.oscarehr.managers.MessengerGroupManager;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -181,8 +180,8 @@ public String sendMessageReview(String message, String subject, String userName,
pdfAttach = str.q(pdfAttach);
}
- sentToWho = org.oscarehr.util.SqlEscapeUtil.escapeSql(sentToWho);
- userName = org.oscarehr.util.SqlEscapeUtil.escapeSql(userName);
+ sentToWho = org.apache.commons.lang.StringEscapeUtils.escapeSql(sentToWho);
+ userName = org.apache.commons.lang.StringEscapeUtils.escapeSql(userName);
MessageTbl mt = new MessageTbl();
mt.setDate(new Date());
@@ -233,8 +232,8 @@ public String sendMessage2(String message, String subject, String userName, Stri
pdfAttach = str.q(pdfAttach);
}
- sentToWho = org.oscarehr.util.SqlEscapeUtil.escapeSql(sentToWho);
- userName = org.oscarehr.util.SqlEscapeUtil.escapeSql(userName);
+ sentToWho = org.apache.commons.lang.StringEscapeUtils.escapeSql(sentToWho);
+ userName = org.apache.commons.lang.StringEscapeUtils.escapeSql(userName);
MessageTbl mt = new MessageTbl();
mt.setDate(new Date());
diff --git a/src/main/java/oscar/oscarPrevention/PreventionData.java b/src/main/java/oscar/oscarPrevention/PreventionData.java
index 36aeb9f5a0f..aa07165a83d 100644
--- a/src/main/java/oscar/oscarPrevention/PreventionData.java
+++ b/src/main/java/oscar/oscarPrevention/PreventionData.java
@@ -34,8 +34,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
import org.oscarehr.PMmodule.caisi_integrator.IntegratorFallBackManager;
diff --git a/src/main/java/oscar/oscarReport/bean/RptByExampleQueryBean.java b/src/main/java/oscar/oscarReport/bean/RptByExampleQueryBean.java
index 44b3d7cd57e..98c6a8248c1 100644
--- a/src/main/java/oscar/oscarReport/bean/RptByExampleQueryBean.java
+++ b/src/main/java/oscar/oscarReport/bean/RptByExampleQueryBean.java
@@ -26,7 +26,7 @@
package oscar.oscarReport.bean;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.oscarehr.util.MiscUtils;
public class RptByExampleQueryBean {
@@ -47,7 +47,7 @@ public RptByExampleQueryBean(int id, String query, String queryName) {
this.id = id;
this.query = query;
this.queryName = queryName;
- this.queryWithEscapeChar = StringEscapeUtils.escapeEcmaScript(query);
+ this.queryWithEscapeChar = StringEscapeUtils.escapeJavaScript(query);
MiscUtils.getLogger().debug("query with javascript escape char: " + queryWithEscapeChar);
}
@@ -56,7 +56,7 @@ public RptByExampleQueryBean(String providerLastName, String providerFirstName,
this.providerFirstName = providerFirstName;
this.query = query;
this.date = date;
- this.queryWithEscapeChar = StringEscapeUtils.escapeEcmaScript(query);
+ this.queryWithEscapeChar = StringEscapeUtils.escapeJavaScript(query);
}
public int getId() {
diff --git a/src/main/java/oscar/oscarReport/data/RptReportCreator.java b/src/main/java/oscar/oscarReport/data/RptReportCreator.java
index c41a31fafd8..18d544ea45b 100644
--- a/src/main/java/oscar/oscarReport/data/RptReportCreator.java
+++ b/src/main/java/oscar/oscarReport/data/RptReportCreator.java
@@ -36,10 +36,9 @@
import java.util.Properties;
import java.util.Vector;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.oscarehr.util.MiscUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.login.DBHelp;
@@ -58,7 +57,7 @@ public String getSelectField(String recordId) throws SQLException {
String caption = DBHelp.getString(rs, "caption");
ret.append((ret.length() < 8 ? " " : ", ") + DBHelp.getString(rs, "table_name") + "." + DBHelp.getString(rs, "name"));
if (caption != null && caption.length() > 0) {
- ret.append(" as '" + SqlEscapeUtil.escapeSql(DBHelp.getString(rs, "caption")) + "'");
+ ret.append(" as '" + StringEscapeUtils.escapeSql(DBHelp.getString(rs, "caption")) + "'");
}
}
rs.close();
diff --git a/src/main/java/oscar/oscarReport/data/RptTableFieldNameCaption.java b/src/main/java/oscar/oscarReport/data/RptTableFieldNameCaption.java
index 6ce73cf285f..30d56a3c996 100644
--- a/src/main/java/oscar/oscarReport/data/RptTableFieldNameCaption.java
+++ b/src/main/java/oscar/oscarReport/data/RptTableFieldNameCaption.java
@@ -36,7 +36,7 @@
import java.util.Properties;
import java.util.Vector;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.EncounterFormDao;
import org.oscarehr.common.dao.ReportTableFieldCaptionDao;
@@ -44,7 +44,6 @@
import org.oscarehr.common.model.ReportTableFieldCaption;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.login.DBHelp;
@@ -64,7 +63,7 @@ public class RptTableFieldNameCaption {
public boolean insertOrUpdateRecord() {
boolean ret;
String sql = "select id from reportTableFieldCaption where table_name = '"
- + SqlEscapeUtil.escapeSql(table_name) + "' and name='" + SqlEscapeUtil.escapeSql(name) + "'";
+ + StringEscapeUtils.escapeSql(table_name) + "' and name='" + StringEscapeUtils.escapeSql(name) + "'";
try {
ResultSet rs = DBHelp.searchDBRecord(sql);
if (rs.next()) {
@@ -120,7 +119,7 @@ public Vector getTableNameCaption(String tableName) {
public Properties getNameCaptionProp(String tableName) {
Properties ret = new Properties();
String sql = "select name, caption from reportTableFieldCaption where table_name = '"
- + SqlEscapeUtil.escapeSql(tableName) + "'";
+ + StringEscapeUtils.escapeSql(tableName) + "'";
try {
ResultSet rs = DBHelp.searchDBRecord(sql);
while (rs.next()) {
diff --git a/src/main/java/oscar/oscarReport/pageUtil/GeneratePatientLetters2Action.java b/src/main/java/oscar/oscarReport/pageUtil/GeneratePatientLetters2Action.java
index 44b6b9b3e64..692b3e2613f 100644
--- a/src/main/java/oscar/oscarReport/pageUtil/GeneratePatientLetters2Action.java
+++ b/src/main/java/oscar/oscarReport/pageUtil/GeneratePatientLetters2Action.java
@@ -42,7 +42,7 @@
import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.JasperReport;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.PMmodule.model.ProgramProvider;
import org.oscarehr.managers.ProgramManager2;
diff --git a/src/main/java/oscar/oscarReport/pageUtil/RptByExample2Action.java b/src/main/java/oscar/oscarReport/pageUtil/RptByExample2Action.java
index fa4acd21aa5..aa97dead2c2 100644
--- a/src/main/java/oscar/oscarReport/pageUtil/RptByExample2Action.java
+++ b/src/main/java/oscar/oscarReport/pageUtil/RptByExample2Action.java
@@ -114,7 +114,7 @@ public void write2Database(String query, String providerNo) {
//query = exampleData.replaceSQLString (";","",query);
//query = exampleData.replaceSQLString("\"", "\'", query);
- // query = SqlEscapeUtil.escapeSql(query);
+ // query = StringEscapeUtils.escapeSql(query);
ReportByExamples r = new ReportByExamples();
r.setProviderNo(providerNo);
diff --git a/src/main/java/oscar/oscarReport/pageUtil/RptByExamplesFavorite2Action.java b/src/main/java/oscar/oscarReport/pageUtil/RptByExamplesFavorite2Action.java
index e78285c19f5..81ff4053610 100644
--- a/src/main/java/oscar/oscarReport/pageUtil/RptByExamplesFavorite2Action.java
+++ b/src/main/java/oscar/oscarReport/pageUtil/RptByExamplesFavorite2Action.java
@@ -32,12 +32,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.oscarehr.common.dao.ReportByExamplesFavoriteDao;
import org.oscarehr.common.model.ReportByExamplesFavorite;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.oscarReport.bean.RptByExampleQueryBeanHandler;
@@ -76,7 +75,7 @@ public String execute() throws ServletException, IOException {
String favoriteName = this.getFavoriteName();
String query = this.getQuery();
- String queryWithEscapeChar = SqlEscapeUtil.escapeSql(query);///queryWithEscapeChar);
+ String queryWithEscapeChar = StringEscapeUtils.escapeSql(query);///queryWithEscapeChar);
MiscUtils.getLogger().debug("escapeSql: " + queryWithEscapeChar);
write2Database(providerNo, favoriteName, queryWithEscapeChar);
}
diff --git a/src/main/java/oscar/oscarReport/reportByTemplate/ReportManager.java b/src/main/java/oscar/oscarReport/reportByTemplate/ReportManager.java
index 512cff154ba..4569f0f4bff 100644
--- a/src/main/java/oscar/oscarReport/reportByTemplate/ReportManager.java
+++ b/src/main/java/oscar/oscarReport/reportByTemplate/ReportManager.java
@@ -34,7 +34,7 @@
import java.util.List;
import java.util.UUID;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.input.SAXBuilder;
@@ -45,7 +45,6 @@
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.log.LogAction;
import oscar.util.ConversionUtils;
@@ -233,22 +232,22 @@ public String loadInReports() {
for (int i = 0; i < reports.size(); i++) {
Element report = reports.get(i);
- String templateid = SqlEscapeUtil.escapeSql(report.getAttributeValue("id"));
+ String templateid = StringEscapeUtils.escapeSql(report.getAttributeValue("id"));
if (templateid == null) return "Error: Attribute 'id' missing in tag";
- String templateTitle = SqlEscapeUtil.escapeSql(report.getAttributeValue("title"));
+ String templateTitle = StringEscapeUtils.escapeSql(report.getAttributeValue("title"));
if (templateTitle == null) return "Error: Attribute 'title' missing in tag";
- String templateDescription = SqlEscapeUtil.escapeSql(report.getAttributeValue("description"));
+ String templateDescription = StringEscapeUtils.escapeSql(report.getAttributeValue("description"));
if (templateDescription == null) return "Error: Attribute 'description' missing in tag";
- String querysql = SqlEscapeUtil.escapeSql(report.getChildText("query"));
+ String querysql = StringEscapeUtils.escapeSql(report.getChildText("query"));
if (querysql == null || querysql.length() == 0)
return "Error: The sql query is missing in tag";
XMLOutputter reportout = new XMLOutputter();
String reportXML = reportout.outputString(report).trim();
reportXML = UtilXML.unescapeXML(reportXML);
- reportXML = SqlEscapeUtil.escapeSql(reportXML);
+ reportXML = StringEscapeUtils.escapeSql(reportXML);
String active = report.getAttributeValue("active");
int activeint;
try {
diff --git a/src/main/java/oscar/oscarRx/data/RxDrugData.java b/src/main/java/oscar/oscarRx/data/RxDrugData.java
index 601193dfd86..8953822ccbd 100644
--- a/src/main/java/oscar/oscarRx/data/RxDrugData.java
+++ b/src/main/java/oscar/oscarRx/data/RxDrugData.java
@@ -31,8 +31,8 @@
import java.util.List;
import java.util.Vector;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ToStringBuilder;
import org.oscarehr.common.model.Allergy;
import org.oscarehr.util.MiscUtils;
diff --git a/src/main/java/oscar/oscarRx/data/RxPrescriptionData.java b/src/main/java/oscar/oscarRx/data/RxPrescriptionData.java
index fbe100ade60..d34986aa8f2 100644
--- a/src/main/java/oscar/oscarRx/data/RxPrescriptionData.java
+++ b/src/main/java/oscar/oscarRx/data/RxPrescriptionData.java
@@ -33,9 +33,9 @@
import java.util.Locale;
import java.util.Vector;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
import org.apache.logging.log4j.Logger;
import org.oscarehr.common.dao.DrugDao;
import org.oscarehr.common.dao.FavoriteDao;
@@ -46,7 +46,6 @@
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.oscarProvider.data.ProSignatureData;
import oscar.oscarRx.util.RxUtil;
@@ -1637,7 +1636,7 @@ public boolean Save(String scriptId) {
if (getSpecial() == null || getSpecial().length() < 6)
logger.warn("drug special appears to be null or empty : " + getSpecial());
- String escapedSpecial = SqlEscapeUtil.escapeSql(this.getSpecial());
+ String escapedSpecial = StringEscapeUtils.escapeSql(this.getSpecial());
if (escapedSpecial == null || escapedSpecial.length() < 6)
logger.warn("drug special after escaping appears to be null or empty : " + escapedSpecial);
diff --git a/src/main/java/oscar/oscarRx/pageUtil/RxChoosePatient2Action.java b/src/main/java/oscar/oscarRx/pageUtil/RxChoosePatient2Action.java
index 5664997eb2f..35ece804f00 100644
--- a/src/main/java/oscar/oscarRx/pageUtil/RxChoosePatient2Action.java
+++ b/src/main/java/oscar/oscarRx/pageUtil/RxChoosePatient2Action.java
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang.BooleanUtils;
import org.oscarehr.common.dao.UserPropertyDAO;
import org.oscarehr.common.model.UserProperty;
import org.oscarehr.managers.SecurityInfoManager;
diff --git a/src/main/java/oscar/oscarRx/pageUtil/RxSearchDrug2Action.java b/src/main/java/oscar/oscarRx/pageUtil/RxSearchDrug2Action.java
index 3eba26fd060..e48ce7a23ef 100644
--- a/src/main/java/oscar/oscarRx/pageUtil/RxSearchDrug2Action.java
+++ b/src/main/java/oscar/oscarRx/pageUtil/RxSearchDrug2Action.java
@@ -39,7 +39,7 @@
import net.sf.json.JSONObject;
import net.sf.json.JSONSerializer;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.managers.SecurityInfoManager;
import org.oscarehr.util.LoggedInInfo;
diff --git a/src/main/java/oscar/oscarRx/util/RxUtil.java b/src/main/java/oscar/oscarRx/util/RxUtil.java
index 346716b4ccb..9a7a32ff5ca 100644
--- a/src/main/java/oscar/oscarRx/util/RxUtil.java
+++ b/src/main/java/oscar/oscarRx/util/RxUtil.java
@@ -1298,7 +1298,7 @@ public static void setSpecialQuantityRepeat(RxPrescriptionData.Prescription rx)
p("else2");
if (rx.getBrandName() != null && rx.getBrandName().length() > 1) {
p("if2");
- //String sql2 = "SELECT * FROM drugs WHERE BN='" + SqlEscapeUtil.escapeSql(rx.getBrandName()) + "' order by written_date desc"; //most recent is the first.
+ //String sql2 = "SELECT * FROM drugs WHERE BN='" + StringEscapeUtils.escapeSql(rx.getBrandName()) + "' order by written_date desc"; //most recent is the first.
Drug drug = dao.findByBrandNameDemographicAndProvider(rx.getBrandName(), rx.getDemographicNo(), rx.getProviderNo());
diff --git a/src/main/java/oscar/oscarSurveillance/SurveillanceAnswer2Action.java b/src/main/java/oscar/oscarSurveillance/SurveillanceAnswer2Action.java
index 10e7b746e7e..04040cf4afc 100644
--- a/src/main/java/oscar/oscarSurveillance/SurveillanceAnswer2Action.java
+++ b/src/main/java/oscar/oscarSurveillance/SurveillanceAnswer2Action.java
@@ -42,7 +42,7 @@
import org.apache.logging.log4j.Logger;
import org.oscarehr.util.MiscUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
/**
* @author Jay Gallagher
diff --git a/src/main/java/oscar/oscarTickler/TicklerData.java b/src/main/java/oscar/oscarTickler/TicklerData.java
index 5b4dab51685..5a1ed5b5b33 100644
--- a/src/main/java/oscar/oscarTickler/TicklerData.java
+++ b/src/main/java/oscar/oscarTickler/TicklerData.java
@@ -31,13 +31,12 @@
import java.util.Date;
import java.util.List;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.oscarehr.common.model.Tickler;
import org.oscarehr.managers.TicklerManager;
import org.oscarehr.util.LoggedInInfo;
import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.SpringUtils;
-import org.oscarehr.util.SqlEscapeUtil;
import oscar.util.ConversionUtils;
@@ -67,7 +66,7 @@ public void addTickler(LoggedInInfo loggedInInfo, String demographic_no, String
String date = service_date;
if (date != null && !date.equals("now()")) { //Just a hack for now.
- date = "'" + SqlEscapeUtil.escapeSql(service_date) + "'";
+ date = "'" + StringEscapeUtils.escapeSql(service_date) + "'";
}
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/src/main/java/oscar/util/DateUtils.java b/src/main/java/oscar/util/DateUtils.java
index 3f97368e1ff..4e285cbe45f 100644
--- a/src/main/java/oscar/util/DateUtils.java
+++ b/src/main/java/oscar/util/DateUtils.java
@@ -34,7 +34,7 @@
import java.util.GregorianCalendar;
import java.util.Locale;
-import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.logging.log4j.Logger;
import org.oscarehr.util.MiscUtils;
@@ -612,17 +612,17 @@ public String NextDay(int day, int month, int year, int numDays) {
*/
public static long getDifDays(Date greater, Date lesser) {
long timeInMillis = greater.getTime() - lesser.getTime();
- return (timeInMillis / org.apache.commons.lang3.time.DateUtils.MILLIS_PER_DAY);
+ return (timeInMillis / org.apache.commons.lang.time.DateUtils.MILLIS_PER_DAY);
}
public static long getNumberOfDaysBetweenTwoDates(Calendar cal1, Calendar cal2) {
long timeInMillis = Math.abs(cal1.getTimeInMillis() - cal2.getTimeInMillis());
- return (timeInMillis / org.apache.commons.lang3.time.DateUtils.MILLIS_PER_DAY);
+ return (timeInMillis / org.apache.commons.lang.time.DateUtils.MILLIS_PER_DAY);
}
public static long getNumberOfDaysBetweenTwoDates(Date date1, Date date2) {
long timeInMillis = Math.abs(date1.getTime() - date2.getTime());
- return (timeInMillis / org.apache.commons.lang3.time.DateUtils.MILLIS_PER_DAY);
+ return (timeInMillis / org.apache.commons.lang.time.DateUtils.MILLIS_PER_DAY);
}
/**
@@ -731,7 +731,7 @@ public static Integer calculateDayDifference(Calendar date1, Calendar date2) {
if (date1 == null || date2 == null) return (null);
long ms = date2.getTimeInMillis() - date1.getTimeInMillis();
- return ((int) (ms / org.apache.commons.lang3.time.DateUtils.MILLIS_PER_DAY));
+ return ((int) (ms / org.apache.commons.lang.time.DateUtils.MILLIS_PER_DAY));
}
public static Integer calculateDayDifference(Calendar date1, Date date2) {
diff --git a/src/main/java/oscar/util/JDBCUtil.java b/src/main/java/oscar/util/JDBCUtil.java
index 0a2329caa10..e7aed05ce04 100644
--- a/src/main/java/oscar/util/JDBCUtil.java
+++ b/src/main/java/oscar/util/JDBCUtil.java
@@ -41,7 +41,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.xerces.parsers.DOMParser;
import org.oscarehr.util.MiscUtils;
import org.w3c.dom.Document;
@@ -69,8 +69,8 @@ public static Document toDocument(ResultSet rs)
results.appendChild(row);
for (int i = 1; i <= colCount; i++) {
- String columnName = StringEscapeUtils.escapeXml10(rsmd.getColumnName(i));
- String value = StringEscapeUtils.escapeXml10(oscar.Misc.getString(rs, i));
+ String columnName = StringEscapeUtils.escapeXml(rsmd.getColumnName(i));
+ String value = StringEscapeUtils.escapeXml(oscar.Misc.getString(rs, i));
Element node = doc.createElement(columnName);
node.appendChild(doc.createTextNode(value));
diff --git a/src/main/java/oscar/util/OscarRoleObjectPrivilege.java b/src/main/java/oscar/util/OscarRoleObjectPrivilege.java
index a441f8d710e..f6a6de00d2a 100644
--- a/src/main/java/oscar/util/OscarRoleObjectPrivilege.java
+++ b/src/main/java/oscar/util/OscarRoleObjectPrivilege.java
@@ -31,7 +31,7 @@
import javax.servlet.jsp.PageContext;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.oscarehr.common.dao.SecObjPrivilegeDao;
import org.oscarehr.common.model.SecObjPrivilege;
import org.oscarehr.util.SpringUtils;
diff --git a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg1.jrxml b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg1.jrxml
index 4304ab7cf9d..9434c48cc23 100644
--- a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg1.jrxml
+++ b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg1.jrxml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg2.jrxml b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg2.jrxml
index 01313560f2a..223486fda2a 100644
--- a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg2.jrxml
+++ b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg2.jrxml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg3.jrxml b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg3.jrxml
index 83847ddfc0d..705a152428a 100644
--- a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg3.jrxml
+++ b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg3.jrxml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg4.jrxml b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg4.jrxml
index 3d0ef25087f..9c17e7bc3b2 100644
--- a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg4.jrxml
+++ b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg4.jrxml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg5.jrxml b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg5.jrxml
index 7b70886346e..0ebf7f868a6 100644
--- a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg5.jrxml
+++ b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg5.jrxml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg6.jrxml b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg6.jrxml
index 7799821380e..26f40a10036 100644
--- a/src/main/resources/oscar/form/bcar2020/BCAR2020_pg6.jrxml
+++ b/src/main/resources/oscar/form/bcar2020/BCAR2020_pg6.jrxml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_add.jsp b/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_add.jsp
index 3543de7f7ef..3aacb6ddf63 100644
--- a/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_add.jsp
+++ b/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_add.jsp
@@ -29,13 +29,13 @@
<%@page import="org.oscarehr.PMmodule.dao.CriteriaDao" %>
<%@page import="org.oscarehr.PMmodule.model.CriteriaType" %>
<%@page import="org.oscarehr.PMmodule.service.VacancyTemplateManager" %>
-<%@page import="org.apache.commons.lang3.StringUtils" %>
+<%@page import="org.apache.commons.lang.StringUtils" %>
<%@page import="java.util.List" %>
<%@page import="java.util.ArrayList" %>
<%@page import="org.oscarehr.util.SpringUtils" %>
<%@page import="java.util.Date" %>
-<%@page import="org.apache.commons.lang3.time.DateFormatUtils" %>
-<%@page import="org.apache.commons.lang3.StringUtils" %>
+<%@page import="org.apache.commons.lang.time.DateFormatUtils" %>
+<%@page import="org.apache.commons.lang.StringUtils" %>
<%@page import="java.util.ResourceBundle" %>
<%@page import="java.text.SimpleDateFormat" %>
diff --git a/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_add.jsp b/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_add.jsp
index 10149c0d7cb..6d591037d56 100644
--- a/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_add.jsp
+++ b/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_add.jsp
@@ -30,7 +30,7 @@
<%@page import="org.oscarehr.PMmodule.service.VacancyTemplateManager" %>
<%@page import="org.oscarehr.PMmodule.model.Program" %>
<%@page import="org.oscarehr.util.LoggedInInfo" %>
-<%@page import="org.apache.commons.lang3.StringUtils" %>
+<%@page import="org.apache.commons.lang.StringUtils" %>
<%@page import="java.util.List" %>
<%@ include file="/taglibs.jsp" %>
diff --git a/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_range.jsp b/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_range.jsp
index 693dad24bb1..f77fa20cdaa 100644
--- a/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_range.jsp
+++ b/src/main/webapp/PMmodule/Admin/ProgramEdit/vacancy_template_range.jsp
@@ -24,7 +24,7 @@
--%>
-<%@page import="org.apache.commons.lang3.StringUtils" %>
+<%@page import="org.apache.commons.lang.StringUtils" %>
<%@page import="org.oscarehr.PMmodule.model.VacancyTemplate" %>
<%@page import="org.oscarehr.PMmodule.model.Criteria" %>
<%@page import="org.oscarehr.PMmodule.model.CriteriaType" %>
diff --git a/src/main/webapp/PMmodule/Admin/ProgramManagerForm.jsp b/src/main/webapp/PMmodule/Admin/ProgramManagerForm.jsp
index 60f58acc78d..04941e78c0a 100644
--- a/src/main/webapp/PMmodule/Admin/ProgramManagerForm.jsp
+++ b/src/main/webapp/PMmodule/Admin/ProgramManagerForm.jsp
@@ -26,7 +26,7 @@
<%@ page import="org.oscarehr.PMmodule.web.formbean.*" %>
<%@ page import="org.oscarehr.PMmodule.model.Program" %>
-<%@ page import="org.apache.commons.lang3.StringUtils" %>
+<%@ page import="org.apache.commons.lang.StringUtils" %>
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
|