conf: Make it more clear 'signup.confirm' option

yona-projects · Dec 14, 2016 · 6f7b0ca · 6f7b0ca
1 parent d2fbefb
commit 6f7b0ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/controllers/UserApp.java b/app/controllers/UserApp.java
@@ -841,7 +841,7 @@ private static User authenticate(String loginId, String password, boolean hashed
 
     public static boolean isUseSignUpConfirm(){
         Configuration config = play.Play.application().configuration();
-        String useSignUpConfirm = config.getString("signup.require.confirm");
+        String useSignUpConfirm = config.getString("signup.require.admin.confirm");
         return useSignUpConfirm != null && useSignUpConfirm.equals("true");
     }
 

diff --git a/conf/application.conf.default b/conf/application.conf.default
@@ -21,6 +21,10 @@ application.siteName="Yona"
 # want to allow that, set signup.require.confirm to true.
 application.allowsAnonymousAccess=true
 
+# If you wants to make the user available to use yona
+# after the server administrator approved,uncomment below
+# signup.require.admin.confirm = true
+
 # Notification
 # ~~~~~
 # Notfication email is delivered by default.
@@ -168,9 +172,6 @@ imap.folder = inbox
 %prod.application.log=INFO
 %prod.application.mode=prod
 
-#if you want to use sign-up is confirmed by site admin, uncomment below
-#signup.require.confirm = true
-
 # User uploaded temporary files cleanup schedule (sec, default 24hour: 24*60*60 = 86400)
 # application.temporaryfiles.keep-up.time = 86400
 
@@ -262,4 +263,4 @@ github.client.secret = "TYPE YOUR GITHUB CILENT SECRET"
 # Attachment Upload File Size Limit
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 2,147,483,454 bytes = 2Gb
-application.maxFileSize = 2147483454
+application.maxFileSize = 2147483454