diff --git a/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml b/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml index 69308bd..5172a33 100644 --- a/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/gcubeloggedin/client/ui/AboutView.ui.xml @@ -12,7 +12,7 @@ See more - Leave this group + Unregister from this group diff --git a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java index 92a7999..01424ef 100644 --- a/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/gcubeloggedin/server/LoggedinServiceImpl.java @@ -139,27 +139,6 @@ public class LoggedinServiceImpl extends RemoteServiceServlet implements Loggedi currSite.isRequestBasedGroup()); return vre; } - /** - * - * @return the portal basic url, e.g. http://www.foo.com - */ - private String getPortalBasicUrl() { - HttpServletRequest request = this.getThreadLocalRequest(); - String toReturn = ""; - //protocol - String protocol = (request.isSecure()) ? "https://" : "http://" ; - toReturn += protocol; - //server name - toReturn += request.getServerName(); - //port - toReturn += (request.getServerPort() == 80) ? "" : ":"+request.getServerPort() ; - - request.getQueryString(); - - _log.trace("\n getPortalBasicUrl: " +toReturn + "queryString: " + request.getQueryString()); - return toReturn; - } - /** *@return the redirect url if everything goes ok, null otherwise */ @@ -172,7 +151,7 @@ public class LoggedinServiceImpl extends RemoteServiceServlet implements Loggedi UserManager userM = new LiferayUserManager(); try { userM.dismissUserFromGroup(getCurrentGroupID(), userM.getUserId(username)); - sendUserUnregisteredNotification(username, getASLSession().getScope(), getPortalBasicUrl(), PortalContext.getConfiguration().getGatewayName()); + sendUserUnregisteredNotification(username, getASLSession().getScope(), PortalContext.getConfiguration().getGatewayURL(getThreadLocalRequest()), PortalContext.getConfiguration().getGatewayName()); return "/"; } catch (Exception e) { e.printStackTrace();