From 72678ef1cc5665b90a45f6073df36ec0590f160f Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Thu, 17 Oct 2013 15:28:57 +0200
Subject: [PATCH] Access point key validation function and handling validation
 function messages in general

---
 src/conf_defaults.lua | 19 ++++++++++++++-----
 src/util/settings.lua |  5 +++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index aad3c94..6049d21 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -44,11 +44,20 @@ M.network_ap_address = {
 }
 
 M.network_ap_key = {
-  default = '',
-  type = 'string',
-  description = 'Access Point security key',
-  min = 8,
-	max = 63
+	default = '',
+	type = 'string',
+	description = 'Access Point security key',
+	isValid = function(value)
+		if value == "" then 
+			return true;
+		elseif value:len() < 8 then
+			return false, "to short"
+		elseif value:len() > 63 then
+			return false, "to long"
+		else
+			return true
+		end
+	end
 }
 
 M.network_ap_netmask = {
diff --git a/src/util/settings.lua b/src/util/settings.lua
index 4ee1725..00d6e16 100644
--- a/src/util/settings.lua
+++ b/src/util/settings.lua
@@ -100,8 +100,9 @@ local function isValid(value, baseTable)
 	local varType, min, max, regex, isValid = baseTable.type, baseTable.min, baseTable.max, baseTable.regex, baseTable.isValid
 
 	if isValid then 
-		local ok = isValid(value)
-		return ok or nil,"invalid value"
+		local ok,msg = isValid(value)
+		if msg == nil then msg = "invalid value" end
+		return ok or nil,msg
 	end
 
 	if varType == 'bool' then