From e330eb50d2c36505270375360303083decedee98 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 23 Jun 2008 21:56:16 -0400 Subject: more robust handling of new JIDs darcs-hash:20080624015616-34904-c1ff985257c8c57aacf68439488d628a8b4d2e38.gz --- lib/jabber.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/jabber.php') diff --git a/lib/jabber.php b/lib/jabber.php index e6529446b..97d02544d 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -27,11 +27,14 @@ function jabber_valid_base_jid($jid) { } function jabber_normalize_jid($jid) { - preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches); - $node = $matches[1]; - $server = $matches[2]; - $resource = $matches[3]; - return strtolower($node.'@'.$server); + if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) { + $node = $matches[1]; + $server = $matches[2]; + $resource = $matches[3]; + return strtolower($node.'@'.$server); + } else { + return NULL; + } } function jabber_connect($resource=NULL) { -- cgit v1.2.3-54-g00ecf