注册用户加入 URL 字段

暂时没有加入升级程序，所以需要重新初始化开发库。

core/src/main/java/org/b3log/solo/processor/UpgradeProcessor.java

@@ -60,6 +60,7 @@ import org.json.JSONObject;
 @RequestProcessor
 // TODO: 060
 // 1. Add column Preference.feedOutputCnt
+// 2. Add column User.userURL
 public final class UpgradeProcessor {
 
     /**

core/src/main/java/org/b3log/solo/processor/console/UserConsole.java

@@ -44,7 +44,7 @@ import org.json.JSONObject;
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
  * @author <a href="mailto:385321165@qq.com">DASHU</a>
- * @version 1.0.0.3, Mar 30, 2013
+ * @version 1.0.0.4, Apr 2, 2013
  * @since 0.4.0
  */
 @RequestProcessor
@@ -94,8 +94,9 @@ public final class UserConsole {
      *     "oId": "",
      *     "userName": "",
      *     "userEmail": "",
-     *     "userPassword": "",
-     *     "userRole": ""
+     *     "userPassword": "", // Unhashed
+     *     "userRole": "", // optional
+     *     "userURL": "", // optional
      * }
      * </pre>
      * @param context the specified http request context
@@ -155,8 +156,8 @@ public final class UserConsole {
      *     "userName": "",
      *     "userEmail": "",
      *     "userPassword": "",
-     *     "userRole": "" // optional, uses {@value org.b3log.latke.model.Role#DEFAULT_ROLE} instead,
-     *                       if not speciffied
+     *     "userURL": "", // optional, uses 'servePath' instead if not specified 
+     *     "userRole": "" // optional, uses {@value org.b3log.latke.model.Role#DEFAULT_ROLE} instead if not speciffied
      * }
      * </pre>
      * @param response the specified http servlet response
@@ -176,9 +177,11 @@ public final class UserConsole {
         try {
             final JSONObject requestJSONObject = Requests.parseRequestJSONObject(request, response);
 
-            if (userUtils.isAdminLoggedIn(request)) {
+            if (userUtils.isAdminLoggedIn(request)) { // if the administrator register a new user, treats the new user as a normal user
+                // (defaultRole) who could post article
                 requestJSONObject.put(User.USER_ROLE, Role.DEFAULT_ROLE);
-            } else {
+            } else { // if a normal user or a visitor register a new user, treates the new user as a visitor (visitorRole) who couldn't 
+                // post article
                 requestJSONObject.put(User.USER_ROLE, Role.VISITOR_ROLE);
             }
 

core/src/main/java/org/b3log/solo/service/InitService.java

@@ -437,6 +437,7 @@ public final class InitService {
 
         admin.put(User.USER_NAME, requestJSONObject.getString(User.USER_NAME));
         admin.put(User.USER_EMAIL, requestJSONObject.getString(User.USER_EMAIL));
+        admin.put(User.USER_URL, Latkes.getServePath());
         admin.put(User.USER_ROLE, Role.ADMIN_ROLE);
         admin.put(User.USER_PASSWORD, MD5.hash(requestJSONObject.getString(User.USER_PASSWORD)));
         admin.put(UserExt.USER_ARTICLE_COUNT, 0);

core/src/main/java/org/b3log/solo/service/UserMgmtService.java

@@ -19,6 +19,7 @@ package org.b3log.solo.service;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.b3log.latke.Keys;
+import org.b3log.latke.Latkes;
 import org.b3log.latke.model.Role;
 import org.b3log.latke.model.User;
 import org.b3log.latke.repository.RepositoryException;
@@ -26,6 +27,7 @@ import org.b3log.latke.repository.Transaction;
 import org.b3log.latke.service.LangPropsService;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.util.MD5;
+import org.b3log.latke.util.Strings;
 import org.b3log.solo.model.UserExt;
 import org.b3log.solo.repository.UserRepository;
 import org.b3log.solo.repository.impl.UserRepositoryImpl;
@@ -67,7 +69,8 @@ public final class UserMgmtService {
      *     "userName": "",
      *     "userEmail": "",
      *     "userPassword": "", // Unhashed
-     *     "userRole": ""
+     *     "userRole": "", // optional
+     *     "userURL": "", // optional
      * }
      * </pre>
      * @throws ServiceException service exception
@@ -99,7 +102,18 @@ public final class UserMgmtService {
             oldUser.put(User.USER_EMAIL, userNewEmail);
             oldUser.put(User.USER_NAME, userName);
             oldUser.put(User.USER_PASSWORD, MD5.hash(userPassword));
-            // Unchanges the default role
+            
+            final String userRole = requestJSONObject.optString(User.USER_ROLE);
+
+            if (!Strings.isEmptyOrNull(userRole)) {
+                oldUser.put(User.USER_ROLE, userRole);
+            }
+            
+            final String userURL = requestJSONObject.optString(User.USER_URL);
+
+            if (!Strings.isEmptyOrNull(userURL)) {
+                oldUser.put(User.USER_URL, userURL);
+            }
             
             userRepository.update(oldUserId, oldUser);
             transaction.commit();
@@ -159,8 +173,8 @@ public final class UserMgmtService {
      *     "userName": "",
      *     "userEmail": "",
      *     "userPassword": "", // Unhashed
-     *     "userRole": "" // optional, uses {@value Role#DEFAULT_ROLE} instead,
-     *                       if not speciffied
+     *     "userURL": "", // optional, uses 'servePath' instead if not specified 
+     *     "userRole": "" // optional, uses {@value Role#DEFAULT_ROLE} instead, if not speciffied
      * }
      * </pre>,see {@link User} for more details
      * @return generated user id
@@ -182,16 +196,32 @@ public final class UserMgmtService {
                 throw new ServiceException(langPropsService.get("duplicatedEmailLabel"));
             }
 
+            user.put(User.USER_EMAIL, userEmail);
+
             final String userName = requestJSONObject.optString(User.USER_NAME);
 
-            user.put(User.USER_EMAIL, userEmail);
             user.put(User.USER_NAME, userName);
+
             final String userPassword = requestJSONObject.optString(User.USER_PASSWORD);
 
             user.put(User.USER_PASSWORD, MD5.hash(userPassword));
+
+            String userURL = requestJSONObject.optString(User.USER_URL);
+
+            if (Strings.isEmptyOrNull(userURL)) {
+                userURL = Latkes.getServePath();
+            }
+            
+            if (!Strings.isURL(userURL)) {
+                throw new ServiceException(langPropsService.get("urlInvalidLabel"));
+            }
+            
+            user.put(User.USER_URL, userURL);
+
             final String roleName = requestJSONObject.optString(User.USER_ROLE, Role.DEFAULT_ROLE);
 
             user.put(User.USER_ROLE, roleName);
+            
             user.put(UserExt.USER_ARTICLE_COUNT, 0);
             user.put(UserExt.USER_PUBLISHED_ARTICLE_COUNT, 0);
 

core/src/main/java/org/b3log/solo/util/Comments.java

@@ -17,7 +17,6 @@ package org.b3log.solo.util;
 
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.b3log.latke.Keys;
@@ -41,7 +40,7 @@ import org.json.JSONObject;
  * Comment utilities.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.9, Mar 28, 2012
+ * @version 1.0.0.10, Apr 2, 2013
  * @since 0.3.1
  */
 public final class Comments {
@@ -204,13 +203,7 @@ public final class Comments {
 
             final String commentURL = requestJSONObject.optString(Comment.COMMENT_URL);
 
-            try {
-                new URL(commentURL);
-
-                if (commentURL.contains("<") || commentURL.contains(">")) {
-                    throw new IllegalArgumentException();
-                }
-            } catch (final Exception e) {
+            if (!Strings.isURL(commentURL)) {
                 LOGGER.log(Level.WARNING, "Comment URL is invalid[{0}]", commentURL);
                 ret.put(Keys.MSG, langPropsService.get("urlInvalidLabel"));
 

core/src/main/resources/repository.json

 {
     "description": "Description of repository structures, for generation (DDL: http://en.wikipedia.org/wiki/Data_Definition_Language) of the relational database table and persistence validation.",
-    "version": "1.0.0.9, Mar 5, 2013",
+    "version": "1.0.1.0, Apr 2, 2013",
     "authors": ["Liang Ding"],
     "since": "0.4.0",
     
@@ -538,6 +538,11 @@
             "type": "String",
             "length": 255
         },
+        {
+            "name": "userURL",
+            "type": "String",
+            "length": 255
+        },
         {
             "name": "userPassword",
             "type": "String",

core/src/test/java/org/b3log/solo/repository/impl/UserRepositoryImplTestCase.java

@@ -34,7 +34,7 @@ import org.testng.annotations.Test;
  * {@link UserRepositoryImpl} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.1, Feb 21, 2012
+ * @version 1.0.0.2, Apr 2, 2013
  */
 @Test(suiteName = "repository")
 public final class UserRepositoryImplTestCase extends AbstractTestCase {
@@ -52,6 +52,7 @@ public final class UserRepositoryImplTestCase extends AbstractTestCase {
         another.put(User.USER_NAME, "test1");
         another.put(User.USER_EMAIL, "test1@gmail.com");
         another.put(User.USER_PASSWORD, "pass1");
+        another.put(User.USER_URL, "http://b3log.org");
         another.put(User.USER_ROLE, Role.DEFAULT_ROLE);
         another.put(UserExt.USER_ARTICLE_COUNT, 0);
         another.put(UserExt.USER_PUBLISHED_ARTICLE_COUNT, 0);
@@ -66,6 +67,7 @@ public final class UserRepositoryImplTestCase extends AbstractTestCase {
         admin.put(User.USER_NAME, "test");
         admin.put(User.USER_EMAIL, "test@gmail.com");
         admin.put(User.USER_PASSWORD, "pass");
+        admin.put(User.USER_URL, "http://b3log.org");
         admin.put(User.USER_ROLE, Role.ADMIN_ROLE);
         admin.put(UserExt.USER_ARTICLE_COUNT, 0);
         admin.put(UserExt.USER_PUBLISHED_ARTICLE_COUNT, 0);

war/src/main/resources/lang_en_US.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Solo language configurations(en_US).
-# Version: 2.1.0.6, Apr 1, 2013
+# Version: 2.1.0.7, Apr 2, 2013
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -193,6 +193,8 @@ userName1Label=Username:
 userLabel=User
 userPassword1Label=Password:
 userPasswordLabel=Password
+userURL1Label=Link:
+userURLLabel=Link
 categoryLabel=Category
 noticeBoard1Label=Notice Board:
 noticeBoardLabel=Notice Board

war/src/main/resources/lang_zh_CN.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Solo default language configurations(zh_CN).
-# Version: 2.1.1.3, Apr 1, 2013
+# Version: 2.1.1.4, Apr 2, 2013
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -193,6 +193,8 @@ userName1Label=\u7528\u6237\u540d\uff1a
 userLabel=\u7528\u6237
 userPassword1Label=\u5bc6\u7801\uff1a
 userPasswordLabel=\u5bc6\u7801
+userURL1Label=\u94fe\u63a5\uff1a
+userURLLabel=\u94fe\u63a5
 categoryLabel=\u5206\u7c7b
 noticeBoard1Label=\u516c\u544a\uff1a
 noticeBoardLabel=\u516c\u544a

war/src/main/webapp/admin-user-list.ftl

@@ -26,6 +26,14 @@
                 <input id="userEmail" type="text"/>
             </td>
         </tr>
+        <tr>
+            <th>
+                <label for="userURL">${userURL1Label}</label>
+            </th>
+            <td>
+                <input id="userURL" type="text"/>
+            </td>
+        </tr>
         <tr>
             <th>
                 <label for="userPassword">${userPassword1Label}</label>
@@ -67,6 +75,14 @@
                     <input id="userEmailUpdate" type="text"/>
                 </td>
             </tr>
+            <tr>
+                <th>
+                    <label for="userURLUpdate">${userURL1Label}</label>
+                </th>
+                <td>
+                    <input id="userURLUpdate" type="text"/>
+                </td>
+            </tr>
             <tr>
                 <th>
                     <label for="userPasswordUpdate">${userPassword1Label}</label>

war/src/main/webapp/js/admin/userList.js

@@ -134,6 +134,7 @@ admin.userList = {
             var requestJSONObject = {
                 "userName": $("#userName").val(),
                 "userEmail": $("#userEmail").val(),
+                "userURL": $("#userURL").val(),
                 "userPassword": $("#userPassword").val()
             };
 
@@ -151,6 +152,7 @@ admin.userList = {
 
                     $("#userName").val("");
                     $("#userEmail").val("");
+                    $("#userURL").val("");
                     $("#userPassword").val("");
                     if (admin.userList.pageInfo.currentCount === Label.PAGE_SIZE &&
                             admin.userList.pageInfo.currentPage === admin.userList.pageInfo.pageCount) {
@@ -198,6 +200,8 @@ admin.userList = {
                 } else {
                     $userEmailUpdate.removeAttr("disabled");
                 }
+                
+                $("#userURLUpdate").val(result.user.userURL);
                 $("#userPasswordUpdate").val(result.user.userPassword);
 
                 $("#loadMsg").text("");
@@ -217,6 +221,7 @@ admin.userList = {
                 "userName": $("#userNameUpdate").val(),
                 "oId": userInfo.oId,
                 "userEmail": $("#userEmailUpdate").val(),
+                "userURL": $("#userURLUpdate").val(),
                 "userRole": userInfo.userRole,
                 "userPassword": $("#userPasswordUpdate").val()
             };

war/src/main/webapp/register.ftl

@@ -4,7 +4,7 @@
         <meta charset="utf-8" />
         <title>${blogTitle}</title>
         <meta name="keywords" content="GAE 博客,blog,b3log,kill IE6" />
-        <meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,Let's kill IE6" />
+        <meta name="description" content="An open source blog based on GAE Java,GAE Java 开源博客,用户注册" />
         <meta name="owner" content="B3log Team" />
         <meta name="author" content="B3log Team" />
         <meta name="generator" content="B3log Solo" />
@@ -34,6 +34,10 @@
                                 ${userName1Label}
                             </label>
                             <input id="userName" />
+                            <label for="userURL">
+                                ${userURL1Label}
+                            </label>
+                            <input id="userURL" />
                             <label for="userPassword">
                                 ${userPassword1Label}
                             </label>
@@ -89,6 +93,7 @@
                                         var requestJSONObject = {
                                             "userName": $("#userName").val(),
                                             "userEmail": $("#userEmail").val(),
+                                            "userURL": $("#userURL").val(),
                                             "userPassword": $("#userPassword").val()
                                         };
                                         $.ajax({