From 42f19babec3fbc0d31eea324c1c246946094280c Mon Sep 17 00:00:00 2001
From: spaghetti <spaghetti@oppaiti.me>
Date: Mon, 31 Jul 2017 15:05:46 -0400
Subject: [PATCH] Add Universal Two Factor support

Also create seperate account security options page

This commit requires a new database table
---
 design/privateheader.php | 6 +++---
 design/publicheader.php  | 2 +-
 static/styles/global.css | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/design/privateheader.php b/design/privateheader.php
index 1b8985e..77fe0bf 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -533,12 +533,12 @@ if (!empty($Alerts) || !empty($ModBar)) { ?>
 <?
   }
   if (!empty($ModBar)) { ?>
-        <div class="alertbar blend">
-          <?=implode(' | ', $ModBar); echo "\n"?>
+        <div class="alertbar modbar">
+          <?=implode(' ', $ModBar); echo "\n"?>
         </div>
 <?  }
 if (check_perms('site_debug') && !apcu_exists('DBKEY')) { ?>
-        <div class="alertbar" style="color: white; background: #B53939;">
+        <div class="alertbar error">
           Warning: <a href="tools.php?action=database_key">no DB key</a>
         </div>
 <?  } ?>
diff --git a/design/publicheader.php b/design/publicheader.php
index 9eb3d59..7b7a253 100644
--- a/design/publicheader.php
+++ b/design/publicheader.php
@@ -11,7 +11,7 @@ define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
   <link rel="shortcut icon" href="favicon.ico?v=<?=md5_file('favicon.ico');?>" />
   <link href="<?=STATIC_SERVER ?>styles/public/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public/style.css')?>" rel="stylesheet" type="text/css" />
 <?
-  $Scripts = ['jquery', 'global', 'ajax.class', 'cookie.class', 'storage.class', 'public'];
+  $Scripts = ['jquery', 'global', 'ajax.class', 'cookie.class', 'storage.class', 'public', 'u2f'];
   foreach($Scripts as $Script) {
     if (($ScriptStats = G::$Cache->get_value("script_stats_$Script")) === false || $ScriptStats['mtime'] != filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js")) {
       $ScriptStats['mtime'] = filemtime(SERVER_ROOT.STATIC_SERVER."functions/$Script.js");
diff --git a/static/styles/global.css b/static/styles/global.css
index 7331499..00a393f 100644
--- a/static/styles/global.css
+++ b/static/styles/global.css
@@ -934,6 +934,11 @@ input[type="search"] {
   max-width: 100%;
 }
 
+#publickey {
+  width: initial;
+  font-family: monospace;
+}
+
 .hidden {
   display: none;
 }