Index: portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java =================================================================== --- portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (revision 83807) +++ portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (working copy) @@ -1084,6 +1084,7 @@ rcontext.put("userId", s.getUserId()); rcontext.put("userEid", s.getUserEid()); rcontext.put("loggedOutUrl",ServerConfigurationService.getLoggedOutUrl()); + rcontext.put("portalPath",ServerConfigurationService.getPortalUrl()); rcontext.put("timeoutDialogEnabled",Boolean.valueOf(ServerConfigurationService.getBoolean("timeoutDialogEnabled", true))); rcontext.put("timeoutDialogWarningSeconds", Integer.valueOf(ServerConfigurationService.getInt("timeoutDialogWarningSeconds", 600))); // rcontext.put("sitHelp", Web.escapeHtml(rb.getString("sit_help"))); Index: portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeStandardHead.vm =================================================================== --- portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeStandardHead.vm (revision 83807) +++ portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeStandardHead.vm (working copy) @@ -11,6 +11,7 @@ ## SAK-13987, SAK-16162, SAK-19132 - Portal Logout Timer var portal = { "loggedIn": $!{loggedIn}, + "portalPath": "$!{portalPath}", "loggedOutUrl": "$!{loggedOutUrl}", "user": { "id": "$!{userId}", Index: portal-charon/charon/src/webapp/scripts/portalscripts.js =================================================================== --- portal-charon/charon/src/webapp/scripts/portalscripts.js (revision 83807) +++ portal-charon/charon/src/webapp/scripts/portalscripts.js (working copy) @@ -74,6 +74,7 @@ var timeoutDialogEnabled = false; var timeoutDialogWarningTime; var timeoutLoggedoutUrl; +var timeoutPortalPath; jQuery(document).ready(function(){ // note a session exists whether the user is logged in or no if (portal.loggedIn && portal.timeoutDialog ) { @@ -85,6 +86,7 @@ timeoutDialogEnabled = portal.timeoutDialog.enabled; timeoutDialogWarningTime = portal.timeoutDialog.seconds; timeoutLoggedoutUrl = portal.loggedOutUrl; + timeoutPortalPath = portal.portalPath; if (timeoutDialogEnabled == true) { poll_session_data(); fetch_timeout_dialog(); @@ -132,7 +134,7 @@ function keep_session_alive(){ dismiss_session_alert(); - jQuery.get(timeoutLoggedoutUrl); + jQuery.get(timeoutPortalPath); } var dismiss_session_alert = function(){