Revize d2ac590f

Added remove diagram servlet + minor fixes

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/LoadGraphData.java

@@ -50 +50 @@
         }
     }
 
+    /**
+     * Return json of file which was uploaded and is stored in session.
+     */
     private String getDiagramFromSession(HttpServletRequest request) throws IOException {
 
         String jsonToDisplay = (String)request.getSession().getAttribute("json_graph");
@@ -68 +71 @@
         return "";
     }
 
+    /**
+     * Return json of diagram which is taken from database. Permissions of user to this diagram is checked.
+     */
     private String getDiagramById(HttpServletRequest request, int diagramId){
 
         DB db = new DB(getServletContext());
@@ -85 +91 @@
         return diagram.getJsonDiagram();
     }
 
+    /**
+     * Return demo diagram from file system.
+     */
     private String getDemoDiagram(HttpServletRequest request){
         String demoId = request.getSession().getAttribute("demo_id").toString();
         String path = "/WEB-INF" + File.separator + "demoDiagram" + File.separator + demoId + ".json";

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/actions/RemoveDiagram.java

@@ +1 @@
+package cz.zcu.kiv.offscreen.servlets.actions;
+
+import com.google.common.base.Strings;
+import cz.zcu.kiv.offscreen.user.DB;
+import cz.zcu.kiv.offscreen.user.Diagram;
+import org.apache.commons.lang.StringUtils;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class RemoveDiagram extends HttpServlet {
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        if (request.getSession().getAttribute("logged_user_id") == null) {
+            response.sendError(response.SC_UNAUTHORIZED);
+            return;
+        }
+
+        if(request.getParameter("diagram_id") == null){
+            response.sendError(response.SC_BAD_REQUEST);
+            return;
+        }
+
+        Integer loggedUserId = Integer.parseInt(request.getSession().getAttribute("logged_user_id").toString());
+        Integer diagramId = Integer.parseInt(request.getParameter("diagram_id"));
+
+        DB db = new DB(getServletContext());
+        Diagram diagram = new Diagram(db, diagramId);
+
+        if(diagram.getUserId() != loggedUserId){
+            response.sendError(response.SC_UNAUTHORIZED);
+            return;
+        }
+
+        diagram.delete();
+        response.sendRedirect("/");
+    }
+}

sources/src/main/webapp/logged_user_menu.jsp

@@ -10 +10 @@
 				<a href="/graph?diagramId=${diagramName.id}">${diagramName.name}</a><a href="#" onclick="return deleteDiagram(${diagramName.id});"><img src="images/button_cancel.png" alt="odstranit" class="imgDelete"/></a>
 			</li>
 		</c:forEach>
-		<li id="diagram_id_new">
-			<a href="<%= getServletContext().getInitParameter("HOME_URL") %>">New diagram</a>
-		</li>
 	</ul>
 <% } %>