[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2071] client base URL is being used for URLs

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new a7521a2  [OPENMEETINGS-2071] client base URL is being used for URLs
a7521a2 is described below

commit a7521a27ceb44c8c77be9c3620dc1e7e49f408ec
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri May 24 10:53:58 2019 +0700

    [OPENMEETINGS-2071] client base URL is being used for URLs
---
 .../java/org/apache/openmeetings/web/app/Application.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 0a4393a..688961e 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -463,12 +463,14 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                return link;
        }
 
-       public static String urlForPage(Class<? extends Page> clazz, 
PageParameters pp, String _baseUrl) {
+       public static boolean isUrlValid(String url) {
+               return new UrlValidator(new String[] {"http", 
"https"}).isValid(url);
+       }
+
+       public static String urlForPage(Class<? extends Page> clazz, 
PageParameters pp, String inBaseUrl) {
                RequestCycle rc = RequestCycle.get();
-               String baseUrl = getBaseUrl();
-               if (!new UrlValidator(new String[] {"http", 
"https"}).isValid(baseUrl) && !Strings.isEmpty(_baseUrl)) {
-                       baseUrl = _baseUrl;
-               }
+               String baseUrl = isUrlValid(inBaseUrl) ? inBaseUrl
+                               : (isUrlValid(getBaseUrl()) ? getBaseUrl() : 
"");
                return rc.getUrlRenderer().renderFullUrl(Url.parse(baseUrl + 
rc.mapUrlFor(clazz, pp)));
        }