[Ils-source] r1465 - in branches/1.6: . webapp webapp/WEB-INF webapp/WEB-INF/classes webapp/api/ccure/adduser webapp/api/ccure/user/put webapp/api/user/add webapp/api/user/edit webapp/api/user/put webapp/help
scribe at crosswire.org
scribe at crosswire.org
Wed May 18 14:47:50 MST 2016
Author: scribe
Date: 2016-05-18 14:47:50 -0700 (Wed, 18 May 2016)
New Revision: 1465
Modified:
branches/1.6/
branches/1.6/webapp/WEB-INF/classes/versions.properties
branches/1.6/webapp/WEB-INF/sysconfig.properties
branches/1.6/webapp/admin_profile.jsp
branches/1.6/webapp/api/ccure/adduser/index.jsp
branches/1.6/webapp/api/ccure/user/put/index.jsp
branches/1.6/webapp/api/user/add/index.jsp
branches/1.6/webapp/api/user/edit/index.jsp
branches/1.6/webapp/api/user/put/index.jsp
branches/1.6/webapp/employeehomegadget.jsp
branches/1.6/webapp/help/admin_userprofile.jsp
branches/1.6/webapp/selfregistration.jsp
Log:
release 1.80.6 which includes option to set default user initial passwd
Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429,1431,1434,1436,1441,1446-1448,1457
+ /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429,1431,1434,1436,1441,1446-1448,1457,1464
Modified: branches/1.6/webapp/WEB-INF/classes/versions.properties
===================================================================
--- branches/1.6/webapp/WEB-INF/classes/versions.properties 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/WEB-INF/classes/versions.properties 2016-05-18 21:47:50 UTC (rev 1465)
@@ -1 +1 @@
-LMS=V1.80.5
+LMS=V1.80.6
Modified: branches/1.6/webapp/WEB-INF/sysconfig.properties
===================================================================
--- branches/1.6/webapp/WEB-INF/sysconfig.properties 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/WEB-INF/sysconfig.properties 2016-05-18 21:47:50 UTC (rev 1465)
@@ -51,4 +51,4 @@
Docusign.password=yoyoyo
Docusign.integratorKey=SSIX-55285494-f60e-49a6-bb5c-70c8605fbee4
Docusign.accountID=f1f63527-3250-49c8-b31b-3166cb3e6a46
-
+DefaultPasswd=changeme
Modified: branches/1.6/webapp/admin_profile.jsp
===================================================================
--- branches/1.6/webapp/admin_profile.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/admin_profile.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -223,7 +223,7 @@
}
}
if ((current.getUserProfilePasswd() == null) || (current.getUserProfilePasswd().trim().length() < 1)) {
- current.setUserProfilePasswd("changeme");
+ current.setUserProfilePasswd(Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme"));
}
if (validError.length() > 0) {
Modified: branches/1.6/webapp/api/ccure/adduser/index.jsp
===================================================================
--- branches/1.6/webapp/api/ccure/adduser/index.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/api/ccure/adduser/index.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -145,7 +145,7 @@
content.append("&USERPRLNAME=").append(URLEncoder.encode(rs.getString("Last_Name"), "UTF-8"));
content.append("&USERPRFNAME=").append(URLEncoder.encode(rs.getString("First_Name"), "UTF-8"));
- content.append("&USERPRPASSWD=").append(URLEncoder.encode("changeme", "UTF-8"));
+ content.append("&USERPRPASSWD=").append(URLEncoder.encode(Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme"), "UTF-8"));
// content.append("&USERPREMAIL=").append(URLEncoder.encode("jsmith at airport.com", "UTF-8"));
content.append("&ILSGROUPROLE=").append(URLEncoder.encode(ccureRole, "UTF-8"));
content.append("&ILSGROUPLOCATION=").append(URLEncoder.encode(ccureLocation, "UTF-8"));
Modified: branches/1.6/webapp/api/ccure/user/put/index.jsp
===================================================================
--- branches/1.6/webapp/api/ccure/user/put/index.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/api/ccure/user/put/index.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -403,7 +403,7 @@
}
if ((current.getUserProfilePasswd() == null) || (current.getUserProfilePasswd().trim().length() < 1)) {
- current.setUserProfilePasswd("changeme");
+ current.setUserProfilePasswd(Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme"));
}
++errCode;
Modified: branches/1.6/webapp/api/user/add/index.jsp
===================================================================
--- branches/1.6/webapp/api/user/add/index.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/api/user/add/index.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -181,7 +181,7 @@
}
}
if ((current.getUserProfilePasswd() == null) || (current.getUserProfilePasswd().trim().length() < 1)) {
- current.setUserProfilePasswd("changeme");
+ current.setUserProfilePasswd(Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme"));
}
if (errorMsg.length() > 0) {
Modified: branches/1.6/webapp/api/user/edit/index.jsp
===================================================================
--- branches/1.6/webapp/api/user/edit/index.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/api/user/edit/index.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -162,7 +162,7 @@
}
}
if ((current.getUserProfilePasswd() == null) || (current.getUserProfilePasswd().trim().length() < 1)) {
- current.setUserProfilePasswd("changeme");
+ current.setUserProfilePasswd(Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme"));
}
if (errorMsg.length() > 0) {
Modified: branches/1.6/webapp/api/user/put/index.jsp
===================================================================
--- branches/1.6/webapp/api/user/put/index.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/api/user/put/index.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -259,7 +259,7 @@
}
if ((current.getUserProfilePasswd() == null) || (current.getUserProfilePasswd().trim().length() < 1)) {
- current.setUserProfilePasswd("changeme");
+ current.setUserProfilePasswd(Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme"));
}
++errCode;
Modified: branches/1.6/webapp/employeehomegadget.jsp
===================================================================
--- branches/1.6/webapp/employeehomegadget.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/employeehomegadget.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<%@ page import="java.net.URL" %>
+<%@ page import="com.resolutions.ils.Utils" %>
<%
response.setContentType("text/xml");
@@ -31,7 +32,7 @@
function onLoadData(data) {
viewer = data.get('viewer').getData();
- window.location.href = url+'?userID='+viewer.getDisplayName()+'&userPw=changeme';
+ window.location.href = url+'?userID='+viewer.getDisplayName()+'&userPw=<%=Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme")%>';
}
function loaded() {
Modified: branches/1.6/webapp/help/admin_userprofile.jsp
===================================================================
--- branches/1.6/webapp/help/admin_userprofile.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/help/admin_userprofile.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -1,3 +1,4 @@
+<%@ page import="com.resolutions.ils.Utils" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -37,7 +38,7 @@
<p>When adding a new User Profile, the following fields are available:</p>
<ul>
<li>Employee ID (Required) – Must be a unique alpha/numeric entry.</li>
- <li>Password (Required) – The default password is “changeme”</li>
+ <li>Password (Required) – The default password is “<%=Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme")%>”</li>
<li>Hire Date</li>
<li>Termination Date</li>
<li>Status – Active or Inactive</li>
Modified: branches/1.6/webapp/selfregistration.jsp
===================================================================
--- branches/1.6/webapp/selfregistration.jsp 2016-05-18 21:43:57 UTC (rev 1464)
+++ branches/1.6/webapp/selfregistration.jsp 2016-05-18 21:47:50 UTC (rev 1465)
@@ -3,6 +3,7 @@
contentType="text/html;charset=utf-8"
%>
<%@ page import="org.crosswire.utils.HTTPUtils" %>
+<%@ page import="com.resolutions.ils.Utils" %>
<%@ page import="org.crosswire.utils.GeoData" %>
<%@ page import="com.resolutions.ils.*" %>
<%@ page import="com.resolutions.ils.data.*" %>
@@ -32,7 +33,7 @@
return;
}
else {
- if (!"on".equals(com.resolutions.ils.Utils.getSysConfig(session).getProperty("SREnable", null))) {
+ if (!"on".equals(Utils.getSysConfig(session).getProperty("SREnable", null))) {
out.print("<html><head><META HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=login.jsp\"></head></html>");
return;
}
@@ -42,8 +43,8 @@
//-- Company logic from login.jsp -------
// TODO: consolidate this somewhere
String requestURL = request.getRequestURL().toString() + "?" + request.getQueryString();
- String co = com.resolutions.ils.Utils.getCompanyFromConfig(session, requestURL);
- if (co == null) co = com.resolutions.ils.Utils.getSysConfig(session).getProperty("Company", null);
+ String co = Utils.getCompanyFromConfig(session, requestURL);
+ if (co == null) co = Utils.getSysConfig(session).getProperty("Company", null);
if (co == null) co = request.getParameter("co");
if (co != null) session.setAttribute("co", co);
co = (String) session.getAttribute("co");
@@ -154,7 +155,7 @@
}
}
if ((current.getUserProfilePasswd() == null) || (current.getUserProfilePasswd().trim().length() < 1)) {
- current.setUserProfilePasswd("changeme");
+ current.setUserProfilePasswd(Utils.getSysConfig(session).getProperty("DefaultPasswd", "changeme"));
}
if (validError.length() > 0) {
@@ -176,12 +177,12 @@
validError = "You must enter a <t:t>Workgroup</t:t>";
}
else {
- int len = -1; try { len = Integer.parseInt(com.resolutions.ils.Utils.getSysConfig(session).getProperty("SRLengthVal", "-1")); } catch (Exception e) {}
+ int len = -1; try { len = Integer.parseInt(Utils.getSysConfig(session).getProperty("SRLengthVal", "-1")); } catch (Exception e) {}
if (len > 0 && currentLocation.length() != len) {
validError = "Invalid <t:t>Workgroup</t:t>";
}
else {
- String validationStrings = com.resolutions.ils.Utils.getSysConfig(session).getProperty("SRWGVal", null);
+ String validationStrings = Utils.getSysConfig(session).getProperty("SRWGVal", null);
if (validationStrings != null && validationStrings.length() > 0) {
BufferedReader reader = new BufferedReader(new StringReader(validationStrings));
try {
More information about the Ils-source
mailing list