more robust handling of new JIDs

darcs-hash:20080624015616-34904-c1ff985257c8c57aacf68439488d628a8b4d2e38.gz

1 files changed, 8 insertions, 5 deletions

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) {