From 94a2d9eb867cb7b74c41e8eff9157c518e18408f Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Thu, 28 Dec 2017 11:06:35 +0000 Subject: [PATCH] Erste Version des MarkdownServlets fertig zum Test --- src/de/uhilger/wbx/web/ViewServlet.java | 76 ++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index e98e751..4b3119c 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -1,53 +1,44 @@ +/* + WebBox - Dein Server. + Copyright (C) 2017 Ulrich Hilger, http://uhilger.de + + 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 de.uhilger.wbx.web; import java.io.IOException; -import java.security.Principal; -import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.servlets.DefaultServlet; /** - * + * Das ViewServlet fügt dem DefaultServlet von Tomcat + * Methoden hinzu, mit denen HTML-Inhalte wie sie z.B. mit + * TinyMCE erzeugt werden zu ganzen HTML-Seiten + * mit head und body tags sowie Stylesheet-Verweisen + * ergänzt werden + * + * TODO: Stylesheets dynamisch einbinden */ -public class ViewServlet extends DefaultServlet { +public class ViewServlet extends WbxServlet { private static final Logger logger = Logger.getLogger(ViewServlet.class.getName()); - private static final String HOME_CTX = "/home"; + //private static final String HOME_CTX = "/home"; - /** - * Handles the HTTP <code>GET</code> method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String contextPath = request.getContextPath(); - if(HOME_CTX.equals(contextPath)) { - String userName = getUserName(request); - if (userName != null) { - String urlUser = getUrlUser(request, userName); - if(userName.equals(urlUser)) { - seiteAusgeben(request, response); - } else { - logger.fine("Wrong user."); - } - } else { - logger.fine("Missing login."); - } - } else { - seiteAusgeben(request, response); - } - } - - private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + protected void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { ServletOutputStream out = response.getOutputStream(); printHeader(out); super.doGet(request, response); @@ -55,15 +46,21 @@ } private void printHeader(ServletOutputStream out) throws IOException { - out.print("<!DOCTYPE html><html><head>"); - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">"); - out.print("</head><body>"); + out.print("<!DOCTYPE html><html><head>\r\n"); + out.print("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/lightbox/lightbox.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">\r\n"); + out.print("</head><body class=\"p-3\">\r\n"); } private void printFooter(ServletOutputStream out) throws IOException { + out.print("<script src=\"/jslib/jquery/jquery.min.js\"></script>\r\n"); + out.print("<script src=\"/jslib/lightbox/lightbox.min.js\"></script>\r\n"); out.print("</body></html>"); } + /* private String getUrlUser(HttpServletRequest request, String userName) throws IOException { String result = ""; String requestUrlStr = request.getRequestURL().toString(); @@ -90,6 +87,7 @@ } return userName; } + */ /** * Returns a short description of the servlet. -- Gitblit v1.9.3