# HG changeset patch
# User Florian Zeitz <florob@babelmonkeys.de>
# Date 1322850294 -3600
# Node ID e68bc6f35106c6b97c2f95c496c7c410078ee886
# Parent  b34eee3712c34d1cc197453bd3eab4570195d97b
util.dataforms: Fix form verification

diff -r b34eee3712c3 -r e68bc6f35106 util/dataforms.lua
--- a/util/dataforms.lua	Mon Dec 12 14:53:12 2011 +0500
+++ b/util/dataforms.lua	Fri Dec 02 19:24:54 2011 +0100
@@ -120,12 +120,18 @@
 			end
 		end
 
-		local reader = field_readers[field.type];
-		local verifier = field.verifier or field_verifiers[field.type];
-		if reader then
-			data[field.name] = reader(tag);
-			if verifier then
-				errors[field.name] = verifier(data[field.name], tag, field.required);
+		if not tag then
+			if field.required then
+				errors[field.name] = "Required value missing";
+			end
+		else
+			local reader = field_readers[field.type];
+			local verifier = field.verifier or field_verifiers[field.type];
+			if reader then
+				data[field.name] = reader(tag);
+				if verifier then
+					errors[field.name] = verifier(data[field.name], tag, field.required);
+				end
 			end
 		end
 	end
@@ -161,7 +167,7 @@
 
 field_verifiers["jid-single"] =
 	function (data, field_tag, required)
-		if #data == 0 and required then
+		if ((not data) or (#data == 0)) and required then
 			return "Required value missing";
 		end
 		if not jid_prep(data) then