From 0b6362e61109d352738e8947cb1837fdd65ba831 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 26 Dec 2019 06:14:03 +0000
Subject: [PATCH 01/20] Updated with loadChannelSelect()

---
 app/js/custom.js | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/app/js/custom.js b/app/js/custom.js
index 40d62ba8..1444f0db 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -190,6 +190,44 @@ function loadWifiStations(refresh) {
 
 $(".js-reload-wifi-stations").on("click", loadWifiStations(true));
 
+/*
+Sets the wirelss channel select options based on hw_mode and country_code.
+
+Methodology: In North America up to channel 11 is the maximum allowed WiFi 2.4Ghz channel,
+except for the US that allows channel 12 & 13 in low power mode with additional restrictions.
+Canada allows channel 12 in low power mode. Because it's unsure if low powered mode can be
+supported the channels are not selectable for those countries.
+Source: https://en.wikipedia.org/wiki/List_of_WLAN_channels#Interference_concerns
+Also Uzbekistan and Colombia allow up to channel 11 as maximum channel on the 2.4Ghz WiFi band.
+*/
+function loadChannelSelect() {
+    var hw_mode = $('#cbxhwmode').val();
+    var country_code = $('#cbxcountries').val();
+    var selectablechannels = Array.range(1,14);
+    var countries_2_4Ghz_max11ch = Array('AG', 'BS', 'BB', 'BZ', 'CR', 'CU', 'DM', 'DO', 'SV', 'GD', 'GT',
+        'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT',
+        'US', 'CA', 'UZ', 'CO');
+    var countries_2_4Ghz_max14ch = Array('JP');
+    var countries_5Ghz_max48ch = Array('US');
+    if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
+       selectablechannels = Array.range(1,12);
+    } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {
+        selectablechannels = Array.range(1,15);
+    } else if (($.inArray(country_code, countries_5Ghz_max48ch) !== -1) && (hw_mode === 'ac')) {
+        selectablechannels = Array(36, 40, 44, 48);
+    }
+
+    // Set channel select with available values
+    var channel_select = $('#cbxchannel');
+    channel_select.empty();
+    $.each(selectablechannels, function(key,value) {
+        channel_select.append($("<option></option>").attr("value", value).text(value));
+    });
+}
+
+// Static Array method
+Array.range = (start, end) => Array.from({length: (end - start)}, (v, k) => k + start);
+
 $(document).on("click", ".js-toggle-password", function(e) {
     var button = $(e.target)
     var field  = $(button.data("target"));

From bbe430028c9e73a970e8968dccbc8e74123df580 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 26 Dec 2019 06:15:04 +0000
Subject: [PATCH 02/20] Updated wpa, wpa_pairwise

---
 config/hostapd.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/hostapd.conf b/config/hostapd.conf
index eea43887..be164e30 100644
--- a/config/hostapd.conf
+++ b/config/hostapd.conf
@@ -9,8 +9,8 @@ channel=1
 hw_mode=g
 wpa_passphrase=ChangeMe
 interface=wlan0
-wpa=1
-wpa_pairwise=TKIP
+wpa=2
+wpa_pairwise=CCMP
 country_code=
 ## Rapberry Pi 3 specific to on board WLAN/WiFi
 #ieee80211n=1 # 802.11n support (Raspberry Pi 3)
@@ -18,4 +18,5 @@ country_code=
 #ht_capab=[HT40][SHORT-GI-20][DSSS_CCK-40] # (Raspberry Pi 3)
 
 ## RaspAP wireless client AP mode
-#interface=uap0
\ No newline at end of file
+#interface=uap0
+

From 6d7aa1b40105352f3e2edd4580835ec7ba7fb62c Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 26 Dec 2019 06:16:13 +0000
Subject: [PATCH 03/20] Added optional $event param to SelectorOptions()

---
 includes/functions.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 1c4c5150..0eef6694 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -142,19 +142,21 @@ function isAssoc($arr)
 /**
 *
 * Display a selector field for a form. Arguments are:
-*   $name:     Field name
-*   $options:  Array of options
-*   $selected: Selected option (optional)
-*       If $options is an associative array this should be the key
-*
+* @param string $name: Field name
+* @param array $options: Array of options
+* @param string $selected: Selected option (optional)
+* @param string $id: $options is an associative array this should be the key
+* @param string $event: onChange event (optional)
 */
-function SelectorOptions($name, $options, $selected = null, $id = null)
+function SelectorOptions($name, $options, $selected = null, $id = null, $event = null)
 {
     echo '<select class="form-control" name="'.htmlspecialchars($name, ENT_QUOTES).'"';
     if (isset($id)) {
         echo ' id="' . htmlspecialchars($id, ENT_QUOTES) .'"';
     }
-
+    if (isset($event)) {
+        echo ' onChange="' . htmlspecialchars($event, ENT_QUOTES).'()"';
+    }
     echo '>' , PHP_EOL;
     foreach ($options as $opt => $label) {
         $select = '';

From 597f2ebdb995f1ac04bf77fcd05e8ed41acb9684 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 26 Dec 2019 06:17:27 +0000
Subject: [PATCH 04/20] Added support for wireless mode AC

---
 includes/hostapd.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/includes/hostapd.php b/includes/hostapd.php
index 2db5733f..418286fb 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -15,8 +15,9 @@ function DisplayHostAPDConfig()
         'a' => '802.11a - 5 GHz',
         'b' => '802.11b - 2.4 GHz',
         'g' => '802.11g - 2.4 GHz',
-        'n' => '802.11n - 2.4 GHz'
-    ];
+        'n' => '802.11n - 2.4 GHz',
+        'ac' => '802.11.ac - 5 GHz'
+   ];
     $arrSecurity = array(1 => 'WPA', 2 => 'WPA2', 3 => 'WPA+WPA2', 'none' => _("None"));
     $arrEncType = array('TKIP' => 'TKIP', 'CCMP' => 'CCMP', 'TKIP CCMP' => 'TKIP+CCMP');
     $managedModeEnabled = false;
@@ -93,7 +94,7 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
         return false;
     }
 
-    if (intval($_POST['channel']) < 1 || intval($_POST['channel']) > 14) {
+    if (intval($_POST['channel']) < 1 || intval($_POST['channel']) > 48) {
         error_log("Attempting to set channel to '".$_POST['channel']."'");
         return false;
     }
@@ -180,6 +181,7 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
 
     if ($good_input) {
         // Fixed values
+        $country_code = $_POST['country_code'];
         $config = 'driver=nl80211'.PHP_EOL;
         $config.= 'ctrl_interface='.RASPI_HOSTAPD_CTRL_INTERFACE.PHP_EOL;
         $config.= 'ctrl_interface_group=0'.PHP_EOL;
@@ -193,6 +195,20 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
             $config.= 'ieee80211n=1'.PHP_EOL;
             // Enable basic Quality of service
             $config.= 'wmm_enabled=1'.PHP_EOL;
+        } elseif ($_POST['hw_mode'] === 'ac') {
+            $config.= 'hw_mode=a'.PHP_EOL.PHP_EOL;
+            $config.= '# N'.PHP_EOL;
+            $config.= 'ieee80211n=1'.PHP_EOL;
+            $config.= 'require_ht=1'.PHP_EOL;
+            $config.= 'ht_capab=[MAX-AMSDU-3839][HT40+][SHORT-GI-20][SHORT-GI-40][DSSS_CCK-40]'.PHP_EOL.PHP_EOL;
+            $config.= '# AC'.PHP_EOL;
+            $config.= 'ieee80211ac=1'.PHP_EOL;
+            $config.= 'require_vht=1'.PHP_EOL;
+            $config.= 'ieee80211d=0'.PHP_EOL;
+            $config.= 'ieee80211h=0'.PHP_EOL;
+            $config.= 'vht_capab=[MAX-AMSDU-3839][SHORT-GI-80]'.PHP_EOL;
+            $config.= 'vht_oper_chwidth=1'.PHP_EOL;
+            $config.= 'vht_oper_centr_freq_seg0_idx=42'.PHP_EOL.PHP_EOL;
         } else {
             $config.= 'hw_mode='.$_POST['hw_mode'].PHP_EOL;
             $config.= 'ieee80211n=0'.PHP_EOL;

From 05772a5ff2d36c83218d35848d4447fd8357f911 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 26 Dec 2019 06:18:22 +0000
Subject: [PATCH 05/20] Added selectable channels for wireless mode AC

---
 templates/hostapd.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/templates/hostapd.php b/templates/hostapd.php
index 316220ac..2cd9d289 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -55,8 +55,13 @@
                         $selectedHwMode = 'n';
                     }
                 }
+                if (isset($arrConfig['ieee80211ac'])) {
+                    if (strval($arrConfig['ieee80211ac']) === '1') {
+                        $selectedHwMode = 'ac';
+                    }
+                }
 
-                SelectorOptions('hw_mode', $arr80211Standard, $selectedHwMode, 'cbxhwmode'); ?>
+                SelectorOptions('hw_mode', $arr80211Standard, $selectedHwMode, 'cbxhwmode', 'loadChannelSelect'); ?>
               </div>
             </div>
             <div class="row">
@@ -68,18 +73,23 @@
                              'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT',
                              'US', 'CA', 'UZ', 'CO');
                 $countries_2_4Ghz_max14ch = array('JP');
+                $countries_5Ghz_max48ch = array('US');
                 if (in_array($arrConfig['country_code'], $countries_max11channels)) {
-                    // In North America till channel 11 is the maximum allowed wi-fi 2.4Ghz channel.
+                    // In North America up to channel 11 is the maximum allowed wi-fi 2.4Ghz channel.
                     // Except for the US that allows channel 12 & 13 in low power mode with additional restrictions.
                     // Canada that allows channel 12 in low power mode. Because it's unsure if low powered mode
                     // can be supported the channels are not selectable for those countries.
                     // source: https://en.wikipedia.org/wiki/List_of_WLAN_channels#Interference_concerns
-                    // Also Uzbekistan and Colombia allow to select till channel 11 as maximum channel on the 2.4Ghz wi-fi band.
+                    // Also Uzbekistan and Colombia allow up to channel 11 as maximum channel on the 2.4Ghz wi-fi band.
                     $selectablechannels = range(1, 11);
                 } elseif (in_array($arrConfig['country_code'], $countries_2_4Ghz_max14ch)) {
                     if ($arrConfig['hw_mode'] === 'b') {
                         $selectablechannels = range(1, 14);
                     }
+                } elseif (in_array($arrConfig['country_code'], $countries_5Ghz_max48ch)) {
+                    if ($selectedHwMode === 'ac') {
+                        $selectablechannels = array(36, 40, 44, 48);
+                    }
                 }
                 SelectorOptions('channel', $selectablechannels, intval($arrConfig['channel']), 'cbxchannel'); ?>
               </div>

From 75ebf08ae77d64848be271bcd1dcf721b631bb86 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 26 Dec 2019 21:36:27 +0000
Subject: [PATCH 06/20] Implemented selectablechannels in custom.js

---
 templates/hostapd.php | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/templates/hostapd.php b/templates/hostapd.php
index 2cd9d289..bf64f399 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -68,29 +68,7 @@
               <div class="form-group col-md-6">
                 <label for="cbxchannel"><?php echo _("Channel"); ?></label>
                 <?php
-                $selectablechannels = range(1, 13);
-                $countries_2_4Ghz_max11ch = array('AG', 'BS', 'BB', 'BZ', 'CR', 'CU', 'DM', 'DO', 'SV', 'GD', 'GT',
-                             'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT',
-                             'US', 'CA', 'UZ', 'CO');
-                $countries_2_4Ghz_max14ch = array('JP');
-                $countries_5Ghz_max48ch = array('US');
-                if (in_array($arrConfig['country_code'], $countries_max11channels)) {
-                    // In North America up to channel 11 is the maximum allowed wi-fi 2.4Ghz channel.
-                    // Except for the US that allows channel 12 & 13 in low power mode with additional restrictions.
-                    // Canada that allows channel 12 in low power mode. Because it's unsure if low powered mode
-                    // can be supported the channels are not selectable for those countries.
-                    // source: https://en.wikipedia.org/wiki/List_of_WLAN_channels#Interference_concerns
-                    // Also Uzbekistan and Colombia allow up to channel 11 as maximum channel on the 2.4Ghz wi-fi band.
-                    $selectablechannels = range(1, 11);
-                } elseif (in_array($arrConfig['country_code'], $countries_2_4Ghz_max14ch)) {
-                    if ($arrConfig['hw_mode'] === 'b') {
-                        $selectablechannels = range(1, 14);
-                    }
-                } elseif (in_array($arrConfig['country_code'], $countries_5Ghz_max48ch)) {
-                    if ($selectedHwMode === 'ac') {
-                        $selectablechannels = array(36, 40, 44, 48);
-                    }
-                }
+                $selectablechannels = Array();
                 SelectorOptions('channel', $selectablechannels, intval($arrConfig['channel']), 'cbxchannel'); ?>
               </div>
             </div>
@@ -190,7 +168,7 @@
               <div class="form-group col-md-6">
               <label for="cbxcountries"><?php echo _("Country Code"); ?></label>
               <input type="hidden" id="selected_country" value="<?php echo htmlspecialchars($arrConfig['country_code'], ENT_QUOTES); ?>">
-              <select  class="form-control" id="cbxcountries" name="country_code">
+              <select  class="form-control" id="cbxcountries" name="country_code" onchange="loadChannelSelect()">
                 <option value="AF">Afghanistan</option>
                 <option value="AX">Åland Islands</option>
                 <option value="AL">Albania</option>

From 6a961e09b87a7ed8224040297f8af5934f22433f Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Thu, 26 Dec 2019 21:37:23 +0000
Subject: [PATCH 07/20] Added loadChannelSelect() to document.ready

---
 app/js/custom.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index 1444f0db..b3d66b81 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -196,13 +196,15 @@ Sets the wirelss channel select options based on hw_mode and country_code.
 Methodology: In North America up to channel 11 is the maximum allowed WiFi 2.4Ghz channel,
 except for the US that allows channel 12 & 13 in low power mode with additional restrictions.
 Canada allows channel 12 in low power mode. Because it's unsure if low powered mode can be
-supported the channels are not selectable for those countries.
+supported the channels are not selectable for those countries. Also Uzbekistan and Colombia
+allow up to channel 11 as maximum channel on the 2.4Ghz WiFi band.
 Source: https://en.wikipedia.org/wiki/List_of_WLAN_channels#Interference_concerns
-Also Uzbekistan and Colombia allow up to channel 11 as maximum channel on the 2.4Ghz WiFi band.
+Additional: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
 */
 function loadChannelSelect() {
     var hw_mode = $('#cbxhwmode').val();
     var country_code = $('#cbxcountries').val();
+    var channel_select = $('#cbxchannel');
     var selectablechannels = Array.range(1,14);
     var countries_2_4Ghz_max11ch = Array('AG', 'BS', 'BB', 'BZ', 'CR', 'CU', 'DM', 'DO', 'SV', 'GD', 'GT',
         'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT',
@@ -218,7 +220,6 @@ function loadChannelSelect() {
     }
 
     // Set channel select with available values
-    var channel_select = $('#cbxchannel');
     channel_select.empty();
     $.each(selectablechannels, function(key,value) {
         channel_select.append($("<option></option>").attr("value", value).text(value));
@@ -334,4 +335,5 @@ $(window).bind("load", function() {
 $(document)
     .ajaxSend(setCSRFTokenHeader)
     .ready(contentLoaded)
-    .ready(loadWifiStations());
+    .ready(loadWifiStations())
+    .ready(loadChannelSelect());

From 93514a678704c2e9b9075a20472588d5060248ef Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 27 Dec 2019 01:26:37 +0000
Subject: [PATCH 08/20] Minor: comments + formatting

---
 app/js/custom.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index b3d66b81..721f5b35 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -198,7 +198,7 @@ except for the US that allows channel 12 & 13 in low power mode with additional
 Canada allows channel 12 in low power mode. Because it's unsure if low powered mode can be
 supported the channels are not selectable for those countries. Also Uzbekistan and Colombia
 allow up to channel 11 as maximum channel on the 2.4Ghz WiFi band.
-Source: https://en.wikipedia.org/wiki/List_of_WLAN_channels#Interference_concerns
+Source: https://en.wikipedia.org/wiki/List_of_WLAN_channels
 Additional: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
 */
 function loadChannelSelect() {
@@ -207,8 +207,7 @@ function loadChannelSelect() {
     var channel_select = $('#cbxchannel');
     var selectablechannels = Array.range(1,14);
     var countries_2_4Ghz_max11ch = Array('AG', 'BS', 'BB', 'BZ', 'CR', 'CU', 'DM', 'DO', 'SV', 'GD', 'GT',
-        'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT',
-        'US', 'CA', 'UZ', 'CO');
+        'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT', 'US', 'CA', 'UZ', 'CO');
     var countries_2_4Ghz_max14ch = Array('JP');
     var countries_5Ghz_max48ch = Array('US');
     if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {

From 3292bc580b3d52f390c495fc5fcf9f708bf8aaf9 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 27 Dec 2019 03:08:51 +0000
Subject: [PATCH 09/20] Added disabled param to SelectorOptions()

---
 includes/functions.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 0eef6694..d43c7b89 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -147,8 +147,9 @@ function isAssoc($arr)
 * @param string $selected: Selected option (optional)
 * @param string $id: $options is an associative array this should be the key
 * @param string $event: onChange event (optional)
+* @param string $disabled (optional)
 */
-function SelectorOptions($name, $options, $selected = null, $id = null, $event = null)
+function SelectorOptions($name, $options, $selected = null, $id = null, $event = null, $disabled = null)
 {
     echo '<select class="form-control" name="'.htmlspecialchars($name, ENT_QUOTES).'"';
     if (isset($id)) {
@@ -164,8 +165,10 @@ function SelectorOptions($name, $options, $selected = null, $id = null, $event =
         if ($key == $selected) {
             $select = ' selected="selected"';
         }
-
-        echo '<option value="'.htmlspecialchars($key, ENT_QUOTES).'"'.$select.'>'.
+        if ($key == $disabled) {
+            $disabled = ' disabled';
+        }
+        echo '<option value="'.htmlspecialchars($key, ENT_QUOTES).'"'.$select.$disabled.'>'.
             htmlspecialchars($label, ENT_QUOTES).'</option>' , PHP_EOL;
     }
 

From 6abe731ae55a186b98bf39678ace7dd1143cd96f Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 27 Dec 2019 03:16:50 +0000
Subject: [PATCH 10/20] Disable ac hw_mode if no 5Ghz country match

---
 templates/hostapd.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/templates/hostapd.php b/templates/hostapd.php
index bf64f399..13d70fd3 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -49,6 +49,7 @@
               <div class="form-group col-md-6">
                 <label for="cbxhwmode"><?php echo _("Wireless Mode") ;?></label>
                 <?php
+                $countries_5Ghz_max48ch = array('US');
                 $selectedHwMode = $arrConfig['hw_mode'];
                 if (isset($arrConfig['ieee80211n'])) {
                     if (strval($arrConfig['ieee80211n']) === '1') {
@@ -60,8 +61,13 @@
                         $selectedHwMode = 'ac';
                     }
                 }
-
-                SelectorOptions('hw_mode', $arr80211Standard, $selectedHwMode, 'cbxhwmode', 'loadChannelSelect'); ?>
+                if (!in_array($arrConfig['country_code'], $countries_5Ghz_max48ch)) {
+                    $hwModeDisabled = 'ac';
+                    if ($selectedHwMode === $hwModeDisabled) {
+                        unset($selectedHwMode);
+                    }
+                }
+                SelectorOptions('hw_mode', $arr80211Standard, $selectedHwMode, 'cbxhwmode', 'loadChannelSelect', $hwModeDisabled); ?>
               </div>
             </div>
             <div class="row">

From b6cd2e0fa15a4fbb92d4aaa9b15c63693382a114 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 27 Dec 2019 06:34:09 +0000
Subject: [PATCH 11/20] Initial commit: ajax get channel

---
 ajax/networking/get_channel.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 ajax/networking/get_channel.php

diff --git a/ajax/networking/get_channel.php b/ajax/networking/get_channel.php
new file mode 100644
index 00000000..5285a3c0
--- /dev/null
+++ b/ajax/networking/get_channel.php
@@ -0,0 +1,17 @@
+<?php
+
+require('../../includes/csrf.php');
+include_once('../../includes/config.php');
+
+exec('cat '. RASPI_HOSTAPD_CONFIG, $hostapdconfig);
+$arrConfig = array();
+
+foreach ($hostapdconfig as $hostapdconfigline) {
+    if (strlen($hostapdconfigline) === 0) {
+        continue;
+    }
+    $arrLine = explode("=", $hostapdconfigline) ;
+    $arrConfig[$arrLine[0]]=$arrLine[1];
+};
+$channel = intval($arrConfig['channel']);
+echo json_encode($channel);

From 597f1b04cf6eacf73dec0216aa93b0cf7fbf1ba9 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 27 Dec 2019 06:43:49 +0000
Subject: [PATCH 12/20] Fetch ajax channel value

---
 app/js/custom.js | 62 ++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index 721f5b35..749d6a89 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -91,31 +91,30 @@ function loadCurrentSettings(strInterface) {
 }
 
 function saveNetworkSettings(int) {
-        var frmInt = $('#frm-'+int).find(':input');
-        var arrFormData = {};
-        $.each(frmInt,function(i3,v3){
-            if($(v3).attr('type') == 'radio') {
-                arrFormData[$(v3).attr('id')] = $(v3).prop('checked');
-            } else {
-                arrFormData[$(v3).attr('id')] = $(v3).val();
-            }
-        });
-        arrFormData['interface'] = int;
-        $.post('ajax/networking/save_int_config.php',arrFormData,function(data){
-            var jsonData = JSON.parse(data);
-            $('#msgNetworking').html(msgShow(jsonData['return'],jsonData['output']));
-        });
+    var frmInt = $('#frm-'+int).find(':input');
+    var arrFormData = {};
+    $.each(frmInt,function(i3,v3){
+        if($(v3).attr('type') == 'radio') {
+		arrFormData[$(v3).attr('id')] = $(v3).prop('checked');
+    } else {
+	    arrFormData[$(v3).attr('id')] = $(v3).val();
+    }
+    });
+    arrFormData['interface'] = int;
+    $.post('ajax/networking/save_int_config.php',arrFormData,function(data){
+        var jsonData = JSON.parse(data);
+        $('#msgNetworking').html(msgShow(jsonData['return'],jsonData['output']));
+    });
 }
 
 function applyNetworkSettings() {
-        var int = $(this).data('int');
-        arrFormData = {};
-        arrFormData['generate'] = '';
-        $.post('ajax/networking/gen_int_config.php',arrFormData,function(data){
-            console.log(data);
-            var jsonData = JSON.parse(data);
-            $('#msgNetworking').html(msgShow(jsonData['return'],jsonData['output']));
-        });
+    var int = $(this).data('int');
+    arrFormData = {};
+    arrFormData['generate'] = '';
+    $.post('ajax/networking/gen_int_config.php',arrFormData,function(data){
+        var jsonData = JSON.parse(data);
+        $('#msgNetworking').html(msgShow(jsonData['return'],jsonData['output']));
+    });
 }
 
 $(document).on("click", ".js-add-dhcp-static-lease", function(e) {
@@ -126,7 +125,6 @@ $(document).on("click", ".js-add-dhcp-static-lease", function(e) {
     if (mac == "" || ip == "") {
         return;
     }
-
     var row = $("#js-dhcp-static-lease-row").html()
         .replace("{{ mac }}", mac)
         .replace("{{ ip }}", ip);
@@ -147,12 +145,10 @@ $(document).on("submit", ".js-dhcp-settings-form", function(e) {
 
 function setupBtns() {
     $('#btnSummaryRefresh').click(function(){getAllInterfaces();});
-
     $('.intsave').click(function(){
         var int = $(this).data('int');
         saveNetworkSettings(int);
     });
-
     $('.intapply').click(function(){
         applyNetworkSettings();
     });
@@ -173,6 +169,8 @@ function contentLoaded() {
             getAllInterfaces();
             setupTabs();
             setupBtns();
+        case "hostapd_conf":
+            loadChannel();
         break;
     }
 }
@@ -190,6 +188,13 @@ function loadWifiStations(refresh) {
 
 $(".js-reload-wifi-stations").on("click", loadWifiStations(true));
 
+function loadChannel() {
+    $.get('ajax/networking/get_channel.php',function(data){
+        jsonData = JSON.parse(data);
+        loadChannelSelect(jsonData);
+    });
+}
+
 /*
 Sets the wirelss channel select options based on hw_mode and country_code.
 
@@ -201,7 +206,7 @@ allow up to channel 11 as maximum channel on the 2.4Ghz WiFi band.
 Source: https://en.wikipedia.org/wiki/List_of_WLAN_channels
 Additional: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
 */
-function loadChannelSelect() {
+function loadChannelSelect(selected) {
     var hw_mode = $('#cbxhwmode').val();
     var country_code = $('#cbxcountries').val();
     var channel_select = $('#cbxchannel');
@@ -219,10 +224,12 @@ function loadChannelSelect() {
     }
 
     // Set channel select with available values
+    var selected = (typeof selected === 'undefined') ? selectablechannels[0] : selected;
     channel_select.empty();
     $.each(selectablechannels, function(key,value) {
         channel_select.append($("<option></option>").attr("value", value).text(value));
     });
+    channel_select.val(selected);
 }
 
 // Static Array method
@@ -334,5 +341,4 @@ $(window).bind("load", function() {
 $(document)
     .ajaxSend(setCSRFTokenHeader)
     .ready(contentLoaded)
-    .ready(loadWifiStations())
-    .ready(loadChannelSelect());
+    .ready(loadWifiStations());

From f1ff34af6da64ab5e052c68aa2bfe5caea11d2e4 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sat, 28 Dec 2019 00:04:50 +0000
Subject: [PATCH 13/20] Expanded 5Ghz country list (testing)

---
 app/js/custom.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index 749d6a89..c25aa2ed 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -214,7 +214,8 @@ function loadChannelSelect(selected) {
     var countries_2_4Ghz_max11ch = Array('AG', 'BS', 'BB', 'BZ', 'CR', 'CU', 'DM', 'DO', 'SV', 'GD', 'GT',
         'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT', 'US', 'CA', 'UZ', 'CO');
     var countries_2_4Ghz_max14ch = Array('JP');
-    var countries_5Ghz_max48ch = Array('US');
+    var countries_5Ghz_max48ch = Array('AU', 'BR', 'CA', 'EE', 'HK', 'IL', 'IS', 'LT', 'LV', 'NZ', 'US',
+        'PH', 'SI', 'SK');
     if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
        selectablechannels = Array.range(1,12);
     } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {

From 40bc21a04b6b9d72c3d286cb700670c8e14b3d4a Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sat, 28 Dec 2019 00:05:59 +0000
Subject: [PATCH 14/20] Allow channel input up to 64 (testing)

---
 includes/hostapd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/hostapd.php b/includes/hostapd.php
index 418286fb..0015d711 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -94,7 +94,7 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
         return false;
     }
 
-    if (intval($_POST['channel']) < 1 || intval($_POST['channel']) > 48) {
+    if (intval($_POST['channel']) < 1 || intval($_POST['channel']) > 64) {
         error_log("Attempting to set channel to '".$_POST['channel']."'");
         return false;
     }

From a596568fbc10941a0184158891b38c81d2db04e5 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 30 Dec 2019 04:39:37 +0000
Subject: [PATCH 15/20] Revert "Allow channel input up to 64 (testing)"

This reverts commit 40bc21a04b6b9d72c3d286cb700670c8e14b3d4a.
---
 includes/hostapd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/hostapd.php b/includes/hostapd.php
index 0015d711..418286fb 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -94,7 +94,7 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
         return false;
     }
 
-    if (intval($_POST['channel']) < 1 || intval($_POST['channel']) > 64) {
+    if (intval($_POST['channel']) < 1 || intval($_POST['channel']) > 48) {
         error_log("Attempting to set channel to '".$_POST['channel']."'");
         return false;
     }

From ba8d245ecab8f7e4481a3a2f88d5139c8b0bf33e Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 30 Dec 2019 04:41:07 +0000
Subject: [PATCH 16/20] Revert "Expanded 5Ghz country list (testing)"

This reverts commit f1ff34af6da64ab5e052c68aa2bfe5caea11d2e4.
---
 app/js/custom.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index c25aa2ed..749d6a89 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -214,8 +214,7 @@ function loadChannelSelect(selected) {
     var countries_2_4Ghz_max11ch = Array('AG', 'BS', 'BB', 'BZ', 'CR', 'CU', 'DM', 'DO', 'SV', 'GD', 'GT',
         'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT', 'US', 'CA', 'UZ', 'CO');
     var countries_2_4Ghz_max14ch = Array('JP');
-    var countries_5Ghz_max48ch = Array('AU', 'BR', 'CA', 'EE', 'HK', 'IL', 'IS', 'LT', 'LV', 'NZ', 'US',
-        'PH', 'SI', 'SK');
+    var countries_5Ghz_max48ch = Array('US');
     if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
        selectablechannels = Array.range(1,12);
     } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {

From 581798a15f5d8b26175f9c85eca492b17f90b2a5 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Tue, 31 Dec 2019 19:09:26 +0000
Subject: [PATCH 17/20] Added constant for CRDA wireless regulatory domain

---
 config/config.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/config.php b/config/config.php
index 046e36a2..f89c1746 100755
--- a/config/config.php
+++ b/config/config.php
@@ -22,6 +22,9 @@ define('RASPI_OPENVPN_SERVER_CONFIG', '/etc/openvpn/server/server.conf');
 define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc');
 define('RASPI_LIGHTTPD_CONFIG', '/etc/lighttpd/lighttpd.conf');
 
+// Constants for CRDA wireless regulatory domain
+define('RASPI_5GHZ_ISO_ALPHA2', array('US'));
+
 // Optional services, set to true to enable.
 define('RASPI_WIFICLIENT_ENABLED', true);
 define('RASPI_HOTSPOT_ENABLED', true);

From f41bfa93aacf15eb9923435712d24d8c2dc373ca Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Tue, 31 Dec 2019 19:10:48 +0000
Subject: [PATCH 18/20] Fetch wireless regulatory data from
 config/wireless.json

---
 app/js/custom.js | 50 ++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index 749d6a89..bba96088 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -207,29 +207,37 @@ Source: https://en.wikipedia.org/wiki/List_of_WLAN_channels
 Additional: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
 */
 function loadChannelSelect(selected) {
-    var hw_mode = $('#cbxhwmode').val();
-    var country_code = $('#cbxcountries').val();
-    var channel_select = $('#cbxchannel');
-    var selectablechannels = Array.range(1,14);
-    var countries_2_4Ghz_max11ch = Array('AG', 'BS', 'BB', 'BZ', 'CR', 'CU', 'DM', 'DO', 'SV', 'GD', 'GT',
-        'HT', 'HN', 'JM', 'MX', 'NI', 'PA', 'KN', 'LC', 'VC', 'TT', 'US', 'CA', 'UZ', 'CO');
-    var countries_2_4Ghz_max14ch = Array('JP');
-    var countries_5Ghz_max48ch = Array('US');
-    if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
-       selectablechannels = Array.range(1,12);
-    } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {
-        selectablechannels = Array.range(1,15);
-    } else if (($.inArray(country_code, countries_5Ghz_max48ch) !== -1) && (hw_mode === 'ac')) {
-        selectablechannels = Array(36, 40, 44, 48);
-    }
 
-    // Set channel select with available values
-    var selected = (typeof selected === 'undefined') ? selectablechannels[0] : selected;
-    channel_select.empty();
-    $.each(selectablechannels, function(key,value) {
-        channel_select.append($("<option></option>").attr("value", value).text(value));
+    // Fetch wireless regulatory data
+    $.getJSON("config/wireless.json", function(json) {
+        var hw_mode = $('#cbxhwmode').val();
+        var country_code = $('#cbxcountries').val();
+        var channel_select = $('#cbxchannel');
+        var data = json["wireless_regdb"];
+        var selectablechannels = Array.range(1,14);
+
+        // Assign array of countries to valid frequencies (channels)
+        var countries_2_4Ghz_max11ch = data["2_4GHz_max11ch"].countries;
+        var countries_2_4Ghz_max14ch = data["2_4GHz_max14ch"].countries;
+        var countries_5Ghz_max48ch = data["5Ghz_max48ch"].countries;
+
+        // Map selected hw_mode and country to determine channel list
+        if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
+            selectablechannels = data["2_4GHz_max11ch"].channels;
+        } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {
+            selectablechannels = data["2_4GHz_max14ch"].channels;
+        } else if (($.inArray(country_code, countries_5Ghz_max48ch) !== -1) && (hw_mode === 'ac')) {
+            selectablechannels = data["5Ghz_max48ch"].channels;
+        }
+
+        // Set channel select with available values
+        var selected = (typeof selected === 'undefined') ? selectablechannels[0] : selected;
+        channel_select.empty();
+        $.each(selectablechannels, function(key,value) {
+            channel_select.append($("<option></option>").attr("value", value).text(value));
+        });
+        channel_select.val(selected);
     });
-    channel_select.val(selected);
 }
 
 // Static Array method

From 154eee337c46163e71c6f2ab4083de6224efa73b Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Tue, 31 Dec 2019 19:11:00 +0000
Subject: [PATCH 19/20] Initial commit

---
 config/wireless.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 config/wireless.json

diff --git a/config/wireless.json b/config/wireless.json
new file mode 100644
index 00000000..f69d94f1
--- /dev/null
+++ b/config/wireless.json
@@ -0,0 +1,17 @@
+{"wireless_regdb": {
+    "debug": "off",
+    "2_4GHz_max11ch": {
+        "countries": [ "AG", "BS", "BB", "BZ", "CR", "CU", "DM", "DO", "SV", "GD", "GT",
+        "HT", "HN", "JM", "MX", "NI", "PA", "KN", "LC", "VC", "TT", "US", "CA", "UZ", "CO" ],
+        "channels": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ]
+    },
+    "2_4GHz_max14ch": { 
+        "countries": [ "JP" ],
+        "channels": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+    },
+    "5Ghz_max48ch": {
+        "countries": [ "US" ],
+        "channels": [ 36, 40, 44, 48 ]
+    }
+}} 
+

From e072e0a32a84dfa82cbcfa82fee48fb4d5e31159 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Tue, 31 Dec 2019 19:12:01 +0000
Subject: [PATCH 20/20] Replace hardcoded 5Ghz countries with constant

---
 templates/hostapd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/hostapd.php b/templates/hostapd.php
index 13d70fd3..2b5667aa 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -49,7 +49,7 @@
               <div class="form-group col-md-6">
                 <label for="cbxhwmode"><?php echo _("Wireless Mode") ;?></label>
                 <?php
-                $countries_5Ghz_max48ch = array('US');
+                $countries_5Ghz_max48ch = RASPI_5GHZ_ISO_ALPHA2;
                 $selectedHwMode = $arrConfig['hw_mode'];
                 if (isset($arrConfig['ieee80211n'])) {
                     if (strval($arrConfig['ieee80211n']) === '1') {