Skip to content

CORE423 Fix #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Felix-Vuylsteker wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CORE423 Fix #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a6f8d
Update author list for 1.7.13
jklann Jun 10, 2022
ebd7532
CORE423 Fix
Vuylsteker-Felix Dec 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions INSTALL-README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ The [i2b2 Installation Guide](http://community.i2b2.org/wiki/display/getstarted/
The i2b2 Admin Module is part of the web client and is used by administrators to setup and maintain the i2b2 environment(s). Documentation on setting up the i2b2 Admin Module within the client is in [Chapter 5.2.3. Admin Module Integrated into Webclient](https://community.i2b2.org/wiki/display/getstarted/2.3+Admin+Module+Install+Integrated+into+Webclient)

[Chapter 14. Initial Setup of i2b2 in Admin](https://community.i2b2.org/wiki/display/getstarted/Chapter+6.+Initial+Setup+of+i2b2+in+Admin) of the i2b2 Installation Guide contain additional information on setting up the Admin module in your environment.

i2b2 v1.7.13 now supports SAML authentication. Details on setting this up can be found in [Chapter 8. SAML Setup for i2b2](https://community.i2b2.org/wiki/pages/viewpage.action?pageId=55706050).
5 changes: 3 additions & 2 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
* Hannah Murphy
* Nich Wattanasin
* Bhaswati Ghosh
* Jeffrey Klann, PhD
* Jeffrey Klann, PhD
* Kevin Bui

PHP components:
* PHP-BASED I2B2 PROXY "CELL"
Expand All @@ -26,7 +27,7 @@

Author: Kevin Bui
Contributors: Michele Morris, Justin Prosser, Mike Mendis, Jeff Klann
Last Revised: 04-22
Last Revised: 05-22
**********************************************************************/

session_start();
Expand Down
26 changes: 13 additions & 13 deletions js-i2b2/cells/PM/PM_ctrlr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Nick Benik, Griffin Weber MD PhD
* @version 1.5
* ----------------------------------------------------------------------------------------
* updated 9-15-09: Refactor loading process to allow CELL loading timeouts and failures [Nick Benik]
* updated 9-15-09: Refactor loading process to allow CELL loading timeouts and failures [Nick Benik]
* updated 11-9-09: Changes to announcement dialog functionality [Charles McGow]
* updated 11-23-09: Bug Fix for Firefox's 4k XML node text limit [Nick Benik]
*/
Expand Down Expand Up @@ -76,12 +76,12 @@ i2b2.PM.doLogin = function () {
domain: login_domain,
is_shrine: shrine_domain,
project: login_project,
username: login_username,
username: login_username.toLowerCase(),
password_text: login_password
};
var transportOptions = {
url: login_url,
user: login_username,
user: login_username.toLowerCase(),
password: login_password,
domain: login_domain,
project: login_project
Expand Down Expand Up @@ -126,11 +126,11 @@ i2b2.PM._processUserConfig = function (data) {
var timeout = t.getAttribute('token_ms_timeout');
if (timeout == undefined || timeout < 300001)
{
i2b2.PM.model.IdleTimer.start(1800000 - 300000); //timeout); //timeout-60000);
i2b2.PM.model.IdleTimer.start(1800000 - 300000); //timeout); //timeout-60000);

} else {

i2b2.PM.model.IdleTimer.start(timeout - 300000); //timeout); //timeout-60000);
i2b2.PM.model.IdleTimer.start(timeout - 300000); //timeout); //timeout-60000);
}
} catch (e) {
//console.error("Could not find returned password node in login XML");
Expand Down Expand Up @@ -208,7 +208,7 @@ i2b2.PM._processUserConfig = function (data) {
if ((roledetails[d].textContent) && (roledetails[d].textContent == "ADMIN")) {
i2b2.PM.model.isAdmin = true
} else if ((roledetails[d].firstChild) && (roledetails[d].firstChild.nodeValue.unescapeHTML() == "ADMIN")) {
i2b2.PM.model.isAdmin = true
i2b2.PM.model.isAdmin = true
}
}
*/
Expand Down Expand Up @@ -248,7 +248,7 @@ i2b2.PM._processUserConfig = function (data) {
i2b2.PM.model.login_project = ""; //i2b2.h.XPath(projs[0], 'attribute::id')[0].nodeValue;
i2b2.PM._processLaunchFramework();
} else if (projs.length == 0) {
// show project selection dialog if needed
// show project selection dialog if needed
try {
i2b2.h.LoadingMask.hide();
} catch (e) {
Expand Down Expand Up @@ -277,10 +277,10 @@ i2b2.PM._processUserConfig = function (data) {
window.location.href = window.location.href + "/logout.php";
}
//} else if (s == null || s == "") {
// alert("The PM Cell is down or the address in the properties file is incorrect.");
// alert("The PM Cell is down or the address in the properties file is incorrect.");
} else {
alert("The PM Cell is down or the address in the properties file is incorrect.");
//alert("Your account does not have access to any i2b2 projects.");
//alert("Your account does not have access to any i2b2 projects.");
}
try {
i2b2.PM.view.modal.login.show();
Expand Down Expand Up @@ -325,7 +325,7 @@ i2b2.PM.changePassword = {
if (!i2b2.PM.changePassword.yuiPanel) {
// load the help page

// show non-modal dialog with help documentation
// show non-modal dialog with help documentation
var panel = new YAHOO.widget.Panel("changepassword-viewer-panel", {
draggable: true,
zindex: 10000,
Expand Down Expand Up @@ -528,7 +528,7 @@ i2b2.PM.view.modal.projectDialog = {
}

i2b2.PM.view.modal.projectDialog.yuiDialog.destroy();
//If admin project goto admin
//If admin project goto admin
if (ProjId == 'admin_HY!5Axu&') {
$('crcQueryToolBox').hide();
i2b2.PM.model.login_project = ""; //i2b2.h.XPath(projs[0], 'attribute::id')[0].nodeValue;
Expand Down Expand Up @@ -723,7 +723,7 @@ i2b2.PM._processLaunchFramework = function () {
} else {
//Remove cells.plugins that dont have right access to
//if (i2b2.PM.model.userRoles.indexOf(i2b2.hive.cfg.lstCells[cellKey].roles) == -1) {
// deleteKeys[cellKey] = true;
// deleteKeys[cellKey] = true;
//}
if (!i2b2.PM.model.admin_only) {
var roleFound = -1;
Expand Down Expand Up @@ -782,7 +782,7 @@ i2b2.PM._processLaunchFramework = function () {
i2b2.hive.cfg.LoadedCells = t;
delete t;

// start our watchdog time (WDT)
// start our watchdog time (WDT)
if (i2b2.hive.cfg.loginTimeout) {
var t = i2b2.hive.cfg.loginTimeout;
} else {
Expand Down