From ab52df7254e3513466bc7ef69ccc0e5420facf11 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 20 May 2015 14:30:50 -0700
Subject: [PATCH 1/6] change checkboxes to prettier bootstrap switches

---
 .../resources/describe-settings.json          | 16 ++++++++++----
 .../web/css/bootstrap-switch.min.css          | 22 +++++++++++++++++++
 domain-server/resources/web/css/style.css     |  7 ++++++
 domain-server/resources/web/header.html       |  2 ++
 .../resources/web/settings/index.shtml        |  7 +++---
 .../web/settings/js/bootstrap-switch.min.js   | 22 +++++++++++++++++++
 .../web/{ => settings}/js/form2js.min.js      |  0
 .../web/{ => settings}/js/settings.js         | 16 ++++++++++----
 .../web/{ => settings}/js/sweetalert.min.js   |  0
 9 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100755 domain-server/resources/web/css/bootstrap-switch.min.css
 create mode 100755 domain-server/resources/web/settings/js/bootstrap-switch.min.js
 rename domain-server/resources/web/{ => settings}/js/form2js.min.js (100%)
 rename domain-server/resources/web/{ => settings}/js/settings.js (98%)
 rename domain-server/resources/web/{ => settings}/js/sweetalert.min.js (100%)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 60f541c10b..a6cee7d491 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -85,11 +85,18 @@
         "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
         "value-hidden": true
       },
+      {
+        "name": "restricted_access",
+        "type": "checkbox",
+        "label": "Restricted Access",
+        "default": true,
+        "help": "Only users listed in \"Allowed Users\" can enter your domain."
+      },
       {
         "name": "allowed_users",
         "type": "table",
         "label": "Allowed Users",
-        "help": "List the High Fidelity names for people you want to be able to connect to this domain.<br/>An empty list means everyone.<br/>You can always connect from the domain-server machine.",
+        "help": "List the High Fidelity names for people you want to be able to connect to this domain (when \"Restricted Access\" is enabled).<br/>An empty list means everyone.<br/>You can always connect from the domain-server machine.",
         "numbered": false,
         "columns": [
           {
@@ -124,8 +131,8 @@
       {
         "name": "editors_are_rezzers",
         "type": "checkbox",
-        "label": "Only editors can create new entities",
-        "help": "When checked, only those who can edit the domain can create new entites.",
+        "label": "Only Editors Can Create Entities",
+        "help": "Only users listed in \"Allowed Editors\" can create new entites.",
         "default": false
       }
     ]
@@ -180,8 +187,9 @@
       },
       {
         "name": "enable_filter",
+        "label": "Low-pass Filter",
         "type": "checkbox",
-        "help": "positional audio stream uses lowpass filter",
+        "help": "Positional audio stream uses low-pass filter",
         "default": true
       },
       {
diff --git a/domain-server/resources/web/css/bootstrap-switch.min.css b/domain-server/resources/web/css/bootstrap-switch.min.css
new file mode 100755
index 0000000000..6eb3d4d9e3
--- /dev/null
+++ b/domain-server/resources/web/css/bootstrap-switch.min.css
@@ -0,0 +1,22 @@
+/* ========================================================================
+ * bootstrap-switch - v3.3.2
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+.bootstrap-switch{display:inline-block;direction:ltr;cursor:pointer;border-radius:4px;border:1px solid;border-color:#ccc;position:relative;text-align:left;overflow:hidden;line-height:8px;z-index:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.bootstrap-switch .bootstrap-switch-container{display:inline-block;top:0;border-radius:4px;-webkit-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.bootstrap-switch .bootstrap-switch-handle-on,.bootstrap-switch .bootstrap-switch-handle-off,.bootstrap-switch .bootstrap-switch-label{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;cursor:pointer;display:inline-block !important;height:100%;padding:6px 12px;font-size:14px;line-height:20px}.bootstrap-switch .bootstrap-switch-handle-on,.bootstrap-switch .bootstrap-switch-handle-off{text-align:center;z-index:1}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary{color:#fff;background:#428bca}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info{color:#fff;background:#5bc0de}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success{color:#fff;background:#5cb85c}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning{background:#f0ad4e;color:#fff}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger{color:#fff;background:#d9534f}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default{color:#000;background:#eee}.bootstrap-switch .bootstrap-switch-label{text-align:center;margin-top:-1px;margin-bottom:-1px;z-index:100;color:#333;background:#fff}.bootstrap-switch .bootstrap-switch-handle-on{border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch .bootstrap-switch-handle-off{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch input[type='radio'],.bootstrap-switch input[type='checkbox']{position:absolute !important;top:0;left:0;opacity:0;filter:alpha(opacity=0);z-index:-1}.bootstrap-switch input[type='radio'].form-control,.bootstrap-switch input[type='checkbox'].form-control{height:auto}.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-label{padding:1px 5px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-label{padding:5px 10px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-label{padding:6px 16px;font-size:18px;line-height:1.33}.bootstrap-switch.bootstrap-switch-disabled,.bootstrap-switch.bootstrap-switch-readonly,.bootstrap-switch.bootstrap-switch-indeterminate{cursor:default !important}.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label{opacity:.5;filter:alpha(opacity=50);cursor:default !important}.bootstrap-switch.bootstrap-switch-animate .bootstrap-switch-container{-webkit-transition:margin-left .5s;transition:margin-left .5s}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-on{border-bottom-left-radius:0;border-top-left-radius:0;border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-off{border-bottom-right-radius:0;border-top-right-radius:0;border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch.bootstrap-switch-focused{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.bootstrap-switch.bootstrap-switch-on .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-off .bootstrap-switch-label{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch.bootstrap-switch-off .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-on .bootstrap-switch-label{border-bottom-left-radius:3px;border-top-left-radius:3px}
\ No newline at end of file
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 952a504b13..1ed2594c11 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -109,6 +109,13 @@ table {
   width: 100%;
 }
 
+/* styling for bootstrap-switch toggles */
+.checkbox-help {
+  margin-top: 10px;
+}
+
+/* CSS only spinner for AJAX requests */
+
 .spinner {
   margin: 30px auto 0;
   width: 70px;
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index 4a75279e8f..f3cacf4b21 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -7,7 +7,9 @@
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/style.css" rel="stylesheet" media="screen">
     <link href="/css/sweetalert.css" rel="stylesheet" media="screen">
+    <link href="/css/bootstrap-switch.min.css" rel="stylesheet" media="screen">
     <link href="/stats/css/json.human.css" rel="stylesheet" media="screen">
+
   </head>
   <body>
     <nav class="navbar navbar-default" role="navigation">
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 957ff2192f..35eab080b9 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -99,7 +99,8 @@
 <script src='/js/underscore-min.js'></script>
 <script src='/js/underscore-keypath.min.js'></script>
 <script src='/js/bootbox.min.js'></script>
-<script src='/js/sweetalert.min.js'></script>
-<script src='/js/settings.js'></script>
-<script src='/js/form2js.min.js'></script>
+<script src='js/bootstrap-switch.min.js'></script>
+<script src='js/sweetalert.min.js'></script>
+<script src='js/settings.js'></script>
+<script src='js/form2js.min.js'></script>
 <!--#include virtual="page-end.html"-->
diff --git a/domain-server/resources/web/settings/js/bootstrap-switch.min.js b/domain-server/resources/web/settings/js/bootstrap-switch.min.js
new file mode 100755
index 0000000000..232ed13908
--- /dev/null
+++ b/domain-server/resources/web/settings/js/bootstrap-switch.min.js
@@ -0,0 +1,22 @@
+/* ========================================================================
+ * bootstrap-switch - v3.3.2
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+(function(){var t=[].slice;!function(e,i){"use strict";var n;return n=function(){function t(t,i){null==i&&(i={}),this.$element=e(t),this.options=e.extend({},e.fn.bootstrapSwitch.defaults,{state:this.$element.is(":checked"),size:this.$element.data("size"),animate:this.$element.data("animate"),disabled:this.$element.is(":disabled"),readonly:this.$element.is("[readonly]"),indeterminate:this.$element.data("indeterminate"),inverse:this.$element.data("inverse"),radioAllOff:this.$element.data("radio-all-off"),onColor:this.$element.data("on-color"),offColor:this.$element.data("off-color"),onText:this.$element.data("on-text"),offText:this.$element.data("off-text"),labelText:this.$element.data("label-text"),handleWidth:this.$element.data("handle-width"),labelWidth:this.$element.data("label-width"),baseClass:this.$element.data("base-class"),wrapperClass:this.$element.data("wrapper-class")},i),this.$wrapper=e("<div>",{"class":function(t){return function(){var e;return e=[""+t.options.baseClass].concat(t._getClasses(t.options.wrapperClass)),e.push(t.options.state?""+t.options.baseClass+"-on":""+t.options.baseClass+"-off"),null!=t.options.size&&e.push(""+t.options.baseClass+"-"+t.options.size),t.options.disabled&&e.push(""+t.options.baseClass+"-disabled"),t.options.readonly&&e.push(""+t.options.baseClass+"-readonly"),t.options.indeterminate&&e.push(""+t.options.baseClass+"-indeterminate"),t.options.inverse&&e.push(""+t.options.baseClass+"-inverse"),t.$element.attr("id")&&e.push(""+t.options.baseClass+"-id-"+t.$element.attr("id")),e.join(" ")}}(this)()}),this.$container=e("<div>",{"class":""+this.options.baseClass+"-container"}),this.$on=e("<span>",{html:this.options.onText,"class":""+this.options.baseClass+"-handle-on "+this.options.baseClass+"-"+this.options.onColor}),this.$off=e("<span>",{html:this.options.offText,"class":""+this.options.baseClass+"-handle-off "+this.options.baseClass+"-"+this.options.offColor}),this.$label=e("<span>",{html:this.options.labelText,"class":""+this.options.baseClass+"-label"}),this.$element.on("init.bootstrapSwitch",function(e){return function(){return e.options.onInit.apply(t,arguments)}}(this)),this.$element.on("switchChange.bootstrapSwitch",function(e){return function(){return e.options.onSwitchChange.apply(t,arguments)}}(this)),this.$container=this.$element.wrap(this.$container).parent(),this.$wrapper=this.$container.wrap(this.$wrapper).parent(),this.$element.before(this.options.inverse?this.$off:this.$on).before(this.$label).before(this.options.inverse?this.$on:this.$off),this.options.indeterminate&&this.$element.prop("indeterminate",!0),this._init(),this._elementHandlers(),this._handleHandlers(),this._labelHandlers(),this._formHandler(),this._externalLabelHandler(),this.$element.trigger("init.bootstrapSwitch")}return t.prototype._constructor=t,t.prototype.state=function(t,e){return"undefined"==typeof t?this.options.state:this.options.disabled||this.options.readonly?this.$element:this.options.state&&!this.options.radioAllOff&&this.$element.is(":radio")?this.$element:(this.options.indeterminate&&this.indeterminate(!1),t=!!t,this.$element.prop("checked",t).trigger("change.bootstrapSwitch",e),this.$element)},t.prototype.toggleState=function(t){return this.options.disabled||this.options.readonly?this.$element:this.options.indeterminate?(this.indeterminate(!1),this.state(!0)):this.$element.prop("checked",!this.options.state).trigger("change.bootstrapSwitch",t)},t.prototype.size=function(t){return"undefined"==typeof t?this.options.size:(null!=this.options.size&&this.$wrapper.removeClass(""+this.options.baseClass+"-"+this.options.size),t&&this.$wrapper.addClass(""+this.options.baseClass+"-"+t),this._width(),this._containerPosition(),this.options.size=t,this.$element)},t.prototype.animate=function(t){return"undefined"==typeof t?this.options.animate:(t=!!t,t===this.options.animate?this.$element:this.toggleAnimate())},t.prototype.toggleAnimate=function(){return this.options.animate=!this.options.animate,this.$wrapper.toggleClass(""+this.options.baseClass+"-animate"),this.$element},t.prototype.disabled=function(t){return"undefined"==typeof t?this.options.disabled:(t=!!t,t===this.options.disabled?this.$element:this.toggleDisabled())},t.prototype.toggleDisabled=function(){return this.options.disabled=!this.options.disabled,this.$element.prop("disabled",this.options.disabled),this.$wrapper.toggleClass(""+this.options.baseClass+"-disabled"),this.$element},t.prototype.readonly=function(t){return"undefined"==typeof t?this.options.readonly:(t=!!t,t===this.options.readonly?this.$element:this.toggleReadonly())},t.prototype.toggleReadonly=function(){return this.options.readonly=!this.options.readonly,this.$element.prop("readonly",this.options.readonly),this.$wrapper.toggleClass(""+this.options.baseClass+"-readonly"),this.$element},t.prototype.indeterminate=function(t){return"undefined"==typeof t?this.options.indeterminate:(t=!!t,t===this.options.indeterminate?this.$element:this.toggleIndeterminate())},t.prototype.toggleIndeterminate=function(){return this.options.indeterminate=!this.options.indeterminate,this.$element.prop("indeterminate",this.options.indeterminate),this.$wrapper.toggleClass(""+this.options.baseClass+"-indeterminate"),this._containerPosition(),this.$element},t.prototype.inverse=function(t){return"undefined"==typeof t?this.options.inverse:(t=!!t,t===this.options.inverse?this.$element:this.toggleInverse())},t.prototype.toggleInverse=function(){var t,e;return this.$wrapper.toggleClass(""+this.options.baseClass+"-inverse"),e=this.$on.clone(!0),t=this.$off.clone(!0),this.$on.replaceWith(t),this.$off.replaceWith(e),this.$on=t,this.$off=e,this.options.inverse=!this.options.inverse,this.$element},t.prototype.onColor=function(t){var e;return e=this.options.onColor,"undefined"==typeof t?e:(null!=e&&this.$on.removeClass(""+this.options.baseClass+"-"+e),this.$on.addClass(""+this.options.baseClass+"-"+t),this.options.onColor=t,this.$element)},t.prototype.offColor=function(t){var e;return e=this.options.offColor,"undefined"==typeof t?e:(null!=e&&this.$off.removeClass(""+this.options.baseClass+"-"+e),this.$off.addClass(""+this.options.baseClass+"-"+t),this.options.offColor=t,this.$element)},t.prototype.onText=function(t){return"undefined"==typeof t?this.options.onText:(this.$on.html(t),this._width(),this._containerPosition(),this.options.onText=t,this.$element)},t.prototype.offText=function(t){return"undefined"==typeof t?this.options.offText:(this.$off.html(t),this._width(),this._containerPosition(),this.options.offText=t,this.$element)},t.prototype.labelText=function(t){return"undefined"==typeof t?this.options.labelText:(this.$label.html(t),this._width(),this.options.labelText=t,this.$element)},t.prototype.handleWidth=function(t){return"undefined"==typeof t?this.options.handleWidth:(this.options.handleWidth=t,this._width(),this._containerPosition(),this.$element)},t.prototype.labelWidth=function(t){return"undefined"==typeof t?this.options.labelWidth:(this.options.labelWidth=t,this._width(),this._containerPosition(),this.$element)},t.prototype.baseClass=function(){return this.options.baseClass},t.prototype.wrapperClass=function(t){return"undefined"==typeof t?this.options.wrapperClass:(t||(t=e.fn.bootstrapSwitch.defaults.wrapperClass),this.$wrapper.removeClass(this._getClasses(this.options.wrapperClass).join(" ")),this.$wrapper.addClass(this._getClasses(t).join(" ")),this.options.wrapperClass=t,this.$element)},t.prototype.radioAllOff=function(t){return"undefined"==typeof t?this.options.radioAllOff:(t=!!t,t===this.options.radioAllOff?this.$element:(this.options.radioAllOff=t,this.$element))},t.prototype.onInit=function(t){return"undefined"==typeof t?this.options.onInit:(t||(t=e.fn.bootstrapSwitch.defaults.onInit),this.options.onInit=t,this.$element)},t.prototype.onSwitchChange=function(t){return"undefined"==typeof t?this.options.onSwitchChange:(t||(t=e.fn.bootstrapSwitch.defaults.onSwitchChange),this.options.onSwitchChange=t,this.$element)},t.prototype.destroy=function(){var t;return t=this.$element.closest("form"),t.length&&t.off("reset.bootstrapSwitch").removeData("bootstrap-switch"),this.$container.children().not(this.$element).remove(),this.$element.unwrap().unwrap().off(".bootstrapSwitch").removeData("bootstrap-switch"),this.$element},t.prototype._width=function(){var t,e;return t=this.$on.add(this.$off),t.add(this.$label).css("width",""),e="auto"===this.options.handleWidth?Math.max(this.$on.width(),this.$off.width()):this.options.handleWidth,t.width(e),this.$label.width(function(t){return function(i,n){return"auto"!==t.options.labelWidth?t.options.labelWidth:e>n?e:n}}(this)),this._handleWidth=this.$on.outerWidth(),this._labelWidth=this.$label.outerWidth(),this.$container.width(2*this._handleWidth+this._labelWidth),this.$wrapper.width(this._handleWidth+this._labelWidth)},t.prototype._containerPosition=function(t,e){return null==t&&(t=this.options.state),this.$container.css("margin-left",function(e){return function(){var i;return i=[0,"-"+e._handleWidth+"px"],e.options.indeterminate?"-"+e._handleWidth/2+"px":t?e.options.inverse?i[1]:i[0]:e.options.inverse?i[0]:i[1]}}(this)),e?setTimeout(function(){return e()},50):void 0},t.prototype._init=function(){var t,e;return t=function(t){return function(){return t._width(),t._containerPosition(null,function(){return t.options.animate?t.$wrapper.addClass(""+t.options.baseClass+"-animate"):void 0})}}(this),this.$wrapper.is(":visible")?t():e=i.setInterval(function(n){return function(){return n.$wrapper.is(":visible")?(t(),i.clearInterval(e)):void 0}}(this),50)},t.prototype._elementHandlers=function(){return this.$element.on({"change.bootstrapSwitch":function(t){return function(i,n){var o;return i.preventDefault(),i.stopImmediatePropagation(),o=t.$element.is(":checked"),t._containerPosition(o),o!==t.options.state?(t.options.state=o,t.$wrapper.toggleClass(""+t.options.baseClass+"-off").toggleClass(""+t.options.baseClass+"-on"),n?void 0:(t.$element.is(":radio")&&e("[name='"+t.$element.attr("name")+"']").not(t.$element).prop("checked",!1).trigger("change.bootstrapSwitch",!0),t.$element.trigger("switchChange.bootstrapSwitch",[o]))):void 0}}(this),"focus.bootstrapSwitch":function(t){return function(e){return e.preventDefault(),t.$wrapper.addClass(""+t.options.baseClass+"-focused")}}(this),"blur.bootstrapSwitch":function(t){return function(e){return e.preventDefault(),t.$wrapper.removeClass(""+t.options.baseClass+"-focused")}}(this),"keydown.bootstrapSwitch":function(t){return function(e){if(e.which&&!t.options.disabled&&!t.options.readonly)switch(e.which){case 37:return e.preventDefault(),e.stopImmediatePropagation(),t.state(!1);case 39:return e.preventDefault(),e.stopImmediatePropagation(),t.state(!0)}}}(this)})},t.prototype._handleHandlers=function(){return this.$on.on("click.bootstrapSwitch",function(t){return function(e){return e.preventDefault(),e.stopPropagation(),t.state(!1),t.$element.trigger("focus.bootstrapSwitch")}}(this)),this.$off.on("click.bootstrapSwitch",function(t){return function(e){return e.preventDefault(),e.stopPropagation(),t.state(!0),t.$element.trigger("focus.bootstrapSwitch")}}(this))},t.prototype._labelHandlers=function(){return this.$label.on({"mousedown.bootstrapSwitch touchstart.bootstrapSwitch":function(t){return function(e){return t._dragStart||t.options.disabled||t.options.readonly?void 0:(e.preventDefault(),e.stopPropagation(),t._dragStart=(e.pageX||e.originalEvent.touches[0].pageX)-parseInt(t.$container.css("margin-left"),10),t.options.animate&&t.$wrapper.removeClass(""+t.options.baseClass+"-animate"),t.$element.trigger("focus.bootstrapSwitch"))}}(this),"mousemove.bootstrapSwitch touchmove.bootstrapSwitch":function(t){return function(e){var i;if(null!=t._dragStart&&(e.preventDefault(),i=(e.pageX||e.originalEvent.touches[0].pageX)-t._dragStart,!(i<-t._handleWidth||i>0)))return t._dragEnd=i,t.$container.css("margin-left",""+t._dragEnd+"px")}}(this),"mouseup.bootstrapSwitch touchend.bootstrapSwitch":function(t){return function(e){var i;if(t._dragStart)return e.preventDefault(),t.options.animate&&t.$wrapper.addClass(""+t.options.baseClass+"-animate"),t._dragEnd?(i=t._dragEnd>-(t._handleWidth/2),t._dragEnd=!1,t.state(t.options.inverse?!i:i)):t.state(!t.options.state),t._dragStart=!1}}(this),"mouseleave.bootstrapSwitch":function(t){return function(){return t.$label.trigger("mouseup.bootstrapSwitch")}}(this)})},t.prototype._externalLabelHandler=function(){var t;return t=this.$element.closest("label"),t.on("click",function(e){return function(i){return i.preventDefault(),i.stopImmediatePropagation(),i.target===t[0]?e.toggleState():void 0}}(this))},t.prototype._formHandler=function(){var t;return t=this.$element.closest("form"),t.data("bootstrap-switch")?void 0:t.on("reset.bootstrapSwitch",function(){return i.setTimeout(function(){return t.find("input").filter(function(){return e(this).data("bootstrap-switch")}).each(function(){return e(this).bootstrapSwitch("state",this.checked)})},1)}).data("bootstrap-switch",!0)},t.prototype._getClasses=function(t){var i,n,o,s;if(!e.isArray(t))return[""+this.options.baseClass+"-"+t];for(n=[],o=0,s=t.length;s>o;o++)i=t[o],n.push(""+this.options.baseClass+"-"+i);return n},t}(),e.fn.bootstrapSwitch=function(){var i,o,s;return o=arguments[0],i=2<=arguments.length?t.call(arguments,1):[],s=this,this.each(function(){var t,a;return t=e(this),a=t.data("bootstrap-switch"),a||t.data("bootstrap-switch",a=new n(this,o)),"string"==typeof o?s=a[o].apply(a,i):void 0}),s},e.fn.bootstrapSwitch.Constructor=n,e.fn.bootstrapSwitch.defaults={state:!0,size:null,animate:!0,disabled:!1,readonly:!1,indeterminate:!1,inverse:!1,radioAllOff:!1,onColor:"primary",offColor:"default",onText:"ON",offText:"OFF",labelText:"&nbsp;",handleWidth:"auto",labelWidth:"auto",baseClass:"bootstrap-switch",wrapperClass:"wrapper",onInit:function(){},onSwitchChange:function(){}}}(window.jQuery,window)}).call(this);
\ No newline at end of file
diff --git a/domain-server/resources/web/js/form2js.min.js b/domain-server/resources/web/settings/js/form2js.min.js
similarity index 100%
rename from domain-server/resources/web/js/form2js.min.js
rename to domain-server/resources/web/settings/js/form2js.min.js
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/settings/js/settings.js
similarity index 98%
rename from domain-server/resources/web/js/settings.js
rename to domain-server/resources/web/settings/js/settings.js
index 044f846293..471d2cf9bc 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -60,10 +60,15 @@ var viewHelpers = {
       if (setting.label) {
         form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
       }
-      form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
-      form_group += "<label for='" + keypath + "'>"
-      form_group += "<input type='checkbox'" + common_attrs() + (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
-      form_group += " " + setting.help + "</label>";
+
+      form_group += "<div class='toggle-checkbox-container" + (isLocked ? " disabled" : "") + "'>"
+      form_group += "<input type='checkbox'" + common_attrs('toggle-checkbox') + (setting_value ? "checked" : "")
+      form_group += (isLocked ? " disabled" : "") + "/>"
+
+      if (setting.help) {
+        form_group += "<span class='help-block checkbox-help'>" + setting.help + "</span>";
+      }
+
       form_group += "</div>"
     } else {
       input_type = _.has(setting, 'type') ? setting.type : "text"
@@ -735,6 +740,9 @@ function reloadSettings() {
     // call our method to setup the place names table
     setupPlacesTable();
 
+    // setup any bootstrap switches
+    $('.toggle-checkbox').bootstrapSwitch();
+
     // add tooltip to locked settings
     $('label.locked').tooltip({
       placement: 'right',
diff --git a/domain-server/resources/web/js/sweetalert.min.js b/domain-server/resources/web/settings/js/sweetalert.min.js
similarity index 100%
rename from domain-server/resources/web/js/sweetalert.min.js
rename to domain-server/resources/web/settings/js/sweetalert.min.js

From e295f52c0a6465a82f473b928671e994eb57ed15 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 20 May 2015 14:52:31 -0700
Subject: [PATCH 2/6] handle change event for new checkboxes

---
 domain-server/resources/web/settings/js/settings.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 471d2cf9bc..450d686cd4 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -206,10 +206,17 @@ $(document).ready(function(){
 
   $('#' + Settings.FORM_ID).on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
     // this input was changed, add the changed data attribute to it
-    $(this).attr('data-changed', true)
+    $(this).attr('data-changed', true);
 
-    badgeSidebarForDifferences($(this))
-  })
+    badgeSidebarForDifferences($(this));
+  });
+
+  $('#' + Settings.FORM_ID).on('switchChange.bootstrapSwitch', 'input.toggle-checkbox', function(){
+    // this checkbox was changed, add the changed data attribute to it
+    $(this).attr('data-changed', true);
+
+    badgeSidebarForDifferences($(this));
+  });
 
   $('.advanced-toggle').click(function(){
     Settings.showAdvanced = !Settings.showAdvanced

From 19b669867e3798bc8c7d27541c66e7402c1785ea Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 20 May 2015 14:58:09 -0700
Subject: [PATCH 3/6] cleanup entity checkboxes for new format

---
 .../resources/describe-settings.json          | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index a6cee7d491..d4a4755101 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -290,7 +290,7 @@
         "name": "dynamic_jitter_buffer",
         "type": "checkbox",
         "label": "Dynamic Jitter Buffers",
-        "help": "dynamically buffer client audio based on perceived jitter in packet receipt timing",
+        "help": "Dynamically buffer client audio based on perceived jitter in packet receipt timing",
         "default": false,
         "advanced": true
       },
@@ -313,8 +313,8 @@
       {
         "name": "use_stdev_for_desired_calc",
         "type": "checkbox",
-        "label": "Use Stdev for Desired Jitter Frames Calc:",
-        "help": "use Philip's method (stdev of timegaps) to calculate desired jitter frames (otherwise Fred's max timegap method is used)",
+        "label": "Stdev for Desired Jitter Frames Calc",
+        "help": "Use Philip's method (stdev of timegaps) to calculate desired jitter frames (otherwise Fred's max timegap method is used)",
         "default": false,
         "advanced": true
       },
@@ -328,7 +328,7 @@
       },
       {
         "name": "window_seconds_for_desired_calc_on_too_many_starves",
-        "label": "Timegaps Window (A) Seconds:",
+        "label": "Timegaps Window (A) Seconds",
         "help": "Window A contains a history of timegaps. Its max timegap is used to re-evaluate the desired jitter frames when too many starves occur within it.",
         "placeholder": "50",
         "default": "50",
@@ -336,7 +336,7 @@
       },
       {
         "name": "window_seconds_for_desired_reduction",
-        "label": "Timegaps Window (B) Seconds:",
+        "label": "Timegaps Window (B) Seconds",
         "help": "Window B contains a history of timegaps. Its max timegap is used as a ceiling for the desired jitter frames value.",
         "placeholder": "10",
         "default": "10",
@@ -345,16 +345,16 @@
       {
         "name": "repetition_with_fade",
         "type": "checkbox",
-        "label": "Repetition with Fade:",
-        "help": "dropped frames and mixing during starves repeat the last frame, eventually fading to silence",
+        "label": "Repetition with Fade",
+        "help": "Dropped frames and mixing during starves repeat the last frame, eventually fading to silence",
         "default": false,
         "advanced": true
       },
       {
         "name": "print_stream_stats",
         "type": "checkbox",
-        "label": "Print Stream Stats:",
-        "help": "audio upstream and downstream stats of each agent printed to audio-mixer stdout",
+        "label": "Print Stream Stats",
+        "help": "Audio upstream and downstream stats of each agent printed to audio-mixer stdout",
         "default": false,
         "advanced": true
       }
@@ -448,6 +448,7 @@
       {
         "name": "NoPersist",
         "type": "checkbox",
+        "label": "Disable Persistence",
         "help": "Don't persist your entities to a file.",
         "default": false,
         "advanced": true
@@ -455,6 +456,7 @@
       {
         "name": "NoBackup",
         "type": "checkbox",
+        "label": "Disable Backup",
         "help": "Don't regularly backup your persisted entities to a backup file.",
         "default": false,
         "advanced": true
@@ -478,6 +480,7 @@
       {
         "name": "wantEditLogging",
         "type": "checkbox",
+        "label": "Edit Logging",
         "help": "Logging of all edits to entities",
         "default": true,
         "advanced": true
@@ -485,28 +488,32 @@
       {
         "name": "verboseDebug",
         "type": "checkbox",
-        "help": "lots of debugging",
+        "label": "Verbose Debug",
+        "help": "Lots of debugging",
         "default": false,
         "advanced": true
       },
       {
         "name": "debugReceiving",
         "type": "checkbox",
-        "help": "extra debugging on receiving",
+        "label": "Extra Receiving Debug",
+        "help": "Extra debugging on receiving",
         "default": false,
         "advanced": true
       },
       {
         "name": "debugSending",
         "type": "checkbox",
-        "help": "extra debugging on sending",
+        "label": "Extra Sending Debug",
+        "help": "Extra debugging on sending",
         "default": false,
         "advanced": true
       },
       {
         "name": "debugTimestampNow",
         "type": "checkbox",
-        "help": "extra debugging for usecTimestampNow() function",
+        "label": "Extra Timestamp Debugging",
+        "help": "Extra debugging for usecTimestampNow() function",
         "default": false,
         "advanced": true
       },

From ac954e1c43b55f67f9a916b2b5cb852aa407fa01 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 20 May 2015 15:00:11 -0700
Subject: [PATCH 4/6] fix for lowercase help text in settings

---
 domain-server/resources/describe-settings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index d4a4755101..90fab58f53 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -464,7 +464,7 @@
       {
         "name": "statusHost",
         "label": "Status Hostname",
-        "help": "host name or IP address of the server for accessing the status page",
+        "help": "Host name or IP address of the server for accessing the status page",
         "placeholder": "",
         "default": "",
         "advanced": true
@@ -472,7 +472,7 @@
       {
         "name": "statusPort",
         "label": "Status Port",
-        "help": "port of the server for accessing the status page",
+        "help": "Port of the server for accessing the status page",
         "placeholder": "",
         "default": "",
         "advanced": true

From 6306b69ec84497cfc2313f6f307686ac204ac561 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 20 May 2015 16:27:53 -0700
Subject: [PATCH 5/6] add a version and handle remapping for restricted access

---
 .../resources/describe-settings.json          | 1085 +++++++++--------
 domain-server/src/DomainServer.cpp            |    2 -
 .../src/DomainServerSettingsManager.cpp       |   77 +-
 .../src/DomainServerSettingsManager.h         |    4 +
 libraries/shared/src/HifiConfigVariantMap.cpp |    7 +-
 libraries/shared/src/HifiConfigVariantMap.h   |    2 +-
 6 files changed, 612 insertions(+), 565 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 90fab58f53..e02fa22246 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,546 +1,549 @@
-[
-  {
-    "name": "metaverse",
-    "label": "Metaverse / Networking",
-    "settings": [
-      {
-        "name": "access_token",
-        "label": "Access Token",
-        "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
-        "advanced": true
-      },
-      {
-        "name": "id",
-        "label": "Domain ID",
-        "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
-      },
-      {
-        "name": "automatic_networking",
-        "label": "Automatic Networking",
-        "help": "This defines how other nodes in the High Fidelity metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
-        "default": "disabled",
-        "type": "select",
-        "options": [
-          {
-            "value": "full",
-            "label": "Full: update both the IP address and port to reach my server"
-          },
-          {
-            "value": "ip",
-            "label": "IP Only: update just my IP address, I will open the port manually"
-          },
-          {
-            "value": "disabled",
-            "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.com"
-          }
-        ]
-      },
-      {
-        "name": "local_port",
-        "label": "Local UDP Port",
-        "help": "This is the local port your domain-server binds to for UDP connections.<br/>Depending on your router, this may need to be changed to run multiple full automatic networking domain-servers in the same network.",
-        "default": "40102",
-        "type": "int",
-        "advanced": true
-      }
-    ]
-  },
-  {
-    "label": "Places / Paths",
-    "html_id": "places_paths",
-    "settings": [
-      {
-        "name": "paths",
-        "label": "Paths",
-        "help": "Clients can enter a path to reach an exact viewpoint in your domain.<br/>Add rows to the table below to map a path to a viewpoint.<br/>The index path ( / ) is where clients will enter if they do not enter an explicit path.",
-        "type": "table",
-        "key": {
-          "name": "path",
-          "label": "Path",
-          "placeholder": "/"
+{
+  "version": 1.0,
+  "settings": [
+    {
+      "name": "metaverse",
+      "label": "Metaverse / Networking",
+      "settings": [
+        {
+          "name": "access_token",
+          "label": "Access Token",
+          "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
+          "advanced": true
         },
-        "columns": [
-          {
-            "name": "viewpoint",
-            "label": "Viewpoint",
-            "placeholder": "/512,512,512"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "security",
-    "label": "Security",
-    "settings": [
-      {
-        "name": "http_username",
-        "label": "HTTP Username",
-        "help": "Username used for basic HTTP authentication."
-      },
-      {
-        "name": "http_password",
-        "label": "HTTP Password",
-        "type": "password",
-        "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
-        "value-hidden": true
-      },
-      {
-        "name": "restricted_access",
-        "type": "checkbox",
-        "label": "Restricted Access",
-        "default": true,
-        "help": "Only users listed in \"Allowed Users\" can enter your domain."
-      },
-      {
-        "name": "allowed_users",
-        "type": "table",
-        "label": "Allowed Users",
-        "help": "List the High Fidelity names for people you want to be able to connect to this domain (when \"Restricted Access\" is enabled).<br/>An empty list means everyone.<br/>You can always connect from the domain-server machine.",
-        "numbered": false,
-        "columns": [
-          {
-            "name": "username",
-            "label": "Username",
-            "can_set": true
-          }
-        ]
-      },
-      {
-        "name": "maximum_user_capacity",
-        "label": "Maximum User Capacity",
-        "help": "The limit on how many avatars can be connected at once.  0 means no limit.",
-        "placeholder": "0",
-        "default": "0",
-        "advanced": false
-      },
-      {
-        "name": "allowed_editors",
-        "type": "table",
-        "label": "Allowed Editors",
-        "help": "List the High Fidelity names for people you want to be able lock or unlock entities in this domain.<br/>An empty list means everyone.",
-        "numbered": false,
-        "columns": [
-          {
-            "name": "username",
-            "label": "Username",
-            "can_set": true
-          }
-        ]
-      },
-      {
-        "name": "editors_are_rezzers",
-        "type": "checkbox",
-        "label": "Only Editors Can Create Entities",
-        "help": "Only users listed in \"Allowed Editors\" can create new entites.",
-        "default": false
-      }
-    ]
-  },
-  {
-    "name": "scripts",
-    "label": "Scripts",
-    "settings": [
-      {
-        "name": "persistent_scripts",
-        "type": "table",
-        "label": "Persistent Scripts",
-        "help": "Add the URLs for scripts that you would like to ensure are always running in your domain.",
-        "columns": [
-          {
-            "name": "url",
-            "label": "Script URL"
-          },
-          {
-            "name": "num_instances",
-            "label": "# instances",
-            "default": 1
-          },
-          {
-            "name": "pool",
-            "label": "Pool"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "audio_env",
-    "label": "Audio Environment",
-    "assignment-types": [0],
-    "settings": [
-      {
-        "name": "attenuation_per_doubling_in_distance",
-        "label": "Default Domain Attenuation",
-        "help": "Factor between 0 and 1.0 (0: No attenuation, 1.0: extreme attenuation)",
-        "placeholder": "0.18",
-        "default": "0.18",
-        "advanced": false
-      },
-      {
-        "name": "noise_muting_threshold",
-        "label": "Noise Muting Threshold",
-        "help": "Loudness value for noise background between 0 and 1.0 (0: mute everyone, 1.0: never mute)",
-        "placeholder": "0.003",
-        "default": "0.003",
-        "advanced": false
-      },
-      {
-        "name": "enable_filter",
-        "label": "Low-pass Filter",
-        "type": "checkbox",
-        "help": "Positional audio stream uses low-pass filter",
-        "default": true
-      },
-      {
-        "name": "zones",
-        "type": "table",
-        "label": "Zones",
-        "help": "In this table you can define a set of zones in which you can specify various audio properties.",
-        "numbered": false,
-        "key": {
-          "name": "name",
-          "label": "Name",
-          "placeholder": "Zone_Name"
+        {
+          "name": "id",
+          "label": "Domain ID",
+          "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
         },
-        "columns": [
-          {
-            "name": "x_range",
-            "label": "X range",
-            "can_set": true,
-            "placeholder": "0-16384"
+        {
+          "name": "automatic_networking",
+          "label": "Automatic Networking",
+          "help": "This defines how other nodes in the High Fidelity metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
+          "default": "disabled",
+          "type": "select",
+          "options": [
+            {
+              "value": "full",
+              "label": "Full: update both the IP address and port to reach my server"
+            },
+            {
+              "value": "ip",
+              "label": "IP Only: update just my IP address, I will open the port manually"
+            },
+            {
+              "value": "disabled",
+              "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.com"
+            }
+          ]
+        },
+        {
+          "name": "local_port",
+          "label": "Local UDP Port",
+          "help": "This is the local port your domain-server binds to for UDP connections.<br/>Depending on your router, this may need to be changed to run multiple full automatic networking domain-servers in the same network.",
+          "default": "40102",
+          "type": "int",
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "label": "Places / Paths",
+      "html_id": "places_paths",
+      "settings": [
+        {
+          "name": "paths",
+          "label": "Paths",
+          "help": "Clients can enter a path to reach an exact viewpoint in your domain.<br/>Add rows to the table below to map a path to a viewpoint.<br/>The index path ( / ) is where clients will enter if they do not enter an explicit path.",
+          "type": "table",
+          "key": {
+            "name": "path",
+            "label": "Path",
+            "placeholder": "/"
           },
-          {
-            "name": "y_range",
-            "label": "Y range",
-            "can_set": true,
-            "placeholder": "0-16384"
-          },
-          {
-            "name": "z_range",
-            "label": "Z range",
-            "can_set": true,
-            "placeholder": "0-16384"
-          }
-        ]
-      },
-      {
-        "name": "attenuation_coefficients",
-        "type": "table",
-        "label": "Attenuation Coefficients",
-        "help": "In this table you can set custom attenuation coefficients between audio zones",
-        "numbered": true,
-        "can_order": true,
-        "columns": [
-          {
-            "name": "source",
-            "label": "Source",
-            "can_set": true,
-            "placeholder": "Zone_A"
-          },
-          {
-            "name": "listener",
-            "label": "Listener",
-            "can_set": true,
-            "placeholder": "Zone_B"
-          },
-          {
-            "name": "coefficient",
-            "label": "Attenuation coefficient",
-            "can_set": true,
-            "placeholder": "0.18"
-          }
-        ]
-      },
-      {
-        "name": "reverb",
-        "type": "table",
-        "label": "Reverb Settings",
-        "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet level of -10 db. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet level of -5 db.",
-        "numbered": true,
-        "columns": [
-          {
-            "name": "zone",
-            "label": "Zone",
-            "can_set": true,
-            "placeholder": "Audio_Zone"
-          },
-          {
-            "name": "reverb_time",
-            "label": "Reverb Decay Time",
-            "can_set": true,
-            "placeholder": "(in sec)"
-          },
-          {
-            "name": "wet_level",
-            "label": "Wet Level",
-            "can_set": true,
-            "placeholder": "(in db)"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "audio_buffer",
-    "label": "Audio Buffers",
-    "assignment-types": [0],
-    "settings": [
-      {
-        "name": "dynamic_jitter_buffer",
-        "type": "checkbox",
-        "label": "Dynamic Jitter Buffers",
-        "help": "Dynamically buffer client audio based on perceived jitter in packet receipt timing",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "static_desired_jitter_buffer_frames",
-        "label": "Static Desired Jitter Buffer Frames",
-        "help": "If dynamic jitter buffers is disabled, this determines the target number of frames maintained by the AudioMixer's jitter buffers",
-        "placeholder": "1",
-        "default": "1",
-        "advanced": true
-      },
-      {
-        "name": "max_frames_over_desired",
-        "label": "Max Frames Over Desired",
-        "help": "The highest number of frames an AudioMixer's ringbuffer can exceed the desired jitter buffer frames by",
-        "placeholder": "10",
-        "default": "10",
-        "advanced": true
-      },
-      {
-        "name": "use_stdev_for_desired_calc",
-        "type": "checkbox",
-        "label": "Stdev for Desired Jitter Frames Calc",
-        "help": "Use Philip's method (stdev of timegaps) to calculate desired jitter frames (otherwise Fred's max timegap method is used)",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "window_starve_threshold",
-        "label": "Window Starve Threshold",
-        "help": "If this many starves occur in an N-second window (N is the number in the next field), then the desired jitter frames will be re-evaluated using Window A.",
-        "placeholder": "3",
-        "default": "3",
-        "advanced": true
-      },
-      {
-        "name": "window_seconds_for_desired_calc_on_too_many_starves",
-        "label": "Timegaps Window (A) Seconds",
-        "help": "Window A contains a history of timegaps. Its max timegap is used to re-evaluate the desired jitter frames when too many starves occur within it.",
-        "placeholder": "50",
-        "default": "50",
-        "advanced": true
-      },
-      {
-        "name": "window_seconds_for_desired_reduction",
-        "label": "Timegaps Window (B) Seconds",
-        "help": "Window B contains a history of timegaps. Its max timegap is used as a ceiling for the desired jitter frames value.",
-        "placeholder": "10",
-        "default": "10",
-        "advanced": true
-      },
-      {
-        "name": "repetition_with_fade",
-        "type": "checkbox",
-        "label": "Repetition with Fade",
-        "help": "Dropped frames and mixing during starves repeat the last frame, eventually fading to silence",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "print_stream_stats",
-        "type": "checkbox",
-        "label": "Print Stream Stats",
-        "help": "Audio upstream and downstream stats of each agent printed to audio-mixer stdout",
-        "default": false,
-        "advanced": true
-      }
-    ]
-  },
-  {
-    "name": "entity_server_settings",
-    "label": "Entity Server Settings",
-    "assignment-types": [6],
-    "settings": [
-      {
-        "name": "persistFilename",
-        "label": "Entities Filename",
-        "help": "the path to the file entities are stored in. Make sure the path exists.",
-        "placeholder": "resources/models.svo",
-        "default": "resources/models.svo",
-        "advanced": true
-      },
-      {
-        "name": "persistAsFileType",
-        "label": "File format for entity server's persistent data",
-        "help": "This defines how the entity server will save entities to disk.",
-        "default": "svo",
-        "type": "select",
-        "options": [
-          {
-            "value": "svo",
-            "label": "Entity server persists data as SVO"
-          },
-          {
-            "value": "json",
-            "label": "Entity server persists data as JSON"
-          }
-        ],
-        "advanced": true
-      },
-      {
-        "name": "persistInterval",
-        "label": "Save Check Interval",
-        "help": "Milliseconds between checks for saving the current state of entities.",
-        "placeholder": "30000",
-        "default": "30000",
-        "advanced": true
-      },
-      {
-        "name": "backups",
-        "type": "table",
-        "label": "Backup Rules",
-        "help": "In this table you can define a set of rules for how frequently to backup copies of your entites content file.",
-        "numbered": false,
-        "default":  [
-                        {"Name":"Half Hourly Rolling","backupInterval":1800,"format":".backup.halfhourly.%N","maxBackupVersions":5},
-                        {"Name":"Daily Rolling","backupInterval":86400,"format":".backup.daily.%N","maxBackupVersions":7},
-                        {"Name":"Weekly Rolling","backupInterval":604800,"format":".backup.weekly.%N","maxBackupVersions":4},
-                        {"Name":"Thirty Day Rolling","backupInterval":2592000,"format":".backup.thirtyday.%N","maxBackupVersions":12}
-                    ],
-        "columns": [
-          {
-            "name": "Name",
+          "columns": [
+            {
+              "name": "viewpoint",
+              "label": "Viewpoint",
+              "placeholder": "/512,512,512"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "security",
+      "label": "Security",
+      "settings": [
+        {
+          "name": "http_username",
+          "label": "HTTP Username",
+          "help": "Username used for basic HTTP authentication."
+        },
+        {
+          "name": "http_password",
+          "label": "HTTP Password",
+          "type": "password",
+          "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
+          "value-hidden": true
+        },
+        {
+          "name": "restricted_access",
+          "type": "checkbox",
+          "label": "Restricted Access",
+          "default": false,
+          "help": "Only users listed in \"Allowed Users\" can enter your domain."
+        },
+        {
+          "name": "allowed_users",
+          "type": "table",
+          "label": "Allowed Users",
+          "help": "You can always connect from the domain-server machine.",
+          "numbered": false,
+          "columns": [
+            {
+              "name": "username",
+              "label": "Username",
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "maximum_user_capacity",
+          "label": "Maximum User Capacity",
+          "help": "The limit on how many avatars can be connected at once.  0 means no limit.",
+          "placeholder": "0",
+          "default": "0",
+          "advanced": false
+        },
+        {
+          "name": "allowed_editors",
+          "type": "table",
+          "label": "Allowed Editors",
+          "help": "List the High Fidelity names for people you want to be able lock or unlock entities in this domain.<br/>An empty list means everyone.",
+          "numbered": false,
+          "columns": [
+            {
+              "name": "username",
+              "label": "Username",
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "editors_are_rezzers",
+          "type": "checkbox",
+          "label": "Only Editors Can Create Entities",
+          "help": "Only users listed in \"Allowed Editors\" can create new entites.",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "scripts",
+      "label": "Scripts",
+      "settings": [
+        {
+          "name": "persistent_scripts",
+          "type": "table",
+          "label": "Persistent Scripts",
+          "help": "Add the URLs for scripts that you would like to ensure are always running in your domain.",
+          "columns": [
+            {
+              "name": "url",
+              "label": "Script URL"
+            },
+            {
+              "name": "num_instances",
+              "label": "# instances",
+              "default": 1
+            },
+            {
+              "name": "pool",
+              "label": "Pool"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "audio_env",
+      "label": "Audio Environment",
+      "assignment-types": [0],
+      "settings": [
+        {
+          "name": "attenuation_per_doubling_in_distance",
+          "label": "Default Domain Attenuation",
+          "help": "Factor between 0 and 1.0 (0: No attenuation, 1.0: extreme attenuation)",
+          "placeholder": "0.18",
+          "default": "0.18",
+          "advanced": false
+        },
+        {
+          "name": "noise_muting_threshold",
+          "label": "Noise Muting Threshold",
+          "help": "Loudness value for noise background between 0 and 1.0 (0: mute everyone, 1.0: never mute)",
+          "placeholder": "0.003",
+          "default": "0.003",
+          "advanced": false
+        },
+        {
+          "name": "enable_filter",
+          "label": "Low-pass Filter",
+          "type": "checkbox",
+          "help": "Positional audio stream uses low-pass filter",
+          "default": true
+        },
+        {
+          "name": "zones",
+          "type": "table",
+          "label": "Zones",
+          "help": "In this table you can define a set of zones in which you can specify various audio properties.",
+          "numbered": false,
+          "key": {
+            "name": "name",
             "label": "Name",
-            "can_set": true,
-            "placeholder": "Example",
-            "default": "Example"
+            "placeholder": "Zone_Name"
           },
-          {
-            "name": "format",
-            "label": "Rule Format",
-            "can_set": true,
-            "help": "Format used to create the extension for the backup of your persisted entities. Use a format with %N to get rolling. Or use date formatting like %Y-%m-%d.%H:%M:%S.%z",
-            "placeholder": ".backup.example.%N",
-            "default": ".backup.example.%N"
-          },
-          {
-            "name": "backupInterval",
-            "label": "Backup Interval in Seconds",
-            "help": "Interval between backup checks in seconds.",
-            "placeholder": 1800,
-            "default": 1800,
-            "can_set": true
-          },
-          {
-            "name": "maxBackupVersions",
-            "label": "Max Rolled Backup Versions",
-            "help": "If your backup extension format uses 'rolling', how many versions do you want us to keep?",
-            "placeholder": 5,
-            "default": 5,
-            "can_set": true
-          }
-        ]
-      },
-      {
-        "name": "NoPersist",
-        "type": "checkbox",
-        "label": "Disable Persistence",
-        "help": "Don't persist your entities to a file.",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "NoBackup",
-        "type": "checkbox",
-        "label": "Disable Backup",
-        "help": "Don't regularly backup your persisted entities to a backup file.",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "statusHost",
-        "label": "Status Hostname",
-        "help": "Host name or IP address of the server for accessing the status page",
-        "placeholder": "",
-        "default": "",
-        "advanced": true
-      },
-      {
-        "name": "statusPort",
-        "label": "Status Port",
-        "help": "Port of the server for accessing the status page",
-        "placeholder": "",
-        "default": "",
-        "advanced": true
-      },
-      {
-        "name": "wantEditLogging",
-        "type": "checkbox",
-        "label": "Edit Logging",
-        "help": "Logging of all edits to entities",
-        "default": true,
-        "advanced": true
-      },
-      {
-        "name": "verboseDebug",
-        "type": "checkbox",
-        "label": "Verbose Debug",
-        "help": "Lots of debugging",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "debugReceiving",
-        "type": "checkbox",
-        "label": "Extra Receiving Debug",
-        "help": "Extra debugging on receiving",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "debugSending",
-        "type": "checkbox",
-        "label": "Extra Sending Debug",
-        "help": "Extra debugging on sending",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "debugTimestampNow",
-        "type": "checkbox",
-        "label": "Extra Timestamp Debugging",
-        "help": "Extra debugging for usecTimestampNow() function",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "clockSkew",
-        "label": "Clock Skew",
-        "help": "Number of msecs to skew the server clock by to test clock skew",
-        "placeholder": "0",
-        "default": "0",
-        "advanced": true
-      }
-    ]
-  },
-  {
-    "name": "avatar_mixer",
-    "label": "Avatar Mixer",
-    "assignment-types": [1],
-    "settings": [
-      {
-        "name": "max_node_send_bandwidth",
-        "type": "double",
-        "label": "Per-Node Bandwidth",
-        "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
-        "placeholder": 1.0,
-        "default": 1.0,
-        "advanced": true
-      }
-    ]
-  }
-]
+          "columns": [
+            {
+              "name": "x_range",
+              "label": "X range",
+              "can_set": true,
+              "placeholder": "0-16384"
+            },
+            {
+              "name": "y_range",
+              "label": "Y range",
+              "can_set": true,
+              "placeholder": "0-16384"
+            },
+            {
+              "name": "z_range",
+              "label": "Z range",
+              "can_set": true,
+              "placeholder": "0-16384"
+            }
+          ]
+        },
+        {
+          "name": "attenuation_coefficients",
+          "type": "table",
+          "label": "Attenuation Coefficients",
+          "help": "In this table you can set custom attenuation coefficients between audio zones",
+          "numbered": true,
+          "can_order": true,
+          "columns": [
+            {
+              "name": "source",
+              "label": "Source",
+              "can_set": true,
+              "placeholder": "Zone_A"
+            },
+            {
+              "name": "listener",
+              "label": "Listener",
+              "can_set": true,
+              "placeholder": "Zone_B"
+            },
+            {
+              "name": "coefficient",
+              "label": "Attenuation coefficient",
+              "can_set": true,
+              "placeholder": "0.18"
+            }
+          ]
+        },
+        {
+          "name": "reverb",
+          "type": "table",
+          "label": "Reverb Settings",
+          "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet level of -10 db. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet level of -5 db.",
+          "numbered": true,
+          "columns": [
+            {
+              "name": "zone",
+              "label": "Zone",
+              "can_set": true,
+              "placeholder": "Audio_Zone"
+            },
+            {
+              "name": "reverb_time",
+              "label": "Reverb Decay Time",
+              "can_set": true,
+              "placeholder": "(in sec)"
+            },
+            {
+              "name": "wet_level",
+              "label": "Wet Level",
+              "can_set": true,
+              "placeholder": "(in db)"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "audio_buffer",
+      "label": "Audio Buffers",
+      "assignment-types": [0],
+      "settings": [
+        {
+          "name": "dynamic_jitter_buffer",
+          "type": "checkbox",
+          "label": "Dynamic Jitter Buffers",
+          "help": "Dynamically buffer client audio based on perceived jitter in packet receipt timing",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "static_desired_jitter_buffer_frames",
+          "label": "Static Desired Jitter Buffer Frames",
+          "help": "If dynamic jitter buffers is disabled, this determines the target number of frames maintained by the AudioMixer's jitter buffers",
+          "placeholder": "1",
+          "default": "1",
+          "advanced": true
+        },
+        {
+          "name": "max_frames_over_desired",
+          "label": "Max Frames Over Desired",
+          "help": "The highest number of frames an AudioMixer's ringbuffer can exceed the desired jitter buffer frames by",
+          "placeholder": "10",
+          "default": "10",
+          "advanced": true
+        },
+        {
+          "name": "use_stdev_for_desired_calc",
+          "type": "checkbox",
+          "label": "Stdev for Desired Jitter Frames Calc",
+          "help": "Use Philip's method (stdev of timegaps) to calculate desired jitter frames (otherwise Fred's max timegap method is used)",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "window_starve_threshold",
+          "label": "Window Starve Threshold",
+          "help": "If this many starves occur in an N-second window (N is the number in the next field), then the desired jitter frames will be re-evaluated using Window A.",
+          "placeholder": "3",
+          "default": "3",
+          "advanced": true
+        },
+        {
+          "name": "window_seconds_for_desired_calc_on_too_many_starves",
+          "label": "Timegaps Window (A) Seconds",
+          "help": "Window A contains a history of timegaps. Its max timegap is used to re-evaluate the desired jitter frames when too many starves occur within it.",
+          "placeholder": "50",
+          "default": "50",
+          "advanced": true
+        },
+        {
+          "name": "window_seconds_for_desired_reduction",
+          "label": "Timegaps Window (B) Seconds",
+          "help": "Window B contains a history of timegaps. Its max timegap is used as a ceiling for the desired jitter frames value.",
+          "placeholder": "10",
+          "default": "10",
+          "advanced": true
+        },
+        {
+          "name": "repetition_with_fade",
+          "type": "checkbox",
+          "label": "Repetition with Fade",
+          "help": "Dropped frames and mixing during starves repeat the last frame, eventually fading to silence",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "print_stream_stats",
+          "type": "checkbox",
+          "label": "Print Stream Stats",
+          "help": "Audio upstream and downstream stats of each agent printed to audio-mixer stdout",
+          "default": false,
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "name": "entity_server_settings",
+      "label": "Entity Server Settings",
+      "assignment-types": [6],
+      "settings": [
+        {
+          "name": "persistFilename",
+          "label": "Entities Filename",
+          "help": "the path to the file entities are stored in. Make sure the path exists.",
+          "placeholder": "resources/models.svo",
+          "default": "resources/models.svo",
+          "advanced": true
+        },
+        {
+          "name": "persistAsFileType",
+          "label": "File format for entity server's persistent data",
+          "help": "This defines how the entity server will save entities to disk.",
+          "default": "svo",
+          "type": "select",
+          "options": [
+            {
+              "value": "svo",
+              "label": "Entity server persists data as SVO"
+            },
+            {
+              "value": "json",
+              "label": "Entity server persists data as JSON"
+            }
+          ],
+          "advanced": true
+        },
+        {
+          "name": "persistInterval",
+          "label": "Save Check Interval",
+          "help": "Milliseconds between checks for saving the current state of entities.",
+          "placeholder": "30000",
+          "default": "30000",
+          "advanced": true
+        },
+        {
+          "name": "backups",
+          "type": "table",
+          "label": "Backup Rules",
+          "help": "In this table you can define a set of rules for how frequently to backup copies of your entites content file.",
+          "numbered": false,
+          "default":  [
+                          {"Name":"Half Hourly Rolling","backupInterval":1800,"format":".backup.halfhourly.%N","maxBackupVersions":5},
+                          {"Name":"Daily Rolling","backupInterval":86400,"format":".backup.daily.%N","maxBackupVersions":7},
+                          {"Name":"Weekly Rolling","backupInterval":604800,"format":".backup.weekly.%N","maxBackupVersions":4},
+                          {"Name":"Thirty Day Rolling","backupInterval":2592000,"format":".backup.thirtyday.%N","maxBackupVersions":12}
+                      ],
+          "columns": [
+            {
+              "name": "Name",
+              "label": "Name",
+              "can_set": true,
+              "placeholder": "Example",
+              "default": "Example"
+            },
+            {
+              "name": "format",
+              "label": "Rule Format",
+              "can_set": true,
+              "help": "Format used to create the extension for the backup of your persisted entities. Use a format with %N to get rolling. Or use date formatting like %Y-%m-%d.%H:%M:%S.%z",
+              "placeholder": ".backup.example.%N",
+              "default": ".backup.example.%N"
+            },
+            {
+              "name": "backupInterval",
+              "label": "Backup Interval in Seconds",
+              "help": "Interval between backup checks in seconds.",
+              "placeholder": 1800,
+              "default": 1800,
+              "can_set": true
+            },
+            {
+              "name": "maxBackupVersions",
+              "label": "Max Rolled Backup Versions",
+              "help": "If your backup extension format uses 'rolling', how many versions do you want us to keep?",
+              "placeholder": 5,
+              "default": 5,
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "NoPersist",
+          "type": "checkbox",
+          "label": "Disable Persistence",
+          "help": "Don't persist your entities to a file.",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "NoBackup",
+          "type": "checkbox",
+          "label": "Disable Backup",
+          "help": "Don't regularly backup your persisted entities to a backup file.",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "statusHost",
+          "label": "Status Hostname",
+          "help": "Host name or IP address of the server for accessing the status page",
+          "placeholder": "",
+          "default": "",
+          "advanced": true
+        },
+        {
+          "name": "statusPort",
+          "label": "Status Port",
+          "help": "Port of the server for accessing the status page",
+          "placeholder": "",
+          "default": "",
+          "advanced": true
+        },
+        {
+          "name": "wantEditLogging",
+          "type": "checkbox",
+          "label": "Edit Logging",
+          "help": "Logging of all edits to entities",
+          "default": true,
+          "advanced": true
+        },
+        {
+          "name": "verboseDebug",
+          "type": "checkbox",
+          "label": "Verbose Debug",
+          "help": "Lots of debugging",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "debugReceiving",
+          "type": "checkbox",
+          "label": "Extra Receiving Debug",
+          "help": "Extra debugging on receiving",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "debugSending",
+          "type": "checkbox",
+          "label": "Extra Sending Debug",
+          "help": "Extra debugging on sending",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "debugTimestampNow",
+          "type": "checkbox",
+          "label": "Extra Timestamp Debugging",
+          "help": "Extra debugging for usecTimestampNow() function",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "clockSkew",
+          "label": "Clock Skew",
+          "help": "Number of msecs to skew the server clock by to test clock skew",
+          "placeholder": "0",
+          "default": "0",
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "name": "avatar_mixer",
+      "label": "Avatar Mixer",
+      "assignment-types": [1],
+      "settings": [
+        {
+          "name": "max_node_send_bandwidth",
+          "type": "double",
+          "label": "Per-Node Bandwidth",
+          "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
+          "placeholder": 1.0,
+          "default": 1.0,
+          "advanced": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 4075ad133b..e4aeddbc0e 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -44,8 +44,6 @@ int const DomainServer::EXIT_CODE_REBOOT = 234923;
 
 const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.io";
 
-
-const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
 const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity";
 const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors";
 const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers";
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 9e98c09093..c0d85687bb 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -14,6 +14,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
+#include <QtCore/QSettings>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
@@ -42,33 +43,73 @@ DomainServerSettingsManager::DomainServerSettingsManager() :
     QFile descriptionFile(QCoreApplication::applicationDirPath() + SETTINGS_DESCRIPTION_RELATIVE_PATH);
     descriptionFile.open(QIODevice::ReadOnly);
 
-    _descriptionArray = QJsonDocument::fromJson(descriptionFile.readAll()).array();
+    QJsonDocument descriptionDocument = QJsonDocument::fromJson(descriptionFile.readAll());
+
+    if (descriptionDocument.isObject()) {
+        QJsonObject descriptionObject = descriptionDocument.object();
+
+        const QString DESCRIPTION_VERSION_KEY = "version";
+
+        if (descriptionObject.contains(DESCRIPTION_VERSION_KEY)) {
+            // read the version from the settings description
+            _descriptionVersion = descriptionObject[DESCRIPTION_VERSION_KEY].toDouble();
+
+            if (descriptionObject.contains(DESCRIPTION_SETTINGS_KEY)) {
+                _descriptionArray = descriptionDocument.object()[DESCRIPTION_SETTINGS_KEY].toArray();
+                return;
+            }
+        }
+    }
+
+    qCritical() << "Did not find settings decription in JSON at" << SETTINGS_DESCRIPTION_RELATIVE_PATH
+            << "- Unable to continue. domain-server will quit.";
+    QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
 }
 
 void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList) {
     _configMap.loadMasterAndUserConfig(argumentList);
 
-    // for now we perform a temporary transition from http-username and http-password to http_username and http_password
-    const QVariant* oldUsername = valueForKeyPath(_configMap.getUserConfig(), "security.http-username");
-    const QVariant* oldPassword = valueForKeyPath(_configMap.getUserConfig(), "security.http-password");
+    // What settings version were we before and what are we using now?
+    // Do we need to do any re-mapping?
+    QSettings appSettings;
+    const QString JSON_SETTINGS_VERSION_KEY = "json-settings/version";
+    double oldVersion = appSettings.value(JSON_SETTINGS_VERSION_KEY, 0.0).toDouble();
 
-    if (oldUsername || oldPassword) {
-        QVariantMap& settingsMap = *reinterpret_cast<QVariantMap*>(_configMap.getUserConfig()["security"].data());
+    if (oldVersion != _descriptionVersion) {
+        qDebug() << "Previous domain-server settings version was"
+            << QString::number(oldVersion, 'g', 8) << "and the new version is"
+            << QString::number(_descriptionVersion, 'g', 8) << "- checking if any re-mapping is required";
 
-        // remove old keys, move to new format
-        if (oldUsername) {
-            settingsMap["http_username"] = oldUsername->toString();
-            settingsMap.remove("http-username");
+        // we have a version mismatch - for now handle custom behaviour here since there are not many remappings
+        if (oldVersion < 1.0) {
+            // This was prior to the introduction of security.restricted_access
+            // If the user has a list of allowed users then set their value for security.restricted_access to true
+
+            QVariant* allowedUsers = valueForKeyPath(_configMap.getMergedConfig(), ALLOWED_USERS_SETTINGS_KEYPATH);
+
+            if (allowedUsers
+                && allowedUsers->canConvert(QMetaType::QVariantList)
+                && reinterpret_cast<QVariantList*>(allowedUsers)->size() > 0) {
+
+                qDebug() << "Forcing security.restricted_access to TRUE since there was an"
+                    << "existing list of allowed users.";
+
+                // In the pre-toggle system the user had a list of allowed users, so
+                // we need to set security.restricted_access to true
+                QVariant* restrictedAccess = valueForKeyPath(_configMap.getUserConfig(),
+                                                             RESTRICTED_ACCESS_SETTINGS_KEYPATH,
+                                                             true);
+
+                *restrictedAccess = QVariant(true);
+
+                // write the new settings to the json file
+                persistToFile();
+            }
         }
-
-        if (oldPassword) {
-            settingsMap["http_password"] = oldPassword->toString();
-            settingsMap.remove("http-password");
-        }
-
-        // save the updated settings
-        persistToFile();
     }
+
+    // write the current description version to our settings
+    appSettings.setValue(JSON_SETTINGS_VERSION_KEY, _descriptionVersion);
 }
 
 QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QString &keyPath) {
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index cf9c0525c8..21bf099ef0 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -23,6 +23,9 @@ const QString SETTINGS_PATHS_KEY = "paths";
 const QString SETTINGS_PATH = "/settings";
 const QString SETTINGS_PATH_JSON = SETTINGS_PATH + ".json";
 
+const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
+const QString RESTRICTED_ACCESS_SETTINGS_KEYPATH = "security.restricted_access";
+
 class DomainServerSettingsManager : public QObject {
     Q_OBJECT
 public:
@@ -44,6 +47,7 @@ private:
     QJsonObject settingDescriptionFromGroup(const QJsonObject& groupObject, const QString& settingName);
     void persistToFile();
 
+    double _descriptionVersion;
     QJsonArray _descriptionArray;
     HifiConfigVariantMap _configMap;
 };
diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp
index 3fe5d9ec3f..4f9a741aad 100644
--- a/libraries/shared/src/HifiConfigVariantMap.cpp
+++ b/libraries/shared/src/HifiConfigVariantMap.cpp
@@ -159,16 +159,17 @@ void HifiConfigVariantMap::addMissingValuesToExistingMap(QVariantMap& existingMa
     }
 }
 
-QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath) {
+QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath, bool shouldCreateIfMissing) {
     int dotIndex = keyPath.indexOf('.');
 
     QString firstKey = (dotIndex == -1) ? keyPath : keyPath.mid(0, dotIndex);
 
-    if (variantMap.contains(firstKey)) {
+    if (shouldCreateIfMissing || variantMap.contains(firstKey)) {
         if (dotIndex == -1) {
             return &variantMap[firstKey];
         } else if (variantMap[firstKey].canConvert(QMetaType::QVariantMap)) {
-            return valueForKeyPath(*static_cast<QVariantMap*>(variantMap[firstKey].data()), keyPath.mid(dotIndex + 1));
+            return valueForKeyPath(*static_cast<QVariantMap*>(variantMap[firstKey].data()), keyPath.mid(dotIndex + 1),
+                                   shouldCreateIfMissing);
         }
     }
 
diff --git a/libraries/shared/src/HifiConfigVariantMap.h b/libraries/shared/src/HifiConfigVariantMap.h
index 3566f446a2..75b8be1984 100644
--- a/libraries/shared/src/HifiConfigVariantMap.h
+++ b/libraries/shared/src/HifiConfigVariantMap.h
@@ -37,6 +37,6 @@ private:
     void addMissingValuesToExistingMap(QVariantMap& existingMap, const QVariantMap& newMap);
 };
 
-QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath);
+QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath, bool shouldCreateIfMissing = false);
 
 #endif // hifi_HifiConfigVariantMap_h

From 4475ca46430dae06bef2398de288d92969a47132 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 20 May 2015 16:47:10 -0700
Subject: [PATCH 6/6] use new restricting access toggle for DS connection

---
 domain-server/src/DomainServer.cpp | 79 +++++++++++++++---------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index e4aeddbc0e..6bf5c62710 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -48,7 +48,6 @@ const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity";
 const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors";
 const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers";
 
-
 DomainServer::DomainServer(int argc, char* argv[]) :
     QCoreApplication(argc, argv),
     _httpManager(DOMAIN_SERVER_HTTP_PORT, QString("%1/resources/web/").arg(QCoreApplication::applicationDirPath()), this),
@@ -774,9 +773,8 @@ bool DomainServer::shouldAllowConnectionFromNode(const QString& username,
                                                  const HifiSockAddr& senderSockAddr,
                                                  QString& reasonReturn) {
 
-    const QVariant* allowedUsersVariant = valueForKeyPath(_settingsManager.getSettingsMap(),
-                                                                 ALLOWED_USERS_SETTINGS_KEYPATH);
-    QStringList allowedUsers = allowedUsersVariant ? allowedUsersVariant->toStringList() : QStringList();
+    bool isRestrictingAccess =
+        _settingsManager.valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool();
 
     // we always let in a user who is sending a packet from our local socket or from the localhost address
     if (senderSockAddr.getAddress() == DependencyManager::get<LimitedNodeList>()->getLocalSockAddr().getAddress()
@@ -784,45 +782,50 @@ bool DomainServer::shouldAllowConnectionFromNode(const QString& username,
         return true;
     }
 
-    if (allowedUsers.count() > 0) {
+    if (isRestrictingAccess) {
+
+        QStringList allowedUsers =
+            _settingsManager.valueOrDefaultValueForKeyPath(ALLOWED_USERS_SETTINGS_KEYPATH).toStringList();
+
         if (allowedUsers.contains(username, Qt::CaseInsensitive)) {
-            if (verifyUsersKey(username, usernameSignature, reasonReturn)) {
-                return true;
+            if (!verifyUsersKey(username, usernameSignature, reasonReturn)) {
+                return false;
             }
         } else {
             qDebug() << "Connect request denied for user" << username << "not in allowed users list.";
             reasonReturn = "User not on whitelist.";
-        }
-        return false;
-    } else {
-        // we have no allowed user list.
 
-        // if this user is in the editors list, exempt them from the max-capacity check
-        const QVariant* allowedEditorsVariant =
-            valueForKeyPath(_settingsManager.getSettingsMap(), ALLOWED_EDITORS_SETTINGS_KEYPATH);
-        QStringList allowedEditors = allowedEditorsVariant ? allowedEditorsVariant->toStringList() : QStringList();
-        if (allowedEditors.contains(username)) {
-            if (verifyUsersKey(username, usernameSignature, reasonReturn)) {
-                return true;
-            }
+            return false;
         }
-
-        // if we haven't reached max-capacity, let them in.
-        const QVariant* maximumUserCapacityVariant = valueForKeyPath(_settingsManager.getSettingsMap(), MAXIMUM_USER_CAPACITY);
-        unsigned int maximumUserCapacity = maximumUserCapacityVariant ? maximumUserCapacityVariant->toUInt() : 0;
-        if (maximumUserCapacity > 0) {
-            unsigned int connectedUsers = countConnectedUsers();
-            if (connectedUsers >= maximumUserCapacity) {
-                // too many users, deny the new connection.
-                qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, denying new connection.";
-                reasonReturn = "Too many connected users.";
-                return false;
-            }
-            qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, perhaps allowing new connection.";
-        }
-
-        return true;
     }
+
+    // either we aren't restricting users, or this user is in the allowed list
+
+    // if this user is in the editors list, exempt them from the max-capacity check
+    const QVariant* allowedEditorsVariant =
+        valueForKeyPath(_settingsManager.getSettingsMap(), ALLOWED_EDITORS_SETTINGS_KEYPATH);
+    QStringList allowedEditors = allowedEditorsVariant ? allowedEditorsVariant->toStringList() : QStringList();
+    if (allowedEditors.contains(username)) {
+        if (verifyUsersKey(username, usernameSignature, reasonReturn)) {
+            return true;
+        }
+    }
+
+    // if we haven't reached max-capacity, let them in.
+    const QVariant* maximumUserCapacityVariant = valueForKeyPath(_settingsManager.getSettingsMap(), MAXIMUM_USER_CAPACITY);
+    unsigned int maximumUserCapacity = maximumUserCapacityVariant ? maximumUserCapacityVariant->toUInt() : 0;
+    if (maximumUserCapacity > 0) {
+        unsigned int connectedUsers = countConnectedUsers();
+        if (connectedUsers >= maximumUserCapacity) {
+            // too many users, deny the new connection.
+            qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, denying new connection.";
+            reasonReturn = "Too many connected users.";
+            return false;
+        }
+        qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, perhaps allowing new connection.";
+    }
+
+    return true;
 }
 
 void DomainServer::preloadAllowedUserPublicKeys() {
@@ -1253,10 +1256,8 @@ void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) {
     // add a flag to indicate if this domain uses restricted access - for now that will exclude it from listings
     const QString RESTRICTED_ACCESS_FLAG = "restricted";
 
-    const QVariant* allowedUsersVariant = valueForKeyPath(_settingsManager.getSettingsMap(),
-                                                          ALLOWED_USERS_SETTINGS_KEYPATH);
-    QStringList allowedUsers = allowedUsersVariant ? allowedUsersVariant->toStringList() : QStringList();
-    domainObject[RESTRICTED_ACCESS_FLAG] = (allowedUsers.size() > 0);
+    domainObject[RESTRICTED_ACCESS_FLAG] =
+        _settingsManager.valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool();
 
     // add the number of currently connected agent users
     int numConnectedAuthedUsers = 0;