diff options
| author | Florian Zeitz <florob@babelmonkeys.de> | 2011-12-02 19:24:54 +0100 |
|---|---|---|
| committer | Florian Zeitz <florob@babelmonkeys.de> | 2011-12-02 19:24:54 +0100 |
| commit | 665853d99933d25ff67a65ef44e9604606ffb752 (patch) | |
| tree | e6d860261d6736f7de03c523e914a77198a3694c | |
| parent | c08e057bd2cf4822f73defb5ea581c7c77cd8e8a (diff) | |
| download | prosody-665853d99933d25ff67a65ef44e9604606ffb752.tar.gz prosody-665853d99933d25ff67a65ef44e9604606ffb752.zip | |
util.dataforms: Fix form verification
| -rw-r--r-- | util/dataforms.lua | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/util/dataforms.lua b/util/dataforms.lua index e4d24cf6..b69df819 100644 --- a/util/dataforms.lua +++ b/util/dataforms.lua @@ -120,12 +120,18 @@ function form_t.data(layout, stanza) 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_readers["jid-single"] = 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 |