From 8adfabddb95ba284e642224a346bb0b34a578d95 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Mon, 23 Mar 2020 13:52:01 +0100
Subject: add https and javascript warnings

---
 webAO/index.html        |  9 +++++++++
 webAO/master.js         | 10 ++++++++++
 webAO/styles/master.css |  4 ++++
 3 files changed, 23 insertions(+)

(limited to 'webAO')

diff --git a/webAO/index.html b/webAO/index.html
index a2c1203..3ed0d26 100644
--- a/webAO/index.html
+++ b/webAO/index.html
@@ -60,6 +60,15 @@
     </nav>
     <div id="serverlist_container">
         <h2>Server List</h2>
+        <div id="https_error" class="error" style="display: none;">
+            <p>https is not supported</p>
+            <p>Please <a href="http://web.aceattorneyonline.com/">click here</a> to be redirected to the http version</p>
+        </div>
+        <noscript>
+        <div id="js_error" class="error">
+            <p>webAO requires JavaScript to work</p>
+        </div>
+        </noscript>
         <ul class="serverlist" id="masterlist">
             <li id="server-1" class="unavailable" onmouseover="setServ(-1)">
                 <p>Localhost</p>
diff --git a/webAO/master.js b/webAO/master.js
index 1607fa5..7ceb748 100644
--- a/webAO/master.js
+++ b/webAO/master.js
@@ -31,6 +31,8 @@ if (window.requestIdleCallback) {
 		Fingerprint2.get(options, function (components) {
 			hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`), 31);
 
+			check_https();
+
 			masterserver = new WebSocket("ws://" + MASTERSERVER_IP);
 			masterserver.onopen = (evt) => onOpen(evt);
 			masterserver.onmessage = (evt) => onMessage(evt);
@@ -45,6 +47,8 @@ if (window.requestIdleCallback) {
 		Fingerprint2.get(options, function (components) {
 			hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`), 31);
 
+			check_https();
+
 			masterserver = new WebSocket("ws://" + MASTERSERVER_IP);
 			masterserver.onopen = (evt) => onOpen(evt);
 			masterserver.onmessage = (evt) => onMessage(evt);
@@ -56,6 +60,12 @@ if (window.requestIdleCallback) {
 	}, 500);
 }
 
+export function check_https() {
+	if (document.location.protocol === "https:") {
+		document.getElementById("https_error").style.display = "";
+	}
+}
+
 export function setServ(ID) {
 	console.log(server_description[ID]);
 	if (server_description[ID] !== undefined) {
diff --git a/webAO/styles/master.css b/webAO/styles/master.css
index 4f6d0ad..4b585da 100644
--- a/webAO/styles/master.css
+++ b/webAO/styles/master.css
@@ -144,6 +144,10 @@
 	box-shadow: 0 0 0 1px #EFAD21;
 }
 
+.error {
+	color: orangered;
+}
+
 #content {}
 
 ul.navbar-nav.ml-auto {
-- 
cgit