SAK-30485 Add property to enable/disable logout confirmation message.

axxter99 · Mar 10, 2016 · 05add93 · 05add93
1 parent 3df4ac4
commit 05add93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -96,6 +96,10 @@
 # DEFAULT: LEC
 # portal.use.sectionTitle.preferredCategory=TUT
 
+# SAK-30485 - Enable logout confirmation
+# DEFAULT: false
+# portal.logout.confirmation=true
+
 # ########################################################################
 # GATEWAY SITE
 # ########################################################################

diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
@@ -1858,7 +1858,7 @@ public void includeLogin(PortalRenderContext rcontext, HttpServletRequest req,
 				// since we are doing logout, cancel top.login
 				topLogin = false;
 
-				logoutWarningMessage = rloader.getString("sit_logout_warn");
+				logoutWarningMessage = ServerConfigurationService.getBoolean("portal.logout.confirmation",false)?rloader.getString("sit_logout_warn"):"";
 			}
 			rcontext.put("userIsLoggedIn", session.getUserId() != null);
 			rcontext.put("loginTopLogin", Boolean.valueOf(topLogin));