[Fusionforge-commits] FusionForge branch Branch_5_1 updated. 45504fb308617a9797c74223adfda29fc7c3670d

Thorsten Glaser mirabilos at fusionforge.org
Mon Jul 22 12:13:22 CEST 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_1 has been updated
       via  45504fb308617a9797c74223adfda29fc7c3670d (commit)
      from  f99a7bedd3782e7fb0fe140c24fe8305c1606db2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 45504fb308617a9797c74223adfda29fc7c3670d
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Tue Jul 16 17:22:56 2013 +0200

    remove illegal jabber functionality (disabled by default anyway)
    
    http://www.gnu.org/licenses/license-list.en.html#josl
    ⇒ not GPL compatible

diff --git a/src/common/frs/FRSRelease.class.php b/src/common/frs/FRSRelease.class.php
index e796b2a..7a6541e 100644
--- a/src/common/frs/FRSRelease.class.php
+++ b/src/common/frs/FRSRelease.class.php
@@ -273,7 +273,7 @@ class FRSRelease extends Error {
 	}
 
 	/**
-	 *  sendNotice - the logic to send an email/jabber notice for a release.
+	 *  sendNotice - the logic to send an email notice for a release.
 	 *
 	 *  @return	boolean	success.
 	 */
diff --git a/src/common/include/Jabber.class.php b/src/common/include/Jabber.class.php
deleted file mode 100644
index 3cee8a7..0000000
--- a/src/common/include/Jabber.class.php
+++ /dev/null
@@ -1,1533 +0,0 @@
-<?php
-
-/***************************************************************************
-
-	Class.Jabber.PHP v0.1.3.1
-	(c) 2002 Carlo "Gossip" Zottmann
-	http://phpjabber.g-blog.net *** gossip at jabber.g-blog.net
-
-	The FULL documentation and examples for this software can be found at
-	http://phpjabber.g-blog.net (not many doc comments in here, sorry)
-	
-	last modified: 2002-10-09 21:57:20
-
-	NOTE:
-	If you want to write addons or extensions, please follow the coding style
-	recommendations @ http://www.phpbuilder.net/columns/tim20010101.php3
-
- ***************************************************************************/
-
-/***************************************************************************
- *
- * The Notice below must appear in each file of the Source Code of any copy
- * you distribute of the Licensed Product or any Modifications thereto.
- * Contributors to any Modifications may add their own copyright notices to
- * identify their own contributions.
- * 
- * License
- * 
- * The contents of this file are subject to the Jabber Open Source License
- * Version 1.0 (the "License").  You may not copy or use this file, in either
- * source code or executable form, except in compliance with the License.  You
- * may obtain a copy of the License at http://www.jabber.com/license/ or at
- * http://www.opensource.org/.  
- * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License
- * for the specific language governing rights and limitations under the
- * License.
- * 
- * Copyrights
- * 
- * Portions created by or assigned to Jabber.com, Inc. are 
- * Copyright (c) 2000 Jabber.com, Inc.  All Rights Reserved.  Contact
- * information for Jabber.com, Inc. is available at http://www.jabber.com/.
- * 
- * Portions Copyright (c) 2002-present Carlo Zottmann,
- * http://phpjabber.g-blog.net
- *  
- * Other portions copyright their respective owners.
- * 
- * Acknowledgements
- * 
- * Special thanks to the Jabber Open Source Contributors for their
- * suggestions and support of Jabber.
- * 
- ***************************************************************************/
-
-/*
-	Jabber::Connect() 
-	Jabber::Disconnect() 
-	Jabber::SendAuth() 
-	Jabber::AccountRegistration($reg_email {string}, $reg_name {string})
- 
-	Jabber::Listen() 
-	Jabber::SendPacket($xml {string})
- 
-	Jabber::RosterUpdate() 
-	Jabber::RosterAddUser($jid {string}, $id {string}, $name {string}) 
-	Jabber::RosterRemoveUser($jid {string}, $id {string})
- 
-	Jabber::Subscribe($jid {string}) 
-	Jabber::Unsubscribe($jid {string})
- 
-	Jabber::CallHandler($message {array}) 
-	Jabber::CruiseControl([$seconds {number}])
- 
-	Jabber::SubscriptionApproveRequest($to {string}) 
-	Jabber::SubscriptionDenyRequest($to {string})
- 
-	Jabber::GetFirstFromQueue() 
-	Jabber::GetFromQueueById($packet_type {string}, $id {string})
- 
-	Jabber::SendMessage($to {string}, $id {number}, $type {string}, $content {array}[, $payload {array}])
- 	Jabber::SendIq($to {string}, $type {string}, $id {string}, $xmlns {string}[, $payload {string}])
-	Jabber::SendPresence($type {string}[, $to {string}[, $status {string}[, $show {string}[, $priority {number}]]]])
- 
-	Jabber::SendError($to {string}, $id {string}, $error_number {number}[, $error_message {string}]) 
-
-	Jabber::GetInfoFromMessageFrom($message {array}) 
-	Jabber::GetInfoFromMessageType($message {array}) 
-	Jabber::GetInfoFromMessageId($message {array}) 
-	Jabber::GetInfoFromMessageThread($message {array}) 
-	Jabber::GetInfoFromMessageSubject($message {array}) 
-	Jabber::GetInfoFromMessageBody($message {array}) 
-	Jabber::GetInfoFromMessageError($message {array})
- 
-	Jabber::GetInfoFromIqFrom($message {array}) 
-	Jabber::GetInfoFromIqType($message {array}) 
-	Jabber::GetInfoFromIqId($message {array}) 
-	Jabber::GetInfoFromIqKey($message {array})
- 
-	Jabber::GetInfoFromPresenceFrom($message {array}) 
-	Jabber::GetInfoFromPresenceType($message {array}) 
-	Jabber::GetInfoFromPresenceStatus($message {array}) 
-	Jabber::GetInfoFromPresenceShow($message {array}) 
-	Jabber::GetInfoFromPresencePriority($message {array})
-
-
-	MakeXML::AddPacketDetails($string {string}[, $value {string/number}])
-	MakeXML::BuildPacket([$array {array}])
-*/
-
-
-
-class Jabber
-{
-	var $server;
-	var $port;
-	var $username;
-	var $password;
-	var $resource;
-	var $jid;
-
-	var $connection;
-
-	var $stream_id;
-	var $roster;
-
-	var $enable_logging;
-	var $logfile;
-
-	var $iq_sleep_timer;
-
-	var $packet_queue;
-	var $subscription_queue;
-	
-	var $iq_version_name;
-	var $iq_version_os;
-	var $iq_version_version;
-
-	var $error_codes;
-	
-	var $CONNECTOR;
-
-
-
-	function Jabber()
-	{
-		$this->server				= forge_get_config('jabber_host');
-		$this->port					= forge_get_config('jabber_port');
-
-		$this->username				= forge_get_config('jabber_user');
-		$this->password				= forge_get_config('jabber_password');
-		$this->resource				= 'home';
-		
-		$this->enable_logging		= FALSE;
-		$this->logfile				= array();
-
-		$this->packet_queue			= array();
-		$this->subscription_queue	= array();
-
-		$this->iq_sleep_timer		= 1;
-
-		$this->iq_version_name		= "Class.Jabber.PHP by Carlo 'Gossip' Zottmann, gossip at jabber.g-blog.net";
-		$this->iq_version_version	= "0.1.3";
-		$this->iq_version_os		= getStringFromServer('SERVER_SOFTWARE');
-
-		$this->connection_class		= "CJP_StandardConnector";
-
-		$this->error_codes			= array(400 => "Bad Request",
-											401 => "Unauthorized",
-											402 => "Payment Required",
-											403 => "Forbidden",
-											404 => "Not Found",
-											405 => "Not Allowed",
-											406 => "Not Acceptable",
-											407 => "Registration Required",
-											408 => "Request Timeout",
-											409 => "Conflict",
-											500 => "Internal Server Error",
-											501 => "Not Implemented",
-											502 => "Remove Server Error",
-											503 => "Service Unavailable",
-											504 => "Remove Server Timeout",
-											510 => "Disconnected");
-	}
-
-
-
-	function Connect()
-	{
-		$this->CONNECTOR = new $this->connection_class;
-		$this->connection = $this->CONNECTOR->OpenSocket($this->server, $this->port);
-
-		if ($this->connection) {
-
-	        socket_set_blocking($this->connection, 0);
-			socket_set_timeout($this->connection, 31536000);
-
-			$this->SendPacket("<?xml version='1.0' encoding='UTF-8' ?>\n");
-			$this->SendPacket("<stream:stream to='" . $this->server . "' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>\n");
-
-			sleep(2);
-
-			if ($this->_check_connected()) {
-
-				return TRUE;
-
-			} else {
-
-				if ($this->enable_logging) {
-					$this->logfile[] = "<strong>Error:</strong> Connect() #1";
-				}
-
-				return FALSE;
-			}
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> Connect() #2";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function Disconnect()
-	{
-		$this->SendPacket("</stream:stream>");
-		$this->CONNECTOR->CloseSocket($this->connection);
-		
-		if ($this->enable_logging) {
-			echo "<h2>logging enabled, logged events below:</h2>\n";
-			echo (count($this->logfile) > 0) ? implode("<br />\n", $this->logfile) : "No logged events.";
-		}
-	}
-
-
-
-	function SendAuth()
-	{
-		// Currently, we only support plaintext authentication. This ain't
-		// perfect, but it works. I'll add <digest/> support later on...
-
-		if ($this->resource) {
-			$this->jid = $this->username . "@" . $this->server . "/" . $this->resource;
-		} else {
-			$this->jid = $this->username . "@" . $this->server;
-		}
-
-		$auth_id = "auth_" . time();
-
-		$payload = "<username>" . $this->username . "</username>
-					<password>" . $this->password . "</password>
-					<resource>" . $this->resource . "</resource>";
-
-		$packet = $this->SendIq(NULL, "set", $auth_id, "jabber:iq:auth", $payload);
-
-		if ($this->GetInfoFromIqType($packet) == "result" && $this->GetInfoFromIqId($packet) == $auth_id) {
-
-			return TRUE;
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> SendAuth() #1";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function AccountRegistration($reg_email = NULL, $reg_name = NULL)
-	{
-		$packet = $this->SendIq($this->server, "get", "reg_01", "jabber:iq:register");
-		
-		if ($packet) {
-	
-			$key = $this->GetInfoFromIqKey($packet);	// just in case a key was passed back from the server
-			unset($packet);
-		
-			$payload = "<username>" . $this->username . "</username>
-						<password>" . $this->password . "</password>
-						<email>$reg_email</email>
-						<name>$reg_name</name>\n";
-			$payload .= ($key) ? "<key>$key</key>\n" : "";
-		
-			$packet = $this->SendIq($this->server, "set", "reg_01", "jabber:iq:register", $payload);
-		
-			if ($this->GetInfoFromIqType($packet) == "result") {
-			
-				if (isset($packet["iq"]["#"]["query"][0]["#"]["registered"][0]["#"])) {
-					$return_code = 1;
-				} else {
-					$return_code = 2;
-				}
-		
-				if ($this->resource) {
-					$this->jid = $this->username . "@" . $this->server . "/" . $this->resource;
-				} else {
-					$this->jid = $this->username . "@" . $this->server;
-				}
-
-			} elseif ($this->GetInfoFromIqType($packet) == "error") {
-		
-				if (isset($packet["iq"]["#"]["error"][0]["#"])) {
-					$return_code = "Error " . $packet["iq"]["#"]["error"][0]["@"]["code"] . ": " . $packet["iq"]["#"]["error"][0]["#"];
-				}
-			}
-	
-			return $return_code;
-	
-		} else {
-		
-			return 3;
-	
-		}
-	}
-
-
-
-	function SendPacket($xml)
-	{
-		$xml = trim($xml);
-
-		if ($this->CONNECTOR->WriteToSocket($this->connection, $xml)) {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>SEND:</strong> " . nl2br(htmlspecialchars($xml));
-			}
-
-			return TRUE;
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> SendPacket() #1";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function Listen()
-	{
-		unset($incoming);
-
-		while ($line = $this->CONNECTOR->ReadFromSocket($this->connection, 4096)) {
-			$incoming .= $line;
-		}
-		
-		$incoming = trim($incoming);
-
-		if ($this->enable_logging && $incoming != "") {
-			$this->logfile[] = "<strong>RECV:</strong> " . nl2br(htmlspecialchars($incoming));
-		}
-
-		if ($incoming != "") {
-			$temp = $this->_split_incoming($incoming);
-
-			for ($a = 0; $a < count($temp); $a++) {
-				$this->packet_queue[] = $this->xmlize($temp[$a]);
-			}
-		}
-
-		return TRUE;
-	}
-
-
-
-	function StripJID($jid = NULL)
-	{
-		preg_match("/(.*)\/(.*)/Ui", $jid, $temp);
-		return ($temp[1] != "") ? $temp[1] : $jid;
-	}
-
-
-
-	function SendMessage($to, $type = "normal", $id = NULL, $content = NULL, $payload = NULL)
-	{
-		if ($to && is_array($content)) {
-		
-			if (!$id) { $id = $type . "_" . time(); }
-
-			$content = $this->_array_htmlspecialchars($content);
-
-			$xml = "<message to='$to' type='$type' id='$id'>\n";
-
-			if ($content["thread"]) {
-				$xml .= "<thread>" . $content["thread"] . "</thread>\n";
-			}
-			if ($content['subject']) { 
-				$xml .= "<subject>" . $content['subject'] . "</subject>\n"; 
-			}
-			
-			$xml .= "<body>" . $content["body"] . "</body>\n";
-			$xml .= $payload;
-			$xml .= "</message>\n";
-
-
-			if ($this->SendPacket($xml)) {
-
-				return TRUE;
-
-			} else {
-
-				if ($this->enable_logging) {
-					$this->logfile[] = "<strong>Error:</strong> SendMessage() #1";
-				}
-
-				return FALSE;
-			}
-
-		} else {
-		
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> SendMessage() #2";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function SendPresence($type = NULL, $to = NULL, $status = NULL, $show = NULL, $priority = NULL)
-	{
-		$xml = "<presence";
-		$xml .= ($to) ? " to='$to'" : "";
-		$xml .= ($type) ? " type='$type'" : "";
-		$xml .= ($status || $show || $priority) ? ">\n" : " />\n";
-
-		$xml .= ($status) ? "	<status>$status</status>\n" : "";
-		$xml .= ($show) ? "	<show>$show</show>\n" : "";
-		$xml .= ($priority) ? "	<priority>$priority</priority>\n" : "";
-
-		$xml .= ($status || $show || $priority) ? "</presence>\n" : "";
-
-		if ($this->SendPacket($xml)) {
-
-			return TRUE;
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> SendPresence() #1";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function SendError($to, $id = NULL, $error_number, $error_message = NULL)
-	{
-		$xml = "<iq type='error' to='$to'";
-		$xml .= ($id) ? " id='$id'" : "";
-		$xml .= ">\n";
-		$xml .= "	<error code='$error_number'>";
-		$xml .= ($error_message) ? $error_message : $this->error_codes[$error_number];
-		$xml .= "</error>\n";
-		$xml .= "</iq>";
-
-		$this->SendPacket($xml);
-	}
-
-
-
-	function RosterUpdate()
-	{
-		$roster_request_id = "roster_" . time();
-
-		$incoming_array = $this->SendIq(NULL, "get", $roster_request_id, "jabber:iq:roster");
-
-		if (is_array($incoming_array)) {
-			
-			if ($incoming_array["iq"]["@"]["type"] == "result"
-				&& $incoming_array["iq"]["@"]["id"] == $roster_request_id
-				&& $incoming_array["iq"]["#"]["query"]["0"]["@"]["xmlns"] == "jabber:iq:roster")
-			{
-
-				$number_of_contacts = count($incoming_array["iq"]["#"]["query"][0]["#"]["item"]);
-				$this->roster = array();
-
-				for ($a = 0; $a < $number_of_contacts; $a++) {
-
-					$this->roster[$a] = array(	"jid"			=> $incoming_array["iq"]["#"]["query"][0]["#"]["item"][$a]["@"]["jid"],
-												"name"			=> $incoming_array["iq"]["#"]["query"][0]["#"]["item"][$a]["@"]["name"],
-												"subscription"	=> $incoming_array["iq"]["#"]["query"][0]["#"]["item"][$a]["@"]["subscription"],
-												"group"			=> $incoming_array["iq"]["#"]["query"][0]["#"]["item"][$a]["#"]["group"][0]["#"]
-											);
-				}
-
-				return TRUE;
-
-			} else {
-
-				if ($this->enable_logging) {
-					$this->logfile[] = "<strong>Error:</strong> RosterUpdate() #1";
-				}
-
-				return FALSE;
-			}
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> RosterUpdate() #2";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function RosterAddUser($jid = NULL, $id = NULL, $name = NULL)
-	{
-		$id = ($id) ? $id : "adduser_" . time();
-
-		if ($jid) {
-	
-			$payload = "		<item jid='$jid'";
-			$payload .= ($name) ? " name='" . htmlspecialchars($name) . "'" : "";
-			$payload .= "/>\n";
-
-			$packet = $this->SendIq(NULL, "set", $id, "jabber:iq:roster", $payload);
-
-			if ($this->GetInfoFromIqType($packet) == "result") {
-
-				$this->RosterUpdate();
-				return TRUE;
-			
-			} else {
-
-				if ($this->enable_logging) {
-					$this->logfile[] = "<strong>Error:</strong> RosterAddUser() #2";
-				}
-
-				return FALSE;
-			}
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> RosterAddUser() #1";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function RosterRemoveUser($jid = NULL, $id = NULL)
-	{
-		if ($jid && $id) {
-
-			$packet = $this->SendIq(NULL, "set", $id, "jabber:iq:roster", "<item jid='$jid' subscription='remove'/>");
-
-			if ($this->GetInfoFromIqType($packet) == "result") {
-
-				$this->RosterUpdate();
-				return TRUE;
-			
-			} else {
-
-				if ($this->enable_logging) {
-					$this->logfile[] = "<strong>Error:</strong> RosterRemoveUser() #2";
-				}
-
-				return FALSE;
-			}
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> RosterRemoveUser() #1";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function GetFirstFromQueue()
-	{
-		reset($this->packet_queue);
-		list($key, $value) = each($this->packet_queue);
-		unset($this->packet_queue[$key]);
-
-		return (is_array($value)) ? $value : FALSE;
-	}
-
-
-
-	function GetFromQueueById($packet_type, $id)
-	{
-		$found_message = FALSE;
-
-		foreach ($this->packet_queue as $key => $value) {
-
-			if ($value["$packet_type"]["@"]["id"] == $id) {
-
-				$found_message = $value;
-				unset($this->packet_queue[$key]);
-
-				break;
-			}
-		}
-
-		return (is_array($found_message)) ? $found_message : FALSE;
-	}
-
-
-
-	function CallHandler($packet = NULL)
-	{
-		$packet_type	= $this->_get_packet_type($packet);
-
-		if ($packet_type == "message") {
-		
-			$type		= $packet["message"]["@"]["type"];
-			$type		= ($type != "") ? $type : "normal";
-			$funcmeth	= "Handler_message_$type";
-
-		} elseif ($packet_type == "iq") {
-		
-			$this->TraverseXMLize($packet);
-
-			$namespace	= $packet["iq"]["#"]["query"][0]["@"]["xmlns"];
-			$namespace	= str_replace(":", "_", $namespace);
-			$funcmeth	= "Handler_iq_$namespace";
-
-		} elseif ($packet_type == "presence") {
-
-			$type		= $packet["presence"]["@"]["type"];
-			$type		= ($type != "") ? $type : "available";
-			$funcmeth	= "Handler_presence_$type";
-
-		}
-
-
-		if ($funcmeth != "") {
-
-			if (function_exists($funcmeth)) {
-
-				call_user_func($funcmeth, $packet);
-
-			} elseif(method_exists($this, $funcmeth)) {
-
-				call_user_func(array(&$this, $funcmeth), $packet);
-
-			} elseif ($this->enable_logging) {
-
-				$this->Handler_NOT_IMPLEMENTED($packet);
-				$this->logfile[] = "<strong>Error:</strong> CallHandler() #1 - neither method nor function $funcmeth() available";
-
-			}
-		}
-	}
-
-
-
-	function CruiseControl($seconds = -1)
-	{
-		$count = 0;
-
-		while ($count != $seconds) {
-			$this->Listen();
-
-			do {
-				$packet = $this->GetFirstFromQueue();
-				$this->CallHandler($packet);
-			} while (count($this->packet_queue) > 1);
-
-			$count++;
-			sleep(1);
-		}
-		
-		return TRUE;
-	}
-
-
-
-	function SubscriptionAcceptRequest($to = NULL)
-	{
-		return ($to) ? $this->SendPresence("subscribed", $to) : FALSE;
-	}
-
-
-
-	function SubscriptionDenyRequest($to = NULL)
-	{
-		return ($to) ? /* still needs to be done */ TRUE : FALSE;
-	}
-
-
-
-	function Subscribe($to = NULL)
-	{
-		return ($to) ? $this->SendPresence("subscribe", $to) : FALSE;
-	}
-
-
-
-	function Unsubscribe($to = NULL)
-	{
-		return ($to) ? $this->SendPresence("unsubscribe", $to) : FALSE;
-	}
-
-
-
-	function SendIq($to = NULL, $type = "get", $id = NULL, $xmlns = NULL, $payload = NULL)
-	{
-		if (!preg_match("/^(get|set|result|error)$/", $type)) {
-			unset($type);
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> SendIq() #2 - type must be 'get', 'set', 'result' or 'error'";
-			}
-			
-			return FALSE;
-
-		} elseif ($id && $xmlns) {
-
-			$xml = "<iq type='$type' id='$id'";
-			$xml .= ($to) ? " to='$to'" : "";
-			$xml .= ">
-						<query xmlns='$xmlns'>
-							$payload
-						</query>
-					</iq>";
-
-			$this->SendPacket($xml);
-			sleep($this->iq_sleep_timer);
-			$this->Listen();
-			
-			return (preg_match("/^(get|set)$/", $type)) ? $this->GetFromQueueById("iq", $id) : TRUE;
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> SendIq() #1 - to, id and xmlns are mandatory";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	// ======================================================================
-	// internal methods
-	// ======================================================================
-
-
-
-	function _listen_incoming()
-	{
-		unset($incoming);
-
-		while ($line = $this->CONNECTOR->ReadFromSocket($this->connection, 4096)) {
-			$incoming .= $line;
-		}
-		
-		$incoming = trim($incoming);
-
-		if ($this->enable_logging && $incoming != "") {
-			$this->logfile[] = "<strong>RECV:</strong> " . nl2br(htmlspecialchars($incoming));
-		}
-
-		return $this->xmlize($incoming);
-	}
-
-
-
-	function _check_connected()
-	{
-		$incoming_array = $this->_listen_incoming();
-		
-		if (is_array($incoming_array)) {
-			
-			if ($incoming_array["stream:stream"]["@"]["from"] == $this->server
-				&& $incoming_array["stream:stream"]["@"]["xmlns"] == "jabber:client"
-				&& $incoming_array["stream:stream"]["@"]["xmlns:stream"] == "http://etherx.jabber.org/streams")
-			{
-
-				$this->stream_id = $incoming_array["stream:stream"]["@"]["id"];
-
-				return TRUE;
-
-			} else {
-
-				if ($this->enable_logging) {
-					$this->logfile[] = "<strong>Error:</strong> _check_connected() #1";
-				}
-
-				return FALSE;
-			}
-
-		} else {
-
-			if ($this->enable_logging) {
-				$this->logfile[] = "<strong>Error:</strong> _check_connected() #2";
-			}
-
-			return FALSE;
-		}
-	}
-
-
-
-	function _get_packet_type($packet = NULL)
-	{
-		if (is_array($packet)) {
-			reset($packet);
-			$packet_type = key($packet);
-		}
-
-		return ($packet_type) ? $packet_type : FALSE;
-	}
-
-
-
-	function _split_incoming($incoming)
-	{
-		$temp = preg_split("/<(message|iq|presence|stream)/", $incoming, -1, PREG_SPLIT_DELIM_CAPTURE);
-		$array = array();
-
-		for ($a = 1; $a < count($temp); $a = $a + 2) {
-			$array[] = "<" . $temp[$a] . $temp[($a + 1)];
-		}
-
-		return $array;
-	}
-
-
-
-	// _array_htmlspecialchars()
-	// applies htmlspecialchars() to all values in an array
-
-	function _array_htmlspecialchars($array)
-	{
-		if (is_array($array)) {
-			foreach ($array as $k => $v) {
-				if (is_array($v)) {
-					$v = $this->_array_htmlspecialchars($v);
-				} else {
-					$v = htmlspecialchars($v);
-				}
-			}
-		}
-		
-		return $array;
-	}
-
-
-
-	// ======================================================================
-	// <message/> parsers
-	// ======================================================================
-
-
-
-	function GetInfoFromMessageFrom($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["message"]["@"]["from"] : FALSE;
-	}
-
-
-
-	function GetInfoFromMessageType($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["message"]["@"]["type"] : FALSE;
-	}
-
-
-
-	function GetInfoFromMessageId($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["message"]["@"]["id"] : FALSE;
-	}
-
-
-
-	function GetInfoFromMessageThread($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["message"]["#"]["thread"][0]["#"] : FALSE;
-	}
-
-
-
-	function GetInfoFromMessageSubject($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["message"]["#"]["subject"][0]["#"] : FALSE;
-	}
-
-
-
-	function GetInfoFromMessageBody($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["message"]["#"]["body"][0]["#"] : FALSE;
-	}
-
-
-
-	function GetInfoFromMessageError($packet = NULL)
-	{
-		$error = preg_replace("/^\/$/", "", ($packet["message"]["#"]["error"][0]["@"]["code"] . "/" . $packet["message"]["#"]["error"][0]["#"]));
-		return (is_array($packet)) ? $error : FALSE;
-	}
-
-
-
-	// ======================================================================
-	// <iq/> parsers
-	// ======================================================================
-
-
-
-	function GetInfoFromIqFrom($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["iq"]["@"]["from"] : FALSE;
-	}
-
-
-
-	function GetInfoFromIqType($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["iq"]["@"]["type"] : FALSE;
-	}
-
-
-
-	function GetInfoFromIqId($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["iq"]["@"]["id"] : FALSE;
-	}
-
-
-
-	function GetInfoFromIqKey($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["iq"]["#"]["query"][0]["#"]["key"][0]["#"] : FALSE;
-	}
-
-
-
-	// ======================================================================
-	// <presence/> parsers
-	// ======================================================================
-
-
-
-	function GetInfoFromPresenceFrom($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["presence"]["@"]["from"] : FALSE;
-	}
-
-
-
-	function GetInfoFromPresenceType($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["presence"]["@"]["type"] : FALSE;
-	}
-
-
-
-	function GetInfoFromPresenceStatus($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["presence"]["#"]["status"][0]["#"] : FALSE;
-	}
-
-
-
-	function GetInfoFromPresenceShow($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["presence"]["#"]["show"][0]["#"] : FALSE;
-	}
-
-
-
-	function GetInfoFromPresencePriority($packet = NULL)
-	{
-		return (is_array($packet)) ? $packet["presence"]["#"]["priority"][0]["#"] : FALSE;
-	}
-
-
-
-	// ======================================================================
-	// <message/> handlers
-	// ======================================================================
-
-
-
-	function Handler_message_normal($packet)
-	{
-		$from = $packet["message"]["@"]["from"];
-		$this->logfile[] = "<strong>message</strong> (type normal) from $from";
-	}
-
-
-
-	function Handler_message_chat($packet)
-	{
-		$from = $packet["message"]["@"]["from"];
-		$this->logfile[] = "<strong>message</strong> (type chat) from $from";
-	}
-
-
-
-	function Handler_message_groupchat($packet)
-	{
-		$from = $packet["message"]["@"]["from"];
-		$this->logfile[] = "<strong>message</strong> (type groupchat) from $from";
-	}
-
-
-
-	function Handler_message_headline($packet)
-	{
-		$from = $packet["message"]["@"]["from"];
-		$this->logfile[] = "<strong>message</strong> (type headline) from $from";
-	}
-
-
-
-	function Handler_message_error($packet)
-	{
-		$from = $packet["message"]["@"]["from"];
-		$this->logfile[] = "<strong>message</strong> (type error) from $from";
-	}
-
-
-
-	// ======================================================================
-	// <iq/> handlers
-	// ======================================================================
-
-
-
-	// application version updates
-    function Handler_iq_jabber_iq_autoupdate($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:autoupdate</strong> from $from";
-	}
-
-
-
-	// interactive server component properties
-    function Handler_iq_jabber_iq_agent($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:agent</strong> from $from";
-	}
-
-
-
-	// method to query interactive server components
-    function Handler_iq_jabber_iq_agents($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:agents</strong> from $from";
-	}
-
-
-
-	// simple client authentication
-	function Handler_iq_jabber_iq_auth($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:auth</strong> from $from";
-	}
-
-
-
-	// out of band data
-	function Handler_iq_jabber_iq_oob($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:oob</strong> from $from";
-	}
-
-
-
-	// method to store private data on the server
-	function Handler_iq_jabber_iq_private($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:private</strong> from $from";
-	}
-
-
-
-	// method for interactive registration
-	function Handler_iq_jabber_iq_register($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:register</strong> from $from";
-	}
-
-
-
-	// client roster management
-	function Handler_iq_jabber_iq_roster($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:roster</strong> from $from";
-	}
-
-
-
-	// method for searching a user database
-	function Handler_iq_jabber_iq_search($packet)
-	{
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>jabber:iq:search</strong> from $from";
-	}
-
-
-
-	// method for requesting the current time
-	function Handler_iq_jabber_iq_time($packet)
-	{
-		$type	= $this->GetInfoFromIqType($packet);
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		$id		= ($id != "") ? $id : "time_" . time();
-
-		if ($type == "get") {
-
-			$payload = "<utc>" . gmdate("Ydm\TH:i:s") . "</utc>
-						<tz>" . date("T") . "</tz>
-						<display>" . date("Y/d/m h:i:s A") . "</display>";
-	
-			$this->SendIq($from, "result", $id, "jabber:iq:time", $payload);
-		}
-
-		$this->logfile[] = "<strong>jabber:iq:time</strong> (type $type) from $from";
-	}
-
-
-
-	// method for requesting version
-	function Handler_iq_jabber_iq_version($packet)
-	{
-		$type	= $this->GetInfoFromIqType($packet);
-		$from	= $this->GetInfoFromIqFrom($packet);
-		$id		= $this->GetInfoFromIqId($packet);
-		$id		= ($id != "") ? $id : "version_" . time();
-
-		if ($type == "get") {
-
-			$payload = "<name>" . $this->iq_version_name . "</name>
-						<os>" . $this->iq_version_os . "</os>
-						<version>" . $this->iq_version_version . "</version>";
-
-			$this->SendIq($from, "result", $id, "jabber:iq:version", $payload);
-		}
-
-		$this->logfile[] = "<strong>jabber:iq:version</strong> (type $type) from $from";
-	}
-
-
-
-	// ======================================================================
-	// <presence/> handlers
-	// ======================================================================
-
-
-
-    function Handler_presence_available($packet)
-	{
-		$from = $this->GetInfoFromPresenceFrom($packet);
-
-		$show_status = $this->GetInfoFromPresenceStatus($packet) . " / " . $this->GetInfoFromPresenceShow($packet);
-		$show_status = ($show_status != " / ") ? " ($addendum)" : "";
-
-		$this->logfile[] = "<strong>Presence:</strong> (type: available) - $from is available $show_status";
-	}
-
-
-
-	function Handler_presence_unavailable($packet)
-	{
-		$from = $this->GetInfoFromPresenceFrom($packet);
-
-		$show_status = $this->GetInfoFromPresenceStatus($packet) . " / " . $this->GetInfoFromPresenceShow($packet);
-		$show_status = ($show_status != " / ") ? " ($addendum)" : "";
-
-		$this->logfile[] = "<strong>Presence:</strong> (type: unavailable) - $from is unavailable $show_status";
-	}
-
-
-
-    function Handler_presence_subscribe($packet)
-	{
-		$from = $this->GetInfoFromPresenceFrom($packet);
-		$this->subscription_queue[] = $from;
-		$this->RosterUpdate();
-
-		$this->logfile[] = "<strong>Presence:</strong> (type: subscribe) - Subscription request from $from, was added to \$this->subscription_queue, roster updated";
-	}
-
-
-
-    function Handler_presence_subscribed($packet)
-	{
-		$from = $this->GetInfoFromPresenceFrom($packet);
-		$this->RosterUpdate();
-
-		$this->logfile[] = "<strong>Presence:</strong> (type: subscribed) - Subscription allowed by $from, roster updated";
-	}
-
-
-
-	function Handler_presence_unsubscribe($packet)
-	{
-		$from = $this->GetInfoFromPresenceFrom($packet);
-		$this->SendPresence("unsubscribed", $from);
-		$this->RosterUpdate();
-
-		$this->logfile[] = "<strong>Presence:</strong> (type: unsubscribe) - Request to unsubscribe from $from, was automatically approved, roster updated";
-	}
-
-
-
-	function Handler_presence_unsubscribed($packet)
-	{
-		$from = $this->GetInfoFromPresenceFrom($packet);
-		$this->RosterUpdate();
-
-		$this->logfile[] = "<strong>Presence:</strong> (type: unsubscribed) - Unsubscribed from $from's presence";
-	}
-
-
-
-	// ======================================================================
-	// Generic handlers
-	// ======================================================================
-
-
-
-	// Generic handler for unsupported requests
-	function Handler_NOT_IMPLEMENTED($packet)
-	{
-		$packet_type	= $this->_get_packet_type($packet);
-		$from			= call_user_func(array(&$this, "GetInfoFrom" . ucfirst($packet_type) . "From"), $packet);
-		$id				= call_user_func(array(&$this, "GetInfoFrom" . ucfirst($packet_type) . "Id"), $packet);
-
-		$this->SendError($from, $id, 501);
-		$this->logfile[] = "<strong>Unrecognized <$packet_type/></strong> from $from";
-	}
-
-
-
-	// ======================================================================
-	// Third party code
-	// m at d pr0ps to the coders ;)
-	// ======================================================================
-
-
-
-	// xmlize()
-	// (c) Hans Anderson / http://www.hansanderson.com/php/xml/
-	
-	function xmlize($data) {
-		$vals = $index = $array = array();
-		$parser = xml_parser_create();
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-		xml_parse_into_struct($parser, $data, $vals, $index);
-		xml_parser_free($parser);
-	
-		$i = 0; 
-	
-		$tagname = $vals[$i]['tag'];
-		$array[$tagname]["@"] = $vals[$i]["attributes"];
-		$array[$tagname]["#"] = $this->_xml_depth($vals, $i);
-	
-		return $array;
-	}
-	
-	
-	
-	// _xml_depth()
-	// (c) Hans Anderson / http://www.hansanderson.com/php/xml/
-	
-	function _xml_depth($vals, &$i) { 
-		$children = array(); 
-
-		if ($vals[$i]['value']) {
-			array_push($children, trim($vals[$i]['value']));
-		}
-	
-		while (++$i < count($vals)) { 
-	
-			switch ($vals[$i]['type']) { 
-	
-				case 'cdata': 
-					array_push($children, trim($vals[$i]['value'])); 
-	 				break; 
-	
-				case 'complete': 
-					$tagname = $vals[$i]['tag'];
-					$size = sizeof($children["$tagname"]);
-					$children[$tagname][$size]["#"] = trim($vals[$i]['value']);
-					if ($vals[$i]["attributes"]) {
-						$children[$tagname][$size]["@"] = $vals[$i]["attributes"];
-					}
-					break; 
-	
-				case 'open': 
-					$tagname = $vals[$i]['tag'];
-					$size = sizeof($children["$tagname"]);
-					if ($vals[$i]["attributes"]) {
-						$children["$tagname"][$size]["@"] = $vals[$i]["attributes"];
-						$children["$tagname"][$size]["#"] = $this->_xml_depth($vals, $i);
-					} else {
-						$children["$tagname"][$size]["#"] = $this->_xml_depth($vals, $i);
-					}
-					break; 
-	
-				case 'close':
-					return $children; 
-					break;
-			} 
-		} 
-	
-		return $children;
-	
-	}
-	
-	
-	
-	// TraverseXMLize()
-	// (c) acebone at f2s.com, a HUGE help!
-	
-	function TraverseXMLize($array, $arrName = "array", $level = 0) {
-		if ($level == 0) {
-			echo "<pre>";
-		}
-	
-		while (list($key, $val) = @each($array)) {
-			if (is_array($val)) {
-				$this->TraverseXMLize($val, $arrName . "[" . $key . "]", $level + 1);
-			} else {
-				echo '$' . $arrName . '[' . $key . '] = "' . $val . "\"\n";
-			}
-		}
-	
-		if ($level == 0) {
-			echo "</pre>";
-		}
-	}
-
-}	
-
-
-
-class MakeXML extends Jabber
-{
-	var $nodes;
-
-
-	function MakeXML()
-	{
-		$nodes = array();
-	}
-
-
-
-	function AddPacketDetails($string, $value = NULL)
-	{
-		if (preg_match("/\(([0-9]*)\)$/i", $string)) {
-			$string .= "/[\"#\"]";
-		}
-
-		$temp = @explode("/", $string);
-		
-		for ($a = 0; $a < count($temp); $a++) {
-			$temp[$a] = preg_replace("/^[@]{1}([a-z0-9_]*)$/i", "[\"@\"][\"\\1\"]", $temp[$a]);
-			$temp[$a] = preg_replace("/^([a-z0-9_]*)\(([0-9]*)\)$/i", "[\"\\1\"][\\2]", $temp[$a]);
-			$temp[$a] = preg_replace("/^([a-z0-9_]*)$/i", "[\"\\1\"]", $temp[$a]);
-		}
-
-		$node = implode("", $temp);
-		
-		// Yeahyeahyeah, I know it's ugly... get over it. ;)
-		echo "\$this->nodes$node = \"" . htmlspecialchars($value) . "\";<br/>";
-		eval("\$this->nodes$node = \"" . htmlspecialchars($value) . "\";");
-	}
-
-
-
-	function BuildPacket($array = NULL)
-	{
-
-		if (!$array) {
-			$array = $this->nodes;
-		}
-
-		if (is_array($array)) {
-
-			array_multisort($array, SORT_ASC, SORT_STRING);
-
-			foreach ($array as $key => $value) {
-	
-				if (is_array($value) && $key == "@") {
-
-					foreach ($value as $subkey => $subvalue) {
-						$subvalue = htmlspecialchars($subvalue);
-						$text .= " $subkey='$subvalue'";
-					}
-
-					$text .= ">\n";
-
-				} elseif ($key == "#") {
-
-					$text .= htmlspecialchars($value);
-
-				} elseif (is_array($value)) {
-
-					for ($a = 0; $a < count($value); $a++) {
-
-						$text .= "<$key";
-
-						if (!$this->_preg_grep_keys("/^@/", $value[$a])) {
-							$text .= ">";
-						}
-
-						$text .= $this->BuildPacket($value[$a]);
-
-						$text .= "</$key>\n";
-					}
-
-				} else {
-
-					$value = htmlspecialchars($value);
-					$text .= "<$key>$value</$key>\n";
-
-				}
-
-			}
-
-			return $text;
-		}
-	}
-
-
-
-	function _preg_grep_keys($pattern, $array)
-	{
-		while (list($key, $val) = each($array)) {
-			if (preg_match($pattern, $key)) {
-				$newarray[$key] = $val;
-			}
-		}
-		return (is_array($newarray)) ? $newarray : FALSE;
-	}
-}
-
-
-
-class CJP_StandardConnector
-{
-	function OpenSocket($server, $port)
-	{
-		return fsockopen($server, $port);
-	}
-
-
-
-	function CloseSocket($connection)
-	{
-		return fclose($connection);
-	}
-
-
-	function WriteToSocket($connection, $data)
-	{
-		return fwrite($connection, $data);
-	}
-
-
-
-	function ReadFromSocket($connection, $chunksize)
-	{
-		return fread($connection, $chunksize);
-	}
-}
-
-
-
-?>
diff --git a/src/common/include/User.class.php b/src/common/include/User.class.php
index c4b1206..17b7f95 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -218,8 +218,8 @@ class GFUser extends Error {
 	 * @param	string	The users preference for receiving community updates by email.
 	 * @param	int		The ID of the language preference.
 	 * @param	string	The users preferred timezone.
-	 * @param	string	The users Jabber address.
-	 * @param	int		The users Jabber preference.
+	 * @param	ignored	(no longer used)
+	 * @param	ignored	(no longer used)
 	 * @param	int		The users theme_id.
 	 * @param	string	The users unix_box.
 	 * @param	string	The users address.
@@ -233,7 +233,7 @@ class GFUser extends Error {
 	 *
 	 */
 	function create($unix_name,$firstname,$lastname,$password1,$password2,$email,
-		$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,$theme_id,
+		$mail_site,$mail_va,$language_id,$timezone,$dummy1,$dummy2,$theme_id,
 		$unix_box='shell',$address='',$address2='',$phone='',$fax='',$title='',$ccode='US',$send_mail=true) {
 		global $SYS;
 		if (!$theme_id) {
@@ -279,15 +279,6 @@ class GFUser extends Error {
 			$this->setError(_('Invalid Email Address') . $email);
 			return false;
 		}
-		if ($jabber_address && !validate_email($jabber_address)) {
-			$this->setError(_('Invalid Jabber Address'));
-			return false;
-		}
-		if (!$jabber_only) {
-			$jabber_only=0;
-		} else {
-			$jabber_only=1;
-		}
 		if ($unix_name && db_numrows(db_query_params('SELECT user_id FROM users WHERE user_name LIKE $1',
 							     array ($unix_name))) > 0) {
 			$this->setError(_('That username already exists.'));
@@ -343,7 +334,7 @@ class GFUser extends Error {
 		// if we got this far, it must be good
 		$confirm_hash = substr(md5($password1 . util_randbytes() . microtime()),0,16);
 		db_begin();
-		$result = db_query_params ('INSERT INTO users (user_name,user_pw,unix_pw,realname,firstname,lastname,email,add_date,status,confirm_hash,mail_siteupdates,mail_va,language,timezone,jabber_address,jabber_only,unix_box,address,address2,phone,fax,title,ccode,theme_id) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24)',
+		$result = db_query_params ('INSERT INTO users (user_name,user_pw,unix_pw,realname,firstname,lastname,email,add_date,status,confirm_hash,mail_siteupdates,mail_va,language,timezone,unix_box,address,address2,phone,fax,title,ccode,theme_id) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22)',
 					   array ($unix_name,
 						  md5($password1),
 						  account_genunixpw($password1),
@@ -358,8 +349,6 @@ class GFUser extends Error {
 						  (($mail_va)?"1":"0"),
 						  $language_id,
 						  $timezone,
-						  $jabber_address,
-						  $jabber_only,
 						  $unix_box,
 						  htmlspecialchars($address),
 						  htmlspecialchars($address2),
@@ -510,8 +499,8 @@ Enjoy the site.
 	 *  @param	string	The users preference for receiving site updates by email.
 	 *  @param	string	The users preference for receiving community updates by email.
 	 *	@param	string	The users preference for being participating in "peer ratings".
-	 *	@param	string	The users Jabber account address.
-	 *	@param	int	The users Jabber preference.
+	 *	@param	ignored	(no longer used)
+	 *	@param	ignored	(no longer used)
 	 *	@param	int	The users theme_id preference.
 	 *	@param	string	The users address.
 	 *	@param	string	The users address2.
@@ -521,21 +510,11 @@ Enjoy the site.
 	 *	@param	string	The users ccode.
 	 */
 	function update($firstname,$lastname,$language_id,$timezone,$mail_site,$mail_va,$use_ratings,
-		$jabber_address,$jabber_only,$theme_id,$address,$address2,$phone,$fax,$title,$ccode) {
+		$dummy1,$dummy2,$theme_id,$address,$address2,$phone,$fax,$title,$ccode) {
 		$mail_site = $mail_site ? 1 : 0;
 		$mail_va   = $mail_va   ? 1 : 0;
 		$block_ratings = $use_ratings ? 0 : 1;
 
-		if ($jabber_address && !validate_email($jabber_address)) {
-			$this->setError(_('Invalid Jabber Address'));
-			return false;
-		}
-		if (!$jabber_only) {
-			$jabber_only=0;
-		} else {
-			$jabber_only=1;
-		}
-
 		db_begin();
 
 		$res = db_query_params ('
@@ -549,16 +528,14 @@ Enjoy the site.
 			mail_siteupdates=$6,
 			mail_va=$7,
 			block_ratings=$8,
-			jabber_address=$9,
-			jabber_only=$10,
-			address=$11,
-			address2=$12,
-			phone=$13,
-			fax=$14,
-			title=$15,
-			ccode=$16,
-			theme_id=$17
-			WHERE user_id=$18',
+			address=$9,
+			address2=$10,
+			phone=$11,
+			fax=$12,
+			title=$13,
+			ccode=$14,
+			theme_id=$15
+			WHERE user_id=$16',
 					array (
 						htmlspecialchars($firstname . ' ' .$lastname),
 						htmlspecialchars($firstname),
@@ -568,8 +545,6 @@ Enjoy the site.
 						$mail_site,
 						$mail_va,
 						$block_ratings,
-						$jabber_address,
-						$jabber_only,
 						htmlspecialchars($address) ,
 						htmlspecialchars($address2) ,
 						htmlspecialchars($phone) ,
@@ -1072,24 +1047,6 @@ Enjoy the site.
 	}
 
 	/**
-	 *	getJabberAddress - this user's optional jabber address.
-	 *
-	 *	@return	string	This user's jabber address.
-	 */
-	function getJabberAddress() {
-		return $this->data_array['jabber_address'];
-	}
-
-	/**
-	 *	getJabberOnly - whether this person wants updates sent ONLY to jabber.
-	 *
-	 *	@return boolean	This user's jabber preference.
-	 */
-	function getJabberOnly() {
-		return $this->data_array['jabber_only'];
-	}
-
-	/**
 	 *	getAddress - get this user's address.
 	 *
 	 *	@return text	This user's address.
diff --git a/src/common/include/config-vars.php b/src/common/include/config-vars.php
index bf3feee..45dd5a7 100644
--- a/src/common/include/config-vars.php
+++ b/src/common/include/config-vars.php
@@ -288,28 +288,6 @@ if (isset ($GLOBALS['sys_forum_return_domain'])) {
 } else {
 	forge_define_config_item ('forum_return_domain', 'core', '') ;
 }
-if (isset ($GLOBALS['sys_use_jabber'])) {
-	forge_define_config_item ('use_jabber', 'core', $GLOBALS['sys_use_jabber']) ;
-} else {
-	forge_define_config_item ('use_jabber', 'core', false) ;
-}
-forge_set_config_item_bool ('use_jabber', 'core') ;
-if (isset ($GLOBALS['sys_jabber_server'])) {
-	forge_define_config_item ('jabber_host', 'core', $GLOBALS['sys_jabber_server']) ;
-} else {
-	forge_define_config_item ('jabber_host', 'core', '') ;
-}
-if (isset ($GLOBALS['sys_jabber_port'])) {
-	forge_define_config_item ('jabber_port', 'core', $GLOBALS['sys_jabber_port']) ;
-} else {
-	forge_define_config_item ('jabber_port', 'core', '') ;
-}
-if (isset ($GLOBALS['sys_jabber_user'])) {
-	forge_define_config_item ('jabber_user', 'core', $GLOBALS['sys_jabber_user']) ;
-} else {
-	forge_define_config_item ('jabber_user', 'core', '') ;
-}
-forge_define_config_item ('jabber_password', 'core', isset($GLOBALS['sys_jabber_pass']) ? $GLOBALS['sys_jabber_pass'] : '') ;
 if (isset ($GLOBALS['sys_ldap_host'])) {
 	forge_define_config_item ('ldap_host', 'core', $GLOBALS['sys_ldap_host']) ;
 } else {
diff --git a/src/common/include/pre.php b/src/common/include/pre.php
index 3e54605..b5c09ba 100644
--- a/src/common/include/pre.php
+++ b/src/common/include/pre.php
@@ -92,8 +92,6 @@ setconfigfromoldsources ('core', 'database_password',
 			 'GForgeDbpasswd', 'sys_gfdbpasswd', 'sys_dbpasswd') ;
 setconfigfromoldsources ('core', 'ldap_password',
 			 'GForgeLdapPasswd', 'sys_gfldap_passwd', NULL) ;
-setconfigfromoldsources ('core', 'jabber_password',
-			 'GForgeJabberPasswd', 'sys_gfjabber_pass', NULL) ;
 
 forge_define_config_item ('source_path', 'core', $fusionforge_basedir) ;
 forge_define_config_item ('data_path', 'core', '/var/lib/gforge') ;
@@ -242,11 +240,6 @@ if (getenv ('FUSIONFORGE_NO_PLUGINS') != 'true') {
 	setup_plugin_manager () ;
 }
 
-// Jabber subsystem
-if (forge_get_config('use_jabber')) {
-	require_once $gfcommon.'include/Jabber.class.php';
-}
-
 ini_set('date.timezone', forge_get_config ('default_timezone'));
 
 if (isset($_SERVER['SERVER_SOFTWARE'])) { // We're on the web
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 4107937..1981908 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -272,59 +272,24 @@ function util_convert_body($str,$charset) {
 	return mb_convert_encoding($str,$charset,"UTF-8");
 }
 
-function util_send_jabber($to,$subject,$body) {
-	if (!forge_get_config('use_jabber')) {
-		return;
-	}
-	$JABBER = new Jabber();
-	if (!$JABBER->Connect()) {
-		echo '<br />Unable to connect';
-		return false;
-	}
-	//$JABBER->SendAuth();
-	//$JABBER->AccountRegistration();
-	if (!$JABBER->SendAuth()) {
-		echo '<br />Auth Failure';
-		$JABBER->Disconnect();
-		return false;
-		//or die("Couldn't authenticate!");
-	}
-	$JABBER->SendPresence(NULL, NULL, "online");
-
-	$body=htmlspecialchars($body);
-	$to_arr=explode(',',$to);
-	for ($i=0; $i<count($to_arr); $i++) {
-		if ($to_arr[$i]) {
-			//echo '<br />Sending Jabbers To: '.$to_arr[$i];
-			if (!$JABBER->SendMessage($to_arr[$i], "normal", NULL, array("body" => $body,"subject"=>$subject))) {
-				echo '<br />Error Sending to '.$to_arr[$i];
-			}
-		}
-	}
-
-	$JABBER->CruiseControl(2);
-	$JABBER->Disconnect();
-}
-
 /**
  *	util_handle_message() - a convenience wrapper which sends messages
- *	to either a jabber account or email account or both, depending on
- *	user preferences
+ *	to an email account
  *
  *	@param	array	array of user_id's from the user table
  *	@param	string	subject of the message
  *	@param	string	the message body
  *	@param	string	a comma-separated list of email address
- *	@param	string	a comma-separated list of jabber address
+ *	@param	ignored	(no longer used)
  *	@param	string	From header
  */
-function util_handle_message($id_arr,$subject,$body,$extra_emails='',$extra_jabbers='',$from='') {
+function util_handle_message($id_arr,$subject,$body,$extra_emails='',$dummy1='',$from='') {
 	$address=array();
 
 	if (count($id_arr) < 1) {
 
 	} else {
-		$res = db_query_params ('SELECT user_id,jabber_address,email,jabber_only FROM users WHERE user_id = ANY ($1)',
+		$res = db_query_params ('SELECT user_id,email FROM users WHERE user_id = ANY ($1)',
 					array (db_int_array_to_any_clause ($id_arr))) ;
 		$rows = db_numrows($res) ;
 
@@ -333,31 +298,15 @@ function util_handle_message($id_arr,$subject,$body,$extra_emails='',$extra_jabb
 				// Do not send messages to "Nobody"
 				continue;
 			}
-			//
-			//  Build arrays of the jabber address
-			//
-			if (db_result($res,$i,'jabber_address')) {
-				$address['jabber_address'][]=db_result($res,$i,'jabber_address');
-				if (db_result($res,$i,'jabber_only') != 1) {
-					$address['email'][]=db_result($res,$i,'email');
-				}
-			} else {
-				$address['email'][]=db_result($res,$i,'email');
-			}
+			$address['email'][]=db_result($res,$i,'email');
 		}
 		if (isset ($address['email']) && count($address['email']) > 0) {
 			$extra_emails=implode($address['email'],',').',' . $extra_emails;
 		}
-		if (isset ($address['jabber_address']) && count($address['jabber_address']) > 0) {
-			$extra_jabbers=implode($address['jabber_address'],',').','.$extra_jabbers;
-		}
 	}
 	if ($extra_emails) {
 		util_send_message('',$subject,$body,$from,$extra_emails);
 	}
-	if ($extra_jabbers) {
-		util_send_jabber($extra_jabbers,$subject,$body);
-	}
 }
 
 /**
diff --git a/src/common/pm/ProjectTask.class.php b/src/common/pm/ProjectTask.class.php
index 6607762..6950a49 100644
--- a/src/common/pm/ProjectTask.class.php
+++ b/src/common/pm/ProjectTask.class.php
@@ -1128,7 +1128,7 @@ class ProjectTask extends Error {
 	}
 
 	/**
-	 *	sendNotice - contains the logic for sending email/jabber updates.
+	 *	sendNotice - contains the logic for sending email updates.
 	 *
 	 *	@return	boolean	success.
 	 */
diff --git a/src/debian/dsf-helper/jabberhost-variables.config b/src/debian/dsf-helper/jabberhost-variables.config
deleted file mode 100644
index 22c0922..0000000
--- a/src/debian/dsf-helper/jabberhost-variables.config
+++ /dev/null
@@ -1,11 +0,0 @@
-db_fget @PACKAGE@/shared/jabber_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/jabber_host jabber.$RET
-fi
-
-db_input low @PACKAGE@/shared/jabber_host || true
-db_go || true
-
-vars="jabber_host"
-update_mainconffile $vars
diff --git a/src/debian/dsf-helper/jabberhost-variables.templates b/src/debian/dsf-helper/jabberhost-variables.templates
deleted file mode 100644
index d720485..0000000
--- a/src/debian/dsf-helper/jabberhost-variables.templates
+++ /dev/null
@@ -1,4 +0,0 @@
-Template: @PACKAGE@/shared/jabber_host
-Type: string
-_Description: Your jabber server:
- The hostname of the server that will host your Jabber server
diff --git a/src/debian/dsf-in/web-apache2.config.dsfh-in b/src/debian/dsf-in/web-apache2.config.dsfh-in
index 05ca76e..403b19d 100644
--- a/src/debian/dsf-in/web-apache2.config.dsfh-in
+++ b/src/debian/dsf-in/web-apache2.config.dsfh-in
@@ -20,7 +20,6 @@ init_debconf_from_mainconffile
 #DSFHELPER:downloadhost-variables#
 #DSFHELPER:uploadhost-variables#
 #DSFHELPER:ftpuploadhost-variables#
-#DSFHELPER:jabberhost-variables#
 # [Disabled] DSFHELPER:shellhost-variables#
 # [Disabled] DSFHELPER:dbpasswd-variables#
 # [Disabled] DSFHELPER:dbhost-variables#
diff --git a/src/debian/dsf-in/web-apache2.templates.dsfh-in b/src/debian/dsf-in/web-apache2.templates.dsfh-in
index 222f46a..6ed9dac 100644
--- a/src/debian/dsf-in/web-apache2.templates.dsfh-in
+++ b/src/debian/dsf-in/web-apache2.templates.dsfh-in
@@ -2,7 +2,6 @@
 #DSFHELPER:downloadhost-variables#
 #DSFHELPER:uploadhost-variables#
 #DSFHELPER:ftpuploadhost-variables#
-#DSFHELPER:jabberhost-variables#
 #DSFHELPER:lists-variables#
 #DSFHELPER:users-variables#
 #DSFHELPER:shellhost-variables#
diff --git a/src/docs/docbook/docbook/installation_guide/installation_guide.xml b/src/docs/docbook/docbook/installation_guide/installation_guide.xml
index c40842d..231d2a2 100644
--- a/src/docs/docbook/docbook/installation_guide/installation_guide.xml
+++ b/src/docs/docbook/docbook/installation_guide/installation_guide.xml
@@ -66,9 +66,6 @@
         <para><ulink url="http://www.gnu.org/software/mailman/">GNU Mailman</ulink> and <ulink url="http://www.python.org/">Python</ulink> (Mailing list support)</para>
       </listitem>
       <listitem>
-        <para><ulink url="http://jabberd.jabberstudio.org/">Jabberd</ulink> (Jabber support)</para>
-      </listitem>
-      <listitem>
         <para><ulink url="http://www.aditus.nu/jpgraph/">JPGraph</ulink> (Gantt Charting and Graphing Support)</para>
       </listitem>
       <listitem>
@@ -322,7 +319,6 @@ cvs             IN      A       <replaceable>1.2.3.4</replaceable>
 svn             IN      A       <replaceable>1.2.3.4</replaceable>
 scm             IN      A       <replaceable>1.2.3.4</replaceable>
 ldap            IN      A       <replaceable>1.2.3.4</replaceable>
-jabber          IN      A       <replaceable>1.2.3.4</replaceable>
 </screen>
       <para>The new zone must be added in main BIND configuration file:</para>
       <screen>
@@ -896,11 +892,6 @@ $sys_dbpasswd = 'p455w0rd' ;
 </programlisting>
       </section>
       <section>
-        <title>Jabber Support</title>
-        <para>FusionForge supports the sending of messages to jabber accounts. To accomplish this, you must have a user account setup on the jabber server that gforge can connect to and send messages.</para>
-        <para>Once you have that user account, server, and password set up, just edit <filename>/etc/gforge/local.inc</filename> and add the information to the jabber section.</para>
-      </section>
-      <section>
         <title>Peer Ratings</title>
         <para>Add yourself, and any others you wish, to the <quote>Peer Ratings</quote> project, which should be at <literal>/projects/peerrating/</literal> on the website. Make yourself an admininistrator of the project, and then proceed to <quote>rate</quote> other users on the website.</para>
         <para>Members of the <quote>Peer Ratings</quote> project, who are administrator of the project, become the first trusted users. This is the only way to prime the pump for the peer ratings system.</para>
diff --git a/src/etc/config.ini.d/defaults.ini b/src/etc/config.ini.d/defaults.ini
index 9d6bc07..cfeb535 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -56,7 +56,6 @@ use_fti = yes
 use_ftp = yes
 use_ftp_uploads = no
 use_gateways = yes
-use_jabber = no
 use_mail = yes
 use_manual_uploads = yes
 use_news = yes
diff --git a/src/etc/gforge.conf.example b/src/etc/gforge.conf.example
index 5f1d769..dc29e01 100644
--- a/src/etc/gforge.conf.example
+++ b/src/etc/gforge.conf.example
@@ -11,7 +11,6 @@ scm_host=cvs.gforge.company.com
 shell_host=shell.gforge.company.com
 users_host=users.gforge.company.com
 lists_host=lists.gforge.company.com
-jabber_host=jabber.gforge.company.com
 upload_host=upload.gforge.company.com
 download_host=download.gforge.company.com
 ftpuploadhost=upload.gforge.company.com
@@ -42,7 +41,6 @@ cvsdir=/cvsroot
 svndir=/svnroot
 uploaddir=/path/to/uploads/
 sys_urlroot=/path/to/gforge/www/
-sys_jabber_pass=
 usr_share_gforge=/opt/gforge
 usr_lib_gforge=/path/to/usr/share/gforge
 var_lib_gforge=/var/lib/gforge
@@ -58,7 +56,6 @@ sys_lang=English
 sys_default_timezone=GMT
 sys_default_country_code=US
 sys_account_manager_type=UNIX
-sys_use_jabber=0
 sys_use_auth_ldap=1
 sys_ldap_auth_port=389
 sys_ldap_auth_version=3
@@ -97,7 +94,6 @@ sys_user_reg_restricted=false
 sys_require_accept_conditions=false
 sys_require_unique_email=false
 sys_localinc=/path/to/local.inc
-sys_jabber_pass=
 sys_plugins_path=/usr/share/gforge/plugins/
 sys_sslcrt=
 sys_sslkey=
diff --git a/src/etc/httpd.conf.d-fhs/secrets.inc b/src/etc/httpd.conf.d-fhs/secrets.inc
index 1a288cb..7fe3fde 100644
--- a/src/etc/httpd.conf.d-fhs/secrets.inc
+++ b/src/etc/httpd.conf.d-fhs/secrets.inc
@@ -18,6 +18,3 @@ RequestHeader append GForgeDbpasswd "{core/database_password}"
 
 RequestHeader unset GForgeLdapPasswd
 RequestHeader append GForgeLdapPasswd "{core/ldap_password}"
-
-RequestHeader unset GForgeJabberPasswd
-RequestHeader append GForgeJabberPasswd "{core/jabber_password}"
diff --git a/src/etc/httpd.conf.d-opt/secrets.inc b/src/etc/httpd.conf.d-opt/secrets.inc
index 1a288cb..7fe3fde 100644
--- a/src/etc/httpd.conf.d-opt/secrets.inc
+++ b/src/etc/httpd.conf.d-opt/secrets.inc
@@ -18,6 +18,3 @@ RequestHeader append GForgeDbpasswd "{core/database_password}"
 
 RequestHeader unset GForgeLdapPasswd
 RequestHeader append GForgeLdapPasswd "{core/ldap_password}"
-
-RequestHeader unset GForgeJabberPasswd
-RequestHeader append GForgeJabberPasswd "{core/jabber_password}"
diff --git a/src/etc/httpd.conf.d-usrlocal/secrets.inc b/src/etc/httpd.conf.d-usrlocal/secrets.inc
index 1a288cb..7fe3fde 100644
--- a/src/etc/httpd.conf.d-usrlocal/secrets.inc
+++ b/src/etc/httpd.conf.d-usrlocal/secrets.inc
@@ -18,6 +18,3 @@ RequestHeader append GForgeDbpasswd "{core/database_password}"
 
 RequestHeader unset GForgeLdapPasswd
 RequestHeader append GForgeLdapPasswd "{core/ldap_password}"
-
-RequestHeader unset GForgeJabberPasswd
-RequestHeader append GForgeJabberPasswd "{core/jabber_password}"
diff --git a/src/etc/httpd.conf.d/secrets.inc b/src/etc/httpd.conf.d/secrets.inc
index 1a288cb..7fe3fde 100644
--- a/src/etc/httpd.conf.d/secrets.inc
+++ b/src/etc/httpd.conf.d/secrets.inc
@@ -18,6 +18,3 @@ RequestHeader append GForgeDbpasswd "{core/database_password}"
 
 RequestHeader unset GForgeLdapPasswd
 RequestHeader append GForgeLdapPasswd "{core/ldap_password}"
-
-RequestHeader unset GForgeJabberPasswd
-RequestHeader append GForgeJabberPasswd "{core/jabber_password}"
diff --git a/src/etc/httpd.d/httpd.secrets b/src/etc/httpd.d/httpd.secrets
index 74e949e..a837b94 100644
--- a/src/etc/httpd.d/httpd.secrets
+++ b/src/etc/httpd.d/httpd.secrets
@@ -19,6 +19,3 @@ RequestHeader append GForgeDbpasswd {db_password}
 
 RequestHeader unset GForgeLdapPasswd
 RequestHeader append GForgeLdapPasswd {ldap_web_add_password}
-
-RequestHeader unset GForgeJabberPasswd
-RequestHeader append GForgeJabberPasswd {sys_jabber_pass}
diff --git a/src/etc/httpd.secrets.example b/src/etc/httpd.secrets.example
index f83fc95..ccc3557 100644
--- a/src/etc/httpd.secrets.example
+++ b/src/etc/httpd.secrets.example
@@ -19,6 +19,3 @@ RequestHeader append GForgeDbpasswd
 
 RequestHeader unset GForgeLdapPasswd
 RequestHeader append GForgeLdapPasswd 
-
-RequestHeader unset GForgeJabberPasswd
-RequestHeader append GForgeJabberPasswd 
diff --git a/src/etc/local.d/10database.env b/src/etc/local.d/10database.env
index 470ed4f..0d39c73 100644
--- a/src/etc/local.d/10database.env
+++ b/src/etc/local.d/10database.env
@@ -12,7 +12,6 @@ if (getenv ('SERVER_SOFTWARE')) { // We're on the web
 	$sys_dbuser = $headers['GForgeDbuser'] or getenv('sys_gfdbuser');
 	$sys_dbpasswd = $headers['GForgeDbpasswd'] or getenv('sys_gfdbpasswd');
 	$sys_ldap_passwd = $headers['GForgeLdapPasswd'] or getenv('sys_gfldap_passwd');
-	$sys_jabber_pass = $headers['GForgeJabberPasswd'] or getenv('sys_jabber_pass');
 } else {
 	@include ('database.inc');
 }
diff --git a/src/etc/local.d/10database.simple b/src/etc/local.d/10database.simple
index 1ffe0a1..6a6b1c0 100644
--- a/src/etc/local.d/10database.simple
+++ b/src/etc/local.d/10database.simple
@@ -15,5 +15,4 @@ $sys_server='pgsql';
 //
 $sys_dbpasswd='{db_password}';
 $sys_ldap_passwd='{ldap_web_add_password}';
-$sys_jabber_pass='{sys_jabber_pass}';
 
diff --git a/src/etc/local.d/23jabber b/src/etc/local.d/23jabber
deleted file mode 100644
index aeff6e8..0000000
--- a/src/etc/local.d/23jabber
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Jabber Configuration
-//
-$sys_use_jabber={sys_use_jabber};
-//messages from the system will be sent to this address
-$sys_jabber_server='{jabber_host}';
-$sys_jabber_port='5222';
-// messages sent to jabber accounts will come from this user
-// It is similar to the "From: noreply at gforge.org" used in emails
-$sys_jabber_user='noreply';
-if (!isset($sys_jabber_pass)) {
-   $sys_jabber_pass='';
-}
-
diff --git a/src/etc/local.inc.example b/src/etc/local.inc.example
index a80986d..8357194 100644
--- a/src/etc/local.inc.example
+++ b/src/etc/local.inc.example
@@ -81,7 +81,6 @@ $sys_server='pgsql';
 //
 $sys_dbpasswd='';
 $sys_ldap_passwd='';
-$sys_jabber_pass='';
 
 //
 // Account Management
@@ -123,19 +122,6 @@ $sys_ldap_bind_dn='cn=SF_robot,dc=gforge,dc=company,dc=com';
 $sys_ldap_admin_dn='cn=admin,dc=gforge,dc=company,dc=com';
 
 //
-// Jabber Configuration
-//
-$sys_use_jabber=0;
-//messages from the system will be sent to this address
-$sys_jabber_server='jabber.gforge.company.com';
-$sys_jabber_port='5222';
-// messages sent to jabber accounts will come from this user
-// It is similar to the "From: noreply at gforge.org" used in emails
-$sys_jabber_user='noreply';
-if (!isset($sys_jabber_pass)) {
-   $sys_jabber_pass='';
-}
-//
 //	FEATURES
 //	You can turn features on/off sitewide
 //
diff --git a/src/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php b/src/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php
index 9e3e9ba..de81c02 100644
--- a/src/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php
+++ b/src/plugins/ldapextauth/etc/plugins/ldapextauth/mapping.php
@@ -20,7 +20,6 @@ function plugin_ldapextauth_mapping ($entry) {
 	$result['themeid']=$GLOBALS['sys_default_theme_id'];
 
 
-	//$result['jabber_address'] = '' ;
 	//$result['address'] = '' ;
 	//$result['address2'] = '' ;
 	//$result['phone'] = $entry['telephonenumber'][0]; //AD
diff --git a/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php b/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php
index 1976e5f..945ad98 100644
--- a/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php
+++ b/src/plugins/ldapextauth/include/LdapExtAuthPlugin.class.php
@@ -254,9 +254,6 @@ class LdapextauthPlugin extends Plugin {
 				if ($mappedinfo['timezone']) {
 					$timezone = $mappedinfo['timezone'] ;
 				}
-				if ($mappedinfo['jabber_address']) {
-					$jabber_address = $mappedinfo['jabber_address'] ;
-				}
 				if ($mappedinfo['address']) {
 					$address = $mappedinfo['address'] ;
 				}
diff --git a/src/setup b/src/setup
index 6b2f4b0..f759f3f 100755
--- a/src/setup
+++ b/src/setup
@@ -36,7 +36,6 @@ computedefault(){
 	# The following three have to be synced when domain_name changes
 	# and docs_host is supposed not to be used
 	#DEFAULTdocs_host=gfdocs.$DEFAULTdomain_name
-	DEFAULTjabber_host=jabber.$DEFAULTdomain_name
 	DEFAULTupload_host=upload.$DEFAULTdomain_name
 	#
 	DEFAULTdownload_host=download.$DEFAULTdomain_name
@@ -71,7 +70,6 @@ computedefault(){
 	# The place where file uploaded with http are stored for download
 	DEFAULTuploaddir=$GFGDIR/var/lib/gforge/download/
 	DEFAULTsys_urlroot=$SHAREDIR/www/
-	DEFAULTsys_jabber_pass=$(dd if=/dev/urandom count=1 bs=8 2> /dev/null | md5sum | cut -b1-8)
 	DEFAULTusr_share_gforge=$SHAREDIR
 	DEFAULTusr_lib_gforge=$LIBDIR
 	DEFAULTvar_lib_gforge=$GFGDIR/var/lib/gforge
@@ -87,7 +85,6 @@ computedefault(){
 	DEFAULTsys_default_timezone=GMT
 	DEFAULTsys_default_country_code=US
 	DEFAULTsys_account_manager_type=$SYSTEM
-	DEFAULTsys_use_jabber=0
 	DEFAULTsys_use_auth_ldap=1
 	# Couldn't find where this is used, maybe some rest of ext auth
 	#DEFAULTsys_ldap_auth_host=localhost
@@ -129,7 +126,6 @@ computedefault(){
 	DEFAULTsys_require_accept_conditions=false
 	DEFAULTsys_require_unique_email=false
 	DEFAULTsys_localinc=$ETCDIR/local.inc
-	DEFAULTsys_jabber_pass=$(dd if=/dev/urandom count=1 bs=8 2> /dev/null | md5sum | cut -b1-8)
 	DEFAULTsys_plugins_path=$SHAREDIR/plugins/
 	DEFAULTsys_sslcrt=$(findcrt)
 	DEFAULTsys_sslkey=$(findkey)
diff --git a/src/translations/bg.po b/src/translations/bg.po
index 3f0b510..3f5ceb4 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -2277,10 +2277,6 @@ msgstr "Грешна парола"
 msgid "Invalid Unix Name."
 msgstr "Невалиден UNIX идентификатор."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8000,14 +7996,6 @@ msgstr "Факс:"
 msgid "Title:"
 msgstr "Име:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11391,10 +11379,6 @@ msgstr "Профил на Уменията"
 msgid "Real Name:"
 msgstr "Фамилия:"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/ca.po b/src/translations/ca.po
index b5877ce..0caf448 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -2380,10 +2380,6 @@ msgstr "Contrasenya no vàlida:"
 msgid "Invalid Unix Name."
 msgstr "Nom Unix no vàlid."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Adreça Jabber no vàlida"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8300,14 +8296,6 @@ msgstr "Fax:"
 msgid "Title:"
 msgstr "Títol:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Adreça Jabber:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "Envieu notícies auto-generades només a la meva adreça de Jabber"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11818,10 +11806,6 @@ msgstr "Perfil d'habilitats"
 msgid "Real Name:"
 msgstr "Nom real"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Adreça de Jabber"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/de.po b/src/translations/de.po
index d722f5a..7ebbac9 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -2424,10 +2424,6 @@ msgstr "Ungültiges Passwort:"
 msgid "Invalid Unix Name."
 msgstr "Ungültiger Unix-Name."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Ungültige Jabber-Adresse"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8447,15 +8443,6 @@ msgstr "FAX:"
 msgid "Title:"
 msgstr "Titel:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabber-Adresse:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-"Sende automatisch generierte Notizen ausschließlich an meine Jabber-Adresse"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -12031,10 +12018,6 @@ msgstr "Qualifikationenprofil"
 msgid "Real Name:"
 msgstr "Richtiger Name"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Jabber Adresse"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/el.po b/src/translations/el.po
index 04016cb..358f7e4 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7561,14 +7557,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10774,10 +10762,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/en.po b/src/translations/en.po
index 75686bb..1ed112c 100644
--- a/src/translations/en.po
+++ b/src/translations/en.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7562,14 +7558,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10775,10 +10763,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/eo.po b/src/translations/eo.po
index 7e0c2df..bc88351 100644
--- a/src/translations/eo.po
+++ b/src/translations/eo.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7561,14 +7557,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10774,10 +10762,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/es.po b/src/translations/es.po
index 8388eb0..f9b975a 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -2388,10 +2388,6 @@ msgstr "La contraseña debe tener por lo menos seis caracteres"
 msgid "Invalid Unix Name."
 msgstr "Nombre de usuario Unix inválido"
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Dirección Jabber inválida"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8340,14 +8336,6 @@ msgstr "FAX:"
 msgid "Title:"
 msgstr "Título:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Dirección Jabber:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "Enviar noticias automáticas sólo a mi dirección Jabber"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11833,11 +11821,6 @@ msgstr "Experiencia"
 msgid "Real Name:"
 msgstr "Nombre real"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-"Dirección <a href=\"http://www.jabber.org/\" _target=\"blank\">Jabber</a>"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/eu.po b/src/translations/eu.po
index fd12c7e..9dcc268 100644
--- a/src/translations/eu.po
+++ b/src/translations/eu.po
@@ -2369,10 +2369,6 @@ msgstr "Pasahitzak gutxienez sei karaktere izan behar ditu"
 msgid "Invalid Unix Name."
 msgstr "Unix erabiltzailearen izena baliogabea da"
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Jabber helbide baliogabea"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8236,14 +8232,6 @@ msgstr "FAXa:"
 msgid "Title:"
 msgstr "Izenburua:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabber helbidea:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "Berri automatikoak bakarrik bidali nere Jabber helbidera"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11734,11 +11722,6 @@ msgstr "Esperientzia"
 msgid "Real Name:"
 msgstr "Benetazko izena"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-"Helbidea <a href=\"http://www.jabber.org/\" _target=\"blank\">Jabber</a>"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/fr.po b/src/translations/fr.po
index fa1d659..ab8786c 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -2320,10 +2320,6 @@ msgstr "Mot de passe non valide :"
 msgid "Invalid Unix Name."
 msgstr "Nom unix non valide"
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Adresse Jabber non valide"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8178,14 +8174,6 @@ msgstr "Fax :"
 msgid "Title:"
 msgstr "Titre :"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Adresse Jabber :"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "N'envoyer les notifications automatiques qu'à mon adresse Jabber"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11640,10 +11628,6 @@ msgstr "Compétences"
 msgid "Real Name:"
 msgstr "Nom complet :"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Addresse Jabber"
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr "Membre du site depuis le :"
diff --git a/src/translations/gl.po b/src/translations/gl.po
index f81df48..91b214f 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -2411,10 +2411,6 @@ msgstr "O contrasinal non é válido:"
 msgid "Invalid Unix Name."
 msgstr "O nome de Unix non é válido."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "O enderezo de Jabber non é válido"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8443,14 +8439,6 @@ msgstr "Fax: "
 msgid "Title:"
 msgstr "Título: "
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Enderezo de Jabber: "
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "Enviar as novas autoxeradas só á miña conta de Jabber "
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11993,10 +11981,6 @@ msgstr "Perfil de habelencias "
 msgid "Real Name:"
 msgstr "Nome verdadeiro "
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Enderezo de Jabber "
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/he.po b/src/translations/he.po
index d6dd5df..1678b2f 100644
--- a/src/translations/he.po
+++ b/src/translations/he.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7561,14 +7557,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10774,10 +10762,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/id.po b/src/translations/id.po
index 6d79470..4f24ee9 100644
--- a/src/translations/id.po
+++ b/src/translations/id.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7561,14 +7557,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10774,10 +10762,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/it.po b/src/translations/it.po
index 2a5346e..e2fe6dc 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -2410,10 +2410,6 @@ msgstr "Password non valida:"
 msgid "Invalid Unix Name."
 msgstr "Nome utente unix non valido."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Indirizzo Jabber non valido"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8317,15 +8313,6 @@ msgstr "FAX:"
 msgid "Title:"
 msgstr "Titolo:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Indirizzo Jabber:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-"Invia le notifiche generate automaticamente solo al mio indirizzo Jabber"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11835,10 +11822,6 @@ msgstr "Profilo delle competenze"
 msgid "Real Name:"
 msgstr "Nome reale"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Indirizzo Jabber:"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/ja.po b/src/translations/ja.po
index 9b82c07..2685f69 100644
--- a/src/translations/ja.po
+++ b/src/translations/ja.po
@@ -2303,10 +2303,6 @@ msgstr "無効なパスワード:"
 msgid "Invalid Unix Name."
 msgstr "無効なUnixネーム"
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "無効なJabberアドレス"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -4987,11 +4983,6 @@ msgstr ""
 msgid "Erase"
 msgstr ""
 
-#: plugins/forumml/www/forumml_utils.php:686
-#, fuzzy
-msgid "Invalid email "
-msgstr "無効なJabberアドレス"
-
 #: plugins/forumml/www/forumml_utils.php:733
 #, fuzzy
 msgid "Mail successfully sent "
@@ -7676,10 +7667,6 @@ msgstr ""
 msgid "Return"
 msgstr ""
 
-#: www/account/change_email.php:38
-msgid "Invalid email address."
-msgstr "無効なJabberアドレス"
-
 #: www/account/change_email.php:57
 #, fuzzy, php-format
 msgid ""
@@ -7972,16 +7959,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabberアドレス:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-"(未訳:account_register.jabberonly)Send auto-generated notices only to my "
-"Jabber address"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -8068,11 +8045,6 @@ msgstr ""
 msgid "Cookies must be enabled past this point."
 msgstr "ここから先はクッキーを有効にしてください"
 
-#: www/account/login.php:137
-#, fuzzy
-msgid "Login name or email address"
-msgstr "無効なJabberアドレス"
-
 #: www/account/login.php:144 www/account/verify.php:90
 msgid "Password:"
 msgstr "パスワード:"
@@ -8213,11 +8185,6 @@ msgid ""
 "Fill in a user name and click 'Submit' to resend the confirmation email."
 msgstr ""
 
-#: www/account/pending-resend.php:69 www/account/verify.php:84
-#, fuzzy
-msgid "Login name or email address:"
-msgstr "無効なJabberアドレス"
-
 #: www/account/register.php:75
 msgid "You can't register an account unless you accept the terms of use."
 msgstr ""
@@ -11325,10 +11292,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr "ログイン名:"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
@@ -14904,11 +14867,6 @@ msgid "Error - Invalid search"
 msgstr ""
 
 #: www/sendmessage.php:33
-#, fuzzy
-msgid "toaddress"
-msgstr "Jabberアドレス:"
-
-#: www/sendmessage.php:33
 msgid "touser"
 msgstr ""
 
diff --git a/src/translations/ko.po b/src/translations/ko.po
index 66cf9bc..d1faa8e 100644
--- a/src/translations/ko.po
+++ b/src/translations/ko.po
@@ -2359,10 +2359,6 @@ msgstr "잘못된 비밀번호입니다."
 msgid "Invalid Unix Name."
 msgstr "잘못된 Unix Name."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "유효하지 않은  Jabber 주소"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8154,14 +8150,6 @@ msgstr ""
 msgid "Title:"
 msgstr "Title:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabber 주소:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "자동생성되는 메시지는 Jabber 주소로만 보내기"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11632,10 +11620,6 @@ msgstr "스킬 프로필"
 msgid "Real Name:"
 msgstr "Real name"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Jabber 주소"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/la.po b/src/translations/la.po
index f892564..513f7c5 100644
--- a/src/translations/la.po
+++ b/src/translations/la.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7561,14 +7557,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10774,10 +10762,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/nb.po b/src/translations/nb.po
index 2348de7..1b4662c 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7561,14 +7557,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10774,10 +10762,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/nl.po b/src/translations/nl.po
index 901b9ba..8eb33c3 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -2376,10 +2376,6 @@ msgstr "Ongeldig wachtwoord:"
 msgid "Invalid Unix Name."
 msgstr "Ongeldige Unix naam."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Ongeldig Jabber adres"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8305,15 +8301,6 @@ msgstr "FAX:"
 msgid "Title:"
 msgstr "Titel:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabber adres:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-"Stuur automatisch gegenereerde mededelingen alleen naar mijn Jabber adres"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11829,10 +11816,6 @@ msgstr "Vaardigheden profiel"
 msgid "Real Name:"
 msgstr "Echte naam"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Je Jabber adres"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/pl.po b/src/translations/pl.po
index 2d0e28d..2c6d8ce 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -2235,10 +2235,6 @@ msgstr "Niepoprawne hasło"
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Niepoprawny adres Jabber"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7833,14 +7829,6 @@ msgstr "FAX:"
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Adres Jabber:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11085,10 +11073,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr "Nazwa wydania:"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/pt.po b/src/translations/pt.po
index 08335b7..340ffac 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -2163,10 +2163,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7561,14 +7557,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10774,10 +10762,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index 7079af9..2f89d1c 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -2374,10 +2374,6 @@ msgstr "Senha Inválida:"
 msgid "Invalid Unix Name."
 msgstr "Nome Unix Inválido."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Endereço do Jabber Inválido"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8186,15 +8182,6 @@ msgstr ""
 msgid "Title:"
 msgstr "Título:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Endereço do Jabber:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-"Enviar notícias geradas automáticamente apenas para o meu endereço do Jabber"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11681,10 +11668,6 @@ msgstr "Perfil de Habilidades"
 msgid "Real Name:"
 msgstr "Nome real"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Endereço do Jabber"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/ru.po b/src/translations/ru.po
index 4a7ec72..4ab808b 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -2364,10 +2364,6 @@ msgstr "Неверный пароль:"
 msgid "Invalid Unix Name."
 msgstr "Неверное Unix-имя."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Неверный Jabber-адрес"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8473,14 +8469,6 @@ msgstr "Факс:"
 msgid "Title:"
 msgstr "Обращение:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Адрес Jabber:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "Отправлять авто-инфомирование только на мой Jabber "
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -12030,10 +12018,6 @@ msgstr "Навыки"
 msgid "Real Name:"
 msgstr "Реальное имя"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Jabber адрес"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/sv.po b/src/translations/sv.po
index 91751d6..391d4a4 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -2382,10 +2382,6 @@ msgstr "Ogiltigt lösenord:"
 msgid "Invalid Unix Name."
 msgstr "Ogiltigt unixnamn."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "Ogiltig jabberadress"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8190,15 +8186,6 @@ msgstr ""
 msgid "Title:"
 msgstr "Rubrik:"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabberadress:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-"Skicka automatiskt genererade meddelanden endast till min Jabber adress"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11674,10 +11661,6 @@ msgstr "kompetensprofil"
 msgid "Real Name:"
 msgstr "Verkligt namn"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Jabberadress"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/th.po b/src/translations/th.po
index 7fc1aa5..25cab3e 100644
--- a/src/translations/th.po
+++ b/src/translations/th.po
@@ -2210,10 +2210,6 @@ msgstr ""
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr ""
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -7624,14 +7620,6 @@ msgstr ""
 msgid "Title:"
 msgstr ""
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr ""
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr ""
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -10844,10 +10832,6 @@ msgstr ""
 msgid "Real Name:"
 msgstr ""
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr ""
-
 #: www/include/user_home.php:141
 msgid "Site Member Since:"
 msgstr ""
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index d1c0ac8..0a1e892 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -2357,10 +2357,6 @@ msgstr "无效的密码:"
 msgid "Invalid Unix Name."
 msgstr "无效的帐号"
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "无效的Jabber信箱"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8220,14 +8216,6 @@ msgstr "传真:"
 msgid "Title:"
 msgstr "标题"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabber 信箱:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "自动产生的通知只发送到我的Jabber信箱"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11682,10 +11670,6 @@ msgstr "专长资料"
 msgid "Real Name:"
 msgstr "真实姓名"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Jabber位址"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index 9c7c7c4..9704ab5 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -2362,10 +2362,6 @@ msgstr "無效的密碼:"
 msgid "Invalid Unix Name."
 msgstr "無效的帳號"
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
-msgid "Invalid Jabber Address"
-msgstr "無效的Jabber信箱"
-
 #: common/include/User.class.php:293 common/include/account.php:80
 #: common/include/account.php:84
 msgid "That username already exists."
@@ -8254,14 +8250,6 @@ msgstr "傳真:"
 msgid "Title:"
 msgstr "標題"
 
-#: www/account/index.php:218 www/account/register.php:195
-msgid "Jabber Address:"
-msgstr "Jabber 信箱:"
-
-#: www/account/index.php:222 www/account/register.php:199
-msgid "Send auto-generated notices only to my Jabber address"
-msgstr "自動產生的通知只發送到我的Jabber信箱"
-
 #: www/account/index.php:238 www/account/register.php:221
 msgid ""
 "Receive Email about Site Updates <i>(Very low traffic and includes security "
@@ -11714,10 +11702,6 @@ msgstr "專長資料"
 msgid "Real Name:"
 msgstr "真實姓名"
 
-#: www/include/user_home.php:106
-msgid "Jabber Address"
-msgstr "Jabber位址"
-
 #: www/include/user_home.php:141
 #, fuzzy
 msgid "Site Member Since:"
diff --git a/src/utils/migrate-to-ini-files.sh b/src/utils/migrate-to-ini-files.sh
index 497ba50..12600e0 100755
--- a/src/utils/migrate-to-ini-files.sh
+++ b/src/utils/migrate-to-ini-files.sh
@@ -95,7 +95,6 @@ add_config core use_fti >> $tmp
 add_config core use_ftp >> $tmp
 add_config core use_ftp_uploads >> $tmp
 add_config core use_gateways >> $tmp
-add_config core use_jabber >> $tmp
 add_config core use_mail >> $tmp
 add_config core use_manual_uploads >> $tmp
 add_config core use_news >> $tmp
@@ -164,10 +163,6 @@ add_config core database_name >> $tmp
 add_config core database_password >> $tmp
 add_config core database_port >> $tmp
 add_config core database_user >> $tmp
-add_config core jabber_host >> $tmp
-add_config core jabber_password >> $tmp
-add_config core jabber_port >> $tmp
-add_config core jabber_user >> $tmp
 add_config core ldap_base_dn >> $tmp
 add_config core ldap_host >> $tmp
 add_config core ldap_password >> $tmp
diff --git a/src/www/account/index.php b/src/www/account/index.php
index cbb7917..922bda3 100644
--- a/src/www/account/index.php
+++ b/src/www/account/index.php
@@ -56,8 +56,6 @@ if (getStringFromRequest('submit')) {
 	$phone = getStringFromRequest('phone');
 	$fax = getStringFromRequest('fax');
 	$title = getStringFromRequest('title');
-	$jabber_address = getStringFromRequest('jabber');
-	$jabber_only = getStringFromRequest('jabber');
 	$mail_site = getStringFromRequest('mail_site');
 	$mail_va = getStringFromRequest('mail_va');
 	$remember_user = getStringFromRequest('remember_user');
@@ -77,7 +75,7 @@ if (getStringFromRequest('submit')) {
 	$refresh = ($language != $u->getLanguage() || $theme_id != $u->getThemeID());
 
 	if (!$u->update($firstname, $lastname, $language, $timezone, $mail_site, $mail_va, $use_ratings,
-		$jabber_address,$jabber_only,$theme_id,$address,$address2,$phone,$fax,$title,$ccode)) {
+		'',0,$theme_id,$address,$address2,$phone,$fax,$title,$ccode)) {
 		form_release_key(getStringFromRequest('form_key'));
 		$error_msg = $u->getErrorMessage();
 		$refresh_url = '/account/?error_msg='.urlencode($error_msg);
@@ -212,20 +210,6 @@ echo $HTML->boxTop(_('Account Maintenance'));
 </td>
 </tr>
 
-<?php
-if (forge_get_config('use_jabber')) {
-    echo '<tr valign="top">
-<td>'. _('Jabber Address:') .'</td>
-<td>
-    <input size="30" type="text" name="jabber_address" value="'. $u->getJabberAddress() .'" /><p />
-	<input type="checkbox" name="jabber_only" value="1" '.(($u->getJabberOnly()) ? 'checked="checked"' : '' ).' />
-	'._('Send auto-generated notices only to my Jabber address').'.
-</td></tr>';
-
-}
-?>
-
-
 <tr>
 <td colspan="2">
 <?php
diff --git a/src/www/account/register.php b/src/www/account/register.php
index 0377215..5b619a6 100644
--- a/src/www/account/register.php
+++ b/src/www/account/register.php
@@ -42,8 +42,6 @@ $mail_va = getIntFromRequest('mail_va');
 
 $language_id = getIntFromRequest('language_id');
 $timezone = getStringFromRequest('timezone');
-$jabber_address = getStringFromRequest('jabber_address');
-$jabber_only = getStringFromRequest('jabber_only');
 $theme_id = getIntFromRequest('theme_id');
 $address = getStringFromRequest('address');
 $address2 = getStringFromRequest('address2');
@@ -86,7 +84,7 @@ if (getStringFromRequest('submit')) {
 		
 		$new_user = new GFUser();
 		$register = $new_user->create($unix_name,$firstname,$lastname,$password1,$password2,
-					      $email,$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,$theme_id,'',
+					      $email,$mail_site,$mail_va,$language_id,$timezone,'',0,$theme_id,'',
 					      $address,$address2,$phone,$fax,$title,$ccode,$send_mail);
 		if ($register) {
 			site_header(array('title'=>'Register Confirmation'));
@@ -190,17 +188,6 @@ if (forge_get_config('require_unique_email')) {
 <br /><input size="30" type="text" name="email" value="<?php print(htmlspecialchars($email)); ?>" />
 </p>
 <p>
-<?php
-if (forge_get_config('use_jabber')) {
-	echo _('Jabber Address:').'<br />
-	<input size="30" type="text" name="jabber_address" value="'. 
-	htmlspecialchars($jabber_address) .'" /><br />
-	<input type="checkbox" name="jabber_only" value="1" />
-	'._('Send auto-generated notices only to my Jabber address').'.';
-}
-?>
-</p>
-<p>
 <?php echo _('Address:'); ?><br />
 <input type="text" name="address" value="<?php echo htmlspecialchars($address); ?>" size="80" />
 </p>
diff --git a/src/www/include/user_home.php b/src/www/include/user_home.php
index 3aae0b7..1865505 100644
--- a/src/www/include/user_home.php
+++ b/src/www/include/user_home.php
@@ -102,14 +102,6 @@ echo $HTML->boxTop(_('Personal Information'), _('Personal Information')); ?>
 	?></strong>
 	</td>
 </tr>
-<?php if ($user->getJabberAddress()) { ?>
-<tr>
-	<td><?php echo _('Jabber Address') ?></td>
-	<td>
-	<a href="jabber:<?php print $user->getJabberAddress(); ?>"><strong><?php print $user->getJabberAddress(); ?></strong></a>
-	</td>
-</tr>
-<?php } ?>
 
 <?php if ($user->getAddress() || $user->getAddress2()) { ?>
 <tr>

-----------------------------------------------------------------------

Summary of changes:
 src/common/frs/FRSRelease.class.php                |    2 +-
 src/common/include/Jabber.class.php                | 1533 --------------------
 src/common/include/User.class.php                  |   73 +-
 src/common/include/config-vars.php                 |   22 -
 src/common/include/pre.php                         |    7 -
 src/common/include/utils.php                       |   61 +-
 src/common/pm/ProjectTask.class.php                |    2 +-
 src/debian/dsf-helper/jabberhost-variables.config  |   11 -
 .../dsf-helper/jabberhost-variables.templates      |    4 -
 src/debian/dsf-in/web-apache2.config.dsfh-in       |    1 -
 src/debian/dsf-in/web-apache2.templates.dsfh-in    |    1 -
 .../installation_guide/installation_guide.xml      |    9 -
 src/etc/config.ini.d/defaults.ini                  |    1 -
 src/etc/gforge.conf.example                        |    4 -
 src/etc/httpd.conf.d-fhs/secrets.inc               |    3 -
 src/etc/httpd.conf.d-opt/secrets.inc               |    3 -
 src/etc/httpd.conf.d-usrlocal/secrets.inc          |    3 -
 src/etc/httpd.conf.d/secrets.inc                   |    3 -
 src/etc/httpd.d/httpd.secrets                      |    3 -
 src/etc/httpd.secrets.example                      |    3 -
 src/etc/local.d/10database.env                     |    1 -
 src/etc/local.d/10database.simple                  |    1 -
 src/etc/local.d/23jabber                           |   14 -
 src/etc/local.inc.example                          |   14 -
 .../etc/plugins/ldapextauth/mapping.php            |    1 -
 .../include/LdapExtAuthPlugin.class.php            |    3 -
 src/setup                                          |    4 -
 src/translations/bg.po                             |   16 -
 src/translations/ca.po                             |   16 -
 src/translations/de.po                             |   17 -
 src/translations/el.po                             |   16 -
 src/translations/en.po                             |   16 -
 src/translations/eo.po                             |   16 -
 src/translations/es.po                             |   17 -
 src/translations/eu.po                             |   17 -
 src/translations/fr.po                             |   16 -
 src/translations/gl.po                             |   16 -
 src/translations/he.po                             |   16 -
 src/translations/id.po                             |   16 -
 src/translations/it.po                             |   17 -
 src/translations/ja.po                             |   42 -
 src/translations/ko.po                             |   16 -
 src/translations/la.po                             |   16 -
 src/translations/nb.po                             |   16 -
 src/translations/nl.po                             |   17 -
 src/translations/pl.po                             |   16 -
 src/translations/pt.po                             |   16 -
 src/translations/pt_BR.po                          |   17 -
 src/translations/ru.po                             |   16 -
 src/translations/sv.po                             |   17 -
 src/translations/th.po                             |   16 -
 src/translations/zh_CN.po                          |   16 -
 src/translations/zh_TW.po                          |   16 -
 src/utils/migrate-to-ini-files.sh                  |    5 -
 src/www/account/index.php                          |   18 +-
 src/www/account/register.php                       |   15 +-
 src/www/include/user_home.php                      |    8 -
 57 files changed, 24 insertions(+), 2258 deletions(-)
 delete mode 100644 src/common/include/Jabber.class.php
 delete mode 100644 src/debian/dsf-helper/jabberhost-variables.config
 delete mode 100644 src/debian/dsf-helper/jabberhost-variables.templates
 delete mode 100644 src/etc/local.d/23jabber


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list