You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/03/06 08:38:28 UTC
svn commit: r1785605 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
branches/3.2.x/openmeetings-web/src/ma...
Author: solomax
Date: Mon Mar 6 08:38:28 2017
New Revision: 1785605
URL: http://svn.apache.org/viewvc?rev=1785605&view=rev
Log:
[OPENMEETINGS-1578] invitation URL should be displayed correctly
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Mon Mar 6 08:38:28 2017
@@ -98,6 +98,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.resource.DynamicJQueryResourceReference;
import org.apache.wicket.util.collections.ConcurrentHashSet;
+import org.apache.wicket.validation.validator.UrlValidator;
import org.slf4j.Logger;
import org.springframework.web.context.WebApplicationContext;
import org.wicketstuff.dashboard.WidgetRegistry;
@@ -534,7 +535,7 @@ public class Application extends Authent
return getContactsLink();
}
- public static String getInvitationLink(Invitation i) {
+ public static String getInvitationLink(Invitation i, String baseUrl) {
String link = "";
Room r = i.getRoom();
User u = i.getInvitee();
@@ -554,30 +555,34 @@ public class Application extends Authent
if (u.getLanguageId() > 0) {
pp.add("language", u.getLanguageId());
}
- link = urlForPage(HashPage.class, pp);
+ link = urlForPage(HashPage.class, pp, baseUrl);
}
}
}
Recording rec = i.getRecording();
if (rec != null) {
- link = urlForPage(HashPage.class, new PageParameters().add(INVITATION_HASH, i.getHash()));
+ link = urlForPage(HashPage.class, new PageParameters().add(INVITATION_HASH, i.getHash()), baseUrl);
}
return link;
}
@Override
public String getOmInvitationLink(Invitation i) { //FIXME hack for email templates support (should be in separate module for now
- return getInvitationLink(i);
+ return getInvitationLink(i, null);
}
- public static String urlForPage(Class<? extends Page> clazz, PageParameters pp) {
+ public static String urlForPage(Class<? extends Page> clazz, PageParameters pp, String _baseUrl) {
RequestCycle rc = RequestCycle.get();
- return rc.getUrlRenderer().renderFullUrl(Url.parse(getBean(ConfigurationDao.class).getBaseUrl() + rc.urlFor(clazz, pp)));
+ String baseUrl = getBean(ConfigurationDao.class).getBaseUrl();
+ if (!new UrlValidator(new String[] {"http", "https"}).isValid(baseUrl) && !Strings.isEmpty(_baseUrl)) {
+ baseUrl = _baseUrl;
+ }
+ return rc.getUrlRenderer().renderFullUrl(Url.parse(baseUrl + rc.urlFor(clazz, pp)));
}
@Override
public String urlForActivatePage(PageParameters pp) { //FIXME hack for email templates support (should be in separate module for now
- return urlForPage(ActivatePage.class, pp);
+ return urlForPage(ActivatePage.class, pp, null);
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java Mon Mar 6 08:38:28 2017
@@ -40,6 +40,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.service.room.InvitationManager;
import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
@@ -209,7 +210,7 @@ public abstract class InvitationForm ext
} else if (button.equals(dialog.generate)) {
Invitation i = create(recipients.getModelObject().iterator().next());
setModelObject(i);
- url.setModelObject(getInvitationLink(i));
+ url.setModelObject(getInvitationLink(i, WebSession.get().getExtendedProperties().getBaseUrl()));
target.add(url);
} else if (button.equals(dialog.send)) {
if (Strings.isEmpty(url.getModelObject())) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Mon Mar 6 08:38:28 2017
@@ -202,7 +202,7 @@ public class RoomMenuPanel extends Panel
add((roomName = new Label("roomName", r.getName())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
String tag = getGroup().getTag();
add(logo, new Label("tag", tag).setVisible(!Strings.isEmpty(tag)));
- add((shareBtn = new StartSharingButton("share", room.getClient(), WebSession.get().getExtendedProperties()))
+ add((shareBtn = new StartSharingButton("share", room.getClient()))
.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
RoomInvitationForm rif = new RoomInvitationForm("form", room.getRoom().getId());
add(invite = new InvitationDialog("invite", rif));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java Mon Mar 6 08:38:28 2017
@@ -44,9 +44,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmButton;
import org.apache.openmeetings.web.util.AjaxDownload;
-import org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -61,7 +61,6 @@ public class StartSharingButton extends
private static final String CDATA_END = "]]>";
private final AjaxDownload download;
private final org.apache.openmeetings.db.entity.basic.Client c;
- private final ExtendedClientProperties extProps;
private enum Protocol {
rtmp
, rtmpe
@@ -69,10 +68,9 @@ public class StartSharingButton extends
, rtmpt
}
- public StartSharingButton(String id, org.apache.openmeetings.db.entity.basic.Client c, final ExtendedClientProperties extProps) {
+ public StartSharingButton(String id, org.apache.openmeetings.db.entity.basic.Client c) {
super(id);
this.c = c;
- this.extProps = extProps;
setOutputMarkupPlaceholderTag(true);
setVisible(false);
add(new AttributeAppender("title", Application.getString(1480)));
@@ -109,7 +107,8 @@ public class StartSharingButton extends
throw new RuntimeException(String.format("Invalid room id passed %s, expected, %s", path, roomId));
}
Protocol protocol = Protocol.valueOf(url.getScheme());
- app = addKeystore(rc, app, protocol).replace("$codebase", extProps.getCodebase())
+ app = addKeystore(rc, app, protocol)
+ .replace("$codebase", WebSession.get().getExtendedProperties().getCodebase())
.replace("$applicationName", cfgDao.getAppName())
.replace("$url", _url)
.replace("$publicSid", publicSid)
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java Mon Mar 6 08:38:28 2017
@@ -51,6 +51,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.util.CalendarHelper;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmDateTimePicker;
import org.apache.openmeetings.web.util.CalendarWebHelper;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
@@ -241,7 +242,7 @@ public class MessageDialog extends Abstr
, CalendarHelper.getDate(start.getModelObject(), to.getTimeZoneId())
, CalendarHelper.getDate(end.getModelObject(), to.getTimeZoneId()), null);
- invitation_link = getInvitationLink(i);
+ invitation_link = getInvitationLink(i, WebSession.get().getExtendedProperties().getBaseUrl());
if (invitation_link == null) {
invitation_link = "";
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java Mon Mar 6 08:38:28 2017
@@ -26,6 +26,7 @@ import org.json.JSONObject;
public class ExtendedClientProperties extends ClientProperties {
private static final long serialVersionUID = 1L;
+ private String baseUrl;
private String codebase;
private String settings;
@@ -33,6 +34,10 @@ public class ExtendedClientProperties ex
return codebase;
}
+ public String getBaseUrl() {
+ return baseUrl;
+ }
+
public void setSettings(JSONObject s) {
settings = s.toString();
}
@@ -57,6 +62,7 @@ public class ExtendedClientProperties ex
if (sb.charAt(sb.length() - 1) != '/') {
sb.append('/');
}
+ baseUrl = sb.toString();
codebase = sb.append("screenshare").toString();
settings = parameters.getParameterValue("settings").toString("{}");
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Mon Mar 6 08:38:28 2017
@@ -98,6 +98,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.resource.DynamicJQueryResourceReference;
import org.apache.wicket.util.collections.ConcurrentHashSet;
+import org.apache.wicket.validation.validator.UrlValidator;
import org.slf4j.Logger;
import org.springframework.web.context.WebApplicationContext;
import org.wicketstuff.dashboard.WidgetRegistry;
@@ -534,7 +535,7 @@ public class Application extends Authent
return getContactsLink();
}
- public static String getInvitationLink(Invitation i) {
+ public static String getInvitationLink(Invitation i, String baseUrl) {
String link = "";
Room r = i.getRoom();
User u = i.getInvitee();
@@ -554,30 +555,34 @@ public class Application extends Authent
if (u.getLanguageId() > 0) {
pp.add("language", u.getLanguageId());
}
- link = urlForPage(HashPage.class, pp);
+ link = urlForPage(HashPage.class, pp, baseUrl);
}
}
}
Recording rec = i.getRecording();
if (rec != null) {
- link = urlForPage(HashPage.class, new PageParameters().add(INVITATION_HASH, i.getHash()));
+ link = urlForPage(HashPage.class, new PageParameters().add(INVITATION_HASH, i.getHash()), baseUrl);
}
return link;
}
@Override
public String getOmInvitationLink(Invitation i) { //FIXME hack for email templates support (should be in separate module for now
- return getInvitationLink(i);
+ return getInvitationLink(i, null);
}
- public static String urlForPage(Class<? extends Page> clazz, PageParameters pp) {
+ public static String urlForPage(Class<? extends Page> clazz, PageParameters pp, String _baseUrl) {
RequestCycle rc = RequestCycle.get();
- return rc.getUrlRenderer().renderFullUrl(Url.parse(getBean(ConfigurationDao.class).getBaseUrl() + rc.urlFor(clazz, pp)));
+ String baseUrl = getBean(ConfigurationDao.class).getBaseUrl();
+ if (!new UrlValidator(new String[] {"http", "https"}).isValid(baseUrl) && !Strings.isEmpty(_baseUrl)) {
+ baseUrl = _baseUrl;
+ }
+ return rc.getUrlRenderer().renderFullUrl(Url.parse(baseUrl + rc.urlFor(clazz, pp)));
}
@Override
public String urlForActivatePage(PageParameters pp) { //FIXME hack for email templates support (should be in separate module for now
- return urlForPage(ActivatePage.class, pp);
+ return urlForPage(ActivatePage.class, pp, null);
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java Mon Mar 6 08:38:28 2017
@@ -40,6 +40,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.service.room.InvitationManager;
import org.apache.openmeetings.util.crypt.CryptProvider;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
@@ -209,7 +210,7 @@ public abstract class InvitationForm ext
} else if (button.equals(dialog.generate)) {
Invitation i = create(recipients.getModelObject().iterator().next());
setModelObject(i);
- url.setModelObject(getInvitationLink(i));
+ url.setModelObject(getInvitationLink(i, WebSession.get().getExtendedProperties().getBaseUrl()));
target.add(url);
} else if (button.equals(dialog.send)) {
if (Strings.isEmpty(url.getModelObject())) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Mon Mar 6 08:38:28 2017
@@ -202,7 +202,7 @@ public class RoomMenuPanel extends Panel
add((roomName = new Label("roomName", r.getName())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
String tag = getGroup().getTag();
add(logo, new Label("tag", tag).setVisible(!Strings.isEmpty(tag)));
- add((shareBtn = new StartSharingButton("share", room.getClient(), WebSession.get().getExtendedProperties()))
+ add((shareBtn = new StartSharingButton("share", room.getClient()))
.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
RoomInvitationForm rif = new RoomInvitationForm("form", room.getRoom().getId());
add(invite = new InvitationDialog("invite", rif));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java Mon Mar 6 08:38:28 2017
@@ -44,9 +44,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmButton;
import org.apache.openmeetings.web.util.AjaxDownload;
-import org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -61,7 +61,6 @@ public class StartSharingButton extends
private static final String CDATA_END = "]]>";
private final AjaxDownload download;
private final org.apache.openmeetings.db.entity.basic.Client c;
- private final ExtendedClientProperties extProps;
private enum Protocol {
rtmp
, rtmpe
@@ -69,10 +68,9 @@ public class StartSharingButton extends
, rtmpt
}
- public StartSharingButton(String id, org.apache.openmeetings.db.entity.basic.Client c, final ExtendedClientProperties extProps) {
+ public StartSharingButton(String id, org.apache.openmeetings.db.entity.basic.Client c) {
super(id);
this.c = c;
- this.extProps = extProps;
setOutputMarkupPlaceholderTag(true);
setVisible(false);
add(new AttributeAppender("title", Application.getString(1480)));
@@ -109,7 +107,8 @@ public class StartSharingButton extends
throw new RuntimeException(String.format("Invalid room id passed %s, expected, %s", path, roomId));
}
Protocol protocol = Protocol.valueOf(url.getScheme());
- app = addKeystore(rc, app, protocol).replace("$codebase", extProps.getCodebase())
+ app = addKeystore(rc, app, protocol)
+ .replace("$codebase", WebSession.get().getExtendedProperties().getCodebase())
.replace("$applicationName", cfgDao.getAppName())
.replace("$url", _url)
.replace("$publicSid", publicSid)
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java Mon Mar 6 08:38:28 2017
@@ -51,6 +51,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.util.CalendarHelper;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmDateTimePicker;
import org.apache.openmeetings.web.util.CalendarWebHelper;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
@@ -241,7 +242,7 @@ public class MessageDialog extends Abstr
, CalendarHelper.getDate(start.getModelObject(), to.getTimeZoneId())
, CalendarHelper.getDate(end.getModelObject(), to.getTimeZoneId()), null);
- invitation_link = getInvitationLink(i);
+ invitation_link = getInvitationLink(i, WebSession.get().getExtendedProperties().getBaseUrl());
if (invitation_link == null) {
invitation_link = "";
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1785605&r1=1785604&r2=1785605&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java Mon Mar 6 08:38:28 2017
@@ -26,6 +26,7 @@ import org.json.JSONObject;
public class ExtendedClientProperties extends ClientProperties {
private static final long serialVersionUID = 1L;
+ private String baseUrl;
private String codebase;
private String settings;
@@ -33,6 +34,10 @@ public class ExtendedClientProperties ex
return codebase;
}
+ public String getBaseUrl() {
+ return baseUrl;
+ }
+
public void setSettings(JSONObject s) {
settings = s.toString();
}
@@ -57,6 +62,7 @@ public class ExtendedClientProperties ex
if (sb.charAt(sb.length() - 1) != '/') {
sb.append('/');
}
+ baseUrl = sb.toString();
codebase = sb.append("screenshare").toString();
settings = parameters.getParameterValue("settings").toString("{}");
}