}
}
+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'));
+ 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;
}
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;
}
function jabber_confirm_address($code, $nickname, $address) {
-
- # FIXME: above arguments are unused, we start the process with a
- # subscription
- # XXX: no idea what we do if the update daemon is already subscribed.
-
- jabber_special_presence('subscribe', $address);
-
+ $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) {