From e330eb50d2c36505270375360303083decedee98 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlezvous.ca>
Date: Mon, 23 Jun 2008 21:56:16 -0400
Subject: more robust handling of new JIDs

darcs-hash:20080624015616-34904-c1ff985257c8c57aacf68439488d628a8b4d2e38.gz
---
 actions/imsettings.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'actions')

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 0496aaacd..d8fc8b87c 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -62,19 +62,26 @@ class ImsettingsAction extends SettingsAction {
 
 	function handle_post() {
 
-		$jabber = jabber_normalize_jid($this->trimmed('jabber'));
+		$jabber = $this->trimmed('jabber');
 		$jabbernotify = $this->boolean('jabbernotify');
 		$updatefrompresence = $this->boolean('updatefrompresence');
 
-		if (!jabber_valid_base_jid($jabber)) {
-			$this->show_form(_('Not a valid Jabber ID'));
-			return;
-		} else if ($this->jabber_exists($jabber)) {
-			$this->show_form(_('Not a valid Jabber ID'));
-			return;
-		}
-
 		# Some validation
+		
+		if ($jabber) {
+			$jabber = jabber_normalize_jid($jabber);
+			if (!$jabber) {
+			    $this->show_form(_('Cannot normalize that Jabber ID'));
+			    return;
+			}
+			if (!jabber_valid_base_jid($jabber)) {
+			    $this->show_form(_('Not a valid Jabber ID'));
+			    return;
+		    } else if ($this->jabber_exists($jabber)) {
+			    $this->show_form(_('Jabber ID already belongs to another user.'));
+			    return;
+			}
+		}
 
 		$user = common_current_user();
 
-- 
cgit v1.2.3-54-g00ecf