svn commit: r1053725 - in /roller/trunk: weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java

[snoopdave]

Author: snoopdave
Date: Wed Dec 29 20:26:04 2010
New Revision: 1053725

URL: http://svn.apache.org/viewvc?rev=1053725&view=rev
Log:
Fix for ROL-1900 that defaults to closed registration and only allows creation 
of first user at installation time. 
https://issues.apache.org/jira/browse/ROL-1900

Modified:
    
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
    
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java

Modified: 
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml?rev=1053725&r1=1053724&r2=1053725&view=diff
==============================================================================
--- 
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
 (original)
+++ 
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
 Wed Dec 29 20:26:04 2010
@@ -92,7 +92,7 @@
    
       <property-def  name="users.registration.enabled"  
key="configForm.allowNewUsers">
          <type>boolean</type>
-         <default-value>true</default-value>
+         <default-value>false</default-value>
       </property-def>
       <property-def  name="user.account.activation.enabled"  
key="configForm.accountActivation">
          <type>boolean</type>

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=1053725&r1=1053724&r2=1053725&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
 Wed Dec 29 20:26:04 2010
@@ -82,7 +82,15 @@ public class Register extends UIAction i
     @SkipValidation
     public String execute() {
         
-        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";
         }