🏗️ Fix b3log#771

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Symphony POM.
-    Version: 2.16.6.104, Sep 25, 2018
+    Version: 2.16.6.105, Sep 27, 2018
     Author: Liang Ding
     Author: Zephyr
 -->
@@ -22,7 +22,7 @@
     <inceptionYear>2012</inceptionYear>
 
     <properties>
-        <latke.version>2.4.16</latke.version>
+        <latke.version>2.4.17</latke.version>
 
         <servlet.version>3.1.0</servlet.version>
         <jetty.version>9.4.12.v20180830</jetty.version>

src/main/java/org/b3log/symphony/SymphonyServletListener.java

@@ -88,9 +88,6 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
         Latkes.setScanPath("org.b3log.symphony");
         super.contextInitialized(servletContextEvent);
 
-        final String skinDirName = Symphonys.get("skinDirName");
-        Latkes.loadSkin(skinDirName);
-
         beanManager = Lifecycle.getBeanManager();
 
         final InitMgmtService initMgmtService = beanManager.getReference(InitMgmtService.class);

src/main/java/org/b3log/symphony/processor/ActivityProcessor.java

@@ -31,7 +31,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Requests;
 import org.b3log.symphony.model.Common;
 import org.b3log.symphony.model.Pointtransfer;
@@ -137,7 +137,7 @@ public class ActivityProcessor {
     public void showCharacter(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) throws Exception {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/activity/character.ftl");
+        renderer.setTemplateName("activity/character.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         dataModelService.fillHeaderAndFooter(request, response, dataModel);
@@ -219,7 +219,7 @@ public void submitCharacter(final HTTPRequestContext context, final HttpServletR
     public void showActivities(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) throws Exception {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/home/activities.ftl");
+        renderer.setTemplateName("home/activities.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         dataModelService.fillHeaderAndFooter(request, response, dataModel);
@@ -256,7 +256,7 @@ public void showDailyCheckin(final HTTPRequestContext context, final HttpServlet
 
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/activity/checkin.ftl");
+        renderer.setTemplateName("activity/checkin.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         dataModelService.fillHeaderAndFooter(request, response, dataModel);
@@ -343,7 +343,7 @@ public void yesterdayLivenessReward(final HttpServletRequest request, final Http
     public void show1A0001(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) throws Exception {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/activity/1A0001.ftl");
+        renderer.setTemplateName("activity/1A0001.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         final JSONObject currentUser = (JSONObject) request.getAttribute(User.USER);
@@ -483,7 +483,7 @@ public void collect1A0001(final HTTPRequestContext context, final HttpServletReq
     public void showEatingSnake(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) throws Exception {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/activity/eating-snake.ftl");
+        renderer.setTemplateName("activity/eating-snake.ftl");
 
         final Map<String, Object> dataModel = renderer.getDataModel();
 
@@ -539,7 +539,7 @@ public void startEatingSnake(final HTTPRequestContext context, final HttpServlet
     public void collectEatingSnake(final HTTPRequestContext context, final HttpServletRequest request) {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/activity/eating-snake.ftl");
+        renderer.setTemplateName("activity/eating-snake.ftl");
 
         JSONObject requestJSONObject;
         try {
@@ -570,7 +570,7 @@ public void collectEatingSnake(final HTTPRequestContext context, final HttpServl
     public void showGobang(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) throws Exception {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/activity/gobang.ftl");
+        renderer.setTemplateName("activity/gobang.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         dataModelService.fillHeaderAndFooter(request, response, dataModel);

src/main/java/org/b3log/symphony/processor/AdminProcessor.java

@@ -37,7 +37,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.CollectionUtils;
 import org.b3log.latke.util.Paginator;
 import org.b3log.latke.util.Strings;

src/main/java/org/b3log/symphony/processor/ArticleProcessor.java

@@ -36,7 +36,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Paginator;
 import org.b3log.latke.util.Requests;
 import org.b3log.latke.util.Stopwatchs;
@@ -56,7 +56,6 @@
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
@@ -433,7 +432,7 @@ public void showPreAddArticle(final HTTPRequestContext context, final HttpServle
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
 
-        renderer.setTemplateName("/home/pre-post.ftl");
+        renderer.setTemplateName("home/pre-post.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         dataModel.put(Common.BROADCAST_POINT, Pointtransfer.TRANSFER_SUM_C_ADD_ARTICLE_BROADCAST);
@@ -492,8 +491,7 @@ public void showAddArticle(final HTTPRequestContext context, final HttpServletRe
             throws Exception {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-
-        renderer.setTemplateName("/home/post.ftl");
+        renderer.setTemplateName("home/post.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         // Qiniu file upload authenticate
@@ -629,8 +627,7 @@ public void showArticle(final HTTPRequestContext context, final HttpServletReque
                             final String articleId) throws Exception {
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-
-        renderer.setTemplateName("/article.ftl");
+        renderer.setTemplateName("article.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         final int avatarViewMode = (int) request.getAttribute(UserExt.USER_AVATAR_VIEW_MODE);
@@ -1033,8 +1030,7 @@ public void showUpdateArticle(final HTTPRequestContext context, final HttpServle
 
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-
-        renderer.setTemplateName("/home/post.ftl");
+        renderer.setTemplateName("home/post.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         dataModel.put(Article.ARTICLE, article);

src/main/java/org/b3log/symphony/processor/BreezemoonProcessor.java

@@ -30,7 +30,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Paginator;
 import org.b3log.latke.util.Requests;
 import org.b3log.symphony.model.Breezemoon;
@@ -43,7 +43,10 @@
 import org.b3log.symphony.service.BreezemoonQueryService;
 import org.b3log.symphony.service.DataModelService;
 import org.b3log.symphony.service.OptionQueryService;
-import org.b3log.symphony.util.*;
+import org.b3log.symphony.util.Geos;
+import org.b3log.symphony.util.Headers;
+import org.b3log.symphony.util.StatusCodes;
+import org.b3log.symphony.util.Symphonys;
 import org.json.JSONObject;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/org/b3log/symphony/processor/ChargeProcessor.java

@@ -25,8 +25,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
-import org.b3log.symphony.model.UserExt;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.symphony.processor.advice.AnonymousViewCheck;
 import org.b3log.symphony.processor.advice.PermissionGrant;
 import org.b3log.symphony.processor.advice.stopwatch.StopwatchEndAdvice;
@@ -78,11 +77,7 @@ public void showChargePoint(final HTTPRequestContext context, final HttpServletR
         context.setRenderer(renderer);
         renderer.setTemplateName("charge-point.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
-
         dataModelService.fillHeaderAndFooter(request, response, dataModel);
-
-        final int avatarViewMode = (int) request.getAttribute(UserExt.USER_AVATAR_VIEW_MODE);
-
         dataModelService.fillRandomArticles(dataModel);
         dataModelService.fillSideHotArticles(dataModel);
         dataModelService.fillSideTags(dataModel);

src/main/java/org/b3log/symphony/processor/ChatRoomProcessor.java

@@ -30,7 +30,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Locales;
 import org.b3log.latke.util.Times;
 import org.b3log.symphony.model.*;

src/main/java/org/b3log/symphony/processor/CityProcessor.java

@@ -31,9 +31,8 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Paginator;
-import org.b3log.latke.util.Strings;
 import org.b3log.symphony.model.Article;
 import org.b3log.symphony.model.Common;
 import org.b3log.symphony.model.Option;

src/main/java/org/b3log/symphony/processor/DomainProcessor.java

@@ -28,9 +28,8 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Paginator;
-import org.b3log.latke.util.Strings;
 import org.b3log.symphony.model.*;
 import org.b3log.symphony.processor.advice.AnonymousViewCheck;
 import org.b3log.symphony.processor.advice.PermissionGrant;

src/main/java/org/b3log/symphony/processor/ErrorProcessor.java

@@ -28,7 +28,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Locales;
 import org.b3log.symphony.processor.advice.PermissionGrant;
 import org.b3log.symphony.processor.advice.stopwatch.StopwatchEndAdvice;

src/main/java/org/b3log/symphony/processor/ForwardProcessor.java

@@ -28,7 +28,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.symphony.model.Common;
 import org.b3log.symphony.model.UserExt;
 import org.b3log.symphony.processor.advice.PermissionGrant;

src/main/java/org/b3log/symphony/processor/IndexProcessor.java

@@ -33,7 +33,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Locales;
 import org.b3log.latke.util.Paginator;
 import org.b3log.latke.util.Stopwatchs;
@@ -50,7 +50,6 @@
 import org.b3log.symphony.service.UserQueryService;
 import org.b3log.symphony.util.Emotions;
 import org.b3log.symphony.util.Markdowns;
-import org.b3log.symphony.util.Sessions;
 import org.b3log.symphony.util.Symphonys;
 import org.json.JSONObject;
 

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

@@ -35,7 +35,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.latke.util.Locales;
 import org.b3log.latke.util.Requests;
 import org.b3log.symphony.model.*;
@@ -232,7 +232,7 @@ public void showGuide(final HTTPRequestContext context, final HttpServletRequest
 
         final AbstractFreeMarkerRenderer renderer = new SkinRenderer(request);
         context.setRenderer(renderer);
-        renderer.setTemplateName("/verify/guide.ftl");
+        renderer.setTemplateName("verify/guide.ftl");
 
         final Map<String, Object> dataModel = renderer.getDataModel();
         dataModel.put(Common.CURRENT_USER, currentUser);
@@ -301,7 +301,7 @@ public void showLogin(final HTTPRequestContext context, final HttpServletRequest
             referer = Latkes.getServePath();
         }
 
-        renderer.setTemplateName("/verify/login.ftl");
+        renderer.setTemplateName("verify/login.ftl");
 
         final Map<String, Object> dataModel = renderer.getDataModel();
         dataModel.put(Common.GOTO, referer);
@@ -396,7 +396,7 @@ public void showResetPwd(final HTTPRequestContext context, final HttpServletRequ
         final JSONObject verifycode = verifycodeQueryService.getVerifycode(code);
         if (null == verifycode) {
             dataModel.put(Keys.MSG, langPropsService.get("verifycodeExpiredLabel"));
-            renderer.setTemplateName("/error/custom.ftl");
+            renderer.setTemplateName("error/custom.ftl");
         } else {
             renderer.setTemplateName("verify/reset-pwd.ftl");
 
@@ -504,7 +504,7 @@ public void showRegister(final HTTPRequestContext context, final HttpServletRequ
             final JSONObject verifycode = verifycodeQueryService.getVerifycode(code);
             if (null == verifycode) {
                 dataModel.put(Keys.MSG, langPropsService.get("verifycodeExpiredLabel"));
-                renderer.setTemplateName("/error/custom.ftl");
+                renderer.setTemplateName("error/custom.ftl");
             } else {
                 renderer.setTemplateName("verify/register2.ftl");
 
@@ -515,7 +515,7 @@ public void showRegister(final HTTPRequestContext context, final HttpServletRequ
                 if (UserExt.USER_STATUS_C_VALID == user.optInt(UserExt.USER_STATUS)
                         || UserExt.NULL_USER_NAME.equals(user.optString(User.USER_NAME))) {
                     dataModel.put(Keys.MSG, langPropsService.get("userExistLabel"));
-                    renderer.setTemplateName("/error/custom.ftl");
+                    renderer.setTemplateName("error/custom.ftl");
                 } else {
                     referral = StringUtils.substringAfter(code, "r=");
                     if (StringUtils.isNotBlank(referral)) {

src/main/java/org/b3log/symphony/processor/ManProcessor.java

@@ -25,7 +25,7 @@
 import org.b3log.latke.servlet.annotation.Before;
 import org.b3log.latke.servlet.annotation.RequestProcessing;
 import org.b3log.latke.servlet.annotation.RequestProcessor;
-import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
+import org.b3log.latke.servlet.renderer.AbstractFreeMarkerRenderer;
 import org.b3log.symphony.model.Common;
 import org.b3log.symphony.model.UserExt;
 import org.b3log.symphony.processor.advice.PermissionGrant;