diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-30 17:35:27 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-30 17:35:27 -0700 |
| commit | 0841fa712ec558d283f533690d2db50dfa1da8fc (patch) | |
| tree | 406ea631c8704dfcfd81dceaacf5a1785ff2103b /actions/imsettings.php | |
| parent | bfb2ac4910a52dde9bd3c39855f0488f56eb79bc (diff) | |
Ticket #1281: JID validation now more or less follows spec instead of calling e-mail validator
Basic splitting/validation code submitted via http://status.net/wiki/XMPP/JID_validation -- Copyright 2009 Patrick Georgi <patrick@georgi-clan.de> Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.
Added PEAR Net_IDNA package to extlib to handle IDN normalization (also used by Validate's email verifier if present).
* added test suite, supplemented my own test cases with JID validation and normalization test cases from libpurple
* follows XMPP rules for validation of name part
* fixes for normalization with non-ASCII names
* will do domain checks if $config['email']['check_domain'] is on, checking for an XMPP-server SRV record or any lookup. (We don't actually need to ping those direct though.)
* some more obscure stringprep validation rules aren't quite followed yet, but we err on the side of permissiveness.
* we still don't actually let you save your address with a resource on it, as we strip resources when looking up users who've sent us presence or message updates. I would recommend saving the outgoing resource as a separate field if/when we add that..?
Diffstat (limited to 'actions/imsettings.php')
| -rw-r--r-- | actions/imsettings.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php index af4915843..c3360fb12 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -292,7 +292,7 @@ class ImsettingsAction extends ConnectSettingsAction $this->showForm(_('Cannot normalize that Jabber ID')); return; } - if (!jabber_valid_base_jid($jabber)) { + if (!jabber_valid_base_jid($jabber, common_config('email', 'domain_check'))) { $this->showForm(_('Not a valid Jabber ID')); return; } else if ($user->jabber == $jabber) { |