Author: snoopdave
Date: Thu Dec 30 16:20:39 2010
New Revision: 1053929
URL: http://svn.apache.org/viewvc?rev=1053929&view=rev
Log:
Needed for default to closed registration issue
https://issues.apache.org/jira/browse/ROL-1900
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1053929&r1=1053928&r2=1053929&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Thu Dec 30 16:20:39 2010
@@ -163,10 +163,18 @@ public class Register extends UIAction i
public String save() {
-
if(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {
+ // if registation is disabled, then don't allow registration
+ try {
+ if
(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")
+ // unless there are 0 users (need to allow creation of first
user)
+ &&
WebloggerFactory.getWeblogger().getUserManager().getUserCount() != 0) {
+ return "disabled";
+ }
+ } catch (Exception e) {
+ log.error("Error checking user count", e);
return "disabled";
}
-
+
myValidate();
if (!hasActionErrors()) try {
