From 88a8a6a0d8843535f71cbe3d9499c4fcc369d22c Mon Sep 17 00:00:00 2001
From: Mitchell Moore <mmoo97@uab.edu>
Date: Tue, 9 Jun 2020 09:09:52 -0500
Subject: [PATCH] Fix variable grabbing and referrer

---
 app/__init__.py                |  2 +-
 app/static/scripts/function.js |  6 +++---
 app/templates/auth/SignUp.html | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 8b13db9..baff395 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -30,7 +30,7 @@ def create_app(config_name):
         if 'user' not in session:
             get_shib_user()
 
-        if "redir" in request.args and 'return_url' not in session:  # check for redir arg in url
+        if "redir" in request.args:  # check for redir arg in url
             session['return_url'] = request.args.get("redir")
 
         elif "redir" not in request.args and 'return_url' not in session:
diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js
index 973ca63..9a909ff 100644
--- a/app/static/scripts/function.js
+++ b/app/static/scripts/function.js
@@ -4,9 +4,9 @@ function displayloading() {
 
 function request_account() {
     socket.emit('request account', {
-        username: document.getElementById("username").value,
-        fullname: document.getElementById("fullname").value,
-        reason: document.getElementById("reason").value,
+        username: document.getElementById("username").innerText,
+        fullname: document.getElementById("fullname").innerText,
+        reason: document.getElementById("reason").innerText,
         email: document.getElementById("email").value
     })
 }
diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html
index 70f5a96..2af9f9f 100644
--- a/app/templates/auth/SignUp.html
+++ b/app/templates/auth/SignUp.html
@@ -95,18 +95,18 @@
     <div id="test">
     <form action="." method="post" onsubmit="" class=".bg-light">
       <div class="signUpContainer">
-          <label><b><label for="username">Blazer Id: {{ username }}</label></b></label><br>
+          <label for="username">Blazer Id:</label>&#9;<span id="username">{{ username }}</span><br>
 
-          <label><b><label for="fullname">Full Name: {{ fullname }}</label></b></label><br>
+          <label for="fullname">Full Name:</label>&#9;<span id="fullname">{{ fullname }}</span><br>
 
-          <label><b><label for="email">Email: {{ email }}</label></b></label><br>
+          <label for="email">Email:</label>&#9;<span id="email">{{ email }}</span><br>
 
-          <label><b><label for="reason">Reason for Requesting Account: </label></b></label><br>
+          <label for="reason">Reason for Requesting Account:</label><br>
             <textarea class="form-control" id="reason" name="reason" placeholder="Enter Reason for Account Request" required=""></textarea>
 
           <div class="row-no-gutters">
               <div class="col-lg-6">
-                  <input class="btn btn-danger btn-block" id="cancel" name="cancel" type="button" value="Cancel" onclick="window.location.replace('{{ cancel_link }}');">
+                  <input class="btn btn-danger btn-block" id="cancel" name="cancel" type="button" value="Cancel" onclick="window.location.replace('{{ referrer }}');">
               </div>
               <div class="col-lg-6">
                   <input class="btn btn-primary btn-block" id="submit" name="submit" type="button" value="Submit" onclick="request_account()">
-- 
GitLab