juick-server: database tags should not be escaped now

1 files changed, 0 insertions, 138 deletions

diff --git a/juick-www/src/main/java/com/juick/www/controllers/Discover.java b/juick-www/src/main/java/com/juick/www/controllers/Discover.java
deleted file mode 100644
index e5d17501..00000000
--- a/juick-www/src/main/java/com/juick/www/controllers/Discover.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.www.controllers;
-
-import com.juick.service.AdsService;
-import com.juick.service.MessagesService;
-import com.juick.service.TagService;
-import com.juick.www.Utils;
-import com.juick.www.WebApp;
-import org.apache.commons.lang3.CharEncoding;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.List;
-
-/**
- *
- * @author Ugnich Anton
- */
-@Controller
-public class Discover {
-    @Inject
-    WebApp webApp;
-    @Inject
-    MessagesService messagesService;
-    @Inject
-    TagService tagService;
-    @Inject
-    AdsService adsService;
-    @Inject
-    PageTemplates templates;
-
-    @RequestMapping(value = "/tag/{tagName}", method = RequestMethod.GET)
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        com.juick.User visitor = webApp.getVisitorUser(request, response);
-
-        String paramTagStr = URLDecoder.decode(request.getRequestURI().substring(5), CharEncoding.UTF_8);
-        com.juick.Tag paramTag = tagService.getTag(paramTagStr, false);
-        if (paramTag == null) {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            return;
-        } else if (paramTag.SynonymID > 0 && paramTag.TID != paramTag.SynonymID) {
-            com.juick.Tag synTag = tagService.getTag(paramTag.SynonymID);
-            String url = "/tag/" + URLEncoder.encode(synTag.getName(), CharEncoding.UTF_8);
-            if (request.getQueryString() != null) {
-                url += "?" + request.getQueryString();
-            }
-            Utils.sendPermanentRedirect(response, url);
-            return;
-        } else if (!paramTag.getName().equals(paramTagStr)) {
-            String url = "/tag/" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8);
-            if (request.getQueryString() != null) {
-                url += "?" + request.getQueryString();
-            }
-            Utils.sendPermanentRedirect(response, url);
-            return;
-        }
-
-        int paramBefore = 0;
-        String paramBeforeStr = request.getParameter("before");
-        if (paramBeforeStr != null) {
-            try {
-                paramBefore = Integer.parseInt(paramBeforeStr);
-            } catch (NumberFormatException e) {
-            }
-        }
-
-        int visitor_uid = visitor.getUid();
-
-        String title = "*" + StringEscapeUtils.escapeHtml4(paramTag.getName());
-        List<Integer> mids = messagesService.getTag(paramTag.TID, visitor_uid, paramBefore, (visitor_uid == 0) ? 40 : 20);
-
-        response.setContentType("text/html; charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            String head = StringUtils.EMPTY;
-            if (tagService.getTagNoIndex(paramTag.TID)) {
-                head = "<meta name=\"robots\" content=\"noindex,nofollow\"/>";
-            } else if (paramBefore > 0 || mids.size() < 5) {
-                head = "<meta name=\"robots\" content=\"noindex\"/>";
-            }
-            templates.pageHead(out, visitor, title, head);
-            templates.pageNavigation(out, visitor, null);
-
-            out.println("<section id=\"content\">");
-
-            if (mids.size() > 0) {
-                int vuid = visitor.getUid();
-                int ad_mid = adsService.getAdMid(vuid);
-                if (ad_mid > 0 && mids.indexOf(ad_mid) == -1) {
-                    mids.add(0, ad_mid);
-                    adsService.logAdMid(vuid, ad_mid);
-                } else {
-                    ad_mid = 0;
-                }
-
-                templates.printMessages(out, null, mids, visitor, visitor_uid == 0 ? 2 : 3, ad_mid);
-            }
-
-            if (mids.size() >= 20) {
-                String nextpage = "/tag/" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8) + "?before=" + mids.get(mids.size() - 1);
-                out.println("<p class=\"page\"><a href=\"" + nextpage + "\" rel=\"prev\">Читать дальше →</a></p>");
-            }
-
-            out.println("</section>");
-			
-			templates.pageHomeColumn(out, visitor);
-
-            templates.pageFooter(request, out, visitor, true);
-
-            templates.pageEnd(out);
-        }
-    }
-}