X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=2e136cd74874ae7091b4b9b9b416dddff11e8ca7;hb=e9dd281735be3aeb9c759a5202fe8b7550a82037;hp=97d02544d668c96f2995f572489de0a24c9cba0a;hpb=e330eb50d2c36505270375360303083decedee98;p=quix0rs-gnu-social.git

diff --git a/lib/jabber.php b/lib/jabber.php
index 97d02544d6..2e136cd748 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -37,24 +37,31 @@ function jabber_normalize_jid($jid) {
 	}
 }
 
+function jabber_daemon_address() {
+	return common_config('xmpp', 'user') . '@' . common_config('xmpp', 'server');
+}
+
 function jabber_connect($resource=NULL) {
 	static $conn = NULL;
 	if (!$conn) {
-		$conn = new XMPP(common_config('xmpp', 'server'),
-					     common_config('xmpp', 'port'),
+		$conn = new XMPP(common_config('xmpp', 'host') ?
+				         common_config('xmpp', 'host') :
+				         common_config('xmpp', 'server'),
+				         common_config('xmpp', 'port'),
 					     common_config('xmpp', 'user'),
 					     common_config('xmpp', 'password'),
-				    	 ($resource) ? $resource : 
-				        	common_config('xmpp', 'resource'));
-				        
+				    	 ($resource) ? $resource :
+				        	common_config('xmpp', 'resource'),
+				         common_config('xmpp', 'server'));
+
 		if (!$conn) {
 			return false;
 		}
-		$conn->connect(true); # try to get a persistent connection
+		$conn->connect(true); # true = persistent connection
 		if ($conn->disconnected) {
 			return false;
 		}
-        $conn->processUntil('session_start');
+    	$conn->processUntil('session_start');
 	}
 	return $conn;
 }
@@ -68,7 +75,7 @@ function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
 	return true;
 }
 
-function jabber_send_presence($status=Null, $show='available', $to=Null) {
+function jabber_send_presence($status, $show='available', $to=Null) {
 	$conn = jabber_connect();
 	if (!$conn) {
 		return false;
@@ -78,30 +85,36 @@ function jabber_send_presence($status=Null, $show='available', $to=Null) {
 }
 
 function jabber_confirm_address($code, $nickname, $address) {
-
-	# FIXME: do we have to request presence first?
-	
-	$body = "Hey, $nickname.";
-	$body .= "\n\n";
-	$body .= 'Someone just entered this IM address on ';
-	$body .= common_config('site', 'name') . '.';
-	$body .= "\n\n";
-	$body .= 'If it was you, and you want to confirm your entry, ';
-	$body .= 'use the URL below:';
-	$body .= "\n\n";
-	$body .= "\t".common_local_url('confirmaddress',
-								   array('code' => $code));
-	$body .= "\n\n";
-	$body .= 'If not, just ignore this message.';
-	$body .= "\n\n";
-	$body .= 'Thanks for your time, ';
-	$body .= "\n";
-	$body .= common_config('site', 'name');
-	$body .= "\n";
+	$body = 'User "' . $nickname . '" on ' . common_config('site', 'name') . ' ' .
+			'has said that your Jabber ID belongs to them. ' .
+    	    'If that\'s true, you can confirm by clicking on this URL: ' .
+        	common_local_url('confirmaddress', array('code' => $code)) .
+        	' . (If you cannot click it, copy-and-paste it into the ' .
+        	'address bar of your browser). If that user isn\'t you, ' .
+        	'or if you didn\'t request this confirmation, just ignore this message.';
 
 	jabber_send_message($address, $body);
 }
-	
+
+function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
+	$conn = jabber_connect();
+
+	$to = htmlspecialchars($to);
+	$status = htmlspecialchars($status);
+	$out = "<presence";
+	if($to) $out .= " to='$to'";
+	if($type) $out .= " type='$type'";
+	if($show == 'available' and !$status) {
+		$out .= "/>";
+	} else {
+		$out .= ">";
+		if($show && ($show != 'available')) $out .= "<show>$show</show>";
+		if($status) $out .= "<status>$status</status>";
+		$out .= "</presence>";
+	}
+	$conn->send($out);
+}
+
 function jabber_broadcast_notice($notice) {
 	# First, get users subscribed to this profile
 	# XXX: use a join here rather than looping through results