From bf412a896b52694891bc4b72dee092e026f6e667 Mon Sep 17 00:00:00 2001
From: ulrich@undisclosed <ulrich@ulrich-vaio>
Date: Thu, 28 May 2020 08:06:37 +0000
Subject: [PATCH] Revert "Fehler bei PDF-Umwandlung behoben"
---
src/de/uhilger/wbx/web/ViewServlet.java | 98 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java
index e98e751..f4b7126 100644
--- a/src/de/uhilger/wbx/web/ViewServlet.java
+++ b/src/de/uhilger/wbx/web/ViewServlet.java
@@ -1,9 +1,29 @@
+/*
+ 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.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
@@ -11,13 +31,63 @@
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 {
private static final Logger logger = Logger.getLogger(ViewServlet.class.getName());
private static final String HOME_CTX = "/home";
+ private String getTitle() {
+ String title = null;
+ try {
+ Object object = ((Context) new InitialContext().lookup("java:comp/env")).lookup("webBoxViewTitle");
+ if(object != null) {
+ title = object.toString();
+ logger.finer("WebBox View Titel: " + title);
+ }
+ } catch (NamingException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ }
+ return title;
+ }
+
+ private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+ ServletOutputStream out = response.getOutputStream();
+ printHeader(out, request);
+ super.doGet(request, response);
+ printFooter(out);
+ }
+
+ private void printHeader(ServletOutputStream out, HttpServletRequest request) throws IOException {
+ 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");
+ String title = getTitle();
+ if(title != null) {
+ out.print("<title>");
+ out.print(title);
+ out.print(" ");
+ out.print(request.getRequestURI());
+ out.print("</title>\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>");
+ }
+
/**
* Handles the HTTP <code>GET</code> method.
*
@@ -27,8 +97,7 @@
* @throws IOException if an I/O error occurs
*/
@Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String contextPath = request.getContextPath();
if(HOME_CTX.equals(contextPath)) {
String userName = getUserName(request);
@@ -47,24 +116,7 @@
}
}
- private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
- ServletOutputStream out = response.getOutputStream();
- printHeader(out);
- super.doGet(request, response);
- printFooter(out);
- }
-
- 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>");
- }
-
- private void printFooter(ServletOutputStream out) throws IOException {
- out.print("</body></html>");
- }
-
- private String getUrlUser(HttpServletRequest request, String userName) throws IOException {
+ protected String getUrlUser(HttpServletRequest request, String userName) {
String result = "";
String requestUrlStr = request.getRequestURL().toString();
String contextPath = request.getContextPath();
@@ -82,7 +134,7 @@
return result;
}
- private String getUserName(HttpServletRequest hr) {
+ protected String getUserName(HttpServletRequest hr) {
String userName = null;
Object p = hr.getUserPrincipal();
if (p instanceof Principal) {
@@ -90,7 +142,7 @@
}
return userName;
}
-
+
/**
* Returns a short description of the servlet.
*
--
Gitblit v1.9.3