You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2014/04/23 13:00:39 UTC

svn commit: r1589369 - /openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java

Author: vdegtyarev
Date: Wed Apr 23 11:00:39 2014
New Revision: 1589369

URL: http://svn.apache.org/r1589369
Log:
Merged revision(s) 1589367 from openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java:
OPENMEETINGS-983 is fixed. Verification URL is generated correctly.
........

Modified:
    openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java   (contents, props changed)

Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1589369&r1=1589368&r2=1589369&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Wed Apr 23 11:00:39 2014
@@ -653,8 +653,8 @@ public class UserManager implements IUse
 					if (hash == null){
 						hash = ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(login
 								+ CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
-						link += "activateUser?u=" + hash;
 					}
+					link += "activate?u=" + hash;
 
 					if (sendWelcomeMessage && email.length() != 0) {
 						String sendMail = emailManagement.sendMail(login, password, email, link, sendConfirmation);

Propchange: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 23 11:00:39 2014
@@ -0,0 +1,6 @@
+/incubator/openmeetings/branches/video-components/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java:1220095-1239505
+/incubator/openmeetings/import/branches/dev/injection/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java:1219598-1219722
+/incubator/openmeetings/import/branches/dev/om_openjpa/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java:1219535-1219562
+/openmeetings/branches/3.0.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java:1583287,1583521,1583566
+/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java:1589367
+/openmeetings/branches/OPENMEETINGS-745/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java:1512528-1512967