svn commit: r1509628 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web: pages/auth/RegisterDialog.java util/BaseUrlAjaxBehavior.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Aug  2 11:16:50 2013
New Revision: 1509628

URL: http://svn.apache.org/r1509628
Log:
Base url is corrected

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/BaseUrlAjaxBehavior.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1509628&r1=1509627&r2=1509628&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 Fri Aug  2 11:16:50 2013
@@ -168,7 +168,7 @@ public class RegisterDialog extends Abst
                String hash = 
getBean(ManageCryptStyle.class).getInstanceOfCrypt()
                                .createPassPhrase(login + 
CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
 
-               String redirectPage = 
getRequestCycle().urlFor(ActivatePage.class, new PageParameters().add("u", 
hash)).toString().substring(1);
+               String redirectPage = 
getRequestCycle().urlFor(ActivatePage.class, new PageParameters().add("u", 
hash)).toString().substring(2);
                String baseURL = WebSession.get().getBaseUrl() + redirectPage;
                
                sendConfirmation = baseURL != null

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/BaseUrlAjaxBehavior.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/BaseUrlAjaxBehavior.java?rev=1509628&r1=1509627&r2=1509628&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/BaseUrlAjaxBehavior.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/BaseUrlAjaxBehavior.java
 Fri Aug  2 11:16:50 2013
@@ -41,9 +41,14 @@ public class BaseUrlAjaxBehavior extends
        @Override
        protected void respond(AjaxRequestTarget target) {
                StringValue url = 
getComponent().getRequestCycle().getRequest().getRequestParameters().getParameterValue("baseUrl");
-               String baseUrl = url.toString(); 
-               if (baseUrl.indexOf('#') > 0 || baseUrl.indexOf('?') > 0) {
-                       baseUrl = baseUrl.substring(0, 
baseUrl.lastIndexOf('/'));
+               String baseUrl = url.toString();
+               int index =  baseUrl.indexOf('#');
+               if (index > 0){
+                       baseUrl = baseUrl.substring(0, index);
+               }
+               index = baseUrl.indexOf('?');
+               if (index > 0) {
+                       baseUrl = baseUrl.substring(0, baseUrl.lastIndexOf('/') 
+ 1);
                }
                WebSession.get().setBaseUrl(baseUrl);
        }