From 7e1c1cf937554870e36a1f3d45d93d162eb20aa8 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Thu, 20 Sep 2018 20:42:24 +0000
Subject: [PATCH] Fix inline images, only award to extant teams

---
 res/basic.css   |  7 +++++++
 res/puzzle.html | 21 ++++++++++++++-------
 src/instance.go |  7 ++++++-
 3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/res/basic.css b/res/basic.css
index a8a856e..644054c 100644
--- a/res/basic.css
+++ b/res/basic.css
@@ -46,3 +46,10 @@ nav li, .category li {
 	display: inline;
 	margin: 1em;
 }
+iframe#body {
+  border: inherit;
+  width: 100%;
+}
+img {
+  max-width: 100%;
+}
\ No newline at end of file
diff --git a/res/puzzle.html b/res/puzzle.html
index 2f73ceb..cb68e8e 100644
--- a/res/puzzle.html
+++ b/res/puzzle.html
@@ -7,10 +7,16 @@
     <link rel="icon" href="res/icon.svg" type="image/svg+xml">
     <link rel="icon" href="res/icon.png" type="image/png">
     <script>
-function render(obj) {
-  let body = document.getElementById("body");
-  body.innerHTML = obj.body;
-  console.log("XXX: Munge relative URLs (src= and href=) in body")
+function resize() {
+  let frame = document.getElementById("body");
+  frame.height = frame.contentDocument.documentElement.scrollHeight;
+}
+function render(obj, base) {
+  let frame = document.getElementById("body");
+  let html = "<base href='" + base + "'><link rel='stylesheet' href='../../../basic.css'>" + obj.body;
+  
+  frame.addEventListener("load", resize);
+  frame.srcdoc = html;
 }
 function init() {
   let params = new URLSearchParams(window.location.search);
@@ -18,13 +24,14 @@ function init() {
   let points = params.get("points");
   let puzzleId = params.get("pid");
 
-  let fn = "content/" + categoryName + "/" + puzzleId + "/puzzle.json";
+  let base = "content/" + categoryName + "/" + puzzleId + "/";
+  let fn =  base + "puzzle.json";
 
 	fetch(fn)
 	.then(function(resp) {
 		return resp.json();
 	}).then(function(obj) {
-		render(obj);
+		render(obj, base);
 	}).catch(function(err) {
 		console.log("Error", err);
 	});
@@ -39,7 +46,7 @@ document.addEventListener("DOMContentLoaded", init);
   <body>
     <h1>Puzzle</h1>
     <section>
-      <div id="body">Loading...</div>
+      <iframe seamless id="body">Loading...</iframe>
     </section>
 		<form action="answer" method="post">
 		  <input type="hidden" name="cat">
diff --git a/src/instance.go b/src/instance.go
index 1c18de1..4a73e03 100644
--- a/src/instance.go
+++ b/src/instance.go
@@ -131,6 +131,11 @@ func (ctx *Instance) AwardPoints(teamid, category string, points int) error {
 		Points:   points,
 	}
 
+	teamName, err := ctx.TeamName(teamid)
+	if err != nil {
+		return fmt.Errorf("No registered team with this hash")
+	}
+
 	for _, e := range ctx.PointsLog() {
 		if a.Same(e) {
 			return fmt.Errorf("Points already awarded to this team in this category")
@@ -150,7 +155,7 @@ func (ctx *Instance) AwardPoints(teamid, category string, points int) error {
 	}
 
 	ctx.update <- true
-	log.Printf("Award %s %s %d", teamid, category, points)
+	log.Printf("Award %s %s %d", teamName, category, points)
 	return nil
 }
 
