From 8af0a78c74b458b5d93269308e416b5c7c4efcbd Mon Sep 17 00:00:00 2001
From: Klaus-Uwe Mitterer <git@kumi.email>
Date: Sun, 21 Oct 2018 09:16:27 +0200
Subject: [PATCH] Fix frontend and input handling

---
 server/daemon.py         | 13 +++++++------
 server/static/index.html |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/daemon.py b/server/daemon.py
index 4e24b31..e72663f 100644
--- a/server/daemon.py
+++ b/server/daemon.py
@@ -40,33 +40,34 @@ def static(req):
 def addjob(req):
     jobid = str(uuid.uuid4())
     config = configparser.ConfigParser()
+
     try:
-        title = req.args["title"][0].replace(" ", "_") or "output"
+        title = re.sub(r"[^a-zA-Z0-9_\-]", "_", req.args["title"][0]) or output
     except:
         title = "output"
 
     try:
-        rx = req.args["rx"][0]
+        rx = int(req.args["rx"][0]) or 0
     except:
         rx = 0
 
     try:
-        ry = req.args["ry"][0]
+        ry = int(req.args["ry"][0]) or 0
     except:
         ry = 0
 
     try:
-        rz = req.args["rz"][0]
+        rz = int(req.args["rz"][0]) or 0
     except:
         rz = 0
 
     try:
-        width = req.args["width"][0]
+        width = int(req.args["width"][0]) or 3840
     except:
         width = 3840
 
     try:
-        height = req.args["height"][0]
+        height = int(req.args["height"][0]) or 1920
     except:
         height = 1920
 
diff --git a/server/static/index.html b/server/static/index.html
index 5863bcc..61aa28b 100644
--- a/server/static/index.html
+++ b/server/static/index.html
@@ -25,7 +25,7 @@
           <form class="" id="theform">
             <div class="form-group"> <label>URL</label> <input type="text" class="form-control" placeholder="https://example.com/0/0/0_0.jpg" name="url" required="required"> <small class="form-text text-muted">URL of an image contained in a krpano panorama or of a website containing a krpano panorama</small> </div>
             <div class="form-group"> <label>Title</label> <input type="" class="form-control" placeholder="1234 - Shiny Place" name="title"> </div>
-	    <div class="form-group"> <label style="display: block;">Resolution</label> <input type="" class="form-control" placeholder="3840" name="width" style="width: 100px; display: inline;"> x <input type="" class="form-control" placeholder="1920" name="width" style="width: 100px; display: inline;"> </div>
+	    <div class="form-group"> <label style="display: block;">Resolution</label> <input type="" class="form-control" placeholder="3840" name="width" style="width: 100px; display: inline;"> x <input type="" class="form-control" placeholder="1920" name="height" style="width: 100px; display: inline;"> </div>
 	    <div id="options">
 		    <div class="form-group"> <label style="display: block;">Rotation on X/Y/Z axes</label> <input type="" class="form-control" placeholder="0" name="rx" style="width: 100px; display: inline;"> / <input type="" class="form-control" placeholder="0" name="ry" style="width: 100px; display: inline;"> / <input type="" class="form-control" placeholder="0" name="rz" style="width: 100px; display: inline;"> </div>
         	    <div class="form-group"> <label>Transposition<br></label><select class="custom-control custom-select" name="transpose">
@@ -33,7 +33,7 @@
                 	<option value="0">No transposition</option>
               	</select> </div>
 	      </div>
-	      <button type="submit" class="btn btn-success">Submit</button> <button type="reset" class="btn btn-danger">Reset</button> <button class="btn btn-info" onclick="toggleOptions()">More options</button>
+	      <button type="submit" class="btn btn-success">Submit</button> <button type="reset" class="btn btn-danger">Reset</button> <button type="button" class="btn btn-info" onclick="toggleOptions()">More options</button>
           </form>
         </div>
       </div>