add a bit of instructions

[quix0rs-gnu-social.git] / lib / jabber.php

diff --git a/lib/jabber.php b/lib/jabber.php
index 2e6770651525d5bff90a102163b0da2da0f2e23e..2e136cd74874ae7091b4b9b9b416dddff11e8ca7 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -37,7 +37,11 @@ function jabber_normalize_jid($jid) {
        }
 }
 
-function jabber_connect($resource=NULL, $status=NULL) {
+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', 'host') ?
@@ -53,14 +57,11 @@ function jabber_connect($resource=NULL, $status=NULL) {
                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');
-        if ($status) {
-               $conn->presence($status);
-               }
+       $conn->processUntil('session_start');
        }
        return $conn;
 }
@@ -74,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;
@@ -84,20 +85,13 @@ function jabber_send_presence($status=Null, $show='available', $to=Null) {
 }
 
 function jabber_confirm_address($code, $nickname, $address) {
-
-       # Fire off a subscription, just in case
-
-       jabber_special_presence('subscribe', $address);
-
-       # Hopefully this goes through if we're not already subscribed
-
-       $body = 'User "' . $nickname . '" on ' . common_config('site', 'name') .
+       $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' => $confirm->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.';
+           '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);
 }