From 068006874dc84f604cb12029cb63c14a305a02c2 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Sun, 20 Nov 2016 03:31:26 -0500
Subject: [PATCH] Closes #168

---
 CTFd/static/admin/js/utils.js          | 55 ++++++++++++++++++++++++++
 CTFd/templates/admin/chals.html        |  6 +--
 CTFd/templates/admin/correct_keys.html |  2 +-
 CTFd/templates/admin/editor.html       |  4 +-
 CTFd/templates/admin/graphs.html       |  2 +-
 CTFd/templates/admin/pages.html        |  4 +-
 CTFd/templates/admin/team.html         | 12 +++---
 CTFd/templates/admin/wrong_keys.html   |  2 +-
 8 files changed, 71 insertions(+), 16 deletions(-)
 create mode 100644 CTFd/static/admin/js/utils.js

diff --git a/CTFd/static/admin/js/utils.js b/CTFd/static/admin/js/utils.js
new file mode 100644
index 0000000..5908ad4
--- /dev/null
+++ b/CTFd/static/admin/js/utils.js
@@ -0,0 +1,55 @@
+//http://stackoverflow.com/a/1186309
+$.fn.serializeObject = function()
+{
+    var o = {};
+    var a = this.serializeArray();
+    $.each(a, function() {
+        if (o[this.name] !== undefined) {
+            if (!o[this.name].push) {
+                o[this.name] = [o[this.name]];
+            }
+            o[this.name].push(this.value || '');
+        } else {
+            o[this.name] = this.value || '';
+        }
+    });
+    return o;
+};
+
+
+//http://stackoverflow.com/a/2648463 - wizardry!
+String.prototype.format = String.prototype.f = function() {
+    var s = this,
+        i = arguments.length;
+
+    while (i--) {
+        s = s.replace(new RegExp('\\{' + i + '\\}', 'gm'), arguments[i]);
+    }
+    return s;
+};
+
+//http://stackoverflow.com/a/7616484
+String.prototype.hashCode = function() {
+    var hash = 0, i, chr, len;
+    if (this.length == 0) return hash;
+    for (i = 0, len = this.length; i < len; i++) {
+        chr   = this.charCodeAt(i);
+        hash  = ((hash << 5) - hash) + chr;
+        hash |= 0; // Convert to 32bit integer
+    }
+    return hash;
+};
+
+function colorhash (x) {
+    color = ""
+    for (var i = 20; i <= 60; i+=20){
+        x += i
+        x *= i
+        color += x.toString(16)
+    };
+    return "#" + color.substring(0, 6)
+}
+
+function htmlentities(string) {
+    return $('<div/>').text(string).html();
+}
diff --git a/CTFd/templates/admin/chals.html b/CTFd/templates/admin/chals.html
index 2adb5d7..d6f12db 100644
--- a/CTFd/templates/admin/chals.html
+++ b/CTFd/templates/admin/chals.html
@@ -298,7 +298,7 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/utils.js"></script>
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/admin/js/multi-modal.js"></script>
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/admin/js/chalboard.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/multi-modal.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/chalboard.js"></script>
 {% endblock %}
diff --git a/CTFd/templates/admin/correct_keys.html b/CTFd/templates/admin/correct_keys.html
index 3c23563..f340496 100644
--- a/CTFd/templates/admin/correct_keys.html
+++ b/CTFd/templates/admin/correct_keys.html
@@ -77,7 +77,7 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/utils.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
     <script>
     $('#delete-solve').click(function(e){
         e.preventDefault();
diff --git a/CTFd/templates/admin/editor.html b/CTFd/templates/admin/editor.html
index 1a08f2f..7945729 100644
--- a/CTFd/templates/admin/editor.html
+++ b/CTFd/templates/admin/editor.html
@@ -1,7 +1,7 @@
 {% extends "admin/base.html" %}
 
 {% block stylesheets %}
-    <link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/{{ ctf_theme() }}/css/vendor/codemirror.min.css">
+    <link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/admin/css/vendor/codemirror.min.css">
     <style>
     .row-fluid { margin: 25px; padding-bottom: 25px; }
     </style>
@@ -38,7 +38,7 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/vendor/codemirror.min.js"></script>
+<script src="{{ request.script_root }}/static/admin/js/vendor/codemirror.min.js"></script>
 <script>
     var editor = CodeMirror.fromTextArea(document.getElementById("admin-pages-editor"), {
         lineNumbers: true,
diff --git a/CTFd/templates/admin/graphs.html b/CTFd/templates/admin/graphs.html
index f71708c..70f42d5 100644
--- a/CTFd/templates/admin/graphs.html
+++ b/CTFd/templates/admin/graphs.html
@@ -29,7 +29,7 @@
             display: block;
         }
     </style>
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/vendor/plotly.min.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/vendor/plotly.min.js"></script>
     <script type="text/javascript">
         // $.distint(array)
         // Unique elements in array
diff --git a/CTFd/templates/admin/pages.html b/CTFd/templates/admin/pages.html
index 0db18c3..991aadf 100644
--- a/CTFd/templates/admin/pages.html
+++ b/CTFd/templates/admin/pages.html
@@ -1,7 +1,7 @@
 {% extends "admin/base.html" %}
 
 {% block stylesheets %}
-    <link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/{{ ctf_theme() }}/css/vendor/codemirror.min.css">
+    <link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/admin/css/vendor/codemirror.min.css">
 {% endblock %}
 
 {% block content %}
@@ -60,7 +60,7 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/vendor/codemirror.min.js"></script>
+<script src="{{ request.script_root }}/static/admin/js/vendor/codemirror.min.js"></script>
 <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("pages-editor"), {
     lineNumbers: true,
diff --git a/CTFd/templates/admin/team.html b/CTFd/templates/admin/team.html
index 84faefd..c8dc41d 100644
--- a/CTFd/templates/admin/team.html
+++ b/CTFd/templates/admin/team.html
@@ -134,7 +134,7 @@
                 <td class="text-center">{{ award.value }}</td>
                 <td class="text-center">{{ award.category }}</td>
                 <td class="text-center">{{ award.icon }}</td>
-                
+
                 <td class="text-center"><i class="fa fa-times"></i></td>
             </tr>
         {% endfor %}
@@ -221,10 +221,10 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/vendor/moment.min.js"></script>
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/vendor/plotly.min.js"></script>
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/utils.js"></script>
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/admin/js/team.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/vendor/moment.min.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/vendor/plotly.min.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/team.js"></script>
     <script>
         $('#delete-solve').click(function (e) {
             e.preventDefault();
@@ -291,7 +291,7 @@
                 var description = "<span>Are you sure you want to delete the " +
                                   "<strong>{0}</strong> award?</span>".format(chal_name);
                 var action = '{{ request.script_root }}/admin/awards/{0}/delete'.format(award_id);
-            } 
+            }
 
             var msg = {
                 title : title,
diff --git a/CTFd/templates/admin/wrong_keys.html b/CTFd/templates/admin/wrong_keys.html
index ae1798a..7149240 100644
--- a/CTFd/templates/admin/wrong_keys.html
+++ b/CTFd/templates/admin/wrong_keys.html
@@ -84,7 +84,7 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="{{ request.script_root }}/static/{{ ctf_theme() }}/js/utils.js"></script>
+    <script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
     <script>
         $('#delete-solve').click(function (e) {
             e.preventDefault();