Merge branch '0.5.6' of https://github.com/b3log/b3log-solo into 0.5.6

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

@@ -41,7 +41,7 @@ import org.json.JSONObject;
  * User console request processing.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.1, Aug 9, 2012
+ * @version 1.0.0.2, Jan 29, 2013
  * @since 0.4.0
  */
 @RequestProcessor
@@ -335,7 +335,7 @@ public final class UserConsole {
     @RequestProcessing(value = "/console/user/*", method = HTTPRequestMethod.GET)
     public void getUser(final HttpServletRequest request, final HttpServletResponse response, final HTTPRequestContext context)
         throws Exception {
-        if (!userUtils.isLoggedIn(request, response)) {
+        if (!userUtils.isAdminLoggedIn(request)) {
             response.sendError(HttpServletResponse.SC_FORBIDDEN);
             return;
         }

core/src/main/java/org/b3log/solo/processor/util/Filler.java

@@ -69,7 +69,7 @@ import org.json.JSONObject;
  * Filler utilities.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.6.2, Jan 18, 2013
+ * @version 1.0.6.3, Jan 29, 2013
  * @since 0.3.1
  */
 public final class Filler {
@@ -506,6 +506,7 @@ public final class Filler {
             dataModel.put(User.USERS, userList);
             for (final JSONObject user : userList) {
                 user.remove(User.USER_EMAIL);
+                user.remove(User.USER_PASSWORD);
             }
 
             final String skinDirName = (String) request.getAttribute(Keys.TEMAPLTE_DIR_NAME);

war/src/main/resources/lang_en_US.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Solo language configurations(en_US).
-# Version: 2.1.0.1, Nov 14, 2012
+# Version: 2.1.0.2, Jan 29, 2013
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -251,7 +251,7 @@ permalink1Label=Permalink:
 permalinkLabel=Permalink
 welcomeToSoloLabel=Welcome to
 initIntroLabel= <p>Please click "Initial" button to initialize your blog ;-)</br></br>\
-Welcome to the <a href="http://symphony.b3log.org" target="_blank">B3log Symphony community</a> of <b>Equality * Freedom * Passion</b> at the same time.</br></br>\
+Welcome to the <a href="http://symphony.b3log.org" target="_blank">B3log Symphony community</a> of <b>Equality \u2022 Freedom \u2022 Passion</b> at the same time.</br></br>\
 <span style="font-size:12px"><span style="color:red">Note</span>: Only to ensure Email is the same and <a href="/article/1353772377257"  target="_blank">synchronization configured</a> is correctly,\
 Your posts and comments can <i>maintain bisynchronous</i> in the community and the B3log Solo.</p>
 killBrowserLabel=<h2>Let's kill outdated and insecure browser!</h2><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul><span style="font-size: 10px">Tip: Remove "Util.killIE();" in /js/common.js can support all browser.</span>

war/src/main/resources/lang_zh_CN.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: B3log Solo default language configurations(zh_CN).
-# Version: 2.1.0.8, Dec 16, 2012
+# Version: 2.1.0.9, Jan 29, 2013
 # Author: Liang Ding
 # Author: Liyuan Li
 # Author: Dongxu Wang
@@ -251,8 +251,8 @@ permalink1Label=\u94fe\u63a5\uff1a
 permalinkLabel=\u94fe\u63a5
 welcomeToSoloLabel=\u6b22\u8fce\u4f7f\u7528
 initIntroLabel=<p>\u8bf7\u70b9\u51fb\u4e0b\u9762\u7684\u201c\u521d\u59cb\u5316\u201d\u6309\u94ae\u8fdb\u884c\u521d\u59cb\u5316\uff0c\u7136\u540e\u7a0d\u7b49\u7247\u523b ;-)</br></br></br></br>\
-\u540c\u65f6\uff0c\u6b22\u8fce\u52a0\u60a8\u5165<b>\u5e73\u7b49*\u81ea\u7531*\u5954\u653e</b>\u7684 <a href="http://symphony.b3log.org" target="_blank">B3log Symphony \u793e\u533a</a>\u3002</br></br>\
-<span style="font-size:12px"><span style="color:red">\u6ce8</span>\uff1a\u5f53\u6ce8\u518c Email \u4e0e B3log Solo \u4fdd\u6301\u4e00\u81f4\uff0c\u5e76\u4e14\u793e\u533a\u4e2d\u7684<a href="/article/1353772377257"  target="_blank">\u540c\u6b65\u8bbe\u7f6e</a>\u914d\u7f6e\u6b63\u786e\u65f6\uff0c\u60a8\u7684\u6587\u7ae0\u548c\u8bc4\u8bba\u5c31\u53ef\u5728\u793e\u533a\u548c\u4e2a\u4eba\u535a\u5ba2\u4e2d\u4fdd\u6301<i>\u53cc\u5411\u540c\u6b65</i>\u3002</span></p>
+\u540c\u65f6\uff0c\u6b22\u8fce\u60a8\u52a0\u5165<b>\u5e73\u7b49\u2022\u81ea\u7531\u2022\u5954\u653e</b>\u7684 <a href="http://symphony.b3log.org" target="_blank">B3log Symphony \u793e\u533a</a>\u3002</br></br>\
+<span style="font-size:12px"><span style="color:red">\u6ce8</span>\uff1a\u5f53\u6ce8\u518c Email \u4e0e B3log Solo \u4fdd\u6301\u4e00\u81f4\uff0c\u5e76\u4e14\u793e\u533a\u4e2d\u7684<a href="http://symphony.b3log.org/article/1353772377257"  target="_blank">\u540c\u6b65\u8bbe\u7f6e</a>\u914d\u7f6e\u6b63\u786e\u65f6\uff0c\u60a8\u7684\u6587\u7ae0\u548c\u8bc4\u8bba\u5c31\u53ef\u5728\u793e\u533a\u548c\u4e2a\u4eba\u535a\u5ba2\u4e2d\u4fdd\u6301<i>\u53cc\u5411\u540c\u6b65</i>\u3002</span></p>
 killBrowserLabel=<h2>\u8ba9\u6211\u4eec\u653e\u5f03\u4f7f\u7528\u90a3\u4e9b\u8fc7\u65f6\u3001\u4e0d\u5b89\u5168\u7684\u6d4f\u89c8\u5668\u5427\uff01</h2><p>\u4e3a\u4e86\u8ba9\u6d4f\u89c8\u5668\u66f4\u597d\u7684\u53d1\u5c55\uff0c\u4eba\u7c7b\u66f4\u52a0\u7684\u8fdb\u6b65\uff0c\u62e5\u6709\u66f4\u597d\u7684\u4f53\u9a8c\uff0c\u8ba9\u6211\u4eec\u653e\u5f03\u4f7f\u7528\u90a3\u4e9b\u8fc7\u65f6\u3001\u4e0d\u5b89\u5168\u7684\u6d4f\u89c8\u5668\u3002</p>\u60a8\u53ef\u4ee5\u4e0b\u8f7d<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706b\u72d0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8c37\u6b4c\u6d4f\u89c8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6e38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5b83\u6d4f\u89c8\u5668</a>.</li></ul><span style="font-size: 10px">\u6ce8\uff1a\u5220\u9664 /js/common.js \u4e2d\u7684 Util.killIE(); \u53ef\u5bf9\u6240\u6709\u6d4f\u89c8\u5668\u8fdb\u884c\u652f\u6301\u3002</span>
 readmoreLabel=\u9605\u8bfb\u66f4\u591a\u00bb
 readmore2Label=\u9605\u8bfb\u66f4\u591a