treewide: replace normal uses of luci.model.uci with simple-uci to reduce LuCI dependencies

We also make use of the boolean support of simple-uci to make scripts
clearer.

package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred

 #!/usr/bin/lua
 
-local uci = require 'luci.model.uci'
-local c = uci.cursor()
-
-
-c:delete('alfred', 'alfred')
-c:section('alfred', 'alfred', 'alfred',
-	  {
-		  interface = 'local-node',
-		  mode = 'slave',
-		  batmanif = 'bat0',
-		  start_vis = '1',
-		  run_facters = '0',
-	  }
-)
-
-c:save('alfred')
+local uci = require('simple-uci').cursor()
+
+uci:delete('alfred', 'alfred')
+uci:section('alfred', 'alfred', 'alfred', {
+	interface = 'local-node',
+	mode = 'slave',
+	batmanif = 'bat0',
+	start_vis = true,
+	run_facters = false,
+})
+
+uci:save('alfred')

package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater

 #!/usr/bin/lua
 
 local site = require 'gluon.site_config'
-local uci = require 'luci.model.uci'
-
-local c = uci.cursor()
+local uci = require('simple-uci').cursor()
 
 
 for name, config in pairs(site.autoupdater.branches) do
-	c:delete('autoupdater', name)
-	c:section('autoupdater', 'branch', name,
-		  {
-			  name = config.name,
-			  mirror = config.mirrors,
-			  good_signatures = config.good_signatures,
-			  pubkey = config.pubkeys,
-		  }
-	)
+	uci:delete('autoupdater', name)
+	uci:section('autoupdater', 'branch', name, {
+		name = config.name,
+		mirror = config.mirrors,
+		good_signatures = config.good_signatures,
+		pubkey = config.pubkeys,
+	})
 end
 
-if not c:get('autoupdater', 'settings') then
-	local enabled = 0
+if not uci:get('autoupdater', 'settings') then
+	local enabled = false
 	local branch = site.autoupdater.branch
 
 	local f = io.open('/lib/gluon/autoupdater/default_branch')
 	if f then
-		enabled = 1
+		enabled = true
 		branch = f:read('*line')
 		f:close()
 	end
 
-	c:section('autoupdater', 'autoupdater', 'settings',
-		  {
-			  enabled = enabled,
-			  branch = branch,
-		  }
-	)
+	uci:section('autoupdater', 'autoupdater', 'settings', {
+		enabled = enabled,
+		branch = branch,
+	})
 end
 
-c:set('autoupdater', 'settings', 'version_file', '/lib/gluon/release')
+uci:set('autoupdater', 'settings', 'version_file', '/lib/gluon/release')
 
-c:save('autoupdater')
+uci:save('autoupdater')
 
 
 local autoupdater_util = require 'autoupdater.util'

package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network

@@ -6,7 +6,7 @@ local util = require 'gluon.util'
 
 local ip = require 'luci.ip'
 local lutil = require 'luci.util'
-local uci = require('luci.model.uci').cursor()
+local uci = require('simple-uci').cursor()
 
 
 local ip4, netmask, ip6
@@ -58,15 +58,15 @@ uci:save('network')
 
 
 local dnsmasq = uci:get_first('dhcp', 'dnsmasq')
-uci:set('dhcp', dnsmasq, 'boguspriv', 0)
-uci:set('dhcp', dnsmasq, 'localise_queries', 0)
-uci:set('dhcp', dnsmasq, 'rebind_protection', 0)
+uci:set('dhcp', dnsmasq, 'boguspriv', false)
+uci:set('dhcp', dnsmasq, 'localise_queries', false)
+uci:set('dhcp', dnsmasq, 'rebind_protection', false)
 
 uci:delete('dhcp', 'client')
 uci:section('dhcp', 'dhcp', 'client',
 	{
 		interface = 'client',
-		ignore = 1,
+		ignore = true,
 	}
 )
 

package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless

@@ -3,16 +3,18 @@
 local site = require 'gluon.site_config'
 local util = require 'gluon.util'
 
-local uci = require('luci.model.uci').cursor()
+local uci = require('simple-uci').cursor()
 
 
 local function is_disabled(config, name)
-  local disabled = config and config.disabled
+  local disabled
   if uci:get('wireless', name) then
     disabled = uci:get_bool('wireless', name, 'disabled')
+  else
+    disabled = config and config.disabled
   end
 
-  return disabled and 1 or 0
+  return disabled
 end
 
 local function configure_client(config, radio, index, suffix)
@@ -38,7 +40,7 @@ local function configure_client(config, radio, index, suffix)
       ssid = config.ssid,
       macaddr = macaddr,
       ifname = suffix and 'client' .. suffix,
-      disabled = disabled,
+      disabled = disabled or false,
     }
   )
 end

package/gluon-config-mode-autoupdater/luasrc/lib/gluon/config-mode/wizard/0050-autoupdater-info.lua

 local cbi = require "luci.cbi"
 local i18n = require "luci.i18n"
-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()
 
 local M = {}
 

package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua

 local cbi = require "luci.cbi"
 local i18n = require "luci.i18n"
-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()
 local site = require 'gluon.site_config'
 
 local M = {}

package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua

@@ -4,7 +4,7 @@ local gluon_luci = require 'gluon.luci'
 local sysconfig = require 'gluon.sysconfig'
 local pretty_hostname = require 'pretty_hostname'
 
-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()
 
 local hostname = pretty_hostname.get(uci)
 local contact = uci:get_first('gluon-node-info', 'owner', 'contact')

package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua

 local wizard_dir = "/lib/gluon/config-mode/wizard/"
 local i18n = luci.i18n
-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()
 local fs = require "nixio.fs"
 local util = require "nixio.util"
 local f, s

package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua

 local cbi = require "luci.cbi"
 local i18n = require "luci.i18n"
-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()
 local site = require 'gluon.site_config'
 
 local M = {}

package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua

 local cbi = require "luci.cbi"
 local i18n = require "luci.i18n"
 local pretty_hostname = require "pretty_hostname"
-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()
 
 local M = {}
 

package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua

-local uci = luci.model.uci.cursor()
-local meshvpn_enabled = uci:get("fastd", "mesh_vpn", "enabled", "0")
+local uci = require("simple-uci").cursor()
+local meshvpn_enabled = uci:get_bool("fastd", "mesh_vpn", "enabled")
 
-if meshvpn_enabled ~= "1" then
+if not meshvpn_enabled then
   return nil
 else
   local i18n = require "luci.i18n"

package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua

 local cbi = require "luci.cbi"
 local i18n = require "luci.i18n"
-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()
 
 local M = {}
 

package/gluon-core/Makefile

@@ -15,7 +15,7 @@ define Package/gluon-core
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Base files of Gluon
-  DEPENDS:=+gluon-site +libgluonutil +lua-platform-info +lua-hash +luci-base +luci-lib-jsonc +odhcp6c +firewall +pretty-hostname
+  DEPENDS:=+gluon-site +libgluonutil +lua-platform-info +lua-simple-uci +lua-hash +luci-base +luci-lib-jsonc +odhcp6c +firewall +pretty-hostname
 endef
 
 define Package/gluon-core/description

package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces

@@ -4,7 +4,7 @@ local sysconfig = require 'gluon.sysconfig'
 local gluon_util = require 'gluon.util'
 local platform = require 'gluon.platform'
 
-local uci = require('luci.model.uci').cursor()
+local uci = require('simple-uci').cursor()
 
 
 if not (sysconfig.lan_ifname or sysconfig.wan_ifname) then

package/gluon-core/luasrc/lib/gluon/upgrade/030-system

@@ -7,7 +7,7 @@ local sysconfig = require 'gluon.sysconfig'
 if not sysconfig.gluon_version then
   local site = require 'gluon.site_config'
   local util = require 'gluon.util'
-  local uci = require('luci.model.uci').cursor()
+  local uci = require('simple-uci').cursor()
 
   local system = uci:get_first('system', 'system')
 

package/gluon-core/luasrc/lib/gluon/upgrade/110-network

 #!/usr/bin/lua
 
-local uci = require('luci.model.uci').cursor()
+local uci = require('simple-uci').cursor()
 local sysctl = require 'gluon.sysctl'
 local sysconfig = require 'gluon.sysconfig'
 
@@ -9,9 +9,9 @@ uci:section('network', 'interface', 'wan',
 	    {
 	      ifname = sysconfig.wan_ifname,
 	      type = 'bridge',
-	      multicast_querier = 0,
-	      peerdns = 0,
-	      auto = 1,
+	      multicast_querier = false,
+	      peerdns = false,
+	      auto = true,
 	    }
 )
 uci:delete('network', 'wan', 'igmp_snooping')
@@ -24,9 +24,9 @@ end
 uci:section('network', 'interface', 'wan6',
 	    {
 	      ifname = 'br-wan',
-	      peerdns = 0,
+	      peerdns = false,
 	      ip6table = 1,
-	      sourcefilter = 0,
+	      sourcefilter = false,
 	    }
 )
 

package/gluon-core/luasrc/lib/gluon/upgrade/120-ntp-servers

 #!/usr/bin/lua
 
 local site = require 'gluon.site_config'
-local uci = require 'luci.model.uci'
+local uci = require 'simple-uci'
 
 if not site.ntp_servers or #site.ntp_servers == 0 then
 	os.exit(0)

package/gluon-core/luasrc/lib/gluon/upgrade/140-firewall-rules

 #!/usr/bin/lua
 
 local site = require 'gluon.site_config'
-local uci = require 'luci.model.uci'
-
-local c = uci.cursor()
+local uci = require('simple-uci').cursor()
 
 
 local function reject_input_on_wan(zone)
 	if zone.name == 'wan' then
-		c:set('firewall', zone['.name'], 'input', 'REJECT')
-		c:set('firewall', zone['.name'], 'conntrack', '1')
+		uci:set('firewall', zone['.name'], 'input', 'REJECT')
+		uci:set('firewall', zone['.name'], 'conntrack', true)
 	end
 
 	return true
 end
-c:foreach('firewall', 'zone', reject_input_on_wan)
+uci:foreach('firewall', 'zone', reject_input_on_wan)
 
-c:section('firewall', 'rule', 'wan_ssh',
-	  {
-		  name = 'wan_ssh',
-		  src = 'wan',
-		  dest_port = '22',
-		  proto = 'tcp',
-		  target = 'ACCEPT',
-	  }
-)
+uci:section('firewall', 'rule', 'wan_ssh', {
+	name = 'wan_ssh',
+	src = 'wan',
+	dest_port = '22',
+	proto = 'tcp',
+	target = 'ACCEPT',
+})
 
-c:save('firewall')
+uci:save('firewall')

package/gluon-core/luasrc/lib/gluon/upgrade/150-poe-passthrough

@@ -3,11 +3,11 @@
 local sysconfig = require 'gluon.sysconfig'
 local site = require 'gluon.site_config'
 
-if (not sysconfig.gluon_version) and (site.poe_passthrough == true) then
-	local uci = require('luci.model.uci').cursor()
+if (not sysconfig.gluon_version) and site.poe_passthrough then
+	local uci = require('simple-uci').cursor()
 
   if uci:get('system', 'gpio_switch_poe_passthrough') then
-    uci:set('system', 'gpio_switch_poe_passthrough', 'value', 1)
+    uci:set('system', 'gpio_switch_poe_passthrough', 'value', true)
     uci:save('system')
   end
 end

package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless

@@ -4,7 +4,7 @@ local util = require 'gluon.util'
 local site = require 'gluon.site_config'
 local sysconfig = require 'gluon.sysconfig'
 
-local uci = require('luci.model.uci').cursor()
+local uci = require('simple-uci').cursor()
 
 -- Initial
 if not sysconfig.gluon_version then
@@ -22,6 +22,8 @@ end
 local function is_disabled(name)
   if uci:get('wireless', name) then
     return uci:get_bool('wireless', name, 'disabled')
+  else
+    return false
   end
 end
 
@@ -82,7 +84,7 @@ local function configure_ibss(config, radio, index, suffix, disabled)
       macaddr = macaddr,
       mcast_rate = config.mcast_rate,
       ifname = suffix and 'ibss' .. suffix,
-      disabled = disabled and 1 or 0,
+      disabled = disabled,
     }
   )
 end
@@ -116,11 +118,11 @@ local function configure_mesh(config, radio, index, suffix, disabled)
       network = name,
       mode = 'mesh',
       mesh_id = config.id,
-      mesh_fwding = 0,
+      mesh_fwding = false,
       macaddr = macaddr,
       mcast_rate = config.mcast_rate,
       ifname = suffix and 'mesh' .. suffix,
-      disabled = disabled and 1 or 0,
+      disabled = disabled,
       macfilter = macfilter,
       maclist = maclist,
     }