Merge pull request #24 from kratz00/delete_router

Fixed exception: caused by deleting a router without an owner

ffmap/web/application.py

@@ -63,7 +63,11 @@ def router_info(dbid):
 				flash("<b>Netmon Sync triggered!</b>", "success")
 				return redirect(url_for("router_info", dbid=dbid))
 			if request.form.get("act") == "delete":
-				if is_authorized(router["user"]["nickname"], session):
+				user = None
+				# a router may not have a owner, but admin users still can delete it
+				if ("user" in router) and ("nickname" in router["user"]):
+					user = router["user"]["nickname"]
+				if is_authorized(user, session):
 					db.routers.delete_one({"_id": ObjectId(dbid)})
 					flash("<b>Router <i>%s</i> deleted!</b>" % router["hostname"], "success")
 					return redirect(url_for("index"))

ffmap/web/helpers.py

@@ -75,7 +75,7 @@ def send_email(recipient, subject, content, sender="FFF Monitoring <noreply@moni
 	s.quit()
 
 def is_authorized(owner, session):
-	if owner == session.get("user"):
+	if ("user" in session) and (owner == session.get("user")):
 		return True
 	elif session.get("admin"):
 		return True