Merge pull request #12094 from b3log/1.4.0-dev

1.4.0 dev

src/main/java/org/b3log/solo/processor/InitProcessor.java

@@ -52,7 +52,7 @@ import org.json.JSONObject;
  * Solo initialization service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.0.8, Oct 17, 2015
+ * @version 1.2.0.9, Apr 15, 2016
  * @since 0.4.0
  */
 @RequestProcessor
@@ -174,7 +174,7 @@ public class InitProcessor {
             }
 
             if (invalidUserName(userName)) {
-                ret.put(Keys.MSG, "Init failed, please check your input [username: length [1, 20], content {a-z, A-Z, 0-9}]");
+                ret.put(Keys.MSG, "Init failed, please check your username (length [1, 20], content {a-z, A-Z, 0-9}, do not contain 'admin' for security reason]");
 
                 return;
             }
@@ -211,6 +211,7 @@ public class InitProcessor {
      * <ul>
      * <li>length [1, 20]</li>
      * <li>content {a-z, A-Z, 0-9}</li>
+     * <li>Not contains "admin"/"Admin"</li>
      * </ul>
      * </p>
      *
@@ -234,6 +235,6 @@ public class InitProcessor {
             return true;
         }
 
-        return false;
+        return name.contains("admin") || name.contains("Admin");
     }
 }

src/main/java/org/b3log/solo/processor/LoginProcessor.java

@@ -65,7 +65,7 @@ import java.util.Map;
  * <p>Initializes administrator</p>.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
+ * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
  * @version 1.1.1.7, Nov 20, 2015
  * @since 0.3.1

src/main/webapp/css/default-init.css

@@ -17,7 +17,8 @@
 * 403, 404, 500, article-pwd, init, login and kill-browser page style.
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
-* @version 1.0.1.6, Sep 12, 2013
+* @author <a href="http://88250.b3log.org">Liang Ding</a>
+* @version 1.0.1.7, Apr 15, 2016
 */
 html {
     height: 100%;
@@ -165,6 +166,7 @@ button:active {
     border-style: solid solid none;
     border-width: 1px;
     margin: 0 auto;
+    padding: 0 0 28px 0;
     position: relative;
     width: 700px;
     top: 60px;

src/main/webapp/js/common.js

@@ -17,7 +17,7 @@
  * @fileoverview util and every page should be used.
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
+ * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @version 1.0.2.6, Nov 28, 2013
  */
 

src/main/webapp/js/page.js

@@ -17,7 +17,7 @@
  * @fileoverview Page util, load heighlight and process comment.
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
+ * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @version 1.2.3.5, Nov 2, 2015
  */
 var Page = function (tips) {