LPS-2631 Rollback

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@28660 05bdf26c-840f-0410-9ced-eb539d925f36
GergoMathe · Mar 30, 2009 · b3eba85 · b3eba85
1 parent 5e8e130
commit b3eba85
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 78 deletions.
diff --git a/definitions/liferay-hook_5_1_0.dtd b/definitions/liferay-hook_5_1_0.dtd
@@ -27,10 +27,9 @@ are:
 auth.forward.by.last.path
 captcha.check.portal.create_account
 default.landing.page.path
-field.enable.com.liferay.portal.model.Contact.birthday
-field.enable.com.liferay.portal.model.Contact.male
-field.enable.com.liferay.portal.model.Contact.password
-field.enable.com.liferay.portal.model.Organization.status
+field.enable.com.liferay.portal.model.contact.birthday
+field.enable.com.liferay.portal.model.contact.male
+field.enable.com.liferay.portal.model.organization.status
 javascript.fast.load
 layout.template.cache.enabled
 layout.user.private.layouts.auto.create

diff --git a/definitions/liferay-hook_5_2_0.dtd b/definitions/liferay-hook_5_2_0.dtd
@@ -15,10 +15,9 @@ are:
 auth.forward.by.last.path
 captcha.check.portal.create_account
 default.landing.page.path
-field.enable.com.liferay.portal.model.Contact.birthday
-field.enable.com.liferay.portal.model.Contact.male
-field.enable.com.liferay.portal.model.Contact.password
-field.enable.com.liferay.portal.model.Organization.status
+field.enable.com.liferay.portal.model.contact.birthday
+field.enable.com.liferay.portal.model.contact.male
+field.enable.com.liferay.portal.model.organization.status
 javascript.fast.load
 layout.template.cache.enabled
 layout.user.private.layouts.auto.create

diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java
@@ -845,7 +845,6 @@ protected void resetPortalProperties(Properties portalProperties)
 		"captcha.check.portal.create_account",
 		"field.enable.com.liferay.portal.model.Contact.birthday",
 		"field.enable.com.liferay.portal.model.Contact.male",
-		"field.enable.com.liferay.portal.model.Contact.password",
 		"field.enable.com.liferay.portal.model.Organization.status",
 		"javascript.fast.load",
 		"layout.template.cache.enabled",

diff --git a/portal-impl/src/com/liferay/portal/service/impl/UserLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/UserLocalServiceImpl.java
@@ -280,9 +280,6 @@ public User addUser(
 		if (autoPassword) {
 			password1 = PwdToolkitUtil.generate();
 		}
-		else {
-			validatePassword(password1, password2);
-		}
 
 		if (autoScreenName) {
 			ScreenNameGenerator screenNameGenerator =
@@ -3269,15 +3266,6 @@ protected void validateEmailAddress(long companyId, String emailAddress)
 		}
 	}
 
-	protected void validatePassword(String password1, String password2)
-		throws PortalException, SystemException {
-
-		if (Validator.isNull(password1) || Validator.isNull(password2)) {
-			throw new UserPasswordException(
-				UserPasswordException.PASSWORD_INVALID);
-		}
-	}
-
 	protected void validatePassword(
 			long companyId, long userId, String password1, String password2)
 		throws PortalException, SystemException {

diff --git a/portal-impl/src/com/liferay/portal/util/PropsKeys.java b/portal-impl/src/com/liferay/portal/util/PropsKeys.java
@@ -386,8 +386,6 @@ public interface PropsKeys {
 
 	public static final String FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_MALE = "field.enable.com.liferay.portal.model.Contact.male";
 
-	public static final String FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_PASSWORD = "field.enable.com.liferay.portal.model.Contact.password";
-
 	public static final String FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_ORGANIZATION_STATUS = "field.enable.com.liferay.portal.model.Organization.status";
 
 	public static final String FLAGS_EMAIL_BODY = "flags.email.body";

diff --git a/portal-impl/src/com/liferay/portal/util/PropsValues.java b/portal-impl/src/com/liferay/portal/util/PropsValues.java
@@ -454,11 +454,6 @@ public class PropsValues {
 		GetterUtil.getBoolean(PropsUtil.get(PropsKeys.
 			FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_MALE));
 
-	public static boolean
-		FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_PASSWORD =
-			GetterUtil.getBoolean(PropsUtil.get(PropsKeys.
-				FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_PASSWORD));
-
 	public static boolean
 		FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_ORGANIZATION_STATUS =
 			GetterUtil.getBoolean(PropsUtil.get(PropsKeys.

diff --git a/portal-impl/src/com/liferay/portlet/login/action/CreateAccountAction.java b/portal-impl/src/com/liferay/portlet/login/action/CreateAccountAction.java
@@ -216,14 +216,6 @@ protected void addUser(
 			CaptchaUtil.check(actionRequest);
 		}
 
-		if (PropsValues.
-				FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_PASSWORD) {
-			autoPassword = false;
-
-			password1 = ParamUtil.getString(actionRequest, "password1");
-			password2 = ParamUtil.getString(actionRequest, "password2");
-		}
-
 		User user = UserServiceUtil.addUser(
 			company.getCompanyId(), autoPassword, password1, password2,
 			autoScreenName, screenName, emailAddress, openId,

diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties
@@ -3258,7 +3258,6 @@
     #
     field.enable.com.liferay.portal.model.Contact.male=true
     field.enable.com.liferay.portal.model.Contact.birthday=true
-    field.enable.com.liferay.portal.model.Contact.password=false
     field.enable.com.liferay.portal.model.Organization.status=false
 
 ##
@@ -4413,10 +4412,6 @@
     communities.email.membership.request.subject=com/liferay/portlet/communities/dependencies/email_membership_request_subject.tmpl
     communities.email.membership.request.body=com/liferay/portlet/communities/dependencies/email_membership_request_body.tmpl
 
-    communities.email.invitation.message.body=com/liferay/portlet/communities/dependencies/invitation_email_message_body.tmpl
-    communities.email.invitation.message.subject=com/liferay/portlet/communities/dependencies/invitation_email_message_subject.tmpl
-
-
 ##
 ## Document Library Portlet
 ##

diff --git a/portal-web/docroot/html/portlet/login/create_account.jsp b/portal-web/docroot/html/portlet/login/create_account.jsp
@@ -30,7 +30,6 @@ String openId = ParamUtil.getString(request, "openId");
 User user2 = null;
 Contact contact2 = null;
 
-PasswordPolicy passwordPolicy = PasswordPolicyLocalServiceUtil.getDefaultPasswordPolicy(company.getCompanyId());
 Calendar birthday = CalendarFactoryUtil.getCalendar();
 
 birthday.set(Calendar.MONTH, Calendar.JANUARY);
@@ -55,29 +54,6 @@ boolean male = BeanParamUtil.getBoolean(contact2, request, "male", true);
 <liferay-ui:error exception="<%= ReservedUserScreenNameException.class %>" message="the-screen-name-you-requested-is-reserved" />
 <liferay-ui:error exception="<%= UserEmailAddressException.class %>" message="please-enter-a-valid-email-address" />
 <liferay-ui:error exception="<%= UserIdException.class %>" message="please-enter-a-valid-user-id" />
-<liferay-ui:error exception="<%= UserPasswordException.class %>">
-
-	<%
-	UserPasswordException upe = (UserPasswordException)errorException;
-	%>
-
-	<c:if test="<%= upe.getType() == UserPasswordException.PASSWORD_CONTAINS_TRIVIAL_WORDS %>">
-		<liferay-ui:message key="that-password-uses-common-words-please-enter-in-a-password-that-is-harder-to-guess-i-e-contains-a-mix-of-numbers-and-letters" />
-	</c:if>
-
-	<c:if test="<%= upe.getType() == UserPasswordException.PASSWORD_INVALID %>">
-		<liferay-ui:message key="that-password-is-invalid-please-enter-in-a-different-password" />
-	</c:if>
-
-	<c:if test="<%= upe.getType() == UserPasswordException.PASSWORD_LENGTH %>">
-		<%= LanguageUtil.format(pageContext, "that-password-is-too-short-or-too-long-please-make-sure-your-password-is-between-x-and-512-characters", String.valueOf(passwordPolicy.getMinLength()), false) %>
-	</c:if>
-
-	<c:if test="<%= upe.getType() == UserPasswordException.PASSWORDS_DO_NOT_MATCH %>">
-		<liferay-ui:message key="the-passwords-you-entered-do-not-match-each-other-please-re-enter-your-password" />
-	</c:if>
-</liferay-ui:error>
-
 <liferay-ui:error exception="<%= UserScreenNameException.class %>" message="please-enter-a-valid-screen-name" />
 
 <c:if test='<%= SessionMessages.contains(request, "missingOpenIdUserInformation") %>'>
@@ -121,19 +97,6 @@ boolean male = BeanParamUtil.getBoolean(contact2, request, "male", true);
 </fieldset>
 
 <fieldset class="block-labels col">
-	<c:if test="<%= PropsValues.FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_PASSWORD %>">
-		<div class="ctrl-holder">
-			<label for=""><liferay-ui:message key="password" /></label>
-
-			<input name="<portlet:namespace />password1" size="30" type="password" value="" />
-		</div>
-		<div class="ctrl-holder">
-			<label for=""><liferay-ui:message key="enter-again" /></label>
-
-			<input name="<portlet:namespace />password2" size="30" type="password" value="" />
-		</div>
-	</c:if>
-
 	<c:choose>
 		<c:when test="<%= PropsValues.FIELD_ENABLE_COM_LIFERAY_PORTAL_MODEL_CONTACT_BIRTHDAY %>">
 			<div class="ctrl-holder">