Merge pull request #17 from opentechinstitute/input-validation

Fixed validation error in bigboard config form. Tested by @jheretic, with additional module import fix works fine.

luasrc/controller/commotion-dash/bigboard-conf.lua

@@ -16,11 +16,11 @@ module("luci.controller.commotion-dash.bigboard-conf", package.seeall)
 require "luci.model.uci"
 require "luci.fs"
 require "luci.sys"
+local log = require "luci.commotion.debugger".log
 
 local dashConfig = "/etc/config/commotion-dash"
 
 function index()
-    local debug = require "luci.commotion.debugger"
 	require("luci.i18n").loadc("commotion")
 	local i18n = luci.i18n.translate
 	local uci = luci.model.uci.cursor()
@@ -41,7 +41,7 @@ function index()
 			entry({"admin", "status", "bigboard-conf_submit"}, call("ifprocess"))
 			entry({"admin", "status", "bigboard-conf"}, call("main"), translate("BigBoard Configuration"), 20).dependent=false
 		else
-			debug.log("Can't run Commotion-Dashboard. Install olsrd jsoninfo plugin.")
+			log("Can't run Commotion-Dashboard. Install olsrd jsoninfo plugin.")
 		end
 	end
 end
@@ -68,7 +68,6 @@ config dashboard
 end
 
 function ifprocess()
-   local debug = require "luci.commotion.debugger"
 	local values = luci.http.formvalue()
 	local encode = require "luci.commotion.encode"
 	local dt = require "luci.cbi.datatypes"
@@ -80,15 +79,15 @@ function ifprocess()
 
 	if values['bbOnOff'] ~= nil then
 		--[[ validate destination address ]]--
-		if dt.host(values['gatherer_ip']) == true then
+		if dt.host(values['gatherer_ip']) ~= true then
                 	ERR = 'ERROR: invalid IP or site address ' .. values['gatherer_ip']
-                	debug.log("Error validating inputs " .. values['gatherer_ip'])
+                	log("Error validating inputs " .. values['gatherer_ip'])
                 	main(ERR)
                 	do return end
         	end
 
-		debug.log("Commotion-Dashboard: Enabling network stats submission...")
-		debug.log("Commotion-Dashboard: Setting " .. values['gatherer_ip'] .. "as network stats collector")
+		log("Commotion-Dashboard: Enabling network stats submission...")
+		log("Commotion-Dashboard: Setting " .. values['gatherer_ip'] .. "as network stats collector")
 		if ERR == nil then
 			local uci = luci.model.uci.cursor()
 			uci:set("commotion-dash", values['dashName'], "enabled", values['bbOnOff'])
@@ -97,7 +96,7 @@ function ifprocess()
 			uci:save('commotion-dash')
 		end	
 	else
-		debug.log("Disabling Commotion-Dashboard")
+		log("Disabling Commotion-Dashboard")
 		local uci = luci.model.uci.cursor()
 		uci:set("commotion-dash", values["dashName"], 'enabled', 'false')
 		uci:set("commotion-dash", values["dashName"], 'gatherer', 'x.x.x.x')